diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000000000000000000000000000000000000..9515b25732000716036b754fa6b2a23444c3d9a3 --- /dev/null +++ b/Android.bp @@ -0,0 +1,2 @@ +soong_namespace { +} diff --git a/BoardConfig.mk b/BoardConfig.mk index 7078a8e42501fde9cce890ecd67d2d76a7f8de0d..b9fb44c1089637a1ef75bf7281b4cdedd31580cf 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -31,13 +31,9 @@ BOARD_KERNEL_CMDLINE += androidboot.hardware=lilac ### PARTITIONS # See also /proc/partitions on the device -BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864 -BOARD_RECOVERYIMAGE_PARTITION_SIZE := 67108864 -BOARD_CACHEIMAGE_PARTITION_SIZE := 398458880 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 5242880000 -BOARD_FLASH_BLOCK_SIZE := 131072 # (BOARD_KERNEL_PAGESIZE * 64) -# Reserve space for data encryption (23753875456-16384) -BOARD_USERDATAIMAGE_PARTITION_SIZE := 23753859072 +# Reserve space for data encryption (23753875456-32768) +BOARD_USERDATAIMAGE_PARTITION_SIZE := 23753842688 # Build vendor.img BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 @@ -47,18 +43,10 @@ BOARD_VENDORIMAGE_PARTITION_SIZE := 1610612736 ### DISPLAY TARGET_SCREEN_DENSITY := 320 -### LIGHTS -TARGET_PROVIDES_LIBLIGHT := true - -### MODEM -BOARD_MODEM_CUSTOMIZATIONS := true - -### IMS -BOARD_IMS_CAMERA := true - ### VNDK BOARD_VNDK_VERSION := current -### SYSTEM PROPS +### PROPS # Add device-specific ones TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop +TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop diff --git a/README.md b/README.md index 91663b3ba9646304a40f5af318eb6bbc6385111e..8b1e2f0b461f24d9fc15f0667bb7af2d6ead5df2 100644 --- a/README.md +++ b/README.md @@ -11,42 +11,57 @@ How to build LineageOS * Make a workspace: - mkdir -p ~/lineageos - cd ~/lineageos + ```bash + mkdir -p ~/lineageos + cd ~/lineageos + ``` * Initialize the repo: - repo init -u git://github.com/LineageOS/android.git -b lineage-17.1 + ```bash + repo init -u git://github.com/LineageOS/android.git -b lineage-17.1 + ``` * Create a local manifest: - vim .repo/local_manifests/roomservice.xml + ```bash + mkdir .repo/local_manifests + vim .repo/local_manifests/roomservice.xml - - - - - - + + + + + + - - - + + + + ``` * Sync the repo: - repo sync + ```bash + repo sync + ``` * Extract vendor blobs - cd device/sony/lilac - ./extract-files.sh + ```bash + cd device/sony/lilac + ./extract-files.sh + ``` * Setup the environment - source build/envsetup.sh - lunch lineage_lilac-userdebug + ```bash + source build/envsetup.sh + lunch lineage_lilac-userdebug + ``` * Build LineageOS - make -j8 bacon + ```bash + make -j8 bacon + ``` diff --git a/config/audio/audio_platform_info.xml b/config/audio/audio_platform_info.xml deleted file mode 100644 index c1b1c64cc69ee98eef12888d37b513057847ce4c..0000000000000000000000000000000000000000 --- a/config/audio/audio_platform_info.xml +++ /dev/null @@ -1,465 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/config/audio/mixer_paths_tasha.xml b/config/audio/mixer_paths_tasha.xml deleted file mode 100644 index 25985b718d10bcaac88d3c79696e5507b7d271ac..0000000000000000000000000000000000000000 --- a/config/audio/mixer_paths_tasha.xml +++ /dev/null @@ -1,4378 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/config/modem/114/modem.conf b/config/modem/114/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..a6a3140e41c751cf00bb3b644487f1362a86d2ee --- /dev/null +++ b/config/modem/114/modem.conf @@ -0,0 +1 @@ +ctm_mo_ims \ No newline at end of file diff --git a/config/modem/122/modem.conf b/config/modem/122/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..fdc5f17a0dd5daf87535efeb610dbbd92cd0260f --- /dev/null +++ b/config/modem/122/modem.conf @@ -0,0 +1 @@ +telefonica_uk \ No newline at end of file diff --git a/config/modem/13/modem.conf b/config/modem/13/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..4fb133035e3e8a0427b462a17fb6abfcac3bbefc --- /dev/null +++ b/config/modem/13/modem.conf @@ -0,0 +1 @@ +vodafone_germany_volte_vowifi \ No newline at end of file diff --git a/config/modem/132/modem.conf b/config/modem/132/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..51df5a346690bfc87ac96c753fa6e1c0642eb6bc --- /dev/null +++ b/config/modem/132/modem.conf @@ -0,0 +1 @@ +elisa_estonia \ No newline at end of file diff --git a/config/modem/133/modem.conf b/config/modem/133/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..37b9ca77970747571e5098f4fe7437029e69e14c --- /dev/null +++ b/config/modem/133/modem.conf @@ -0,0 +1 @@ +emt_estonia_volte_vilte \ No newline at end of file diff --git a/config/modem/134/modem.conf b/config/modem/134/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..54c3d62a18848441494952a3a7645777fbeace4c --- /dev/null +++ b/config/modem/134/modem.conf @@ -0,0 +1 @@ +tele2_estonia \ No newline at end of file diff --git a/config/modem/170/modem.conf b/config/modem/170/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..02be868971295ed0213f047e5ba8b2bd104f3d7f --- /dev/null +++ b/config/modem/170/modem.conf @@ -0,0 +1 @@ +kpn \ No newline at end of file diff --git a/config/modem/177/modem.conf b/config/modem/177/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..93aeb00deeaa3796eecd42409afc22e8e97ddebd --- /dev/null +++ b/config/modem/177/modem.conf @@ -0,0 +1 @@ +salt_switzerland_vowifi_only \ No newline at end of file diff --git a/config/modem/184/modem.conf b/config/modem/184/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..11b951b9a18693b41aa99df93a2518df47b46ead --- /dev/null +++ b/config/modem/184/modem.conf @@ -0,0 +1 @@ +telia_norway_volte_vowifi \ No newline at end of file diff --git a/config/modem/191/modem.conf b/config/modem/191/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..900e9f8568ea28ce7838c40f746d6d17ef0b4f1c --- /dev/null +++ b/config/modem/191/modem.conf @@ -0,0 +1 @@ +skt_kr_ims \ No newline at end of file diff --git a/config/modem/192/modem.conf b/config/modem/192/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..69fe032f37aabd200809401950df98aab3215c22 --- /dev/null +++ b/config/modem/192/modem.conf @@ -0,0 +1 @@ +kt_kr_ims \ No newline at end of file diff --git a/config/modem/193/modem.conf b/config/modem/193/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..1f98993990ba6badf5bf50d0bf7f7a32285381a5 --- /dev/null +++ b/config/modem/193/modem.conf @@ -0,0 +1 @@ +lguplus_kr_ims \ No newline at end of file diff --git a/config/modem/196/modem.conf b/config/modem/196/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..5232d89ccedd99b81c0257115e1cf6682915e6f5 --- /dev/null +++ b/config/modem/196/modem.conf @@ -0,0 +1 @@ +telia_lithuania_ims \ No newline at end of file diff --git a/config/modem/198/modem.conf b/config/modem/198/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..8fd0b75fcf6fcf7bb3ca03a619d4bdc4cbd6a58e --- /dev/null +++ b/config/modem/198/modem.conf @@ -0,0 +1 @@ +proximus_belgium_ims \ No newline at end of file diff --git a/config/modem/2/modem.conf b/config/modem/2/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..a5662744f49e831eb06bb0afc139af93a7a26475 --- /dev/null +++ b/config/modem/2/modem.conf @@ -0,0 +1 @@ +telia_sweden_volte_vowifi \ No newline at end of file diff --git a/config/modem/244/modem.conf b/config/modem/244/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/config/modem/272/modem.conf b/config/modem/272/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..ac0d130b63b6763662599ae77bbc1b58d94a42bf --- /dev/null +++ b/config/modem/272/modem.conf @@ -0,0 +1 @@ +dna_finland_volte_vowifi \ No newline at end of file diff --git a/config/modem/273/modem.conf b/config/modem/273/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..b5c8bca9825111c3919fa3bc79d6e4a233acafe4 --- /dev/null +++ b/config/modem/273/modem.conf @@ -0,0 +1 @@ +tdc_denmark_volte_vowifi \ No newline at end of file diff --git a/config/modem/274/modem.conf b/config/modem/274/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..feaf44cca9531c21c338a188c1b8877b75a8c44f --- /dev/null +++ b/config/modem/274/modem.conf @@ -0,0 +1 @@ +telenor_denmark_volte_vowifi \ No newline at end of file diff --git a/config/modem/286/modem.conf b/config/modem/286/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..d995654f213afcfc74f24f67c8d13ff95618d539 --- /dev/null +++ b/config/modem/286/modem.conf @@ -0,0 +1 @@ +sunrise_switzerland_volte_vowifi \ No newline at end of file diff --git a/config/modem/297/modem.conf b/config/modem/297/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..4d2e8fc2ae93e85e1317453306e82adeed7b5509 --- /dev/null +++ b/config/modem/297/modem.conf @@ -0,0 +1 @@ +sfr_france_volte_vowifi \ No newline at end of file diff --git a/config/modem/3/modem.conf b/config/modem/3/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..a5662744f49e831eb06bb0afc139af93a7a26475 --- /dev/null +++ b/config/modem/3/modem.conf @@ -0,0 +1 @@ +telia_sweden_volte_vowifi \ No newline at end of file diff --git a/config/modem/306/modem.conf b/config/modem/306/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/config/modem/308/modem.conf b/config/modem/308/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..f607dfd08d7ca085dd1efec8d6d3c4a7457490c5 --- /dev/null +++ b/config/modem/308/modem.conf @@ -0,0 +1 @@ +pccw_hk_ims \ No newline at end of file diff --git a/config/modem/310/modem.conf b/config/modem/310/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..ffb8ecf4f56be16d0827821bcb87a16dd4e7eb4e --- /dev/null +++ b/config/modem/310/modem.conf @@ -0,0 +1 @@ +telefonica_germany_volte_vilte_vowifi \ No newline at end of file diff --git a/config/modem/311/modem.conf b/config/modem/311/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..d56fe2765dc37e231f0c22c9cc46825c929a8e87 --- /dev/null +++ b/config/modem/311/modem.conf @@ -0,0 +1 @@ +ee_ims \ No newline at end of file diff --git a/config/modem/318/modem.conf b/config/modem/318/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..8d5191b9ae84992daeb470094665218af2754402 --- /dev/null +++ b/config/modem/318/modem.conf @@ -0,0 +1 @@ +china_mobile_cn_ims \ No newline at end of file diff --git a/config/modem/326/modem.conf b/config/modem/326/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..168f8742b722fad9d003d68105b8e9b0791c943e --- /dev/null +++ b/config/modem/326/modem.conf @@ -0,0 +1 @@ +telenor_sweden_volte_vowifi \ No newline at end of file diff --git a/config/modem/34/modem.conf b/config/modem/34/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..09251b01aa5a16b413f75a45bc64a42c764800bb --- /dev/null +++ b/config/modem/34/modem.conf @@ -0,0 +1 @@ +tele2_sweden_ims \ No newline at end of file diff --git a/config/modem/341/modem.conf b/config/modem/341/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..6baebdf94c167402d616d75d9bd89eb56cf0b914 --- /dev/null +++ b/config/modem/341/modem.conf @@ -0,0 +1 @@ +reliance_jio_in_ims \ No newline at end of file diff --git a/config/modem/348/modem.conf b/config/modem/348/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/config/modem/350/modem.conf b/config/modem/350/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..c2780426539ceb39338b0022bbe78db1791bbdec --- /dev/null +++ b/config/modem/350/modem.conf @@ -0,0 +1 @@ +tele2_netherlands_ims \ No newline at end of file diff --git a/config/modem/358/modem.conf b/config/modem/358/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..dae51762572ea4764d12d209cb17f2a5f93e1f95 --- /dev/null +++ b/config/modem/358/modem.conf @@ -0,0 +1 @@ +airtel_in_ims \ No newline at end of file diff --git a/config/modem/37/modem.conf b/config/modem/37/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..67bed34ea065b61cee0ffb485293f3b24e0cbce5 --- /dev/null +++ b/config/modem/37/modem.conf @@ -0,0 +1 @@ +a1_austria_volte_vowifi \ No newline at end of file diff --git a/config/modem/38/modem.conf b/config/modem/38/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..b1709898ca9a60da3c66aa3ad2f178278d2625be --- /dev/null +++ b/config/modem/38/modem.conf @@ -0,0 +1 @@ +vodafone_uk_volte_vowifi \ No newline at end of file diff --git a/config/modem/39/modem.conf b/config/modem/39/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..65983e1eca6fe2ad08ea4c2980724718dc8ebafa --- /dev/null +++ b/config/modem/39/modem.conf @@ -0,0 +1 @@ +swisscom_switzerland_ims \ No newline at end of file diff --git a/config/modem/40/modem.conf b/config/modem/40/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/config/modem/404/modem.conf b/config/modem/404/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..60b692a7b5f28763061fecc4b4aee104254e5a3c --- /dev/null +++ b/config/modem/404/modem.conf @@ -0,0 +1 @@ +telekom_netherlands_ims \ No newline at end of file diff --git a/config/modem/408/modem.conf b/config/modem/408/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..137dea10cb5ca2e232c2ac36e2b78397ccbdddae --- /dev/null +++ b/config/modem/408/modem.conf @@ -0,0 +1 @@ +tmobile_us_ims \ No newline at end of file diff --git a/config/modem/41/modem.conf b/config/modem/41/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..0681dad07d988f8da2e88d2e0c1d595619eea526 --- /dev/null +++ b/config/modem/41/modem.conf @@ -0,0 +1 @@ +telenor_norway_volte_vowifi \ No newline at end of file diff --git a/config/modem/415/modem.conf b/config/modem/415/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..825856b09f7d546944f1ca01945647c5162448ca --- /dev/null +++ b/config/modem/415/modem.conf @@ -0,0 +1 @@ +vodafone_global \ No newline at end of file diff --git a/config/modem/42/modem.conf b/config/modem/42/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..b70c13adb33d17504beb607d594720b64e34fc9d --- /dev/null +++ b/config/modem/42/modem.conf @@ -0,0 +1 @@ +vodafone_germany_pp_volte_vowifi \ No newline at end of file diff --git a/config/modem/420/modem.conf b/config/modem/420/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..eccb29bc0a255ea0986a0362df3183ce5e32b703 --- /dev/null +++ b/config/modem/420/modem.conf @@ -0,0 +1 @@ +elisa_finland_volte_vowifi \ No newline at end of file diff --git a/config/modem/424/modem.conf b/config/modem/424/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..825856b09f7d546944f1ca01945647c5162448ca --- /dev/null +++ b/config/modem/424/modem.conf @@ -0,0 +1 @@ +vodafone_global \ No newline at end of file diff --git a/config/modem/426/modem.conf b/config/modem/426/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..81508773f2ccfb130fa22e6efa790ddaf6456c84 --- /dev/null +++ b/config/modem/426/modem.conf @@ -0,0 +1 @@ +tstar_tw_ims \ No newline at end of file diff --git a/config/modem/441/modem.conf b/config/modem/441/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..5f7ed3bb2bb93765de3915e8494cee9a9449c5d1 --- /dev/null +++ b/config/modem/441/modem.conf @@ -0,0 +1 @@ +bite_lithuania \ No newline at end of file diff --git a/config/modem/442/modem.conf b/config/modem/442/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..5f26866fdaa345bfddf8c854064bcd3d4e900511 --- /dev/null +++ b/config/modem/442/modem.conf @@ -0,0 +1 @@ +bite_latvia \ No newline at end of file diff --git a/config/modem/446/modem.conf b/config/modem/446/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..11b951b9a18693b41aa99df93a2518df47b46ead --- /dev/null +++ b/config/modem/446/modem.conf @@ -0,0 +1 @@ +telia_norway_volte_vowifi \ No newline at end of file diff --git a/config/modem/452/modem.conf b/config/modem/452/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..fdc5f17a0dd5daf87535efeb610dbbd92cd0260f --- /dev/null +++ b/config/modem/452/modem.conf @@ -0,0 +1 @@ +telefonica_uk \ No newline at end of file diff --git a/config/modem/461/modem.conf b/config/modem/461/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/config/modem/477/modem.conf b/config/modem/477/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/config/modem/483/modem.conf b/config/modem/483/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..755fccd39a2ab591b6da3f8befaacb0431e4e1d6 --- /dev/null +++ b/config/modem/483/modem.conf @@ -0,0 +1 @@ +telekom_germany_volte_vowifi \ No newline at end of file diff --git a/config/modem/489/modem.conf b/config/modem/489/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/config/modem/492/modem.conf b/config/modem/492/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..268be4001739ecfc745e00a1b72c25c3ee6eb90d --- /dev/null +++ b/config/modem/492/modem.conf @@ -0,0 +1 @@ +kpn_netherlands_ims \ No newline at end of file diff --git a/config/modem/513/modem.conf b/config/modem/513/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..448ce4be79ad0ff9bcd193d9365d8cb8199a5d56 --- /dev/null +++ b/config/modem/513/modem.conf @@ -0,0 +1 @@ +tmobile_austria \ No newline at end of file diff --git a/config/modem/523/modem.conf b/config/modem/523/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/config/modem/54/modem.conf b/config/modem/54/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..84888bf5008b2ee42ebf136bf54b028b0f5bb83d --- /dev/null +++ b/config/modem/54/modem.conf @@ -0,0 +1 @@ +megafon_ru_ims \ No newline at end of file diff --git a/config/modem/549/modem.conf b/config/modem/549/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..ad5a7f1dcb50334bc95a79d3a5432826262cf2b9 --- /dev/null +++ b/config/modem/549/modem.conf @@ -0,0 +1 @@ +virgin_uk \ No newline at end of file diff --git a/config/modem/55/modem.conf b/config/modem/55/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..2b3cb0ede29fa2e307affc5aa526b861b46da866 --- /dev/null +++ b/config/modem/55/modem.conf @@ -0,0 +1 @@ +mts_ru_ims \ No newline at end of file diff --git a/config/modem/567/modem.conf b/config/modem/567/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..a441ee8032b963b2a7dde7238c6626f6d3116bd2 --- /dev/null +++ b/config/modem/567/modem.conf @@ -0,0 +1 @@ +asiapacific_tw_ims \ No newline at end of file diff --git a/config/modem/57/modem.conf b/config/modem/57/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..6d25cdf82e371c9c986ac5086a9ca8c6e3e4d21f --- /dev/null +++ b/config/modem/57/modem.conf @@ -0,0 +1 @@ +singtel_sg_ims \ No newline at end of file diff --git a/config/modem/58/modem.conf b/config/modem/58/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..099bc4a1a2ebacfd836833ef359c5288facd424b --- /dev/null +++ b/config/modem/58/modem.conf @@ -0,0 +1 @@ +starhub_sg_ims \ No newline at end of file diff --git a/config/modem/59/modem.conf b/config/modem/59/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..df7845ff9dfbe99cc1b1bd606f146fcad4f1cf0b --- /dev/null +++ b/config/modem/59/modem.conf @@ -0,0 +1 @@ +m1_sg_ims \ No newline at end of file diff --git a/config/modem/611/modem.conf b/config/modem/611/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..b0f999bf2a61158760adc30bb042d179532074a8 --- /dev/null +++ b/config/modem/611/modem.conf @@ -0,0 +1 @@ +hutch_sweden_volte_vowifi \ No newline at end of file diff --git a/config/modem/62/modem.conf b/config/modem/62/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..3b2ea1267b78a69428ec5017546f265b005b308f --- /dev/null +++ b/config/modem/62/modem.conf @@ -0,0 +1 @@ +smartone_hk_ims \ No newline at end of file diff --git a/config/modem/640/modem.conf b/config/modem/640/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..9e47bf615f1a92b5ef4709cd0be2f095304d9e11 --- /dev/null +++ b/config/modem/640/modem.conf @@ -0,0 +1 @@ +csl_hk_ims \ No newline at end of file diff --git a/config/modem/71/modem.conf b/config/modem/71/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..fe1082e13af989d053b646fe70e86a143bbf320e --- /dev/null +++ b/config/modem/71/modem.conf @@ -0,0 +1 @@ +hutch_denmark_volte_vowifi \ No newline at end of file diff --git a/config/modem/73/modem.conf b/config/modem/73/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..2d9dcb3b4a04eb4fe73747cc72d773cdaa2713ad --- /dev/null +++ b/config/modem/73/modem.conf @@ -0,0 +1 @@ +hutch_hk_ims \ No newline at end of file diff --git a/config/modem/79/modem.conf b/config/modem/79/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..06bacb242edf31d850efb8f221f9d1edd293a240 --- /dev/null +++ b/config/modem/79/modem.conf @@ -0,0 +1 @@ +china_mobile_hk_ims \ No newline at end of file diff --git a/config/modem/88/modem.conf b/config/modem/88/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/config/modem/901/modem.conf b/config/modem/901/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..3f5cfa359255d4aad9416702fb018988bd5b463f --- /dev/null +++ b/config/modem/901/modem.conf @@ -0,0 +1 @@ +telekom_czech_volte_vowifi \ No newline at end of file diff --git a/config/modem/903/modem.conf b/config/modem/903/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..d275291fbc21fd43bc025596d07770169bdd1bf7 --- /dev/null +++ b/config/modem/903/modem.conf @@ -0,0 +1 @@ +telekom_greece_volte_vowifi \ No newline at end of file diff --git a/config/modem/906/modem.conf b/config/modem/906/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..20118122ee8e6fcfc94b22f8ba4426424643a7f4 --- /dev/null +++ b/config/modem/906/modem.conf @@ -0,0 +1 @@ +telekom_croatia \ No newline at end of file diff --git a/config/modem/909/modem.conf b/config/modem/909/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..6c65fee44a8f981c9cf05c1a569a42138ac12fb1 --- /dev/null +++ b/config/modem/909/modem.conf @@ -0,0 +1 @@ +vodafone_czech_volte_vowifi \ No newline at end of file diff --git a/config/modem/910/modem.conf b/config/modem/910/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..a56936e43abd3943c7a7dc8cf5840d06620449f4 --- /dev/null +++ b/config/modem/910/modem.conf @@ -0,0 +1 @@ +telekom_slovakia_ims \ No newline at end of file diff --git a/config/modem/911/modem.conf b/config/modem/911/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..fe399ede86d609d18bbc1db8c3db0efcfb9a4559 --- /dev/null +++ b/config/modem/911/modem.conf @@ -0,0 +1 @@ +telefonica_uk_ims \ No newline at end of file diff --git a/config/modem/915/modem.conf b/config/modem/915/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..825856b09f7d546944f1ca01945647c5162448ca --- /dev/null +++ b/config/modem/915/modem.conf @@ -0,0 +1 @@ +vodafone_global \ No newline at end of file diff --git a/config/modem/92/modem.conf b/config/modem/92/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..935c68e2730b1e3681002ef07ff8f50624b4b8b1 --- /dev/null +++ b/config/modem/92/modem.conf @@ -0,0 +1 @@ +fareastone_tw_ims \ No newline at end of file diff --git a/config/modem/928/modem.conf b/config/modem/928/modem.conf new file mode 100644 index 0000000000000000000000000000000000000000..69b6d832bf4670cc10a1dbc49551e5d180e2122f --- /dev/null +++ b/config/modem/928/modem.conf @@ -0,0 +1 @@ +ir51_ir92_ims_gte \ No newline at end of file diff --git a/config/modem/929/modem.conf b/config/modem/929/modem.conf new file mode 100644 index 0000000000000000000000000000000000000000..69b6d832bf4670cc10a1dbc49551e5d180e2122f --- /dev/null +++ b/config/modem/929/modem.conf @@ -0,0 +1 @@ +ir51_ir92_ims_gte \ No newline at end of file diff --git a/config/modem/93/modem.conf b/config/modem/93/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..34a8e597111b3068110c8dac795a49da087cbb08 --- /dev/null +++ b/config/modem/93/modem.conf @@ -0,0 +1 @@ +cht_tw_ims \ No newline at end of file diff --git a/config/modem/94/modem.conf b/config/modem/94/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..c2bb1dcc59c82304c37c2e4a3f4140c8e63ad13c --- /dev/null +++ b/config/modem/94/modem.conf @@ -0,0 +1 @@ +twm_tw_ims \ No newline at end of file diff --git a/config/modem/modem.conf b/config/modem/modem.conf new file mode 100755 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/config/power/powerhint.json b/config/power/powerhint.json new file mode 100644 index 0000000000000000000000000000000000000000..7055feb414f653665d6a8a0cae16048ef1d98763 --- /dev/null +++ b/config/power/powerhint.json @@ -0,0 +1,551 @@ +{ + "Nodes": [ + { + "Name": "CPULittleClusterMaxFreq", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq", + "Values": [ + "1900800", + "1555200", + "1478400", + "1248000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CPULittleClusterMinFreq", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq", + "Values": [ + "1900800", + "1555200", + "1478400", + "1171200", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "CPUBigClusterMaxFreq", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", + "Values": [ + "2457600", + "1958400", + "1574400", + "1344000", + "1267200" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CPUBigClusterMinFreq", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq", + "Values": [ + "2457600", + "1574400", + "1420800", + "1344000", + "1132800", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "GPUMaxFreq", + "Path": "/sys/class/kgsl/kgsl-3d0/devfreq/max_freq", + "Values": [ + "342000000", + "414000000", + "515000000", + "710000000" + ], + "ResetOnInit": true + }, + { + "Name": "GPUMinFreq", + "Path": "/sys/class/kgsl/kgsl-3d0/devfreq/min_freq", + "Values": [ + "515000000", + "414000000", + "257000000" + ], + "ResetOnInit": true + }, + { + "Name": "GPUBusMinFreq", + "Path": "/sys/class/devfreq/soc:qcom,gpubw/min_freq", + "Values": [ + "11863", + "7759", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TASchedtuneBoost", + "Path": "/dev/stune/top-app/schedtune.boost", + "Values": [ + "30", + "10" + ], + "ResetOnInit": true + }, + { + "Name": "CPUBWHystTriggerCount", + "Path": "/sys/devices/soc/soc:qcom,cpubw/devfreq/soc:qcom,cpubw/bw_hwmon/hyst_trigger_count", + "Values": [ + "0", + "3" + ] + }, + { + "Name": "CPUBWHistMemory", + "Path": "/sys/devices/soc/soc:qcom,cpubw/devfreq/soc:qcom,cpubw/bw_hwmon/hist_memory", + "Values": [ + "0", + "20" + ] + }, + { + "Name": "CPUBWHystLength", + "Path": "/sys/devices/soc/soc:qcom,cpubw/devfreq/soc:qcom,cpubw/bw_hwmon/hyst_length", + "Values": [ + "0", + "10" + ] + }, + { + "Name": "CPUBWMinFreq", + "Path": "/sys/devices/soc/soc:qcom,cpubw/devfreq/soc:qcom,cpubw/min_freq", + "Values": [ + "13763", + "5195", + "1525", + "762" + ], + "ResetOnInit": true + }, + { + "Name": "PMQoSCpuDmaLatency", + "Path": "/dev/cpu_dma_latency", + "Values": [ + "2c", + "64" + ], + "HoldFd": true + }, + { + "Name": "PowerHALMainState", + "Path": "vendor.powerhal.state", + "Values": [ + "CAMERA_STREAMING", + "VR_SUSTAINED_PERFORMANCE", + "SUSTAINED_PERFORMANCE", + "VR_MODE", + "" + ], + "Type": "Property" + }, + { + "Name": "PowerHALAudioState", + "Path": "vendor.powerhal.audio", + "Values": [ + "AUDIO_LOW_LATENCY", + "" + ], + "Type": "Property" + }, + { + "Name": "PowerHALRenderingState", + "Path": "vendor.powerhal.rendering", + "Values": [ + "EXPENSIVE_RENDERING", + "" + ], + "Type": "Property" + }, + { + "Name": "ThermalMode", + "Path": "vendor.thermal.vr_mode", + "Values": [ + "-vr", + "-novr" + ], + "Type": "Property" + } + ], + "Actions": [ + { + "PowerHint": "VIDEO_ENCODE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1958400" + }, + { + "PowerHint": "SUSTAINED_PERFORMANCE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1267200" + }, + { + "PowerHint": "SUSTAINED_PERFORMANCE", + "Node": "PowerHALMainState", + "Duration": 0, + "Value": "SUSTAINED_PERFORMANCE" + }, + { + "PowerHint": "SUSTAINED_PERFORMANCE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1248000" + }, + { + "PowerHint": "SUSTAINED_PERFORMANCE", + "Node": "GPUMaxFreq", + "Duration": 0, + "Value": "342000000" + }, + { + "PowerHint": "VR_MODE", + "Node": "PowerHALMainState", + "Duration": 0, + "Value": "VR_MODE" + }, + { + "PowerHint": "VR_MODE", + "Node": "ThermalMode", + "Duration": 0, + "Value": "-vr" + }, + { + "PowerHint": "VR_MODE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1574400" + }, + { + "PowerHint": "VR_MODE", + "Node": "CPUBigClusterMinFreq", + "Duration": 0, + "Value": "1574400" + }, + { + "PowerHint": "VR_MODE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1555200" + }, + { + "PowerHint": "VR_MODE", + "Node": "CPULittleClusterMinFreq", + "Duration": 0, + "Value": "1555200" + }, + { + "PowerHint": "VR_MODE", + "Node": "GPUMaxFreq", + "Duration": 0, + "Value": "515000000" + }, + { + "PowerHint": "VR_MODE", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "414000000" + }, + { + "PowerHint": "VR_MODE", + "Node": "GPUBusMinFreq", + "Duration": 0, + "Value": "11863" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "PowerHALMainState", + "Duration": 0, + "Value": "VR_SUSTAINED_PERFORMANCE" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "ThermalMode", + "Duration": 0, + "Value": "-vr" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1344000" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "CPUBigClusterMinFreq", + "Duration": 0, + "Value": "1344000" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1478400" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "CPULittleClusterMinFreq", + "Duration": 0, + "Value": "1478400" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "GPUMaxFreq", + "Duration": 0, + "Value": "414000000" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "414000000" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "GPUBusMinFreq", + "Duration": 0, + "Value": "7759" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPUBigClusterMinFreq", + "Duration": 0, + "Value": "1132800" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPULittleClusterMinFreq", + "Duration": 0, + "Value": "1171200" + }, + { + "PowerHint": "INTERACTION", + "Node": "TASchedtuneBoost", + "Duration": 0, + "Value": "30" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPUBWHystTriggerCount", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPUBWHystLength", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPUBWHistMemory", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPUBWMinFreq", + "Duration": 0, + "Value": "5195" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterMaxFreq", + "Duration": 5000, + "Value": "2457600" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterMinFreq", + "Duration": 5000, + "Value": "2457600" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterMinFreq", + "Duration": 5000, + "Value": "1900800" + }, + { + "PowerHint": "LAUNCH", + "Node": "PMQoSCpuDmaLatency", + "Duration": 5000, + "Value": "2c" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBWHystTriggerCount", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBWHystLength", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBWHistMemory", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBWMinFreq", + "Duration": 5000, + "Value": "13763" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "2457600" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUBigClusterMinFreq", + "Duration": 1000, + "Value": "2457600" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPULittleClusterMinFreq", + "Duration": 1000, + "Value": "1900800" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "PMQoSCpuDmaLatency", + "Duration": 1000, + "Value": "2c" + }, + { + "PowerHint": "CAMERA_STREAMING", + "Node": "PowerHALMainState", + "Duration": 0, + "Value": "CAMERA_STREAMING" + }, + { + "PowerHint": "CAMERA_STREAMING", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "2457600" + }, + { + "PowerHint": "CAMERA_STREAMING", + "Node": "CPUBigClusterMinFreq", + "Duration": 1000, + "Value": "2457600" + }, + { + "PowerHint": "CAMERA_STREAMING", + "Node": "CPULittleClusterMinFreq", + "Duration": 1000, + "Value": "1900800" + }, + { + "PowerHint": "CAMERA_STREAMING", + "Node": "PMQoSCpuDmaLatency", + "Duration": 1000, + "Value": "2c" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "2457600" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBigClusterMinFreq", + "Duration": 1000, + "Value": "2457600" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPULittleClusterMinFreq", + "Duration": 1000, + "Value": "1900800" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "PMQoSCpuDmaLatency", + "Duration": 1000, + "Value": "2c" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBWHystTriggerCount", + "Duration": 1000, + "Value": "0" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBWHystLength", + "Duration": 1000, + "Value": "0" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBWHistMemory", + "Duration": 1000, + "Value": "0" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBWMinFreq", + "Duration": 1000, + "Value": "13763" + }, + { + "PowerHint": "AUDIO_STREAMING", + "Node": "CPUBigClusterMinFreq", + "Duration": 2000, + "Value": "1420800" + }, + { + "PowerHint": "AUDIO_STREAMING", + "Node": "PMQoSCpuDmaLatency", + "Duration": 2000, + "Value": "2c" + }, + { + "PowerHint": "AUDIO_LOW_LATENCY", + "Node": "PowerHALAudioState", + "Duration": 0, + "Value": "AUDIO_LOW_LATENCY" + }, + { + "PowerHint": "AUDIO_LOW_LATENCY", + "Node": "PMQoSCpuDmaLatency", + "Duration": 0, + "Value": "2c" + }, + { + "PowerHint": "EXPENSIVE_RENDERING", + "Node": "PowerHALRenderingState", + "Duration": 0, + "Value": "EXPENSIVE_RENDERING" + }, + { + "PowerHint": "EXPENSIVE_RENDERING", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "414000000" + }, + { + "PowerHint": "EXPENSIVE_RENDERING", + "Node": "GPUMaxFreq", + "Duration": 0, + "Value": "710000000" + } + ] +} diff --git a/device.mk b/device.mk index 029406541a9cae357c7939a1f64528199fb7cf93..8d6cc62cb70abb52ec0085b0791eb9811f320e28 100644 --- a/device.mk +++ b/device.mk @@ -3,6 +3,9 @@ $(call inherit-product, device/sony/yoshino-common/platform.mk) ### PROPRIETARY VENDOR FILES $(call inherit-product, vendor/sony/lilac/lilac-vendor.mk) +# Enable updating of APEXes +$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk) + ifeq ($(WITH_FDROID),true) $(call inherit-product, vendor/fdroid/fdroid-vendor.mk) endif @@ -15,6 +18,10 @@ $(call inherit-product, frameworks/native/build/phone-xhdpi-4096-dalvik-heap.mk) DEVICE_PATH := device/sony/lilac +# Soong +PRODUCT_SOONG_NAMESPACES += \ + $(DEVICE_PATH) + # Device uses high-density artwork where available PRODUCT_AAPT_CONFIG := normal hdpi xhdpi PRODUCT_AAPT_PREF_CONFIG := xhdpi @@ -22,9 +29,10 @@ PRODUCT_AAPT_PREF_CONFIG := xhdpi DEVICE_PACKAGE_OVERLAYS += \ $(DEVICE_PATH)/overlay -ifeq ($(WITH_TWRP),true) -include $(DEVICE_PATH)/device/init.mk -else # WITH_TWRP +PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += \ + $(DEVICE_PATH)/overlay/packages/apps/CarrierConfig + +### POWER +TARGET_USE_CUSTOM_POWERHINT := true + include $(DEVICE_PATH)/device/*.mk -include $(DEVICE_PATH)/vendor_prop.mk -endif # WITH_TWRP diff --git a/device/config-files.mk b/device/config-files.mk index 8c557b705d466975820dd19c4fd9f968af234bf8..7cb6f66c6fc6da91389aab98581d9fdac0152dbd 100644 --- a/device/config-files.mk +++ b/device/config-files.mk @@ -1,4 +1,89 @@ -### Audio +### Modem Configs PRODUCT_COPY_FILES += \ - $(DEVICE_PATH)/config/audio/mixer_paths_tasha.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tasha.xml \ - $(DEVICE_PATH)/config/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml + $(DEVICE_PATH)/config/modem/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/modem.conf \ + $(DEVICE_PATH)/config/modem/2/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/2/modem.conf \ + $(DEVICE_PATH)/config/modem/3/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/3/modem.conf \ + $(DEVICE_PATH)/config/modem/13/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/13/modem.conf \ + $(DEVICE_PATH)/config/modem/34/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/34/modem.conf \ + $(DEVICE_PATH)/config/modem/37/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/37/modem.conf \ + $(DEVICE_PATH)/config/modem/38/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/38/modem.conf \ + $(DEVICE_PATH)/config/modem/39/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/39/modem.conf \ + $(DEVICE_PATH)/config/modem/40/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/40/modem.conf \ + $(DEVICE_PATH)/config/modem/41/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/41/modem.conf \ + $(DEVICE_PATH)/config/modem/42/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/42/modem.conf \ + $(DEVICE_PATH)/config/modem/54/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/54/modem.conf \ + $(DEVICE_PATH)/config/modem/55/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/55/modem.conf \ + $(DEVICE_PATH)/config/modem/57/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/57/modem.conf \ + $(DEVICE_PATH)/config/modem/58/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/58/modem.conf \ + $(DEVICE_PATH)/config/modem/59/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/59/modem.conf \ + $(DEVICE_PATH)/config/modem/62/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/62/modem.conf \ + $(DEVICE_PATH)/config/modem/71/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/71/modem.conf \ + $(DEVICE_PATH)/config/modem/73/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/73/modem.conf \ + $(DEVICE_PATH)/config/modem/79/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/79/modem.conf \ + $(DEVICE_PATH)/config/modem/88/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/88/modem.conf \ + $(DEVICE_PATH)/config/modem/92/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/92/modem.conf \ + $(DEVICE_PATH)/config/modem/93/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/93/modem.conf \ + $(DEVICE_PATH)/config/modem/94/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/94/modem.conf \ + $(DEVICE_PATH)/config/modem/114/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/114/modem.conf \ + $(DEVICE_PATH)/config/modem/122/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/122/modem.conf \ + $(DEVICE_PATH)/config/modem/132/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/132/modem.conf \ + $(DEVICE_PATH)/config/modem/133/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/133/modem.conf \ + $(DEVICE_PATH)/config/modem/134/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/134/modem.conf \ + $(DEVICE_PATH)/config/modem/170/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/170/modem.conf \ + $(DEVICE_PATH)/config/modem/177/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/177/modem.conf \ + $(DEVICE_PATH)/config/modem/184/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/184/modem.conf \ + $(DEVICE_PATH)/config/modem/191/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/191/modem.conf \ + $(DEVICE_PATH)/config/modem/192/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/192/modem.conf \ + $(DEVICE_PATH)/config/modem/193/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/193/modem.conf \ + $(DEVICE_PATH)/config/modem/196/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/196/modem.conf \ + $(DEVICE_PATH)/config/modem/198/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/198/modem.conf \ + $(DEVICE_PATH)/config/modem/244/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/244/modem.conf \ + $(DEVICE_PATH)/config/modem/272/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/272/modem.conf \ + $(DEVICE_PATH)/config/modem/273/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/273/modem.conf \ + $(DEVICE_PATH)/config/modem/274/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/274/modem.conf \ + $(DEVICE_PATH)/config/modem/286/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/286/modem.conf \ + $(DEVICE_PATH)/config/modem/297/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/297/modem.conf \ + $(DEVICE_PATH)/config/modem/306/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/306/modem.conf \ + $(DEVICE_PATH)/config/modem/308/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/308/modem.conf \ + $(DEVICE_PATH)/config/modem/310/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/310/modem.conf \ + $(DEVICE_PATH)/config/modem/311/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/311/modem.conf \ + $(DEVICE_PATH)/config/modem/318/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/318/modem.conf \ + $(DEVICE_PATH)/config/modem/326/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/326/modem.conf \ + $(DEVICE_PATH)/config/modem/341/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/341/modem.conf \ + $(DEVICE_PATH)/config/modem/348/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/348/modem.conf \ + $(DEVICE_PATH)/config/modem/350/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/350/modem.conf \ + $(DEVICE_PATH)/config/modem/358/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/358/modem.conf \ + $(DEVICE_PATH)/config/modem/404/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/404/modem.conf \ + $(DEVICE_PATH)/config/modem/408/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/408/modem.conf \ + $(DEVICE_PATH)/config/modem/415/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/415/modem.conf \ + $(DEVICE_PATH)/config/modem/420/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/420/modem.conf \ + $(DEVICE_PATH)/config/modem/424/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/424/modem.conf \ + $(DEVICE_PATH)/config/modem/426/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/426/modem.conf \ + $(DEVICE_PATH)/config/modem/441/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/441/modem.conf \ + $(DEVICE_PATH)/config/modem/442/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/442/modem.conf \ + $(DEVICE_PATH)/config/modem/446/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/446/modem.conf \ + $(DEVICE_PATH)/config/modem/452/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/452/modem.conf \ + $(DEVICE_PATH)/config/modem/461/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/461/modem.conf \ + $(DEVICE_PATH)/config/modem/477/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/477/modem.conf \ + $(DEVICE_PATH)/config/modem/483/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/483/modem.conf \ + $(DEVICE_PATH)/config/modem/489/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/489/modem.conf \ + $(DEVICE_PATH)/config/modem/492/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/492/modem.conf \ + $(DEVICE_PATH)/config/modem/513/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/513/modem.conf \ + $(DEVICE_PATH)/config/modem/523/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/523/modem.conf \ + $(DEVICE_PATH)/config/modem/549/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/549/modem.conf \ + $(DEVICE_PATH)/config/modem/567/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/567/modem.conf \ + $(DEVICE_PATH)/config/modem/611/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/611/modem.conf \ + $(DEVICE_PATH)/config/modem/640/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/640/modem.conf \ + $(DEVICE_PATH)/config/modem/901/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/901/modem.conf \ + $(DEVICE_PATH)/config/modem/903/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/903/modem.conf \ + $(DEVICE_PATH)/config/modem/906/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/906/modem.conf \ + $(DEVICE_PATH)/config/modem/909/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/909/modem.conf \ + $(DEVICE_PATH)/config/modem/910/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/910/modem.conf \ + $(DEVICE_PATH)/config/modem/911/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/911/modem.conf \ + $(DEVICE_PATH)/config/modem/915/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/915/modem.conf \ + $(DEVICE_PATH)/config/modem/928/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/928/modem.conf \ + $(DEVICE_PATH)/config/modem/929/modem.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/customization/modem/929/modem.conf + +### POWER +PRODUCT_COPY_FILES += \ + $(DEVICE_PATH)/config/power/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json diff --git a/device/hardware.mk b/device/hardware.mk new file mode 100644 index 0000000000000000000000000000000000000000..056b510bef62cbf5e511ede6090843634e2fbdb4 --- /dev/null +++ b/device/hardware.mk @@ -0,0 +1,19 @@ +# Copyright (C) 2017 The LineageOS Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# NFC +PRODUCT_PACKAGES += \ + android.hardware.nfc@1.1-service + +TARGET_USE_YOSHINO_LIGHT_SERVICE := true diff --git a/extract-files.sh b/extract-files.sh index 429b31df90e1974c09d84f7574a7eaa0bfd6034c..4f10b8be020b066610bdebe312c1bcd483c2d2f4 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -60,16 +60,6 @@ setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT" false "$CLEAN_VENDOR" extract "$MY_DIR"/proprietary-files.txt "$SRC" "$SECTION" extract "$MY_DIR"/proprietary-files-vendor.txt "$SRC" "$SECTION" -#extract "$MY_DIR"/proprietary-files-rootfs.txt "$SRC" "$SECTION" -extract "$MY_DIR"/proprietary-files-twrp.txt "$SRC" "$SECTION" - -TWRP_QSEECOMD="$LINEAGE_ROOT"/vendor/"$VENDOR"/"$DEVICE"/proprietary/recovery/root/sbin/qseecomd -TWRP_GATEKEEPER_SERVICE="$LINEAGE_ROOT"/vendor/"$VENDOR"/"$DEVICE"/proprietary/recovery/root/sbin/android.hardware.gatekeeper@1.0-service-qti -TWRP_KEYMASTER_SERVICE="$LINEAGE_ROOT"/vendor/"$VENDOR"/"$DEVICE"/proprietary/recovery/root/sbin/android.hardware.keymaster@3.0-service-qti - -sed -i "s|/system/bin/linker64|/sbin/linker64\x0\x0\x0\x0\x0\x0|g" "$TWRP_QSEECOMD" -sed -i "s|/system/bin/linker64|/sbin/linker64\x0\x0\x0\x0\x0\x0|g" "$TWRP_GATEKEEPER_SERVICE" -sed -i "s|/system/bin/linker64|/sbin/linker64\x0\x0\x0\x0\x0\x0|g" "$TWRP_KEYMASTER_SERVICE" # # Fix product path diff --git a/lineage.dependencies b/lineage.dependencies index 50bece9d6cae461c2d782c9299c30dd1e9e35b7b..f839b3f9addf9473ff1e4fc7087553b29b26383b 100644 --- a/lineage.dependencies +++ b/lineage.dependencies @@ -1,10 +1,10 @@ [ { - "repository": "whatawurst/android_kernel_sony_msm8998", + "repository": "Flamefire/android_kernel_sony_msm8998", "target_path": "kernel/sony/msm8998" }, { - "repository": "whatawurst/android_device_sony_yoshino-common", + "repository": "Flamefire/android_device_sony_yoshino-common", "target_path": "device/sony/yoshino-common" } ] diff --git a/lineage_lilac.mk b/lineage_lilac.mk index e6adbcca9d458199f0e1070a5333d6d7bbd5e1ce..720a39195e01f9b719ae4285d2d0c46cb81b3180 100644 --- a/lineage_lilac.mk +++ b/lineage_lilac.mk @@ -27,10 +27,14 @@ PRODUCT_MANUFACTURER := Sony PRODUCT_BUILD_PROP_OVERRIDES += \ PRODUCT_NAME=lilac \ - PRIVATE_BUILD_DESC="G8441-user 9 47.2.A.11.228 3311891731 release-keys" + PRIVATE_BUILD_DESC="G8441-user 9 47.2.A.11.228 3311891731 release-keys" \ + BUILD_NUMBER=3311891731 +# From MagiskHideProps, Stock FP doesn't seem to work BUILD_FINGERPRINT := Sony/G8441/G8441:9/47.2.A.11.228/3311891731:user/release-keys +PRODUCT_GMS_CLIENTID_BASE := android-sony-mobile + ifneq ($(LINEAGE_DEV_CERTIFICATE),) PRODUCT_DEFAULT_DEV_CERTIFICATE := $(LINEAGE_DEV_CERTIFICATE) endif diff --git a/overlay/device/sony/yoshino-common/hardware/OpenCustomizationSelector/res/xml/configuration_selectors.xml b/overlay/device/sony/yoshino-common/hardware/OpenCustomizationSelector/res/xml/configuration_selectors.xml new file mode 100644 index 0000000000000000000000000000000000000000..4fe71199059f42e022c57f07cbbedabc6bad013e --- /dev/null +++ b/overlay/device/sony/yoshino-common/hardware/OpenCustomizationSelector/res/xml/configuration_selectors.xml @@ -0,0 +1,348 @@ + + + + S54.1 + + + S57.1 + + + S75.1 + + + S55.3 + + + S136.1 + + + S114.1 + + + S31.1 + + + S125.1 + + + S260.1 + + + S75.2 + + + S344.1 + + + S346.1 + + + S43.1 + + + S45.1 + + + S44.1 + + + S369.1 + + + S120.1 + + + S367.1 + + + S9064.1 + + + S8683.1 + + + S278.1 + + + S277.1 + + + S280.1 + + + S9065.2 + + + S21.1 + + + S253.1 + + + S252.1 + + + S254.1 + + + S9087.1 + + + S32.1 + + + S261.1 + + + S6552.1 + + + S8765.1 + + + S9089.1 + + + S249.1 + + + S212.1 + + + S537.1 + + + S257.1 + + + S123.1 + + + S122.1 + + + S33.1 + + + S12.1 + + + S173.1 + + + S545.1 + S545.2 + + + S77.1 + S77.2 + S77.3 + + + S20.1 + S8773.1 + + + S284.1 + S284.2 + S284.3 + S284.4 + S284.5 + + + S58.1 + + + S523.1 + S523.2 + S523.3 + S523.4 + S523.5 + S523.6 + S523.7 + S523.8 + S523.9 + S523.10 + S523.11 + S523.12 + S523.13 + S523.14 + S523.15 + S523.16 + S523.17 + S523.18 + S523.19 + S523.20 + S523.21 + S523.22 + + + S8760.1 + + + S8626.2 + S8626.4 + + + S523.45 + S523.46 + S523.47 + S523.48 + S523.49 + S523.50 + S523.51 + S523.52 + S523.53 + S523.54 + S523.55 + S523.56 + S523.57 + S523.58 + S523.59 + S523.60 + S523.61 + S523.62 + S523.63 + S523.64 + S523.65 + S523.66 + + + S221.4 + S221.5 + + + S264.1 + S264.2 + S264.3 + S264.4 + S264.5 + S264.6 + S264.7 + S264.8 + S264.9 + S264.10 + S264.11 + S264.12 + S264.13 + S264.14 + S264.15 + S264.16 + S264.17 + S264.18 + S8663.1 + + + S74.1 + + + S256.1 + + + S219.1 + + + S283.1 + + + S687.2 + + + S687.1 + + + S9111.1 + + + S9112.1 + + + S6.5 + S6.6 + S6.7 + S6.8 + S6.9 + S6.10 + + + S187.1 + S187.5 + S187.7 + + + S8655.1 + S8655.4 + S8655.5 + S8655.6 + S8655.7 + S8960.1 + S8960.2 + + + S9126.1 + S9126.2 + + + S218.1 + S9116.1 + + + S137.1 + + + S46.1 + + + S22.1 + S22.2 + S22.3 + S22.4 + + + S8779.1 + S8779.6 + + + S59.1 + S59.2 + S9105.1 + + + S366.2 + S366.4 + S366.5 + S366.6 + S366.7 + S366.19 + + + S175.1 + + + S273.1 + + + S176.1 + + + S174.1 + + + S206.1 + + + S23.1 + + + S26.1 + + + S285.1 + S285.2 + S285.3 + + + S8760.1 + S8760.2 + + diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 17ad6e7aae4a98421b95a9bedeb3c9badd854e6e..eb2c80f25d79584b44f4be349f81f4d578c05874 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -190,8 +190,13 @@ in darkness (although they may not be visible in a bright room). --> 1 + + true + SonyG8441 - http://uaprof.sonymobile.com/G8441R4711.xml + http://uaprof.sonymobile.com/G8441R4721.xml diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/lineage_config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/lineage_config.xml new file mode 100644 index 0000000000000000000000000000000000000000..20a83f938f64d7327a575ac1d37bc77b3957cd7e --- /dev/null +++ b/overlay/frameworks/base/packages/SystemUI/res/values/lineage_config.xml @@ -0,0 +1,20 @@ + + + + + false + diff --git a/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml b/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml index 6a817cae63739a481c1f6c76269577facd53e6fe..9d00ac8807b36f0c5e08060aab308ff0433091dc 100755 --- a/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml +++ b/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml @@ -55,7 +55,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.--> 2 2 - + @@ -108,11 +108,55 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.--> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -153,6 +197,14 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.--> + + + + + + + + @@ -185,18 +237,31 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.--> - + + + + + + + + + + + + + + @@ -242,6 +307,12 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.--> + + + + + + @@ -251,7 +322,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.--> - @@ -297,6 +367,36 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.--> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -331,12 +431,16 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.--> - - + + + + - - + + + + @@ -370,6 +474,38 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.--> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -444,6 +580,14 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.--> + + + + + + + + @@ -512,6 +656,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.--> + @@ -520,10 +665,12 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.--> + + @@ -532,137 +679,702 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.--> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + @@ -733,9 +1445,49 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.--> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -784,4 +1536,66 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.--> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/patches/0001-keystore-Block-key-attestation-for-Google-Play-Servi.patch b/patches/0001-keystore-Block-key-attestation-for-Google-Play-Servi.patch new file mode 100644 index 0000000000000000000000000000000000000000..08fcfc993122eb7ac9fe932e9a3c791d466bbf50 --- /dev/null +++ b/patches/0001-keystore-Block-key-attestation-for-Google-Play-Servi.patch @@ -0,0 +1,90 @@ +# PWD: system/security + +From 9dd88a70668da3d7b0581489d55d0d1a2ced2f5c Mon Sep 17 00:00:00 2001 +From: Danny Lin +Date: Wed, 13 Jan 2021 02:05:05 -0800 +Subject: [PATCH] keystore: Block key attestation for Google Play Services + +In order to enforce SafetyNet security, Google Play Services is now +using hardware attestation for ctsProfile validation in all cases, even +when basic attestation is selected. The SafetyNet API response from GMS +will report that basic attestation was used, but under the hood, +hardware attestation is always used regardless of the reported state. +This results in SafetyNet failing to pass due to TrustZone reporting an +unlocked bootloader (and a partially invalidated root of trust) in the +key attestation result. + +We can still take advantage of the fact that this usage of hardware +attestation is opportunistic - that is, it falls back to basic +attestation if key attestation fails to run - and prevent GMS from using +key attestation at the framework level. This causes it to gracefully +fall back to basic attestation and pass SafetyNet with an unlocked +bootloader. + +Key attestation is still available for other apps, as there are valid +uses for it that do not involve SafetyNet. + +The "not implemented" error code from keymaster is used to simulate the +most realistic failure condition to evade detection, i.e. an old device +that lacks support for key attestation. + +Change-Id: Iba5fe0791622839e1bad4730593a319ea03661f2 +--- + keystore/key_store_service.cpp | 9 +++++++-- + keystore/keystore_attestation_id.cpp | 6 ++++++ + 2 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp +index b6b7295..40550a7 100644 +--- a/keystore/key_store_service.cpp ++++ b/keystore/key_store_service.cpp +@@ -48,6 +48,7 @@ + #include + + #include ++#include + + namespace keystore { + +@@ -122,8 +123,12 @@ KeyStoreServiceReturnCode updateParamsForAttestation(uid_t callingUid, Authoriza + + auto asn1_attestation_id_result = security::gather_attestation_application_id(callingUid); + if (!asn1_attestation_id_result.isOk()) { +- ALOGE("failed to gather attestation_id"); +- return ErrorCode::ATTESTATION_APPLICATION_ID_MISSING; ++ if (asn1_attestation_id_result.status() == KM_ERROR_UNIMPLEMENTED) { ++ return KeyStoreServiceReturnCode(KM_ERROR_UNIMPLEMENTED); ++ } else { ++ ALOGE("failed to gather attestation_id"); ++ return ErrorCode::ATTESTATION_APPLICATION_ID_MISSING; ++ } + } + std::vector& asn1_attestation_id = asn1_attestation_id_result; + +diff --git a/keystore/keystore_attestation_id.cpp b/keystore/keystore_attestation_id.cpp +index b48639f..1f1f79b 100644 +--- a/keystore/keystore_attestation_id.cpp ++++ b/keystore/keystore_attestation_id.cpp +@@ -34,6 +34,8 @@ + #include + #include + ++#include ++ + #include /* for AID_SYSTEM */ + + #include +@@ -209,6 +211,10 @@ build_attestation_application_id(const KeyAttestationApplicationId& key_attestat + return BAD_VALUE; + } + std::string package_name(String8(*pinfo->package_name()).string()); ++ // Prevent Google Play Services from using key attestation for SafetyNet ++ if (package_name == "com.google.android.gms") { ++ return KM_ERROR_UNIMPLEMENTED; ++ } + std::unique_ptr attestation_package_info; + auto rc = build_attestation_package_info(*pinfo, &attestation_package_info); + if (rc != NO_ERROR) { +-- +2.29.2 + diff --git a/patches/add-missing-nothrow.patch b/patches/add-missing-nothrow.patch new file mode 100644 index 0000000000000000000000000000000000000000..0a5268d69b032916cf61a040d5db8b05aaae7730 --- /dev/null +++ b/patches/add-missing-nothrow.patch @@ -0,0 +1,15 @@ +# PWD: bionic + +diff --git a/libc/bionic/jemalloc.h b/libc/bionic/jemalloc.h +index b9a4e993c..ef77c9c99 100644 +--- a/libc/bionic/jemalloc.h ++++ b/libc/bionic/jemalloc.h +@@ -30,7 +30,7 @@ __BEGIN_DECLS + + void* je_aligned_alloc_wrapper(size_t, size_t); + int je_iterate(uintptr_t, size_t, void (*)(uintptr_t, size_t, void*), void*); +-int je_mallctl(const char *name, void *oldp, size_t *oldlenp, void *newp, size_t newlen); ++int je_mallctl(const char *name, void *oldp, size_t *oldlenp, void *newp, size_t newlen) __attribute__((nothrow)); + struct mallinfo je_mallinfo(); + void je_malloc_disable(); + void je_malloc_enable(); diff --git a/patches/add-network-stack-permission.patch b/patches/add-network-stack-permission.patch new file mode 100644 index 0000000000000000000000000000000000000000..6adbb1d214207473028cd968c693c20a7c66be10 --- /dev/null +++ b/patches/add-network-stack-permission.patch @@ -0,0 +1,13 @@ +# PWD: packages/modules/NetworkStack +diff --git a/AndroidManifest.xml b/AndroidManifest.xml +index 5dcf27e..ad41896 100644 +--- a/AndroidManifest.xml ++++ b/AndroidManifest.xml +@@ -41,6 +41,7 @@ + + + ++ + diff --git a/patches/allow-whitelisting-of-default-apps.patch b/patches/allow-whitelisting-of-default-apps.patch new file mode 100644 index 0000000000000000000000000000000000000000..06652873f53dbbf38868f6a672e10507e63abf90 --- /dev/null +++ b/patches/allow-whitelisting-of-default-apps.patch @@ -0,0 +1,44 @@ +# PWD: packages/apps/Settings +diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java +index 545115d897..7f9ea6f9c2 100644 +--- a/src/com/android/settings/applications/manageapplications/ManageApplications.java ++++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java +@@ -1392,8 +1392,7 @@ public class ManageApplications extends InstrumentedFragment + } + ApplicationsState.AppEntry entry = mEntries.get(position); + +- return !mBackend.isSysWhitelisted(entry.info.packageName) +- && !mBackend.isDefaultActiveApp(entry.info.packageName); ++ return !mBackend.isSysWhitelisted(entry.info.packageName); + } + + @Override +diff --git a/src/com/android/settings/fuelgauge/HighPowerDetail.java b/src/com/android/settings/fuelgauge/HighPowerDetail.java +index 6448d9a226..7f7edb6882 100644 +--- a/src/com/android/settings/fuelgauge/HighPowerDetail.java ++++ b/src/com/android/settings/fuelgauge/HighPowerDetail.java +@@ -180,7 +180,7 @@ public class HighPowerDetail extends InstrumentedDialogFragment implements OnCli + static CharSequence getSummary(Context context, PowerWhitelistBackend powerWhitelist, + String pkg) { + return context.getString( +- powerWhitelist.isSysWhitelisted(pkg) || powerWhitelist.isDefaultActiveApp(pkg) ++ powerWhitelist.isSysWhitelisted(pkg) + ? R.string.high_power_system + : powerWhitelist.isWhitelisted(pkg) + ? R.string.high_power_on +diff --git a/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java +index e613684ef0..02d55da360 100644 +--- a/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java ++++ b/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java +@@ -91,11 +91,4 @@ public class HighPowerDetailTest { + AppOpsManager.MODE_ALLOWED); + } + +- @Test +- public void getSummary_defaultActivePackage_returnUnavailable() { +- doReturn(true).when(mPowerWhitelistBackend).isDefaultActiveApp(TEST_PACKAGE); +- +- assertThat(HighPowerDetail.getSummary(mContext, mPowerWhitelistBackend, TEST_PACKAGE)) +- .isEqualTo(mContext.getString(R.string.high_power_system)); +- } + } diff --git a/patches/applyPatches.sh b/patches/applyPatches.sh new file mode 100755 index 0000000000000000000000000000000000000000..e080053f0ba0361edb0003b907fbcfc74a0fc543 --- /dev/null +++ b/patches/applyPatches.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +# Apply patches to other repos +# Needs to be run from within repo and with envsetup sourced + +set -euo pipefail + +PATCH_ROOT="$ANDROID_BUILD_TOP/device/sony/lilac/patches" + +numApplied=0 +numSkipped=0 +numWarned=0 + +for p in "$PATCH_ROOT/"*.patch; do + patch_dir=$(head -n1 "$p" | grep "# PWD: " | awk '{print $NF}') + if [[ "$patch_dir" == "" ]]; then + echo "Faulty patch: $p" + exit 1 + fi + + echo -n "Applying $(basename "$p") in $patch_dir : " + # If the reverse patch could be applied, then the patch was likely already applied + patch --reverse --force -p1 -d "$patch_dir" --input "$p" --dry-run > /dev/null && applied=1 || applied=0 + if out=$(patch --forward -p1 -d "$patch_dir" --input "$p" -r /dev/null --no-backup-if-mismatch 2>&1); then + echo "Done." + ((++numApplied)) + # We applied the patch but could apply the reverse before, i.e. would detect it as already applied. + # This may happen for patches only deleting stuff where the reverse (adding it) may succeed via fuzzy match + if [[ $applied == 1 ]]; then + echo "WARNING: Skip detection will not work correctly for this patch!" + ((++numWarned)) + fi + elif [[ $applied == 1 ]]; then + echo "Skipped." + ((++numSkipped)) + else + echo "Failed!" + echo "$out" + exit 1 + fi +done + +echo "Patching done! Applied: $numApplied, skipped: $numSkipped, warnings: $numWarned" diff --git a/patches/dont-assume-default-apps-are-whitelisted.patch b/patches/dont-assume-default-apps-are-whitelisted.patch new file mode 100644 index 0000000000000000000000000000000000000000..b667a4c629071d96e6ae73bcb7fd5f28b781826b --- /dev/null +++ b/patches/dont-assume-default-apps-are-whitelisted.patch @@ -0,0 +1,22 @@ +# PWD: frameworks/base +diff --git a/packages/SettingsLib/src/com/android/settingslib/fuelgauge/PowerWhitelistBackend.java b/packages/SettingsLib/src/com/android/settingslib/fuelgauge/PowerWhitelistBackend.java +index ea8a62f84164..213ab2c6ff2f 100644 +--- a/packages/SettingsLib/src/com/android/settingslib/fuelgauge/PowerWhitelistBackend.java ++++ b/packages/SettingsLib/src/com/android/settingslib/fuelgauge/PowerWhitelistBackend.java +@@ -72,15 +72,7 @@ public class PowerWhitelistBackend { + } + + public boolean isWhitelisted(String pkg) { +- if (mWhitelistedApps.contains(pkg)) { +- return true; +- } +- +- if (isDefaultActiveApp(pkg)) { +- return true; +- } +- +- return false; ++ return mWhitelistedApps.contains(pkg); + } + + /** diff --git a/patches/dont-export-libm-libc-symbols.patch b/patches/dont-export-libm-libc-symbols.patch new file mode 100644 index 0000000000000000000000000000000000000000..82b02ce38f0292b9d49cb37ae522cdc38e581f9b --- /dev/null +++ b/patches/dont-export-libm-libc-symbols.patch @@ -0,0 +1,137 @@ +# PWD: bionic + +diff --git a/libc/libc.map.txt b/libc/libc.map.txt +index 88192239a..5cf98ded3 100644 +--- a/libc/libc.map.txt ++++ b/libc/libc.map.txt +@@ -1482,11 +1482,6 @@ LIBC_Q { # introduced=Q + + LIBC_PRIVATE { + global: +- ___Unwind_Backtrace; # arm +- ___Unwind_ForcedUnwind; # arm +- ___Unwind_RaiseException; # arm +- ___Unwind_Resume; # arm +- ___Unwind_Resume_or_Rethrow; # arm + __accept4; # arm x86 mips + __adddf3; # arm + __addsf3; # arm +@@ -1596,24 +1591,8 @@ LIBC_PRIVATE { + __getdents64; # arm x86 mips + __gnu_ldivmod_helper; # arm + __gnu_uldivmod_helper; # arm +- __gnu_Unwind_Backtrace; # arm +- __gnu_unwind_execute; # arm + __gnu_Unwind_Find_exidx; # arm +- __gnu_Unwind_ForcedUnwind; # arm + __gnu_unwind_frame; # arm +- __gnu_Unwind_RaiseException; # arm +- __gnu_Unwind_Restore_VFP; # arm +- __gnu_Unwind_Restore_VFP_D; # arm +- __gnu_Unwind_Restore_VFP_D_16_to_31; # arm +- __gnu_Unwind_Restore_WMMXC; # arm +- __gnu_Unwind_Restore_WMMXD; # arm +- __gnu_Unwind_Resume; # arm +- __gnu_Unwind_Resume_or_Rethrow; # arm +- __gnu_Unwind_Save_VFP; # arm +- __gnu_Unwind_Save_VFP_D; # arm +- __gnu_Unwind_Save_VFP_D_16_to_31; # arm +- __gnu_Unwind_Save_WMMXC; # arm +- __gnu_Unwind_Save_WMMXD; # arm + __gtdf2; # arm + __gtsf2; # arm + __ledf2; # arm +@@ -1632,7 +1611,6 @@ LIBC_PRIVATE { + __popcount_tab; # arm + __popcountsi2; # arm x86 mips + __pthread_gettid; # arm x86 mips +- __restore_core_regs; # arm + __sclose; # arm x86 mips + __sdidinit; # arm x86 mips + __set_errno; # arm x86 mips +@@ -1662,8 +1640,6 @@ LIBC_PRIVATE { + _Unwind_Backtrace; # arm + _Unwind_Complete; # arm + _Unwind_DeleteException; # arm +- _Unwind_ForcedUnwind; # arm +- _Unwind_GetCFA; # arm + _Unwind_GetDataRelBase; # arm + _Unwind_GetLanguageSpecificData; # arm + _Unwind_GetRegionStart; # arm +@@ -1672,7 +1648,6 @@ LIBC_PRIVATE { + _Unwind_Resume; # arm + _Unwind_Resume_or_Rethrow; # arm + _Unwind_VRS_Get; # arm +- _Unwind_VRS_Pop; # arm + _Unwind_VRS_Set; # arm + android_getaddrinfofornetcontext; + android_gethostbyaddrfornet; +@@ -1696,7 +1671,6 @@ LIBC_PRIVATE { + memswap; # arm x86 mips + pthread_attr_getstackaddr; # arm x86 mips + pthread_attr_setstackaddr; # arm x86 mips +- restore_core_regs; # arm + SHA1Final; # arm x86 mips + SHA1Init; # arm x86 mips + SHA1Transform; # arm x86 mips +diff --git a/libm/libm.map.txt b/libm/libm.map.txt +index 00ea7eef3..24ae50b26 100644 +--- a/libm/libm.map.txt ++++ b/libm/libm.map.txt +@@ -296,56 +296,14 @@ LIBC_O { # introduced=O + + LIBC_DEPRECATED { # arm mips platform-only + global: # arm mips +- ___Unwind_Backtrace; # arm +- ___Unwind_ForcedUnwind; # arm +- ___Unwind_RaiseException; # arm +- ___Unwind_Resume; # arm +- ___Unwind_Resume_or_Rethrow; # arm + __aeabi_d2lz; # arm + __aeabi_d2ulz; # arm + __aeabi_f2lz; # arm + __aeabi_f2ulz; # arm + __aeabi_l2d; # arm +- __aeabi_unwind_cpp_pr0; # arm +- __aeabi_unwind_cpp_pr1; # arm +- __aeabi_unwind_cpp_pr2; # arm + __fixdfdi; # arm mips + __fixsfdi; # arm mips + __fixunsdfdi; # arm mips + __fixunssfdi; # arm mips + __floatdidf; # arm +- __gnu_Unwind_Backtrace; # arm +- __gnu_unwind_execute; # arm +- __gnu_Unwind_ForcedUnwind; # arm +- __gnu_unwind_frame; # arm +- __gnu_Unwind_RaiseException; # arm +- __gnu_Unwind_Restore_VFP; # arm +- __gnu_Unwind_Restore_VFP_D; # arm +- __gnu_Unwind_Restore_VFP_D_16_to_31; # arm +- __gnu_Unwind_Restore_WMMXC; # arm +- __gnu_Unwind_Restore_WMMXD; # arm +- __gnu_Unwind_Resume; # arm +- __gnu_Unwind_Resume_or_Rethrow; # arm +- __gnu_Unwind_Save_VFP; # arm +- __gnu_Unwind_Save_VFP_D; # arm +- __gnu_Unwind_Save_VFP_D_16_to_31; # arm +- __gnu_Unwind_Save_WMMXC; # arm +- __gnu_Unwind_Save_WMMXD; # arm +- __restore_core_regs; # arm +- _Unwind_Backtrace; # arm +- _Unwind_Complete; # arm +- _Unwind_DeleteException; # arm +- _Unwind_ForcedUnwind; # arm +- _Unwind_GetCFA; # arm +- _Unwind_GetDataRelBase; # arm +- _Unwind_GetLanguageSpecificData; # arm +- _Unwind_GetRegionStart; # arm +- _Unwind_GetTextRelBase; # arm +- _Unwind_RaiseException; # arm +- _Unwind_Resume; # arm +- _Unwind_Resume_or_Rethrow; # arm +- _Unwind_VRS_Get; # arm +- _Unwind_VRS_Pop; # arm +- _Unwind_VRS_Set; # arm +- restore_core_regs; # arm + } LIBC_O; # arm mips diff --git a/patches/fix-RVO-in-bandwidthcontroller.patch b/patches/fix-RVO-in-bandwidthcontroller.patch new file mode 100644 index 0000000000000000000000000000000000000000..046b13be7152471be61ad540e642865b52068c51 --- /dev/null +++ b/patches/fix-RVO-in-bandwidthcontroller.patch @@ -0,0 +1,43 @@ +# PWD: system/netd + +commit f580db2ae0d34b426be39bb15f7cef059fda9a64 +Author: Treehugger Robot +Date: Thu Apr 30 00:42:33 2020 +0000 + + BandwidthController: fix performance-no-automatic-move warning. + + In the next compiler update, it reports the below warning as error: + + system/netd/server/BandwidthController.cpp:263:12: error: + constness of 'ipt_basic_accounting_commands' prevents automatic move + [performance-no-automatic-move,-warnings-as-errors] + return ipt_basic_accounting_commands; + + Bug: 149839606 + Test: build. + Change-Id: I32ee491b0de6a986dc66de06a4f56d980f794136 + Merged-In: I32ee491b0de6a986dc66de06a4f56d980f794136 + +diff --git a/server/BandwidthController.cpp b/server/BandwidthController.cpp +index cddaa961..a179872c 100644 +--- a/server/BandwidthController.cpp ++++ b/server/BandwidthController.cpp +@@ -212,8 +212,8 @@ static const uint32_t uidBillingMask = Fwmark::getUidBillingMask(); + * See go/ipsec-data-accounting for more information. + */ + +-const std::vector getBasicAccountingCommands(const bool useBpf) { +- const std::vector ipt_basic_accounting_commands = { ++std::vector getBasicAccountingCommands(const bool useBpf) { ++ std::vector ipt_basic_accounting_commands = { + "*filter", + + "-A bw_INPUT -j bw_global_alert", +@@ -263,7 +263,6 @@ const std::vector getBasicAccountingCommands(const bool useBpf) { + return ipt_basic_accounting_commands; + } + +- + std::vector toStrVec(int num, const char* const strs[]) { + return std::vector(strs, strs + num); + } diff --git a/patches/fix-class-templates.patch b/patches/fix-class-templates.patch new file mode 100644 index 0000000000000000000000000000000000000000..3585494c1d8cc75002461a96d2585f215cc2833a --- /dev/null +++ b/patches/fix-class-templates.patch @@ -0,0 +1,70 @@ +# PWD: libnativehelper + +diff --git a/platform_include/nativehelper/detail/signature_checker.h b/platform_include/nativehelper/detail/signature_checker.h +index 7c2a7fc..06ebfa4 100644 +--- a/platform_include/nativehelper/detail/signature_checker.h ++++ b/platform_include/nativehelper/detail/signature_checker.h +@@ -951,10 +951,10 @@ struct is_valid_jni_argument_type { + }; + + // This helper is required to decompose the function type into a list of arg types. +-template ++template + struct is_valid_jni_function_type_helper; + +-template ++template + struct is_valid_jni_function_type_helper { + static constexpr bool value = + IsJniParameterCountValid(native_kind, sizeof...(Args)) +@@ -965,7 +965,7 @@ struct is_valid_jni_function_type_helper { + }; + + // Is this function type 'T' a valid C++ function type given the native_kind? +-template ++template + constexpr bool IsValidJniFunctionType() { + return is_valid_jni_function_type_helper::value; + // TODO: we could replace template metaprogramming with constexpr by +@@ -1036,12 +1036,12 @@ constexpr auto MakeArray(Args&& ... args) { + } + + // See below. +-template ++template + struct FunctionTypeMetafunction { + }; + + // Enables the "map" operation over the function component types. +-template ++template + struct FunctionTypeMetafunction { + // Count how many arguments there are, and add 1 for the return type. + static constexpr size_t +@@ -1107,7 +1107,7 @@ using ReifiedJniSignature = FunctionSignatureDescriptor returns nullopt (test behavior). + template ::count> + constexpr ConstexprOptional> + MaybeMakeReifiedJniSignature() { +@@ -1218,7 +1218,7 @@ CompareJniDescriptorNodeErased(JniDescriptorNode user_defined_descriptor, + // If matches fails, then: + // parses are fatal -> assertion is triggered (default behavior), + // parses are nonfatal -> returns false (test behavior). +-template ++template + constexpr bool + MatchJniDescriptorWithFunctionType(ConstexprStringView user_function_descriptor) { + constexpr size_t kReifiedMaxSize = FunctionTypeMetafunction::count; +@@ -1267,7 +1267,7 @@ MatchJniDescriptorWithFunctionType(ConstexprStringView user_function_descriptor) + + // Supports inferring the JNI function descriptor string from the C++ + // function type when all type components are final. +-template ++template + struct InferJniDescriptor { + static constexpr size_t kMaxSize = FunctionTypeMetafunction::count; + diff --git a/patches/fix-dangling-pointer.patch b/patches/fix-dangling-pointer.patch new file mode 100644 index 0000000000000000000000000000000000000000..11744fb052d7cd09c12f8b0fe32916864815281a --- /dev/null +++ b/patches/fix-dangling-pointer.patch @@ -0,0 +1,37 @@ +# PWD: vendor/qcom/opensource/audio + +diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp +index 48f7a53..72d38fc 100755 +--- a/policy_hal/AudioPolicyManager.cpp ++++ b/policy_hal/AudioPolicyManager.cpp +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2013-2019 The Linux Foundation. All rights reserved. ++ * Copyright (c) 2013-2020 The Linux Foundation. All rights reserved. + * Not a contribution. + * + * Copyright (C) 2009 The Android Open Source Project +@@ -58,18 +58,18 @@ sp AudioPolicyManagerCustom::mApmConfigs = new APMConfigHelper( + audio_output_flags_t AudioPolicyManagerCustom::getFallBackPath() + { + audio_output_flags_t flag = AUDIO_OUTPUT_FLAG_FAST; +- const char *fallback_path = mApmConfigs->getVoiceConcFallbackPath().c_str(); ++ const std::string fallback_path = mApmConfigs->getVoiceConcFallbackPath(); + +- if (strlen(fallback_path) > 0) { +- if (!strncmp(fallback_path, "deep-buffer", 11)) { ++ if (!fallback_path.empty()) { ++ if (fallback_path == "deep-buffer") { + flag = AUDIO_OUTPUT_FLAG_DEEP_BUFFER; + } +- else if (!strncmp(fallback_path, "fast", 4)) { ++ else if (fallback_path == "fast") { + flag = AUDIO_OUTPUT_FLAG_FAST; + } + else { + ALOGD("voice_conc:not a recognised path(%s) in prop vendor.voice.conc.fallbackpath", +- fallback_path); ++ fallback_path.c_str()); + } + } + else { diff --git a/patches/fix-fallthrough-in-keymaster.patch b/patches/fix-fallthrough-in-keymaster.patch new file mode 100644 index 0000000000000000000000000000000000000000..25f1a13799e41f1c7416b89756410b953c96994a --- /dev/null +++ b/patches/fix-fallthrough-in-keymaster.patch @@ -0,0 +1,103 @@ +# PWD: system/keymaster + +diff --git a/key_blob_utils/ocb.c b/key_blob_utils/ocb.c +index 9a68182..299a0dd 100644 +--- a/key_blob_utils/ocb.c ++++ b/key_blob_utils/ocb.c +@@ -335,6 +335,16 @@ static inline block double_block(block b) { + + #endif + ++#ifndef __has_attribute ++#define __has_attribute(x) 0 ++#endif ++ ++#if __has_attribute(fallthrough) ++#define __fallthrough __attribute__((__fallthrough__)); ++#else ++#define __fallthrough ++#endif ++ + /* ----------------------------------------------------------------------- */ + /* AES - Code uses OpenSSL API. Other implementations get mapped to it. */ + /* ----------------------------------------------------------------------- */ +@@ -894,19 +904,26 @@ static void process_ad(ae_ctx* ctx, const void* ad, int ad_len, int final) { + #if (BPI == 8) + case 8: + ad_checksum = xor_block(ad_checksum, ta[7]); ++ __fallthrough; + case 7: + ad_checksum = xor_block(ad_checksum, ta[6]); ++ __fallthrough; + case 6: + ad_checksum = xor_block(ad_checksum, ta[5]); ++ __fallthrough; + case 5: + ad_checksum = xor_block(ad_checksum, ta[4]); ++ __fallthrough; + #endif + case 4: + ad_checksum = xor_block(ad_checksum, ta[3]); ++ __fallthrough; + case 3: + ad_checksum = xor_block(ad_checksum, ta[2]); ++ __fallthrough; + case 2: + ad_checksum = xor_block(ad_checksum, ta[1]); ++ __fallthrough; + case 1: + ad_checksum = xor_block(ad_checksum, ta[0]); + } +@@ -1066,17 +1083,23 @@ int ae_encrypt(ae_ctx* ctx, const void* nonce, const void* pt, int pt_len, const + #if (BPI == 8) + case 7: + ctp[6] = xor_block(ta[6], oa[6]); ++ __fallthrough; + case 6: + ctp[5] = xor_block(ta[5], oa[5]); ++ __fallthrough; + case 5: + ctp[4] = xor_block(ta[4], oa[4]); ++ __fallthrough; + case 4: + ctp[3] = xor_block(ta[3], oa[3]); ++ __fallthrough; + #endif + case 3: + ctp[2] = xor_block(ta[2], oa[2]); ++ __fallthrough; + case 2: + ctp[1] = xor_block(ta[1], oa[1]); ++ __fallthrough; + case 1: + ctp[0] = xor_block(ta[0], oa[0]); + } +@@ -1273,22 +1296,28 @@ int ae_decrypt(ae_ctx* ctx, const void* nonce, const void* ct, int ct_len, const + case 7: + ptp[6] = xor_block(ta[6], oa[6]); + checksum = xor_block(checksum, ptp[6]); ++ __fallthrough; + case 6: + ptp[5] = xor_block(ta[5], oa[5]); + checksum = xor_block(checksum, ptp[5]); ++ __fallthrough; + case 5: + ptp[4] = xor_block(ta[4], oa[4]); + checksum = xor_block(checksum, ptp[4]); ++ __fallthrough; + case 4: + ptp[3] = xor_block(ta[3], oa[3]); + checksum = xor_block(checksum, ptp[3]); ++ __fallthrough; + #endif + case 3: + ptp[2] = xor_block(ta[2], oa[2]); + checksum = xor_block(checksum, ptp[2]); ++ __fallthrough; + case 2: + ptp[1] = xor_block(ta[1], oa[1]); + checksum = xor_block(checksum, ptp[1]); ++ __fallthrough; + case 1: + ptp[0] = xor_block(ta[0], oa[0]); + checksum = xor_block(checksum, ptp[0]); diff --git a/patches/fix-llvm-unwind-warning-and-findUnwindSections.patch b/patches/fix-llvm-unwind-warning-and-findUnwindSections.patch new file mode 100644 index 0000000000000000000000000000000000000000..8801c4b151351af36a667ddcbe57d1963e1c5f21 --- /dev/null +++ b/patches/fix-llvm-unwind-warning-and-findUnwindSections.patch @@ -0,0 +1,65 @@ +# PWD: external/libunwind_llvm + +diff --git a/Android.bp b/Android.bp +index 61709d6..f7c517f 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -46,6 +46,7 @@ LIBUNWIND_CPPFLAGS = [ + "-Wno-unused-function", + "-Wno-unused-parameter", + "-Wno-unused-local-typedef", ++ "-Wno-bitwise-conditional-parentheses", // in src/UnwindCursor.hpp:1437 + ] + + cc_library_static { +diff --git a/src/AddressSpace.hpp b/src/AddressSpace.hpp +index fb370ad..18e7228 100644 +--- a/src/AddressSpace.hpp ++++ b/src/AddressSpace.hpp +@@ -29,6 +29,13 @@ + #include + #endif + ++#if defined(_LIBUNWIND_ARM_EHABI) ++struct EHABIIndexEntry { ++ uint32_t functionOffset; ++ uint32_t data; ++}; ++#endif ++ + #ifdef __APPLE__ + #include + namespace libunwind { +@@ -459,12 +466,13 @@ inline bool LocalAddressSpace::findUnwindSections(pint_t targetAddr, + (void)targetAddr; + (void)info; + return true; +-#elif defined(_LIBUNWIND_ARM_EHABI) && defined(__BIONIC__) && \ +- (__ANDROID_API__ < 21) ++#elif defined(_LIBUNWIND_ARM_EHABI) && defined(__BIONIC__) ++ // For ARM EHABI, Bionic didn't implement dl_iterate_phdr until API 21. After ++ // API 21, dl_iterate_phdr exists, but dl_unwind_find_exidx is much faster. + int length = 0; + info.arm_section = + (uintptr_t)dl_unwind_find_exidx((_Unwind_Ptr)targetAddr, &length); +- info.arm_section_length = (uintptr_t)length; ++ info.arm_section_length = (uintptr_t)length * sizeof(EHABIIndexEntry); + if (info.arm_section && info.arm_section_length) + return true; + #elif defined(_LIBUNWIND_ARM_EHABI) || defined(_LIBUNWIND_SUPPORT_DWARF_UNWIND) +diff --git a/src/UnwindCursor.hpp b/src/UnwindCursor.hpp +index 836de38..e2de6d5 100644 +--- a/src/UnwindCursor.hpp ++++ b/src/UnwindCursor.hpp +@@ -1222,11 +1222,6 @@ template bool UnwindCursor::isSignalFrame() { + #endif // defined(_LIBUNWIND_SUPPORT_SEH_UNWIND) + + #if defined(_LIBUNWIND_ARM_EHABI) +-struct EHABIIndexEntry { +- uint32_t functionOffset; +- uint32_t data; +-}; +- + template + struct EHABISectionIterator { + typedef EHABISectionIterator _Self; diff --git a/patches/fix-mediaplayer2-flags.patch b/patches/fix-mediaplayer2-flags.patch new file mode 100644 index 0000000000000000000000000000000000000000..695d7a489f420a009f10e333f0f843a300da3411 --- /dev/null +++ b/patches/fix-mediaplayer2-flags.patch @@ -0,0 +1,37 @@ +# PWD: frameworks/av + +diff --git a/media/libmediaplayer2/JAudioTrack.cpp b/media/libmediaplayer2/JAudioTrack.cpp +index fab6c649fc..be91e9a920 100644 +--- a/media/libmediaplayer2/JAudioTrack.cpp ++++ b/media/libmediaplayer2/JAudioTrack.cpp +@@ -695,26 +695,26 @@ jobject JAudioTrack::createVolumeShaperOperationObj( + jBuilderObj = env->CallObjectMethod(jBuilderCls, jReplace, operation->getReplaceId(), join); + } + +- if (flags | media::VolumeShaper::Operation::FLAG_REVERSE) { ++ if (flags & media::VolumeShaper::Operation::FLAG_REVERSE) { + jmethodID jReverse = env->GetMethodID(jBuilderCls, "reverse", + "()Landroid/media/VolumeShaper$Operation$Builder;"); + jBuilderObj = env->CallObjectMethod(jBuilderCls, jReverse); + } + + // TODO: VolumeShaper Javadoc says "Do not call terminate() directly". Can we call this? +- if (flags | media::VolumeShaper::Operation::FLAG_TERMINATE) { ++ if (flags & media::VolumeShaper::Operation::FLAG_TERMINATE) { + jmethodID jTerminate = env->GetMethodID(jBuilderCls, "terminate", + "()Landroid/media/VolumeShaper$Operation$Builder;"); + jBuilderObj = env->CallObjectMethod(jBuilderCls, jTerminate); + } + +- if (flags | media::VolumeShaper::Operation::FLAG_DELAY) { ++ if (flags & media::VolumeShaper::Operation::FLAG_DELAY) { + jmethodID jDefer = env->GetMethodID(jBuilderCls, "defer", + "()Landroid/media/VolumeShaper$Operation$Builder;"); + jBuilderObj = env->CallObjectMethod(jBuilderCls, jDefer); + } + +- if (flags | media::VolumeShaper::Operation::FLAG_CREATE_IF_NECESSARY) { ++ if (flags & media::VolumeShaper::Operation::FLAG_CREATE_IF_NECESSARY) { + jmethodID jCreateIfNeeded = env->GetMethodID(jBuilderCls, "createIfNeeded", + "()Landroid/media/VolumeShaper$Operation$Builder;"); + jBuilderObj = env->CallObjectMethod(jBuilderCls, jCreateIfNeeded); diff --git a/patches/fix-messaging-doze.patch b/patches/fix-messaging-doze.patch new file mode 100644 index 0000000000000000000000000000000000000000..77194ab89118337cba2b1094cdeb0f7ea16a9023 --- /dev/null +++ b/patches/fix-messaging-doze.patch @@ -0,0 +1,62 @@ +# PWD: packages/apps/Messaging + +diff --git a/Android.mk b/Android.mk +index bd4063c..618a3ff 100644 +--- a/Android.mk ++++ b/Android.mk +@@ -74,17 +74,6 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_APPS) + + LOCAL_COMPATIBILITY_SUITE := general-tests + +-LOCAL_REQUIRED_MODULES += com.android.messaging_whitelist.xml +- + include $(BUILD_PACKAGE) + +-include $(CLEAR_VARS) +-LOCAL_MODULE := com.android.messaging_whitelist.xml +-LOCAL_MODULE_CLASS := ETC +-LOCAL_MODULE_TAGS := optional +-LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/sysconfig +-LOCAL_PRODUCT_MODULE := true +-LOCAL_SRC_FILES := $(LOCAL_MODULE) +-include $(BUILD_PREBUILT) +- + include $(call all-makefiles-under, $(LOCAL_PATH)) +diff --git a/com.android.messaging_whitelist.xml b/com.android.messaging_whitelist.xml +deleted file mode 100644 +index 6bc77a8..0000000 +--- a/com.android.messaging_whitelist.xml ++++ /dev/null +@@ -1,19 +0,0 @@ +- +- +- +- +- +diff --git a/src/com/android/messaging/datamodel/action/ActionServiceImpl.java b/src/com/android/messaging/datamodel/action/ActionServiceImpl.java +index d78bdc0..172e792 100644 +--- a/src/com/android/messaging/datamodel/action/ActionServiceImpl.java ++++ b/src/com/android/messaging/datamodel/action/ActionServiceImpl.java +@@ -171,7 +171,7 @@ public class ActionServiceImpl extends JobIntentService { + (AlarmManager) context.getSystemService(Context.ALARM_SERVICE); + + if (delayMs < Long.MAX_VALUE) { +- mgr.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, ++ mgr.setAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME_WAKEUP, + SystemClock.elapsedRealtime() + delayMs, pendingIntent); + } else { + mgr.cancel(pendingIntent); diff --git a/patches/fix-native-vulkan.patch b/patches/fix-native-vulkan.patch new file mode 100644 index 0000000000000000000000000000000000000000..61dc62ea3854332946fff83b7574f4a761195db1 --- /dev/null +++ b/patches/fix-native-vulkan.patch @@ -0,0 +1,130 @@ +# PWD: frameworks/native + +diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp +index 681a289c1..3fc76cf23 100644 +--- a/vulkan/libvulkan/driver.cpp ++++ b/vulkan/libvulkan/driver.cpp +@@ -153,15 +153,12 @@ class CreateInfoWrapper { + Hal Hal::hal_; + + void* LoadLibrary(const android_dlextinfo& dlextinfo, +- const char* subname, +- int subname_len) { ++ const std::string_view subname) { + ATRACE_CALL(); + +- const char kLibFormat[] = "vulkan.%*s.so"; +- char* name = static_cast( +- alloca(sizeof(kLibFormat) + static_cast(subname_len))); +- sprintf(name, kLibFormat, subname_len, subname); +- return android_dlopen_ext(name, RTLD_LOCAL | RTLD_NOW, &dlextinfo); ++ std::stringstream ss; ++ ss << "vulkan." << subname << ".so"; ++ return android_dlopen_ext(ss.str().c_str(), RTLD_LOCAL | RTLD_NOW, &dlextinfo); + } + + const std::array HAL_SUBNAME_KEY_PROPERTIES = {{ +@@ -181,8 +178,9 @@ int LoadDriver(android_namespace_t* library_namespace, + char prop[PROPERTY_VALUE_MAX]; + for (auto key : HAL_SUBNAME_KEY_PROPERTIES) { + int prop_len = property_get(key, prop, nullptr); +- if (prop_len > 0) { +- so = LoadLibrary(dlextinfo, prop, prop_len); ++ if (prop_len > 0 && prop_len <= UINT_MAX) { ++ std::string_view lib_name(prop, static_cast(prop_len)); ++ so = LoadLibrary(dlextinfo, lib_name); + if (so) + break; + } +diff --git a/vulkan/libvulkan/layers_extensions.cpp b/vulkan/libvulkan/layers_extensions.cpp +index 691f3b0f5..5fdb873bf 100644 +--- a/vulkan/libvulkan/layers_extensions.cpp ++++ b/vulkan/libvulkan/layers_extensions.cpp +@@ -101,9 +101,7 @@ class LayerLibrary { + bool EnumerateLayers(size_t library_idx, + std::vector& instance_layers) const; + +- void* GetGPA(const Layer& layer, +- const char* gpa_name, +- size_t gpa_name_len) const; ++ void* GetGPA(const Layer& layer, const std::string_view gpa_name) const; + + const std::string GetFilename() { return filename_; } + +@@ -226,9 +224,8 @@ bool LayerLibrary::EnumerateLayers(size_t library_idx, + } + + // get layer properties +- VkLayerProperties* properties = static_cast(alloca( +- (num_instance_layers + num_device_layers) * sizeof(VkLayerProperties))); +- result = enumerate_instance_layers(&num_instance_layers, properties); ++ std::vector properties(num_instance_layers + num_device_layers); ++ result = enumerate_instance_layers(&num_instance_layers, properties.data()); + if (result != VK_SUCCESS) { + ALOGE("vkEnumerateInstanceLayerProperties failed for library '%s': %d", + path_.c_str(), result); +@@ -236,7 +233,7 @@ bool LayerLibrary::EnumerateLayers(size_t library_idx, + } + if (num_device_layers > 0) { + result = enumerate_device_layers(VK_NULL_HANDLE, &num_device_layers, +- properties + num_instance_layers); ++ &properties[num_instance_layers]); + if (result != VK_SUCCESS) { + ALOGE( + "vkEnumerateDeviceLayerProperties failed for library '%s': %d", +@@ -321,21 +318,11 @@ bool LayerLibrary::EnumerateLayers(size_t library_idx, + return true; + } + +-void* LayerLibrary::GetGPA(const Layer& layer, +- const char* gpa_name, +- size_t gpa_name_len) const { +- void* gpa; +- size_t layer_name_len = +- std::max(size_t{2}, strlen(layer.properties.layerName)); +- char* name = static_cast(alloca(layer_name_len + gpa_name_len + 1)); +- strcpy(name, layer.properties.layerName); +- strcpy(name + layer_name_len, gpa_name); +- if (!(gpa = GetTrampoline(name))) { +- strcpy(name, "vk"); +- strcpy(name + 2, gpa_name); +- gpa = GetTrampoline(name); +- } +- return gpa; ++void* LayerLibrary::GetGPA(const Layer& layer, const std::string_view gpa_name) const { ++ std::string layer_name { layer.properties.layerName }; ++ if (void* gpa = GetTrampoline((layer_name.append(gpa_name).c_str()))) ++ return gpa; ++ return GetTrampoline((std::string {"vk"}.append(gpa_name)).c_str()); + } + + // ---------------------------------------------------------------------------- +@@ -473,10 +460,9 @@ const VkExtensionProperties* FindExtension( + } + + void* GetLayerGetProcAddr(const Layer& layer, +- const char* gpa_name, +- size_t gpa_name_len) { ++ const std::string_view gpa_name) { + const LayerLibrary& library = g_layer_libraries[layer.library_idx]; +- return library.GetGPA(layer, gpa_name, gpa_name_len); ++ return library.GetGPA(layer, gpa_name); + } + + } // anonymous namespace +@@ -558,13 +544,13 @@ LayerRef::LayerRef(LayerRef&& other) noexcept : layer_(other.layer_) { + + PFN_vkGetInstanceProcAddr LayerRef::GetGetInstanceProcAddr() const { + return layer_ ? reinterpret_cast( +- GetLayerGetProcAddr(*layer_, "GetInstanceProcAddr", 19)) ++ GetLayerGetProcAddr(*layer_, "GetInstanceProcAddr")) + : nullptr; + } + + PFN_vkGetDeviceProcAddr LayerRef::GetGetDeviceProcAddr() const { + return layer_ ? reinterpret_cast( +- GetLayerGetProcAddr(*layer_, "GetDeviceProcAddr", 17)) ++ GetLayerGetProcAddr(*layer_, "GetDeviceProcAddr")) + : nullptr; + } + diff --git a/patches/fix-null-ptr-in-customtile.patch b/patches/fix-null-ptr-in-customtile.patch new file mode 100644 index 0000000000000000000000000000000000000000..40aedc909939346324020f432cc6e769f883909f --- /dev/null +++ b/patches/fix-null-ptr-in-customtile.patch @@ -0,0 +1,15 @@ +# PWD: frameworks/base + +diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java +index 466c8082f0b..d8f12dbee4a 100644 +--- a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java ++++ b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java +@@ -311,7 +311,7 @@ public class CustomTile extends QSTileImpl implements TileChangeListener + } catch (Exception e) { + Log.w(TAG, "Invalid icon, forcing into unavailable state"); + state.state = Tile.STATE_UNAVAILABLE; +- drawable = mDefaultIcon.loadDrawable(mContext); ++ drawable = (mDefaultIcon != null) ? mDefaultIcon.loadDrawable(mContext) : null; + } + + final Drawable drawableF = drawable; diff --git a/patches/fix-reversed-logic.patch b/patches/fix-reversed-logic.patch new file mode 100644 index 0000000000000000000000000000000000000000..6249c902c6b8d17f5cf71ef0a390e4f2ed19a94d --- /dev/null +++ b/patches/fix-reversed-logic.patch @@ -0,0 +1,21 @@ +# PWD: frameworks/base + +diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp +index 66fdb8c09a9c..d794227ba00e 100644 +--- a/libs/androidfw/ResourceTypes.cpp ++++ b/libs/androidfw/ResourceTypes.cpp +@@ -7408,12 +7408,12 @@ void ResTable::print_value(const Package* pkg, const Res_value& value) const + print_complex(value.data, true); + printf("\n"); + } else if (value.dataType >= Res_value::TYPE_FIRST_COLOR_INT +- || value.dataType <= Res_value::TYPE_LAST_COLOR_INT) { ++ && value.dataType <= Res_value::TYPE_LAST_COLOR_INT) { + printf("(color) #%08x\n", value.data); + } else if (value.dataType == Res_value::TYPE_INT_BOOLEAN) { + printf("(boolean) %s\n", value.data ? "true" : "false"); + } else if (value.dataType >= Res_value::TYPE_FIRST_INT +- || value.dataType <= Res_value::TYPE_LAST_INT) { ++ && value.dataType <= Res_value::TYPE_LAST_INT) { + printf("(int) 0x%08x or %d\n", value.data, value.data); + } else { + printf("(unknown type) t=0x%02x d=0x%08x (s=0x%04x r=0x%02x)\n", diff --git a/patches/fix-self-assign-in-libnetdbpf.patch b/patches/fix-self-assign-in-libnetdbpf.patch new file mode 100644 index 0000000000000000000000000000000000000000..194d32b133694ba9fa063f12af83c1391398e30e --- /dev/null +++ b/patches/fix-self-assign-in-libnetdbpf.patch @@ -0,0 +1,26 @@ +# PWD: system/netd + +commit 28e84722e6d9f66495fb555538d162109e5f25f2 +Author: Luca Stefani +Date: Sun Sep 1 21:11:02 2019 +0200 + + libnetdbpf: Fix clang-tidy warning + + warning: operator=() does not handle self-assignment properly [cert-oop54-cpp] + + Test: m libnetdbpf, no warnings + Change-Id: I6f480c2bb2fd457ada3597a6a9506c0a03e863d3 + +diff --git a/libnetdbpf/BpfNetworkStats.cpp b/libnetdbpf/BpfNetworkStats.cpp +index fe86cc10..e93a1e66 100644 +--- a/libnetdbpf/BpfNetworkStats.cpp ++++ b/libnetdbpf/BpfNetworkStats.cpp +@@ -321,6 +321,8 @@ bool operator<(const stats_line& lhs, const stats_line& rhs) { + } + + stats_line& stats_line::operator=(const stats_line& rhs) { ++ if (this == &rhs) return *this; ++ + strlcpy(iface, rhs.iface, sizeof(iface)); + uid = rhs.uid; + set = rhs.set; diff --git a/patches/fix-setLocked-signature.patch b/patches/fix-setLocked-signature.patch new file mode 100644 index 0000000000000000000000000000000000000000..5515cf0800fda0bf4fd9eda5453277be12fc3b5d --- /dev/null +++ b/patches/fix-setLocked-signature.patch @@ -0,0 +1,17 @@ +# PWD: system/libhidl + +diff --git a/transport/include/hidl/ConcurrentMap.h b/transport/include/hidl/ConcurrentMap.h +index 329752c..57b28c5 100644 +--- a/transport/include/hidl/ConcurrentMap.h ++++ b/transport/include/hidl/ConcurrentMap.h +@@ -66,8 +66,8 @@ public: + + std::unique_lock lock() { return std::unique_lock(mMutex); } + +- void setLocked(K&& k, V&& v) { mMap[std::forward(k)] = std::forward(v); } +- void setLocked(K&& k, const V& v) { mMap[std::forward(k)] = v; } ++ void setLocked(const K& k, V&& v) { mMap[k] = std::forward(v); } ++ void setLocked(const K& k, const V& v) { mMap[k] = v; } + + const V& getLocked(const K& k, const V& def) const { + const_iterator iter = mMap.find(k); diff --git a/patches/fix_audit2allow.patch b/patches/fix_audit2allow.patch new file mode 100644 index 0000000000000000000000000000000000000000..92143e8fd5d3a44f1fe3d5474e2d4949c72c34c8 --- /dev/null +++ b/patches/fix_audit2allow.patch @@ -0,0 +1,25 @@ +# PWD: external/selinux + +diff --git a/prebuilts/bin/audit2allow b/prebuilts/bin/audit2allow +index 0d96ca60..8be60117 100755 +--- a/prebuilts/bin/audit2allow ++++ b/prebuilts/bin/audit2allow +@@ -16,7 +16,7 @@ unamestr=`uname` + if [ "$unamestr" = "Linux" -o "$unamestr" = "linux" ]; then + export LD_PRELOAD=$ANDROID_HOST_OUT/lib64/libselinux.so + export PYTHONPATH=$ANDROID_BUILD_TOP/prebuilts/python/linux-x86/2.7.5/lib/python2.7/site-packages +- python $ANDROID_BUILD_TOP/external/selinux/python/audit2allow/audit2allow "$@" ++ python2 $ANDROID_BUILD_TOP/external/selinux/python/audit2allow/audit2allow "$@" + else + echo "audit2allow is only supported on linux" + exit 1 +diff --git a/python/audit2allow/audit2allow b/python/audit2allow/audit2allow +index 09b06f66..57a4c805 100755 +--- a/python/audit2allow/audit2allow ++++ b/python/audit2allow/audit2allow +@@ -1,4 +1,4 @@ +-#!/usr/bin/python3 -Es ++#!/usr/bin/python2 -Es + # Authors: Karl MacMillan + # Authors: Dan Walsh + # diff --git a/patches/fix_snet_probs.patch b/patches/fix_snet_probs.patch new file mode 100644 index 0000000000000000000000000000000000000000..b2401cadcabb093fdc2fba48b75eabfbc1dfb819 --- /dev/null +++ b/patches/fix_snet_probs.patch @@ -0,0 +1,109 @@ +# PWD: system/core + +Based on the work from Havoc-OS + +diff --git a/init/property_service.cpp b/init/property_service.cpp +index 65e9cda1c..3bdeb8bdf 100644 +--- a/init/property_service.cpp ++++ b/init/property_service.cpp +@@ -45,6 +45,7 @@ + #include + #include + #include ++#include + #include + + #include +@@ -104,6 +105,8 @@ struct PropertyAuditData { + const char* name; + }; + ++static bool weaken_prop_override_security = false; ++ + static int PropertyAuditCallback(void* data, security_class_t /*cls*/, char* buf, size_t len) { + auto* d = reinterpret_cast(data); + +@@ -196,7 +199,7 @@ static uint32_t PropertySet(const std::string& name, const std::string& value, s + prop_info* pi = (prop_info*) __system_property_find(name.c_str()); + if (pi != nullptr) { + // ro.* properties are actually "write-once". +- if (StartsWith(name, "ro.")) { ++ if (StartsWith(name, "ro.") && !weaken_prop_override_security) { + *error = "Read-only property was already set"; + return PROP_ERROR_READ_ONLY_PROPERTY; + } +@@ -774,7 +777,74 @@ static void update_sys_usb_config() { + } + } + ++static std::pair snet_props[] = { ++ {"ro.boot.flash.locked", "1"}, ++ {"ro.boot.vbmeta.device_state", "locked"}, ++ {"ro.boot.verifiedbootstate", "green"}, ++ {"ro.build.tags", "release-keys"}, ++ {"ro.build.type", "user"}, ++ {"ro.debuggable", "0"}, ++ {"ro.odm.build.tags", "release-keys"}, ++ {"ro.odm.build.type", "user"}, ++ {"ro.product.build.type", "user"}, ++ {"ro.system.build.tags", "release-keys"}, ++ {"ro.system.build.type", "user"}, ++ {"ro.vendor.build.tags", "release-keys"}, ++ {"ro.vendor.build.type", "user"}, ++ {"vendor.boot.vbmeta.device_state", "locked"}, ++ {"vendor.boot.verifiedbootstate", "green"}, ++ //{"ro.boot.selinux", "enforcing"}, - n/a ++ //{"ro.boot.veritymode", "enforcing"}, - set ++ //{"ro.boot.warranty_bit", "0"}, - n/a ++ //{"ro.build.keys", "release-keys"}, - n/a ++ //{"ro.secure", "1"}, - set ++ //{"ro.system_ext.build.type", "user"}, - n/a ++ //{"ro.vendor.boot.warranty_bit", "0"}, - n/a ++ //{"ro.vendor.warranty_bit", "0"}, - n/a ++ //{"ro.warranty_bit", "0"}, - na ++ // Those 2 must come last! ++ {"ro.build.version.security_patch", "2019-09-01"}, ++ {"ro.build.version.real_security_patch", nullptr}, ++}; ++ ++static void workaround_snet_properties() { ++ const std::string build_type = android::base::GetProperty("ro.build.type", ""); ++ ++ // Weaken property override security to set safetynet props ++ weaken_prop_override_security = true; ++ ++ std::string error; ++ ++ // Hide all sensitive props if not eng build ++ if (build_type != "eng") { ++ LOG(INFO) << "snet: Hiding sensitive props"; ++ // Store real security patch level before overwriting it ++ const std::string security_patch = android::base::GetProperty((std::end(snet_props) - 2)->first, ""); ++ (std::end(snet_props) - 1)->second = security_patch.c_str(); ++ for (const auto& [name, value]: snet_props) { ++ if (PropertySet(name, value, &error) != PROP_SUCCESS) { ++ LOG(ERROR) << "snet: Could not set '" << name << "' to '" << value << "': " << error; ++ } ++ } ++ } ++ ++ // Extra props ++ const std::string build_flavor_key = "ro.build.flavor"; ++ std::string build_flavor_value = android::base::GetProperty(build_flavor_key, ""); ++ // userdebug -> user ++ if (android::base::EndsWith(build_flavor_value, "userdebug")) { ++ build_flavor_value.resize(build_flavor_value.size() - std::string("debug").size()); ++ PropertySet(build_flavor_key, build_flavor_value, &error); ++ } ++ ++ // Restore the normal property override security after safetynet props have been set ++ weaken_prop_override_security = false; ++} ++ + static void load_override_properties() { ++ if (!IsRecoveryMode()) { ++ workaround_snet_properties(); ++ } + if (ALLOW_LOCAL_PROP_OVERRIDE) { + std::map properties; + load_properties_from_file("/data/local.prop", nullptr, &properties); diff --git a/patches/make-hidl_enum_values-inline.patch b/patches/make-hidl_enum_values-inline.patch new file mode 100644 index 0000000000000000000000000000000000000000..dfe7516ad0c4e532c6ba8fa5280d9ffce44d23a9 --- /dev/null +++ b/patches/make-hidl_enum_values-inline.patch @@ -0,0 +1,29 @@ +# PWD: system/tools/hidl + +diff --git a/EnumType.cpp b/EnumType.cpp +index 32682645..9f808eaa 100644 +--- a/EnumType.cpp ++++ b/EnumType.cpp +@@ -289,7 +289,12 @@ void EnumType::emitIteratorDeclaration(Formatter& out) const { + elementCount += type->mValues.size(); + } + +- out << "template<> constexpr std::array<" << getCppStackType() << ", " << elementCount ++ // TODO(pcc): Remove the pragmas once all users of the hidl headers have ++ // been moved to C++17. ++ out << "#pragma clang diagnostic push\n"; ++ out << "#pragma clang diagnostic ignored \"-Wc++17-extensions\"\n"; ++ ++ out << "template<> inline constexpr std::array<" << getCppStackType() << ", " << elementCount + << "> hidl_enum_values<" << getCppStackType() << "> = "; + out.block([&] { + auto enumerators = typeChain(); +@@ -300,6 +305,8 @@ void EnumType::emitIteratorDeclaration(Formatter& out) const { + } + } + }) << ";\n"; ++ ++ out << "#pragma clang diagnostic pop\n"; + } + + void EnumType::emitEnumBitwiseOperator( diff --git a/patches/make-stub-symbols-visible.patch b/patches/make-stub-symbols-visible.patch new file mode 100644 index 0000000000000000000000000000000000000000..5e7ef254a7bd8634575bd4e6c3aedfb61337296f --- /dev/null +++ b/patches/make-stub-symbols-visible.patch @@ -0,0 +1,17 @@ +# PWD: build/soong + +diff --git a/cc/ndk_library.go b/cc/ndk_library.go +index 7fb04ddd..adb6fc42 100644 +--- a/cc/ndk_library.go ++++ b/cc/ndk_library.go +@@ -265,6 +265,10 @@ func addStubLibraryCompilerFlags(flags Flags) Flags { + // (avoids the need to link an unwinder into a fake library). + "-fno-unwind-tables", + ) ++ // All symbols in the stubs library should be visible. ++ if inList("-fvisibility=hidden", flags.CFlags) { ++ flags.CFlags = append(flags.CFlags, "-fvisibility=default") ++ } + return flags + } + diff --git a/patches/remove-fallhthrough-warning.patch b/patches/remove-fallhthrough-warning.patch new file mode 100644 index 0000000000000000000000000000000000000000..aae2a838d2080b94b71021dc877e577ff8fa69e8 --- /dev/null +++ b/patches/remove-fallhthrough-warning.patch @@ -0,0 +1,14 @@ +# PWD: bionic + +diff --git a/libc/Android.bp b/libc/Android.bp +index 6031b1661..b59a39a0a 100644 +--- a/libc/Android.bp ++++ b/libc/Android.bp +@@ -42,7 +42,6 @@ libc_common_flags = [ + "-Wno-deprecated-declarations", + "-Wno-gcc-compat", + "-Wframe-larger-than=2048", +- "-Wimplicit-fallthrough", + + // Try to catch typical 32-bit assumptions that break with 64-bit pointers. + "-Werror=pointer-to-int-cast", diff --git a/patches/remove_log_check.patch b/patches/remove_log_check.patch new file mode 100644 index 0000000000000000000000000000000000000000..4c6d5bba3c1a365558d11b63f67428fb04f96573 --- /dev/null +++ b/patches/remove_log_check.patch @@ -0,0 +1,18 @@ +# PWD: system/core + +diff --git a/base/logging.cpp b/base/logging.cpp +index 5bd21da66..4c25a8daf 100644 +--- a/base/logging.cpp ++++ b/base/logging.cpp +@@ -480,11 +480,6 @@ LogMessage::LogMessage(const char* file, unsigned int line, LogSeverity severity + : data_(new LogMessageData(file, line, severity, tag, error)) {} + + LogMessage::~LogMessage() { +- // Check severity again. This is duplicate work wrt/ LOG macros, but not LOG_STREAM. +- if (!WOULD_LOG(data_->GetSeverity())) { +- return; +- } +- + // Finish constructing the message. + if (data_->GetError() != -1) { + data_->GetBuffer() << ": " << strerror(data_->GetError()); diff --git a/patches/show-adb-root-option.patch b/patches/show-adb-root-option.patch new file mode 100644 index 0000000000000000000000000000000000000000..62977cb0135adde3e9e2003490a238c840a3dfb9 --- /dev/null +++ b/patches/show-adb-root-option.patch @@ -0,0 +1,15 @@ +# PWD: packages/apps/Settings + +diff --git a/src/com/android/settings/development/AdbRootPreferenceController.java b/src/com/android/settings/development/AdbRootPreferenceController.java +index 5f7d65da35..8cdc24ff8a 100644 +--- a/src/com/android/settings/development/AdbRootPreferenceController.java ++++ b/src/com/android/settings/development/AdbRootPreferenceController.java +@@ -53,7 +53,7 @@ public class AdbRootPreferenceController extends DeveloperOptionsPreferenceContr + + @Override + public boolean isAvailable() { +- return Build.IS_DEBUGGABLE; ++ return true; + } + + @Override diff --git a/patches/suppress-bool-operation-warning.patch b/patches/suppress-bool-operation-warning.patch new file mode 100644 index 0000000000000000000000000000000000000000..0d673008eee785b18f7fc2922425dfaf3d7ed633 --- /dev/null +++ b/patches/suppress-bool-operation-warning.patch @@ -0,0 +1,16 @@ +# PWD: system/tools/hidl + +diff --git a/Android.bp b/Android.bp +index 8cf4f5dd..8ce6ba02 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -58,6 +58,9 @@ java_defaults { + cc_library_host_shared { + name: "libhidl-gen", + defaults: ["hidl-gen-defaults"], ++ cflags: [ ++ "-Wno-bool-operation", // found in ConstantExpression.cpp:105 ++ ], + srcs: [ + "Annotation.cpp", + "ArrayType.cpp", diff --git a/patches/update-abi-dumps.patch b/patches/update-abi-dumps.patch new file mode 100644 index 0000000000000000000000000000000000000000..ab3ed49f49862449c3cc8166d9dc01a25d7bbb3a --- /dev/null +++ b/patches/update-abi-dumps.patch @@ -0,0 +1,594776 @@ +# PWD: prebuilts/abi-dumps/vndk + +diff --git a/29/32/arm_armv7-a-neon/source-based/libhidlbase.so.lsdump b/29/32/arm_armv7-a-neon/source-based/libhidlbase.so.lsdump +index fbde119..3cd952b 100644 +--- a/29/32/arm_armv7-a-neon/source-based/libhidlbase.so.lsdump ++++ b/29/32/arm_armv7-a-neon/source-based/libhidlbase.so.lsdump +@@ -5,16 +5,16 @@ + "alignment" : 1, + "linker_set_key" : "char [0]", + "name" : "char [0]", +- "referenced_type" : "type-48", +- "self_type" : "type-231", ++ "referenced_type" : "type-47", ++ "self_type" : "type-230", + "source_file" : "/system/core/liblog/include/log/log_read.h" + }, + { + "alignment" : 1, + "linker_set_key" : "char [10]", + "name" : "char [10]", +- "referenced_type" : "type-48", +- "self_type" : "type-3654", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3647", + "size" : 10, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -22,8 +22,8 @@ + "alignment" : 1, + "linker_set_key" : "char [11]", + "name" : "char [11]", +- "referenced_type" : "type-48", +- "self_type" : "type-3677", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3670", + "size" : 11, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -31,8 +31,8 @@ + "alignment" : 1, + "linker_set_key" : "char [12]", + "name" : "char [12]", +- "referenced_type" : "type-48", +- "self_type" : "type-3651", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3644", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -40,8 +40,8 @@ + "alignment" : 1, + "linker_set_key" : "char [13]", + "name" : "char [13]", +- "referenced_type" : "type-48", +- "self_type" : "type-3647", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3640", + "size" : 13, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -49,8 +49,8 @@ + "alignment" : 1, + "linker_set_key" : "char [14]", + "name" : "char [14]", +- "referenced_type" : "type-48", +- "self_type" : "type-3696", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3689", + "size" : 14, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -58,8 +58,8 @@ + "alignment" : 1, + "linker_set_key" : "char [15]", + "name" : "char [15]", +- "referenced_type" : "type-48", +- "self_type" : "type-3794", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3787", + "size" : 15, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -67,8 +67,8 @@ + "alignment" : 1, + "linker_set_key" : "char [16]", + "name" : "char [16]", +- "referenced_type" : "type-48", +- "self_type" : "type-47", ++ "referenced_type" : "type-47", ++ "self_type" : "type-46", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -76,8 +76,8 @@ + "alignment" : 1, + "linker_set_key" : "char [17]", + "name" : "char [17]", +- "referenced_type" : "type-48", +- "self_type" : "type-3699", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3692", + "size" : 17, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -85,8 +85,8 @@ + "alignment" : 1, + "linker_set_key" : "char [18]", + "name" : "char [18]", +- "referenced_type" : "type-48", +- "self_type" : "type-3683", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3676", + "size" : 18, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -94,8 +94,8 @@ + "alignment" : 1, + "linker_set_key" : "char [19]", + "name" : "char [19]", +- "referenced_type" : "type-48", +- "self_type" : "type-3715", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3708", + "size" : 19, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -103,8 +103,8 @@ + "alignment" : 1, + "linker_set_key" : "char [20]", + "name" : "char [20]", +- "referenced_type" : "type-48", +- "self_type" : "type-3693", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3686", + "size" : 20, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -112,8 +112,8 @@ + "alignment" : 1, + "linker_set_key" : "char [22]", + "name" : "char [22]", +- "referenced_type" : "type-48", +- "self_type" : "type-3718", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3711", + "size" : 22, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -121,8 +121,8 @@ + "alignment" : 1, + "linker_set_key" : "char [25]", + "name" : "char [25]", +- "referenced_type" : "type-48", +- "self_type" : "type-3708", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3701", + "size" : 25, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -130,8 +130,8 @@ + "alignment" : 1, + "linker_set_key" : "char [28]", + "name" : "char [28]", +- "referenced_type" : "type-48", +- "self_type" : "type-3730", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3723", + "size" : 28, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -139,8 +139,8 @@ + "alignment" : 1, + "linker_set_key" : "char [29]", + "name" : "char [29]", +- "referenced_type" : "type-48", +- "self_type" : "type-3705", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3698", + "size" : 29, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -148,8 +148,8 @@ + "alignment" : 1, + "linker_set_key" : "char [2]", + "name" : "char [2]", +- "referenced_type" : "type-48", +- "self_type" : "type-3658", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3650", + "size" : 2, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -157,8 +157,8 @@ + "alignment" : 1, + "linker_set_key" : "char [31]", + "name" : "char [31]", +- "referenced_type" : "type-48", +- "self_type" : "type-3690", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3682", + "size" : 31, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -166,8 +166,8 @@ + "alignment" : 1, + "linker_set_key" : "char [32]", + "name" : "char [32]", +- "referenced_type" : "type-48", +- "self_type" : "type-3722", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3715", + "size" : 32, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -175,8 +175,8 @@ + "alignment" : 1, + "linker_set_key" : "char [35]", + "name" : "char [35]", +- "referenced_type" : "type-48", +- "self_type" : "type-3711", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3704", + "size" : 35, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -184,8 +184,8 @@ + "alignment" : 1, + "linker_set_key" : "char [37]", + "name" : "char [37]", +- "referenced_type" : "type-48", +- "self_type" : "type-3702", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3695", + "size" : 37, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -193,8 +193,8 @@ + "alignment" : 1, + "linker_set_key" : "char [3]", + "name" : "char [3]", +- "referenced_type" : "type-48", +- "self_type" : "type-3670", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3663", + "size" : 3, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -202,8 +202,8 @@ + "alignment" : 1, + "linker_set_key" : "char [4]", + "name" : "char [4]", +- "referenced_type" : "type-48", +- "self_type" : "type-3791", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3784", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -211,8 +211,8 @@ + "alignment" : 1, + "linker_set_key" : "char [5]", + "name" : "char [5]", +- "referenced_type" : "type-48", +- "self_type" : "type-3797", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3790", + "size" : 5, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -220,8 +220,8 @@ + "alignment" : 1, + "linker_set_key" : "char [6]", + "name" : "char [6]", +- "referenced_type" : "type-48", +- "self_type" : "type-3662", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3655", + "size" : 6, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -229,8 +229,8 @@ + "alignment" : 1, + "linker_set_key" : "char [7]", + "name" : "char [7]", +- "referenced_type" : "type-48", +- "self_type" : "type-3686", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3679", + "size" : 7, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -238,8 +238,8 @@ + "alignment" : 1, + "linker_set_key" : "char [8]", + "name" : "char [8]", +- "referenced_type" : "type-48", +- "self_type" : "type-3674", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3667", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -247,16 +247,16 @@ + "alignment" : 1, + "linker_set_key" : "char [9]", + "name" : "char [9]", +- "referenced_type" : "type-48", +- "self_type" : "type-3665", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3658", + "size" : 9, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { + "linker_set_key" : "float []", + "name" : "float []", +- "referenced_type" : "type-298", +- "self_type" : "type-297", ++ "referenced_type" : "type-297", ++ "self_type" : "type-296", + "source_file" : "/system/core/libsystem/include/system/graphics.h" + }, + { +@@ -271,8 +271,8 @@ + "alignment" : 1, + "linker_set_key" : "unsigned char [32]", + "name" : "unsigned char [32]", +- "referenced_type" : "type-199", +- "self_type" : "type-1013", ++ "referenced_type" : "type-198", ++ "self_type" : "type-1010", + "size" : 32, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -280,8 +280,8 @@ + "alignment" : 1, + "linker_set_key" : "unsigned char [5121]", + "name" : "unsigned char [5121]", +- "referenced_type" : "type-199", +- "self_type" : "type-238", ++ "referenced_type" : "type-198", ++ "self_type" : "type-237", + "size" : 5121, + "source_file" : "/system/core/liblog/include/log/log_read.h" + }, +@@ -290,7 +290,7 @@ + "linker_set_key" : "unsigned int [8]", + "name" : "unsigned int [8]", + "referenced_type" : "type-1", +- "self_type" : "type-288", ++ "self_type" : "type-287", + "size" : 32, + "source_file" : "/system/core/libsystem/include/system/graphics.h" + } +@@ -303,8 +303,8 @@ + "is_unsigned" : true, + "linker_set_key" : "bool", + "name" : "bool", +- "referenced_type" : "type-44", +- "self_type" : "type-44", ++ "referenced_type" : "type-43", ++ "self_type" : "type-43", + "size" : 1 + }, + { +@@ -313,8 +313,8 @@ + "is_unsigned" : true, + "linker_set_key" : "char", + "name" : "char", +- "referenced_type" : "type-48", +- "self_type" : "type-48", ++ "referenced_type" : "type-47", ++ "self_type" : "type-47", + "size" : 1 + }, + { +@@ -323,8 +323,8 @@ + "is_unsigned" : true, + "linker_set_key" : "char16_t", + "name" : "char16_t", +- "referenced_type" : "type-345", +- "self_type" : "type-345", ++ "referenced_type" : "type-344", ++ "self_type" : "type-344", + "size" : 2 + }, + { +@@ -339,8 +339,8 @@ + "alignment" : 4, + "linker_set_key" : "float", + "name" : "float", +- "referenced_type" : "type-298", +- "self_type" : "type-298", ++ "referenced_type" : "type-297", ++ "self_type" : "type-297", + "size" : 4 + }, + { +@@ -357,16 +357,16 @@ + "is_integral" : true, + "linker_set_key" : "long", + "name" : "long", +- "referenced_type" : "type-111", +- "self_type" : "type-111", ++ "referenced_type" : "type-110", ++ "self_type" : "type-110", + "size" : 4 + }, + { + "alignment" : 8, + "linker_set_key" : "long double", + "name" : "long double", +- "referenced_type" : "type-61", +- "self_type" : "type-61", ++ "referenced_type" : "type-60", ++ "self_type" : "type-60", + "size" : 8 + }, + { +@@ -402,8 +402,8 @@ + "is_unsigned" : true, + "linker_set_key" : "unsigned char", + "name" : "unsigned char", +- "referenced_type" : "type-199", +- "self_type" : "type-199", ++ "referenced_type" : "type-198", ++ "self_type" : "type-198", + "size" : 1 + }, + { +@@ -422,8 +422,8 @@ + "is_unsigned" : true, + "linker_set_key" : "unsigned long", + "name" : "unsigned long", +- "referenced_type" : "type-416", +- "self_type" : "type-416", ++ "referenced_type" : "type-415", ++ "self_type" : "type-415", + "size" : 4 + }, + { +@@ -442,15 +442,15 @@ + "is_unsigned" : true, + "linker_set_key" : "unsigned short", + "name" : "unsigned short", +- "referenced_type" : "type-132", +- "self_type" : "type-132", ++ "referenced_type" : "type-131", ++ "self_type" : "type-131", + "size" : 2 + }, + { + "linker_set_key" : "void", + "name" : "void", +- "referenced_type" : "type-106", +- "self_type" : "type-106" ++ "referenced_type" : "type-105", ++ "self_type" : "type-105" + } + ], + "elf_functions" : +@@ -467,14 +467,6 @@ + "binding" : "weak", + "name" : "_ZN7android2spINS_8hardware25PassthroughServiceManagerEED2Ev" + }, +- { +- "binding" : "weak", +- "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_" +- }, + { + "binding" : "weak", + "name" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_" +@@ -2563,6 +2555,230 @@ + { + "name" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_6StatusE" + }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_compareEPKvSA_" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE8do_splatEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_compareES3_S3_" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE15do_move_forwardEPvS3_j" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE16do_move_backwardEPvS3_j" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE7do_copyEPvS3_j" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE8do_splatEPvS3_j" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE8do_splatEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE8do_splatEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE8do_splatEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE8do_splatEPvPKvj" ++ }, + { + "name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv" + }, +@@ -3457,7 +3673,7 @@ + }, + { + "binding" : "weak", +- "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware7details9SchedPrioEEENS_19__map_value_compareIS8_SC_NS_4lessIS8_EELb1EEENS_9allocatorISC_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJOS8_EEENSO_IJEEEEEENS_4pairINS_15__tree_iteratorISC_PNS_11__tree_nodeISC_PvEEiEEbEERKT_DpOT0_" ++ "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware7details9SchedPrioEEENS_19__map_value_compareIS8_SC_NS_4lessIS8_EELb1EEENS_9allocatorISC_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSO_IJEEEEEENS_4pairINS_15__tree_iteratorISC_PNS_11__tree_nodeISC_PvEEiEEbEERKT_DpOT0_" + }, + { + "binding" : "weak", +@@ -3465,7 +3681,7 @@ + }, + { + "binding" : "weak", +- "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJOS8_EEENSL_IJEEEEEENS_4pairINS_15__tree_iteratorIS9_PNS_11__tree_nodeIS9_PvEEiEEbEERKT_DpOT0_" ++ "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSL_IJEEEEEENS_4pairINS_15__tree_iteratorIS9_PNS_11__tree_nodeIS9_PvEEiEEbEERKT_DpOT0_" + }, + { + "binding" : "weak", +@@ -4620,8 +4836,8 @@ + ], + "linker_set_key" : "android::Condition::WakeUpType", + "name" : "android::Condition::WakeUpType", +- "referenced_type" : "type-444", +- "self_type" : "type-444", ++ "referenced_type" : "type-442", ++ "self_type" : "type-442", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Condition.h", + "underlying_type" : "type-1", +@@ -4638,8 +4854,8 @@ + ], + "linker_set_key" : "android::String16::StaticLinkage", + "name" : "android::String16::StaticLinkage", +- "referenced_type" : "type-347", +- "self_type" : "type-347", ++ "referenced_type" : "type-346", ++ "self_type" : "type-346", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String16.h", + "underlying_type" : "type-1", +@@ -4656,8 +4872,8 @@ + ], + "linker_set_key" : "android::String8::StaticLinkage", + "name" : "android::String8::StaticLinkage", +- "referenced_type" : "type-222", +- "self_type" : "type-222", ++ "referenced_type" : "type-221", ++ "self_type" : "type-221", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String8.h", + "underlying_type" : "type-1", +@@ -4682,8 +4898,8 @@ + ], + "linker_set_key" : "android::hardware::HidlReturnRestriction", + "name" : "android::hardware::HidlReturnRestriction", +- "referenced_type" : "type-176", +- "self_type" : "type-176", ++ "referenced_type" : "type-175", ++ "self_type" : "type-175", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", + "underlying_type" : "type-19", +@@ -4712,8 +4928,8 @@ + ], + "linker_set_key" : "android::hardware::MQDescriptor::GrantorType", + "name" : "android::hardware::MQDescriptor::GrantorType", +- "referenced_type" : "type-1033", +- "self_type" : "type-1033", ++ "referenced_type" : "type-1030", ++ "self_type" : "type-1030", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h", + "underlying_type" : "type-19", +@@ -4734,8 +4950,8 @@ + ], + "linker_set_key" : "android::hardware::MQFlavor", + "name" : "android::hardware::MQFlavor", +- "referenced_type" : "type-332", +- "self_type" : "type-332", ++ "referenced_type" : "type-331", ++ "self_type" : "type-331", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h", + "underlying_type" : "type-1", +@@ -4760,8 +4976,8 @@ + ], + "linker_set_key" : "android::hardware::ProcessState::CallRestriction", + "name" : "android::hardware::ProcessState::CallRestriction", +- "referenced_type" : "type-2432", +- "self_type" : "type-2432", ++ "referenced_type" : "type-2427", ++ "self_type" : "type-2427", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h", + "underlying_type" : "type-19", +@@ -4814,8 +5030,8 @@ + ], + "linker_set_key" : "android::hardware::Status::Exception", + "name" : "android::hardware::Status::Exception", +- "referenced_type" : "type-165", +- "self_type" : "type-165", ++ "referenced_type" : "type-164", ++ "self_type" : "type-164", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", + "underlying_type" : "type-19", +@@ -4868,8 +5084,8 @@ + ], + "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent", + "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent", +- "referenced_type" : "type-183", +- "self_type" : "type-183", ++ "referenced_type" : "type-182", ++ "self_type" : "type-182", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "underlying_type" : "type-1", +@@ -4894,8 +5110,8 @@ + ], + "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture", + "name" : "android::hidl::base::V1_0::DebugInfo::Architecture", +- "referenced_type" : "type-336", +- "self_type" : "type-336", ++ "referenced_type" : "type-335", ++ "self_type" : "type-335", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h", + "underlying_type" : "type-19", +@@ -4912,8 +5128,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::PidConstant", + "name" : "android::hidl::manager::V1_0::IServiceManager::PidConstant", +- "referenced_type" : "type-547", +- "self_type" : "type-547", ++ "referenced_type" : "type-545", ++ "self_type" : "type-545", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h", + "underlying_type" : "type-19", +@@ -4938,11 +5154,11 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::Transport", + "name" : "android::hidl::manager::V1_0::IServiceManager::Transport", +- "referenced_type" : "type-546", +- "self_type" : "type-546", ++ "referenced_type" : "type-544", ++ "self_type" : "type-544", + "size" : 1, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h", +- "underlying_type" : "type-199", ++ "underlying_type" : "type-198", + "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager9TransportE" + }, + { +@@ -4988,8 +5204,8 @@ + ], + "linker_set_key" : "android_LogPriority", + "name" : "android_LogPriority", +- "referenced_type" : "type-267", +- "self_type" : "type-267", ++ "referenced_type" : "type-266", ++ "self_type" : "type-266", + "size" : 4, + "source_file" : "/system/core/liblog/include/android/log.h", + "underlying_type" : "type-1", +@@ -5042,8 +5258,8 @@ + ], + "linker_set_key" : "android_color_mode_t", + "name" : "android_color_mode_t", +- "referenced_type" : "type-275", +- "self_type" : "type-275", ++ "referenced_type" : "type-274", ++ "self_type" : "type-274", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h", + "underlying_type" : "type-1", +@@ -5068,8 +5284,8 @@ + ], + "linker_set_key" : "android_color_mode_v1_1_t", + "name" : "android_color_mode_v1_1_t", +- "referenced_type" : "type-280", +- "self_type" : "type-280", ++ "referenced_type" : "type-279", ++ "self_type" : "type-279", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h", + "underlying_type" : "type-1", +@@ -5110,8 +5326,8 @@ + ], + "linker_set_key" : "android_color_transform_t", + "name" : "android_color_transform_t", +- "referenced_type" : "type-276", +- "self_type" : "type-276", ++ "referenced_type" : "type-275", ++ "self_type" : "type-275", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h", + "underlying_type" : "type-1", +@@ -5352,8 +5568,8 @@ + ], + "linker_set_key" : "android_dataspace_t", + "name" : "android_dataspace_t", +- "referenced_type" : "type-274", +- "self_type" : "type-274", ++ "referenced_type" : "type-273", ++ "self_type" : "type-273", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h", + "underlying_type" : "type-1", +@@ -5382,8 +5598,8 @@ + ], + "linker_set_key" : "android_dataspace_v1_1_t", + "name" : "android_dataspace_v1_1_t", +- "referenced_type" : "type-279", +- "self_type" : "type-279", ++ "referenced_type" : "type-278", ++ "self_type" : "type-278", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h", + "underlying_type" : "type-1", +@@ -5412,8 +5628,8 @@ + ], + "linker_set_key" : "android_dataspace_v1_2_t", + "name" : "android_dataspace_v1_2_t", +- "referenced_type" : "type-283", +- "self_type" : "type-283", ++ "referenced_type" : "type-282", ++ "self_type" : "type-282", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h", + "underlying_type" : "type-1", +@@ -5454,8 +5670,8 @@ + ], + "linker_set_key" : "android_flex_component", + "name" : "android_flex_component", +- "referenced_type" : "type-289", +- "self_type" : "type-289", ++ "referenced_type" : "type-288", ++ "self_type" : "type-288", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics.h", + "underlying_type" : "type-1", +@@ -5492,8 +5708,8 @@ + ], + "linker_set_key" : "android_flex_format", + "name" : "android_flex_format", +- "referenced_type" : "type-292", +- "self_type" : "type-292", ++ "referenced_type" : "type-291", ++ "self_type" : "type-291", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics.h", + "underlying_type" : "type-1", +@@ -5518,8 +5734,8 @@ + ], + "linker_set_key" : "android_hdr_t", + "name" : "android_hdr_t", +- "referenced_type" : "type-277", +- "self_type" : "type-277", ++ "referenced_type" : "type-276", ++ "self_type" : "type-276", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h", + "underlying_type" : "type-1", +@@ -5536,8 +5752,8 @@ + ], + "linker_set_key" : "android_hdr_v1_2_t", + "name" : "android_hdr_v1_2_t", +- "referenced_type" : "type-282", +- "self_type" : "type-282", ++ "referenced_type" : "type-281", ++ "self_type" : "type-281", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h", + "underlying_type" : "type-1", +@@ -5566,8 +5782,8 @@ + ], + "linker_set_key" : "android_pixel_format_sw_t", + "name" : "android_pixel_format_sw_t", +- "referenced_type" : "type-286", +- "self_type" : "type-286", ++ "referenced_type" : "type-285", ++ "self_type" : "type-285", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-sw.h", + "underlying_type" : "type-1", +@@ -5660,8 +5876,8 @@ + ], + "linker_set_key" : "android_pixel_format_t", + "name" : "android_pixel_format_t", +- "referenced_type" : "type-271", +- "self_type" : "type-271", ++ "referenced_type" : "type-270", ++ "self_type" : "type-270", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h", + "underlying_type" : "type-1", +@@ -5702,8 +5918,8 @@ + ], + "linker_set_key" : "android_pixel_format_v1_1_t", + "name" : "android_pixel_format_v1_1_t", +- "referenced_type" : "type-278", +- "self_type" : "type-278", ++ "referenced_type" : "type-277", ++ "self_type" : "type-277", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h", + "underlying_type" : "type-1", +@@ -5720,8 +5936,8 @@ + ], + "linker_set_key" : "android_pixel_format_v1_2_t", + "name" : "android_pixel_format_v1_2_t", +- "referenced_type" : "type-285", +- "self_type" : "type-285", ++ "referenced_type" : "type-284", ++ "self_type" : "type-284", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h", + "underlying_type" : "type-1", +@@ -5750,8 +5966,8 @@ + ], + "linker_set_key" : "android_render_intent_v1_1_t", + "name" : "android_render_intent_v1_1_t", +- "referenced_type" : "type-281", +- "self_type" : "type-281", ++ "referenced_type" : "type-280", ++ "self_type" : "type-280", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h", + "underlying_type" : "type-1", +@@ -5784,8 +6000,8 @@ + ], + "linker_set_key" : "android_transform_t", + "name" : "android_transform_t", +- "referenced_type" : "type-272", +- "self_type" : "type-272", ++ "referenced_type" : "type-271", ++ "self_type" : "type-271", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h", + "underlying_type" : "type-1", +@@ -5838,8 +6054,8 @@ + ], + "linker_set_key" : "log_id", + "name" : "log_id", +- "referenced_type" : "type-268", +- "self_type" : "type-268", ++ "referenced_type" : "type-267", ++ "self_type" : "type-267", + "size" : 4, + "source_file" : "/system/core/liblog/include/android/log.h", + "underlying_type" : "type-1", +@@ -5855,12 +6071,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2474" ++ "referenced_type" : "type-2469" + } + ], +- "referenced_type" : "type-2478", +- "return_type" : "type-2474", +- "self_type" : "type-2478", ++ "referenced_type" : "type-2473", ++ "return_type" : "type-2469", ++ "self_type" : "type-2473", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -5870,18 +6086,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-350" ++ "referenced_type" : "type-349" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "referenced_type" : "type-2429", +- "return_type" : "type-44", +- "self_type" : "type-2429", ++ "referenced_type" : "type-2424", ++ "return_type" : "type-43", ++ "self_type" : "type-2424", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -5891,12 +6107,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "referenced_type" : "type-303", ++ "referenced_type" : "type-302", + "return_type" : "type-19", +- "self_type" : "type-303", ++ "self_type" : "type-302", + "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h" + }, + { +@@ -5906,12 +6122,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2490" ++ "referenced_type" : "type-2485" + } + ], +- "referenced_type" : "type-2489", +- "return_type" : "type-2490", +- "self_type" : "type-2489", ++ "referenced_type" : "type-2484", ++ "return_type" : "type-2485", ++ "self_type" : "type-2484", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -5921,27 +6137,27 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-1030" ++ "referenced_type" : "type-1027" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2352" ++ "referenced_type" : "type-2347" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "referenced_type" : "type-2351", +- "return_type" : "type-106", +- "self_type" : "type-2351", ++ "referenced_type" : "type-2346", ++ "return_type" : "type-105", ++ "self_type" : "type-2346", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -5951,18 +6167,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "referenced_type" : "type-2346", +- "return_type" : "type-106", +- "self_type" : "type-2346", ++ "referenced_type" : "type-2341", ++ "return_type" : "type-105", ++ "self_type" : "type-2341", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -5972,15 +6188,15 @@ + "parameters" : + [ + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "referenced_type" : "type-2539", +- "return_type" : "type-106", +- "self_type" : "type-2539", ++ "referenced_type" : "type-2534", ++ "return_type" : "type-105", ++ "self_type" : "type-2534", + "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h" + } + ], +@@ -5993,10 +6209,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-587" ++ "referenced_type" : "type-585" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, + { +@@ -6006,13 +6222,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-495" ++ "referenced_type" : "type-493" + }, + { +- "referenced_type" : "type-2441" ++ "referenced_type" : "type-2436" + } + ], +- "return_type" : "type-3839", ++ "return_type" : "type-3832", + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, + { +@@ -6022,42 +6238,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-788" ++ "referenced_type" : "type-785" + } + ], +- "return_type" : "type-106", +- "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" +- }, +- { +- "function_name" : "android::sp::operator=", +- "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-482" +- }, +- { +- "referenced_type" : "type-483" +- } +- ], +- "return_type" : "type-485", +- "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" +- }, +- { +- "function_name" : "android::sp::operator=", +- "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-482" +- }, +- { +- "referenced_type" : "type-2329" +- } +- ], +- "return_type" : "type-485", ++ "return_type" : "type-105", + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, + { +@@ -6067,13 +6251,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2380" ++ "referenced_type" : "type-2375" + }, + { +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + } + ], +- "return_type" : "type-3754", ++ "return_type" : "type-3747", + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, + { +@@ -6086,13 +6270,13 @@ + "referenced_type" : "type-33" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6105,10 +6289,10 @@ + "referenced_type" : "type-33" + }, + { +- "referenced_type" : "type-2765" ++ "referenced_type" : "type-2759" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6121,10 +6305,10 @@ + "referenced_type" : "type-33" + }, + { +- "referenced_type" : "type-2766" ++ "referenced_type" : "type-2760" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6137,10 +6321,10 @@ + "referenced_type" : "type-33" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6153,10 +6337,10 @@ + "referenced_type" : "type-33" + }, + { +- "referenced_type" : "type-2767" ++ "referenced_type" : "type-2761" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6169,10 +6353,10 @@ + "referenced_type" : "type-33" + }, + { +- "referenced_type" : "type-2768" ++ "referenced_type" : "type-2762" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6185,7 +6369,7 @@ + "referenced_type" : "type-33" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6198,7 +6382,7 @@ + "referenced_type" : "type-33" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6211,7 +6395,7 @@ + "referenced_type" : "type-33" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6224,13 +6408,13 @@ + "referenced_type" : "type-33" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6239,14 +6423,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-801", ++ "return_type" : "type-798", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6257,13 +6441,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2250" ++ "referenced_type" : "type-2245" + }, + { +- "referenced_type" : "type-2771" ++ "referenced_type" : "type-2765" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h" + }, + { +@@ -6273,13 +6457,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2250" ++ "referenced_type" : "type-2245" + }, + { +- "referenced_type" : "type-459" ++ "referenced_type" : "type-456" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h" + }, + { +@@ -6289,13 +6473,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2250" ++ "referenced_type" : "type-2245" + }, + { +- "referenced_type" : "type-459" ++ "referenced_type" : "type-456" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h" + }, + { +@@ -6304,16 +6488,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-2280" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2281" ++ "referenced_type" : "type-2276" + }, + { +- "referenced_type" : "type-2774" ++ "referenced_type" : "type-2768" + } + ], + "return_type" : "type-19", +@@ -6326,16 +6510,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2280" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2281" ++ "referenced_type" : "type-2276" + }, + { + "default_arg" : true, +@@ -6343,7 +6527,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-2775" ++ "referenced_type" : "type-2769" + } + ], + "return_type" : "type-19", +@@ -6355,16 +6539,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-2280" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2281" ++ "referenced_type" : "type-2276" + }, + { +- "referenced_type" : "type-2776" ++ "referenced_type" : "type-2770" + } + ], + "return_type" : "type-19", +@@ -6378,13 +6562,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-2777" ++ "referenced_type" : "type-2771" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, + { +@@ -6393,16 +6577,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-2280" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2281" ++ "referenced_type" : "type-2276" + }, + { +- "referenced_type" : "type-2778" ++ "referenced_type" : "type-2772" + } + ], + "return_type" : "type-19", +@@ -6414,16 +6598,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-2280" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2281" ++ "referenced_type" : "type-2276" + }, + { +- "referenced_type" : "type-2779" ++ "referenced_type" : "type-2773" + } + ], + "return_type" : "type-19", +@@ -6435,16 +6619,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-2280" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2281" ++ "referenced_type" : "type-2276" + }, + { +- "referenced_type" : "type-2780" ++ "referenced_type" : "type-2774" + } + ], + "return_type" : "type-19", +@@ -6456,16 +6640,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-2280" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2281" ++ "referenced_type" : "type-2276" + }, + { +- "referenced_type" : "type-2781" ++ "referenced_type" : "type-2775" + } + ], + "return_type" : "type-19", +@@ -6477,16 +6661,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-2280" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2281" ++ "referenced_type" : "type-2276" + }, + { +- "referenced_type" : "type-2782" ++ "referenced_type" : "type-2776" + } + ], + "return_type" : "type-19", +@@ -6500,10 +6684,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, + { +@@ -6513,13 +6697,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, + { +@@ -6529,19 +6713,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-2277" ++ "referenced_type" : "type-2272" + }, + { +- "referenced_type" : "type-2277" ++ "referenced_type" : "type-2272" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, + { +@@ -6551,13 +6735,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, + { +@@ -6567,19 +6751,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-2277" ++ "referenced_type" : "type-2272" + }, + { +- "referenced_type" : "type-2277" ++ "referenced_type" : "type-2272" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, + { +@@ -6589,10 +6773,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, + { +@@ -6602,10 +6786,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, + { +@@ -6615,10 +6799,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, + { +@@ -6627,13 +6811,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2253" ++ "referenced_type" : "type-2248" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6642,19 +6826,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2253" ++ "referenced_type" : "type-2248" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6664,16 +6848,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6683,13 +6867,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + }, + { +- "referenced_type" : "type-2783" ++ "referenced_type" : "type-2777" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6699,13 +6883,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + }, + { +- "referenced_type" : "type-2784" ++ "referenced_type" : "type-2778" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6715,13 +6899,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6731,13 +6915,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + }, + { +- "referenced_type" : "type-2785" ++ "referenced_type" : "type-2779" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6746,16 +6930,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2253" ++ "referenced_type" : "type-2248" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-2786" ++ "referenced_type" : "type-2780" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6764,16 +6948,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2253" ++ "referenced_type" : "type-2248" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-2787" ++ "referenced_type" : "type-2781" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6783,13 +6967,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + }, + { +- "referenced_type" : "type-2788" ++ "referenced_type" : "type-2782" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6798,16 +6982,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2253" ++ "referenced_type" : "type-2248" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-2789" ++ "referenced_type" : "type-2783" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6817,10 +7001,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6830,10 +7014,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6842,16 +7026,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2253" ++ "referenced_type" : "type-2248" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-2790" ++ "referenced_type" : "type-2784" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6860,13 +7044,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2253" ++ "referenced_type" : "type-2248" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6875,13 +7059,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2253" ++ "referenced_type" : "type-2248" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6891,10 +7075,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6904,16 +7088,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6923,13 +7107,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6939,13 +7123,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6955,14 +7139,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1048" ++ "referenced_type" : "type-1045" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-575", ++ "return_type" : "type-573", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -6972,16 +7156,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -6991,13 +7175,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + }, + { +- "referenced_type" : "type-1570" ++ "referenced_type" : "type-1566" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7007,13 +7191,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + }, + { +- "referenced_type" : "type-1571" ++ "referenced_type" : "type-1567" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7023,14 +7207,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1048" ++ "referenced_type" : "type-1045" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-575", ++ "return_type" : "type-573", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7040,13 +7224,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7056,13 +7240,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + }, + { +- "referenced_type" : "type-1572" ++ "referenced_type" : "type-1568" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7072,11 +7256,11 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + }, + { + "default_arg" : true, +- "referenced_type" : "type-1048" ++ "referenced_type" : "type-1045" + } + ], + "return_type" : "type-19", +@@ -7089,13 +7273,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + }, + { +- "referenced_type" : "type-1573" ++ "referenced_type" : "type-1569" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7105,10 +7289,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7118,10 +7302,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7130,13 +7314,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1048" ++ "referenced_type" : "type-1045" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7146,10 +7330,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7159,16 +7343,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7177,14 +7361,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-986", ++ "return_type" : "type-983", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7193,14 +7377,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-910" ++ "referenced_type" : "type-906" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-986", ++ "return_type" : "type-983", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7211,13 +7395,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-958" ++ "referenced_type" : "type-955" + }, + { +- "referenced_type" : "type-1576" ++ "referenced_type" : "type-1572" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h" + }, + { +@@ -7227,13 +7411,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-958" ++ "referenced_type" : "type-955" + }, + { +- "referenced_type" : "type-578" ++ "referenced_type" : "type-576" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h" + }, + { +@@ -7243,13 +7427,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-958" ++ "referenced_type" : "type-955" + }, + { +- "referenced_type" : "type-578" ++ "referenced_type" : "type-576" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h" + }, + { +@@ -7258,16 +7442,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { +- "referenced_type" : "type-1582" ++ "referenced_type" : "type-1578" + } + ], + "return_type" : "type-19", +@@ -7280,16 +7464,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-872" ++ "referenced_type" : "type-869" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { + "default_arg" : true, +@@ -7297,7 +7481,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-1583" ++ "referenced_type" : "type-1579" + } + ], + "return_type" : "type-19", +@@ -7311,13 +7495,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-872" ++ "referenced_type" : "type-869" + }, + { +- "referenced_type" : "type-1584" ++ "referenced_type" : "type-1580" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h" + }, + { +@@ -7326,16 +7510,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { +- "referenced_type" : "type-1585" ++ "referenced_type" : "type-1581" + } + ], + "return_type" : "type-19", +@@ -7347,16 +7531,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { +- "referenced_type" : "type-1586" ++ "referenced_type" : "type-1582" + } + ], + "return_type" : "type-19", +@@ -7368,16 +7552,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { +- "referenced_type" : "type-1587" ++ "referenced_type" : "type-1583" + } + ], + "return_type" : "type-19", +@@ -7389,16 +7573,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { +- "referenced_type" : "type-1588" ++ "referenced_type" : "type-1584" + } + ], + "return_type" : "type-19", +@@ -7410,16 +7594,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { +- "referenced_type" : "type-1589" ++ "referenced_type" : "type-1585" + } + ], + "return_type" : "type-19", +@@ -7433,10 +7617,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-872" ++ "referenced_type" : "type-869" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h" + }, + { +@@ -7445,16 +7629,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { +- "referenced_type" : "type-1590" ++ "referenced_type" : "type-1586" + } + ], + "return_type" : "type-19", +@@ -7466,16 +7650,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { +- "referenced_type" : "type-1591" ++ "referenced_type" : "type-1587" + } + ], + "return_type" : "type-19", +@@ -7488,13 +7672,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-872" ++ "referenced_type" : "type-869" + }, + { +- "referenced_type" : "type-910" ++ "referenced_type" : "type-906" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h" + }, + { +@@ -7504,13 +7688,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-872" ++ "referenced_type" : "type-869" + }, + { +- "referenced_type" : "type-910" ++ "referenced_type" : "type-906" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h" + }, + { +@@ -7520,10 +7704,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-872" ++ "referenced_type" : "type-869" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h" + }, + { +@@ -7533,10 +7717,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-872" ++ "referenced_type" : "type-869" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h" + }, + { +@@ -7546,10 +7730,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-872" ++ "referenced_type" : "type-869" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h" + }, + { +@@ -7558,16 +7742,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-969" ++ "referenced_type" : "type-966" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-1592" ++ "referenced_type" : "type-1588" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7577,16 +7761,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7596,13 +7780,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-1593" ++ "referenced_type" : "type-1589" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7612,13 +7796,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-1594" ++ "referenced_type" : "type-1590" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7628,16 +7812,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-807", ++ "return_type" : "type-804", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7647,13 +7831,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7663,13 +7847,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-1595" ++ "referenced_type" : "type-1591" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7678,16 +7862,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-969" ++ "referenced_type" : "type-966" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-1596" ++ "referenced_type" : "type-1592" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7697,16 +7881,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-1597" ++ "referenced_type" : "type-1593" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7715,19 +7899,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-969" ++ "referenced_type" : "type-966" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-807", ++ "return_type" : "type-804", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7737,13 +7921,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-1598" ++ "referenced_type" : "type-1594" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7752,19 +7936,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-969" ++ "referenced_type" : "type-966" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-1599" ++ "referenced_type" : "type-1595" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7774,10 +7958,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7787,10 +7971,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7800,19 +7984,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7822,16 +8006,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7840,22 +8024,22 @@ + "parameters" : + [ + { +- "referenced_type" : "type-969" ++ "referenced_type" : "type-966" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7864,19 +8048,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-969" ++ "referenced_type" : "type-966" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7886,16 +8070,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7905,16 +8089,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-801", ++ "return_type" : "type-798", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7924,13 +8108,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-1600" ++ "referenced_type" : "type-1596" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7940,10 +8124,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7953,16 +8137,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7971,19 +8155,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-969" ++ "referenced_type" : "type-966" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7992,19 +8176,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-969" ++ "referenced_type" : "type-966" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-801", ++ "return_type" : "type-798", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -8014,13 +8198,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-1601" ++ "referenced_type" : "type-1597" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -8030,13 +8214,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -8046,13 +8230,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -8062,14 +8246,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1115" ++ "referenced_type" : "type-1112" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-590", ++ "return_type" : "type-588", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8079,16 +8263,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8098,13 +8282,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + }, + { +- "referenced_type" : "type-1602" ++ "referenced_type" : "type-1598" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8114,13 +8298,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + }, + { +- "referenced_type" : "type-1603" ++ "referenced_type" : "type-1599" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8130,14 +8314,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1115" ++ "referenced_type" : "type-1112" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-590", ++ "return_type" : "type-588", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8147,13 +8331,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8163,13 +8347,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + }, + { +- "referenced_type" : "type-1604" ++ "referenced_type" : "type-1600" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8179,11 +8363,11 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + }, + { + "default_arg" : true, +- "referenced_type" : "type-1115" ++ "referenced_type" : "type-1112" + } + ], + "return_type" : "type-19", +@@ -8196,13 +8380,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + }, + { +- "referenced_type" : "type-1605" ++ "referenced_type" : "type-1601" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8212,10 +8396,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8225,10 +8409,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8237,13 +8421,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1115" ++ "referenced_type" : "type-1112" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8253,10 +8437,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8266,16 +8450,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8284,14 +8468,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1093", ++ "return_type" : "type-1090", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8300,14 +8484,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1093", ++ "return_type" : "type-1090", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8318,13 +8502,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1085" ++ "referenced_type" : "type-1082" + }, + { +- "referenced_type" : "type-1608" ++ "referenced_type" : "type-1604" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h" + }, + { +@@ -8334,13 +8518,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1085" ++ "referenced_type" : "type-1082" + }, + { +- "referenced_type" : "type-593" ++ "referenced_type" : "type-591" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h" + }, + { +@@ -8350,13 +8534,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1085" ++ "referenced_type" : "type-1082" + }, + { +- "referenced_type" : "type-593" ++ "referenced_type" : "type-591" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h" + }, + { +@@ -8365,10 +8549,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1072" ++ "referenced_type" : "type-1069" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { + "referenced_type" : "type-1" +@@ -8386,10 +8570,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1072" ++ "referenced_type" : "type-1069" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { + "referenced_type" : "type-1" +@@ -8408,16 +8592,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-863" ++ "referenced_type" : "type-860" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1128" ++ "referenced_type" : "type-1125" + }, + { +- "referenced_type" : "type-1129" ++ "referenced_type" : "type-1126" + }, + { + "default_arg" : true, +@@ -8425,7 +8609,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-1611" ++ "referenced_type" : "type-1607" + } + ], + "return_type" : "type-19", +@@ -8439,13 +8623,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-863" ++ "referenced_type" : "type-860" + }, + { +- "referenced_type" : "type-1612" ++ "referenced_type" : "type-1608" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, + { +@@ -8454,16 +8638,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1128" ++ "referenced_type" : "type-1125" + }, + { +- "referenced_type" : "type-1129" ++ "referenced_type" : "type-1126" + }, + { +- "referenced_type" : "type-1613" ++ "referenced_type" : "type-1609" + } + ], + "return_type" : "type-19", +@@ -8477,10 +8661,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-863" ++ "referenced_type" : "type-860" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, + { +@@ -8490,13 +8674,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-863" ++ "referenced_type" : "type-860" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, + { +@@ -8506,13 +8690,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-863" ++ "referenced_type" : "type-860" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, + { +@@ -8522,10 +8706,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-863" ++ "referenced_type" : "type-860" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, + { +@@ -8535,10 +8719,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-863" ++ "referenced_type" : "type-860" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, + { +@@ -8548,10 +8732,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-863" ++ "referenced_type" : "type-860" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, + { +@@ -8561,16 +8745,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8580,13 +8764,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-1614" ++ "referenced_type" : "type-1610" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8596,13 +8780,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-1615" ++ "referenced_type" : "type-1611" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8612,13 +8796,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8628,13 +8812,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-1616" ++ "referenced_type" : "type-1612" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8644,19 +8828,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8666,13 +8850,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-1617" ++ "referenced_type" : "type-1613" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8681,22 +8865,22 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1088" ++ "referenced_type" : "type-1085" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8706,10 +8890,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8719,10 +8903,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8732,10 +8916,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8745,16 +8929,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8764,13 +8948,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8780,13 +8964,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8796,14 +8980,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1176" ++ "referenced_type" : "type-1173" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-580", ++ "return_type" : "type-578", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8813,16 +8997,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8832,13 +9016,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + }, + { +- "referenced_type" : "type-1618" ++ "referenced_type" : "type-1614" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8848,13 +9032,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + }, + { +- "referenced_type" : "type-1619" ++ "referenced_type" : "type-1615" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8864,14 +9048,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1176" ++ "referenced_type" : "type-1173" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-580", ++ "return_type" : "type-578", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8881,13 +9065,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8897,13 +9081,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + }, + { +- "referenced_type" : "type-1620" ++ "referenced_type" : "type-1616" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8913,11 +9097,11 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + }, + { + "default_arg" : true, +- "referenced_type" : "type-1176" ++ "referenced_type" : "type-1173" + } + ], + "return_type" : "type-19", +@@ -8930,13 +9114,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + }, + { +- "referenced_type" : "type-1621" ++ "referenced_type" : "type-1617" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8946,10 +9130,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8959,10 +9143,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8971,13 +9155,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1176" ++ "referenced_type" : "type-1173" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8987,10 +9171,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -9000,16 +9184,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -9018,14 +9202,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1153", ++ "return_type" : "type-1150", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -9034,14 +9218,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-910" ++ "referenced_type" : "type-906" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1153", ++ "return_type" : "type-1150", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -9050,14 +9234,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-764" ++ "referenced_type" : "type-761" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1153", ++ "return_type" : "type-1150", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -9068,13 +9252,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1141" ++ "referenced_type" : "type-1138" + }, + { +- "referenced_type" : "type-1624" ++ "referenced_type" : "type-1620" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h" + }, + { +@@ -9084,13 +9268,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1141" ++ "referenced_type" : "type-1138" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-581" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h" + }, + { +@@ -9100,13 +9284,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1141" ++ "referenced_type" : "type-1138" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-581" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h" + }, + { +@@ -9116,16 +9300,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-880" ++ "referenced_type" : "type-877" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1189" ++ "referenced_type" : "type-1186" + }, + { +- "referenced_type" : "type-1190" ++ "referenced_type" : "type-1187" + }, + { + "default_arg" : true, +@@ -9133,7 +9317,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-1630" ++ "referenced_type" : "type-1626" + } + ], + "return_type" : "type-19", +@@ -9147,13 +9331,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-880" ++ "referenced_type" : "type-877" + }, + { +- "referenced_type" : "type-1631" ++ "referenced_type" : "type-1627" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, + { +@@ -9162,16 +9346,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1189" ++ "referenced_type" : "type-1186" + }, + { +- "referenced_type" : "type-1190" ++ "referenced_type" : "type-1187" + }, + { +- "referenced_type" : "type-1632" ++ "referenced_type" : "type-1628" + } + ], + "return_type" : "type-19", +@@ -9185,10 +9369,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-880" ++ "referenced_type" : "type-877" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, + { +@@ -9198,13 +9382,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-880" ++ "referenced_type" : "type-877" + }, + { +- "referenced_type" : "type-764" ++ "referenced_type" : "type-761" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, + { +@@ -9214,13 +9398,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-880" ++ "referenced_type" : "type-877" + }, + { +- "referenced_type" : "type-764" ++ "referenced_type" : "type-761" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, + { +@@ -9230,10 +9414,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-880" ++ "referenced_type" : "type-877" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, + { +@@ -9243,10 +9427,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-880" ++ "referenced_type" : "type-877" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, + { +@@ -9256,10 +9440,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-880" ++ "referenced_type" : "type-877" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, + { +@@ -9269,16 +9453,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9288,13 +9472,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-1633" ++ "referenced_type" : "type-1629" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9304,13 +9488,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-1634" ++ "referenced_type" : "type-1630" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9320,16 +9504,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-807", ++ "return_type" : "type-804", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9339,13 +9523,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9355,13 +9539,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-1635" ++ "referenced_type" : "type-1631" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9371,16 +9555,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-1636" ++ "referenced_type" : "type-1632" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9390,13 +9574,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-1637" ++ "referenced_type" : "type-1633" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9406,10 +9590,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9419,10 +9603,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9432,19 +9616,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9454,16 +9638,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9473,19 +9657,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9494,22 +9678,22 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1145" ++ "referenced_type" : "type-1142" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9519,16 +9703,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9538,16 +9722,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-801", ++ "return_type" : "type-798", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9557,13 +9741,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-1638" ++ "referenced_type" : "type-1634" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9573,10 +9757,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9586,16 +9770,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9605,13 +9789,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-1639" ++ "referenced_type" : "type-1635" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9621,13 +9805,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9637,13 +9821,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9653,14 +9837,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1235" ++ "referenced_type" : "type-1232" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-595", ++ "return_type" : "type-593", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9670,16 +9854,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9689,13 +9873,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + }, + { +- "referenced_type" : "type-1640" ++ "referenced_type" : "type-1636" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9705,13 +9889,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + }, + { +- "referenced_type" : "type-1641" ++ "referenced_type" : "type-1637" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9721,14 +9905,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1235" ++ "referenced_type" : "type-1232" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-595", ++ "return_type" : "type-593", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9738,13 +9922,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9754,13 +9938,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + }, + { +- "referenced_type" : "type-1642" ++ "referenced_type" : "type-1638" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9770,11 +9954,11 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + }, + { + "default_arg" : true, +- "referenced_type" : "type-1235" ++ "referenced_type" : "type-1232" + } + ], + "return_type" : "type-19", +@@ -9787,13 +9971,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + }, + { +- "referenced_type" : "type-1643" ++ "referenced_type" : "type-1639" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9803,10 +9987,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9816,10 +10000,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9828,13 +10012,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1235" ++ "referenced_type" : "type-1232" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9844,10 +10028,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9857,16 +10041,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9875,14 +10059,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1213", ++ "return_type" : "type-1210", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9891,14 +10075,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-787" ++ "referenced_type" : "type-784" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1213", ++ "return_type" : "type-1210", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9908,14 +10092,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1314" ++ "referenced_type" : "type-1311" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-585", ++ "return_type" : "type-583", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -9925,16 +10109,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -9944,13 +10128,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + }, + { +- "referenced_type" : "type-1644" ++ "referenced_type" : "type-1640" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -9960,13 +10144,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + }, + { +- "referenced_type" : "type-1645" ++ "referenced_type" : "type-1641" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -9976,14 +10160,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1314" ++ "referenced_type" : "type-1311" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-585", ++ "return_type" : "type-583", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -9993,13 +10177,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10009,13 +10193,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + }, + { +- "referenced_type" : "type-1646" ++ "referenced_type" : "type-1642" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10025,11 +10209,11 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + }, + { + "default_arg" : true, +- "referenced_type" : "type-1314" ++ "referenced_type" : "type-1311" + } + ], + "return_type" : "type-19", +@@ -10042,13 +10226,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + }, + { +- "referenced_type" : "type-1647" ++ "referenced_type" : "type-1643" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10058,10 +10242,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10071,10 +10255,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10083,13 +10267,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1314" ++ "referenced_type" : "type-1311" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10099,10 +10283,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10112,16 +10296,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10130,14 +10314,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1284", ++ "return_type" : "type-1281", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10146,14 +10330,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-910" ++ "referenced_type" : "type-906" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1284", ++ "return_type" : "type-1281", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10162,14 +10346,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-764" ++ "referenced_type" : "type-761" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1284", ++ "return_type" : "type-1281", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10178,14 +10362,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-773" ++ "referenced_type" : "type-769" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1284", ++ "return_type" : "type-1281", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10196,13 +10380,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1198" ++ "referenced_type" : "type-1195" + }, + { +- "referenced_type" : "type-1650" ++ "referenced_type" : "type-1646" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h" + }, + { +@@ -10212,13 +10396,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1198" ++ "referenced_type" : "type-1195" + }, + { +- "referenced_type" : "type-600" ++ "referenced_type" : "type-598" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h" + }, + { +@@ -10228,13 +10412,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1198" ++ "referenced_type" : "type-1195" + }, + { +- "referenced_type" : "type-600" ++ "referenced_type" : "type-598" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h" + }, + { +@@ -10245,13 +10429,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1273" ++ "referenced_type" : "type-1269" + }, + { +- "referenced_type" : "type-1655" ++ "referenced_type" : "type-1651" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h" + }, + { +@@ -10261,13 +10445,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1273" ++ "referenced_type" : "type-1269" + }, + { +- "referenced_type" : "type-588" ++ "referenced_type" : "type-586" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h" + }, + { +@@ -10277,13 +10461,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1273" ++ "referenced_type" : "type-1269" + }, + { +- "referenced_type" : "type-588" ++ "referenced_type" : "type-586" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h" + }, + { +@@ -10293,16 +10477,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-889" ++ "referenced_type" : "type-886" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1255" ++ "referenced_type" : "type-1252" + }, + { +- "referenced_type" : "type-1256" ++ "referenced_type" : "type-1253" + }, + { + "default_arg" : true, +@@ -10310,7 +10494,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-1662" ++ "referenced_type" : "type-1658" + } + ], + "return_type" : "type-19", +@@ -10324,13 +10508,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-889" ++ "referenced_type" : "type-886" + }, + { +- "referenced_type" : "type-1663" ++ "referenced_type" : "type-1659" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, + { +@@ -10339,16 +10523,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1255" ++ "referenced_type" : "type-1252" + }, + { +- "referenced_type" : "type-1256" ++ "referenced_type" : "type-1253" + }, + { +- "referenced_type" : "type-1664" ++ "referenced_type" : "type-1660" + } + ], + "return_type" : "type-19", +@@ -10362,10 +10546,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-889" ++ "referenced_type" : "type-886" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, + { +@@ -10375,13 +10559,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-889" ++ "referenced_type" : "type-886" + }, + { +- "referenced_type" : "type-787" ++ "referenced_type" : "type-784" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, + { +@@ -10391,13 +10575,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-889" ++ "referenced_type" : "type-886" + }, + { +- "referenced_type" : "type-787" ++ "referenced_type" : "type-784" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, + { +@@ -10407,10 +10591,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-889" ++ "referenced_type" : "type-886" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, + { +@@ -10420,10 +10604,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-889" ++ "referenced_type" : "type-886" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, + { +@@ -10433,10 +10617,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-889" ++ "referenced_type" : "type-886" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, + { +@@ -10446,16 +10630,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-896" ++ "referenced_type" : "type-893" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1309" ++ "referenced_type" : "type-1306" + }, + { +- "referenced_type" : "type-1310" ++ "referenced_type" : "type-1307" + }, + { + "default_arg" : true, +@@ -10463,7 +10647,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-1665" ++ "referenced_type" : "type-1661" + } + ], + "return_type" : "type-19", +@@ -10477,13 +10661,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-896" ++ "referenced_type" : "type-893" + }, + { +- "referenced_type" : "type-1666" ++ "referenced_type" : "type-1662" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h" + }, + { +@@ -10492,16 +10676,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1309" ++ "referenced_type" : "type-1306" + }, + { +- "referenced_type" : "type-1310" ++ "referenced_type" : "type-1307" + }, + { +- "referenced_type" : "type-1667" ++ "referenced_type" : "type-1663" + } + ], + "return_type" : "type-19", +@@ -10513,16 +10697,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1309" ++ "referenced_type" : "type-1306" + }, + { +- "referenced_type" : "type-1310" ++ "referenced_type" : "type-1307" + }, + { +- "referenced_type" : "type-1668" ++ "referenced_type" : "type-1664" + } + ], + "return_type" : "type-19", +@@ -10534,16 +10718,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1309" ++ "referenced_type" : "type-1306" + }, + { +- "referenced_type" : "type-1310" ++ "referenced_type" : "type-1307" + }, + { +- "referenced_type" : "type-1669" ++ "referenced_type" : "type-1665" + } + ], + "return_type" : "type-19", +@@ -10555,16 +10739,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1309" ++ "referenced_type" : "type-1306" + }, + { +- "referenced_type" : "type-1310" ++ "referenced_type" : "type-1307" + }, + { +- "referenced_type" : "type-1670" ++ "referenced_type" : "type-1666" + } + ], + "return_type" : "type-19", +@@ -10576,16 +10760,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1309" ++ "referenced_type" : "type-1306" + }, + { +- "referenced_type" : "type-1310" ++ "referenced_type" : "type-1307" + }, + { +- "referenced_type" : "type-1671" ++ "referenced_type" : "type-1667" + } + ], + "return_type" : "type-19", +@@ -10599,10 +10783,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-896" ++ "referenced_type" : "type-893" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h" + }, + { +@@ -10612,13 +10796,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-896" ++ "referenced_type" : "type-893" + }, + { +- "referenced_type" : "type-773" ++ "referenced_type" : "type-769" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h" + }, + { +@@ -10628,13 +10812,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-896" ++ "referenced_type" : "type-893" + }, + { +- "referenced_type" : "type-773" ++ "referenced_type" : "type-769" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h" + }, + { +@@ -10644,10 +10828,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-896" ++ "referenced_type" : "type-893" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h" + }, + { +@@ -10657,10 +10841,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-896" ++ "referenced_type" : "type-893" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h" + }, + { +@@ -10670,10 +10854,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-896" ++ "referenced_type" : "type-893" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h" + }, + { +@@ -10683,16 +10867,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10702,13 +10886,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-1672" ++ "referenced_type" : "type-1668" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10718,13 +10902,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-1673" ++ "referenced_type" : "type-1669" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10734,13 +10918,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10750,13 +10934,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-1674" ++ "referenced_type" : "type-1670" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10765,19 +10949,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1203" ++ "referenced_type" : "type-1200" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10787,13 +10971,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1671" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10803,10 +10987,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10816,10 +11000,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10829,10 +11013,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10842,16 +11026,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10861,16 +11045,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10880,13 +11064,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10896,13 +11080,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10912,16 +11096,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -10931,19 +11115,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -10953,13 +11137,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-1676" ++ "referenced_type" : "type-1672" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -10969,13 +11153,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-1677" ++ "referenced_type" : "type-1673" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -10985,16 +11169,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-807", ++ "return_type" : "type-804", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11004,19 +11188,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11026,13 +11210,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11042,13 +11226,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-1678" ++ "referenced_type" : "type-1674" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11058,16 +11242,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-1679" ++ "referenced_type" : "type-1675" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11076,22 +11260,22 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1277" ++ "referenced_type" : "type-1273" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11100,22 +11284,22 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1277" ++ "referenced_type" : "type-1273" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11125,13 +11309,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-1680" ++ "referenced_type" : "type-1676" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11141,10 +11325,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11154,10 +11338,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11167,22 +11351,22 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-787" ++ "referenced_type" : "type-784" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11192,16 +11376,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-1681" ++ "referenced_type" : "type-1677" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11211,19 +11395,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11233,16 +11417,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-787" ++ "referenced_type" : "type-784" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11252,16 +11436,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11271,19 +11455,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11292,25 +11476,25 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1277" ++ "referenced_type" : "type-1273" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-787" ++ "referenced_type" : "type-784" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11319,19 +11503,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1277" ++ "referenced_type" : "type-1273" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-1682" ++ "referenced_type" : "type-1678" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11340,19 +11524,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1277" ++ "referenced_type" : "type-1273" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-787" ++ "referenced_type" : "type-784" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11362,16 +11546,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11381,16 +11565,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-801", ++ "return_type" : "type-798", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11400,13 +11584,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-1683" ++ "referenced_type" : "type-1679" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11416,10 +11600,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11429,16 +11613,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11448,13 +11632,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-1684" ++ "referenced_type" : "type-1680" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11464,13 +11648,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11480,13 +11664,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11497,10 +11681,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11510,14 +11694,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { +- "referenced_type" : "type-2405" ++ "referenced_type" : "type-2400" + }, + { + "default_arg" : true, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "default_arg" : true, +@@ -11534,22 +11718,22 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-2345" ++ "referenced_type" : "type-2340" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11559,13 +11743,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11575,10 +11759,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], +- "return_type" : "type-2335", ++ "return_type" : "type-2330", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11588,10 +11772,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11601,10 +11785,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2423" ++ "referenced_type" : "type-2418" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11614,22 +11798,22 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2423" ++ "referenced_type" : "type-2418" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-2345" ++ "referenced_type" : "type-2340" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11639,13 +11823,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2423" ++ "referenced_type" : "type-2418" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11655,10 +11839,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2423" ++ "referenced_type" : "type-2418" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11668,10 +11852,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2423" ++ "referenced_type" : "type-2418" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11681,10 +11865,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2423" ++ "referenced_type" : "type-2418" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11694,10 +11878,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2423" ++ "referenced_type" : "type-2418" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11707,14 +11891,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { +- "referenced_type" : "type-2359" ++ "referenced_type" : "type-2354" + }, + { + "default_arg" : true, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "default_arg" : true, +@@ -11722,7 +11906,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-949" ++ "referenced_type" : "type-946" + } + ], + "return_type" : "type-19", +@@ -11736,13 +11920,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { +- "referenced_type" : "type-2414" ++ "referenced_type" : "type-2409" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11753,13 +11937,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11770,16 +11954,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11789,7 +11973,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], + "return_type" : "type-19", +@@ -11802,16 +11986,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2354" ++ "referenced_type" : "type-2349" + }, + { +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "default_arg" : true, +@@ -11819,7 +12003,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-2791" ++ "referenced_type" : "type-2785" + } + ], + "return_type" : "type-19", +@@ -11832,13 +12016,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11848,13 +12032,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11865,10 +12049,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11879,10 +12063,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11893,10 +12077,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11905,10 +12089,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-126" ++ "referenced_type" : "type-125" + } + ], +- "return_type" : "type-157", ++ "return_type" : "type-156", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -11917,10 +12101,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-124" ++ "referenced_type" : "type-123" + } + ], +- "return_type" : "type-157", ++ "return_type" : "type-156", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -11929,7 +12113,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { + "referenced_type" : "type-19" +@@ -11938,7 +12122,7 @@ + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-157", ++ "return_type" : "type-156", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -11949,10 +12133,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-158" ++ "referenced_type" : "type-157" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { + "referenced_type" : "type-86" +@@ -11961,7 +12145,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -11972,10 +12156,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-158" ++ "referenced_type" : "type-157" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -11986,10 +12170,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-158" ++ "referenced_type" : "type-157" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { + "referenced_type" : "type-86" +@@ -11998,7 +12182,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12009,10 +12193,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-158" ++ "referenced_type" : "type-157" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12022,10 +12206,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-158" ++ "referenced_type" : "type-157" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12035,10 +12219,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-158" ++ "referenced_type" : "type-157" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12048,10 +12232,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-158" ++ "referenced_type" : "type-157" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12060,10 +12244,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2551" ++ "referenced_type" : "type-2546" + } + ], +- "return_type" : "type-71", ++ "return_type" : "type-70", + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h" + }, + { +@@ -12072,10 +12256,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2544" ++ "referenced_type" : "type-2539" + } + ], +- "return_type" : "type-71", ++ "return_type" : "type-70", + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h" + }, + { +@@ -12085,10 +12269,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2548" ++ "referenced_type" : "type-2543" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h" + }, + { +@@ -12099,10 +12283,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2548" ++ "referenced_type" : "type-2543" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h" + }, + { +@@ -12113,10 +12297,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2548" ++ "referenced_type" : "type-2543" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h" + }, + { +@@ -12127,10 +12311,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2548" ++ "referenced_type" : "type-2543" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h" + }, + { +@@ -12140,10 +12324,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3884" ++ "referenced_type" : "type-3877" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -12153,10 +12337,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3884" ++ "referenced_type" : "type-3877" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -12166,10 +12350,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3884" ++ "referenced_type" : "type-3877" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -12179,10 +12363,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3884" ++ "referenced_type" : "type-3877" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -12191,12 +12375,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-356", ++ "return_type" : "type-355", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h", +- "template_args" : [ "type-34", "type-419", "type-355" ] ++ "template_args" : [ "type-34", "type-417", "type-354" ] + }, + { + "function_name" : "android::hardware::fromBinder", +@@ -12204,12 +12388,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-590", ++ "return_type" : "type-588", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h", +- "template_args" : [ "type-541", "type-864", "type-862" ] ++ "template_args" : [ "type-539", "type-861", "type-859" ] + }, + { + "function_name" : "android::hardware::fromBinder", +@@ -12217,12 +12401,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-595", ++ "return_type" : "type-593", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h", +- "template_args" : [ "type-544", "type-890", "type-888" ] ++ "template_args" : [ "type-542", "type-887", "type-884" ] + }, + { + "function_name" : "android::hardware::fromBinder", +@@ -12230,12 +12414,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-585", ++ "return_type" : "type-583", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h", +- "template_args" : [ "type-565", "type-774", "type-845" ] ++ "template_args" : [ "type-563", "type-770", "type-842" ] + }, + { + "access" : "protected", +@@ -12245,10 +12429,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2368" ++ "referenced_type" : "type-2363" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -12259,13 +12443,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2368" ++ "referenced_type" : "type-2363" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -12276,16 +12460,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2368" ++ "referenced_type" : "type-2363" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -12296,13 +12480,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2368" ++ "referenced_type" : "type-2363" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -12313,13 +12497,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2368" ++ "referenced_type" : "type-2363" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -12330,10 +12514,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2368" ++ "referenced_type" : "type-2363" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -12344,10 +12528,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2368" ++ "referenced_type" : "type-2363" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -12358,10 +12542,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2368" ++ "referenced_type" : "type-2363" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -12372,10 +12556,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12385,17 +12569,17 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { +- "referenced_type" : "type-91" ++ "referenced_type" : "type-90" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12405,13 +12589,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { + "referenced_type" : "type-86" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12421,13 +12605,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { + "referenced_type" : "type-16" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12437,13 +12621,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12453,10 +12637,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12466,13 +12650,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { + "referenced_type" : "type-86" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12482,13 +12666,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { + "referenced_type" : "type-16" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12498,13 +12682,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12514,10 +12698,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12527,10 +12711,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12540,10 +12724,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12553,13 +12737,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { + "referenced_type" : "type-86" + } + ], +- "return_type" : "type-88", ++ "return_type" : "type-87", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12569,13 +12753,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { + "referenced_type" : "type-16" + } + ], +- "return_type" : "type-88", ++ "return_type" : "type-87", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12585,13 +12769,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + } + ], +- "return_type" : "type-88", ++ "return_type" : "type-87", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12601,16 +12785,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12620,10 +12804,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12634,16 +12818,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12654,13 +12838,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-116" ++ "referenced_type" : "type-115" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12670,13 +12854,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-116" ++ "referenced_type" : "type-115" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12686,13 +12870,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12702,16 +12886,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12721,13 +12905,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-115" ++ "referenced_type" : "type-114" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12737,13 +12921,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12753,10 +12937,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12766,13 +12950,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-116" ++ "referenced_type" : "type-115" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12782,13 +12966,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12798,16 +12982,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12817,13 +13001,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-115" ++ "referenced_type" : "type-114" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12833,13 +13017,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12849,10 +13033,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12862,10 +13046,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12875,10 +13059,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12888,13 +13072,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-116" ++ "referenced_type" : "type-115" + } + ], +- "return_type" : "type-118", ++ "return_type" : "type-117", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12904,13 +13088,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "return_type" : "type-118", ++ "return_type" : "type-117", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12920,13 +13104,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-115" ++ "referenced_type" : "type-114" + } + ], +- "return_type" : "type-118", ++ "return_type" : "type-117", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12936,19 +13120,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-118", ++ "return_type" : "type-117", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "function_name" : "android::hardware::ProcessState::selfOrNull", + "linker_set_key" : "_ZN7android8hardware12ProcessState10selfOrNullEv", +- "return_type" : "type-491", ++ "return_type" : "type-489", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -12958,7 +13142,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2441" ++ "referenced_type" : "type-2436" + } + ], + "return_type" : "type-1", +@@ -12971,16 +13155,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2441" ++ "referenced_type" : "type-2436" + }, + { + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -12990,7 +13174,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2441" ++ "referenced_type" : "type-2436" + } + ], + "return_type" : "type-1", +@@ -13003,10 +13187,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2441" ++ "referenced_type" : "type-2436" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13016,13 +13200,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2441" ++ "referenced_type" : "type-2436" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-71", ++ "return_type" : "type-70", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13032,16 +13216,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2441" ++ "referenced_type" : "type-2436" + }, + { +- "referenced_type" : "type-350" ++ "referenced_type" : "type-349" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-71", ++ "return_type" : "type-70", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13053,7 +13237,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-491", ++ "return_type" : "type-489", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13063,13 +13247,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2441" ++ "referenced_type" : "type-2436" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13079,16 +13263,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2441" ++ "referenced_type" : "type-2436" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + }, + { +- "referenced_type" : "type-350" ++ "referenced_type" : "type-349" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13098,13 +13282,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2441" ++ "referenced_type" : "type-2436" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13114,10 +13298,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2441" ++ "referenced_type" : "type-2436" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13128,13 +13312,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2441" ++ "referenced_type" : "type-2436" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-3807", ++ "return_type" : "type-3800", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13144,13 +13328,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2441" ++ "referenced_type" : "type-2436" + }, + { +- "referenced_type" : "type-2432" ++ "referenced_type" : "type-2427" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13160,13 +13344,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2441" ++ "referenced_type" : "type-2436" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + } + ], + "return_type" : "type-19", +@@ -13179,16 +13363,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2441" ++ "referenced_type" : "type-2436" + }, + { +- "referenced_type" : "type-2431" ++ "referenced_type" : "type-2426" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13199,10 +13383,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2441" ++ "referenced_type" : "type-2436" + } + ], +- "return_type" : "type-221", ++ "return_type" : "type-220", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13212,13 +13396,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2441" ++ "referenced_type" : "type-2436" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-2381", ++ "return_type" : "type-2376", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13228,13 +13412,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2441" ++ "referenced_type" : "type-2436" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-71", ++ "return_type" : "type-70", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13244,13 +13428,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2441" ++ "referenced_type" : "type-2436" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "return_type" : "type-19", +@@ -13263,7 +13447,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2441" ++ "referenced_type" : "type-2436" + }, + { + "referenced_type" : "type-19" +@@ -13275,7 +13459,7 @@ + { + "function_name" : "android::hardware::ProcessState::self", + "linker_set_key" : "_ZN7android8hardware12ProcessState4selfEv", +- "return_type" : "type-491", ++ "return_type" : "type-489", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13286,13 +13470,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2441" ++ "referenced_type" : "type-2436" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13303,13 +13487,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2441" ++ "referenced_type" : "type-2436" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13320,10 +13504,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2441" ++ "referenced_type" : "type-2436" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13334,10 +13518,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2441" ++ "referenced_type" : "type-2436" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13348,10 +13532,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2441" ++ "referenced_type" : "type-2436" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13360,10 +13544,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-137" ++ "referenced_type" : "type-136" + }, + { +- "referenced_type" : "type-373" ++ "referenced_type" : "type-372" + } + ], + "return_type" : "type-19", +@@ -13375,10 +13559,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-168" ++ "referenced_type" : "type-167" + }, + { +- "referenced_type" : "type-371" ++ "referenced_type" : "type-370" + } + ], + "return_type" : "type-19", +@@ -13391,31 +13575,31 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-1030" ++ "referenced_type" : "type-1027" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2352" ++ "referenced_type" : "type-2347" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { + "function_name" : "android::hardware::IPCThreadState::selfOrNull", + "linker_set_key" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv", +- "return_type" : "type-3636", ++ "return_type" : "type-3629", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13426,10 +13610,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13439,14 +13623,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13456,10 +13640,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + }, + { +- "referenced_type" : "type-521" ++ "referenced_type" : "type-519" + } + ], + "return_type" : "type-19", +@@ -13472,13 +13656,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13490,10 +13674,10 @@ + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13503,10 +13687,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13516,16 +13700,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + }, + { + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13535,7 +13719,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + } + ], + "return_type" : "type-19", +@@ -13549,7 +13733,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + }, + { + "referenced_type" : "type-19" +@@ -13565,10 +13749,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13578,14 +13762,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13596,11 +13780,11 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "return_type" : "type-19", +@@ -13613,13 +13797,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13629,16 +13813,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + }, + { + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13649,14 +13833,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + }, + { +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "default_arg" : true, +- "referenced_type" : "type-521" ++ "referenced_type" : "type-519" + } + ], + "return_type" : "type-19", +@@ -13669,10 +13853,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13682,13 +13866,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + }, + { +- "referenced_type" : "type-3642" ++ "referenced_type" : "type-3635" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13698,10 +13882,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13711,13 +13895,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13727,13 +13911,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + }, + { +- "referenced_type" : "type-472" ++ "referenced_type" : "type-470" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13743,7 +13927,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + } + ], + "return_type" : "type-447", +@@ -13757,7 +13941,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + } + ], + "return_type" : "type-19", +@@ -13770,7 +13954,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + } + ], + "return_type" : "type-19", +@@ -13784,10 +13968,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13798,7 +13982,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + }, + { + "referenced_type" : "type-19" +@@ -13813,10 +13997,10 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2354" ++ "referenced_type" : "type-2349" + }, + { +- "referenced_type" : "type-521" ++ "referenced_type" : "type-519" + } + ], + "return_type" : "type-19", +@@ -13829,7 +14013,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + }, + { + "referenced_type" : "type-19" +@@ -13845,13 +14029,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + }, + { + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], + "return_type" : "type-19", +@@ -13865,10 +14049,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13878,13 +14062,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + }, + { + "referenced_type" : "type-447" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13894,13 +14078,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + }, + { + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], + "return_type" : "type-19", +@@ -13913,10 +14097,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13926,10 +14110,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13939,19 +14123,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { + "function_name" : "android::hardware::IPCThreadState::self", + "linker_set_key" : "_ZN7android8hardware14IPCThreadState4selfEv", +- "return_type" : "type-3636", ++ "return_type" : "type-3629", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13961,16 +14145,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + } + ], +- "return_type" : "type-491", ++ "return_type" : "type-489", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { + "function_name" : "android::hardware::IPCThreadState::shutdown", + "linker_set_key" : "_ZN7android8hardware14IPCThreadState8shutdownEv", +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13980,7 +14164,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + }, + { + "referenced_type" : "type-19" +@@ -13989,10 +14173,10 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2354" ++ "referenced_type" : "type-2349" + }, + { +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -14009,10 +14193,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + }, + { +- "referenced_type" : "type-2354" ++ "referenced_type" : "type-2349" + }, + { + "referenced_type" : "type-1" +@@ -14029,10 +14213,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -14043,10 +14227,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -14057,10 +14241,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -14071,10 +14255,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3636" ++ "referenced_type" : "type-3629" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -14083,10 +14267,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-166" ++ "referenced_type" : "type-165" + }, + { +- "referenced_type" : "type-370" ++ "referenced_type" : "type-369" + } + ], + "return_type" : "type-19", +@@ -14098,10 +14282,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-370" ++ "referenced_type" : "type-369" + } + ], +- "return_type" : "type-134", ++ "return_type" : "type-133", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -14110,16 +14294,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-3620" ++ "referenced_type" : "type-3613" + }, + { +- "referenced_type" : "type-3769" ++ "referenced_type" : "type-3762" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -14128,13 +14312,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, + { +@@ -14149,19 +14333,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, + { + "function_name" : "android::hardware::joinRpcThreadpool", + "linker_set_key" : "_ZN7android8hardware17joinRpcThreadpoolEv", +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, + { +@@ -14171,13 +14355,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2505" ++ "referenced_type" : "type-2500" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { +@@ -14187,17 +14371,17 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2505" ++ "referenced_type" : "type-2500" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { + "access" : "private", + "function_name" : "android::hardware::BufferedTextOutput::getThreadState", + "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv", +- "return_type" : "type-2506", ++ "return_type" : "type-2501", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { +@@ -14207,10 +14391,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { +@@ -14220,10 +14404,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2505" ++ "referenced_type" : "type-2500" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { + "referenced_type" : "type-1" +@@ -14239,10 +14423,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2505" ++ "referenced_type" : "type-2500" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { +@@ -14252,14 +14436,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2505" ++ "referenced_type" : "type-2500" + }, + { + "default_arg" : true, + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { +@@ -14269,10 +14453,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2505" ++ "referenced_type" : "type-2500" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { +@@ -14282,10 +14466,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2505" ++ "referenced_type" : "type-2500" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { +@@ -14295,10 +14479,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2505" ++ "referenced_type" : "type-2500" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { +@@ -14307,10 +14491,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-376" ++ "referenced_type" : "type-375" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -14338,14 +14522,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-532" ++ "referenced_type" : "type-530" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { + "default_arg" : true, +- "referenced_type" : "type-535" ++ "referenced_type" : "type-533" + } + ], + "return_type" : "type-19", +@@ -14358,10 +14542,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-532" ++ "referenced_type" : "type-530" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, + { +@@ -14371,16 +14555,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-532" ++ "referenced_type" : "type-530" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, + { + "function_name" : "android::hardware::defaultServiceManager", + "linker_set_key" : "_ZN7android8hardware21defaultServiceManagerEv", +- "return_type" : "type-575", ++ "return_type" : "type-573", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { +@@ -14389,7 +14573,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { + "referenced_type" : "type-19" +@@ -14398,7 +14582,7 @@ + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, + { +@@ -14413,10 +14597,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-371" ++ "referenced_type" : "type-370" + }, + { + "referenced_type" : "type-1" +@@ -14434,10 +14618,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-124" ++ "referenced_type" : "type-123" + }, + { +- "referenced_type" : "type-371" ++ "referenced_type" : "type-370" + }, + { + "referenced_type" : "type-1" +@@ -14455,10 +14639,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-371" ++ "referenced_type" : "type-370" + }, + { + "referenced_type" : "type-1" +@@ -14479,10 +14663,10 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, + { +@@ -14491,10 +14675,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-370" ++ "referenced_type" : "type-369" + }, + { + "referenced_type" : "type-1" +@@ -14512,10 +14696,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-124" ++ "referenced_type" : "type-123" + }, + { +- "referenced_type" : "type-370" ++ "referenced_type" : "type-369" + }, + { + "referenced_type" : "type-1" +@@ -14533,10 +14717,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-370" ++ "referenced_type" : "type-369" + }, + { + "referenced_type" : "type-1" +@@ -14557,25 +14741,25 @@ + "referenced_type" : "type-33" + } + ], +- "return_type" : "type-71", ++ "return_type" : "type-70", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { + "function_name" : "android::hardware::joinBinderRpcThreadpool", + "linker_set_key" : "_ZN7android8hardware23joinBinderRpcThreadpoolEv", +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { + "function_name" : "android::hardware::defaultServiceManager1_1", + "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_1Ev", +- "return_type" : "type-580", ++ "return_type" : "type-578", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { + "function_name" : "android::hardware::defaultServiceManager1_2", + "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_2Ev", +- "return_type" : "type-585", ++ "return_type" : "type-583", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { +@@ -14585,13 +14769,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-363" ++ "referenced_type" : "type-362" + }, + { +- "referenced_type" : "type-367" ++ "referenced_type" : "type-366" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -14601,10 +14785,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-363" ++ "referenced_type" : "type-362" + } + ], +- "return_type" : "type-361", ++ "return_type" : "type-360", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -14614,19 +14798,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-363" ++ "referenced_type" : "type-362" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -14636,19 +14820,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-363" ++ "referenced_type" : "type-362" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -14660,22 +14844,22 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { + "function_name" : "android::hardware::getPassthroughServiceManager", + "linker_set_key" : "_ZN7android8hardware28getPassthroughServiceManagerEv", +- "return_type" : "type-575", ++ "return_type" : "type-573", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { + "function_name" : "android::hardware::getPassthroughServiceManager1_1", + "linker_set_key" : "_ZN7android8hardware31getPassthroughServiceManager1_1Ev", +- "return_type" : "type-580", ++ "return_type" : "type-578", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { +@@ -14684,10 +14868,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-176" ++ "referenced_type" : "type-175" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -14697,10 +14881,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-298" ++ "referenced_type" : "type-297" + } + ], + "return_type" : "type-19", +@@ -14713,7 +14897,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-2" +@@ -14729,7 +14913,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-19" +@@ -14745,7 +14929,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-447" +@@ -14761,10 +14945,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-199" ++ "referenced_type" : "type-198" + } + ], + "return_type" : "type-19", +@@ -14778,7 +14962,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -14794,7 +14978,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -14810,16 +14994,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + } + ], + "return_type" : "type-19", +@@ -14832,7 +15016,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-4" +@@ -14848,15 +15032,15 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-3769" ++ "referenced_type" : "type-3762" + } + ], + "return_type" : "type-19", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-4081" ] ++ "template_args" : [ "type-4073" ] + }, + { + "function_name" : "android::hardware::Parcel::writeUint16", +@@ -14865,10 +15049,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + } + ], + "return_type" : "type-19", +@@ -14881,7 +15065,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -14897,7 +15081,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-21" +@@ -14914,7 +15098,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -14930,10 +15114,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], + "return_type" : "type-19", +@@ -14946,13 +15130,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-245", ++ "return_type" : "type-244", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -14963,7 +15147,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -14980,7 +15164,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -14996,10 +15180,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-343" ++ "referenced_type" : "type-342" + }, + { + "referenced_type" : "type-1" +@@ -15015,10 +15199,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-350" ++ "referenced_type" : "type-349" + } + ], + "return_type" : "type-19", +@@ -15031,10 +15215,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], + "return_type" : "type-19", +@@ -15047,10 +15231,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { + "referenced_type" : "type-1" +@@ -15067,10 +15251,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15081,10 +15265,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15095,10 +15279,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15108,10 +15292,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + }, + { + "referenced_type" : "type-1" +@@ -15130,7 +15314,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -15146,10 +15330,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-3750" ++ "referenced_type" : "type-3743" + } + ], + "return_type" : "type-19", +@@ -15162,10 +15346,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], + "return_type" : "type-19", +@@ -15184,10 +15368,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + } + ], + "return_type" : "type-19", +@@ -15207,28 +15391,28 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-1030" ++ "referenced_type" : "type-1027" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2352" ++ "referenced_type" : "type-2347" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2350" ++ "referenced_type" : "type-2345" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15238,16 +15422,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + }, + { + "referenced_type" : "type-1" +@@ -15266,10 +15450,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], + "return_type" : "type-19", +@@ -15282,10 +15466,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15296,7 +15480,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], + "return_type" : "type-19", +@@ -15309,10 +15493,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + }, + { + "referenced_type" : "type-1" +@@ -15337,7 +15521,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-16" +@@ -15353,13 +15537,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-16" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "default_arg" : true, +@@ -15380,7 +15564,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-16" +@@ -15402,10 +15586,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + }, + { + "referenced_type" : "type-1" +@@ -15424,10 +15608,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { + "referenced_type" : "type-1" +@@ -15443,7 +15627,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -15452,7 +15636,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15462,10 +15646,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-1030" ++ "referenced_type" : "type-1027" + }, + { + "referenced_type" : "type-1" +@@ -15481,10 +15665,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15495,7 +15679,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -15511,13 +15695,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15528,10 +15712,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15541,10 +15725,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "return_type" : "type-19", +@@ -15557,7 +15741,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-550" +@@ -15573,10 +15757,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15586,10 +15770,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15599,10 +15783,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15612,10 +15796,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15627,7 +15811,7 @@ + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-104", ++ "return_type" : "type-103", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -15637,16 +15821,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-166" ++ "referenced_type" : "type-165" + }, + { + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -15656,13 +15840,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-166" ++ "referenced_type" : "type-165" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -15674,7 +15858,7 @@ + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-104", ++ "return_type" : "type-103", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -15686,16 +15870,16 @@ + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "return_type" : "type-104", ++ "return_type" : "type-103", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { + "function_name" : "android::hardware::Status::ok", + "linker_set_key" : "_ZN7android8hardware6Status2okEv", +- "return_type" : "type-104", ++ "return_type" : "type-103", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -15706,7 +15890,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-166" ++ "referenced_type" : "type-165" + }, + { + "referenced_type" : "type-19" +@@ -15715,7 +15899,7 @@ + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -15726,7 +15910,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-166" ++ "referenced_type" : "type-165" + }, + { + "referenced_type" : "type-19" +@@ -15735,10 +15919,10 @@ + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -15749,7 +15933,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-166" ++ "referenced_type" : "type-165" + }, + { + "referenced_type" : "type-19" +@@ -15758,7 +15942,7 @@ + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -15769,7 +15953,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-166" ++ "referenced_type" : "type-165" + }, + { + "referenced_type" : "type-19" +@@ -15778,10 +15962,10 @@ + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -15791,10 +15975,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2485" ++ "referenced_type" : "type-2480" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { + "referenced_type" : "type-1" +@@ -15804,7 +15988,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -15814,10 +15998,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2485" ++ "referenced_type" : "type-2480" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { + "referenced_type" : "type-1" +@@ -15827,7 +16011,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -15837,10 +16021,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + } + ], +- "return_type" : "type-2332", ++ "return_type" : "type-2327", + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, + { +@@ -15850,10 +16034,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + } + ], +- "return_type" : "type-2335", ++ "return_type" : "type-2330", + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, + { +@@ -15863,10 +16047,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, + { +@@ -15877,10 +16061,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, + { +@@ -15891,10 +16075,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, + { +@@ -15905,10 +16089,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, + { +@@ -15918,13 +16102,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-301" ++ "referenced_type" : "type-300" + }, + { +- "referenced_type" : "type-308" ++ "referenced_type" : "type-307" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, + { +@@ -15934,13 +16118,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-301" ++ "referenced_type" : "type-300" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, + { +@@ -15950,10 +16134,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-301" ++ "referenced_type" : "type-300" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, + { +@@ -15963,10 +16147,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-301" ++ "referenced_type" : "type-300" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, + { +@@ -15976,10 +16160,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-301" ++ "referenced_type" : "type-300" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, + { +@@ -15989,16 +16173,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-301" ++ "referenced_type" : "type-300" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, + { + "function_name" : "android::hardware::details::debuggable", + "linker_set_key" : "_ZN7android8hardware7details10debuggableEv", +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -16007,18 +16191,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-356" ++ "referenced_type" : "type-355" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-986", ++ "return_type" : "type-983", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-552", "type-34", "type-873" ] ++ "template_args" : [ "type-548", "type-34", "type-870" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16026,18 +16210,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-356" ++ "referenced_type" : "type-355" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1093", ++ "return_type" : "type-1090", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-541", "type-34", "type-864" ] ++ "template_args" : [ "type-539", "type-34", "type-861" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16045,18 +16229,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-356" ++ "referenced_type" : "type-355" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1153", ++ "return_type" : "type-1150", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-562", "type-34", "type-881" ] ++ "template_args" : [ "type-560", "type-34", "type-878" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16064,18 +16248,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-575" ++ "referenced_type" : "type-573" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1153", ++ "return_type" : "type-1150", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-562", "type-552", "type-881" ] ++ "template_args" : [ "type-560", "type-548", "type-878" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16083,18 +16267,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-356" ++ "referenced_type" : "type-355" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1213", ++ "return_type" : "type-1210", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-544", "type-34", "type-890" ] ++ "template_args" : [ "type-542", "type-34", "type-887" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16102,18 +16286,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-356" ++ "referenced_type" : "type-355" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1284", ++ "return_type" : "type-1281", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-565", "type-34", "type-774" ] ++ "template_args" : [ "type-563", "type-34", "type-770" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16121,18 +16305,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-575" ++ "referenced_type" : "type-573" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1284", ++ "return_type" : "type-1281", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-565", "type-552", "type-774" ] ++ "template_args" : [ "type-563", "type-548", "type-770" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16140,18 +16324,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-580" ++ "referenced_type" : "type-578" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1284", ++ "return_type" : "type-1281", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-565", "type-562", "type-774" ] ++ "template_args" : [ "type-563", "type-560", "type-770" ] + }, + { + "function_name" : "android::hardware::details::getDescriptor", +@@ -16162,7 +16346,7 @@ + "referenced_type" : "type-33" + } + ], +- "return_type" : "type-685", ++ "return_type" : "type-683", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h" + }, + { +@@ -16172,10 +16356,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-172" ++ "referenced_type" : "type-171" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -16185,10 +16369,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-172" ++ "referenced_type" : "type-171" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -16198,13 +16382,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-172" ++ "referenced_type" : "type-171" + }, + { +- "referenced_type" : "type-173" ++ "referenced_type" : "type-172" + } + ], +- "return_type" : "type-266", ++ "return_type" : "type-265", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -16213,10 +16397,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16225,12 +16409,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-356" ++ "referenced_type" : "type-355" + } + ], +- "return_type" : "type-356", ++ "return_type" : "type-355", + "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h", +- "template_args" : [ "type-34", "type-106" ] ++ "template_args" : [ "type-34", "type-105" ] + }, + { + "function_name" : "android::hardware::details::wrapPassthrough", +@@ -16238,12 +16422,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-590" ++ "referenced_type" : "type-588" + } + ], +- "return_type" : "type-590", ++ "return_type" : "type-588", + "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h", +- "template_args" : [ "type-541", "type-106" ] ++ "template_args" : [ "type-539", "type-105" ] + }, + { + "function_name" : "android::hardware::details::wrapPassthrough", +@@ -16251,12 +16435,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-595" ++ "referenced_type" : "type-593" + } + ], +- "return_type" : "type-595", ++ "return_type" : "type-593", + "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h", +- "template_args" : [ "type-544", "type-106" ] ++ "template_args" : [ "type-542", "type-105" ] + }, + { + "access" : "protected", +@@ -16266,13 +16450,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-273" ++ "referenced_type" : "type-272" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16283,14 +16467,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16301,13 +16485,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-247" ++ "referenced_type" : "type-246" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16317,16 +16501,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-214" ++ "referenced_type" : "type-213" + }, + { +- "referenced_type" : "type-214" ++ "referenced_type" : "type-213" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16336,16 +16520,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-214" ++ "referenced_type" : "type-213" + }, + { +- "referenced_type" : "type-214" ++ "referenced_type" : "type-213" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16355,10 +16539,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16368,10 +16552,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16381,10 +16565,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16396,14 +16580,14 @@ + "referenced_type" : "type-33" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h" + }, + { +@@ -16418,19 +16602,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-849" ++ "referenced_type" : "type-845" + }, + { +- "referenced_type" : "type-849" ++ "referenced_type" : "type-845" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { + "function_name" : "android::hardware::details::getVndkVersionStr", + "linker_set_key" : "_ZN7android8hardware7details17getVndkVersionStrEv", +- "return_type" : "type-686", ++ "return_type" : "type-684", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16439,18 +16623,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1048" ++ "referenced_type" : "type-1045" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-575", ++ "return_type" : "type-573", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-873", "type-552", "type-106", "type-106" ] ++ "template_args" : [ "type-870", "type-548", "type-105", "type-105" ] + }, + { + "function_name" : "android::hardware::details::getServiceInternal", +@@ -16458,18 +16642,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1115" ++ "referenced_type" : "type-1112" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-590", ++ "return_type" : "type-588", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-864", "type-541", "type-106", "type-106" ] ++ "template_args" : [ "type-861", "type-539", "type-105", "type-105" ] + }, + { + "function_name" : "android::hardware::details::getServiceInternal", +@@ -16477,18 +16661,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1176" ++ "referenced_type" : "type-1173" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-580", ++ "return_type" : "type-578", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-881", "type-562", "type-106", "type-106" ] ++ "template_args" : [ "type-878", "type-560", "type-105", "type-105" ] + }, + { + "function_name" : "android::hardware::details::getServiceInternal", +@@ -16496,18 +16680,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1235" ++ "referenced_type" : "type-1232" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-595", ++ "return_type" : "type-593", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-890", "type-544", "type-106", "type-106" ] ++ "template_args" : [ "type-887", "type-542", "type-105", "type-105" ] + }, + { + "function_name" : "android::hardware::details::getServiceInternal", +@@ -16515,29 +16699,29 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1314" ++ "referenced_type" : "type-1311" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-585", ++ "return_type" : "type-583", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-774", "type-565", "type-106", "type-106" ] ++ "template_args" : [ "type-770", "type-563", "type-105", "type-105" ] + }, + { + "function_name" : "android::hardware::details::getBnConstructorMap", + "linker_set_key" : "_ZN7android8hardware7details19getBnConstructorMapEv", +- "return_type" : "type-926", ++ "return_type" : "type-923", + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, + { + "function_name" : "android::hardware::details::getBsConstructorMap", + "linker_set_key" : "_ZN7android8hardware7details19getBsConstructorMapEv", +- "return_type" : "type-927", ++ "return_type" : "type-924", + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, + { +@@ -16546,19 +16730,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-849" ++ "referenced_type" : "type-845" + }, + { +- "referenced_type" : "type-849" ++ "referenced_type" : "type-845" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-356", ++ "return_type" : "type-355", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { +@@ -16567,10 +16751,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-356" ++ "referenced_type" : "type-355" + } + ], +- "return_type" : "type-356", ++ "return_type" : "type-355", + "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h" + }, + { +@@ -16579,10 +16763,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-849" ++ "referenced_type" : "type-845" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { +@@ -16591,10 +16775,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-849" ++ "referenced_type" : "type-845" + } + ], + "return_type" : "type-19", +@@ -16608,16 +16792,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2354" ++ "referenced_type" : "type-2349" + }, + { +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "default_arg" : true, +@@ -16625,7 +16809,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-2792" ++ "referenced_type" : "type-2786" + } + ], + "return_type" : "type-19", +@@ -16638,14 +16822,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + }, + { +- "referenced_type" : "type-2357" ++ "referenced_type" : "type-2352" + }, + { + "default_arg" : true, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "default_arg" : true, +@@ -16662,10 +16846,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], +- "return_type" : "type-2332", ++ "return_type" : "type-2327", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16675,22 +16859,22 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-2345" ++ "referenced_type" : "type-2340" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16700,13 +16884,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16716,14 +16900,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + }, + { +- "referenced_type" : "type-2359" ++ "referenced_type" : "type-2354" + }, + { + "default_arg" : true, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "default_arg" : true, +@@ -16731,7 +16915,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-949" ++ "referenced_type" : "type-946" + } + ], + "return_type" : "type-19", +@@ -16744,10 +16928,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16758,13 +16942,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16775,10 +16959,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], +- "return_type" : "type-2362", ++ "return_type" : "type-2357", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16788,7 +16972,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], + "return_type" : "type-19", +@@ -16801,7 +16985,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], + "return_type" : "type-19", +@@ -16814,16 +16998,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2354" ++ "referenced_type" : "type-2349" + }, + { +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "default_arg" : true, +@@ -16831,7 +17015,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-2793" ++ "referenced_type" : "type-2787" + } + ], + "return_type" : "type-19", +@@ -16844,10 +17028,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16857,10 +17041,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16871,10 +17055,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16885,10 +17069,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16899,10 +17083,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16911,13 +17095,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2474" ++ "referenced_type" : "type-2469" + }, + { +- "referenced_type" : "type-3886" ++ "referenced_type" : "type-3879" + } + ], +- "return_type" : "type-2474", ++ "return_type" : "type-2469", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -16926,13 +17110,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2474" ++ "referenced_type" : "type-2469" + }, + { +- "referenced_type" : "type-3885" ++ "referenced_type" : "type-3878" + } + ], +- "return_type" : "type-2474", ++ "return_type" : "type-2469", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -16941,13 +17125,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-119" ++ "referenced_type" : "type-118" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-119", ++ "return_type" : "type-118", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -16956,412 +17140,1640 @@ + "parameters" : + [ + { +- "referenced_type" : "type-264" ++ "referenced_type" : "type-263" + }, + { +- "referenced_type" : "type-168" ++ "referenced_type" : "type-167" + } + ], +- "return_type" : "type-264", ++ "return_type" : "type-263", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +- "function_name" : "android::hardware::BpHwBinder::findObject", +- "linker_set_key" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_compare", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_compareEPKvSA_", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2372" ++ "referenced_type" : "type-3819" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-245", +- "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" ++ "return_type" : "type-19", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::BpHwBinder::ObjectManager::find", +- "linker_set_key" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_destroy", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_destroyEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2425" ++ "referenced_type" : "type-3819" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-245", +- "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::hidl_handle::getNativeHandle", +- "linker_set_key" : "_ZNK7android8hardware11hidl_handle15getNativeHandleEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_construct", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE12do_constructEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-95" ++ "referenced_type" : "type-3819" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-16", +- "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::hidl_handle::operator const native_handle *", +- "linker_set_key" : "_ZNK7android8hardware11hidl_handlecvPK13native_handleEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_move_forward", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE15do_move_forwardEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-95" ++ "referenced_type" : "type-3819" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-16", +- "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::hidl_handle::operator->", +- "linker_set_key" : "_ZNK7android8hardware11hidl_handleptEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_move_backward", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE16do_move_backwardEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-95" ++ "referenced_type" : "type-3819" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-16", +- "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::hidl_string::size", +- "linker_set_key" : "_ZNK7android8hardware11hidl_string4sizeEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_copy", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE7do_copyEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-117" ++ "referenced_type" : "type-3819" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-1", +- "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::hidl_string::c_str", +- "linker_set_key" : "_ZNK7android8hardware11hidl_string5c_strEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_splat", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE8do_splatEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-117" ++ "referenced_type" : "type-3819" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-99", +- "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::hidl_string::empty", +- "linker_set_key" : "_ZNK7android8hardware11hidl_string5emptyEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_compare", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_compareES3_S3_", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-117" ++ "referenced_type" : "type-2403" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-44", +- "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ "return_type" : "type-19", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::hidl_string::operator basic_string", +- "linker_set_key" : "_ZNK7android8hardware11hidl_stringcvNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_destroy", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_destroyEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-117" ++ "referenced_type" : "type-2403" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-700", +- "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::ProcessState::isContextManager", +- "linker_set_key" : "_ZNK7android8hardware12ProcessState16isContextManagerEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_construct", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE12do_constructEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3845" ++ "referenced_type" : "type-2403" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-44", +- "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::IPCThreadState::getCallingPid", +- "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_move_forward", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE15do_move_forwardEPvS3_j", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3639" ++ "referenced_type" : "type-2403" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::IPCThreadState::getCallingSid", +- "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_move_backward", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE16do_move_backwardEPvS3_j", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3639" ++ "referenced_type" : "type-2403" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-99", +- "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::IPCThreadState::getCallingUid", +- "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_copy", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE7do_copyEPvS3_j", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3639" ++ "referenced_type" : "type-2403" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-1", +- "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::IPCThreadState::isServingCall", +- "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_splat", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE8do_splatEPvS3_j", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3639" ++ "referenced_type" : "type-2403" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-44", +- "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::IPCThreadState::getStrictModePolicy", +- "linker_set_key" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv", ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE10do_destroyEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3639" ++ "referenced_type" : "type-2514" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::IPCThreadState::getLastTransactionBinderFlags", +- "linker_set_key" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv", ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE12do_constructEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3639" ++ "referenced_type" : "type-2514" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "access" : "private", +- "function_name" : "android::hardware::BufferedTextOutput::getBuffer", +- "linker_set_key" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv", ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2509" ++ "referenced_type" : "type-2514" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-2469", +- "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::clearCache", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10clearCacheEv", ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-2514" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::errorCheck", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10errorCheckEv", ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-2514" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::findBuffer", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_", ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-2514" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-1" ++ "referenced_type" : "type-138" + }, + { +- "referenced_type" : "type-3777" ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE10do_destroyEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2408" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::ipcObjects", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10ipcObjectsEv", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE12do_constructEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-2408" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-1", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::readBuffer", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE15do_move_forwardEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-2408" + }, + { +- "referenced_type" : "type-1" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-138" + }, + { +- "referenced_type" : "type-3781" ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::readBuffer", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE16do_move_backwardEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-2408" + }, + { +- "referenced_type" : "type-1" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-138" + }, + { + "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE7do_copyEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2408" + }, + { +- "referenced_type" : "type-1" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-1" ++ "referenced_type" : "type-138" + }, + { +- "referenced_type" : "type-3781" ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::readDouble", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEPd", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE8do_splatEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-2408" + }, + { +- "referenced_type" : "type-3776" ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::readDouble", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEv", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE10do_destroyEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3823" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-4", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::readObject", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE12do_constructEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3823" + }, + { +- "default_arg" : true, +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-3780", ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE15do_move_forwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3823" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE16do_move_backwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3823" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE7do_copyEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3823" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE8do_splatEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3823" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3620" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3620" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3620" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3620" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3620" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3620" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3624" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3624" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3624" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3624" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3624" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3624" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE10do_destroyEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3616" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE12do_constructEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3616" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE15do_move_forwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3616" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE16do_move_backwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3616" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE7do_copyEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3616" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE8do_splatEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3616" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorIiE10do_destroyEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2509" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorIiE12do_constructEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2509" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2509" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2509" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorIiE7do_copyEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2509" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorIiE8do_splatEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2509" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "function_name" : "android::hardware::BpHwBinder::findObject", ++ "linker_set_key" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2367" ++ }, ++ { ++ "referenced_type" : "type-138" ++ } ++ ], ++ "return_type" : "type-244", ++ "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" ++ }, ++ { ++ "function_name" : "android::hardware::BpHwBinder::ObjectManager::find", ++ "linker_set_key" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2420" ++ }, ++ { ++ "referenced_type" : "type-138" ++ } ++ ], ++ "return_type" : "type-244", ++ "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" ++ }, ++ { ++ "function_name" : "android::hardware::hidl_handle::getNativeHandle", ++ "linker_set_key" : "_ZNK7android8hardware11hidl_handle15getNativeHandleEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-94" ++ } ++ ], ++ "return_type" : "type-16", ++ "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ }, ++ { ++ "function_name" : "android::hardware::hidl_handle::operator const native_handle *", ++ "linker_set_key" : "_ZNK7android8hardware11hidl_handlecvPK13native_handleEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-94" ++ } ++ ], ++ "return_type" : "type-16", ++ "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ }, ++ { ++ "function_name" : "android::hardware::hidl_handle::operator->", ++ "linker_set_key" : "_ZNK7android8hardware11hidl_handleptEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-94" ++ } ++ ], ++ "return_type" : "type-16", ++ "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ }, ++ { ++ "function_name" : "android::hardware::hidl_string::size", ++ "linker_set_key" : "_ZNK7android8hardware11hidl_string4sizeEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-116" ++ } ++ ], ++ "return_type" : "type-1", ++ "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ }, ++ { ++ "function_name" : "android::hardware::hidl_string::c_str", ++ "linker_set_key" : "_ZNK7android8hardware11hidl_string5c_strEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-116" ++ } ++ ], ++ "return_type" : "type-98", ++ "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ }, ++ { ++ "function_name" : "android::hardware::hidl_string::empty", ++ "linker_set_key" : "_ZNK7android8hardware11hidl_string5emptyEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-116" ++ } ++ ], ++ "return_type" : "type-43", ++ "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ }, ++ { ++ "function_name" : "android::hardware::hidl_string::operator basic_string", ++ "linker_set_key" : "_ZNK7android8hardware11hidl_stringcvNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-116" ++ } ++ ], ++ "return_type" : "type-698", ++ "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ }, ++ { ++ "function_name" : "android::hardware::ProcessState::isContextManager", ++ "linker_set_key" : "_ZNK7android8hardware12ProcessState16isContextManagerEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3838" ++ } ++ ], ++ "return_type" : "type-43", ++ "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" ++ }, ++ { ++ "function_name" : "android::hardware::IPCThreadState::getCallingPid", ++ "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3632" ++ } ++ ], ++ "return_type" : "type-19", ++ "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ }, ++ { ++ "function_name" : "android::hardware::IPCThreadState::getCallingSid", ++ "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3632" ++ } ++ ], ++ "return_type" : "type-98", ++ "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ }, ++ { ++ "function_name" : "android::hardware::IPCThreadState::getCallingUid", ++ "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3632" ++ } ++ ], ++ "return_type" : "type-1", ++ "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ }, ++ { ++ "function_name" : "android::hardware::IPCThreadState::isServingCall", ++ "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3632" ++ } ++ ], ++ "return_type" : "type-43", ++ "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ }, ++ { ++ "function_name" : "android::hardware::IPCThreadState::getStrictModePolicy", ++ "linker_set_key" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3632" ++ } ++ ], ++ "return_type" : "type-19", ++ "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ }, ++ { ++ "function_name" : "android::hardware::IPCThreadState::getLastTransactionBinderFlags", ++ "linker_set_key" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3632" ++ } ++ ], ++ "return_type" : "type-19", ++ "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ }, ++ { ++ "access" : "private", ++ "function_name" : "android::hardware::BufferedTextOutput::getBuffer", ++ "linker_set_key" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2504" ++ } ++ ], ++ "return_type" : "type-2464", ++ "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" ++ }, ++ { ++ "access" : "private", ++ "function_name" : "android::hardware::Parcel::clearCache", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10clearCacheEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3756" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::errorCheck", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10errorCheckEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3756" ++ } ++ ], ++ "return_type" : "type-19", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::findBuffer", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3756" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ }, ++ { ++ "referenced_type" : "type-3770" ++ }, ++ { ++ "referenced_type" : "type-1038" ++ }, ++ { ++ "referenced_type" : "type-1038" ++ } ++ ], ++ "return_type" : "type-19", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "access" : "private", ++ "function_name" : "android::hardware::Parcel::ipcObjects", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10ipcObjectsEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3756" ++ } ++ ], ++ "return_type" : "type-1", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::readBuffer", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3756" ++ }, ++ { ++ "referenced_type" : "type-1" ++ }, ++ { ++ "referenced_type" : "type-1038" ++ }, ++ { ++ "referenced_type" : "type-3774" ++ } ++ ], ++ "return_type" : "type-19", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "access" : "private", ++ "function_name" : "android::hardware::Parcel::readBuffer", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3756" ++ }, ++ { ++ "referenced_type" : "type-1" ++ }, ++ { ++ "referenced_type" : "type-1038" ++ }, ++ { ++ "referenced_type" : "type-1" ++ }, ++ { ++ "referenced_type" : "type-1" ++ }, ++ { ++ "referenced_type" : "type-1" ++ }, ++ { ++ "referenced_type" : "type-3774" ++ } ++ ], ++ "return_type" : "type-19", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::readDouble", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEPd", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3756" ++ }, ++ { ++ "referenced_type" : "type-3769" ++ } ++ ], ++ "return_type" : "type-19", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::readDouble", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3756" ++ } ++ ], ++ "return_type" : "type-4", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::readObject", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3756" ++ }, ++ { ++ "default_arg" : true, ++ "referenced_type" : "type-1038" ++ } ++ ], ++ "return_type" : "type-3773", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-4082" ] ++ "template_args" : [ "type-4074" ] + }, + { + "function_name" : "android::hardware::Parcel::readUint16", +@@ -17370,10 +18782,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { +- "referenced_type" : "type-3772" ++ "referenced_type" : "type-3765" + } + ], + "return_type" : "type-19", +@@ -17386,10 +18798,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + } + ], + "return_type" : "type-19", +@@ -17402,7 +18814,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + } + ], + "return_type" : "type-1", +@@ -17415,10 +18827,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { +- "referenced_type" : "type-3774" ++ "referenced_type" : "type-3767" + } + ], + "return_type" : "type-19", +@@ -17431,7 +18843,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + } + ], + "return_type" : "type-21", +@@ -17445,10 +18857,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17459,7 +18871,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + } + ], + "return_type" : "type-1", +@@ -17472,10 +18884,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + } + ], +- "return_type" : "type-99", ++ "return_type" : "type-98", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17485,13 +18897,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-139", ++ "return_type" : "type-138", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17502,10 +18914,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + } + ], + "return_type" : "type-19", +@@ -17519,7 +18931,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + } + ], + "return_type" : "type-1", +@@ -17533,10 +18945,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17546,7 +18958,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + } + ], + "return_type" : "type-1", +@@ -17559,7 +18971,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + } + ], + "return_type" : "type-1", +@@ -17572,7 +18984,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + } + ], + "return_type" : "type-1", +@@ -17585,10 +18997,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { +- "referenced_type" : "type-352" ++ "referenced_type" : "type-351" + } + ], + "return_type" : "type-19", +@@ -17601,10 +19013,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { +- "referenced_type" : "type-3778" ++ "referenced_type" : "type-3771" + } + ], + "return_type" : "type-19", +@@ -17617,10 +19029,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + } + ], +- "return_type" : "type-342", ++ "return_type" : "type-341", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17631,7 +19043,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + } + ], + "return_type" : "type-1", +@@ -17644,16 +19056,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { +- "referenced_type" : "type-3781" ++ "referenced_type" : "type-3774" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + }, + { +- "referenced_type" : "type-3777" ++ "referenced_type" : "type-3770" + } + ], + "return_type" : "type-19", +@@ -17666,10 +19078,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + } + ], +- "return_type" : "type-2381", ++ "return_type" : "type-2376", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17680,7 +19092,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + } + ], + "return_type" : "type-1", +@@ -17693,13 +19105,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + } + ], + "return_type" : "type-19", +@@ -17712,13 +19124,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17728,13 +19140,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17744,10 +19156,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { +- "referenced_type" : "type-482" ++ "referenced_type" : "type-480" + } + ], + "return_type" : "type-19", +@@ -17760,10 +19172,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + } + ], +- "return_type" : "type-71", ++ "return_type" : "type-70", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17773,13 +19185,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + }, + { + "referenced_type" : "type-1" +@@ -17788,7 +19200,7 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-3781" ++ "referenced_type" : "type-3774" + } + ], + "return_type" : "type-19", +@@ -17801,16 +19213,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + }, + { +- "referenced_type" : "type-3781" ++ "referenced_type" : "type-3774" + } + ], + "return_type" : "type-19", +@@ -17824,10 +19236,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { +- "referenced_type" : "type-3785" ++ "referenced_type" : "type-3778" + }, + { + "referenced_type" : "type-1" +@@ -17842,7 +19254,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17852,13 +19264,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + } + ], +- "return_type" : "type-343", ++ "return_type" : "type-342", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17869,7 +19281,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { + "referenced_type" : "type-1" +@@ -17878,7 +19290,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17889,7 +19301,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { + "referenced_type" : "type-1" +@@ -17898,7 +19310,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17908,13 +19320,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { +- "referenced_type" : "type-3781" ++ "referenced_type" : "type-3774" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + }, + { + "referenced_type" : "type-1" +@@ -17923,7 +19335,7 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-3777" ++ "referenced_type" : "type-3770" + } + ], + "return_type" : "type-19", +@@ -17936,10 +19348,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { +- "referenced_type" : "type-3782" ++ "referenced_type" : "type-3775" + } + ], + "return_type" : "type-19", +@@ -17952,7 +19364,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { + "referenced_type" : "type-1" +@@ -17961,7 +19373,7 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-3782" ++ "referenced_type" : "type-3775" + } + ], + "return_type" : "type-19", +@@ -17974,10 +19386,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { +- "referenced_type" : "type-482" ++ "referenced_type" : "type-480" + } + ], + "return_type" : "type-19", +@@ -17990,13 +19402,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + }, + { + "referenced_type" : "type-1" +@@ -18005,7 +19417,7 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-3781" ++ "referenced_type" : "type-3774" + } + ], + "return_type" : "type-19", +@@ -18018,10 +19430,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { +- "referenced_type" : "type-3782" ++ "referenced_type" : "type-3775" + } + ], + "return_type" : "type-19", +@@ -18035,13 +19447,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { +- "referenced_type" : "type-3782" ++ "referenced_type" : "type-3775" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "default_arg" : true, +@@ -18062,7 +19474,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { + "referenced_type" : "type-1" +@@ -18071,7 +19483,7 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-3782" ++ "referenced_type" : "type-3775" + } + ], + "return_type" : "type-19", +@@ -18084,10 +19496,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + } + ], +- "return_type" : "type-1030", ++ "return_type" : "type-1027", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -18097,10 +19509,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "referenced_type" : "type-1" +@@ -18116,17 +19528,17 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { +- "referenced_type" : "type-2474" ++ "referenced_type" : "type-2469" + }, + { + "default_arg" : true, + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -18137,7 +19549,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + } + ], + "return_type" : "type-1", +@@ -18151,10 +19563,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + } + ], +- "return_type" : "type-2352", ++ "return_type" : "type-2347", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -18164,7 +19576,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + } + ], + "return_type" : "type-1", +@@ -18177,10 +19589,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { +- "referenced_type" : "type-3777" ++ "referenced_type" : "type-3770" + } + ], + "return_type" : "type-19", +@@ -18193,10 +19605,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -18206,10 +19618,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { +- "referenced_type" : "type-3770" ++ "referenced_type" : "type-3763" + } + ], + "return_type" : "type-19", +@@ -18222,7 +19634,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + } + ], + "return_type" : "type-1", +@@ -18235,10 +19647,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { +- "referenced_type" : "type-3775" ++ "referenced_type" : "type-3768" + } + ], + "return_type" : "type-19", +@@ -18251,10 +19663,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + } + ], +- "return_type" : "type-298", ++ "return_type" : "type-297", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -18264,10 +19676,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { +- "referenced_type" : "type-3771" ++ "referenced_type" : "type-3764" + } + ], + "return_type" : "type-19", +@@ -18280,10 +19692,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { +- "referenced_type" : "type-521" ++ "referenced_type" : "type-519" + } + ], + "return_type" : "type-19", +@@ -18296,7 +19708,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + } + ], + "return_type" : "type-19", +@@ -18309,10 +19721,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { +- "referenced_type" : "type-3773" ++ "referenced_type" : "type-3766" + } + ], + "return_type" : "type-19", +@@ -18325,7 +19737,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + } + ], + "return_type" : "type-447", +@@ -18338,10 +19750,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3763" ++ "referenced_type" : "type-3756" + }, + { +- "referenced_type" : "type-291" ++ "referenced_type" : "type-290" + } + ], + "return_type" : "type-19", +@@ -18354,10 +19766,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-171" ++ "referenced_type" : "type-170" + } + ], +- "return_type" : "type-701", ++ "return_type" : "type-699", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -18367,13 +19779,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2331" ++ "referenced_type" : "type-2326" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, + { +@@ -18383,10 +19795,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-175" ++ "referenced_type" : "type-174" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -18396,13 +19808,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2361" ++ "referenced_type" : "type-2356" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-245", ++ "return_type" : "type-244", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -18413,10 +19825,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -18427,10 +19839,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2368" ++ "referenced_type" : "type-2363" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -18441,13 +19853,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -18458,13 +19870,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2368" ++ "referenced_type" : "type-2363" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -18475,16 +19887,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -18495,16 +19907,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2368" ++ "referenced_type" : "type-2363" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -18516,7 +19928,7 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + } + ], + "return_type" : "type-19", +@@ -18531,7 +19943,7 @@ + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { + "referenced_type" : "type-1" +@@ -18550,18 +19962,18 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "default_arg" : true, +- "referenced_type" : "type-2540" ++ "referenced_type" : "type-2535" + }, + { + "default_arg" : true, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h" + }, + { +@@ -18574,14 +19986,14 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-2540" ++ "referenced_type" : "type-2535" + }, + { + "default_arg" : true, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h" + }, + { +@@ -18593,7 +20005,7 @@ + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-99", ++ "return_type" : "type-98", + "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h" + } + ], +@@ -18602,115 +20014,115 @@ + { + "linker_set_key" : "_ZN7android4hidl4base4V1_05IBase10descriptorE", + "name" : "android::hidl::base::V1_0::IBase::descriptor", +- "referenced_type" : "type-99", ++ "referenced_type" : "type-98", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { + "linker_set_key" : "_ZN7android4hidl7manager4V1_015IServiceManager10descriptorE", + "name" : "android::hidl::manager::V1_0::IServiceManager::descriptor", +- "referenced_type" : "type-99", ++ "referenced_type" : "type-98", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { + "linker_set_key" : "_ZN7android4hidl7manager4V1_020IServiceNotification10descriptorE", + "name" : "android::hidl::manager::V1_0::IServiceNotification::descriptor", +- "referenced_type" : "type-99", ++ "referenced_type" : "type-98", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { + "linker_set_key" : "_ZN7android4hidl7manager4V1_115IServiceManager10descriptorE", + "name" : "android::hidl::manager::V1_1::IServiceManager::descriptor", +- "referenced_type" : "type-99", ++ "referenced_type" : "type-98", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { + "linker_set_key" : "_ZN7android4hidl7manager4V1_215IClientCallback10descriptorE", + "name" : "android::hidl::manager::V1_2::IClientCallback::descriptor", +- "referenced_type" : "type-99", ++ "referenced_type" : "type-98", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { + "linker_set_key" : "_ZN7android4hidl7manager4V1_215IServiceManager10descriptorE", + "name" : "android::hidl::manager::V1_2::IServiceManager::descriptor", +- "referenced_type" : "type-99", ++ "referenced_type" : "type-98", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { + "linker_set_key" : "_ZN7android8hardware11hidl_handle21kOffsetOfNativeHandleE", + "name" : "android::hardware::hidl_handle::kOffsetOfNativeHandle", +- "referenced_type" : "type-246", ++ "referenced_type" : "type-245", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "_ZN7android8hardware11hidl_memory13kOffsetOfNameE", + "name" : "android::hardware::hidl_memory::kOffsetOfName", +- "referenced_type" : "type-246", ++ "referenced_type" : "type-245", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "_ZN7android8hardware11hidl_memory15kOffsetOfHandleE", + "name" : "android::hardware::hidl_memory::kOffsetOfHandle", +- "referenced_type" : "type-246", ++ "referenced_type" : "type-245", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "_ZN7android8hardware11hidl_string15kOffsetOfBufferE", + "name" : "android::hardware::hidl_string::kOffsetOfBuffer", +- "referenced_type" : "type-246", ++ "referenced_type" : "type-245", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "_ZN7android8hardware12gTextBuffersE", + "name" : "android::hardware::gTextBuffers", +- "referenced_type" : "type-2512", ++ "referenced_type" : "type-2507", + "source_file" : "/system/libhwbinder/include/hwbinder/Static.h" + }, + { + "linker_set_key" : "_ZN7android8hardware13gProcessMutexE", + "name" : "android::hardware::gProcessMutex", +- "referenced_type" : "type-440", ++ "referenced_type" : "type-438", + "source_file" : "/system/libhwbinder/include/hwbinder/Static.h" + }, + { + "linker_set_key" : "_ZN7android8hardware4aerrE", + "name" : "android::hardware::aerr", +- "referenced_type" : "type-2474", ++ "referenced_type" : "type-2469", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { + "linker_set_key" : "_ZN7android8hardware4alogE", + "name" : "android::hardware::alog", +- "referenced_type" : "type-2474", ++ "referenced_type" : "type-2469", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { + "linker_set_key" : "_ZN7android8hardware4aoutE", + "name" : "android::hardware::aout", +- "referenced_type" : "type-2474", ++ "referenced_type" : "type-2469", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { + "linker_set_key" : "_ZN7android8hardware7details14gServiceSidMapE", + "name" : "android::hardware::details::gServiceSidMap", +- "referenced_type" : "type-703", ++ "referenced_type" : "type-701", + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, + { + "linker_set_key" : "_ZN7android8hardware7details15gServicePrioMapE", + "name" : "android::hardware::details::gServicePrioMap", +- "referenced_type" : "type-704", ++ "referenced_type" : "type-702", + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, + { + "linker_set_key" : "_ZN7android8hardware7details6gBnMapE", + "name" : "android::hardware::details::gBnMap", +- "referenced_type" : "type-412", ++ "referenced_type" : "type-410", + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, + { + "linker_set_key" : "_ZN7android8hardware8gProcessE", + "name" : "android::hardware::gProcess", +- "referenced_type" : "type-2794", ++ "referenced_type" : "type-2788", + "source_file" : "/system/libhwbinder/include/hwbinder/Static.h" + } + ], +@@ -18720,8 +20132,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Mutex &", + "name" : "android::Mutex &", +- "referenced_type" : "type-436", +- "self_type" : "type-440", ++ "referenced_type" : "type-433", ++ "self_type" : "type-438", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Mutex.h" + }, +@@ -18729,8 +20141,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RWLock &", + "name" : "android::RWLock &", +- "referenced_type" : "type-448", +- "self_type" : "type-452", ++ "referenced_type" : "type-444", ++ "self_type" : "type-450", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RWLock.h" + }, +@@ -18738,8 +20150,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase *const &", + "name" : "android::RefBase *const &", +- "referenced_type" : "type-3609", +- "self_type" : "type-3632", ++ "referenced_type" : "type-3602", ++ "self_type" : "type-3625", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -18747,8 +20159,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_type *const &", + "name" : "android::RefBase::weakref_type *const &", +- "referenced_type" : "type-3607", +- "self_type" : "type-3628", ++ "referenced_type" : "type-3600", ++ "self_type" : "type-3621", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -18756,8 +20168,8 @@ + "alignment" : 4, + "linker_set_key" : "android::String16 &", + "name" : "android::String16 &", +- "referenced_type" : "type-342", +- "self_type" : "type-351", ++ "referenced_type" : "type-341", ++ "self_type" : "type-350", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String16.h" + }, +@@ -18765,8 +20177,8 @@ + "alignment" : 4, + "linker_set_key" : "android::String8 &", + "name" : "android::String8 &", +- "referenced_type" : "type-221", +- "self_type" : "type-226", ++ "referenced_type" : "type-220", ++ "self_type" : "type-225", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String8.h" + }, +@@ -18774,8 +20186,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *const &", + "name" : "android::hardware::BHwBinder *const &", +- "referenced_type" : "type-3605", +- "self_type" : "type-3624", ++ "referenced_type" : "type-3598", ++ "self_type" : "type-3617", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -18784,7 +20196,7 @@ + "linker_set_key" : "android::hardware::ConcurrentMap, android::hardware::details::SchedPrio> &", + "name" : "android::hardware::ConcurrentMap, android::hardware::details::SchedPrio> &", + "referenced_type" : "type-29", +- "self_type" : "type-49", ++ "self_type" : "type-48", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -18792,8 +20204,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ConcurrentMap, bool> &", + "name" : "android::hardware::ConcurrentMap, bool> &", +- "referenced_type" : "type-41", +- "self_type" : "type-52", ++ "referenced_type" : "type-40", ++ "self_type" : "type-51", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -18801,8 +20213,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > &", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > &", +- "referenced_type" : "type-635", +- "self_type" : "type-927", ++ "referenced_type" : "type-633", ++ "self_type" : "type-924", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, +@@ -18810,8 +20222,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > &", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > &", +- "referenced_type" : "type-398", +- "self_type" : "type-926", ++ "referenced_type" : "type-396", ++ "self_type" : "type-923", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, +@@ -18819,8 +20231,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::HexDump &", + "name" : "android::hardware::HexDump &", +- "referenced_type" : "type-2484", +- "self_type" : "type-2486", ++ "referenced_type" : "type-2479", ++ "self_type" : "type-2481", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -18828,8 +20240,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel &", + "name" : "android::hardware::Parcel &", +- "referenced_type" : "type-1376", +- "self_type" : "type-1375", ++ "referenced_type" : "type-1373", ++ "self_type" : "type-1372", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -18837,8 +20249,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel &", + "name" : "android::hardware::Parcel &", +- "referenced_type" : "type-2575", +- "self_type" : "type-2574", ++ "referenced_type" : "type-2570", ++ "self_type" : "type-2569", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -18846,8 +20258,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel &", + "name" : "android::hardware::Parcel &", +- "referenced_type" : "type-374", +- "self_type" : "type-373", ++ "referenced_type" : "type-373", ++ "self_type" : "type-372", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -18855,8 +20267,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel &", + "name" : "android::hardware::Parcel &", +- "referenced_type" : "type-3919", +- "self_type" : "type-3918", ++ "referenced_type" : "type-3912", ++ "self_type" : "type-3911", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -18864,8 +20276,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState::handle_entry &", + "name" : "android::hardware::ProcessState::handle_entry &", +- "referenced_type" : "type-2415", +- "self_type" : "type-3831", ++ "referenced_type" : "type-2410", ++ "self_type" : "type-3824", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -18873,8 +20285,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return &", + "name" : "android::hardware::Return &", +- "referenced_type" : "type-807", +- "self_type" : "type-810", ++ "referenced_type" : "type-804", ++ "self_type" : "type-807", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18882,8 +20294,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-801", +- "self_type" : "type-804", ++ "referenced_type" : "type-798", ++ "self_type" : "type-801", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18891,8 +20303,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-986", +- "self_type" : "type-989", ++ "referenced_type" : "type-983", ++ "self_type" : "type-986", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18900,8 +20312,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-1093", +- "self_type" : "type-1096", ++ "referenced_type" : "type-1090", ++ "self_type" : "type-1093", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18909,8 +20321,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-1153", +- "self_type" : "type-1156", ++ "referenced_type" : "type-1150", ++ "self_type" : "type-1153", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18918,8 +20330,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-1213", +- "self_type" : "type-1216", ++ "referenced_type" : "type-1210", ++ "self_type" : "type-1213", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18927,8 +20339,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-1284", +- "self_type" : "type-1287", ++ "referenced_type" : "type-1281", ++ "self_type" : "type-1284", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18936,8 +20348,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return &", + "name" : "android::hardware::Return &", +- "referenced_type" : "type-309", +- "self_type" : "type-312", ++ "referenced_type" : "type-308", ++ "self_type" : "type-311", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18945,8 +20357,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return &", + "name" : "android::hardware::Return &", +- "referenced_type" : "type-102", +- "self_type" : "type-179", ++ "referenced_type" : "type-101", ++ "self_type" : "type-178", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18954,8 +20366,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Status &", + "name" : "android::hardware::Status &", +- "referenced_type" : "type-104", +- "self_type" : "type-170", ++ "referenced_type" : "type-103", ++ "self_type" : "type-169", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18963,8 +20375,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-2377", +- "self_type" : "type-2376", ++ "referenced_type" : "type-2372", ++ "self_type" : "type-2371", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -18972,8 +20384,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-2428", +- "self_type" : "type-2427", ++ "referenced_type" : "type-2423", ++ "self_type" : "type-2422", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -18981,8 +20393,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-2472", +- "self_type" : "type-2474", ++ "referenced_type" : "type-2467", ++ "self_type" : "type-2469", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -18990,8 +20402,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-3482", +- "self_type" : "type-3481", ++ "referenced_type" : "type-3475", ++ "self_type" : "type-3474", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -18999,8 +20411,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-3533", +- "self_type" : "type-3532", ++ "referenced_type" : "type-3526", ++ "self_type" : "type-3525", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -19008,8 +20420,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-3841", +- "self_type" : "type-3840", ++ "referenced_type" : "type-3834", ++ "self_type" : "type-3833", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -19017,8 +20429,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer > &", + "name" : "android::hardware::details::hidl_pointer > &", +- "referenced_type" : "type-1009", +- "self_type" : "type-1075", ++ "referenced_type" : "type-1006", ++ "self_type" : "type-1071", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19026,8 +20438,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer &", + "name" : "android::hardware::details::hidl_pointer &", +- "referenced_type" : "type-620", +- "self_type" : "type-1071", ++ "referenced_type" : "type-618", ++ "self_type" : "type-1068", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19035,8 +20447,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer &", + "name" : "android::hardware::details::hidl_pointer &", +- "referenced_type" : "type-835", +- "self_type" : "type-852", ++ "referenced_type" : "type-832", ++ "self_type" : "type-848", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19044,8 +20456,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer &", + "name" : "android::hardware::details::hidl_pointer &", +- "referenced_type" : "type-97", +- "self_type" : "type-150", ++ "referenced_type" : "type-96", ++ "self_type" : "type-149", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19054,7 +20466,7 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer &", + "name" : "android::hardware::details::hidl_pointer &", + "referenced_type" : "type-14", +- "self_type" : "type-643", ++ "self_type" : "type-641", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19062,8 +20474,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer &", + "name" : "android::hardware::details::hidl_pointer &", +- "referenced_type" : "type-519", +- "self_type" : "type-823", ++ "referenced_type" : "type-517", ++ "self_type" : "type-820", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19071,8 +20483,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::return_status &", + "name" : "android::hardware::details::return_status &", +- "referenced_type" : "type-103", +- "self_type" : "type-266", ++ "referenced_type" : "type-102", ++ "self_type" : "type-265", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -19080,8 +20492,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_array &", + "name" : "android::hardware::hidl_array &", +- "referenced_type" : "type-1012", +- "self_type" : "type-1078", ++ "referenced_type" : "type-1009", ++ "self_type" : "type-1075", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19089,8 +20501,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_handle &", + "name" : "android::hardware::hidl_handle &", +- "referenced_type" : "type-77", +- "self_type" : "type-88", ++ "referenced_type" : "type-76", ++ "self_type" : "type-87", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19098,8 +20510,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_memory &", + "name" : "android::hardware::hidl_memory &", +- "referenced_type" : "type-121", +- "self_type" : "type-125", ++ "referenced_type" : "type-120", ++ "self_type" : "type-124", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19107,8 +20519,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_string &", + "name" : "android::hardware::hidl_string &", +- "referenced_type" : "type-96", +- "self_type" : "type-118", ++ "referenced_type" : "type-95", ++ "self_type" : "type-117", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19116,8 +20528,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec > &", + "name" : "android::hardware::hidl_vec > &", +- "referenced_type" : "type-1008", +- "self_type" : "type-1018", ++ "referenced_type" : "type-1005", ++ "self_type" : "type-1015", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19125,8 +20537,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec &", + "name" : "android::hardware::hidl_vec &", +- "referenced_type" : "type-619", +- "self_type" : "type-1007", ++ "referenced_type" : "type-617", ++ "self_type" : "type-1004", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19134,8 +20546,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec::iter &", + "name" : "android::hardware::hidl_vec::iter &", +- "referenced_type" : "type-625", +- "self_type" : "type-628", ++ "referenced_type" : "type-622", ++ "self_type" : "type-626", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19143,8 +20555,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec &", + "name" : "android::hardware::hidl_vec &", +- "referenced_type" : "type-518", +- "self_type" : "type-829", ++ "referenced_type" : "type-516", ++ "self_type" : "type-826", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19152,8 +20564,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &", + "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &", +- "referenced_type" : "type-548", +- "self_type" : "type-861", ++ "referenced_type" : "type-546", ++ "self_type" : "type-858", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19161,8 +20573,8 @@ + "alignment" : 4, + "linker_set_key" : "android::key_value_pair_t > &", + "name" : "android::key_value_pair_t > &", +- "referenced_type" : "type-3805", +- "self_type" : "type-3817", ++ "referenced_type" : "type-3798", ++ "self_type" : "type-3810", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -19170,8 +20582,8 @@ + "alignment" : 4, + "linker_set_key" : "android::key_value_pair_t &", + "name" : "android::key_value_pair_t &", +- "referenced_type" : "type-2383", +- "self_type" : "type-2396", ++ "referenced_type" : "type-2378", ++ "self_type" : "type-2391", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -19179,8 +20591,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-472", +- "self_type" : "type-3633", ++ "referenced_type" : "type-470", ++ "self_type" : "type-3626", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19188,8 +20600,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-2468", +- "self_type" : "type-2497", ++ "referenced_type" : "type-2463", ++ "self_type" : "type-2492", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19197,8 +20609,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-71", +- "self_type" : "type-485", ++ "referenced_type" : "type-70", ++ "self_type" : "type-483", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19206,8 +20618,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-491", +- "self_type" : "type-3839", ++ "referenced_type" : "type-489", ++ "self_type" : "type-3832", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19215,8 +20627,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-789", +- "self_type" : "type-793", ++ "referenced_type" : "type-786", ++ "self_type" : "type-789", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19224,8 +20636,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-951", +- "self_type" : "type-984", ++ "referenced_type" : "type-948", ++ "self_type" : "type-980", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19233,8 +20645,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-356", +- "self_type" : "type-660", ++ "referenced_type" : "type-355", ++ "self_type" : "type-658", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19242,8 +20654,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-575", +- "self_type" : "type-976", ++ "referenced_type" : "type-573", ++ "self_type" : "type-973", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19251,8 +20663,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-590", +- "self_type" : "type-979", ++ "referenced_type" : "type-588", ++ "self_type" : "type-976", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19260,8 +20672,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-580", +- "self_type" : "type-771", ++ "referenced_type" : "type-578", ++ "self_type" : "type-768", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19269,8 +20681,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-595", +- "self_type" : "type-1210", ++ "referenced_type" : "type-593", ++ "self_type" : "type-1207", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19278,8 +20690,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-585", +- "self_type" : "type-779", ++ "referenced_type" : "type-583", ++ "self_type" : "type-776", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19287,8 +20699,8 @@ + "alignment" : 4, + "linker_set_key" : "android::wp &", + "name" : "android::wp &", +- "referenced_type" : "type-383", +- "self_type" : "type-471", ++ "referenced_type" : "type-382", ++ "self_type" : "type-469", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -19296,8 +20708,8 @@ + "alignment" : 4, + "linker_set_key" : "android::wp &", + "name" : "android::wp &", +- "referenced_type" : "type-944", +- "self_type" : "type-2403", ++ "referenced_type" : "type-941", ++ "self_type" : "type-2398", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -19305,8 +20717,8 @@ + "alignment" : 4, + "linker_set_key" : "android::wp &", + "name" : "android::wp &", +- "referenced_type" : "type-2381", +- "self_type" : "type-3754", ++ "referenced_type" : "type-2376", ++ "self_type" : "type-3747", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -19315,7 +20727,7 @@ + "linker_set_key" : "android::wp &", + "name" : "android::wp &", + "referenced_type" : "type-32", +- "self_type" : "type-461", ++ "self_type" : "type-459", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -19323,8 +20735,8 @@ + "alignment" : 4, + "linker_set_key" : "char *const &", + "name" : "char *const &", +- "referenced_type" : "type-3788", +- "self_type" : "type-3789", ++ "referenced_type" : "type-3781", ++ "self_type" : "type-3782", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19332,8 +20744,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[10]", + "name" : "char const (&)[10]", +- "referenced_type" : "type-3653", +- "self_type" : "type-3655", ++ "referenced_type" : "type-3646", ++ "self_type" : "type-3648", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19341,8 +20753,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[11]", + "name" : "char const (&)[11]", +- "referenced_type" : "type-3676", +- "self_type" : "type-3678", ++ "referenced_type" : "type-3669", ++ "self_type" : "type-3671", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19350,8 +20762,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[12]", + "name" : "char const (&)[12]", +- "referenced_type" : "type-3650", +- "self_type" : "type-3652", ++ "referenced_type" : "type-3643", ++ "self_type" : "type-3645", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19359,8 +20771,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[13]", + "name" : "char const (&)[13]", +- "referenced_type" : "type-3646", +- "self_type" : "type-3649", ++ "referenced_type" : "type-3639", ++ "self_type" : "type-3642", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19368,8 +20780,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[14]", + "name" : "char const (&)[14]", +- "referenced_type" : "type-3695", +- "self_type" : "type-3697", ++ "referenced_type" : "type-3688", ++ "self_type" : "type-3690", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19377,8 +20789,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[15]", + "name" : "char const (&)[15]", +- "referenced_type" : "type-3793", +- "self_type" : "type-3795", ++ "referenced_type" : "type-3786", ++ "self_type" : "type-3788", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19386,8 +20798,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[16]", + "name" : "char const (&)[16]", +- "referenced_type" : "type-3679", +- "self_type" : "type-3680", ++ "referenced_type" : "type-3672", ++ "self_type" : "type-3673", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19395,8 +20807,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[17]", + "name" : "char const (&)[17]", +- "referenced_type" : "type-3698", +- "self_type" : "type-3700", ++ "referenced_type" : "type-3691", ++ "self_type" : "type-3693", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19404,8 +20816,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[18]", + "name" : "char const (&)[18]", +- "referenced_type" : "type-3682", +- "self_type" : "type-3684", ++ "referenced_type" : "type-3675", ++ "self_type" : "type-3677", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19413,8 +20825,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[19]", + "name" : "char const (&)[19]", +- "referenced_type" : "type-3714", +- "self_type" : "type-3716", ++ "referenced_type" : "type-3707", ++ "self_type" : "type-3709", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19422,8 +20834,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[20]", + "name" : "char const (&)[20]", +- "referenced_type" : "type-3692", +- "self_type" : "type-3694", ++ "referenced_type" : "type-3685", ++ "self_type" : "type-3687", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19431,8 +20843,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[22]", + "name" : "char const (&)[22]", +- "referenced_type" : "type-3717", +- "self_type" : "type-3720", ++ "referenced_type" : "type-3710", ++ "self_type" : "type-3712", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19440,8 +20852,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[25]", + "name" : "char const (&)[25]", +- "referenced_type" : "type-3707", +- "self_type" : "type-3709", ++ "referenced_type" : "type-3700", ++ "self_type" : "type-3702", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19449,8 +20861,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[28]", + "name" : "char const (&)[28]", +- "referenced_type" : "type-3729", +- "self_type" : "type-3731", ++ "referenced_type" : "type-3722", ++ "self_type" : "type-3724", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19458,8 +20870,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[29]", + "name" : "char const (&)[29]", +- "referenced_type" : "type-3704", +- "self_type" : "type-3706", ++ "referenced_type" : "type-3697", ++ "self_type" : "type-3699", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19467,8 +20879,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[2]", + "name" : "char const (&)[2]", +- "referenced_type" : "type-3657", +- "self_type" : "type-3659", ++ "referenced_type" : "type-3649", ++ "self_type" : "type-3652", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19476,8 +20888,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[31]", + "name" : "char const (&)[31]", +- "referenced_type" : "type-3689", +- "self_type" : "type-3691", ++ "referenced_type" : "type-3681", ++ "self_type" : "type-3684", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19485,8 +20897,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[32]", + "name" : "char const (&)[32]", +- "referenced_type" : "type-3721", +- "self_type" : "type-3723", ++ "referenced_type" : "type-3714", ++ "self_type" : "type-3716", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19494,8 +20906,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[35]", + "name" : "char const (&)[35]", +- "referenced_type" : "type-3710", +- "self_type" : "type-3712", ++ "referenced_type" : "type-3703", ++ "self_type" : "type-3705", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19503,8 +20915,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[37]", + "name" : "char const (&)[37]", +- "referenced_type" : "type-3701", +- "self_type" : "type-3703", ++ "referenced_type" : "type-3694", ++ "self_type" : "type-3696", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19512,8 +20924,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[3]", + "name" : "char const (&)[3]", +- "referenced_type" : "type-3669", +- "self_type" : "type-3672", ++ "referenced_type" : "type-3662", ++ "self_type" : "type-3665", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19521,8 +20933,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[4]", + "name" : "char const (&)[4]", +- "referenced_type" : "type-3790", +- "self_type" : "type-3792", ++ "referenced_type" : "type-3783", ++ "self_type" : "type-3785", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19530,8 +20942,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[5]", + "name" : "char const (&)[5]", +- "referenced_type" : "type-3796", +- "self_type" : "type-3798", ++ "referenced_type" : "type-3789", ++ "self_type" : "type-3791", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19539,8 +20951,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[6]", + "name" : "char const (&)[6]", +- "referenced_type" : "type-3661", +- "self_type" : "type-3663", ++ "referenced_type" : "type-3654", ++ "self_type" : "type-3656", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19548,8 +20960,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[7]", + "name" : "char const (&)[7]", +- "referenced_type" : "type-3685", +- "self_type" : "type-3688", ++ "referenced_type" : "type-3678", ++ "self_type" : "type-3680", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19557,8 +20969,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[8]", + "name" : "char const (&)[8]", +- "referenced_type" : "type-3673", +- "self_type" : "type-3675", ++ "referenced_type" : "type-3666", ++ "self_type" : "type-3668", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19566,8 +20978,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[9]", + "name" : "char const (&)[9]", +- "referenced_type" : "type-3664", +- "self_type" : "type-3666", ++ "referenced_type" : "type-3657", ++ "self_type" : "type-3659", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19575,8 +20987,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::String16 &", + "name" : "const android::String16 &", +- "referenced_type" : "type-348", +- "self_type" : "type-350", ++ "referenced_type" : "type-347", ++ "self_type" : "type-349", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String16.h" + }, +@@ -19584,8 +20996,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::String8 &", + "name" : "const android::String8 &", +- "referenced_type" : "type-223", +- "self_type" : "type-225", ++ "referenced_type" : "type-222", ++ "self_type" : "type-224", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String8.h" + }, +@@ -19593,8 +21005,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BpHwBinder::Obituary &", + "name" : "const android::hardware::BpHwBinder::Obituary &", +- "referenced_type" : "type-2390", +- "self_type" : "type-2414", ++ "referenced_type" : "type-2385", ++ "self_type" : "type-2409", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -19602,8 +21014,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &", + "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &", +- "referenced_type" : "type-2397", +- "self_type" : "type-2398", ++ "referenced_type" : "type-2392", ++ "self_type" : "type-2393", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -19611,8 +21023,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::HexDump &", + "name" : "const android::hardware::HexDump &", +- "referenced_type" : "type-2487", +- "self_type" : "type-3886", ++ "referenced_type" : "type-2482", ++ "self_type" : "type-3879", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19620,8 +21032,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1038", +- "self_type" : "type-1040", ++ "referenced_type" : "type-1035", ++ "self_type" : "type-1037", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19629,8 +21041,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1126", +- "self_type" : "type-1128", ++ "referenced_type" : "type-1123", ++ "self_type" : "type-1125", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -19638,8 +21050,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1187", +- "self_type" : "type-1189", ++ "referenced_type" : "type-1184", ++ "self_type" : "type-1186", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -19647,8 +21059,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1253", +- "self_type" : "type-1255", ++ "referenced_type" : "type-1250", ++ "self_type" : "type-1252", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -19656,8 +21068,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1307", +- "self_type" : "type-1309", ++ "referenced_type" : "type-1304", ++ "self_type" : "type-1306", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19665,8 +21077,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1370", +- "self_type" : "type-1372", ++ "referenced_type" : "type-1367", ++ "self_type" : "type-1369", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19674,8 +21086,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1964", +- "self_type" : "type-1966", ++ "referenced_type" : "type-1959", ++ "self_type" : "type-1961", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19683,8 +21095,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2048", +- "self_type" : "type-2050", ++ "referenced_type" : "type-2043", ++ "self_type" : "type-2045", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -19692,8 +21104,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2107", +- "self_type" : "type-2109", ++ "referenced_type" : "type-2102", ++ "self_type" : "type-2104", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -19701,8 +21113,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2172", +- "self_type" : "type-2174", ++ "referenced_type" : "type-2167", ++ "self_type" : "type-2169", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -19710,8 +21122,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2224", +- "self_type" : "type-2226", ++ "referenced_type" : "type-2219", ++ "self_type" : "type-2221", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19719,8 +21131,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2278", +- "self_type" : "type-2280", ++ "referenced_type" : "type-2273", ++ "self_type" : "type-2275", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -19728,8 +21140,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2353", +- "self_type" : "type-2354", ++ "referenced_type" : "type-2348", ++ "self_type" : "type-2349", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -19737,8 +21149,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2569", +- "self_type" : "type-2571", ++ "referenced_type" : "type-2564", ++ "self_type" : "type-2566", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19746,8 +21158,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3102", +- "self_type" : "type-3104", ++ "referenced_type" : "type-3095", ++ "self_type" : "type-3097", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19755,8 +21167,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3182", +- "self_type" : "type-3185", ++ "referenced_type" : "type-3175", ++ "self_type" : "type-3177", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -19764,8 +21176,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3249", +- "self_type" : "type-3251", ++ "referenced_type" : "type-3242", ++ "self_type" : "type-3244", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -19773,8 +21185,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3307", +- "self_type" : "type-3309", ++ "referenced_type" : "type-3299", ++ "self_type" : "type-3302", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -19782,8 +21194,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3352", +- "self_type" : "type-3354", ++ "referenced_type" : "type-3345", ++ "self_type" : "type-3347", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19791,8 +21203,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3408", +- "self_type" : "type-3410", ++ "referenced_type" : "type-3397", ++ "self_type" : "type-3403", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -19800,8 +21212,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-368", +- "self_type" : "type-370", ++ "referenced_type" : "type-367", ++ "self_type" : "type-369", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19809,8 +21221,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3913", +- "self_type" : "type-3915", ++ "referenced_type" : "type-3906", ++ "self_type" : "type-3908", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19818,8 +21230,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::ProcessState::handle_entry &", + "name" : "const android::hardware::ProcessState::handle_entry &", +- "referenced_type" : "type-3810", +- "self_type" : "type-3832", ++ "referenced_type" : "type-3802", ++ "self_type" : "type-3825", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -19827,8 +21239,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return &", + "name" : "const android::hardware::Return &", +- "referenced_type" : "type-506", +- "self_type" : "type-992", ++ "referenced_type" : "type-504", ++ "self_type" : "type-989", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -19836,8 +21248,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return &", + "name" : "const android::hardware::Return &", +- "referenced_type" : "type-101", +- "self_type" : "type-107", ++ "referenced_type" : "type-100", ++ "self_type" : "type-106", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -19845,8 +21257,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Status &", + "name" : "const android::hardware::Status &", +- "referenced_type" : "type-167", +- "self_type" : "type-168", ++ "referenced_type" : "type-166", ++ "self_type" : "type-167", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -19854,8 +21266,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::TypeCode &", + "name" : "const android::hardware::TypeCode &", +- "referenced_type" : "type-2482", +- "self_type" : "type-3885", ++ "referenced_type" : "type-2477", ++ "self_type" : "type-3878", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19863,8 +21275,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::SchedPrio &", + "name" : "const android::hardware::details::SchedPrio &", +- "referenced_type" : "type-1050", +- "self_type" : "type-1049", ++ "referenced_type" : "type-1047", ++ "self_type" : "type-1046", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -19873,7 +21285,7 @@ + "linker_set_key" : "const android::hardware::details::hidl_pointer &", + "name" : "const android::hardware::details::hidl_pointer &", + "referenced_type" : "type-13", +- "self_type" : "type-76", ++ "self_type" : "type-75", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19881,8 +21293,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::hidl_pointer &", + "name" : "const android::hardware::details::hidl_pointer &", +- "referenced_type" : "type-537", +- "self_type" : "type-830", ++ "referenced_type" : "type-535", ++ "self_type" : "type-827", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19890,8 +21302,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_handle &", + "name" : "const android::hardware::hidl_handle &", +- "referenced_type" : "type-79", +- "self_type" : "type-83", ++ "referenced_type" : "type-78", ++ "self_type" : "type-82", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19899,8 +21311,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_memory &", + "name" : "const android::hardware::hidl_memory &", +- "referenced_type" : "type-123", +- "self_type" : "type-124", ++ "referenced_type" : "type-122", ++ "self_type" : "type-123", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19908,8 +21320,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_string &", + "name" : "const android::hardware::hidl_string &", +- "referenced_type" : "type-110", +- "self_type" : "type-112", ++ "referenced_type" : "type-109", ++ "self_type" : "type-111", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19917,8 +21329,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec > &", + "name" : "const android::hardware::hidl_vec > &", +- "referenced_type" : "type-2270", +- "self_type" : "type-2283", ++ "referenced_type" : "type-2264", ++ "self_type" : "type-2278", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19926,8 +21338,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec &", + "name" : "const android::hardware::hidl_vec &", +- "referenced_type" : "type-622", +- "self_type" : "type-1042", ++ "referenced_type" : "type-620", ++ "self_type" : "type-1039", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19935,8 +21347,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec &", + "name" : "const android::hardware::hidl_vec &", +- "referenced_type" : "type-1022", +- "self_type" : "type-1043", ++ "referenced_type" : "type-1019", ++ "self_type" : "type-1040", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19944,8 +21356,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec::iter &", + "name" : "const android::hardware::hidl_vec::iter &", +- "referenced_type" : "type-629", +- "self_type" : "type-631", ++ "referenced_type" : "type-627", ++ "self_type" : "type-629", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19953,8 +21365,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec &", + "name" : "const android::hardware::hidl_vec &", +- "referenced_type" : "type-523", +- "self_type" : "type-525", ++ "referenced_type" : "type-521", ++ "self_type" : "type-523", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19962,8 +21374,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_version &", + "name" : "const android::hardware::hidl_version &", +- "referenced_type" : "type-135", +- "self_type" : "type-137", ++ "referenced_type" : "type-134", ++ "self_type" : "type-136", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19971,8 +21383,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::base::V1_0::IBase *const &", + "name" : "const android::hidl::base::V1_0::IBase *const &", +- "referenced_type" : "type-396", +- "self_type" : "type-397", ++ "referenced_type" : "type-390", ++ "self_type" : "type-391", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -19980,8 +21392,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &", + "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &", +- "referenced_type" : "type-1021", +- "self_type" : "type-1072", ++ "referenced_type" : "type-1018", ++ "self_type" : "type-1069", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19989,8 +21401,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::key_value_pair_t > &", + "name" : "const android::key_value_pair_t > &", +- "referenced_type" : "type-3804", +- "self_type" : "type-3806", ++ "referenced_type" : "type-3797", ++ "self_type" : "type-3799", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -19998,8 +21410,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::key_value_pair_t &", + "name" : "const android::key_value_pair_t &", +- "referenced_type" : "type-2382", +- "self_type" : "type-2384", ++ "referenced_type" : "type-2377", ++ "self_type" : "type-2379", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20007,8 +21419,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-3638", +- "self_type" : "type-3645", ++ "referenced_type" : "type-3631", ++ "self_type" : "type-3638", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20016,8 +21428,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-2496", +- "self_type" : "type-2495", ++ "referenced_type" : "type-2491", ++ "self_type" : "type-2490", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20025,8 +21437,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-2355", +- "self_type" : "type-2357", ++ "referenced_type" : "type-2350", ++ "self_type" : "type-2352", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -20034,8 +21446,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-2404", +- "self_type" : "type-2405", ++ "referenced_type" : "type-2399", ++ "self_type" : "type-2400", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20043,8 +21455,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-3465", +- "self_type" : "type-3467", ++ "referenced_type" : "type-3458", ++ "self_type" : "type-3460", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -20052,8 +21464,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-2522", +- "self_type" : "type-2524", ++ "referenced_type" : "type-2515", ++ "self_type" : "type-2519", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, +@@ -20061,8 +21473,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-2536", +- "self_type" : "type-2538", ++ "referenced_type" : "type-2531", ++ "self_type" : "type-2533", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, +@@ -20070,8 +21482,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-3581", +- "self_type" : "type-3585", ++ "referenced_type" : "type-3574", ++ "self_type" : "type-3576", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, +@@ -20079,8 +21491,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-3590", +- "self_type" : "type-3592", ++ "referenced_type" : "type-3583", ++ "self_type" : "type-3585", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, +@@ -20088,8 +21500,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-70", +- "self_type" : "type-69", ++ "referenced_type" : "type-69", ++ "self_type" : "type-68", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20097,8 +21509,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-2545", +- "self_type" : "type-2544", ++ "referenced_type" : "type-2540", ++ "self_type" : "type-2539", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h" + }, +@@ -20106,8 +21518,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-765", +- "self_type" : "type-770", ++ "referenced_type" : "type-762", ++ "self_type" : "type-767", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20115,8 +21527,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-496", +- "self_type" : "type-3620", ++ "referenced_type" : "type-494", ++ "self_type" : "type-3613", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20124,8 +21536,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-950", +- "self_type" : "type-953", ++ "referenced_type" : "type-947", ++ "self_type" : "type-950", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20133,8 +21545,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-141", +- "self_type" : "type-140", ++ "referenced_type" : "type-140", ++ "self_type" : "type-139", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -20142,8 +21554,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-459", +- "self_type" : "type-460", ++ "referenced_type" : "type-456", ++ "self_type" : "type-458", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20151,8 +21563,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-578", +- "self_type" : "type-910", ++ "referenced_type" : "type-576", ++ "self_type" : "type-906", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20160,8 +21572,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-593", +- "self_type" : "type-783", ++ "referenced_type" : "type-591", ++ "self_type" : "type-780", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20169,8 +21581,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-583", +- "self_type" : "type-764", ++ "referenced_type" : "type-581", ++ "self_type" : "type-761", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20178,8 +21590,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-600", +- "self_type" : "type-787", ++ "referenced_type" : "type-598", ++ "self_type" : "type-784", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20187,8 +21599,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-588", +- "self_type" : "type-773", ++ "referenced_type" : "type-586", ++ "self_type" : "type-769", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20196,8 +21608,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-469", +- "self_type" : "type-470", ++ "referenced_type" : "type-467", ++ "self_type" : "type-468", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20205,8 +21617,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-2358", +- "self_type" : "type-2359", ++ "referenced_type" : "type-2353", ++ "self_type" : "type-2354", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -20214,8 +21626,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-1367", +- "self_type" : "type-1369", ++ "referenced_type" : "type-1364", ++ "self_type" : "type-1366", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -20223,8 +21635,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-2566", +- "self_type" : "type-2568", ++ "referenced_type" : "type-2561", ++ "self_type" : "type-2563", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -20232,8 +21644,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-365", +- "self_type" : "type-367", ++ "referenced_type" : "type-364", ++ "self_type" : "type-366", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -20241,8 +21653,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-3749", +- "self_type" : "type-3750", ++ "referenced_type" : "type-3742", ++ "self_type" : "type-3743", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20250,8 +21662,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-3910", +- "self_type" : "type-3912", ++ "referenced_type" : "type-3903", ++ "self_type" : "type-3905", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -20259,8 +21671,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-464", +- "self_type" : "type-465", ++ "referenced_type" : "type-462", ++ "self_type" : "type-463", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20268,8 +21680,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-64", +- "self_type" : "type-63", ++ "referenced_type" : "type-63", ++ "self_type" : "type-62", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20277,8 +21689,8 @@ + "alignment" : 4, + "linker_set_key" : "const bool &", + "name" : "const bool &", +- "referenced_type" : "type-502", +- "self_type" : "type-538", ++ "referenced_type" : "type-500", ++ "self_type" : "type-537", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20286,8 +21698,8 @@ + "alignment" : 4, + "linker_set_key" : "const char &", + "name" : "const char &", +- "referenced_type" : "type-100", +- "self_type" : "type-2493", ++ "referenced_type" : "type-99", ++ "self_type" : "type-2488", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -20295,8 +21707,8 @@ + "alignment" : 4, + "linker_set_key" : "const char *const &", + "name" : "const char *const &", +- "referenced_type" : "type-2476", +- "self_type" : "type-2477", ++ "referenced_type" : "type-2471", ++ "self_type" : "type-2472", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -20313,8 +21725,8 @@ + "alignment" : 4, + "linker_set_key" : "const flat_binder_object &", + "name" : "const flat_binder_object &", +- "referenced_type" : "type-3767", +- "self_type" : "type-3769", ++ "referenced_type" : "type-3760", ++ "self_type" : "type-3762", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -20322,8 +21734,8 @@ + "alignment" : 4, + "linker_set_key" : "const float &", + "name" : "const float &", +- "referenced_type" : "type-665", +- "self_type" : "type-666", ++ "referenced_type" : "type-663", ++ "self_type" : "type-664", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20332,7 +21744,7 @@ + "linker_set_key" : "const int &", + "name" : "const int &", + "referenced_type" : "type-624", +- "self_type" : "type-632", ++ "self_type" : "type-630", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20346,352 +21758,352 @@ + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1000", +- "self_type" : "type-1003", ++ "referenced_type" : "type-1099", ++ "self_type" : "type-1101", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1102", +- "self_type" : "type-1104", ++ "referenced_type" : "type-1159", ++ "self_type" : "type-1161", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1162", +- "self_type" : "type-1164", ++ "referenced_type" : "type-1220", ++ "self_type" : "type-1222", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1223", +- "self_type" : "type-1225", ++ "referenced_type" : "type-127", ++ "self_type" : "type-129", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-128", +- "self_type" : "type-130", ++ "referenced_type" : "type-1294", ++ "self_type" : "type-1296", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1297", +- "self_type" : "type-1299", ++ "referenced_type" : "type-1347", ++ "self_type" : "type-1349", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1350", +- "self_type" : "type-1352", ++ "referenced_type" : "type-1453", ++ "self_type" : "type-1455", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1457", +- "self_type" : "type-1459", ++ "referenced_type" : "type-1522", ++ "self_type" : "type-1525", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1527", +- "self_type" : "type-1529", ++ "referenced_type" : "type-1689", ++ "self_type" : "type-1691", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1693", +- "self_type" : "type-1695", ++ "referenced_type" : "type-1727", ++ "self_type" : "type-1729", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1732", +- "self_type" : "type-1735", ++ "referenced_type" : "type-1792", ++ "self_type" : "type-1794", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1797", +- "self_type" : "type-1799", ++ "referenced_type" : "type-1818", ++ "self_type" : "type-1827", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1823", +- "self_type" : "type-1832", ++ "referenced_type" : "type-1861", ++ "self_type" : "type-1863", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1866", +- "self_type" : "type-1869", ++ "referenced_type" : "type-1933", ++ "self_type" : "type-1935", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1938", +- "self_type" : "type-1941", ++ "referenced_type" : "type-2019", ++ "self_type" : "type-2021", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2024", +- "self_type" : "type-2026", ++ "referenced_type" : "type-2077", ++ "self_type" : "type-2079", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2082", +- "self_type" : "type-2084", ++ "referenced_type" : "type-2136", ++ "self_type" : "type-2138", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2141", +- "self_type" : "type-2143", ++ "referenced_type" : "type-2209", ++ "self_type" : "type-2211", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2214", +- "self_type" : "type-2216", ++ "referenced_type" : "type-2255", ++ "self_type" : "type-2257", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2260", +- "self_type" : "type-2262", ++ "referenced_type" : "type-2306", ++ "self_type" : "type-2308", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2311", +- "self_type" : "type-2313", ++ "referenced_type" : "type-2541", ++ "self_type" : "type-2547", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2546", +- "self_type" : "type-2552", ++ "referenced_type" : "type-2648", ++ "self_type" : "type-2650", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2654", +- "self_type" : "type-2656", ++ "referenced_type" : "type-2717", ++ "self_type" : "type-2720", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2724", +- "self_type" : "type-2726", ++ "referenced_type" : "type-2829", ++ "self_type" : "type-2832", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2836", +- "self_type" : "type-2838", ++ "referenced_type" : "type-2867", ++ "self_type" : "type-2869", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2874", +- "self_type" : "type-2876", ++ "referenced_type" : "type-2925", ++ "self_type" : "type-2930", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2932", ++ "referenced_type" : "type-2933", + "self_type" : "type-2935", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2940", +- "self_type" : "type-2943", ++ "referenced_type" : "type-3002", ++ "self_type" : "type-3004", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3009", +- "self_type" : "type-3011", ++ "referenced_type" : "type-3074", ++ "self_type" : "type-3076", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3081", +- "self_type" : "type-3083", ++ "referenced_type" : "type-3153", ++ "self_type" : "type-3155", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3160", +- "self_type" : "type-3162", ++ "referenced_type" : "type-3220", ++ "self_type" : "type-3222", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3227", +- "self_type" : "type-3229", ++ "referenced_type" : "type-326", ++ "self_type" : "type-328", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-327", +- "self_type" : "type-329", ++ "referenced_type" : "type-3275", ++ "self_type" : "type-3277", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3282", +- "self_type" : "type-3284", ++ "referenced_type" : "type-3325", ++ "self_type" : "type-3327", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3332", +- "self_type" : "type-3334", ++ "referenced_type" : "type-3336", ++ "self_type" : "type-3338", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3343", +- "self_type" : "type-3345", ++ "referenced_type" : "type-3382", ++ "self_type" : "type-3384", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3389", +- "self_type" : "type-3391", ++ "referenced_type" : "type-3426", ++ "self_type" : "type-3428", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3433", +- "self_type" : "type-3435", ++ "referenced_type" : "type-3885", ++ "self_type" : "type-3887", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3892", +- "self_type" : "type-3894", ++ "referenced_type" : "type-3994", ++ "self_type" : "type-3996", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-4002", +- "self_type" : "type-4004", ++ "referenced_type" : "type-4068", ++ "self_type" : "type-4070", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-4076", +- "self_type" : "type-4078", ++ "referenced_type" : "type-513", ++ "self_type" : "type-515", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-515", +- "self_type" : "type-517", ++ "referenced_type" : "type-613", ++ "self_type" : "type-616", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-616", +- "self_type" : "type-618", ++ "referenced_type" : "type-708", ++ "self_type" : "type-710", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-710", +- "self_type" : "type-712", ++ "referenced_type" : "type-746", ++ "self_type" : "type-748", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-749", +- "self_type" : "type-752", ++ "referenced_type" : "type-821", ++ "self_type" : "type-823", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-824", +- "self_type" : "type-826", ++ "referenced_type" : "type-83", ++ "self_type" : "type-85", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-84", +- "self_type" : "type-87", ++ "referenced_type" : "type-851", ++ "self_type" : "type-865", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-854", +- "self_type" : "type-868", ++ "referenced_type" : "type-914", ++ "self_type" : "type-916", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-917", +- "self_type" : "type-920", ++ "referenced_type" : "type-997", ++ "self_type" : "type-999", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const log_msg &", + "name" : "const log_msg &", +- "referenced_type" : "type-239", +- "self_type" : "type-241", ++ "referenced_type" : "type-238", ++ "self_type" : "type-240", + "size" : 4, + "source_file" : "/system/core/liblog/include/log/log_read.h" + }, +@@ -20699,8 +22111,8 @@ + "alignment" : 4, + "linker_set_key" : "const long long &", + "name" : "const long long &", +- "referenced_type" : "type-653", +- "self_type" : "type-659", ++ "referenced_type" : "type-651", ++ "self_type" : "type-657", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20708,8 +22120,8 @@ + "alignment" : 4, + "linker_set_key" : "const short &", + "name" : "const short &", +- "referenced_type" : "type-609", +- "self_type" : "type-610", ++ "referenced_type" : "type-607", ++ "self_type" : "type-608", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20718,7 +22130,7 @@ + "linker_set_key" : "const signed char &", + "name" : "const signed char &", + "referenced_type" : "type-549", +- "self_type" : "type-570", ++ "self_type" : "type-568", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20726,8 +22138,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1046", +- "self_type" : "type-1048", ++ "referenced_type" : "type-1043", ++ "self_type" : "type-1045", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20735,8 +22147,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1109", +- "self_type" : "type-1149", ++ "referenced_type" : "type-1108", ++ "self_type" : "type-1146", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -20744,8 +22156,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1113", +- "self_type" : "type-1115", ++ "referenced_type" : "type-1110", ++ "self_type" : "type-1112", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20753,8 +22165,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-113", +- "self_type" : "type-115", ++ "referenced_type" : "type-112", ++ "self_type" : "type-114", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -20762,8 +22174,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1174", +- "self_type" : "type-1176", ++ "referenced_type" : "type-1171", ++ "self_type" : "type-1173", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20771,8 +22183,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1233", +- "self_type" : "type-1235", ++ "referenced_type" : "type-1230", ++ "self_type" : "type-1232", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20780,8 +22192,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1312", +- "self_type" : "type-1314", ++ "referenced_type" : "type-1309", ++ "self_type" : "type-1311", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20789,8 +22201,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1398", +- "self_type" : "type-1400", ++ "referenced_type" : "type-1394", ++ "self_type" : "type-1396", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20798,8 +22210,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1467", +- "self_type" : "type-1469", ++ "referenced_type" : "type-1463", ++ "self_type" : "type-1465", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -20807,8 +22219,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1546", +- "self_type" : "type-1548", ++ "referenced_type" : "type-1542", ++ "self_type" : "type-1544", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20816,8 +22228,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1774", +- "self_type" : "type-1786", ++ "referenced_type" : "type-1769", ++ "self_type" : "type-1781", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -20825,8 +22237,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1815", +- "self_type" : "type-1818", ++ "referenced_type" : "type-1810", ++ "self_type" : "type-1812", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -20834,8 +22246,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1972", +- "self_type" : "type-1974", ++ "referenced_type" : "type-1967", ++ "self_type" : "type-1969", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20843,8 +22255,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2031", +- "self_type" : "type-2070", ++ "referenced_type" : "type-2028", ++ "self_type" : "type-2065", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -20852,8 +22264,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2035", +- "self_type" : "type-2037", ++ "referenced_type" : "type-2030", ++ "self_type" : "type-2032", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20861,8 +22273,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-206", +- "self_type" : "type-214", ++ "referenced_type" : "type-205", ++ "self_type" : "type-213", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -20870,8 +22282,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2094", +- "self_type" : "type-2096", ++ "referenced_type" : "type-2089", ++ "self_type" : "type-2091", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20879,8 +22291,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2151", +- "self_type" : "type-2153", ++ "referenced_type" : "type-2146", ++ "self_type" : "type-2148", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20888,8 +22300,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2229", +- "self_type" : "type-2231", ++ "referenced_type" : "type-2224", ++ "self_type" : "type-2226", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20897,8 +22309,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2275", +- "self_type" : "type-2277", ++ "referenced_type" : "type-2270", ++ "self_type" : "type-2272", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -20906,8 +22318,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2597", +- "self_type" : "type-2599", ++ "referenced_type" : "type-2591", ++ "self_type" : "type-2593", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20915,8 +22327,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2664", +- "self_type" : "type-2666", ++ "referenced_type" : "type-2658", ++ "self_type" : "type-2660", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -20924,8 +22336,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2742", +- "self_type" : "type-2744", ++ "referenced_type" : "type-2736", ++ "self_type" : "type-2738", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20933,8 +22345,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2813", +- "self_type" : "type-2815", ++ "referenced_type" : "type-2806", ++ "self_type" : "type-2809", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20942,8 +22354,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2877", +- "self_type" : "type-2881", ++ "referenced_type" : "type-2870", ++ "self_type" : "type-2874", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -20951,8 +22363,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2960", +- "self_type" : "type-2962", ++ "referenced_type" : "type-2953", ++ "self_type" : "type-2955", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -20960,8 +22372,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3110", +- "self_type" : "type-3112", ++ "referenced_type" : "type-3103", ++ "self_type" : "type-3105", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20969,8 +22381,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3150", +- "self_type" : "type-3184", ++ "referenced_type" : "type-3143", ++ "self_type" : "type-3178", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -20978,8 +22390,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3169", +- "self_type" : "type-3171", ++ "referenced_type" : "type-3162", ++ "self_type" : "type-3164", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20987,8 +22399,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3188", +- "self_type" : "type-3193", ++ "referenced_type" : "type-3181", ++ "self_type" : "type-3188", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -20996,8 +22408,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3236", +- "self_type" : "type-3238", ++ "referenced_type" : "type-3229", ++ "self_type" : "type-3231", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -21005,8 +22417,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3291", +- "self_type" : "type-3293", ++ "referenced_type" : "type-3284", ++ "self_type" : "type-3286", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -21014,8 +22426,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3300", +- "self_type" : "type-3306", ++ "referenced_type" : "type-3293", ++ "self_type" : "type-3301", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21023,8 +22435,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3357", +- "self_type" : "type-3359", ++ "referenced_type" : "type-3350", ++ "self_type" : "type-3352", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -21032,8 +22444,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3401", +- "self_type" : "type-3407", ++ "referenced_type" : "type-3394", ++ "self_type" : "type-3396", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -21041,8 +22453,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3940", +- "self_type" : "type-3942", ++ "referenced_type" : "type-3932", ++ "self_type" : "type-3934", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21050,8 +22462,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-4014", +- "self_type" : "type-4016", ++ "referenced_type" : "type-4006", ++ "self_type" : "type-4008", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -21059,8 +22471,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-409", +- "self_type" : "type-411", ++ "referenced_type" : "type-407", ++ "self_type" : "type-409", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21068,8 +22480,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-533", +- "self_type" : "type-535", ++ "referenced_type" : "type-531", ++ "self_type" : "type-533", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -21077,8 +22489,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-646", +- "self_type" : "type-648", ++ "referenced_type" : "type-644", ++ "self_type" : "type-646", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21086,8 +22498,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-799", +- "self_type" : "type-813", ++ "referenced_type" : "type-796", ++ "self_type" : "type-810", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21095,8 +22507,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-846", +- "self_type" : "type-849", ++ "referenced_type" : "type-843", ++ "self_type" : "type-845", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -21104,8 +22516,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-1541", +- "self_type" : "type-1540", ++ "referenced_type" : "type-1537", ++ "self_type" : "type-1536", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21113,8 +22525,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-2737", +- "self_type" : "type-2736", ++ "referenced_type" : "type-2731", ++ "self_type" : "type-2730", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21122,8 +22534,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-2808", +- "self_type" : "type-2807", ++ "referenced_type" : "type-2802", ++ "self_type" : "type-2801", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21131,8 +22543,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-641", +- "self_type" : "type-640", ++ "referenced_type" : "type-639", ++ "self_type" : "type-638", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21140,8 +22552,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-1394", +- "self_type" : "type-1393", ++ "referenced_type" : "type-1390", ++ "self_type" : "type-1389", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21149,8 +22561,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-2593", +- "self_type" : "type-2592", ++ "referenced_type" : "type-2587", ++ "self_type" : "type-2586", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21158,8 +22570,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-3936", +- "self_type" : "type-3935", ++ "referenced_type" : "type-3928", ++ "self_type" : "type-3927", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21167,8 +22579,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-404", +- "self_type" : "type-403", ++ "referenced_type" : "type-402", ++ "self_type" : "type-401", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21176,8 +22588,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function &", + "name" : "const std::function &", +- "referenced_type" : "type-1337", +- "self_type" : "type-1339", ++ "referenced_type" : "type-1334", ++ "self_type" : "type-1336", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -21185,8 +22597,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function &", + "name" : "const std::function &", +- "referenced_type" : "type-2305", +- "self_type" : "type-2310", ++ "referenced_type" : "type-2300", ++ "self_type" : "type-2305", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -21194,8 +22606,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function &", + "name" : "const std::function &", +- "referenced_type" : "type-306", +- "self_type" : "type-308", ++ "referenced_type" : "type-305", ++ "self_type" : "type-307", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -21203,8 +22615,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function &", + "name" : "const std::function &", +- "referenced_type" : "type-3640", +- "self_type" : "type-3642", ++ "referenced_type" : "type-3633", ++ "self_type" : "type-3635", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -21212,8 +22624,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function &", + "name" : "const std::function &", +- "referenced_type" : "type-3758", +- "self_type" : "type-3762", ++ "referenced_type" : "type-3751", ++ "self_type" : "type-3755", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -21221,8 +22633,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::unique_ptr > &", + "name" : "const std::unique_ptr > &", +- "referenced_type" : "type-3764", +- "self_type" : "type-3766", ++ "referenced_type" : "type-3757", ++ "self_type" : "type-3759", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -21230,8 +22642,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-1804", +- "self_type" : "type-1806", ++ "referenced_type" : "type-1799", ++ "self_type" : "type-1801", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21239,8 +22651,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-2948", +- "self_type" : "type-2950", ++ "referenced_type" : "type-2941", ++ "self_type" : "type-2943", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21248,8 +22660,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-831", +- "self_type" : "type-833", ++ "referenced_type" : "type-828", ++ "self_type" : "type-830", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21257,8 +22669,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1080", +- "self_type" : "type-1079", ++ "referenced_type" : "type-1077", ++ "self_type" : "type-1076", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21266,8 +22678,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1132", +- "self_type" : "type-1131", ++ "referenced_type" : "type-1129", ++ "self_type" : "type-1128", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21275,8 +22687,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1151", +- "self_type" : "type-1150", ++ "referenced_type" : "type-1148", ++ "self_type" : "type-1147", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21284,8 +22696,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1170", +- "self_type" : "type-1169", ++ "referenced_type" : "type-1167", ++ "self_type" : "type-1166", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21293,8 +22705,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1193", +- "self_type" : "type-1192", ++ "referenced_type" : "type-1190", ++ "self_type" : "type-1189", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21302,8 +22714,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1260", +- "self_type" : "type-1259", ++ "referenced_type" : "type-1257", ++ "self_type" : "type-1256", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21311,8 +22723,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1326", +- "self_type" : "type-1325", ++ "referenced_type" : "type-1323", ++ "self_type" : "type-1322", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21320,8 +22732,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1384", +- "self_type" : "type-1383", ++ "referenced_type" : "type-1381", ++ "self_type" : "type-1380", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21329,8 +22741,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1492", +- "self_type" : "type-1491", ++ "referenced_type" : "type-1488", ++ "self_type" : "type-1487", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21338,8 +22750,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-155", +- "self_type" : "type-154", ++ "referenced_type" : "type-154", ++ "self_type" : "type-153", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21347,8 +22759,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1556", +- "self_type" : "type-1555", ++ "referenced_type" : "type-1552", ++ "self_type" : "type-1551", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21356,8 +22768,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1716", +- "self_type" : "type-1715", ++ "referenced_type" : "type-1711", ++ "self_type" : "type-1710", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21365,8 +22777,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1741", +- "self_type" : "type-1740", ++ "referenced_type" : "type-1736", ++ "self_type" : "type-1735", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21374,8 +22786,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1850", +- "self_type" : "type-1849", ++ "referenced_type" : "type-1845", ++ "self_type" : "type-1844", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21383,8 +22795,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1884", +- "self_type" : "type-1883", ++ "referenced_type" : "type-1878", ++ "self_type" : "type-1877", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21392,8 +22804,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1889", +- "self_type" : "type-1888", ++ "referenced_type" : "type-1884", ++ "self_type" : "type-1883", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21401,8 +22813,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2004", +- "self_type" : "type-2003", ++ "referenced_type" : "type-1999", ++ "self_type" : "type-1998", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21410,8 +22822,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2054", +- "self_type" : "type-2053", ++ "referenced_type" : "type-2049", ++ "self_type" : "type-2048", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21419,8 +22831,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2072", +- "self_type" : "type-2071", ++ "referenced_type" : "type-2067", ++ "self_type" : "type-2066", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21428,8 +22840,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2090", +- "self_type" : "type-2089", ++ "referenced_type" : "type-2085", ++ "self_type" : "type-2084", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21437,8 +22849,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2113", +- "self_type" : "type-2112", ++ "referenced_type" : "type-2108", ++ "self_type" : "type-2107", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21446,8 +22858,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-216", +- "self_type" : "type-215", ++ "referenced_type" : "type-215", ++ "self_type" : "type-214", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21455,8 +22867,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2179", +- "self_type" : "type-2178", ++ "referenced_type" : "type-2174", ++ "self_type" : "type-2173", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21464,8 +22876,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-219", +- "self_type" : "type-218", ++ "referenced_type" : "type-218", ++ "self_type" : "type-217", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21473,8 +22885,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2243", +- "self_type" : "type-2242", ++ "referenced_type" : "type-2238", ++ "self_type" : "type-2237", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21482,8 +22894,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2298", +- "self_type" : "type-2297", ++ "referenced_type" : "type-2293", ++ "self_type" : "type-2292", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21491,8 +22903,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2319", +- "self_type" : "type-2318", ++ "referenced_type" : "type-2313", ++ "self_type" : "type-2312", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21500,8 +22912,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2583", +- "self_type" : "type-2582", ++ "referenced_type" : "type-2578", ++ "self_type" : "type-2577", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21509,8 +22921,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2689", +- "self_type" : "type-2688", ++ "referenced_type" : "type-2683", ++ "self_type" : "type-2682", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21518,8 +22930,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2752", +- "self_type" : "type-2751", ++ "referenced_type" : "type-2746", ++ "self_type" : "type-2745", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21527,8 +22939,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2824", +- "self_type" : "type-2823", ++ "referenced_type" : "type-2818", ++ "self_type" : "type-2817", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21536,8 +22948,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2860", +- "self_type" : "type-2859", ++ "referenced_type" : "type-2853", ++ "self_type" : "type-2852", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21545,8 +22957,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2883", +- "self_type" : "type-2882", ++ "referenced_type" : "type-2876", ++ "self_type" : "type-2875", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21554,8 +22966,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2993", +- "self_type" : "type-2992", ++ "referenced_type" : "type-2985", ++ "self_type" : "type-2984", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21563,8 +22975,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3004", +- "self_type" : "type-3003", ++ "referenced_type" : "type-2997", ++ "self_type" : "type-2996", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21572,8 +22984,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3026", +- "self_type" : "type-3025", ++ "referenced_type" : "type-3019", ++ "self_type" : "type-3018", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21581,8 +22993,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3139", +- "self_type" : "type-3138", ++ "referenced_type" : "type-3132", ++ "self_type" : "type-3131", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21590,8 +23002,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3191", +- "self_type" : "type-3190", ++ "referenced_type" : "type-3184", ++ "self_type" : "type-3183", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21599,8 +23011,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3197", +- "self_type" : "type-3196", ++ "referenced_type" : "type-3190", ++ "self_type" : "type-3189", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21608,8 +23020,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3216", +- "self_type" : "type-3215", ++ "referenced_type" : "type-3209", ++ "self_type" : "type-3208", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21617,8 +23029,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3255", +- "self_type" : "type-3254", ++ "referenced_type" : "type-3248", ++ "self_type" : "type-3247", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21626,8 +23038,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3313", +- "self_type" : "type-3312", ++ "referenced_type" : "type-3306", ++ "self_type" : "type-3305", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21635,8 +23047,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3368", +- "self_type" : "type-3367", ++ "referenced_type" : "type-3361", ++ "self_type" : "type-3360", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21644,8 +23056,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3375", +- "self_type" : "type-3374", ++ "referenced_type" : "type-3368", ++ "self_type" : "type-3367", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21653,8 +23065,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3405", +- "self_type" : "type-3404", ++ "referenced_type" : "type-3401", ++ "self_type" : "type-3400", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21662,8 +23074,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3425", +- "self_type" : "type-3424", ++ "referenced_type" : "type-3418", ++ "self_type" : "type-3417", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21671,8 +23083,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3439", +- "self_type" : "type-3438", ++ "referenced_type" : "type-3432", ++ "self_type" : "type-3431", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21680,8 +23092,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-388", +- "self_type" : "type-387", ++ "referenced_type" : "type-387", ++ "self_type" : "type-386", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21689,8 +23101,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3926", +- "self_type" : "type-3925", ++ "referenced_type" : "type-3919", ++ "self_type" : "type-3918", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21698,8 +23110,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-4040", +- "self_type" : "type-4039", ++ "referenced_type" : "type-4032", ++ "self_type" : "type-4031", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21707,8 +23119,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-568", +- "self_type" : "type-567", ++ "referenced_type" : "type-566", ++ "self_type" : "type-565", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21716,8 +23128,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-59", +- "self_type" : "type-58", ++ "referenced_type" : "type-58", ++ "self_type" : "type-57", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21725,8 +23137,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-657", +- "self_type" : "type-656", ++ "referenced_type" : "type-655", ++ "self_type" : "type-654", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21734,8 +23146,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-733", +- "self_type" : "type-732", ++ "referenced_type" : "type-730", ++ "self_type" : "type-729", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21743,8 +23155,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-758", +- "self_type" : "type-757", ++ "referenced_type" : "type-755", ++ "self_type" : "type-754", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21752,8 +23164,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-901", +- "self_type" : "type-900", ++ "referenced_type" : "type-898", ++ "self_type" : "type-897", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21761,8 +23173,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-93", +- "self_type" : "type-92", ++ "referenced_type" : "type-92", ++ "self_type" : "type-91", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21770,8 +23182,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-935", +- "self_type" : "type-934", ++ "referenced_type" : "type-931", ++ "self_type" : "type-930", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21779,8 +23191,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-940", +- "self_type" : "type-939", ++ "referenced_type" : "type-937", ++ "self_type" : "type-936", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21788,8 +23200,8 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned char &", + "name" : "const unsigned char &", +- "referenced_type" : "type-604", +- "self_type" : "type-608", ++ "referenced_type" : "type-603", ++ "self_type" : "type-606", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -21797,8 +23209,8 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned char *const &", + "name" : "const unsigned char *const &", +- "referenced_type" : "type-3725", +- "self_type" : "type-3726", ++ "referenced_type" : "type-3718", ++ "self_type" : "type-3719", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21806,8 +23218,8 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned int &", + "name" : "const unsigned int &", +- "referenced_type" : "type-246", +- "self_type" : "type-651", ++ "referenced_type" : "type-245", ++ "self_type" : "type-650", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -21815,8 +23227,8 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned int *const &", + "name" : "const unsigned int *const &", +- "referenced_type" : "type-3727", +- "self_type" : "type-3728", ++ "referenced_type" : "type-3720", ++ "self_type" : "type-3721", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21824,8 +23236,8 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned long long &", + "name" : "const unsigned long long &", +- "referenced_type" : "type-661", +- "self_type" : "type-664", ++ "referenced_type" : "type-659", ++ "self_type" : "type-662", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -21833,7 +23245,7 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned short &", + "name" : "const unsigned short &", +- "referenced_type" : "type-614", ++ "referenced_type" : "type-612", + "self_type" : "type-615", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" +@@ -21842,8 +23254,8 @@ + "alignment" : 4, + "linker_set_key" : "const void *const &", + "name" : "const void *const &", +- "referenced_type" : "type-2385", +- "self_type" : "type-2386", ++ "referenced_type" : "type-2380", ++ "self_type" : "type-2381", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -21852,7 +23264,7 @@ + "linker_set_key" : "int &", + "name" : "int &", + "referenced_type" : "type-19", +- "self_type" : "type-339", ++ "self_type" : "type-338", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -21860,8 +23272,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-120", +- "self_type" : "type-119", ++ "referenced_type" : "type-119", ++ "self_type" : "type-118", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21869,8 +23281,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-1295", +- "self_type" : "type-1294", ++ "referenced_type" : "type-1293", ++ "self_type" : "type-1292", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -21878,8 +23290,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-1795", +- "self_type" : "type-1794", ++ "referenced_type" : "type-1790", ++ "self_type" : "type-1789", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21887,8 +23299,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-2212", +- "self_type" : "type-2211", ++ "referenced_type" : "type-2208", ++ "self_type" : "type-2207", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -21896,8 +23308,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-2491", +- "self_type" : "type-2490", ++ "referenced_type" : "type-2486", ++ "self_type" : "type-2485", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21905,8 +23317,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-265", +- "self_type" : "type-264", ++ "referenced_type" : "type-264", ++ "self_type" : "type-263", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -21914,8 +23326,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-2892", +- "self_type" : "type-2891", ++ "referenced_type" : "type-2885", ++ "self_type" : "type-2884", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21923,8 +23335,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3318", +- "self_type" : "type-3317", ++ "referenced_type" : "type-3311", ++ "self_type" : "type-3310", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21932,8 +23344,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3559", +- "self_type" : "type-3558", ++ "referenced_type" : "type-3552", ++ "self_type" : "type-3551", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21941,8 +23353,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3584", +- "self_type" : "type-3583", ++ "referenced_type" : "type-3578", ++ "self_type" : "type-3577", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -21950,8 +23362,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3736", +- "self_type" : "type-3735", ++ "referenced_type" : "type-3729", ++ "self_type" : "type-3728", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21959,8 +23371,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3801", +- "self_type" : "type-3800", ++ "referenced_type" : "type-3793", ++ "self_type" : "type-3792", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21968,8 +23380,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3877", +- "self_type" : "type-3876", ++ "referenced_type" : "type-3870", ++ "self_type" : "type-3869", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21977,8 +23389,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3888", +- "self_type" : "type-3887", ++ "referenced_type" : "type-3881", ++ "self_type" : "type-3880", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21986,8 +23398,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-822", +- "self_type" : "type-821", ++ "referenced_type" : "type-819", ++ "self_type" : "type-818", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21995,8 +23407,8 @@ + "alignment" : 4, + "linker_set_key" : "unsigned char &", + "name" : "unsigned char &", +- "referenced_type" : "type-199", +- "self_type" : "type-555", ++ "referenced_type" : "type-198", ++ "self_type" : "type-553", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -22004,8 +23416,8 @@ + "alignment" : 4, + "linker_set_key" : "void *const &", + "name" : "void *const &", +- "referenced_type" : "type-3667", +- "self_type" : "type-3668", ++ "referenced_type" : "type-3660", ++ "self_type" : "type-3661", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + } +@@ -22016,8 +23428,8 @@ + "alignment" : 4, + "linker_set_key" : "android::CallStack *", + "name" : "android::CallStack *", +- "referenced_type" : "type-256", +- "self_type" : "type-257", ++ "referenced_type" : "type-255", ++ "self_type" : "type-256", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/CallStack.h" + }, +@@ -22025,8 +23437,8 @@ + "alignment" : 4, + "linker_set_key" : "android::CallStack::StackDeleter *", + "name" : "android::CallStack::StackDeleter *", +- "referenced_type" : "type-260", +- "self_type" : "type-261", ++ "referenced_type" : "type-259", ++ "self_type" : "type-260", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/CallStack.h" + }, +@@ -22034,8 +23446,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Condition *", + "name" : "android::Condition *", +- "referenced_type" : "type-442", +- "self_type" : "type-445", ++ "referenced_type" : "type-440", ++ "self_type" : "type-443", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Condition.h" + }, +@@ -22043,8 +23455,8 @@ + "alignment" : 4, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-2437", +- "self_type" : "type-2436", ++ "referenced_type" : "type-2432", ++ "self_type" : "type-2431", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -22052,8 +23464,8 @@ + "alignment" : 4, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-3537", +- "self_type" : "type-3536", ++ "referenced_type" : "type-3530", ++ "self_type" : "type-3529", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -22061,8 +23473,8 @@ + "alignment" : 4, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-3635", +- "self_type" : "type-3634", ++ "referenced_type" : "type-3628", ++ "self_type" : "type-3627", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -22070,8 +23482,8 @@ + "alignment" : 4, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-3787", +- "self_type" : "type-3786", ++ "referenced_type" : "type-3780", ++ "self_type" : "type-3779", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -22079,8 +23491,8 @@ + "alignment" : 4, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-3843", +- "self_type" : "type-3842", ++ "referenced_type" : "type-3836", ++ "self_type" : "type-3835", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -22088,8 +23500,8 @@ + "alignment" : 4, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-3881", +- "self_type" : "type-3880", ++ "referenced_type" : "type-3874", ++ "self_type" : "type-3873", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -22097,8 +23509,8 @@ + "alignment" : 4, + "linker_set_key" : "android::KeyedVector > *", + "name" : "android::KeyedVector > *", +- "referenced_type" : "type-433", +- "self_type" : "type-3833", ++ "referenced_type" : "type-431", ++ "self_type" : "type-3826", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -22106,8 +23518,8 @@ + "alignment" : 4, + "linker_set_key" : "android::KeyedVector *", + "name" : "android::KeyedVector *", +- "referenced_type" : "type-2341", +- "self_type" : "type-2416", ++ "referenced_type" : "type-2336", ++ "self_type" : "type-2411", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -22115,8 +23527,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Mutex *", + "name" : "android::Mutex *", +- "referenced_type" : "type-436", +- "self_type" : "type-438", ++ "referenced_type" : "type-433", ++ "self_type" : "type-436", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Mutex.h" + }, +@@ -22124,8 +23536,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Mutex::Autolock *", + "name" : "android::Mutex::Autolock *", +- "referenced_type" : "type-439", +- "self_type" : "type-441", ++ "referenced_type" : "type-437", ++ "self_type" : "type-439", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Mutex.h" + }, +@@ -22133,8 +23545,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RWLock *", + "name" : "android::RWLock *", +- "referenced_type" : "type-448", +- "self_type" : "type-450", ++ "referenced_type" : "type-444", ++ "self_type" : "type-448", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RWLock.h" + }, +@@ -22142,8 +23554,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RWLock::AutoRLock *", + "name" : "android::RWLock::AutoRLock *", +- "referenced_type" : "type-451", +- "self_type" : "type-453", ++ "referenced_type" : "type-449", ++ "self_type" : "type-451", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RWLock.h" + }, +@@ -22151,8 +23563,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RWLock::AutoWLock *", + "name" : "android::RWLock::AutoWLock *", +- "referenced_type" : "type-455", +- "self_type" : "type-456", ++ "referenced_type" : "type-452", ++ "self_type" : "type-454", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RWLock.h" + }, +@@ -22161,7 +23573,7 @@ + "linker_set_key" : "android::RefBase *", + "name" : "android::RefBase *", + "referenced_type" : "type-25", +- "self_type" : "type-68", ++ "self_type" : "type-67", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22169,8 +23581,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase **", + "name" : "android::RefBase **", +- "referenced_type" : "type-68", +- "self_type" : "type-3604", ++ "referenced_type" : "type-67", ++ "self_type" : "type-3597", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -22178,8 +23590,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase *const *", + "name" : "android::RefBase *const *", +- "referenced_type" : "type-3609", +- "self_type" : "type-3610", ++ "referenced_type" : "type-3602", ++ "self_type" : "type-3603", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -22187,8 +23599,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1100", +- "self_type" : "type-1099", ++ "referenced_type" : "type-1097", ++ "self_type" : "type-1096", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22196,8 +23608,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1160", +- "self_type" : "type-1159", ++ "referenced_type" : "type-1157", ++ "self_type" : "type-1156", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22205,8 +23617,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1221", +- "self_type" : "type-1220", ++ "referenced_type" : "type-1218", ++ "self_type" : "type-1217", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22214,8 +23626,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1293", +- "self_type" : "type-1292", ++ "referenced_type" : "type-1290", ++ "self_type" : "type-1289", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22223,8 +23635,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1348", +- "self_type" : "type-1347", ++ "referenced_type" : "type-1345", ++ "self_type" : "type-1344", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22232,8 +23644,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1455", +- "self_type" : "type-1454", ++ "referenced_type" : "type-1451", ++ "self_type" : "type-1450", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22241,8 +23653,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1523", +- "self_type" : "type-1522", ++ "referenced_type" : "type-1519", ++ "self_type" : "type-1518", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22250,8 +23662,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1690", +- "self_type" : "type-1689", ++ "referenced_type" : "type-1686", ++ "self_type" : "type-1685", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22259,8 +23671,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1702", +- "self_type" : "type-1701", ++ "referenced_type" : "type-1698", ++ "self_type" : "type-1697", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22268,8 +23680,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1729", +- "self_type" : "type-1728", ++ "referenced_type" : "type-1724", ++ "self_type" : "type-1723", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22277,8 +23689,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1792", +- "self_type" : "type-1791", ++ "referenced_type" : "type-1787", ++ "self_type" : "type-1786", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22286,8 +23698,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1864", +- "self_type" : "type-1863", ++ "referenced_type" : "type-1859", ++ "self_type" : "type-1858", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22295,8 +23707,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1935", +- "self_type" : "type-1934", ++ "referenced_type" : "type-1930", ++ "self_type" : "type-1929", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22304,8 +23716,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2022", +- "self_type" : "type-2021", ++ "referenced_type" : "type-2017", ++ "self_type" : "type-2016", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22313,8 +23725,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2080", +- "self_type" : "type-2079", ++ "referenced_type" : "type-2075", ++ "self_type" : "type-2074", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22322,8 +23734,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2139", +- "self_type" : "type-2138", ++ "referenced_type" : "type-2134", ++ "self_type" : "type-2133", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22331,8 +23743,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2210", +- "self_type" : "type-2209", ++ "referenced_type" : "type-2205", ++ "self_type" : "type-2204", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22340,8 +23752,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2258", +- "self_type" : "type-2257", ++ "referenced_type" : "type-2253", ++ "self_type" : "type-2252", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22349,8 +23761,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2308", +- "self_type" : "type-2307", ++ "referenced_type" : "type-2303", ++ "self_type" : "type-2302", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22358,8 +23770,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2326", +- "self_type" : "type-2325", ++ "referenced_type" : "type-2321", ++ "self_type" : "type-2320", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22367,8 +23779,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2401", +- "self_type" : "type-2400", ++ "referenced_type" : "type-2396", ++ "self_type" : "type-2395", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22376,8 +23788,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2499", +- "self_type" : "type-2498", ++ "referenced_type" : "type-2494", ++ "self_type" : "type-2493", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22385,8 +23797,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2521", +- "self_type" : "type-2520", ++ "referenced_type" : "type-2518", ++ "self_type" : "type-2517", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22394,8 +23806,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2534", +- "self_type" : "type-2533", ++ "referenced_type" : "type-2529", ++ "self_type" : "type-2528", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22403,8 +23815,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2542", +- "self_type" : "type-2541", ++ "referenced_type" : "type-2537", ++ "self_type" : "type-2536", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22412,8 +23824,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2652", +- "self_type" : "type-2651", ++ "referenced_type" : "type-2646", ++ "self_type" : "type-2645", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22421,8 +23833,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2720", +- "self_type" : "type-2719", ++ "referenced_type" : "type-2714", ++ "self_type" : "type-2713", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22439,8 +23851,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2820", +- "self_type" : "type-2819", ++ "referenced_type" : "type-2815", ++ "self_type" : "type-2814", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22448,8 +23860,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2833", +- "self_type" : "type-2832", ++ "referenced_type" : "type-2827", ++ "self_type" : "type-2826", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22457,8 +23869,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2871", +- "self_type" : "type-2870", ++ "referenced_type" : "type-2864", ++ "self_type" : "type-2863", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22466,8 +23878,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2937", +- "self_type" : "type-2936", ++ "referenced_type" : "type-2929", ++ "self_type" : "type-2928", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22475,8 +23887,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3007", +- "self_type" : "type-3006", ++ "referenced_type" : "type-3000", ++ "self_type" : "type-2999", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22484,8 +23896,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3078", +- "self_type" : "type-3077", ++ "referenced_type" : "type-3071", ++ "self_type" : "type-3070", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22493,8 +23905,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3158", +- "self_type" : "type-3157", ++ "referenced_type" : "type-3151", ++ "self_type" : "type-3150", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22502,8 +23914,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-321", +- "self_type" : "type-320", ++ "referenced_type" : "type-320", ++ "self_type" : "type-319", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22511,8 +23923,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3225", +- "self_type" : "type-3224", ++ "referenced_type" : "type-3218", ++ "self_type" : "type-3217", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22520,8 +23932,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3268", +- "self_type" : "type-3267", ++ "referenced_type" : "type-3261", ++ "self_type" : "type-3260", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22529,8 +23941,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3278", +- "self_type" : "type-3277", ++ "referenced_type" : "type-3271", ++ "self_type" : "type-3270", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22538,8 +23950,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3341", +- "self_type" : "type-3340", ++ "referenced_type" : "type-3334", ++ "self_type" : "type-3333", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22547,8 +23959,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3387", +- "self_type" : "type-3386", ++ "referenced_type" : "type-3380", ++ "self_type" : "type-3379", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22556,8 +23968,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3431", +- "self_type" : "type-3430", ++ "referenced_type" : "type-3424", ++ "self_type" : "type-3423", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22565,8 +23977,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3446", +- "self_type" : "type-3445", ++ "referenced_type" : "type-3439", ++ "self_type" : "type-3438", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22574,8 +23986,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3503", +- "self_type" : "type-3502", ++ "referenced_type" : "type-3496", ++ "self_type" : "type-3495", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22583,8 +23995,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3566", +- "self_type" : "type-3565", ++ "referenced_type" : "type-3559", ++ "self_type" : "type-3558", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22592,8 +24004,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3587", +- "self_type" : "type-3586", ++ "referenced_type" : "type-3580", ++ "self_type" : "type-3579", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22601,8 +24013,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3595", +- "self_type" : "type-3594", ++ "referenced_type" : "type-3588", ++ "self_type" : "type-3587", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22610,8 +24022,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3618", +- "self_type" : "type-3617", ++ "referenced_type" : "type-3611", ++ "self_type" : "type-3610", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22619,8 +24031,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3752", +- "self_type" : "type-3751", ++ "referenced_type" : "type-3745", ++ "self_type" : "type-3744", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22628,8 +24040,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3819", +- "self_type" : "type-3818", ++ "referenced_type" : "type-3812", ++ "self_type" : "type-3811", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22637,8 +24049,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3874", +- "self_type" : "type-3873", ++ "referenced_type" : "type-3867", ++ "self_type" : "type-3866", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22646,8 +24058,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3890", +- "self_type" : "type-3889", ++ "referenced_type" : "type-3883", ++ "self_type" : "type-3882", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22655,8 +24067,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-4000", +- "self_type" : "type-3999", ++ "referenced_type" : "type-3992", ++ "self_type" : "type-3991", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22664,8 +24076,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-4073", +- "self_type" : "type-4072", ++ "referenced_type" : "type-4065", ++ "self_type" : "type-4064", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22673,8 +24085,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-511", +- "self_type" : "type-510", ++ "referenced_type" : "type-509", ++ "self_type" : "type-508", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22691,8 +24103,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-612", +- "self_type" : "type-611", ++ "referenced_type" : "type-610", ++ "self_type" : "type-609", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22700,8 +24112,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-707", +- "self_type" : "type-706", ++ "referenced_type" : "type-705", ++ "self_type" : "type-704", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22709,8 +24121,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-719", +- "self_type" : "type-718", ++ "referenced_type" : "type-717", ++ "self_type" : "type-716", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22718,8 +24130,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-746", +- "self_type" : "type-745", ++ "referenced_type" : "type-743", ++ "self_type" : "type-742", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22727,8 +24139,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-81", +- "self_type" : "type-80", ++ "referenced_type" : "type-80", ++ "self_type" : "type-79", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22736,8 +24148,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-819", +- "self_type" : "type-818", ++ "referenced_type" : "type-816", ++ "self_type" : "type-815", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22745,8 +24157,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-915", +- "self_type" : "type-914", ++ "referenced_type" : "type-912", ++ "self_type" : "type-911", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22754,8 +24166,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-997", +- "self_type" : "type-996", ++ "referenced_type" : "type-994", ++ "self_type" : "type-993", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22773,7 +24185,7 @@ + "linker_set_key" : "android::RefBase::weakref_type **", + "name" : "android::RefBase::weakref_type **", + "referenced_type" : "type-35", +- "self_type" : "type-3603", ++ "self_type" : "type-3596", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -22781,8 +24193,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_type *const *", + "name" : "android::RefBase::weakref_type *const *", +- "referenced_type" : "type-3607", +- "self_type" : "type-3608", ++ "referenced_type" : "type-3600", ++ "self_type" : "type-3601", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -22799,8 +24211,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ScopedTrace *", + "name" : "android::ScopedTrace *", +- "referenced_type" : "type-1064", +- "self_type" : "type-1065", ++ "referenced_type" : "type-1061", ++ "self_type" : "type-1062", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Trace.h" + }, +@@ -22808,8 +24220,8 @@ + "alignment" : 4, + "linker_set_key" : "android::SortedVector > > *", + "name" : "android::SortedVector > > *", +- "referenced_type" : "type-426", +- "self_type" : "type-3824", ++ "referenced_type" : "type-424", ++ "self_type" : "type-3817", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -22817,8 +24229,8 @@ + "alignment" : 4, + "linker_set_key" : "android::SortedVector > *", + "name" : "android::SortedVector > *", +- "referenced_type" : "type-2342", +- "self_type" : "type-2406", ++ "referenced_type" : "type-2337", ++ "self_type" : "type-2401", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -22826,8 +24238,8 @@ + "alignment" : 4, + "linker_set_key" : "android::String16 *", + "name" : "android::String16 *", +- "referenced_type" : "type-342", +- "self_type" : "type-352", ++ "referenced_type" : "type-341", ++ "self_type" : "type-351", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String16.h" + }, +@@ -22835,8 +24247,8 @@ + "alignment" : 4, + "linker_set_key" : "android::String8 *", + "name" : "android::String8 *", +- "referenced_type" : "type-221", +- "self_type" : "type-227", ++ "referenced_type" : "type-220", ++ "self_type" : "type-226", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String8.h" + }, +@@ -22844,8 +24256,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Thread *", + "name" : "android::Thread *", +- "referenced_type" : "type-501", +- "self_type" : "type-500", ++ "referenced_type" : "type-499", ++ "self_type" : "type-498", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -22853,8 +24265,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-432", +- "self_type" : "type-3629", ++ "referenced_type" : "type-430", ++ "self_type" : "type-3622", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22862,8 +24274,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-431", +- "self_type" : "type-3625", ++ "referenced_type" : "type-429", ++ "self_type" : "type-3618", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22871,8 +24283,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-252", +- "self_type" : "type-253", ++ "referenced_type" : "type-251", ++ "self_type" : "type-252", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22880,8 +24292,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-430", +- "self_type" : "type-3621", ++ "referenced_type" : "type-428", ++ "self_type" : "type-3614", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22889,8 +24301,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-2339", +- "self_type" : "type-2338", ++ "referenced_type" : "type-2334", ++ "self_type" : "type-2333", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -22898,8 +24310,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-2409", +- "self_type" : "type-2411", ++ "referenced_type" : "type-2404", ++ "self_type" : "type-2406", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22907,8 +24319,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-3458", +- "self_type" : "type-3457", ++ "referenced_type" : "type-3451", ++ "self_type" : "type-3450", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -22916,8 +24328,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-3644", +- "self_type" : "type-3643", ++ "referenced_type" : "type-3637", ++ "self_type" : "type-3636", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -22925,8 +24337,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-3761", +- "self_type" : "type-3760", ++ "referenced_type" : "type-3754", ++ "self_type" : "type-3753", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -22934,8 +24346,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-3838", +- "self_type" : "type-3837", ++ "referenced_type" : "type-3831", ++ "self_type" : "type-3830", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -22943,8 +24355,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-428", +- "self_type" : "type-3827", ++ "referenced_type" : "type-426", ++ "self_type" : "type-3820", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22952,8 +24364,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector > *", + "name" : "android::Vector > *", +- "referenced_type" : "type-2516", +- "self_type" : "type-2517", ++ "referenced_type" : "type-2511", ++ "self_type" : "type-2512", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22961,8 +24373,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-2512", +- "self_type" : "type-2515", ++ "referenced_type" : "type-2507", ++ "self_type" : "type-2510", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22970,8 +24382,8 @@ + "alignment" : 4, + "linker_set_key" : "android::VirtualLightRefBase *", + "name" : "android::VirtualLightRefBase *", +- "referenced_type" : "type-182", +- "self_type" : "type-184", ++ "referenced_type" : "type-181", ++ "self_type" : "type-183", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/LightRefBase.h" + }, +@@ -22979,8 +24391,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1083", +- "self_type" : "type-1082", ++ "referenced_type" : "type-1080", ++ "self_type" : "type-1079", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22988,8 +24400,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1139", +- "self_type" : "type-1138", ++ "referenced_type" : "type-1136", ++ "self_type" : "type-1135", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22997,8 +24409,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1196", +- "self_type" : "type-1195", ++ "referenced_type" : "type-1193", ++ "self_type" : "type-1192", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23006,8 +24418,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1269", +- "self_type" : "type-1268", ++ "referenced_type" : "type-1266", ++ "self_type" : "type-1265", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23015,8 +24427,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1381", +- "self_type" : "type-1380", ++ "referenced_type" : "type-1378", ++ "self_type" : "type-1377", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23024,8 +24436,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1759", +- "self_type" : "type-1758", ++ "referenced_type" : "type-1753", ++ "self_type" : "type-1752", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23033,8 +24445,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1887", +- "self_type" : "type-1886", ++ "referenced_type" : "type-1882", ++ "self_type" : "type-1881", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23042,8 +24454,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1899", +- "self_type" : "type-1898", ++ "referenced_type" : "type-1894", ++ "self_type" : "type-1893", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23051,8 +24463,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2007", +- "self_type" : "type-2006", ++ "referenced_type" : "type-2002", ++ "self_type" : "type-2001", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23060,8 +24472,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2061", +- "self_type" : "type-2060", ++ "referenced_type" : "type-2056", ++ "self_type" : "type-2055", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23069,8 +24481,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2116", +- "self_type" : "type-2115", ++ "referenced_type" : "type-2111", ++ "self_type" : "type-2110", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23078,8 +24490,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2188", +- "self_type" : "type-2187", ++ "referenced_type" : "type-2183", ++ "self_type" : "type-2182", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23087,8 +24499,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2247", +- "self_type" : "type-2246", ++ "referenced_type" : "type-2242", ++ "self_type" : "type-2241", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23096,8 +24508,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2333", +- "self_type" : "type-2332", ++ "referenced_type" : "type-2328", ++ "self_type" : "type-2327", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, +@@ -23105,8 +24517,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2580", +- "self_type" : "type-2579", ++ "referenced_type" : "type-2575", ++ "self_type" : "type-2574", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23114,8 +24526,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2903", +- "self_type" : "type-2902", ++ "referenced_type" : "type-2896", ++ "self_type" : "type-2895", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23123,8 +24535,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3030", +- "self_type" : "type-3029", ++ "referenced_type" : "type-3023", ++ "self_type" : "type-3022", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23132,8 +24544,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3041", +- "self_type" : "type-3040", ++ "referenced_type" : "type-3034", ++ "self_type" : "type-3033", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23141,8 +24553,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3142", +- "self_type" : "type-3141", ++ "referenced_type" : "type-3135", ++ "self_type" : "type-3134", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23150,8 +24562,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3202", +- "self_type" : "type-3201", ++ "referenced_type" : "type-3195", ++ "self_type" : "type-3194", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23159,8 +24571,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3258", +- "self_type" : "type-3257", ++ "referenced_type" : "type-3251", ++ "self_type" : "type-3250", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23168,8 +24580,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3322", +- "self_type" : "type-3321", ++ "referenced_type" : "type-3315", ++ "self_type" : "type-3314", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23177,8 +24589,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3378", +- "self_type" : "type-3377", ++ "referenced_type" : "type-3371", ++ "self_type" : "type-3370", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23186,8 +24598,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-385", +- "self_type" : "type-384", ++ "referenced_type" : "type-384", ++ "self_type" : "type-383", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23195,8 +24607,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3924", +- "self_type" : "type-3923", ++ "referenced_type" : "type-3917", ++ "self_type" : "type-3916", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23204,8 +24616,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-782", +- "self_type" : "type-781", ++ "referenced_type" : "type-778", ++ "self_type" : "type-777", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23213,8 +24625,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-938", +- "self_type" : "type-937", ++ "referenced_type" : "type-935", ++ "self_type" : "type-934", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23222,8 +24634,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-955", +- "self_type" : "type-954", ++ "referenced_type" : "type-952", ++ "self_type" : "type-951", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23231,8 +24643,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder **", + "name" : "android::hardware::BHwBinder **", +- "referenced_type" : "type-2332", +- "self_type" : "type-3602", ++ "referenced_type" : "type-2327", ++ "self_type" : "type-3595", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -23240,8 +24652,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *const *", + "name" : "android::hardware::BHwBinder *const *", +- "referenced_type" : "type-3605", +- "self_type" : "type-3606", ++ "referenced_type" : "type-3598", ++ "self_type" : "type-3599", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -23249,8 +24661,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder::Extras *", + "name" : "android::hardware::BHwBinder::Extras *", +- "referenced_type" : "type-2363", +- "self_type" : "type-2362", ++ "referenced_type" : "type-2358", ++ "self_type" : "type-2357", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -23258,8 +24670,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder::Extras *", + "name" : "android::hardware::BHwBinder::Extras *", +- "referenced_type" : "type-3473", +- "self_type" : "type-3472", ++ "referenced_type" : "type-3466", ++ "self_type" : "type-3465", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -23267,8 +24679,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BpHwBinder *", + "name" : "android::hardware::BpHwBinder *", +- "referenced_type" : "type-2336", +- "self_type" : "type-2335", ++ "referenced_type" : "type-2331", ++ "self_type" : "type-2330", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, +@@ -23276,8 +24688,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BpHwBinder::Obituary *", + "name" : "android::hardware::BpHwBinder::Obituary *", +- "referenced_type" : "type-2373", +- "self_type" : "type-2388", ++ "referenced_type" : "type-2368", ++ "self_type" : "type-2383", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -23285,8 +24697,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager *", + "name" : "android::hardware::BpHwBinder::ObjectManager *", +- "referenced_type" : "type-2340", +- "self_type" : "type-2423", ++ "referenced_type" : "type-2335", ++ "self_type" : "type-2418", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -23294,8 +24706,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BpHwRefBase *", + "name" : "android::hardware::BpHwRefBase *", +- "referenced_type" : "type-2364", +- "self_type" : "type-2368", ++ "referenced_type" : "type-2359", ++ "self_type" : "type-2363", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -23303,8 +24715,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BufferedTextOutput *", + "name" : "android::hardware::BufferedTextOutput *", +- "referenced_type" : "type-2504", +- "self_type" : "type-2505", ++ "referenced_type" : "type-2499", ++ "self_type" : "type-2500", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -23312,8 +24724,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *", + "name" : "android::hardware::BufferedTextOutput::BufferState *", +- "referenced_type" : "type-2470", +- "self_type" : "type-2469", ++ "referenced_type" : "type-2465", ++ "self_type" : "type-2464", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23321,8 +24733,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *", + "name" : "android::hardware::BufferedTextOutput::BufferState *", +- "referenced_type" : "type-3543", +- "self_type" : "type-3542", ++ "referenced_type" : "type-3536", ++ "self_type" : "type-3535", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23330,8 +24742,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *", + "name" : "android::hardware::BufferedTextOutput::BufferState *", +- "referenced_type" : "type-3879", +- "self_type" : "type-3878", ++ "referenced_type" : "type-3872", ++ "self_type" : "type-3871", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -23339,8 +24751,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *", + "name" : "android::hardware::BufferedTextOutput::ThreadState *", +- "referenced_type" : "type-2507", +- "self_type" : "type-2506", ++ "referenced_type" : "type-2502", ++ "self_type" : "type-2501", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -23348,8 +24760,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *", + "name" : "android::hardware::BufferedTextOutput::ThreadState *", +- "referenced_type" : "type-3572", +- "self_type" : "type-3571", ++ "referenced_type" : "type-3565", ++ "self_type" : "type-3564", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -23366,8 +24778,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ConcurrentMap, bool> *", + "name" : "android::hardware::ConcurrentMap, bool> *", +- "referenced_type" : "type-41", +- "self_type" : "type-45", ++ "referenced_type" : "type-40", ++ "self_type" : "type-44", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -23375,8 +24787,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ConcurrentMap > *", + "name" : "android::hardware::ConcurrentMap > *", +- "referenced_type" : "type-378", +- "self_type" : "type-390", ++ "referenced_type" : "type-377", ++ "self_type" : "type-389", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -23384,8 +24796,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", +- "referenced_type" : "type-635", +- "self_type" : "type-650", ++ "referenced_type" : "type-633", ++ "self_type" : "type-648", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -23393,8 +24805,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", +- "referenced_type" : "type-398", +- "self_type" : "type-417", ++ "referenced_type" : "type-396", ++ "self_type" : "type-413", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -23402,8 +24814,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::GrantorDescriptor *", + "name" : "android::hardware::GrantorDescriptor *", +- "referenced_type" : "type-319", +- "self_type" : "type-318", ++ "referenced_type" : "type-318", ++ "self_type" : "type-317", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -23411,8 +24823,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::HexDump *", + "name" : "android::hardware::HexDump *", +- "referenced_type" : "type-2484", +- "self_type" : "type-2485", ++ "referenced_type" : "type-2479", ++ "self_type" : "type-2480", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -23420,8 +24832,17 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::HidlMemory *", + "name" : "android::hardware::HidlMemory *", +- "referenced_type" : "type-159", +- "self_type" : "type-158", ++ "referenced_type" : "type-158", ++ "self_type" : "type-157", ++ "size" : 4, ++ "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "android::hardware::IBinder *", ++ "name" : "android::hardware::IBinder *", ++ "referenced_type" : "type-1084", ++ "self_type" : "type-1083", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23429,8 +24850,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1087", +- "self_type" : "type-1086", ++ "referenced_type" : "type-1141", ++ "self_type" : "type-1140", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23438,8 +24859,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1144", +- "self_type" : "type-1143", ++ "referenced_type" : "type-1198", ++ "self_type" : "type-1197", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23447,8 +24868,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1201", +- "self_type" : "type-1200", ++ "referenced_type" : "type-1272", ++ "self_type" : "type-1271", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23456,8 +24877,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1275", +- "self_type" : "type-1274", ++ "referenced_type" : "type-1404", ++ "self_type" : "type-1403", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23465,8 +24886,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1408", +- "self_type" : "type-1407", ++ "referenced_type" : "type-1493", ++ "self_type" : "type-1492", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23474,8 +24895,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1497", +- "self_type" : "type-1496", ++ "referenced_type" : "type-1558", ++ "self_type" : "type-1557", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23483,8 +24904,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1562", +- "self_type" : "type-1561", ++ "referenced_type" : "type-1717", ++ "self_type" : "type-1716", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23492,8 +24913,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1722", +- "self_type" : "type-1721", ++ "referenced_type" : "type-1849", ++ "self_type" : "type-1848", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23501,8 +24922,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1854", +- "self_type" : "type-1853", ++ "referenced_type" : "type-1887", ++ "self_type" : "type-1886", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23510,8 +24931,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1892", +- "self_type" : "type-1891", ++ "referenced_type" : "type-1902", ++ "self_type" : "type-1901", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23519,8 +24940,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1907", +- "self_type" : "type-1906", ++ "referenced_type" : "type-2005", ++ "self_type" : "type-2004", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23528,8 +24949,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2010", +- "self_type" : "type-2009", ++ "referenced_type" : "type-2060", ++ "self_type" : "type-2059", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23537,8 +24958,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2065", +- "self_type" : "type-2064", ++ "referenced_type" : "type-2115", ++ "self_type" : "type-2114", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23546,8 +24967,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2120", +- "self_type" : "type-2119", ++ "referenced_type" : "type-2188", ++ "self_type" : "type-2187", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23555,8 +24976,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2193", +- "self_type" : "type-2192", ++ "referenced_type" : "type-2247", ++ "self_type" : "type-2246", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23564,8 +24985,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2252", +- "self_type" : "type-2251", ++ "referenced_type" : "type-2318", ++ "self_type" : "type-2317", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23574,7 +24995,7 @@ + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", + "referenced_type" : "type-2323", +- "self_type" : "type-2322", ++ "self_type" : "type-2324", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23582,8 +25003,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2328", +- "self_type" : "type-2329", ++ "referenced_type" : "type-2601", ++ "self_type" : "type-2600", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23591,8 +25012,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2607", +- "self_type" : "type-2606", ++ "referenced_type" : "type-2688", ++ "self_type" : "type-2687", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23600,17 +25021,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2694", +- "self_type" : "type-2693", +- "size" : 4, +- "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "android::hardware::IBinder *", +- "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2758", +- "self_type" : "type-2757", ++ "referenced_type" : "type-2752", ++ "self_type" : "type-2751", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23618,8 +25030,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2828", +- "self_type" : "type-2827", ++ "referenced_type" : "type-2822", ++ "self_type" : "type-2821", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23627,8 +25039,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2865", +- "self_type" : "type-2864", ++ "referenced_type" : "type-2858", ++ "self_type" : "type-2857", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23636,8 +25048,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2997", +- "self_type" : "type-2996", ++ "referenced_type" : "type-2990", ++ "self_type" : "type-2989", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23645,8 +25057,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3032", +- "self_type" : "type-3031", ++ "referenced_type" : "type-3025", ++ "self_type" : "type-3024", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23654,8 +25066,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3050", +- "self_type" : "type-3049", ++ "referenced_type" : "type-3043", ++ "self_type" : "type-3042", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23663,8 +25075,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3145", +- "self_type" : "type-3144", ++ "referenced_type" : "type-3138", ++ "self_type" : "type-3137", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23672,8 +25084,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3208", +- "self_type" : "type-3207", ++ "referenced_type" : "type-3201", ++ "self_type" : "type-3200", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23681,8 +25093,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3262", +- "self_type" : "type-3261", ++ "referenced_type" : "type-3255", ++ "self_type" : "type-3254", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23690,8 +25102,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3327", +- "self_type" : "type-3326", ++ "referenced_type" : "type-3320", ++ "self_type" : "type-3319", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23699,8 +25111,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3381", +- "self_type" : "type-3380", ++ "referenced_type" : "type-3374", ++ "self_type" : "type-3373", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23708,8 +25120,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3442", +- "self_type" : "type-3441", ++ "referenced_type" : "type-3435", ++ "self_type" : "type-3434", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23717,8 +25129,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3949", +- "self_type" : "type-3948", ++ "referenced_type" : "type-3941", ++ "self_type" : "type-3940", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23726,8 +25138,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-4044", +- "self_type" : "type-4043", ++ "referenced_type" : "type-4036", ++ "self_type" : "type-4035", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23735,8 +25147,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-573", +- "self_type" : "type-572", ++ "referenced_type" : "type-571", ++ "self_type" : "type-570", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23744,8 +25156,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-663", +- "self_type" : "type-662", ++ "referenced_type" : "type-66", ++ "self_type" : "type-65", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23753,8 +25165,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-67", +- "self_type" : "type-66", ++ "referenced_type" : "type-661", ++ "self_type" : "type-660", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23762,8 +25174,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-73", +- "self_type" : "type-72", ++ "referenced_type" : "type-72", ++ "self_type" : "type-71", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23771,8 +25183,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-739", +- "self_type" : "type-738", ++ "referenced_type" : "type-736", ++ "self_type" : "type-735", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23780,8 +25192,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-905", +- "self_type" : "type-904", ++ "referenced_type" : "type-902", ++ "self_type" : "type-901", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23789,8 +25201,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-943", +- "self_type" : "type-942", ++ "referenced_type" : "type-940", ++ "self_type" : "type-939", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23798,8 +25210,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-966", +- "self_type" : "type-965", ++ "referenced_type" : "type-963", ++ "self_type" : "type-962", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23807,8 +25219,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-1135", +- "self_type" : "type-1134", ++ "referenced_type" : "type-1132", ++ "self_type" : "type-1131", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23816,8 +25228,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-1137", +- "self_type" : "type-1136", ++ "referenced_type" : "type-1134", ++ "self_type" : "type-1133", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23825,8 +25237,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-1264", +- "self_type" : "type-1263", ++ "referenced_type" : "type-1261", ++ "self_type" : "type-1260", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23834,8 +25246,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-1266", +- "self_type" : "type-1265", ++ "referenced_type" : "type-1263", ++ "self_type" : "type-1262", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23843,8 +25255,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-1894", +- "self_type" : "type-1893", ++ "referenced_type" : "type-1889", ++ "self_type" : "type-1888", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23852,8 +25264,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-2057", +- "self_type" : "type-2056", ++ "referenced_type" : "type-2052", ++ "self_type" : "type-2051", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23861,8 +25273,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-2059", +- "self_type" : "type-2058", ++ "referenced_type" : "type-2054", ++ "self_type" : "type-2053", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23870,8 +25282,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-2183", +- "self_type" : "type-2182", ++ "referenced_type" : "type-2178", ++ "self_type" : "type-2177", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23879,8 +25291,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-2185", +- "self_type" : "type-2184", ++ "referenced_type" : "type-2180", ++ "self_type" : "type-2179", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23888,8 +25300,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-2301", +- "self_type" : "type-2300", ++ "referenced_type" : "type-2296", ++ "self_type" : "type-2295", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23897,8 +25309,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-2378", +- "self_type" : "type-2379", ++ "referenced_type" : "type-2373", ++ "self_type" : "type-2374", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23906,8 +25318,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-3035", +- "self_type" : "type-3034", ++ "referenced_type" : "type-3027", ++ "self_type" : "type-3026", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23915,8 +25327,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-3195", +- "self_type" : "type-3194", ++ "referenced_type" : "type-3187", ++ "self_type" : "type-3186", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23924,8 +25336,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-3200", +- "self_type" : "type-3199", ++ "referenced_type" : "type-3193", ++ "self_type" : "type-3192", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23933,8 +25345,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-3316", +- "self_type" : "type-3315", ++ "referenced_type" : "type-3309", ++ "self_type" : "type-3308", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23942,8 +25354,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-3320", +- "self_type" : "type-3319", ++ "referenced_type" : "type-3313", ++ "self_type" : "type-3312", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23951,8 +25363,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-3428", +- "self_type" : "type-3427", ++ "referenced_type" : "type-3421", ++ "self_type" : "type-3420", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23960,8 +25372,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-946", +- "self_type" : "type-945", ++ "referenced_type" : "type-943", ++ "self_type" : "type-942", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23969,8 +25381,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-1089", +- "self_type" : "type-1088", ++ "referenced_type" : "type-1086", ++ "self_type" : "type-1085", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23978,8 +25390,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-1146", +- "self_type" : "type-1145", ++ "referenced_type" : "type-1143", ++ "self_type" : "type-1142", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23987,8 +25399,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-1204", +- "self_type" : "type-1203", ++ "referenced_type" : "type-1201", ++ "self_type" : "type-1200", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23996,8 +25408,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-1278", +- "self_type" : "type-1277", ++ "referenced_type" : "type-1274", ++ "self_type" : "type-1273", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24005,8 +25417,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-1910", +- "self_type" : "type-1909", ++ "referenced_type" : "type-1905", ++ "self_type" : "type-1904", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24014,8 +25426,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-2012", +- "self_type" : "type-2011", ++ "referenced_type" : "type-2007", ++ "self_type" : "type-2006", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24023,8 +25435,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-2067", +- "self_type" : "type-2066", ++ "referenced_type" : "type-2062", ++ "self_type" : "type-2061", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24032,8 +25444,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-2123", +- "self_type" : "type-2122", ++ "referenced_type" : "type-2118", ++ "self_type" : "type-2117", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24041,8 +25453,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-2196", +- "self_type" : "type-2195", ++ "referenced_type" : "type-2190", ++ "self_type" : "type-2189", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24050,8 +25462,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-2254", +- "self_type" : "type-2253", ++ "referenced_type" : "type-2249", ++ "self_type" : "type-2248", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24059,8 +25471,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-2374", +- "self_type" : "type-2548", ++ "referenced_type" : "type-2369", ++ "self_type" : "type-2543", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24068,8 +25480,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-3053", +- "self_type" : "type-3052", ++ "referenced_type" : "type-3045", ++ "self_type" : "type-3044", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24077,8 +25489,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-3147", +- "self_type" : "type-3146", ++ "referenced_type" : "type-3140", ++ "self_type" : "type-3139", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24086,8 +25498,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-3212", +- "self_type" : "type-3211", ++ "referenced_type" : "type-3205", ++ "self_type" : "type-3204", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24095,8 +25507,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-3264", +- "self_type" : "type-3263", ++ "referenced_type" : "type-3257", ++ "self_type" : "type-3256", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24104,8 +25516,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-3329", +- "self_type" : "type-3328", ++ "referenced_type" : "type-3322", ++ "self_type" : "type-3321", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24113,8 +25525,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-3383", +- "self_type" : "type-3382", ++ "referenced_type" : "type-3376", ++ "self_type" : "type-3375", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24122,8 +25534,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-970", +- "self_type" : "type-969", ++ "referenced_type" : "type-967", ++ "self_type" : "type-966", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24131,8 +25543,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IPCThreadState *", + "name" : "android::hardware::IPCThreadState *", +- "referenced_type" : "type-2433", +- "self_type" : "type-3636", ++ "referenced_type" : "type-2428", ++ "self_type" : "type-3629", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -24140,8 +25552,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::LazyServiceRegistrar *", + "name" : "android::hardware::LazyServiceRegistrar *", +- "referenced_type" : "type-530", +- "self_type" : "type-532", ++ "referenced_type" : "type-528", ++ "self_type" : "type-530", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -24149,8 +25561,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1045", +- "self_type" : "type-1044", ++ "referenced_type" : "type-1042", ++ "self_type" : "type-1041", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24158,8 +25570,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1130", +- "self_type" : "type-1129", ++ "referenced_type" : "type-1127", ++ "self_type" : "type-1126", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -24167,8 +25579,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1191", +- "self_type" : "type-1190", ++ "referenced_type" : "type-1188", ++ "self_type" : "type-1187", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -24176,8 +25588,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1257", +- "self_type" : "type-1256", ++ "referenced_type" : "type-1254", ++ "self_type" : "type-1253", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -24185,8 +25597,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1311", +- "self_type" : "type-1310", ++ "referenced_type" : "type-1308", ++ "self_type" : "type-1307", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24194,8 +25606,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1374", +- "self_type" : "type-1373", ++ "referenced_type" : "type-1371", ++ "self_type" : "type-1370", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24203,8 +25615,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1971", +- "self_type" : "type-1970", ++ "referenced_type" : "type-1966", ++ "self_type" : "type-1965", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24212,8 +25624,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2052", +- "self_type" : "type-2051", ++ "referenced_type" : "type-2047", ++ "self_type" : "type-2046", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -24221,8 +25633,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2111", +- "self_type" : "type-2110", ++ "referenced_type" : "type-2106", ++ "self_type" : "type-2105", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -24230,8 +25642,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2176", +- "self_type" : "type-2175", ++ "referenced_type" : "type-2171", ++ "self_type" : "type-2170", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -24239,8 +25651,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2228", +- "self_type" : "type-2227", ++ "referenced_type" : "type-2223", ++ "self_type" : "type-2222", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24248,8 +25660,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2282", +- "self_type" : "type-2281", ++ "referenced_type" : "type-2277", ++ "self_type" : "type-2276", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -24257,8 +25669,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2348", +- "self_type" : "type-2347", ++ "referenced_type" : "type-2343", ++ "self_type" : "type-2342", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -24266,8 +25678,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2573", +- "self_type" : "type-2572", ++ "referenced_type" : "type-2568", ++ "self_type" : "type-2567", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24275,8 +25687,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3109", +- "self_type" : "type-3108", ++ "referenced_type" : "type-3102", ++ "self_type" : "type-3101", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24284,8 +25696,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3187", +- "self_type" : "type-3186", ++ "referenced_type" : "type-3180", ++ "self_type" : "type-3179", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -24293,8 +25705,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3253", +- "self_type" : "type-3252", ++ "referenced_type" : "type-3246", ++ "self_type" : "type-3245", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -24302,8 +25714,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3311", +- "self_type" : "type-3310", ++ "referenced_type" : "type-3304", ++ "self_type" : "type-3303", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -24311,8 +25723,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3356", +- "self_type" : "type-3355", ++ "referenced_type" : "type-3349", ++ "self_type" : "type-3348", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24320,8 +25732,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3412", +- "self_type" : "type-3411", ++ "referenced_type" : "type-3405", ++ "self_type" : "type-3404", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -24329,8 +25741,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-372", +- "self_type" : "type-371", ++ "referenced_type" : "type-371", ++ "self_type" : "type-370", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24338,8 +25750,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3917", +- "self_type" : "type-3916", ++ "referenced_type" : "type-3910", ++ "self_type" : "type-3909", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24347,8 +25759,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::PassthroughServiceManager *", + "name" : "android::hardware::PassthroughServiceManager *", +- "referenced_type" : "type-1750", +- "self_type" : "type-1749", ++ "referenced_type" : "type-1745", ++ "self_type" : "type-1744", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24356,8 +25768,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::PassthroughServiceManager *", + "name" : "android::hardware::PassthroughServiceManager *", +- "referenced_type" : "type-2896", +- "self_type" : "type-2895", ++ "referenced_type" : "type-2889", ++ "self_type" : "type-2888", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24365,8 +25777,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::PassthroughServiceManager *", + "name" : "android::hardware::PassthroughServiceManager *", +- "referenced_type" : "type-768", +- "self_type" : "type-767", ++ "referenced_type" : "type-765", ++ "self_type" : "type-764", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24374,8 +25786,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::PoolThread *", + "name" : "android::hardware::PoolThread *", +- "referenced_type" : "type-3823", +- "self_type" : "type-3822", ++ "referenced_type" : "type-3816", ++ "self_type" : "type-3815", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24383,8 +25795,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1091", +- "self_type" : "type-1090", ++ "referenced_type" : "type-1088", ++ "self_type" : "type-1087", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24392,8 +25804,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1148", +- "self_type" : "type-1147", ++ "referenced_type" : "type-1145", ++ "self_type" : "type-1144", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24401,8 +25813,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1206", +- "self_type" : "type-1205", ++ "referenced_type" : "type-1203", ++ "self_type" : "type-1202", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24410,8 +25822,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1280", +- "self_type" : "type-1279", ++ "referenced_type" : "type-1277", ++ "self_type" : "type-1276", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24419,8 +25831,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1447", +- "self_type" : "type-1446", ++ "referenced_type" : "type-1443", ++ "self_type" : "type-1442", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24428,8 +25840,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1857", +- "self_type" : "type-1856", ++ "referenced_type" : "type-1852", ++ "self_type" : "type-1851", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24437,8 +25849,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1912", +- "self_type" : "type-1911", ++ "referenced_type" : "type-1907", ++ "self_type" : "type-1906", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24446,8 +25858,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2014", +- "self_type" : "type-2013", ++ "referenced_type" : "type-2009", ++ "self_type" : "type-2008", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24455,8 +25867,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2069", +- "self_type" : "type-2068", ++ "referenced_type" : "type-2064", ++ "self_type" : "type-2063", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24464,8 +25876,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2125", +- "self_type" : "type-2124", ++ "referenced_type" : "type-2120", ++ "self_type" : "type-2119", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24473,8 +25885,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2198", +- "self_type" : "type-2197", ++ "referenced_type" : "type-2193", ++ "self_type" : "type-2192", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24482,8 +25894,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2256", +- "self_type" : "type-2255", ++ "referenced_type" : "type-2251", ++ "self_type" : "type-2250", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24491,8 +25903,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2438", +- "self_type" : "type-2441", ++ "referenced_type" : "type-2433", ++ "self_type" : "type-2436", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24500,8 +25912,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2645", +- "self_type" : "type-2644", ++ "referenced_type" : "type-2639", ++ "self_type" : "type-2638", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24509,8 +25921,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3000", +- "self_type" : "type-2999", ++ "referenced_type" : "type-2992", ++ "self_type" : "type-2991", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24518,8 +25930,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3055", +- "self_type" : "type-3054", ++ "referenced_type" : "type-3048", ++ "self_type" : "type-3047", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24527,8 +25939,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3149", +- "self_type" : "type-3148", ++ "referenced_type" : "type-3142", ++ "self_type" : "type-3141", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24536,8 +25948,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3214", +- "self_type" : "type-3213", ++ "referenced_type" : "type-3207", ++ "self_type" : "type-3206", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24545,8 +25957,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3266", +- "self_type" : "type-3265", ++ "referenced_type" : "type-3259", ++ "self_type" : "type-3258", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24554,8 +25966,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3331", +- "self_type" : "type-3330", ++ "referenced_type" : "type-3324", ++ "self_type" : "type-3323", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24563,8 +25975,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3385", +- "self_type" : "type-3384", ++ "referenced_type" : "type-3378", ++ "self_type" : "type-3377", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24572,8 +25984,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3988", +- "self_type" : "type-3987", ++ "referenced_type" : "type-3980", ++ "self_type" : "type-3979", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24581,8 +25993,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-493", +- "self_type" : "type-492", ++ "referenced_type" : "type-491", ++ "self_type" : "type-490", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24590,8 +26002,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-908", +- "self_type" : "type-907", ++ "referenced_type" : "type-905", ++ "self_type" : "type-904", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24599,8 +26011,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-973", +- "self_type" : "type-972", ++ "referenced_type" : "type-970", ++ "self_type" : "type-969", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24608,8 +26020,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState::handle_entry *", + "name" : "android::hardware::ProcessState::handle_entry *", +- "referenced_type" : "type-2415", +- "self_type" : "type-3807", ++ "referenced_type" : "type-2410", ++ "self_type" : "type-3800", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -24617,8 +26029,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return *", + "name" : "android::hardware::Return *", +- "referenced_type" : "type-807", +- "self_type" : "type-808", ++ "referenced_type" : "type-804", ++ "self_type" : "type-805", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24626,8 +26038,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-801", +- "self_type" : "type-802", ++ "referenced_type" : "type-798", ++ "self_type" : "type-799", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24635,8 +26047,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-986", +- "self_type" : "type-987", ++ "referenced_type" : "type-983", ++ "self_type" : "type-984", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24644,8 +26056,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-1093", +- "self_type" : "type-1094", ++ "referenced_type" : "type-1090", ++ "self_type" : "type-1091", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24653,8 +26065,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-1153", +- "self_type" : "type-1154", ++ "referenced_type" : "type-1150", ++ "self_type" : "type-1151", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24662,8 +26074,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-1213", +- "self_type" : "type-1214", ++ "referenced_type" : "type-1210", ++ "self_type" : "type-1211", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24671,8 +26083,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-1284", +- "self_type" : "type-1285", ++ "referenced_type" : "type-1281", ++ "self_type" : "type-1282", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24680,8 +26092,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return *", + "name" : "android::hardware::Return *", +- "referenced_type" : "type-309", +- "self_type" : "type-310", ++ "referenced_type" : "type-308", ++ "self_type" : "type-309", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24689,8 +26101,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return *", + "name" : "android::hardware::Return *", +- "referenced_type" : "type-102", +- "self_type" : "type-177", ++ "referenced_type" : "type-101", ++ "self_type" : "type-176", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24698,8 +26110,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Status *", + "name" : "android::hardware::Status *", +- "referenced_type" : "type-104", +- "self_type" : "type-166", ++ "referenced_type" : "type-103", ++ "self_type" : "type-165", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24707,8 +26119,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)", + "name" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)", +- "referenced_type" : "type-2478", +- "self_type" : "type-2479", ++ "referenced_type" : "type-2473", ++ "self_type" : "type-2474", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -24716,8 +26128,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput *", + "name" : "android::hardware::TextOutput *", +- "referenced_type" : "type-2472", +- "self_type" : "type-3884", ++ "referenced_type" : "type-2467", ++ "self_type" : "type-3877", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -24725,8 +26137,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput::Bundle *", + "name" : "android::hardware::TextOutput::Bundle *", +- "referenced_type" : "type-2473", +- "self_type" : "type-2475", ++ "referenced_type" : "type-2468", ++ "self_type" : "type-2470", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -24734,8 +26146,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TypeCode *", + "name" : "android::hardware::TypeCode *", +- "referenced_type" : "type-2480", +- "self_type" : "type-2481", ++ "referenced_type" : "type-2475", ++ "self_type" : "type-2476", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -24743,8 +26155,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::ClientCounterCallback *", + "name" : "android::hardware::details::ClientCounterCallback *", +- "referenced_type" : "type-1514", +- "self_type" : "type-1513", ++ "referenced_type" : "type-1510", ++ "self_type" : "type-1509", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24752,8 +26164,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::ClientCounterCallback *", + "name" : "android::hardware::details::ClientCounterCallback *", +- "referenced_type" : "type-2711", +- "self_type" : "type-2710", ++ "referenced_type" : "type-2705", ++ "self_type" : "type-2704", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24761,8 +26173,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::ClientCounterCallback *", + "name" : "android::hardware::details::ClientCounterCallback *", +- "referenced_type" : "type-4063", +- "self_type" : "type-4062", ++ "referenced_type" : "type-4055", ++ "self_type" : "type-4054", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24770,8 +26182,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::ClientCounterCallback *", + "name" : "android::hardware::details::ClientCounterCallback *", +- "referenced_type" : "type-599", +- "self_type" : "type-598", ++ "referenced_type" : "type-597", ++ "self_type" : "type-596", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24779,8 +26191,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::DoNotDestruct, android::hardware::details::SchedPrio> > *", + "name" : "android::hardware::details::DoNotDestruct, android::hardware::details::SchedPrio> > *", +- "referenced_type" : "type-46", +- "self_type" : "type-50", ++ "referenced_type" : "type-45", ++ "self_type" : "type-49", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -24788,8 +26200,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::DoNotDestruct, bool> > *", + "name" : "android::hardware::details::DoNotDestruct, bool> > *", +- "referenced_type" : "type-51", +- "self_type" : "type-53", ++ "referenced_type" : "type-50", ++ "self_type" : "type-52", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -24797,8 +26209,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::DoNotDestruct > > *", + "name" : "android::hardware::details::DoNotDestruct > > *", +- "referenced_type" : "type-412", +- "self_type" : "type-413", ++ "referenced_type" : "type-410", ++ "self_type" : "type-411", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -24806,8 +26218,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > > *", + "name" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > > *", +- "referenced_type" : "type-649", +- "self_type" : "type-652", ++ "referenced_type" : "type-647", ++ "self_type" : "type-649", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -24815,8 +26227,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > > *", + "name" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > > *", +- "referenced_type" : "type-414", +- "self_type" : "type-418", ++ "referenced_type" : "type-412", ++ "self_type" : "type-416", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -24824,8 +26236,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::HidlInstrumentor *", + "name" : "android::hardware::details::HidlInstrumentor *", +- "referenced_type" : "type-145", +- "self_type" : "type-194", ++ "referenced_type" : "type-144", ++ "self_type" : "type-193", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24833,8 +26245,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::TaskRunner *", + "name" : "android::hardware::details::TaskRunner *", +- "referenced_type" : "type-269", +- "self_type" : "type-301", ++ "referenced_type" : "type-268", ++ "self_type" : "type-300", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -24842,8 +26254,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::Waiter *", + "name" : "android::hardware::details::Waiter *", +- "referenced_type" : "type-1762", +- "self_type" : "type-1761", ++ "referenced_type" : "type-1757", ++ "self_type" : "type-1756", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24851,8 +26263,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::Waiter *", + "name" : "android::hardware::details::Waiter *", +- "referenced_type" : "type-2907", +- "self_type" : "type-2906", ++ "referenced_type" : "type-2900", ++ "self_type" : "type-2899", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24860,8 +26272,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::Waiter *", + "name" : "android::hardware::details::Waiter *", +- "referenced_type" : "type-785", +- "self_type" : "type-784", ++ "referenced_type" : "type-782", ++ "self_type" : "type-781", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24869,8 +26281,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer > *", + "name" : "android::hardware::details::hidl_pointer > *", +- "referenced_type" : "type-1009", +- "self_type" : "type-1073", ++ "referenced_type" : "type-1006", ++ "self_type" : "type-1070", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24878,8 +26290,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer *", + "name" : "android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-620", +- "self_type" : "type-1070", ++ "referenced_type" : "type-618", ++ "self_type" : "type-1067", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24887,8 +26299,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer *", + "name" : "android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-835", +- "self_type" : "type-850", ++ "referenced_type" : "type-832", ++ "self_type" : "type-847", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24896,8 +26308,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer *", + "name" : "android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-97", +- "self_type" : "type-149", ++ "referenced_type" : "type-96", ++ "self_type" : "type-148", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24906,7 +26318,7 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer *", + "name" : "android::hardware::details::hidl_pointer *", + "referenced_type" : "type-14", +- "self_type" : "type-574", ++ "self_type" : "type-572", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24914,8 +26326,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer *", + "name" : "android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-519", +- "self_type" : "type-817", ++ "referenced_type" : "type-517", ++ "self_type" : "type-814", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24923,8 +26335,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::return_status *", + "name" : "android::hardware::details::return_status *", +- "referenced_type" : "type-103", +- "self_type" : "type-172", ++ "referenced_type" : "type-102", ++ "self_type" : "type-171", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24932,8 +26344,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_array *", + "name" : "android::hardware::hidl_array *", +- "referenced_type" : "type-1012", +- "self_type" : "type-1011", ++ "referenced_type" : "type-1009", ++ "self_type" : "type-1008", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24941,8 +26353,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_binder_death_recipient *", + "name" : "android::hardware::hidl_binder_death_recipient *", +- "referenced_type" : "type-360", +- "self_type" : "type-363", ++ "referenced_type" : "type-359", ++ "self_type" : "type-362", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24950,8 +26362,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_death_recipient *", + "name" : "android::hardware::hidl_death_recipient *", +- "referenced_type" : "type-144", +- "self_type" : "type-143", ++ "referenced_type" : "type-143", ++ "self_type" : "type-142", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24959,8 +26371,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_handle *", + "name" : "android::hardware::hidl_handle *", +- "referenced_type" : "type-77", +- "self_type" : "type-78", ++ "referenced_type" : "type-76", ++ "self_type" : "type-77", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -24968,8 +26380,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_memory *", + "name" : "android::hardware::hidl_memory *", +- "referenced_type" : "type-121", +- "self_type" : "type-122", ++ "referenced_type" : "type-120", ++ "self_type" : "type-121", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -24977,8 +26389,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_string *", + "name" : "android::hardware::hidl_string *", +- "referenced_type" : "type-96", +- "self_type" : "type-108", ++ "referenced_type" : "type-95", ++ "self_type" : "type-107", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -24986,8 +26398,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec > *", + "name" : "android::hardware::hidl_vec > *", +- "referenced_type" : "type-1008", +- "self_type" : "type-1015", ++ "referenced_type" : "type-1005", ++ "self_type" : "type-1012", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -24995,8 +26407,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec *", + "name" : "android::hardware::hidl_vec *", +- "referenced_type" : "type-619", +- "self_type" : "type-1004", ++ "referenced_type" : "type-617", ++ "self_type" : "type-1001", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -25004,8 +26416,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec *", + "name" : "android::hardware::hidl_vec *", +- "referenced_type" : "type-834", +- "self_type" : "type-838", ++ "referenced_type" : "type-831", ++ "self_type" : "type-835", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -25013,8 +26425,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec::iter *", + "name" : "android::hardware::hidl_vec::iter *", +- "referenced_type" : "type-625", +- "self_type" : "type-627", ++ "referenced_type" : "type-622", ++ "self_type" : "type-625", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -25022,8 +26434,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec *", + "name" : "android::hardware::hidl_vec *", +- "referenced_type" : "type-518", +- "self_type" : "type-827", ++ "referenced_type" : "type-516", ++ "self_type" : "type-824", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -25031,8 +26443,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_version *", + "name" : "android::hardware::hidl_version *", +- "referenced_type" : "type-131", +- "self_type" : "type-134", ++ "referenced_type" : "type-130", ++ "self_type" : "type-133", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -25040,8 +26452,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::base::V1_0::BnHwBase *", + "name" : "android::hidl::base::V1_0::BnHwBase *", +- "referenced_type" : "type-355", +- "self_type" : "type-358", ++ "referenced_type" : "type-354", ++ "self_type" : "type-357", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -25049,8 +26461,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::base::V1_0::BpHwBase *", + "name" : "android::hidl::base::V1_0::BpHwBase *", +- "referenced_type" : "type-419", +- "self_type" : "type-960", ++ "referenced_type" : "type-417", ++ "self_type" : "type-957", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25058,8 +26470,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::base::V1_0::BsBase *", + "name" : "android::hidl::base::V1_0::BsBase *", +- "referenced_type" : "type-2248", +- "self_type" : "type-2250", ++ "referenced_type" : "type-2243", ++ "self_type" : "type-2245", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25076,8 +26488,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager *", + "name" : "android::hidl::manager::V1_0::BnHwServiceManager *", +- "referenced_type" : "type-871", +- "self_type" : "type-872", ++ "referenced_type" : "type-868", ++ "self_type" : "type-869", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h" + }, +@@ -25085,8 +26497,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification *", + "name" : "android::hidl::manager::V1_0::BnHwServiceNotification *", +- "referenced_type" : "type-862", +- "self_type" : "type-863", ++ "referenced_type" : "type-859", ++ "self_type" : "type-860", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -25094,8 +26506,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager *", + "name" : "android::hidl::manager::V1_0::BpHwServiceManager *", +- "referenced_type" : "type-873", +- "self_type" : "type-959", ++ "referenced_type" : "type-870", ++ "self_type" : "type-956", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25103,8 +26515,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification *", + "name" : "android::hidl::manager::V1_0::BpHwServiceNotification *", +- "referenced_type" : "type-864", +- "self_type" : "type-978", ++ "referenced_type" : "type-861", ++ "self_type" : "type-975", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25112,8 +26524,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager *", + "name" : "android::hidl::manager::V1_0::BsServiceManager *", +- "referenced_type" : "type-957", +- "self_type" : "type-958", ++ "referenced_type" : "type-954", ++ "self_type" : "type-955", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25121,8 +26533,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification *", + "name" : "android::hidl::manager::V1_0::BsServiceNotification *", +- "referenced_type" : "type-1084", +- "self_type" : "type-1085", ++ "referenced_type" : "type-1081", ++ "self_type" : "type-1082", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25130,8 +26542,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager *", + "name" : "android::hidl::manager::V1_0::IServiceManager *", +- "referenced_type" : "type-552", +- "self_type" : "type-576", ++ "referenced_type" : "type-548", ++ "self_type" : "type-574", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25139,8 +26551,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *", + "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *", +- "referenced_type" : "type-548", +- "self_type" : "type-837", ++ "referenced_type" : "type-546", ++ "self_type" : "type-834", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -25148,8 +26560,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *", + "name" : "android::hidl::manager::V1_0::IServiceNotification *", +- "referenced_type" : "type-541", +- "self_type" : "type-591", ++ "referenced_type" : "type-539", ++ "self_type" : "type-589", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25157,8 +26569,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager *", + "name" : "android::hidl::manager::V1_1::BnHwServiceManager *", +- "referenced_type" : "type-879", +- "self_type" : "type-880", ++ "referenced_type" : "type-876", ++ "self_type" : "type-877", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -25166,8 +26578,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager *", + "name" : "android::hidl::manager::V1_1::BpHwServiceManager *", +- "referenced_type" : "type-881", +- "self_type" : "type-1142", ++ "referenced_type" : "type-878", ++ "self_type" : "type-1139", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25175,8 +26587,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager *", + "name" : "android::hidl::manager::V1_1::BsServiceManager *", +- "referenced_type" : "type-1140", +- "self_type" : "type-1141", ++ "referenced_type" : "type-1137", ++ "self_type" : "type-1138", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25184,8 +26596,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager *", + "name" : "android::hidl::manager::V1_1::IServiceManager *", +- "referenced_type" : "type-562", +- "self_type" : "type-581", ++ "referenced_type" : "type-560", ++ "self_type" : "type-579", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25193,8 +26605,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback *", + "name" : "android::hidl::manager::V1_2::BnHwClientCallback *", +- "referenced_type" : "type-888", +- "self_type" : "type-889", ++ "referenced_type" : "type-884", ++ "self_type" : "type-886", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -25202,8 +26614,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager *", + "name" : "android::hidl::manager::V1_2::BnHwServiceManager *", +- "referenced_type" : "type-845", +- "self_type" : "type-896", ++ "referenced_type" : "type-842", ++ "self_type" : "type-893", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h" + }, +@@ -25211,8 +26623,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback *", + "name" : "android::hidl::manager::V1_2::BpHwClientCallback *", +- "referenced_type" : "type-890", +- "self_type" : "type-1199", ++ "referenced_type" : "type-887", ++ "self_type" : "type-1196", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25220,8 +26632,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager *", + "name" : "android::hidl::manager::V1_2::BpHwServiceManager *", +- "referenced_type" : "type-774", +- "self_type" : "type-778", ++ "referenced_type" : "type-770", ++ "self_type" : "type-775", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25229,8 +26641,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback *", + "name" : "android::hidl::manager::V1_2::BsClientCallback *", +- "referenced_type" : "type-1197", +- "self_type" : "type-1198", ++ "referenced_type" : "type-1194", ++ "self_type" : "type-1195", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25238,8 +26650,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager *", + "name" : "android::hidl::manager::V1_2::BsServiceManager *", +- "referenced_type" : "type-1271", +- "self_type" : "type-1273", ++ "referenced_type" : "type-1268", ++ "self_type" : "type-1269", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25247,8 +26659,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback *", + "name" : "android::hidl::manager::V1_2::IClientCallback *", +- "referenced_type" : "type-544", +- "self_type" : "type-596", ++ "referenced_type" : "type-542", ++ "self_type" : "type-594", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25256,8 +26668,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager *", + "name" : "android::hidl::manager::V1_2::IServiceManager *", +- "referenced_type" : "type-565", +- "self_type" : "type-586", ++ "referenced_type" : "type-563", ++ "self_type" : "type-584", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25265,8 +26677,8 @@ + "alignment" : 4, + "linker_set_key" : "android::key_value_pair_t > *", + "name" : "android::key_value_pair_t > *", +- "referenced_type" : "type-3805", +- "self_type" : "type-3808", ++ "referenced_type" : "type-3798", ++ "self_type" : "type-3801", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -25274,8 +26686,8 @@ + "alignment" : 4, + "linker_set_key" : "android::key_value_pair_t *", + "name" : "android::key_value_pair_t *", +- "referenced_type" : "type-2383", +- "self_type" : "type-2387", ++ "referenced_type" : "type-2378", ++ "self_type" : "type-2382", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -25283,8 +26695,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-499", +- "self_type" : "type-3821", ++ "referenced_type" : "type-497", ++ "self_type" : "type-3814", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25292,8 +26704,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-472", +- "self_type" : "type-503", ++ "referenced_type" : "type-470", ++ "self_type" : "type-501", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25301,8 +26713,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-2468", +- "self_type" : "type-2502", ++ "referenced_type" : "type-2463", ++ "self_type" : "type-2497", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -25310,8 +26722,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-157", +- "self_type" : "type-160", ++ "referenced_type" : "type-156", ++ "self_type" : "type-159", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25319,8 +26731,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-962", +- "self_type" : "type-964", ++ "referenced_type" : "type-959", ++ "self_type" : "type-961", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25328,8 +26740,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-71", +- "self_type" : "type-482", ++ "referenced_type" : "type-70", ++ "self_type" : "type-480", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25337,8 +26749,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-766", +- "self_type" : "type-788", ++ "referenced_type" : "type-763", ++ "self_type" : "type-785", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25346,8 +26758,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-491", +- "self_type" : "type-495", ++ "referenced_type" : "type-489", ++ "self_type" : "type-493", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25355,8 +26767,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-602", +- "self_type" : "type-605", ++ "referenced_type" : "type-600", ++ "self_type" : "type-602", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25364,8 +26776,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-789", +- "self_type" : "type-791", ++ "referenced_type" : "type-786", ++ "self_type" : "type-788", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25373,8 +26785,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-951", +- "self_type" : "type-981", ++ "referenced_type" : "type-948", ++ "self_type" : "type-978", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25382,8 +26794,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-142", +- "self_type" : "type-475", ++ "referenced_type" : "type-141", ++ "self_type" : "type-473", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25391,8 +26803,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-356", +- "self_type" : "type-480", ++ "referenced_type" : "type-355", ++ "self_type" : "type-478", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25400,8 +26812,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-575", +- "self_type" : "type-577", ++ "referenced_type" : "type-573", ++ "self_type" : "type-575", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25409,8 +26821,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-590", +- "self_type" : "type-592", ++ "referenced_type" : "type-588", ++ "self_type" : "type-590", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25418,8 +26830,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-580", +- "self_type" : "type-582", ++ "referenced_type" : "type-578", ++ "self_type" : "type-580", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25427,8 +26839,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-595", +- "self_type" : "type-597", ++ "referenced_type" : "type-593", ++ "self_type" : "type-595", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25436,8 +26848,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-585", +- "self_type" : "type-587", ++ "referenced_type" : "type-583", ++ "self_type" : "type-585", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25445,8 +26857,8 @@ + "alignment" : 4, + "linker_set_key" : "android::wp *", + "name" : "android::wp *", +- "referenced_type" : "type-383", +- "self_type" : "type-468", ++ "referenced_type" : "type-382", ++ "self_type" : "type-466", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25454,8 +26866,8 @@ + "alignment" : 4, + "linker_set_key" : "android::wp *", + "name" : "android::wp *", +- "referenced_type" : "type-944", +- "self_type" : "type-949", ++ "referenced_type" : "type-941", ++ "self_type" : "type-946", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25463,8 +26875,8 @@ + "alignment" : 4, + "linker_set_key" : "android::wp *", + "name" : "android::wp *", +- "referenced_type" : "type-2381", +- "self_type" : "type-2380", ++ "referenced_type" : "type-2376", ++ "self_type" : "type-2375", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25472,8 +26884,8 @@ + "alignment" : 4, + "linker_set_key" : "android::wp *", + "name" : "android::wp *", +- "referenced_type" : "type-361", +- "self_type" : "type-463", ++ "referenced_type" : "type-360", ++ "self_type" : "type-461", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25482,7 +26894,7 @@ + "linker_set_key" : "android::wp *", + "name" : "android::wp *", + "referenced_type" : "type-32", +- "self_type" : "type-454", ++ "self_type" : "type-453", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25490,8 +26902,8 @@ + "alignment" : 4, + "linker_set_key" : "android_flex_plane *", + "name" : "android_flex_plane *", +- "referenced_type" : "type-290", +- "self_type" : "type-294", ++ "referenced_type" : "type-289", ++ "self_type" : "type-293", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics.h" + }, +@@ -25499,8 +26911,8 @@ + "alignment" : 4, + "linker_set_key" : "bool (*)(const android::String16 &, const android::sp &, void *)", + "name" : "bool (*)(const android::String16 &, const android::sp &, void *)", +- "referenced_type" : "type-2429", +- "self_type" : "type-2431", ++ "referenced_type" : "type-2424", ++ "self_type" : "type-2426", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, +@@ -25508,8 +26920,8 @@ + "alignment" : 4, + "linker_set_key" : "bool *", + "name" : "bool *", +- "referenced_type" : "type-44", +- "self_type" : "type-3777", ++ "referenced_type" : "type-43", ++ "self_type" : "type-3770", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -25517,8 +26929,8 @@ + "alignment" : 4, + "linker_set_key" : "char *", + "name" : "char *", +- "referenced_type" : "type-48", +- "self_type" : "type-243", ++ "referenced_type" : "type-47", ++ "self_type" : "type-242", + "size" : 4, + "source_file" : "/system/core/liblog/include/log/log_read.h" + }, +@@ -25526,8 +26938,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::CallStack *", + "name" : "const android::CallStack *", +- "referenced_type" : "type-258", +- "self_type" : "type-259", ++ "referenced_type" : "type-257", ++ "self_type" : "type-258", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/CallStack.h" + }, +@@ -25535,8 +26947,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::KeyedVector > *", + "name" : "const android::KeyedVector > *", +- "referenced_type" : "type-3834", +- "self_type" : "type-3836", ++ "referenced_type" : "type-3827", ++ "self_type" : "type-3829", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -25544,8 +26956,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::KeyedVector *", + "name" : "const android::KeyedVector *", +- "referenced_type" : "type-2417", +- "self_type" : "type-2418", ++ "referenced_type" : "type-2412", ++ "self_type" : "type-2413", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -25553,8 +26965,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::NativeHandle *", + "name" : "const android::NativeHandle *", +- "referenced_type" : "type-333", +- "self_type" : "type-334", ++ "referenced_type" : "type-332", ++ "self_type" : "type-333", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/NativeHandle.h" + }, +@@ -25562,8 +26974,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::RefBase *", + "name" : "const android::RefBase *", +- "referenced_type" : "type-62", +- "self_type" : "type-65", ++ "referenced_type" : "type-61", ++ "self_type" : "type-64", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25571,8 +26983,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::SortedVector > > *", + "name" : "const android::SortedVector > > *", +- "referenced_type" : "type-3825", +- "self_type" : "type-3826", ++ "referenced_type" : "type-3818", ++ "self_type" : "type-3819", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -25580,8 +26992,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::SortedVector > *", + "name" : "const android::SortedVector > *", +- "referenced_type" : "type-2407", +- "self_type" : "type-2408", ++ "referenced_type" : "type-2402", ++ "self_type" : "type-2403", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -25589,8 +27001,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::String16 *", + "name" : "const android::String16 *", +- "referenced_type" : "type-348", +- "self_type" : "type-349", ++ "referenced_type" : "type-347", ++ "self_type" : "type-348", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String16.h" + }, +@@ -25598,8 +27010,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::String8 *", + "name" : "const android::String8 *", +- "referenced_type" : "type-223", +- "self_type" : "type-224", ++ "referenced_type" : "type-222", ++ "self_type" : "type-223", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String8.h" + }, +@@ -25607,8 +27019,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-3630", +- "self_type" : "type-3631", ++ "referenced_type" : "type-3623", ++ "self_type" : "type-3624", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25616,8 +27028,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-3626", +- "self_type" : "type-3627", ++ "referenced_type" : "type-3619", ++ "self_type" : "type-3620", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25625,8 +27037,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-254", +- "self_type" : "type-255", ++ "referenced_type" : "type-253", ++ "self_type" : "type-254", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25634,8 +27046,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-3622", +- "self_type" : "type-3623", ++ "referenced_type" : "type-3615", ++ "self_type" : "type-3616", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25643,8 +27055,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-2412", +- "self_type" : "type-2413", ++ "referenced_type" : "type-2407", ++ "self_type" : "type-2408", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25652,8 +27064,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-3829", +- "self_type" : "type-3830", ++ "referenced_type" : "type-3822", ++ "self_type" : "type-3823", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25661,8 +27073,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector > *", + "name" : "const android::Vector > *", +- "referenced_type" : "type-2518", +- "self_type" : "type-2519", ++ "referenced_type" : "type-2513", ++ "self_type" : "type-2514", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25670,8 +27082,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-2513", +- "self_type" : "type-2514", ++ "referenced_type" : "type-2508", ++ "self_type" : "type-2509", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25679,8 +27091,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::VectorImpl *", + "name" : "const android::VectorImpl *", +- "referenced_type" : "type-249", +- "self_type" : "type-250", ++ "referenced_type" : "type-248", ++ "self_type" : "type-249", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/VectorImpl.h" + }, +@@ -25688,8 +27100,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BHwBinder *", + "name" : "const android::hardware::BHwBinder *", +- "referenced_type" : "type-2360", +- "self_type" : "type-2361", ++ "referenced_type" : "type-2355", ++ "self_type" : "type-2356", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -25697,8 +27109,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BpHwBinder *", + "name" : "const android::hardware::BpHwBinder *", +- "referenced_type" : "type-2371", +- "self_type" : "type-2372", ++ "referenced_type" : "type-2366", ++ "self_type" : "type-2367", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -25706,8 +27118,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BpHwBinder::Obituary *", + "name" : "const android::hardware::BpHwBinder::Obituary *", +- "referenced_type" : "type-2390", +- "self_type" : "type-2391", ++ "referenced_type" : "type-2385", ++ "self_type" : "type-2386", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -25715,8 +27127,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager *", + "name" : "const android::hardware::BpHwBinder::ObjectManager *", +- "referenced_type" : "type-2424", +- "self_type" : "type-2425", ++ "referenced_type" : "type-2419", ++ "self_type" : "type-2420", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -25724,8 +27136,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BpHwRefBase *", + "name" : "const android::hardware::BpHwRefBase *", +- "referenced_type" : "type-2369", +- "self_type" : "type-2370", ++ "referenced_type" : "type-2364", ++ "self_type" : "type-2365", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -25733,8 +27145,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BufferedTextOutput *", + "name" : "const android::hardware::BufferedTextOutput *", +- "referenced_type" : "type-2508", +- "self_type" : "type-2509", ++ "referenced_type" : "type-2503", ++ "self_type" : "type-2504", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -25742,8 +27154,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::ConcurrentMap, android::hardware::details::SchedPrio> *", + "name" : "const android::hardware::ConcurrentMap, android::hardware::details::SchedPrio> *", +- "referenced_type" : "type-1051", +- "self_type" : "type-1052", ++ "referenced_type" : "type-1048", ++ "self_type" : "type-1049", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -25751,8 +27163,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::ConcurrentMap, bool> *", + "name" : "const android::hardware::ConcurrentMap, bool> *", +- "referenced_type" : "type-1053", +- "self_type" : "type-1054", ++ "referenced_type" : "type-1050", ++ "self_type" : "type-1051", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -25761,7 +27173,7 @@ + "linker_set_key" : "const android::hardware::ConcurrentMap > *", + "name" : "const android::hardware::ConcurrentMap > *", + "referenced_type" : "type-393", +- "self_type" : "type-394", ++ "self_type" : "type-395", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -25769,8 +27181,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", + "name" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", +- "referenced_type" : "type-644", +- "self_type" : "type-645", ++ "referenced_type" : "type-642", ++ "self_type" : "type-643", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -25778,8 +27190,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", + "name" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", +- "referenced_type" : "type-407", +- "self_type" : "type-408", ++ "referenced_type" : "type-404", ++ "self_type" : "type-406", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -25787,8 +27199,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::HexDump *", + "name" : "const android::hardware::HexDump *", +- "referenced_type" : "type-2487", +- "self_type" : "type-2488", ++ "referenced_type" : "type-2482", ++ "self_type" : "type-2483", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -25796,8 +27208,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IBinder *", + "name" : "const android::hardware::IBinder *", +- "referenced_type" : "type-1443", +- "self_type" : "type-1445", ++ "referenced_type" : "type-1439", ++ "self_type" : "type-1441", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25805,8 +27217,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IBinder *", + "name" : "const android::hardware::IBinder *", +- "referenced_type" : "type-2330", +- "self_type" : "type-2331", ++ "referenced_type" : "type-2325", ++ "self_type" : "type-2326", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, +@@ -25814,8 +27226,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IBinder *", + "name" : "const android::hardware::IBinder *", +- "referenced_type" : "type-2641", +- "self_type" : "type-2643", ++ "referenced_type" : "type-2635", ++ "self_type" : "type-2637", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25823,8 +27235,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IBinder *", + "name" : "const android::hardware::IBinder *", +- "referenced_type" : "type-3984", +- "self_type" : "type-3986", ++ "referenced_type" : "type-3976", ++ "self_type" : "type-3978", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25832,8 +27244,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IBinder *", + "name" : "const android::hardware::IBinder *", +- "referenced_type" : "type-488", +- "self_type" : "type-490", ++ "referenced_type" : "type-486", ++ "self_type" : "type-488", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25841,8 +27253,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IBinder::DeathRecipient *", + "name" : "const android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-2419", +- "self_type" : "type-2420", ++ "referenced_type" : "type-2414", ++ "self_type" : "type-2415", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25850,8 +27262,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IInterface *", + "name" : "const android::hardware::IInterface *", +- "referenced_type" : "type-2550", +- "self_type" : "type-2551", ++ "referenced_type" : "type-2545", ++ "self_type" : "type-2546", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25859,8 +27271,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IPCThreadState *", + "name" : "const android::hardware::IPCThreadState *", +- "referenced_type" : "type-3637", +- "self_type" : "type-3639", ++ "referenced_type" : "type-3630", ++ "self_type" : "type-3632", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -25868,8 +27280,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel *", + "name" : "const android::hardware::Parcel *", +- "referenced_type" : "type-2353", +- "self_type" : "type-3763", ++ "referenced_type" : "type-2348", ++ "self_type" : "type-3756", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -25877,8 +27289,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::ProcessState *", + "name" : "const android::hardware::ProcessState *", +- "referenced_type" : "type-3844", +- "self_type" : "type-3845", ++ "referenced_type" : "type-3837", ++ "self_type" : "type-3838", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25886,8 +27298,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::ProcessState::handle_entry *", + "name" : "const android::hardware::ProcessState::handle_entry *", +- "referenced_type" : "type-3810", +- "self_type" : "type-3811", ++ "referenced_type" : "type-3802", ++ "self_type" : "type-3803", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -25895,8 +27307,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return *", + "name" : "const android::hardware::Return *", +- "referenced_type" : "type-811", +- "self_type" : "type-812", ++ "referenced_type" : "type-808", ++ "self_type" : "type-809", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25904,8 +27316,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-805", +- "self_type" : "type-806", ++ "referenced_type" : "type-802", ++ "self_type" : "type-803", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25913,8 +27325,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-990", +- "self_type" : "type-991", ++ "referenced_type" : "type-987", ++ "self_type" : "type-988", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25922,8 +27334,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-1097", +- "self_type" : "type-1098", ++ "referenced_type" : "type-1094", ++ "self_type" : "type-1095", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25931,8 +27343,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-1157", +- "self_type" : "type-1158", ++ "referenced_type" : "type-1154", ++ "self_type" : "type-1155", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25940,8 +27352,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-1217", +- "self_type" : "type-1218", ++ "referenced_type" : "type-1214", ++ "self_type" : "type-1215", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25949,8 +27361,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-1288", +- "self_type" : "type-1289", ++ "referenced_type" : "type-1285", ++ "self_type" : "type-1286", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25958,8 +27370,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return *", + "name" : "const android::hardware::Return *", +- "referenced_type" : "type-506", +- "self_type" : "type-507", ++ "referenced_type" : "type-504", ++ "self_type" : "type-505", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25967,8 +27379,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Status *", + "name" : "const android::hardware::Status *", +- "referenced_type" : "type-167", +- "self_type" : "type-171", ++ "referenced_type" : "type-166", ++ "self_type" : "type-170", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25976,8 +27388,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::TypeCode *", + "name" : "const android::hardware::TypeCode *", +- "referenced_type" : "type-2482", +- "self_type" : "type-2483", ++ "referenced_type" : "type-2477", ++ "self_type" : "type-2478", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -25985,8 +27397,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::Waiter *", + "name" : "const android::hardware::details::Waiter *", +- "referenced_type" : "type-1771", +- "self_type" : "type-1773", ++ "referenced_type" : "type-1766", ++ "self_type" : "type-1768", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25994,8 +27406,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::Waiter *", + "name" : "const android::hardware::details::Waiter *", +- "referenced_type" : "type-2916", +- "self_type" : "type-2918", ++ "referenced_type" : "type-2908", ++ "self_type" : "type-2911", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26003,8 +27415,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::Waiter *", + "name" : "const android::hardware::details::Waiter *", +- "referenced_type" : "type-796", +- "self_type" : "type-798", ++ "referenced_type" : "type-793", ++ "self_type" : "type-795", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26012,8 +27424,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::hidl_pointer > *", + "name" : "const android::hardware::details::hidl_pointer > *", +- "referenced_type" : "type-1076", +- "self_type" : "type-1077", ++ "referenced_type" : "type-1072", ++ "self_type" : "type-1074", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26021,8 +27433,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::hidl_pointer *", + "name" : "const android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-654", +- "self_type" : "type-655", ++ "referenced_type" : "type-652", ++ "self_type" : "type-653", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26030,8 +27442,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::hidl_pointer *", + "name" : "const android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-853", +- "self_type" : "type-856", ++ "referenced_type" : "type-850", ++ "self_type" : "type-853", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26039,8 +27451,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::hidl_pointer *", + "name" : "const android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-152", +- "self_type" : "type-153", ++ "referenced_type" : "type-151", ++ "self_type" : "type-152", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26049,7 +27461,7 @@ + "linker_set_key" : "const android::hardware::details::hidl_pointer *", + "name" : "const android::hardware::details::hidl_pointer *", + "referenced_type" : "type-13", +- "self_type" : "type-109", ++ "self_type" : "type-108", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26057,8 +27469,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::hidl_pointer *", + "name" : "const android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-537", +- "self_type" : "type-539", ++ "referenced_type" : "type-535", ++ "self_type" : "type-536", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26066,8 +27478,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::return_status *", + "name" : "const android::hardware::details::return_status *", +- "referenced_type" : "type-174", +- "self_type" : "type-175", ++ "referenced_type" : "type-173", ++ "self_type" : "type-174", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -26075,8 +27487,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_array *", + "name" : "const android::hardware::hidl_array *", +- "referenced_type" : "type-2268", +- "self_type" : "type-2267", ++ "referenced_type" : "type-2263", ++ "self_type" : "type-2262", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26084,8 +27496,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_death_recipient *", + "name" : "const android::hardware::hidl_death_recipient *", +- "referenced_type" : "type-478", +- "self_type" : "type-479", ++ "referenced_type" : "type-476", ++ "self_type" : "type-477", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26093,8 +27505,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_handle *", + "name" : "const android::hardware::hidl_handle *", +- "referenced_type" : "type-79", +- "self_type" : "type-95", ++ "referenced_type" : "type-78", ++ "self_type" : "type-94", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26102,8 +27514,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_memory *", + "name" : "const android::hardware::hidl_memory *", +- "referenced_type" : "type-123", +- "self_type" : "type-127", ++ "referenced_type" : "type-122", ++ "self_type" : "type-126", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26111,8 +27523,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_string *", + "name" : "const android::hardware::hidl_string *", +- "referenced_type" : "type-110", +- "self_type" : "type-117", ++ "referenced_type" : "type-109", ++ "self_type" : "type-116", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26120,8 +27532,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec > *", + "name" : "const android::hardware::hidl_vec > *", +- "referenced_type" : "type-2270", +- "self_type" : "type-2271", ++ "referenced_type" : "type-2264", ++ "self_type" : "type-2265", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26129,8 +27541,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec *", + "name" : "const android::hardware::hidl_vec *", +- "referenced_type" : "type-622", +- "self_type" : "type-623", ++ "referenced_type" : "type-620", ++ "self_type" : "type-621", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26138,8 +27550,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec *", + "name" : "const android::hardware::hidl_vec *", +- "referenced_type" : "type-1022", +- "self_type" : "type-1023", ++ "referenced_type" : "type-1019", ++ "self_type" : "type-1020", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26147,8 +27559,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec::iter *", + "name" : "const android::hardware::hidl_vec::iter *", +- "referenced_type" : "type-629", +- "self_type" : "type-630", ++ "referenced_type" : "type-627", ++ "self_type" : "type-628", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26156,8 +27568,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec *", + "name" : "const android::hardware::hidl_vec *", +- "referenced_type" : "type-523", +- "self_type" : "type-524", ++ "referenced_type" : "type-521", ++ "self_type" : "type-522", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26165,8 +27577,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_version *", + "name" : "const android::hardware::hidl_version *", +- "referenced_type" : "type-135", +- "self_type" : "type-136", ++ "referenced_type" : "type-134", ++ "self_type" : "type-135", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26174,8 +27586,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase *", + "name" : "const android::hidl::base::V1_0::BpHwBase *", +- "referenced_type" : "type-423", +- "self_type" : "type-424", ++ "referenced_type" : "type-421", ++ "self_type" : "type-422", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, +@@ -26183,8 +27595,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::base::V1_0::IBase *", + "name" : "const android::hidl::base::V1_0::IBase *", +- "referenced_type" : "type-382", +- "self_type" : "type-381", ++ "referenced_type" : "type-381", ++ "self_type" : "type-380", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26192,8 +27604,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceManager *", + "name" : "const android::hidl::manager::V1_0::BpHwServiceManager *", +- "referenced_type" : "type-877", +- "self_type" : "type-878", ++ "referenced_type" : "type-874", ++ "self_type" : "type-875", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, +@@ -26201,8 +27613,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceNotification *", + "name" : "const android::hidl::manager::V1_0::BpHwServiceNotification *", +- "referenced_type" : "type-869", +- "self_type" : "type-870", ++ "referenced_type" : "type-866", ++ "self_type" : "type-867", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, +@@ -26210,8 +27622,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager *", + "name" : "const android::hidl::manager::V1_0::IServiceManager *", +- "referenced_type" : "type-551", +- "self_type" : "type-553", ++ "referenced_type" : "type-547", ++ "self_type" : "type-551", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -26219,8 +27631,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *", + "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *", +- "referenced_type" : "type-1021", +- "self_type" : "type-1020", ++ "referenced_type" : "type-1018", ++ "self_type" : "type-1017", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26228,8 +27640,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *", + "name" : "const android::hidl::manager::V1_0::IServiceNotification *", +- "referenced_type" : "type-540", +- "self_type" : "type-542", ++ "referenced_type" : "type-538", ++ "self_type" : "type-540", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, +@@ -26237,8 +27649,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_1::BpHwServiceManager *", + "name" : "const android::hidl::manager::V1_1::BpHwServiceManager *", +- "referenced_type" : "type-885", +- "self_type" : "type-887", ++ "referenced_type" : "type-882", ++ "self_type" : "type-883", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, +@@ -26246,8 +27658,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_1::IServiceManager *", + "name" : "const android::hidl::manager::V1_1::IServiceManager *", +- "referenced_type" : "type-561", +- "self_type" : "type-563", ++ "referenced_type" : "type-559", ++ "self_type" : "type-561", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, +@@ -26255,8 +27667,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_2::BpHwClientCallback *", + "name" : "const android::hidl::manager::V1_2::BpHwClientCallback *", +- "referenced_type" : "type-894", +- "self_type" : "type-895", ++ "referenced_type" : "type-891", ++ "self_type" : "type-892", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, +@@ -26264,8 +27676,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_2::BpHwServiceManager *", + "name" : "const android::hidl::manager::V1_2::BpHwServiceManager *", +- "referenced_type" : "type-898", +- "self_type" : "type-899", ++ "referenced_type" : "type-894", ++ "self_type" : "type-895", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, +@@ -26273,8 +27685,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_2::IClientCallback *", + "name" : "const android::hidl::manager::V1_2::IClientCallback *", +- "referenced_type" : "type-543", +- "self_type" : "type-545", ++ "referenced_type" : "type-541", ++ "self_type" : "type-543", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, +@@ -26282,8 +27694,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager *", + "name" : "const android::hidl::manager::V1_2::IServiceManager *", +- "referenced_type" : "type-564", +- "self_type" : "type-566", ++ "referenced_type" : "type-562", ++ "self_type" : "type-564", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, +@@ -26291,8 +27703,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::key_value_pair_t > *", + "name" : "const android::key_value_pair_t > *", +- "referenced_type" : "type-3804", +- "self_type" : "type-3812", ++ "referenced_type" : "type-3797", ++ "self_type" : "type-3805", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -26300,8 +27712,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::key_value_pair_t *", + "name" : "const android::key_value_pair_t *", +- "referenced_type" : "type-2382", +- "self_type" : "type-2389", ++ "referenced_type" : "type-2377", ++ "self_type" : "type-2384", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -26309,8 +27721,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-3828", +- "self_type" : "type-3835", ++ "referenced_type" : "type-3821", ++ "self_type" : "type-3828", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26318,8 +27730,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-3638", +- "self_type" : "type-3648", ++ "referenced_type" : "type-3631", ++ "self_type" : "type-3641", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26327,8 +27739,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-2496", +- "self_type" : "type-2503", ++ "referenced_type" : "type-2491", ++ "self_type" : "type-2498", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -26336,8 +27748,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-162", +- "self_type" : "type-163", ++ "referenced_type" : "type-161", ++ "self_type" : "type-162", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26345,8 +27757,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-2404", +- "self_type" : "type-2422", ++ "referenced_type" : "type-2399", ++ "self_type" : "type-2417", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26354,8 +27766,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-70", +- "self_type" : "type-487", ++ "referenced_type" : "type-69", ++ "self_type" : "type-484", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26363,8 +27775,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-2545", +- "self_type" : "type-2549", ++ "referenced_type" : "type-2540", ++ "self_type" : "type-2544", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26372,8 +27784,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-496", +- "self_type" : "type-498", ++ "referenced_type" : "type-494", ++ "self_type" : "type-495", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26381,8 +27793,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-606", +- "self_type" : "type-607", ++ "referenced_type" : "type-604", ++ "self_type" : "type-605", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26390,8 +27802,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-794", +- "self_type" : "type-795", ++ "referenced_type" : "type-790", ++ "self_type" : "type-792", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26399,8 +27811,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-950", +- "self_type" : "type-985", ++ "referenced_type" : "type-947", ++ "self_type" : "type-982", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26408,8 +27820,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-141", +- "self_type" : "type-164", ++ "referenced_type" : "type-140", ++ "self_type" : "type-163", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26417,8 +27829,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-459", +- "self_type" : "type-481", ++ "referenced_type" : "type-456", ++ "self_type" : "type-479", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26426,8 +27838,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-578", +- "self_type" : "type-579", ++ "referenced_type" : "type-576", ++ "self_type" : "type-577", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26435,8 +27847,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-593", +- "self_type" : "type-594", ++ "referenced_type" : "type-591", ++ "self_type" : "type-592", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26444,8 +27856,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-583", +- "self_type" : "type-584", ++ "referenced_type" : "type-581", ++ "self_type" : "type-582", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26453,8 +27865,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-600", +- "self_type" : "type-601", ++ "referenced_type" : "type-598", ++ "self_type" : "type-599", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26462,8 +27874,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-588", +- "self_type" : "type-589", ++ "referenced_type" : "type-586", ++ "self_type" : "type-587", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26471,8 +27883,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp *", + "name" : "const android::wp *", +- "referenced_type" : "type-469", +- "self_type" : "type-474", ++ "referenced_type" : "type-467", ++ "self_type" : "type-472", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26480,8 +27892,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp *", + "name" : "const android::wp *", +- "referenced_type" : "type-2358", +- "self_type" : "type-2410", ++ "referenced_type" : "type-2353", ++ "self_type" : "type-2405", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26489,8 +27901,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp *", + "name" : "const android::wp *", +- "referenced_type" : "type-3749", +- "self_type" : "type-3756", ++ "referenced_type" : "type-3742", ++ "self_type" : "type-3749", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26498,8 +27910,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp *", + "name" : "const android::wp *", +- "referenced_type" : "type-464", +- "self_type" : "type-467", ++ "referenced_type" : "type-462", ++ "self_type" : "type-464", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26507,8 +27919,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp *", + "name" : "const android::wp *", +- "referenced_type" : "type-64", +- "self_type" : "type-462", ++ "referenced_type" : "type-63", ++ "self_type" : "type-460", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26516,8 +27928,8 @@ + "alignment" : 4, + "linker_set_key" : "const binder_buffer_object *", + "name" : "const binder_buffer_object *", +- "referenced_type" : "type-3783", +- "self_type" : "type-3785", ++ "referenced_type" : "type-3776", ++ "self_type" : "type-3778", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26525,8 +27937,8 @@ + "alignment" : 4, + "linker_set_key" : "const char *", + "name" : "const char *", +- "referenced_type" : "type-100", +- "self_type" : "type-99", ++ "referenced_type" : "type-99", ++ "self_type" : "type-98", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26534,8 +27946,8 @@ + "alignment" : 4, + "linker_set_key" : "const char16_t *", + "name" : "const char16_t *", +- "referenced_type" : "type-344", +- "self_type" : "type-343", ++ "referenced_type" : "type-343", ++ "self_type" : "type-342", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String16.h" + }, +@@ -26543,8 +27955,8 @@ + "alignment" : 4, + "linker_set_key" : "const dirent *", + "name" : "const dirent *", +- "referenced_type" : "type-1290", +- "self_type" : "type-1328", ++ "referenced_type" : "type-1287", ++ "self_type" : "type-1325", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26552,8 +27964,8 @@ + "alignment" : 4, + "linker_set_key" : "const dirent *", + "name" : "const dirent *", +- "referenced_type" : "type-2207", +- "self_type" : "type-2245", ++ "referenced_type" : "type-2202", ++ "self_type" : "type-2240", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26561,8 +27973,8 @@ + "alignment" : 4, + "linker_set_key" : "const dirent *", + "name" : "const dirent *", +- "referenced_type" : "type-262", +- "self_type" : "type-273", ++ "referenced_type" : "type-261", ++ "self_type" : "type-272", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26570,8 +27982,8 @@ + "alignment" : 4, + "linker_set_key" : "const dirent *", + "name" : "const dirent *", +- "referenced_type" : "type-3209", +- "self_type" : "type-3218", ++ "referenced_type" : "type-3202", ++ "self_type" : "type-3211", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26579,8 +27991,8 @@ + "alignment" : 4, + "linker_set_key" : "const dirent *", + "name" : "const dirent *", +- "referenced_type" : "type-3324", +- "self_type" : "type-3360", ++ "referenced_type" : "type-3317", ++ "self_type" : "type-3353", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26588,8 +28000,8 @@ + "alignment" : 4, + "linker_set_key" : "const flat_binder_object *", + "name" : "const flat_binder_object *", +- "referenced_type" : "type-3767", +- "self_type" : "type-3780", ++ "referenced_type" : "type-3760", ++ "self_type" : "type-3773", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26598,7 +28010,7 @@ + "linker_set_key" : "const int *", + "name" : "const int *", + "referenced_type" : "type-624", +- "self_type" : "type-1019", ++ "self_type" : "type-1016", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26606,8 +28018,8 @@ + "alignment" : 4, + "linker_set_key" : "const log_msg *", + "name" : "const log_msg *", +- "referenced_type" : "type-239", +- "self_type" : "type-240", ++ "referenced_type" : "type-238", ++ "self_type" : "type-239", + "size" : 4, + "source_file" : "/system/core/liblog/include/log/log_read.h" + }, +@@ -26625,7 +28037,7 @@ + "linker_set_key" : "const native_handle **", + "name" : "const native_handle **", + "referenced_type" : "type-16", +- "self_type" : "type-3782", ++ "self_type" : "type-3775", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26633,8 +28045,8 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned char *", + "name" : "const unsigned char *", +- "referenced_type" : "type-604", +- "self_type" : "type-1030", ++ "referenced_type" : "type-603", ++ "self_type" : "type-1027", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26642,8 +28054,8 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned int *", + "name" : "const unsigned int *", +- "referenced_type" : "type-246", +- "self_type" : "type-2352", ++ "referenced_type" : "type-245", ++ "self_type" : "type-2347", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26651,8 +28063,8 @@ + "alignment" : 4, + "linker_set_key" : "const void *", + "name" : "const void *", +- "referenced_type" : "type-138", +- "self_type" : "type-139", ++ "referenced_type" : "type-137", ++ "self_type" : "type-138", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26660,8 +28072,8 @@ + "alignment" : 4, + "linker_set_key" : "const void **", + "name" : "const void **", +- "referenced_type" : "type-139", +- "self_type" : "type-3781", ++ "referenced_type" : "type-138", ++ "self_type" : "type-3774", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26670,7 +28082,7 @@ + "linker_set_key" : "double *", + "name" : "double *", + "referenced_type" : "type-4", +- "self_type" : "type-3776", ++ "self_type" : "type-3769", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26678,8 +28090,8 @@ + "alignment" : 4, + "linker_set_key" : "float *", + "name" : "float *", +- "referenced_type" : "type-298", +- "self_type" : "type-3775", ++ "referenced_type" : "type-297", ++ "self_type" : "type-3768", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26687,8 +28099,8 @@ + "alignment" : 4, + "linker_set_key" : "int (*)(void *)", + "name" : "int (*)(void *)", +- "referenced_type" : "type-303", +- "self_type" : "type-304", ++ "referenced_type" : "type-302", ++ "self_type" : "type-303", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h" + }, +@@ -26697,7 +28109,7 @@ + "linker_set_key" : "int *", + "name" : "int *", + "referenced_type" : "type-19", +- "self_type" : "type-521", ++ "self_type" : "type-519", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26705,8 +28117,8 @@ + "alignment" : 4, + "linker_set_key" : "log_msg *", + "name" : "log_msg *", +- "referenced_type" : "type-236", +- "self_type" : "type-242", ++ "referenced_type" : "type-235", ++ "self_type" : "type-241", + "size" : 4, + "source_file" : "/system/core/liblog/include/log/log_read.h" + }, +@@ -26715,7 +28127,7 @@ + "linker_set_key" : "long long *", + "name" : "long long *", + "referenced_type" : "type-447", +- "self_type" : "type-3773", ++ "self_type" : "type-3766", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26724,7 +28136,7 @@ + "linker_set_key" : "native_handle *", + "name" : "native_handle *", + "referenced_type" : "type-18", +- "self_type" : "type-91", ++ "self_type" : "type-90", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26733,7 +28145,7 @@ + "linker_set_key" : "short *", + "name" : "short *", + "referenced_type" : "type-2", +- "self_type" : "type-3771", ++ "self_type" : "type-3764", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26742,7 +28154,7 @@ + "linker_set_key" : "signed char *", + "name" : "signed char *", + "referenced_type" : "type-550", +- "self_type" : "type-3770", ++ "self_type" : "type-3763", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26750,8 +28162,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__1::basic_ostream &(*)(std::__1::basic_ostream &)", + "name" : "std::__1::basic_ostream &(*)(std::__1::basic_ostream &)", +- "referenced_type" : "type-2489", +- "self_type" : "type-2492", ++ "referenced_type" : "type-2484", ++ "self_type" : "type-2487", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -26759,8 +28171,8 @@ + "alignment" : 4, + "linker_set_key" : "std::unique_ptr > *", + "name" : "std::unique_ptr > *", +- "referenced_type" : "type-3779", +- "self_type" : "type-3778", ++ "referenced_type" : "type-3772", ++ "self_type" : "type-3771", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26768,8 +28180,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *)>, std::allocator > *)> > > *", + "name" : "std::vector > *)>, std::allocator > *)> > > *", +- "referenced_type" : "type-1251", +- "self_type" : "type-1250", ++ "referenced_type" : "type-1248", ++ "self_type" : "type-1247", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26777,8 +28189,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *)>, std::allocator > *)> > > *", + "name" : "std::vector > *)>, std::allocator > *)> > > *", +- "referenced_type" : "type-2170", +- "self_type" : "type-2169", ++ "referenced_type" : "type-2165", ++ "self_type" : "type-2164", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26786,8 +28198,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *)>, std::allocator > *)> > > *", + "name" : "std::vector > *)>, std::allocator > *)> > > *", +- "referenced_type" : "type-248", +- "self_type" : "type-247", ++ "referenced_type" : "type-247", ++ "self_type" : "type-246", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26795,8 +28207,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *)>, std::allocator > *)> > > *", + "name" : "std::vector > *)>, std::allocator > *)> > > *", +- "referenced_type" : "type-3204", +- "self_type" : "type-3203", ++ "referenced_type" : "type-3197", ++ "self_type" : "type-3196", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26804,8 +28216,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *)>, std::allocator > *)> > > *", + "name" : "std::vector > *)>, std::allocator > *)> > > *", +- "referenced_type" : "type-3281", +- "self_type" : "type-3280", ++ "referenced_type" : "type-3274", ++ "self_type" : "type-3273", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26813,8 +28225,8 @@ + "alignment" : 4, + "linker_set_key" : "unsigned char *", + "name" : "unsigned char *", +- "referenced_type" : "type-199", +- "self_type" : "type-291", ++ "referenced_type" : "type-198", ++ "self_type" : "type-290", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics.h" + }, +@@ -26823,7 +28235,7 @@ + "linker_set_key" : "unsigned int *", + "name" : "unsigned int *", + "referenced_type" : "type-1", +- "self_type" : "type-1041", ++ "self_type" : "type-1038", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -26832,7 +28244,7 @@ + "linker_set_key" : "unsigned long long *", + "name" : "unsigned long long *", + "referenced_type" : "type-21", +- "self_type" : "type-3774", ++ "self_type" : "type-3767", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26840,8 +28252,8 @@ + "alignment" : 4, + "linker_set_key" : "unsigned short *", + "name" : "unsigned short *", +- "referenced_type" : "type-132", +- "self_type" : "type-3772", ++ "referenced_type" : "type-131", ++ "self_type" : "type-3765", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26849,8 +28261,8 @@ + "alignment" : 4, + "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned int *, unsigned int, void *)", + "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned int *, unsigned int, void *)", +- "referenced_type" : "type-2351", +- "self_type" : "type-2350", ++ "referenced_type" : "type-2346", ++ "self_type" : "type-2345", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26858,8 +28270,8 @@ + "alignment" : 4, + "linker_set_key" : "void (*)(const void *, void *, void *)", + "name" : "void (*)(const void *, void *, void *)", +- "referenced_type" : "type-2346", +- "self_type" : "type-2345", ++ "referenced_type" : "type-2341", ++ "self_type" : "type-2340", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -26867,8 +28279,8 @@ + "alignment" : 4, + "linker_set_key" : "void (*)(void *, const char *)", + "name" : "void (*)(void *, const char *)", +- "referenced_type" : "type-2539", +- "self_type" : "type-2540", ++ "referenced_type" : "type-2534", ++ "self_type" : "type-2535", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h" + }, +@@ -26876,8 +28288,8 @@ + "alignment" : 4, + "linker_set_key" : "void *", + "name" : "void *", +- "referenced_type" : "type-106", +- "self_type" : "type-245", ++ "referenced_type" : "type-105", ++ "self_type" : "type-244", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/VectorImpl.h" + }, +@@ -26885,8 +28297,8 @@ + "alignment" : 4, + "linker_set_key" : "void **", + "name" : "void **", +- "referenced_type" : "type-245", +- "self_type" : "type-305", ++ "referenced_type" : "type-244", ++ "self_type" : "type-304", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h" + } +@@ -26898,8 +28310,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase *const", + "name" : "android::RefBase *const", +- "referenced_type" : "type-68", +- "self_type" : "type-3609", ++ "referenced_type" : "type-67", ++ "self_type" : "type-3602", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -26908,8 +28320,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1099", +- "self_type" : "type-1101", ++ "referenced_type" : "type-1096", ++ "self_type" : "type-1098", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26918,8 +28330,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1159", +- "self_type" : "type-1161", ++ "referenced_type" : "type-1156", ++ "self_type" : "type-1158", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26928,8 +28340,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1220", +- "self_type" : "type-1222", ++ "referenced_type" : "type-1217", ++ "self_type" : "type-1219", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26938,8 +28350,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1292", +- "self_type" : "type-1296", ++ "referenced_type" : "type-1289", ++ "self_type" : "type-1291", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26948,8 +28360,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1347", +- "self_type" : "type-1349", ++ "referenced_type" : "type-1344", ++ "self_type" : "type-1346", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26958,8 +28370,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1454", +- "self_type" : "type-1456", ++ "referenced_type" : "type-1450", ++ "self_type" : "type-1452", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26968,8 +28380,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1522", +- "self_type" : "type-1524", ++ "referenced_type" : "type-1518", ++ "self_type" : "type-1520", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26978,8 +28390,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1689", +- "self_type" : "type-1691", ++ "referenced_type" : "type-1685", ++ "self_type" : "type-1687", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26988,8 +28400,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1701", +- "self_type" : "type-1700", ++ "referenced_type" : "type-1697", ++ "self_type" : "type-1696", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26998,8 +28410,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1728", +- "self_type" : "type-1730", ++ "referenced_type" : "type-1723", ++ "self_type" : "type-1725", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27008,8 +28420,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1791", +- "self_type" : "type-1793", ++ "referenced_type" : "type-1786", ++ "self_type" : "type-1788", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27018,8 +28430,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1863", +- "self_type" : "type-1865", ++ "referenced_type" : "type-1858", ++ "self_type" : "type-1860", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27028,8 +28440,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1934", +- "self_type" : "type-1936", ++ "referenced_type" : "type-1929", ++ "self_type" : "type-1931", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27038,8 +28450,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2021", +- "self_type" : "type-2023", ++ "referenced_type" : "type-2016", ++ "self_type" : "type-2018", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27048,8 +28460,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2079", +- "self_type" : "type-2081", ++ "referenced_type" : "type-2074", ++ "self_type" : "type-2076", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27058,8 +28470,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2138", +- "self_type" : "type-2140", ++ "referenced_type" : "type-2133", ++ "self_type" : "type-2135", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27068,8 +28480,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2209", +- "self_type" : "type-2213", ++ "referenced_type" : "type-2204", ++ "self_type" : "type-2206", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27078,8 +28490,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2257", +- "self_type" : "type-2259", ++ "referenced_type" : "type-2252", ++ "self_type" : "type-2254", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27088,8 +28500,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2307", +- "self_type" : "type-2309", ++ "referenced_type" : "type-2302", ++ "self_type" : "type-2304", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27098,8 +28510,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2325", +- "self_type" : "type-2327", ++ "referenced_type" : "type-2320", ++ "self_type" : "type-2322", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27108,8 +28520,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2400", +- "self_type" : "type-2402", ++ "referenced_type" : "type-2395", ++ "self_type" : "type-2397", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27118,8 +28530,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2498", +- "self_type" : "type-2500", ++ "referenced_type" : "type-2493", ++ "self_type" : "type-2495", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27128,8 +28540,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2520", +- "self_type" : "type-2532", ++ "referenced_type" : "type-2517", ++ "self_type" : "type-2527", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27138,8 +28550,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2533", +- "self_type" : "type-2535", ++ "referenced_type" : "type-2528", ++ "self_type" : "type-2530", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27148,8 +28560,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2541", +- "self_type" : "type-2543", ++ "referenced_type" : "type-2536", ++ "self_type" : "type-2538", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27158,8 +28570,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2651", +- "self_type" : "type-2653", ++ "referenced_type" : "type-2645", ++ "self_type" : "type-2647", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27168,8 +28580,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2719", +- "self_type" : "type-2721", ++ "referenced_type" : "type-2713", ++ "self_type" : "type-2715", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27188,8 +28600,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2819", +- "self_type" : "type-2818", ++ "referenced_type" : "type-2814", ++ "self_type" : "type-2813", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27198,8 +28610,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2832", +- "self_type" : "type-2834", ++ "referenced_type" : "type-2826", ++ "self_type" : "type-2828", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27208,8 +28620,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2870", +- "self_type" : "type-2872", ++ "referenced_type" : "type-2863", ++ "self_type" : "type-2865", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27218,8 +28630,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2936", +- "self_type" : "type-2938", ++ "referenced_type" : "type-2928", ++ "self_type" : "type-2931", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27228,8 +28640,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3006", +- "self_type" : "type-3008", ++ "referenced_type" : "type-2999", ++ "self_type" : "type-3001", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27238,8 +28650,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3077", +- "self_type" : "type-3079", ++ "referenced_type" : "type-3070", ++ "self_type" : "type-3072", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27248,8 +28660,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3157", +- "self_type" : "type-3159", ++ "referenced_type" : "type-3150", ++ "self_type" : "type-3152", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27258,8 +28670,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-320", +- "self_type" : "type-322", ++ "referenced_type" : "type-319", ++ "self_type" : "type-321", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27268,8 +28680,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3224", +- "self_type" : "type-3226", ++ "referenced_type" : "type-3217", ++ "self_type" : "type-3219", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27278,8 +28690,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3267", +- "self_type" : "type-3271", ++ "referenced_type" : "type-3260", ++ "self_type" : "type-3264", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27288,8 +28700,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3277", +- "self_type" : "type-3279", ++ "referenced_type" : "type-3270", ++ "self_type" : "type-3272", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27298,8 +28710,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3340", +- "self_type" : "type-3342", ++ "referenced_type" : "type-3333", ++ "self_type" : "type-3335", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27308,8 +28720,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3386", +- "self_type" : "type-3388", ++ "referenced_type" : "type-3379", ++ "self_type" : "type-3381", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27318,8 +28730,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3430", +- "self_type" : "type-3432", ++ "referenced_type" : "type-3423", ++ "self_type" : "type-3425", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27328,8 +28740,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3445", +- "self_type" : "type-3447", ++ "referenced_type" : "type-3438", ++ "self_type" : "type-3440", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27338,8 +28750,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3502", +- "self_type" : "type-3505", ++ "referenced_type" : "type-3495", ++ "self_type" : "type-3497", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27348,8 +28760,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3565", +- "self_type" : "type-3567", ++ "referenced_type" : "type-3558", ++ "self_type" : "type-3560", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27358,8 +28770,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3586", +- "self_type" : "type-3588", ++ "referenced_type" : "type-3579", ++ "self_type" : "type-3581", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27368,8 +28780,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3594", +- "self_type" : "type-3596", ++ "referenced_type" : "type-3587", ++ "self_type" : "type-3589", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27378,8 +28790,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3617", +- "self_type" : "type-3619", ++ "referenced_type" : "type-3610", ++ "self_type" : "type-3612", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27388,8 +28800,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3751", +- "self_type" : "type-3753", ++ "referenced_type" : "type-3744", ++ "self_type" : "type-3746", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27398,8 +28810,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3818", +- "self_type" : "type-3820", ++ "referenced_type" : "type-3811", ++ "self_type" : "type-3813", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27408,8 +28820,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3873", +- "self_type" : "type-3875", ++ "referenced_type" : "type-3866", ++ "self_type" : "type-3868", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27418,8 +28830,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3889", +- "self_type" : "type-3891", ++ "referenced_type" : "type-3882", ++ "self_type" : "type-3884", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27428,8 +28840,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3999", +- "self_type" : "type-4001", ++ "referenced_type" : "type-3991", ++ "self_type" : "type-3993", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27438,8 +28850,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-4072", +- "self_type" : "type-4074", ++ "referenced_type" : "type-4064", ++ "self_type" : "type-4066", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27448,8 +28860,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-510", +- "self_type" : "type-513", ++ "referenced_type" : "type-508", ++ "self_type" : "type-510", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27468,8 +28880,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-611", +- "self_type" : "type-613", ++ "referenced_type" : "type-609", ++ "self_type" : "type-611", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27478,8 +28890,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-706", +- "self_type" : "type-708", ++ "referenced_type" : "type-704", ++ "self_type" : "type-706", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27488,8 +28900,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-718", +- "self_type" : "type-717", ++ "referenced_type" : "type-716", ++ "self_type" : "type-715", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27498,8 +28910,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-745", +- "self_type" : "type-747", ++ "referenced_type" : "type-742", ++ "self_type" : "type-744", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27508,8 +28920,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-80", +- "self_type" : "type-82", ++ "referenced_type" : "type-79", ++ "self_type" : "type-81", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27518,8 +28930,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-818", +- "self_type" : "type-820", ++ "referenced_type" : "type-815", ++ "self_type" : "type-817", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27528,8 +28940,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-914", +- "self_type" : "type-916", ++ "referenced_type" : "type-911", ++ "self_type" : "type-913", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27538,8 +28950,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-996", +- "self_type" : "type-998", ++ "referenced_type" : "type-993", ++ "self_type" : "type-995", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27549,7 +28961,7 @@ + "linker_set_key" : "android::RefBase::weakref_type *const", + "name" : "android::RefBase::weakref_type *const", + "referenced_type" : "type-35", +- "self_type" : "type-3607", ++ "self_type" : "type-3600", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -27558,8 +28970,8 @@ + "is_const" : true, + "linker_set_key" : "android::hardware::BHwBinder *const", + "name" : "android::hardware::BHwBinder *const", +- "referenced_type" : "type-2332", +- "self_type" : "type-3605", ++ "referenced_type" : "type-2327", ++ "self_type" : "type-3598", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -27568,8 +28980,8 @@ + "is_const" : true, + "linker_set_key" : "android::hardware::IBinder *const", + "name" : "android::hardware::IBinder *const", +- "referenced_type" : "type-2329", +- "self_type" : "type-2365", ++ "referenced_type" : "type-2324", ++ "self_type" : "type-2360", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -27578,8 +28990,8 @@ + "is_const" : true, + "linker_set_key" : "char *const", + "name" : "char *const", +- "referenced_type" : "type-243", +- "self_type" : "type-3788", ++ "referenced_type" : "type-242", ++ "self_type" : "type-3781", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27588,8 +29000,8 @@ + "is_const" : true, + "linker_set_key" : "char const[10]", + "name" : "char const[10]", +- "referenced_type" : "type-3654", +- "self_type" : "type-3653", ++ "referenced_type" : "type-3647", ++ "self_type" : "type-3646", + "size" : 10, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27598,8 +29010,8 @@ + "is_const" : true, + "linker_set_key" : "char const[11]", + "name" : "char const[11]", +- "referenced_type" : "type-3677", +- "self_type" : "type-3676", ++ "referenced_type" : "type-3670", ++ "self_type" : "type-3669", + "size" : 11, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27608,8 +29020,8 @@ + "is_const" : true, + "linker_set_key" : "char const[12]", + "name" : "char const[12]", +- "referenced_type" : "type-3651", +- "self_type" : "type-3650", ++ "referenced_type" : "type-3644", ++ "self_type" : "type-3643", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27618,8 +29030,8 @@ + "is_const" : true, + "linker_set_key" : "char const[13]", + "name" : "char const[13]", +- "referenced_type" : "type-3647", +- "self_type" : "type-3646", ++ "referenced_type" : "type-3640", ++ "self_type" : "type-3639", + "size" : 13, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27628,8 +29040,8 @@ + "is_const" : true, + "linker_set_key" : "char const[14]", + "name" : "char const[14]", +- "referenced_type" : "type-3696", +- "self_type" : "type-3695", ++ "referenced_type" : "type-3689", ++ "self_type" : "type-3688", + "size" : 14, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27638,8 +29050,8 @@ + "is_const" : true, + "linker_set_key" : "char const[15]", + "name" : "char const[15]", +- "referenced_type" : "type-3794", +- "self_type" : "type-3793", ++ "referenced_type" : "type-3787", ++ "self_type" : "type-3786", + "size" : 15, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27648,8 +29060,8 @@ + "is_const" : true, + "linker_set_key" : "char const[16]", + "name" : "char const[16]", +- "referenced_type" : "type-47", +- "self_type" : "type-3679", ++ "referenced_type" : "type-46", ++ "self_type" : "type-3672", + "size" : 16, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27658,8 +29070,8 @@ + "is_const" : true, + "linker_set_key" : "char const[17]", + "name" : "char const[17]", +- "referenced_type" : "type-3699", +- "self_type" : "type-3698", ++ "referenced_type" : "type-3692", ++ "self_type" : "type-3691", + "size" : 17, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27668,8 +29080,8 @@ + "is_const" : true, + "linker_set_key" : "char const[18]", + "name" : "char const[18]", +- "referenced_type" : "type-3683", +- "self_type" : "type-3682", ++ "referenced_type" : "type-3676", ++ "self_type" : "type-3675", + "size" : 18, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27678,8 +29090,8 @@ + "is_const" : true, + "linker_set_key" : "char const[19]", + "name" : "char const[19]", +- "referenced_type" : "type-3715", +- "self_type" : "type-3714", ++ "referenced_type" : "type-3708", ++ "self_type" : "type-3707", + "size" : 19, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27688,8 +29100,8 @@ + "is_const" : true, + "linker_set_key" : "char const[20]", + "name" : "char const[20]", +- "referenced_type" : "type-3693", +- "self_type" : "type-3692", ++ "referenced_type" : "type-3686", ++ "self_type" : "type-3685", + "size" : 20, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27698,8 +29110,8 @@ + "is_const" : true, + "linker_set_key" : "char const[22]", + "name" : "char const[22]", +- "referenced_type" : "type-3718", +- "self_type" : "type-3717", ++ "referenced_type" : "type-3711", ++ "self_type" : "type-3710", + "size" : 22, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27708,8 +29120,8 @@ + "is_const" : true, + "linker_set_key" : "char const[25]", + "name" : "char const[25]", +- "referenced_type" : "type-3708", +- "self_type" : "type-3707", ++ "referenced_type" : "type-3701", ++ "self_type" : "type-3700", + "size" : 25, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27718,8 +29130,8 @@ + "is_const" : true, + "linker_set_key" : "char const[28]", + "name" : "char const[28]", +- "referenced_type" : "type-3730", +- "self_type" : "type-3729", ++ "referenced_type" : "type-3723", ++ "self_type" : "type-3722", + "size" : 28, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27728,8 +29140,8 @@ + "is_const" : true, + "linker_set_key" : "char const[29]", + "name" : "char const[29]", +- "referenced_type" : "type-3705", +- "self_type" : "type-3704", ++ "referenced_type" : "type-3698", ++ "self_type" : "type-3697", + "size" : 29, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27738,8 +29150,8 @@ + "is_const" : true, + "linker_set_key" : "char const[2]", + "name" : "char const[2]", +- "referenced_type" : "type-3658", +- "self_type" : "type-3657", ++ "referenced_type" : "type-3650", ++ "self_type" : "type-3649", + "size" : 2, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27748,8 +29160,8 @@ + "is_const" : true, + "linker_set_key" : "char const[31]", + "name" : "char const[31]", +- "referenced_type" : "type-3690", +- "self_type" : "type-3689", ++ "referenced_type" : "type-3682", ++ "self_type" : "type-3681", + "size" : 31, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27758,8 +29170,8 @@ + "is_const" : true, + "linker_set_key" : "char const[32]", + "name" : "char const[32]", +- "referenced_type" : "type-3722", +- "self_type" : "type-3721", ++ "referenced_type" : "type-3715", ++ "self_type" : "type-3714", + "size" : 32, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27768,8 +29180,8 @@ + "is_const" : true, + "linker_set_key" : "char const[35]", + "name" : "char const[35]", +- "referenced_type" : "type-3711", +- "self_type" : "type-3710", ++ "referenced_type" : "type-3704", ++ "self_type" : "type-3703", + "size" : 35, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27778,8 +29190,8 @@ + "is_const" : true, + "linker_set_key" : "char const[37]", + "name" : "char const[37]", +- "referenced_type" : "type-3702", +- "self_type" : "type-3701", ++ "referenced_type" : "type-3695", ++ "self_type" : "type-3694", + "size" : 37, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27788,8 +29200,8 @@ + "is_const" : true, + "linker_set_key" : "char const[3]", + "name" : "char const[3]", +- "referenced_type" : "type-3670", +- "self_type" : "type-3669", ++ "referenced_type" : "type-3663", ++ "self_type" : "type-3662", + "size" : 3, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27798,8 +29210,8 @@ + "is_const" : true, + "linker_set_key" : "char const[4]", + "name" : "char const[4]", +- "referenced_type" : "type-3791", +- "self_type" : "type-3790", ++ "referenced_type" : "type-3784", ++ "self_type" : "type-3783", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27808,8 +29220,8 @@ + "is_const" : true, + "linker_set_key" : "char const[5]", + "name" : "char const[5]", +- "referenced_type" : "type-3797", +- "self_type" : "type-3796", ++ "referenced_type" : "type-3790", ++ "self_type" : "type-3789", + "size" : 5, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27818,8 +29230,8 @@ + "is_const" : true, + "linker_set_key" : "char const[6]", + "name" : "char const[6]", +- "referenced_type" : "type-3662", +- "self_type" : "type-3661", ++ "referenced_type" : "type-3655", ++ "self_type" : "type-3654", + "size" : 6, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27828,8 +29240,8 @@ + "is_const" : true, + "linker_set_key" : "char const[7]", + "name" : "char const[7]", +- "referenced_type" : "type-3686", +- "self_type" : "type-3685", ++ "referenced_type" : "type-3679", ++ "self_type" : "type-3678", + "size" : 7, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27838,8 +29250,8 @@ + "is_const" : true, + "linker_set_key" : "char const[8]", + "name" : "char const[8]", +- "referenced_type" : "type-3674", +- "self_type" : "type-3673", ++ "referenced_type" : "type-3667", ++ "self_type" : "type-3666", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27848,8 +29260,8 @@ + "is_const" : true, + "linker_set_key" : "char const[9]", + "name" : "char const[9]", +- "referenced_type" : "type-3665", +- "self_type" : "type-3664", ++ "referenced_type" : "type-3658", ++ "self_type" : "type-3657", + "size" : 9, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27858,8 +29270,8 @@ + "is_const" : true, + "linker_set_key" : "const android::CallStack", + "name" : "const android::CallStack", +- "referenced_type" : "type-256", +- "self_type" : "type-258", ++ "referenced_type" : "type-255", ++ "self_type" : "type-257", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/CallStack.h" + }, +@@ -27868,8 +29280,8 @@ + "is_const" : true, + "linker_set_key" : "const android::KeyedVector >", + "name" : "const android::KeyedVector >", +- "referenced_type" : "type-433", +- "self_type" : "type-3834", ++ "referenced_type" : "type-431", ++ "self_type" : "type-3827", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -27878,8 +29290,8 @@ + "is_const" : true, + "linker_set_key" : "const android::KeyedVector", + "name" : "const android::KeyedVector", +- "referenced_type" : "type-2341", +- "self_type" : "type-2417", ++ "referenced_type" : "type-2336", ++ "self_type" : "type-2412", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -27888,8 +29300,8 @@ + "is_const" : true, + "linker_set_key" : "const android::NativeHandle", + "name" : "const android::NativeHandle", +- "referenced_type" : "type-315", +- "self_type" : "type-333", ++ "referenced_type" : "type-314", ++ "self_type" : "type-332", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/NativeHandle.h" + }, +@@ -27899,7 +29311,7 @@ + "linker_set_key" : "const android::RefBase", + "name" : "const android::RefBase", + "referenced_type" : "type-25", +- "self_type" : "type-62", ++ "self_type" : "type-61", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27908,8 +29320,8 @@ + "is_const" : true, + "linker_set_key" : "const android::SortedVector > >", + "name" : "const android::SortedVector > >", +- "referenced_type" : "type-426", +- "self_type" : "type-3825", ++ "referenced_type" : "type-424", ++ "self_type" : "type-3818", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -27918,8 +29330,8 @@ + "is_const" : true, + "linker_set_key" : "const android::SortedVector >", + "name" : "const android::SortedVector >", +- "referenced_type" : "type-2342", +- "self_type" : "type-2407", ++ "referenced_type" : "type-2337", ++ "self_type" : "type-2402", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -27928,8 +29340,8 @@ + "is_const" : true, + "linker_set_key" : "const android::String16", + "name" : "const android::String16", +- "referenced_type" : "type-342", +- "self_type" : "type-348", ++ "referenced_type" : "type-341", ++ "self_type" : "type-347", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String16.h" + }, +@@ -27938,8 +29350,8 @@ + "is_const" : true, + "linker_set_key" : "const android::String8", + "name" : "const android::String8", +- "referenced_type" : "type-221", +- "self_type" : "type-223", ++ "referenced_type" : "type-220", ++ "self_type" : "type-222", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String8.h" + }, +@@ -27948,8 +29360,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-432", +- "self_type" : "type-3630", ++ "referenced_type" : "type-430", ++ "self_type" : "type-3623", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -27958,8 +29370,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-431", +- "self_type" : "type-3626", ++ "referenced_type" : "type-429", ++ "self_type" : "type-3619", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -27968,8 +29380,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-252", +- "self_type" : "type-254", ++ "referenced_type" : "type-251", ++ "self_type" : "type-253", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -27978,8 +29390,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-430", +- "self_type" : "type-3622", ++ "referenced_type" : "type-428", ++ "self_type" : "type-3615", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -27988,8 +29400,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-2409", +- "self_type" : "type-2412", ++ "referenced_type" : "type-2404", ++ "self_type" : "type-2407", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -27998,8 +29410,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-428", +- "self_type" : "type-3829", ++ "referenced_type" : "type-426", ++ "self_type" : "type-3822", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -28008,8 +29420,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector >", + "name" : "const android::Vector >", +- "referenced_type" : "type-2516", +- "self_type" : "type-2518", ++ "referenced_type" : "type-2511", ++ "self_type" : "type-2513", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -28018,8 +29430,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-2512", +- "self_type" : "type-2513", ++ "referenced_type" : "type-2507", ++ "self_type" : "type-2508", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -28028,8 +29440,8 @@ + "is_const" : true, + "linker_set_key" : "const android::VectorImpl", + "name" : "const android::VectorImpl", +- "referenced_type" : "type-244", +- "self_type" : "type-249", ++ "referenced_type" : "type-243", ++ "self_type" : "type-248", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/VectorImpl.h" + }, +@@ -28038,8 +29450,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BHwBinder", + "name" : "const android::hardware::BHwBinder", +- "referenced_type" : "type-2333", +- "self_type" : "type-2360", ++ "referenced_type" : "type-2328", ++ "self_type" : "type-2355", + "size" : 28, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -28048,8 +29460,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BpHwBinder", + "name" : "const android::hardware::BpHwBinder", +- "referenced_type" : "type-2336", +- "self_type" : "type-2371", ++ "referenced_type" : "type-2331", ++ "self_type" : "type-2366", + "size" : 60, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -28058,8 +29470,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BpHwBinder::Obituary", + "name" : "const android::hardware::BpHwBinder::Obituary", +- "referenced_type" : "type-2373", +- "self_type" : "type-2390", ++ "referenced_type" : "type-2368", ++ "self_type" : "type-2385", + "size" : 16, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -28068,8 +29480,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager", + "name" : "const android::hardware::BpHwBinder::ObjectManager", +- "referenced_type" : "type-2340", +- "self_type" : "type-2424", ++ "referenced_type" : "type-2335", ++ "self_type" : "type-2419", + "size" : 20, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -28078,8 +29490,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t", + "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t", +- "referenced_type" : "type-2344", +- "self_type" : "type-2397", ++ "referenced_type" : "type-2339", ++ "self_type" : "type-2392", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -28088,8 +29500,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BpHwRefBase", + "name" : "const android::hardware::BpHwRefBase", +- "referenced_type" : "type-2364", +- "self_type" : "type-2369", ++ "referenced_type" : "type-2359", ++ "self_type" : "type-2364", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -28098,8 +29510,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BufferedTextOutput", + "name" : "const android::hardware::BufferedTextOutput", +- "referenced_type" : "type-2504", +- "self_type" : "type-2508", ++ "referenced_type" : "type-2499", ++ "self_type" : "type-2503", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -28109,7 +29521,7 @@ + "linker_set_key" : "const android::hardware::ConcurrentMap, android::hardware::details::SchedPrio>", + "name" : "const android::hardware::ConcurrentMap, android::hardware::details::SchedPrio>", + "referenced_type" : "type-29", +- "self_type" : "type-1051", ++ "self_type" : "type-1048", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -28118,8 +29530,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ConcurrentMap, bool>", + "name" : "const android::hardware::ConcurrentMap, bool>", +- "referenced_type" : "type-41", +- "self_type" : "type-1053", ++ "referenced_type" : "type-40", ++ "self_type" : "type-1050", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -28128,7 +29540,7 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ConcurrentMap >", + "name" : "const android::hardware::ConcurrentMap >", +- "referenced_type" : "type-378", ++ "referenced_type" : "type-377", + "self_type" : "type-393", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" +@@ -28138,8 +29550,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "name" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", +- "referenced_type" : "type-635", +- "self_type" : "type-644", ++ "referenced_type" : "type-633", ++ "self_type" : "type-642", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -28148,8 +29560,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "name" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", +- "referenced_type" : "type-398", +- "self_type" : "type-407", ++ "referenced_type" : "type-396", ++ "self_type" : "type-404", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -28158,8 +29570,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::HexDump", + "name" : "const android::hardware::HexDump", +- "referenced_type" : "type-2484", +- "self_type" : "type-2487", ++ "referenced_type" : "type-2479", ++ "self_type" : "type-2482", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -28168,8 +29580,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder", + "name" : "const android::hardware::IBinder", +- "referenced_type" : "type-1444", +- "self_type" : "type-1443", ++ "referenced_type" : "type-1440", ++ "self_type" : "type-1439", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28178,8 +29590,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder", + "name" : "const android::hardware::IBinder", +- "referenced_type" : "type-2328", +- "self_type" : "type-2330", ++ "referenced_type" : "type-2323", ++ "self_type" : "type-2325", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, +@@ -28188,8 +29600,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder", + "name" : "const android::hardware::IBinder", +- "referenced_type" : "type-2642", +- "self_type" : "type-2641", ++ "referenced_type" : "type-2636", ++ "self_type" : "type-2635", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28198,8 +29610,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder", + "name" : "const android::hardware::IBinder", +- "referenced_type" : "type-3985", +- "self_type" : "type-3984", ++ "referenced_type" : "type-3977", ++ "self_type" : "type-3976", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28208,8 +29620,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder", + "name" : "const android::hardware::IBinder", +- "referenced_type" : "type-489", +- "self_type" : "type-488", ++ "referenced_type" : "type-487", ++ "self_type" : "type-486", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28218,8 +29630,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder::DeathRecipient", + "name" : "const android::hardware::IBinder::DeathRecipient", +- "referenced_type" : "type-2378", +- "self_type" : "type-2419", ++ "referenced_type" : "type-2373", ++ "self_type" : "type-2414", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -28228,8 +29640,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IInterface", + "name" : "const android::hardware::IInterface", +- "referenced_type" : "type-2374", +- "self_type" : "type-2550", ++ "referenced_type" : "type-2369", ++ "self_type" : "type-2545", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28238,8 +29650,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IPCThreadState", + "name" : "const android::hardware::IPCThreadState", +- "referenced_type" : "type-2433", +- "self_type" : "type-3637", ++ "referenced_type" : "type-2428", ++ "self_type" : "type-3630", + "size" : 272, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -28248,8 +29660,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1039", +- "self_type" : "type-1038", ++ "referenced_type" : "type-1036", ++ "self_type" : "type-1035", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28258,8 +29670,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1127", +- "self_type" : "type-1126", ++ "referenced_type" : "type-1124", ++ "self_type" : "type-1123", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -28268,8 +29680,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1188", +- "self_type" : "type-1187", ++ "referenced_type" : "type-1185", ++ "self_type" : "type-1184", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -28278,8 +29690,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1254", +- "self_type" : "type-1253", ++ "referenced_type" : "type-1251", ++ "self_type" : "type-1250", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -28288,8 +29700,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1308", +- "self_type" : "type-1307", ++ "referenced_type" : "type-1305", ++ "self_type" : "type-1304", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28298,8 +29710,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1371", +- "self_type" : "type-1370", ++ "referenced_type" : "type-1368", ++ "self_type" : "type-1367", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28308,8 +29720,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1965", +- "self_type" : "type-1964", ++ "referenced_type" : "type-1960", ++ "self_type" : "type-1959", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28318,8 +29730,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2049", +- "self_type" : "type-2048", ++ "referenced_type" : "type-2044", ++ "self_type" : "type-2043", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -28328,8 +29740,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2108", +- "self_type" : "type-2107", ++ "referenced_type" : "type-2103", ++ "self_type" : "type-2102", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -28338,8 +29750,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2173", +- "self_type" : "type-2172", ++ "referenced_type" : "type-2168", ++ "self_type" : "type-2167", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -28348,8 +29760,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2225", +- "self_type" : "type-2224", ++ "referenced_type" : "type-2220", ++ "self_type" : "type-2219", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28358,8 +29770,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2279", +- "self_type" : "type-2278", ++ "referenced_type" : "type-2274", ++ "self_type" : "type-2273", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -28368,8 +29780,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2348", +- "self_type" : "type-2353", ++ "referenced_type" : "type-2343", ++ "self_type" : "type-2348", + "size" : 68, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -28378,8 +29790,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2570", +- "self_type" : "type-2569", ++ "referenced_type" : "type-2565", ++ "self_type" : "type-2564", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28388,8 +29800,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3103", +- "self_type" : "type-3102", ++ "referenced_type" : "type-3096", ++ "self_type" : "type-3095", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28398,8 +29810,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3183", +- "self_type" : "type-3182", ++ "referenced_type" : "type-3176", ++ "self_type" : "type-3175", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -28408,8 +29820,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3250", +- "self_type" : "type-3249", ++ "referenced_type" : "type-3243", ++ "self_type" : "type-3242", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -28418,8 +29830,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3308", +- "self_type" : "type-3307", ++ "referenced_type" : "type-3300", ++ "self_type" : "type-3299", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -28428,8 +29840,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3353", +- "self_type" : "type-3352", ++ "referenced_type" : "type-3346", ++ "self_type" : "type-3345", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28438,8 +29850,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3409", +- "self_type" : "type-3408", ++ "referenced_type" : "type-3398", ++ "self_type" : "type-3397", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -28448,8 +29860,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-369", +- "self_type" : "type-368", ++ "referenced_type" : "type-368", ++ "self_type" : "type-367", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28458,8 +29870,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3914", +- "self_type" : "type-3913", ++ "referenced_type" : "type-3907", ++ "self_type" : "type-3906", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28468,8 +29880,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ProcessState", + "name" : "const android::hardware::ProcessState", +- "referenced_type" : "type-2438", +- "self_type" : "type-3844", ++ "referenced_type" : "type-2433", ++ "self_type" : "type-3837", + "size" : 128, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28478,8 +29890,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ProcessState::handle_entry", + "name" : "const android::hardware::ProcessState::handle_entry", +- "referenced_type" : "type-2415", +- "self_type" : "type-3810", ++ "referenced_type" : "type-2410", ++ "self_type" : "type-3802", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -28488,8 +29900,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return", + "name" : "const android::hardware::Return", +- "referenced_type" : "type-807", +- "self_type" : "type-811", ++ "referenced_type" : "type-804", ++ "self_type" : "type-808", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28498,8 +29910,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-801", +- "self_type" : "type-805", ++ "referenced_type" : "type-798", ++ "self_type" : "type-802", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28508,8 +29920,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-986", +- "self_type" : "type-990", ++ "referenced_type" : "type-983", ++ "self_type" : "type-987", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28518,8 +29930,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-1093", +- "self_type" : "type-1097", ++ "referenced_type" : "type-1090", ++ "self_type" : "type-1094", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28528,8 +29940,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-1153", +- "self_type" : "type-1157", ++ "referenced_type" : "type-1150", ++ "self_type" : "type-1154", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28538,8 +29950,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-1213", +- "self_type" : "type-1217", ++ "referenced_type" : "type-1210", ++ "self_type" : "type-1214", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28548,8 +29960,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-1284", +- "self_type" : "type-1288", ++ "referenced_type" : "type-1281", ++ "self_type" : "type-1285", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28558,8 +29970,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return", + "name" : "const android::hardware::Return", +- "referenced_type" : "type-309", +- "self_type" : "type-506", ++ "referenced_type" : "type-308", ++ "self_type" : "type-504", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28568,8 +29980,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return", + "name" : "const android::hardware::Return", +- "referenced_type" : "type-102", +- "self_type" : "type-101", ++ "referenced_type" : "type-101", ++ "self_type" : "type-100", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28578,8 +29990,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Status", + "name" : "const android::hardware::Status", +- "referenced_type" : "type-104", +- "self_type" : "type-167", ++ "referenced_type" : "type-103", ++ "self_type" : "type-166", + "size" : 20, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28588,8 +30000,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::TypeCode", + "name" : "const android::hardware::TypeCode", +- "referenced_type" : "type-2480", +- "self_type" : "type-2482", ++ "referenced_type" : "type-2475", ++ "self_type" : "type-2477", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -28599,7 +30011,7 @@ + "linker_set_key" : "const android::hardware::details::SchedPrio", + "name" : "const android::hardware::details::SchedPrio", + "referenced_type" : "type-37", +- "self_type" : "type-1050", ++ "self_type" : "type-1047", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -28608,8 +30020,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::Waiter", + "name" : "const android::hardware::details::Waiter", +- "referenced_type" : "type-1772", +- "self_type" : "type-1771", ++ "referenced_type" : "type-1767", ++ "self_type" : "type-1766", + "size" : 52, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28618,8 +30030,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::Waiter", + "name" : "const android::hardware::details::Waiter", +- "referenced_type" : "type-2917", +- "self_type" : "type-2916", ++ "referenced_type" : "type-2909", ++ "self_type" : "type-2908", + "size" : 52, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28628,8 +30040,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::Waiter", + "name" : "const android::hardware::details::Waiter", +- "referenced_type" : "type-797", +- "self_type" : "type-796", ++ "referenced_type" : "type-794", ++ "self_type" : "type-793", + "size" : 52, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28638,8 +30050,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::hidl_pointer >", + "name" : "const android::hardware::details::hidl_pointer >", +- "referenced_type" : "type-1009", +- "self_type" : "type-1076", ++ "referenced_type" : "type-1006", ++ "self_type" : "type-1072", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28648,8 +30060,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::hidl_pointer", + "name" : "const android::hardware::details::hidl_pointer", +- "referenced_type" : "type-620", +- "self_type" : "type-654", ++ "referenced_type" : "type-618", ++ "self_type" : "type-652", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28658,8 +30070,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::hidl_pointer", + "name" : "const android::hardware::details::hidl_pointer", +- "referenced_type" : "type-835", +- "self_type" : "type-853", ++ "referenced_type" : "type-832", ++ "self_type" : "type-850", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28668,8 +30080,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::hidl_pointer", + "name" : "const android::hardware::details::hidl_pointer", +- "referenced_type" : "type-97", +- "self_type" : "type-152", ++ "referenced_type" : "type-96", ++ "self_type" : "type-151", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28688,8 +30100,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::hidl_pointer", + "name" : "const android::hardware::details::hidl_pointer", +- "referenced_type" : "type-519", +- "self_type" : "type-537", ++ "referenced_type" : "type-517", ++ "self_type" : "type-535", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28698,8 +30110,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::return_status", + "name" : "const android::hardware::details::return_status", +- "referenced_type" : "type-103", +- "self_type" : "type-174", ++ "referenced_type" : "type-102", ++ "self_type" : "type-173", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28708,8 +30120,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_array", + "name" : "const android::hardware::hidl_array", +- "referenced_type" : "type-1012", +- "self_type" : "type-2268", ++ "referenced_type" : "type-1009", ++ "self_type" : "type-2263", + "size" : 32, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28718,8 +30130,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_death_recipient", + "name" : "const android::hardware::hidl_death_recipient", +- "referenced_type" : "type-144", +- "self_type" : "type-478", ++ "referenced_type" : "type-143", ++ "self_type" : "type-476", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28728,8 +30140,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_handle", + "name" : "const android::hardware::hidl_handle", +- "referenced_type" : "type-77", +- "self_type" : "type-79", ++ "referenced_type" : "type-76", ++ "self_type" : "type-78", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28738,8 +30150,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_memory", + "name" : "const android::hardware::hidl_memory", +- "referenced_type" : "type-121", +- "self_type" : "type-123", ++ "referenced_type" : "type-120", ++ "self_type" : "type-122", + "size" : 40, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28748,8 +30160,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_string", + "name" : "const android::hardware::hidl_string", +- "referenced_type" : "type-96", +- "self_type" : "type-110", ++ "referenced_type" : "type-95", ++ "self_type" : "type-109", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28758,8 +30170,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_vec >", + "name" : "const android::hardware::hidl_vec >", +- "referenced_type" : "type-1008", +- "self_type" : "type-2270", ++ "referenced_type" : "type-1005", ++ "self_type" : "type-2264", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28768,8 +30180,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_vec", + "name" : "const android::hardware::hidl_vec", +- "referenced_type" : "type-619", +- "self_type" : "type-622", ++ "referenced_type" : "type-617", ++ "self_type" : "type-620", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28778,8 +30190,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_vec", + "name" : "const android::hardware::hidl_vec", +- "referenced_type" : "type-834", +- "self_type" : "type-1022", ++ "referenced_type" : "type-831", ++ "self_type" : "type-1019", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28788,8 +30200,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_vec::iter", + "name" : "const android::hardware::hidl_vec::iter", +- "referenced_type" : "type-625", +- "self_type" : "type-629", ++ "referenced_type" : "type-622", ++ "self_type" : "type-627", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28798,8 +30210,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_vec", + "name" : "const android::hardware::hidl_vec", +- "referenced_type" : "type-518", +- "self_type" : "type-523", ++ "referenced_type" : "type-516", ++ "self_type" : "type-521", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28808,8 +30220,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_version", + "name" : "const android::hardware::hidl_version", +- "referenced_type" : "type-131", +- "self_type" : "type-135", ++ "referenced_type" : "type-130", ++ "self_type" : "type-134", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28818,8 +30230,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase", + "name" : "const android::hidl::base::V1_0::BpHwBase", +- "referenced_type" : "type-419", +- "self_type" : "type-423", ++ "referenced_type" : "type-417", ++ "self_type" : "type-421", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, +@@ -28828,8 +30240,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::base::V1_0::DebugInfo::Architecture", + "name" : "const android::hidl::base::V1_0::DebugInfo::Architecture", +- "referenced_type" : "type-336", +- "self_type" : "type-338", ++ "referenced_type" : "type-335", ++ "self_type" : "type-337", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -28839,7 +30251,7 @@ + "linker_set_key" : "const android::hidl::base::V1_0::IBase", + "name" : "const android::hidl::base::V1_0::IBase", + "referenced_type" : "type-34", +- "self_type" : "type-382", ++ "self_type" : "type-381", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -28848,8 +30260,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::base::V1_0::IBase *const", + "name" : "const android::hidl::base::V1_0::IBase *const", +- "referenced_type" : "type-381", +- "self_type" : "type-396", ++ "referenced_type" : "type-380", ++ "self_type" : "type-390", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -28858,8 +30270,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceManager", + "name" : "const android::hidl::manager::V1_0::BpHwServiceManager", +- "referenced_type" : "type-873", +- "self_type" : "type-877", ++ "referenced_type" : "type-870", ++ "self_type" : "type-874", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, +@@ -28868,8 +30280,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceNotification", + "name" : "const android::hidl::manager::V1_0::BpHwServiceNotification", +- "referenced_type" : "type-864", +- "self_type" : "type-869", ++ "referenced_type" : "type-861", ++ "self_type" : "type-866", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, +@@ -28878,8 +30290,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager", + "name" : "const android::hidl::manager::V1_0::IServiceManager", +- "referenced_type" : "type-552", +- "self_type" : "type-551", ++ "referenced_type" : "type-548", ++ "self_type" : "type-547", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -28888,8 +30300,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo", + "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo", +- "referenced_type" : "type-548", +- "self_type" : "type-1021", ++ "referenced_type" : "type-546", ++ "self_type" : "type-1018", + "size" : 64, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28898,8 +30310,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::PidConstant", + "name" : "const android::hidl::manager::V1_0::IServiceManager::PidConstant", +- "referenced_type" : "type-547", +- "self_type" : "type-556", ++ "referenced_type" : "type-545", ++ "self_type" : "type-554", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -28908,8 +30320,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::Transport", + "name" : "const android::hidl::manager::V1_0::IServiceManager::Transport", +- "referenced_type" : "type-546", +- "self_type" : "type-554", ++ "referenced_type" : "type-544", ++ "self_type" : "type-552", + "size" : 1, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -28918,8 +30330,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification", + "name" : "const android::hidl::manager::V1_0::IServiceNotification", +- "referenced_type" : "type-541", +- "self_type" : "type-540", ++ "referenced_type" : "type-539", ++ "self_type" : "type-538", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, +@@ -28928,8 +30340,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_1::BpHwServiceManager", + "name" : "const android::hidl::manager::V1_1::BpHwServiceManager", +- "referenced_type" : "type-881", +- "self_type" : "type-885", ++ "referenced_type" : "type-878", ++ "self_type" : "type-882", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, +@@ -28938,8 +30350,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_1::IServiceManager", + "name" : "const android::hidl::manager::V1_1::IServiceManager", +- "referenced_type" : "type-562", +- "self_type" : "type-561", ++ "referenced_type" : "type-560", ++ "self_type" : "type-559", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, +@@ -28948,8 +30360,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_2::BpHwClientCallback", + "name" : "const android::hidl::manager::V1_2::BpHwClientCallback", +- "referenced_type" : "type-890", +- "self_type" : "type-894", ++ "referenced_type" : "type-887", ++ "self_type" : "type-891", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, +@@ -28958,8 +30370,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_2::BpHwServiceManager", + "name" : "const android::hidl::manager::V1_2::BpHwServiceManager", +- "referenced_type" : "type-774", +- "self_type" : "type-898", ++ "referenced_type" : "type-770", ++ "self_type" : "type-894", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, +@@ -28968,8 +30380,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_2::IClientCallback", + "name" : "const android::hidl::manager::V1_2::IClientCallback", +- "referenced_type" : "type-544", +- "self_type" : "type-543", ++ "referenced_type" : "type-542", ++ "self_type" : "type-541", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, +@@ -28978,8 +30390,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager", + "name" : "const android::hidl::manager::V1_2::IServiceManager", +- "referenced_type" : "type-565", +- "self_type" : "type-564", ++ "referenced_type" : "type-563", ++ "self_type" : "type-562", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, +@@ -28988,8 +30400,8 @@ + "is_const" : true, + "linker_set_key" : "const android::key_value_pair_t >", + "name" : "const android::key_value_pair_t >", +- "referenced_type" : "type-3805", +- "self_type" : "type-3804", ++ "referenced_type" : "type-3798", ++ "self_type" : "type-3797", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -28998,8 +30410,8 @@ + "is_const" : true, + "linker_set_key" : "const android::key_value_pair_t", + "name" : "const android::key_value_pair_t", +- "referenced_type" : "type-2383", +- "self_type" : "type-2382", ++ "referenced_type" : "type-2378", ++ "self_type" : "type-2377", + "size" : 16, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -29008,8 +30420,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-499", +- "self_type" : "type-3828", ++ "referenced_type" : "type-497", ++ "self_type" : "type-3821", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29018,8 +30430,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-472", +- "self_type" : "type-3638", ++ "referenced_type" : "type-470", ++ "self_type" : "type-3631", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29028,8 +30440,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-2468", +- "self_type" : "type-2496", ++ "referenced_type" : "type-2463", ++ "self_type" : "type-2491", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -29038,8 +30450,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-157", +- "self_type" : "type-162", ++ "referenced_type" : "type-156", ++ "self_type" : "type-161", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29047,16 +30459,16 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-2356", +- "self_type" : "type-2355", ++ "referenced_type" : "type-2351", ++ "self_type" : "type-2350", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-3466", +- "self_type" : "type-3465", ++ "referenced_type" : "type-3459", ++ "self_type" : "type-3458", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -29064,8 +30476,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-962", +- "self_type" : "type-2404", ++ "referenced_type" : "type-959", ++ "self_type" : "type-2399", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -29073,32 +30485,32 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-2523", +- "self_type" : "type-2522", ++ "referenced_type" : "type-2516", ++ "self_type" : "type-2515", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-2537", +- "self_type" : "type-2536", ++ "referenced_type" : "type-2532", ++ "self_type" : "type-2531", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-3582", +- "self_type" : "type-3581", ++ "referenced_type" : "type-3575", ++ "self_type" : "type-3574", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-3591", +- "self_type" : "type-3590", ++ "referenced_type" : "type-3584", ++ "self_type" : "type-3583", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -29106,8 +30518,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-71", +- "self_type" : "type-70", ++ "referenced_type" : "type-70", ++ "self_type" : "type-69", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29116,8 +30528,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-968", +- "self_type" : "type-2545", ++ "referenced_type" : "type-965", ++ "self_type" : "type-2540", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29126,8 +30538,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-766", +- "self_type" : "type-765", ++ "referenced_type" : "type-763", ++ "self_type" : "type-762", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29136,8 +30548,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-491", +- "self_type" : "type-496", ++ "referenced_type" : "type-489", ++ "self_type" : "type-494", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29146,8 +30558,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-602", +- "self_type" : "type-606", ++ "referenced_type" : "type-600", ++ "self_type" : "type-604", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29156,8 +30568,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-789", +- "self_type" : "type-794", ++ "referenced_type" : "type-786", ++ "self_type" : "type-790", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29166,8 +30578,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-951", +- "self_type" : "type-950", ++ "referenced_type" : "type-948", ++ "self_type" : "type-947", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -29176,8 +30588,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-142", +- "self_type" : "type-141", ++ "referenced_type" : "type-141", ++ "self_type" : "type-140", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29186,8 +30598,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-356", +- "self_type" : "type-459", ++ "referenced_type" : "type-355", ++ "self_type" : "type-456", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -29196,8 +30608,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-575", +- "self_type" : "type-578", ++ "referenced_type" : "type-573", ++ "self_type" : "type-576", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29206,8 +30618,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-590", +- "self_type" : "type-593", ++ "referenced_type" : "type-588", ++ "self_type" : "type-591", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29216,8 +30628,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-580", +- "self_type" : "type-583", ++ "referenced_type" : "type-578", ++ "self_type" : "type-581", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29226,8 +30638,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-595", +- "self_type" : "type-600", ++ "referenced_type" : "type-593", ++ "self_type" : "type-598", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29236,8 +30648,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-585", +- "self_type" : "type-588", ++ "referenced_type" : "type-583", ++ "self_type" : "type-586", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29246,8 +30658,8 @@ + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-383", +- "self_type" : "type-469", ++ "referenced_type" : "type-382", ++ "self_type" : "type-467", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -29256,8 +30668,8 @@ + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-944", +- "self_type" : "type-2358", ++ "referenced_type" : "type-941", ++ "self_type" : "type-2353", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -29265,8 +30677,8 @@ + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-1368", +- "self_type" : "type-1367", ++ "referenced_type" : "type-1365", ++ "self_type" : "type-1364", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -29274,8 +30686,8 @@ + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-2381", +- "self_type" : "type-3749", ++ "referenced_type" : "type-2376", ++ "self_type" : "type-3742", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -29283,24 +30695,24 @@ + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-2567", +- "self_type" : "type-2566", ++ "referenced_type" : "type-2562", ++ "self_type" : "type-2561", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-366", +- "self_type" : "type-365", ++ "referenced_type" : "type-365", ++ "self_type" : "type-364", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-3911", +- "self_type" : "type-3910", ++ "referenced_type" : "type-3904", ++ "self_type" : "type-3903", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -29308,8 +30720,8 @@ + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-361", +- "self_type" : "type-464", ++ "referenced_type" : "type-360", ++ "self_type" : "type-462", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -29319,7 +30731,7 @@ + "linker_set_key" : "const android::wp", + "name" : "const android::wp", + "referenced_type" : "type-32", +- "self_type" : "type-64", ++ "self_type" : "type-63", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -29328,8 +30740,8 @@ + "is_const" : true, + "linker_set_key" : "const binder_buffer_object", + "name" : "const binder_buffer_object", +- "referenced_type" : "type-3784", +- "self_type" : "type-3783", ++ "referenced_type" : "type-3777", ++ "self_type" : "type-3776", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -29338,8 +30750,8 @@ + "is_const" : true, + "linker_set_key" : "const bool", + "name" : "const bool", +- "referenced_type" : "type-44", +- "self_type" : "type-502", ++ "referenced_type" : "type-43", ++ "self_type" : "type-500", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -29348,8 +30760,8 @@ + "is_const" : true, + "linker_set_key" : "const char", + "name" : "const char", +- "referenced_type" : "type-48", +- "self_type" : "type-100", ++ "referenced_type" : "type-47", ++ "self_type" : "type-99", + "size" : 1, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -29358,8 +30770,8 @@ + "is_const" : true, + "linker_set_key" : "const char *const", + "name" : "const char *const", +- "referenced_type" : "type-99", +- "self_type" : "type-2476", ++ "referenced_type" : "type-98", ++ "self_type" : "type-2471", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -29368,8 +30780,8 @@ + "is_const" : true, + "linker_set_key" : "const char16_t", + "name" : "const char16_t", +- "referenced_type" : "type-345", +- "self_type" : "type-344", ++ "referenced_type" : "type-344", ++ "self_type" : "type-343", + "size" : 2, + "source_file" : "/system/core/libutils/include/utils/String16.h" + }, +@@ -29378,8 +30790,8 @@ + "is_const" : true, + "linker_set_key" : "const dirent", + "name" : "const dirent", +- "referenced_type" : "type-1291", +- "self_type" : "type-1290", ++ "referenced_type" : "type-1288", ++ "self_type" : "type-1287", + "size" : 280, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -29388,8 +30800,8 @@ + "is_const" : true, + "linker_set_key" : "const dirent", + "name" : "const dirent", +- "referenced_type" : "type-2208", +- "self_type" : "type-2207", ++ "referenced_type" : "type-2203", ++ "self_type" : "type-2202", + "size" : 280, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -29398,8 +30810,8 @@ + "is_const" : true, + "linker_set_key" : "const dirent", + "name" : "const dirent", +- "referenced_type" : "type-263", +- "self_type" : "type-262", ++ "referenced_type" : "type-262", ++ "self_type" : "type-261", + "size" : 280, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -29408,8 +30820,8 @@ + "is_const" : true, + "linker_set_key" : "const dirent", + "name" : "const dirent", +- "referenced_type" : "type-3210", +- "self_type" : "type-3209", ++ "referenced_type" : "type-3203", ++ "self_type" : "type-3202", + "size" : 280, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -29418,8 +30830,8 @@ + "is_const" : true, + "linker_set_key" : "const dirent", + "name" : "const dirent", +- "referenced_type" : "type-3325", +- "self_type" : "type-3324", ++ "referenced_type" : "type-3318", ++ "self_type" : "type-3317", + "size" : 280, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -29438,8 +30850,8 @@ + "is_const" : true, + "linker_set_key" : "const flat_binder_object", + "name" : "const flat_binder_object", +- "referenced_type" : "type-3768", +- "self_type" : "type-3767", ++ "referenced_type" : "type-3761", ++ "self_type" : "type-3760", + "size" : 16, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -29448,8 +30860,8 @@ + "is_const" : true, + "linker_set_key" : "const float", + "name" : "const float", +- "referenced_type" : "type-298", +- "self_type" : "type-665", ++ "referenced_type" : "type-297", ++ "self_type" : "type-663", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -29467,400 +30879,400 @@ + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1001", +- "self_type" : "type-1000", ++ "referenced_type" : "type-1100", ++ "self_type" : "type-1099", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1103", +- "self_type" : "type-1102", ++ "referenced_type" : "type-1160", ++ "self_type" : "type-1159", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1163", +- "self_type" : "type-1162", ++ "referenced_type" : "type-11", ++ "self_type" : "type-10", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-11", +- "self_type" : "type-10", ++ "referenced_type" : "type-1221", ++ "self_type" : "type-1220", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1224", +- "self_type" : "type-1223", ++ "referenced_type" : "type-128", ++ "self_type" : "type-127", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1298", +- "self_type" : "type-1297", ++ "referenced_type" : "type-1295", ++ "self_type" : "type-1294", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-129", +- "self_type" : "type-128", ++ "referenced_type" : "type-1348", ++ "self_type" : "type-1347", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1351", +- "self_type" : "type-1350", ++ "referenced_type" : "type-1454", ++ "self_type" : "type-1453", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1458", +- "self_type" : "type-1457", ++ "referenced_type" : "type-1523", ++ "self_type" : "type-1522", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1528", +- "self_type" : "type-1527", ++ "referenced_type" : "type-1690", ++ "self_type" : "type-1689", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1694", +- "self_type" : "type-1693", ++ "referenced_type" : "type-1728", ++ "self_type" : "type-1727", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1733", +- "self_type" : "type-1732", ++ "referenced_type" : "type-1793", ++ "self_type" : "type-1792", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1798", +- "self_type" : "type-1797", ++ "referenced_type" : "type-1819", ++ "self_type" : "type-1818", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1824", +- "self_type" : "type-1823", ++ "referenced_type" : "type-1862", ++ "self_type" : "type-1861", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1867", +- "self_type" : "type-1866", ++ "referenced_type" : "type-1934", ++ "self_type" : "type-1933", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1939", +- "self_type" : "type-1938", ++ "referenced_type" : "type-2020", ++ "self_type" : "type-2019", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2025", +- "self_type" : "type-2024", ++ "referenced_type" : "type-2078", ++ "self_type" : "type-2077", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2083", +- "self_type" : "type-2082", ++ "referenced_type" : "type-2137", ++ "self_type" : "type-2136", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2142", +- "self_type" : "type-2141", ++ "referenced_type" : "type-2210", ++ "self_type" : "type-2209", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2215", +- "self_type" : "type-2214", ++ "referenced_type" : "type-2256", ++ "self_type" : "type-2255", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2261", +- "self_type" : "type-2260", ++ "referenced_type" : "type-2307", ++ "self_type" : "type-2306", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2312", +- "self_type" : "type-2311", ++ "referenced_type" : "type-2542", ++ "self_type" : "type-2541", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2547", +- "self_type" : "type-2546", ++ "referenced_type" : "type-2649", ++ "self_type" : "type-2648", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2655", +- "self_type" : "type-2654", ++ "referenced_type" : "type-2718", ++ "self_type" : "type-2717", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2725", +- "self_type" : "type-2724", ++ "referenced_type" : "type-2830", ++ "self_type" : "type-2829", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2837", +- "self_type" : "type-2836", ++ "referenced_type" : "type-2868", ++ "self_type" : "type-2867", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2875", +- "self_type" : "type-2874", ++ "referenced_type" : "type-2926", ++ "self_type" : "type-2925", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2933", +- "self_type" : "type-2932", ++ "referenced_type" : "type-2934", ++ "self_type" : "type-2933", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2941", +- "self_type" : "type-2940", ++ "referenced_type" : "type-3003", ++ "self_type" : "type-3002", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3010", +- "self_type" : "type-3009", ++ "referenced_type" : "type-3075", ++ "self_type" : "type-3074", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3082", +- "self_type" : "type-3081", ++ "referenced_type" : "type-3154", ++ "self_type" : "type-3153", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3161", +- "self_type" : "type-3160", ++ "referenced_type" : "type-3221", ++ "self_type" : "type-3220", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3228", +- "self_type" : "type-3227", ++ "referenced_type" : "type-3276", ++ "self_type" : "type-3275", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3283", +- "self_type" : "type-3282", ++ "referenced_type" : "type-327", ++ "self_type" : "type-326", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-328", +- "self_type" : "type-327", ++ "referenced_type" : "type-3326", ++ "self_type" : "type-3325", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3333", +- "self_type" : "type-3332", ++ "referenced_type" : "type-3337", ++ "self_type" : "type-3336", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3344", +- "self_type" : "type-3343", ++ "referenced_type" : "type-3383", ++ "self_type" : "type-3382", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3390", +- "self_type" : "type-3389", ++ "referenced_type" : "type-3427", ++ "self_type" : "type-3426", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3434", +- "self_type" : "type-3433", ++ "referenced_type" : "type-3886", ++ "self_type" : "type-3885", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3893", +- "self_type" : "type-3892", ++ "referenced_type" : "type-3995", ++ "self_type" : "type-3994", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-4003", +- "self_type" : "type-4002", ++ "referenced_type" : "type-4069", ++ "self_type" : "type-4068", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-4077", +- "self_type" : "type-4076", ++ "referenced_type" : "type-514", ++ "self_type" : "type-513", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-516", +- "self_type" : "type-515", ++ "referenced_type" : "type-614", ++ "self_type" : "type-613", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-617", +- "self_type" : "type-616", ++ "referenced_type" : "type-709", ++ "self_type" : "type-708", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-711", +- "self_type" : "type-710", ++ "referenced_type" : "type-747", ++ "self_type" : "type-746", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-750", +- "self_type" : "type-749", ++ "referenced_type" : "type-822", ++ "self_type" : "type-821", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-825", +- "self_type" : "type-824", ++ "referenced_type" : "type-84", ++ "self_type" : "type-83", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-855", +- "self_type" : "type-854", ++ "referenced_type" : "type-852", ++ "self_type" : "type-851", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-85", +- "self_type" : "type-84", ++ "referenced_type" : "type-915", ++ "self_type" : "type-914", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-918", +- "self_type" : "type-917", ++ "referenced_type" : "type-998", ++ "self_type" : "type-997", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -29868,8 +31280,8 @@ + "is_const" : true, + "linker_set_key" : "const log_msg", + "name" : "const log_msg", +- "referenced_type" : "type-236", +- "self_type" : "type-239", ++ "referenced_type" : "type-235", ++ "self_type" : "type-238", + "size" : 5124, + "source_file" : "/system/core/liblog/include/log/log_read.h" + }, +@@ -29879,7 +31291,7 @@ + "linker_set_key" : "const long long", + "name" : "const long long", + "referenced_type" : "type-447", +- "self_type" : "type-653", ++ "self_type" : "type-651", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -29899,7 +31311,7 @@ + "linker_set_key" : "const short", + "name" : "const short", + "referenced_type" : "type-2", +- "self_type" : "type-609", ++ "self_type" : "type-607", + "size" : 2, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -29918,8 +31330,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1035", +- "self_type" : "type-1034", ++ "referenced_type" : "type-1032", ++ "self_type" : "type-1031", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29928,8 +31340,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1112", +- "self_type" : "type-1111", ++ "referenced_type" : "type-1107", ++ "self_type" : "type-1106", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29938,8 +31350,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1173", +- "self_type" : "type-1172", ++ "referenced_type" : "type-1170", ++ "self_type" : "type-1169", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29948,8 +31360,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1231", +- "self_type" : "type-1230", ++ "referenced_type" : "type-1228", ++ "self_type" : "type-1227", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29958,8 +31370,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1305", +- "self_type" : "type-1304", ++ "referenced_type" : "type-1302", ++ "self_type" : "type-1301", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29968,8 +31380,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1358", +- "self_type" : "type-1357", ++ "referenced_type" : "type-1355", ++ "self_type" : "type-1354", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29978,8 +31390,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1465", +- "self_type" : "type-1464", ++ "referenced_type" : "type-1461", ++ "self_type" : "type-1460", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29988,8 +31400,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1539", +- "self_type" : "type-1538", ++ "referenced_type" : "type-1535", ++ "self_type" : "type-1534", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29998,8 +31410,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1699", +- "self_type" : "type-1698", ++ "referenced_type" : "type-1695", ++ "self_type" : "type-1694", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30008,8 +31420,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1738", +- "self_type" : "type-1737", ++ "referenced_type" : "type-1733", ++ "self_type" : "type-1732", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30018,8 +31430,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1812", +- "self_type" : "type-1811", ++ "referenced_type" : "type-1807", ++ "self_type" : "type-1806", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30028,8 +31440,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1871", +- "self_type" : "type-1870", ++ "referenced_type" : "type-1866", ++ "self_type" : "type-1865", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30038,8 +31450,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1961", +- "self_type" : "type-1960", ++ "referenced_type" : "type-1956", ++ "self_type" : "type-1955", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30048,8 +31460,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2034", +- "self_type" : "type-2033", ++ "referenced_type" : "type-2027", ++ "self_type" : "type-2026", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30058,8 +31470,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2093", +- "self_type" : "type-2092", ++ "referenced_type" : "type-2088", ++ "self_type" : "type-2087", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30068,8 +31480,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2149", +- "self_type" : "type-2148", ++ "referenced_type" : "type-2144", ++ "self_type" : "type-2143", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30078,8 +31490,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2222", +- "self_type" : "type-2221", ++ "referenced_type" : "type-2217", ++ "self_type" : "type-2216", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30088,8 +31500,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2273", +- "self_type" : "type-2272", ++ "referenced_type" : "type-2268", ++ "self_type" : "type-2267", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30098,8 +31510,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2315", +- "self_type" : "type-2314", ++ "referenced_type" : "type-2310", ++ "self_type" : "type-2309", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30118,8 +31530,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2558", +- "self_type" : "type-2557", ++ "referenced_type" : "type-2553", ++ "self_type" : "type-2552", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30128,8 +31540,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2662", +- "self_type" : "type-2661", ++ "referenced_type" : "type-2656", ++ "self_type" : "type-2655", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30138,8 +31550,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2735", +- "self_type" : "type-2734", ++ "referenced_type" : "type-2729", ++ "self_type" : "type-2728", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30148,8 +31560,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2805", +- "self_type" : "type-2804", ++ "referenced_type" : "type-2799", ++ "self_type" : "type-2798", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30158,8 +31570,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2841", +- "self_type" : "type-2840", ++ "referenced_type" : "type-2834", ++ "self_type" : "type-2833", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30168,8 +31580,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2880", +- "self_type" : "type-2879", ++ "referenced_type" : "type-2873", ++ "self_type" : "type-2872", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30178,8 +31590,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2957", +- "self_type" : "type-2956", ++ "referenced_type" : "type-2949", ++ "self_type" : "type-2948", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30188,8 +31600,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3014", +- "self_type" : "type-3013", ++ "referenced_type" : "type-3007", ++ "self_type" : "type-3006", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30198,8 +31610,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3101", +- "self_type" : "type-3100", ++ "referenced_type" : "type-3094", ++ "self_type" : "type-3093", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30208,8 +31620,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3168", +- "self_type" : "type-3167", ++ "referenced_type" : "type-3161", ++ "self_type" : "type-3160", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30218,8 +31630,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3235", +- "self_type" : "type-3234", ++ "referenced_type" : "type-3228", ++ "self_type" : "type-3227", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30228,8 +31640,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3290", +- "self_type" : "type-3289", ++ "referenced_type" : "type-3283", ++ "self_type" : "type-3282", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30238,8 +31650,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3351", +- "self_type" : "type-3350", ++ "referenced_type" : "type-3344", ++ "self_type" : "type-3343", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30248,8 +31660,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3400", +- "self_type" : "type-3399", ++ "referenced_type" : "type-3393", ++ "self_type" : "type-3392", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30258,8 +31670,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-341", +- "self_type" : "type-340", ++ "referenced_type" : "type-340", ++ "self_type" : "type-339", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30268,8 +31680,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3437", +- "self_type" : "type-3436", ++ "referenced_type" : "type-3430", ++ "self_type" : "type-3429", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30278,8 +31690,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3900", +- "self_type" : "type-3899", ++ "referenced_type" : "type-3893", ++ "self_type" : "type-3892", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30288,8 +31700,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-4011", +- "self_type" : "type-4010", ++ "referenced_type" : "type-4003", ++ "self_type" : "type-4002", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30298,8 +31710,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-528", +- "self_type" : "type-527", ++ "referenced_type" : "type-526", ++ "self_type" : "type-525", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30308,8 +31720,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-634", +- "self_type" : "type-633", ++ "referenced_type" : "type-632", ++ "self_type" : "type-631", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30318,8 +31730,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-716", +- "self_type" : "type-715", ++ "referenced_type" : "type-714", ++ "self_type" : "type-713", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30328,8 +31740,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-755", +- "self_type" : "type-754", ++ "referenced_type" : "type-752", ++ "self_type" : "type-751", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30338,8 +31750,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-842", +- "self_type" : "type-841", ++ "referenced_type" : "type-839", ++ "self_type" : "type-838", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30348,8 +31760,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-90", +- "self_type" : "type-89", ++ "referenced_type" : "type-89", ++ "self_type" : "type-88", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30358,8 +31770,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-922", +- "self_type" : "type-921", ++ "referenced_type" : "type-919", ++ "self_type" : "type-918", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30368,8 +31780,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1069", +- "self_type" : "type-1068", ++ "referenced_type" : "type-1066", ++ "self_type" : "type-1065", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30378,8 +31790,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1125", +- "self_type" : "type-1124", ++ "referenced_type" : "type-1122", ++ "self_type" : "type-1121", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30388,8 +31800,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1186", +- "self_type" : "type-1185", ++ "referenced_type" : "type-1183", ++ "self_type" : "type-1182", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30398,8 +31810,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1249", +- "self_type" : "type-1248", ++ "referenced_type" : "type-1246", ++ "self_type" : "type-1245", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30408,8 +31820,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1324", +- "self_type" : "type-1323", ++ "referenced_type" : "type-1321", ++ "self_type" : "type-1320", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30418,8 +31830,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1486", +- "self_type" : "type-1485", ++ "referenced_type" : "type-1482", ++ "self_type" : "type-1481", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30428,8 +31840,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1714", +- "self_type" : "type-1713", ++ "referenced_type" : "type-1709", ++ "self_type" : "type-1708", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30438,8 +31850,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1829", +- "self_type" : "type-1828", ++ "referenced_type" : "type-1824", ++ "self_type" : "type-1823", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30448,8 +31860,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1881", +- "self_type" : "type-1880", ++ "referenced_type" : "type-1876", ++ "self_type" : "type-1875", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30458,8 +31870,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1993", +- "self_type" : "type-1992", ++ "referenced_type" : "type-1988", ++ "self_type" : "type-1987", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30468,8 +31880,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2047", +- "self_type" : "type-2046", ++ "referenced_type" : "type-2042", ++ "self_type" : "type-2041", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30478,8 +31890,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2106", +- "self_type" : "type-2105", ++ "referenced_type" : "type-2101", ++ "self_type" : "type-2100", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30488,8 +31900,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2168", +- "self_type" : "type-2167", ++ "referenced_type" : "type-2163", ++ "self_type" : "type-2162", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30498,8 +31910,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2241", +- "self_type" : "type-2240", ++ "referenced_type" : "type-2236", ++ "self_type" : "type-2235", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30508,8 +31920,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2295", +- "self_type" : "type-2294", ++ "referenced_type" : "type-2290", ++ "self_type" : "type-2289", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30518,8 +31930,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2683", +- "self_type" : "type-2682", ++ "referenced_type" : "type-2677", ++ "self_type" : "type-2676", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30528,8 +31940,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2858", +- "self_type" : "type-2857", ++ "referenced_type" : "type-2851", ++ "self_type" : "type-2850", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30538,8 +31950,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2971", +- "self_type" : "type-2970", ++ "referenced_type" : "type-2964", ++ "self_type" : "type-2963", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30548,8 +31960,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3024", +- "self_type" : "type-3023", ++ "referenced_type" : "type-3016", ++ "self_type" : "type-3015", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30558,8 +31970,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3128", +- "self_type" : "type-3127", ++ "referenced_type" : "type-3121", ++ "self_type" : "type-3120", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30568,8 +31980,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3181", +- "self_type" : "type-3180", ++ "referenced_type" : "type-3174", ++ "self_type" : "type-3173", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30578,8 +31990,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3248", +- "self_type" : "type-3247", ++ "referenced_type" : "type-3241", ++ "self_type" : "type-3240", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30588,8 +32000,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3305", +- "self_type" : "type-3304", ++ "referenced_type" : "type-3298", ++ "self_type" : "type-3297", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30598,8 +32010,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3373", +- "self_type" : "type-3372", ++ "referenced_type" : "type-3366", ++ "self_type" : "type-3365", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30608,8 +32020,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3423", +- "self_type" : "type-3422", ++ "referenced_type" : "type-3416", ++ "self_type" : "type-3415", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30618,8 +32030,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-4033", +- "self_type" : "type-4032", ++ "referenced_type" : "type-4025", ++ "self_type" : "type-4024", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30628,8 +32040,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-560", +- "self_type" : "type-559", ++ "referenced_type" : "type-558", ++ "self_type" : "type-557", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30638,8 +32050,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-57", +- "self_type" : "type-56", ++ "referenced_type" : "type-56", ++ "self_type" : "type-55", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30648,8 +32060,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-731", +- "self_type" : "type-730", ++ "referenced_type" : "type-728", ++ "self_type" : "type-727", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30658,8 +32070,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-860", +- "self_type" : "type-859", ++ "referenced_type" : "type-857", ++ "self_type" : "type-856", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30668,8 +32080,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-932", +- "self_type" : "type-931", ++ "referenced_type" : "type-929", ++ "self_type" : "type-928", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30678,8 +32090,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1067", +- "self_type" : "type-1066", ++ "referenced_type" : "type-1064", ++ "self_type" : "type-1063", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30688,8 +32100,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1123", +- "self_type" : "type-1122", ++ "referenced_type" : "type-1120", ++ "self_type" : "type-1119", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30698,8 +32110,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1184", +- "self_type" : "type-1183", ++ "referenced_type" : "type-1181", ++ "self_type" : "type-1180", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30708,8 +32120,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1247", +- "self_type" : "type-1246", ++ "referenced_type" : "type-1244", ++ "self_type" : "type-1243", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30718,8 +32130,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1322", +- "self_type" : "type-1321", ++ "referenced_type" : "type-1319", ++ "self_type" : "type-1318", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30728,8 +32140,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1484", +- "self_type" : "type-1483", ++ "referenced_type" : "type-1480", ++ "self_type" : "type-1479", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30738,8 +32150,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1712", +- "self_type" : "type-1711", ++ "referenced_type" : "type-1707", ++ "self_type" : "type-1706", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30748,8 +32160,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1827", +- "self_type" : "type-1826", ++ "referenced_type" : "type-1822", ++ "self_type" : "type-1821", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30758,8 +32170,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1879", +- "self_type" : "type-1878", ++ "referenced_type" : "type-1873", ++ "self_type" : "type-1872", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30768,8 +32180,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1991", +- "self_type" : "type-1990", ++ "referenced_type" : "type-1986", ++ "self_type" : "type-1985", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30778,8 +32190,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2045", +- "self_type" : "type-2044", ++ "referenced_type" : "type-2040", ++ "self_type" : "type-2039", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30788,8 +32200,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2104", +- "self_type" : "type-2103", ++ "referenced_type" : "type-2099", ++ "self_type" : "type-2098", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30798,8 +32210,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2166", +- "self_type" : "type-2165", ++ "referenced_type" : "type-2161", ++ "self_type" : "type-2160", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30808,8 +32220,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2239", +- "self_type" : "type-2238", ++ "referenced_type" : "type-2234", ++ "self_type" : "type-2233", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30818,8 +32230,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2293", +- "self_type" : "type-2292", ++ "referenced_type" : "type-2288", ++ "self_type" : "type-2287", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30828,8 +32240,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2681", +- "self_type" : "type-2680", ++ "referenced_type" : "type-2675", ++ "self_type" : "type-2674", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30838,8 +32250,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2856", +- "self_type" : "type-2855", ++ "referenced_type" : "type-2848", ++ "self_type" : "type-2847", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30848,8 +32260,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2969", +- "self_type" : "type-2968", ++ "referenced_type" : "type-2962", ++ "self_type" : "type-2961", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30858,8 +32270,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3021", +- "self_type" : "type-3020", ++ "referenced_type" : "type-3014", ++ "self_type" : "type-3013", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30868,8 +32280,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3126", +- "self_type" : "type-3125", ++ "referenced_type" : "type-3119", ++ "self_type" : "type-3118", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30878,8 +32290,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3179", +- "self_type" : "type-3178", ++ "referenced_type" : "type-3172", ++ "self_type" : "type-3171", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30888,8 +32300,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3246", +- "self_type" : "type-3245", ++ "referenced_type" : "type-3239", ++ "self_type" : "type-3238", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30898,8 +32310,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3303", +- "self_type" : "type-3302", ++ "referenced_type" : "type-3296", ++ "self_type" : "type-3295", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30908,8 +32320,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3371", +- "self_type" : "type-3370", ++ "referenced_type" : "type-3364", ++ "self_type" : "type-3363", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30918,8 +32330,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3421", +- "self_type" : "type-3420", ++ "referenced_type" : "type-3414", ++ "self_type" : "type-3413", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30928,8 +32340,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-4031", +- "self_type" : "type-4030", ++ "referenced_type" : "type-4023", ++ "self_type" : "type-4022", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30938,8 +32350,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-558", +- "self_type" : "type-557", ++ "referenced_type" : "type-54", ++ "self_type" : "type-53", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30948,8 +32360,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-55", +- "self_type" : "type-54", ++ "referenced_type" : "type-556", ++ "self_type" : "type-555", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30958,8 +32370,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-729", +- "self_type" : "type-728", ++ "referenced_type" : "type-726", ++ "self_type" : "type-725", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30968,8 +32380,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-858", +- "self_type" : "type-857", ++ "referenced_type" : "type-855", ++ "self_type" : "type-854", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30978,8 +32390,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-930", +- "self_type" : "type-929", ++ "referenced_type" : "type-926", ++ "self_type" : "type-925", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30988,8 +32400,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1047", +- "self_type" : "type-1046", ++ "referenced_type" : "type-1044", ++ "self_type" : "type-1043", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -30998,8 +32410,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1110", +- "self_type" : "type-1109", ++ "referenced_type" : "type-1109", ++ "self_type" : "type-1108", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31008,8 +32420,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1114", +- "self_type" : "type-1113", ++ "referenced_type" : "type-1111", ++ "self_type" : "type-1110", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31018,8 +32430,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-114", +- "self_type" : "type-113", ++ "referenced_type" : "type-113", ++ "self_type" : "type-112", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31028,8 +32440,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1175", +- "self_type" : "type-1174", ++ "referenced_type" : "type-1172", ++ "self_type" : "type-1171", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31038,8 +32450,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1234", +- "self_type" : "type-1233", ++ "referenced_type" : "type-1231", ++ "self_type" : "type-1230", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31048,8 +32460,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1313", +- "self_type" : "type-1312", ++ "referenced_type" : "type-1310", ++ "self_type" : "type-1309", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31058,8 +32470,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1399", +- "self_type" : "type-1398", ++ "referenced_type" : "type-1395", ++ "self_type" : "type-1394", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31068,8 +32480,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1468", +- "self_type" : "type-1467", ++ "referenced_type" : "type-1464", ++ "self_type" : "type-1463", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -31078,8 +32490,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1547", +- "self_type" : "type-1546", ++ "referenced_type" : "type-1543", ++ "self_type" : "type-1542", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31088,8 +32500,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1775", +- "self_type" : "type-1774", ++ "referenced_type" : "type-1770", ++ "self_type" : "type-1769", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31098,8 +32510,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1816", +- "self_type" : "type-1815", ++ "referenced_type" : "type-1811", ++ "self_type" : "type-1810", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -31108,8 +32520,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1973", +- "self_type" : "type-1972", ++ "referenced_type" : "type-1968", ++ "self_type" : "type-1967", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31118,8 +32530,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2032", +- "self_type" : "type-2031", ++ "referenced_type" : "type-2029", ++ "self_type" : "type-2028", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31128,8 +32540,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2036", +- "self_type" : "type-2035", ++ "referenced_type" : "type-2031", ++ "self_type" : "type-2030", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31138,8 +32550,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-207", +- "self_type" : "type-206", ++ "referenced_type" : "type-206", ++ "self_type" : "type-205", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31148,8 +32560,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2095", +- "self_type" : "type-2094", ++ "referenced_type" : "type-2090", ++ "self_type" : "type-2089", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31158,8 +32570,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2152", +- "self_type" : "type-2151", ++ "referenced_type" : "type-2147", ++ "self_type" : "type-2146", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31168,8 +32580,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2230", +- "self_type" : "type-2229", ++ "referenced_type" : "type-2225", ++ "self_type" : "type-2224", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31178,8 +32590,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2276", +- "self_type" : "type-2275", ++ "referenced_type" : "type-2271", ++ "self_type" : "type-2270", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -31188,8 +32600,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2598", +- "self_type" : "type-2597", ++ "referenced_type" : "type-2592", ++ "self_type" : "type-2591", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31198,8 +32610,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2665", +- "self_type" : "type-2664", ++ "referenced_type" : "type-2659", ++ "self_type" : "type-2658", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -31208,8 +32620,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2743", +- "self_type" : "type-2742", ++ "referenced_type" : "type-2737", ++ "self_type" : "type-2736", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31218,8 +32630,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2814", +- "self_type" : "type-2813", ++ "referenced_type" : "type-2807", ++ "self_type" : "type-2806", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31228,8 +32640,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2878", +- "self_type" : "type-2877", ++ "referenced_type" : "type-2871", ++ "self_type" : "type-2870", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31238,8 +32650,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2961", +- "self_type" : "type-2960", ++ "referenced_type" : "type-2954", ++ "self_type" : "type-2953", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -31248,8 +32660,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3111", +- "self_type" : "type-3110", ++ "referenced_type" : "type-3104", ++ "self_type" : "type-3103", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31258,8 +32670,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3151", +- "self_type" : "type-3150", ++ "referenced_type" : "type-3144", ++ "self_type" : "type-3143", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31268,8 +32680,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3170", +- "self_type" : "type-3169", ++ "referenced_type" : "type-3163", ++ "self_type" : "type-3162", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31278,8 +32690,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3189", +- "self_type" : "type-3188", ++ "referenced_type" : "type-3182", ++ "self_type" : "type-3181", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31288,8 +32700,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3237", +- "self_type" : "type-3236", ++ "referenced_type" : "type-3230", ++ "self_type" : "type-3229", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31298,8 +32710,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3292", +- "self_type" : "type-3291", ++ "referenced_type" : "type-3285", ++ "self_type" : "type-3284", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31308,8 +32720,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3301", +- "self_type" : "type-3300", ++ "referenced_type" : "type-3294", ++ "self_type" : "type-3293", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31318,8 +32730,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3358", +- "self_type" : "type-3357", ++ "referenced_type" : "type-3351", ++ "self_type" : "type-3350", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31328,8 +32740,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3402", +- "self_type" : "type-3401", ++ "referenced_type" : "type-3395", ++ "self_type" : "type-3394", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -31338,8 +32750,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3941", +- "self_type" : "type-3940", ++ "referenced_type" : "type-3933", ++ "self_type" : "type-3932", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31348,8 +32760,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-4015", +- "self_type" : "type-4014", ++ "referenced_type" : "type-4007", ++ "self_type" : "type-4006", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -31358,8 +32770,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-410", +- "self_type" : "type-409", ++ "referenced_type" : "type-408", ++ "self_type" : "type-407", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31368,8 +32780,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-534", +- "self_type" : "type-533", ++ "referenced_type" : "type-532", ++ "self_type" : "type-531", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -31378,8 +32790,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-647", +- "self_type" : "type-646", ++ "referenced_type" : "type-645", ++ "self_type" : "type-644", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31388,8 +32800,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-800", +- "self_type" : "type-799", ++ "referenced_type" : "type-797", ++ "self_type" : "type-796", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31398,8 +32810,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-847", +- "self_type" : "type-846", ++ "referenced_type" : "type-844", ++ "self_type" : "type-843", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -31408,8 +32820,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-1542", +- "self_type" : "type-1541", ++ "referenced_type" : "type-1538", ++ "self_type" : "type-1537", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31418,8 +32830,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-2738", +- "self_type" : "type-2737", ++ "referenced_type" : "type-2732", ++ "self_type" : "type-2731", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31428,8 +32840,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-2809", +- "self_type" : "type-2808", ++ "referenced_type" : "type-2803", ++ "self_type" : "type-2802", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31438,8 +32850,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-642", +- "self_type" : "type-641", ++ "referenced_type" : "type-640", ++ "self_type" : "type-639", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31448,8 +32860,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-1395", +- "self_type" : "type-1394", ++ "referenced_type" : "type-1391", ++ "self_type" : "type-1390", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31458,8 +32870,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-2594", +- "self_type" : "type-2593", ++ "referenced_type" : "type-2588", ++ "self_type" : "type-2587", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31468,8 +32880,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-3937", +- "self_type" : "type-3936", ++ "referenced_type" : "type-3929", ++ "self_type" : "type-3928", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31478,8 +32890,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-405", +- "self_type" : "type-404", ++ "referenced_type" : "type-403", ++ "self_type" : "type-402", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31488,8 +32900,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-1338", +- "self_type" : "type-1337", ++ "referenced_type" : "type-1335", ++ "self_type" : "type-1334", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -31498,8 +32910,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-1378", +- "self_type" : "type-1377", ++ "referenced_type" : "type-1375", ++ "self_type" : "type-1374", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -31508,8 +32920,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-2306", +- "self_type" : "type-2305", ++ "referenced_type" : "type-2301", ++ "self_type" : "type-2300", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -31518,8 +32930,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-2577", +- "self_type" : "type-2576", ++ "referenced_type" : "type-2572", ++ "self_type" : "type-2571", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -31528,8 +32940,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-307", +- "self_type" : "type-306", ++ "referenced_type" : "type-306", ++ "self_type" : "type-305", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -31538,8 +32950,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-3641", +- "self_type" : "type-3640", ++ "referenced_type" : "type-3634", ++ "self_type" : "type-3633", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -31548,8 +32960,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-3759", +- "self_type" : "type-3758", ++ "referenced_type" : "type-3752", ++ "self_type" : "type-3751", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -31558,8 +32970,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-377", +- "self_type" : "type-376", ++ "referenced_type" : "type-376", ++ "self_type" : "type-375", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -31568,8 +32980,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-3921", +- "self_type" : "type-3920", ++ "referenced_type" : "type-3914", ++ "self_type" : "type-3913", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -31578,8 +32990,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1017", +- "self_type" : "type-1016", ++ "referenced_type" : "type-1014", ++ "self_type" : "type-1013", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31588,8 +33000,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1108", +- "self_type" : "type-1107", ++ "referenced_type" : "type-1105", ++ "self_type" : "type-1104", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31598,8 +33010,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1168", +- "self_type" : "type-1167", ++ "referenced_type" : "type-1165", ++ "self_type" : "type-1164", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31608,8 +33020,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1229", +- "self_type" : "type-1228", ++ "referenced_type" : "type-1226", ++ "self_type" : "type-1225", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31618,8 +33030,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1303", +- "self_type" : "type-1302", ++ "referenced_type" : "type-1300", ++ "self_type" : "type-1299", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31628,8 +33040,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1951", +- "self_type" : "type-1950", ++ "referenced_type" : "type-1946", ++ "self_type" : "type-1945", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31638,8 +33050,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-2030", +- "self_type" : "type-2029", ++ "referenced_type" : "type-2025", ++ "self_type" : "type-2024", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31648,8 +33060,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-2088", +- "self_type" : "type-2087", ++ "referenced_type" : "type-2083", ++ "self_type" : "type-2082", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31658,8 +33070,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-2147", +- "self_type" : "type-2146", ++ "referenced_type" : "type-2142", ++ "self_type" : "type-2141", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31668,8 +33080,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-2220", +- "self_type" : "type-2219", ++ "referenced_type" : "type-2215", ++ "self_type" : "type-2214", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31678,8 +33090,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-2266", +- "self_type" : "type-2265", ++ "referenced_type" : "type-2261", ++ "self_type" : "type-2260", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31688,8 +33100,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-3092", +- "self_type" : "type-3091", ++ "referenced_type" : "type-3085", ++ "self_type" : "type-3084", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31698,8 +33110,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-3166", +- "self_type" : "type-3165", ++ "referenced_type" : "type-3159", ++ "self_type" : "type-3158", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31708,8 +33120,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-3233", +- "self_type" : "type-3232", ++ "referenced_type" : "type-3226", ++ "self_type" : "type-3225", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31718,8 +33130,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-3288", +- "self_type" : "type-3287", ++ "referenced_type" : "type-3281", ++ "self_type" : "type-3280", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31728,8 +33140,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-3349", +- "self_type" : "type-3348", ++ "referenced_type" : "type-3342", ++ "self_type" : "type-3341", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31738,8 +33150,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-3395", +- "self_type" : "type-3394", ++ "referenced_type" : "type-3388", ++ "self_type" : "type-3387", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31748,8 +33160,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1006", +- "self_type" : "type-1005", ++ "referenced_type" : "type-1003", ++ "self_type" : "type-1002", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31758,8 +33170,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1106", +- "self_type" : "type-1105", ++ "referenced_type" : "type-1103", ++ "self_type" : "type-1102", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31768,8 +33180,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1166", +- "self_type" : "type-1165", ++ "referenced_type" : "type-1163", ++ "self_type" : "type-1162", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31778,8 +33190,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1227", +- "self_type" : "type-1226", ++ "referenced_type" : "type-1224", ++ "self_type" : "type-1223", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31788,8 +33200,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1301", +- "self_type" : "type-1300", ++ "referenced_type" : "type-1298", ++ "self_type" : "type-1297", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31798,8 +33210,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1944", +- "self_type" : "type-1943", ++ "referenced_type" : "type-1939", ++ "self_type" : "type-1938", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31808,8 +33220,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-2028", +- "self_type" : "type-2027", ++ "referenced_type" : "type-2023", ++ "self_type" : "type-2022", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31818,8 +33230,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-2086", +- "self_type" : "type-2085", ++ "referenced_type" : "type-2081", ++ "self_type" : "type-2080", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31828,8 +33240,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-2145", +- "self_type" : "type-2144", ++ "referenced_type" : "type-2140", ++ "self_type" : "type-2139", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31838,8 +33250,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-2218", +- "self_type" : "type-2217", ++ "referenced_type" : "type-2213", ++ "self_type" : "type-2212", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31848,8 +33260,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-2264", +- "self_type" : "type-2263", ++ "referenced_type" : "type-2259", ++ "self_type" : "type-2258", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31858,8 +33270,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-3086", +- "self_type" : "type-3085", ++ "referenced_type" : "type-3079", ++ "self_type" : "type-3078", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31868,8 +33280,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-3164", +- "self_type" : "type-3163", ++ "referenced_type" : "type-3157", ++ "self_type" : "type-3156", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31878,8 +33290,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-3231", +- "self_type" : "type-3230", ++ "referenced_type" : "type-3224", ++ "self_type" : "type-3223", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31888,8 +33300,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-3286", +- "self_type" : "type-3285", ++ "referenced_type" : "type-3279", ++ "self_type" : "type-3278", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31898,8 +33310,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-3347", +- "self_type" : "type-3346", ++ "referenced_type" : "type-3340", ++ "self_type" : "type-3339", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31908,8 +33320,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-3393", +- "self_type" : "type-3392", ++ "referenced_type" : "type-3386", ++ "self_type" : "type-3385", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31918,8 +33330,8 @@ + "is_const" : true, + "linker_set_key" : "const std::unique_ptr >", + "name" : "const std::unique_ptr >", +- "referenced_type" : "type-3765", +- "self_type" : "type-3764", ++ "referenced_type" : "type-3758", ++ "self_type" : "type-3757", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -31928,8 +33340,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-1805", +- "self_type" : "type-1804", ++ "referenced_type" : "type-1800", ++ "self_type" : "type-1799", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31938,8 +33350,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-2949", +- "self_type" : "type-2948", ++ "referenced_type" : "type-2942", ++ "self_type" : "type-2941", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31948,8 +33360,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-832", +- "self_type" : "type-831", ++ "referenced_type" : "type-829", ++ "self_type" : "type-828", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31958,8 +33370,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1081", +- "self_type" : "type-1080", ++ "referenced_type" : "type-1078", ++ "self_type" : "type-1077", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31968,8 +33380,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1133", +- "self_type" : "type-1132", ++ "referenced_type" : "type-1130", ++ "self_type" : "type-1129", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31978,8 +33390,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1152", +- "self_type" : "type-1151", ++ "referenced_type" : "type-1149", ++ "self_type" : "type-1148", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31988,8 +33400,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1171", +- "self_type" : "type-1170", ++ "referenced_type" : "type-1168", ++ "self_type" : "type-1167", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31998,8 +33410,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1194", +- "self_type" : "type-1193", ++ "referenced_type" : "type-1191", ++ "self_type" : "type-1190", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32008,8 +33420,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1261", +- "self_type" : "type-1260", ++ "referenced_type" : "type-1258", ++ "self_type" : "type-1257", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32018,8 +33430,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1327", +- "self_type" : "type-1326", ++ "referenced_type" : "type-1324", ++ "self_type" : "type-1323", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32028,8 +33440,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1385", +- "self_type" : "type-1384", ++ "referenced_type" : "type-1382", ++ "self_type" : "type-1381", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32038,8 +33450,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1493", +- "self_type" : "type-1492", ++ "referenced_type" : "type-1489", ++ "self_type" : "type-1488", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32048,8 +33460,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1557", +- "self_type" : "type-1556", ++ "referenced_type" : "type-1553", ++ "self_type" : "type-1552", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32058,8 +33470,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-156", +- "self_type" : "type-155", ++ "referenced_type" : "type-155", ++ "self_type" : "type-154", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32068,8 +33480,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1717", +- "self_type" : "type-1716", ++ "referenced_type" : "type-1712", ++ "self_type" : "type-1711", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32078,8 +33490,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1742", +- "self_type" : "type-1741", ++ "referenced_type" : "type-1737", ++ "self_type" : "type-1736", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32088,8 +33500,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1851", +- "self_type" : "type-1850", ++ "referenced_type" : "type-1846", ++ "self_type" : "type-1845", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32098,8 +33510,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1885", +- "self_type" : "type-1884", ++ "referenced_type" : "type-1879", ++ "self_type" : "type-1878", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32108,8 +33520,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1890", +- "self_type" : "type-1889", ++ "referenced_type" : "type-1885", ++ "self_type" : "type-1884", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32118,8 +33530,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2005", +- "self_type" : "type-2004", ++ "referenced_type" : "type-2000", ++ "self_type" : "type-1999", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32128,8 +33540,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2055", +- "self_type" : "type-2054", ++ "referenced_type" : "type-2050", ++ "self_type" : "type-2049", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32138,8 +33550,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2073", +- "self_type" : "type-2072", ++ "referenced_type" : "type-2068", ++ "self_type" : "type-2067", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32148,8 +33560,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2091", +- "self_type" : "type-2090", ++ "referenced_type" : "type-2086", ++ "self_type" : "type-2085", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32158,8 +33570,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2114", +- "self_type" : "type-2113", ++ "referenced_type" : "type-2109", ++ "self_type" : "type-2108", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32168,8 +33580,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-217", +- "self_type" : "type-216", ++ "referenced_type" : "type-216", ++ "self_type" : "type-215", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32178,8 +33590,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2180", +- "self_type" : "type-2179", ++ "referenced_type" : "type-2175", ++ "self_type" : "type-2174", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32188,8 +33600,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-220", +- "self_type" : "type-219", ++ "referenced_type" : "type-219", ++ "self_type" : "type-218", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32198,8 +33610,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2244", +- "self_type" : "type-2243", ++ "referenced_type" : "type-2239", ++ "self_type" : "type-2238", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32208,8 +33620,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2299", +- "self_type" : "type-2298", ++ "referenced_type" : "type-2294", ++ "self_type" : "type-2293", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32218,8 +33630,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2320", +- "self_type" : "type-2319", ++ "referenced_type" : "type-2314", ++ "self_type" : "type-2313", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32228,8 +33640,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2584", +- "self_type" : "type-2583", ++ "referenced_type" : "type-2579", ++ "self_type" : "type-2578", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32238,8 +33650,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2690", +- "self_type" : "type-2689", ++ "referenced_type" : "type-2684", ++ "self_type" : "type-2683", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32248,8 +33660,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2753", +- "self_type" : "type-2752", ++ "referenced_type" : "type-2747", ++ "self_type" : "type-2746", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32258,8 +33670,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2825", +- "self_type" : "type-2824", ++ "referenced_type" : "type-2819", ++ "self_type" : "type-2818", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32268,8 +33680,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2861", +- "self_type" : "type-2860", ++ "referenced_type" : "type-2854", ++ "self_type" : "type-2853", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32278,8 +33690,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2884", +- "self_type" : "type-2883", ++ "referenced_type" : "type-2877", ++ "self_type" : "type-2876", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32288,8 +33700,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2994", +- "self_type" : "type-2993", ++ "referenced_type" : "type-2986", ++ "self_type" : "type-2985", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32298,8 +33710,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3005", +- "self_type" : "type-3004", ++ "referenced_type" : "type-2998", ++ "self_type" : "type-2997", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32308,8 +33720,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3027", +- "self_type" : "type-3026", ++ "referenced_type" : "type-3020", ++ "self_type" : "type-3019", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32318,8 +33730,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3140", +- "self_type" : "type-3139", ++ "referenced_type" : "type-3133", ++ "self_type" : "type-3132", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32328,8 +33740,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3192", +- "self_type" : "type-3191", ++ "referenced_type" : "type-3185", ++ "self_type" : "type-3184", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32338,8 +33750,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3198", +- "self_type" : "type-3197", ++ "referenced_type" : "type-3191", ++ "self_type" : "type-3190", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32348,8 +33760,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3217", +- "self_type" : "type-3216", ++ "referenced_type" : "type-3210", ++ "self_type" : "type-3209", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32358,8 +33770,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3256", +- "self_type" : "type-3255", ++ "referenced_type" : "type-3249", ++ "self_type" : "type-3248", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32368,8 +33780,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3314", +- "self_type" : "type-3313", ++ "referenced_type" : "type-3307", ++ "self_type" : "type-3306", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32378,8 +33790,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3369", +- "self_type" : "type-3368", ++ "referenced_type" : "type-3362", ++ "self_type" : "type-3361", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32388,8 +33800,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3376", +- "self_type" : "type-3375", ++ "referenced_type" : "type-3369", ++ "self_type" : "type-3368", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32398,8 +33810,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3406", +- "self_type" : "type-3405", ++ "referenced_type" : "type-3402", ++ "self_type" : "type-3401", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32408,8 +33820,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3426", +- "self_type" : "type-3425", ++ "referenced_type" : "type-3419", ++ "self_type" : "type-3418", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32418,8 +33830,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3440", +- "self_type" : "type-3439", ++ "referenced_type" : "type-3433", ++ "self_type" : "type-3432", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32428,8 +33840,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-389", +- "self_type" : "type-388", ++ "referenced_type" : "type-388", ++ "self_type" : "type-387", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32438,8 +33850,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3927", +- "self_type" : "type-3926", ++ "referenced_type" : "type-3920", ++ "self_type" : "type-3919", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32448,8 +33860,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-4041", +- "self_type" : "type-4040", ++ "referenced_type" : "type-4033", ++ "self_type" : "type-4032", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32458,8 +33870,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-569", +- "self_type" : "type-568", ++ "referenced_type" : "type-567", ++ "self_type" : "type-566", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32468,8 +33880,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-60", +- "self_type" : "type-59", ++ "referenced_type" : "type-59", ++ "self_type" : "type-58", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32478,8 +33890,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-658", +- "self_type" : "type-657", ++ "referenced_type" : "type-656", ++ "self_type" : "type-655", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32488,8 +33900,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-734", +- "self_type" : "type-733", ++ "referenced_type" : "type-731", ++ "self_type" : "type-730", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32498,8 +33910,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-759", +- "self_type" : "type-758", ++ "referenced_type" : "type-756", ++ "self_type" : "type-755", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32508,8 +33920,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-902", +- "self_type" : "type-901", ++ "referenced_type" : "type-899", ++ "self_type" : "type-898", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32518,8 +33930,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-936", +- "self_type" : "type-935", ++ "referenced_type" : "type-932", ++ "self_type" : "type-931", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32528,8 +33940,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-941", +- "self_type" : "type-940", ++ "referenced_type" : "type-938", ++ "self_type" : "type-937", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32538,8 +33950,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-94", +- "self_type" : "type-93", ++ "referenced_type" : "type-93", ++ "self_type" : "type-92", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32548,8 +33960,8 @@ + "is_const" : true, + "linker_set_key" : "const unsigned char", + "name" : "const unsigned char", +- "referenced_type" : "type-199", +- "self_type" : "type-604", ++ "referenced_type" : "type-198", ++ "self_type" : "type-603", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -32558,8 +33970,8 @@ + "is_const" : true, + "linker_set_key" : "const unsigned char *const", + "name" : "const unsigned char *const", +- "referenced_type" : "type-1030", +- "self_type" : "type-3725", ++ "referenced_type" : "type-1027", ++ "self_type" : "type-3718", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -32569,7 +33981,7 @@ + "linker_set_key" : "const unsigned int", + "name" : "const unsigned int", + "referenced_type" : "type-1", +- "self_type" : "type-246", ++ "self_type" : "type-245", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -32578,8 +33990,8 @@ + "is_const" : true, + "linker_set_key" : "const unsigned int *const", + "name" : "const unsigned int *const", +- "referenced_type" : "type-2352", +- "self_type" : "type-3727", ++ "referenced_type" : "type-2347", ++ "self_type" : "type-3720", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -32589,7 +34001,7 @@ + "linker_set_key" : "const unsigned long long", + "name" : "const unsigned long long", + "referenced_type" : "type-21", +- "self_type" : "type-661", ++ "self_type" : "type-659", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -32598,8 +34010,8 @@ + "is_const" : true, + "linker_set_key" : "const unsigned short", + "name" : "const unsigned short", +- "referenced_type" : "type-132", +- "self_type" : "type-614", ++ "referenced_type" : "type-131", ++ "self_type" : "type-612", + "size" : 2, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -32607,8 +34019,8 @@ + "is_const" : true, + "linker_set_key" : "const void", + "name" : "const void", +- "referenced_type" : "type-106", +- "self_type" : "type-138", ++ "referenced_type" : "type-105", ++ "self_type" : "type-137", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -32616,8 +34028,8 @@ + "is_const" : true, + "linker_set_key" : "const void *const", + "name" : "const void *const", +- "referenced_type" : "type-139", +- "self_type" : "type-2385", ++ "referenced_type" : "type-138", ++ "self_type" : "type-2380", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -32626,8 +34038,8 @@ + "is_const" : true, + "linker_set_key" : "void *const", + "name" : "void *const", +- "referenced_type" : "type-245", +- "self_type" : "type-3667", ++ "referenced_type" : "type-244", ++ "self_type" : "type-3660", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -32636,8 +34048,8 @@ + "is_volatile" : true, + "linker_set_key" : "volatile bool", + "name" : "volatile bool", +- "referenced_type" : "type-44", +- "self_type" : "type-457", ++ "referenced_type" : "type-43", ++ "self_type" : "type-455", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/Thread.h" + }, +@@ -32647,7 +34059,7 @@ + "linker_set_key" : "volatile int", + "name" : "volatile int", + "referenced_type" : "type-19", +- "self_type" : "type-2337", ++ "self_type" : "type-2332", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + } +@@ -32668,20 +34080,20 @@ + "access" : "private", + "field_name" : "d_", + "field_offset" : 32, +- "referenced_type" : "type-2502" ++ "referenced_type" : "type-2497" + }, + { + "access" : "private", + "field_name" : "s_", + "field_offset" : 64, +- "referenced_type" : "type-2503" ++ "referenced_type" : "type-2498" + } + ], + "linker_set_key" : "Renamer", + "name" : "Renamer", + "record_kind" : "class", +- "referenced_type" : "type-2501", +- "self_type" : "type-2501", ++ "referenced_type" : "type-2496", ++ "self_type" : "type-2496", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/RefBase.h", + "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jE7Renamer", +@@ -32714,14 +34126,14 @@ + { + "access" : "private", + "field_name" : "mFrameLines", +- "referenced_type" : "type-252" ++ "referenced_type" : "type-251" + } + ], + "linker_set_key" : "android::CallStack", + "name" : "android::CallStack", + "record_kind" : "class", +- "referenced_type" : "type-256", +- "self_type" : "type-256", ++ "referenced_type" : "type-255", ++ "self_type" : "type-255", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/CallStack.h", + "unique_id" : "_ZTSN7android9CallStackE" +@@ -32730,8 +34142,8 @@ + "alignment" : 1, + "linker_set_key" : "android::CallStack::StackDeleter", + "name" : "android::CallStack::StackDeleter", +- "referenced_type" : "type-260", +- "self_type" : "type-260", ++ "referenced_type" : "type-259", ++ "self_type" : "type-259", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/CallStack.h", + "unique_id" : "_ZTSN7android9CallStack12StackDeleterE" +@@ -32740,8 +34152,8 @@ + "alignment" : 1, + "linker_set_key" : "android::CompileTimeAssert", + "name" : "android::CompileTimeAssert", +- "referenced_type" : "type-3802", +- "self_type" : "type-3802", ++ "referenced_type" : "type-3795", ++ "self_type" : "type-3795", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/Debug.h", + "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE" +@@ -32753,14 +34165,14 @@ + { + "access" : "private", + "field_name" : "mCond", +- "referenced_type" : "type-443" ++ "referenced_type" : "type-441" + } + ], + "linker_set_key" : "android::Condition", + "name" : "android::Condition", + "record_kind" : "class", +- "referenced_type" : "type-442", +- "self_type" : "type-442", ++ "referenced_type" : "type-440", ++ "self_type" : "type-440", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Condition.h", + "unique_id" : "_ZTSN7android9ConditionE" +@@ -32772,17 +34184,17 @@ + { + "access" : "private", + "field_name" : "mVector", +- "referenced_type" : "type-426" ++ "referenced_type" : "type-424" + } + ], + "linker_set_key" : "android::KeyedVector >", + "name" : "android::KeyedVector >", + "record_kind" : "class", +- "referenced_type" : "type-433", +- "self_type" : "type-433", ++ "referenced_type" : "type-431", ++ "self_type" : "type-431", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h", +- "template_args" : [ "type-342", "type-71" ], ++ "template_args" : [ "type-341", "type-70" ], + "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE" + }, + { +@@ -32792,17 +34204,17 @@ + { + "access" : "private", + "field_name" : "mVector", +- "referenced_type" : "type-2342" ++ "referenced_type" : "type-2337" + } + ], + "linker_set_key" : "android::KeyedVector", + "name" : "android::KeyedVector", + "record_kind" : "class", +- "referenced_type" : "type-2341", +- "self_type" : "type-2341", ++ "referenced_type" : "type-2336", ++ "self_type" : "type-2336", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h", +- "template_args" : [ "type-139", "type-2344" ], ++ "template_args" : [ "type-138", "type-2339" ], + "unique_id" : "_ZTSN7android11KeyedVectorIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { +@@ -32812,17 +34224,17 @@ + { + "access" : "private", + "field_name" : "mCount", +- "referenced_type" : "type-314" ++ "referenced_type" : "type-313" + } + ], + "linker_set_key" : "android::LightRefBase", + "name" : "android::LightRefBase", + "record_kind" : "class", +- "referenced_type" : "type-313", +- "self_type" : "type-313", ++ "referenced_type" : "type-312", ++ "self_type" : "type-312", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/LightRefBase.h", +- "template_args" : [ "type-315" ], ++ "template_args" : [ "type-314" ], + "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE" + }, + { +@@ -32832,17 +34244,17 @@ + { + "access" : "private", + "field_name" : "mCount", +- "referenced_type" : "type-181" ++ "referenced_type" : "type-180" + } + ], + "linker_set_key" : "android::LightRefBase", + "name" : "android::LightRefBase", + "record_kind" : "class", +- "referenced_type" : "type-180", +- "self_type" : "type-180", ++ "referenced_type" : "type-179", ++ "self_type" : "type-179", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/LightRefBase.h", +- "template_args" : [ "type-182" ], ++ "template_args" : [ "type-181" ], + "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE" + }, + { +@@ -32852,14 +34264,14 @@ + { + "access" : "private", + "field_name" : "mMutex", +- "referenced_type" : "type-437" ++ "referenced_type" : "type-434" + } + ], + "linker_set_key" : "android::Mutex", + "name" : "android::Mutex", + "record_kind" : "class", +- "referenced_type" : "type-436", +- "self_type" : "type-436", ++ "referenced_type" : "type-433", ++ "self_type" : "type-433", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Mutex.h", + "unique_id" : "_ZTSN7android5MutexE" +@@ -32871,14 +34283,14 @@ + { + "access" : "private", + "field_name" : "mLock", +- "referenced_type" : "type-440" ++ "referenced_type" : "type-438" + } + ], + "linker_set_key" : "android::Mutex::Autolock", + "name" : "android::Mutex::Autolock", + "record_kind" : "class", +- "referenced_type" : "type-439", +- "self_type" : "type-439", ++ "referenced_type" : "type-437", ++ "self_type" : "type-437", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Mutex.h", + "unique_id" : "_ZTSN7android5Mutex8AutolockE" +@@ -32888,7 +34300,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-313" ++ "referenced_type" : "type-312" + } + ], + "fields" : +@@ -32897,20 +34309,20 @@ + "access" : "private", + "field_name" : "mHandle", + "field_offset" : 32, +- "referenced_type" : "type-91" ++ "referenced_type" : "type-90" + }, + { + "access" : "private", + "field_name" : "mOwnsHandle", + "field_offset" : 64, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::NativeHandle", + "name" : "android::NativeHandle", + "record_kind" : "class", +- "referenced_type" : "type-315", +- "self_type" : "type-315", ++ "referenced_type" : "type-314", ++ "self_type" : "type-314", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/NativeHandle.h", + "unique_id" : "_ZTSN7android12NativeHandleE" +@@ -32922,14 +34334,14 @@ + { + "access" : "private", + "field_name" : "mRWLock", +- "referenced_type" : "type-449" ++ "referenced_type" : "type-445" + } + ], + "linker_set_key" : "android::RWLock", + "name" : "android::RWLock", + "record_kind" : "class", +- "referenced_type" : "type-448", +- "self_type" : "type-448", ++ "referenced_type" : "type-444", ++ "self_type" : "type-444", + "size" : 40, + "source_file" : "/system/core/libutils/include/utils/RWLock.h", + "unique_id" : "_ZTSN7android6RWLockE" +@@ -32941,14 +34353,14 @@ + { + "access" : "private", + "field_name" : "mLock", +- "referenced_type" : "type-452" ++ "referenced_type" : "type-450" + } + ], + "linker_set_key" : "android::RWLock::AutoRLock", + "name" : "android::RWLock::AutoRLock", + "record_kind" : "class", +- "referenced_type" : "type-451", +- "self_type" : "type-451", ++ "referenced_type" : "type-449", ++ "self_type" : "type-449", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RWLock.h", + "unique_id" : "_ZTSN7android6RWLock9AutoRLockE" +@@ -32960,14 +34372,14 @@ + { + "access" : "private", + "field_name" : "mLock", +- "referenced_type" : "type-452" ++ "referenced_type" : "type-450" + } + ], + "linker_set_key" : "android::RWLock::AutoWLock", + "name" : "android::RWLock::AutoWLock", + "record_kind" : "class", +- "referenced_type" : "type-455", +- "self_type" : "type-455", ++ "referenced_type" : "type-452", ++ "self_type" : "type-452", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RWLock.h", + "unique_id" : "_ZTSN7android6RWLock9AutoWLockE" +@@ -33038,8 +34450,8 @@ + "linker_set_key" : "android::ReferenceMover", + "name" : "android::ReferenceMover", + "record_kind" : "class", +- "referenced_type" : "type-75", +- "self_type" : "type-75", ++ "referenced_type" : "type-74", ++ "self_type" : "type-74", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/RefBase.h", + "unique_id" : "_ZTSN7android14ReferenceMoverE" +@@ -33082,8 +34494,8 @@ + "linker_set_key" : "android::ScopedTrace", + "name" : "android::ScopedTrace", + "record_kind" : "class", +- "referenced_type" : "type-1064", +- "self_type" : "type-1064", ++ "referenced_type" : "type-1061", ++ "self_type" : "type-1061", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Trace.h", + "unique_id" : "_ZTSN7android11ScopedTraceE" +@@ -33094,17 +34506,17 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-251" ++ "referenced_type" : "type-250" + } + ], + "linker_set_key" : "android::SortedVector > >", + "name" : "android::SortedVector > >", + "record_kind" : "class", +- "referenced_type" : "type-426", +- "self_type" : "type-426", ++ "referenced_type" : "type-424", ++ "self_type" : "type-424", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h", +- "template_args" : [ "type-427" ], ++ "template_args" : [ "type-425" ], + "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE", + "vtable_components" : + [ +@@ -33152,17 +34564,17 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-251" ++ "referenced_type" : "type-250" + } + ], + "linker_set_key" : "android::SortedVector >", + "name" : "android::SortedVector >", + "record_kind" : "class", +- "referenced_type" : "type-2342", +- "self_type" : "type-2342", ++ "referenced_type" : "type-2337", ++ "self_type" : "type-2337", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h", +- "template_args" : [ "type-2343" ], ++ "template_args" : [ "type-2338" ], + "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE", + "vtable_components" : + [ +@@ -33209,14 +34621,14 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-244" ++ "referenced_type" : "type-243" + } + ], + "linker_set_key" : "android::SortedVectorImpl", + "name" : "android::SortedVectorImpl", + "record_kind" : "class", +- "referenced_type" : "type-251", +- "self_type" : "type-251", ++ "referenced_type" : "type-250", ++ "self_type" : "type-250", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/VectorImpl.h", + "unique_id" : "_ZTSN7android16SortedVectorImplE", +@@ -33274,14 +34686,14 @@ + { + "access" : "private", + "field_name" : "mString", +- "referenced_type" : "type-343" ++ "referenced_type" : "type-342" + } + ], + "linker_set_key" : "android::String16", + "name" : "android::String16", + "record_kind" : "class", +- "referenced_type" : "type-342", +- "self_type" : "type-342", ++ "referenced_type" : "type-341", ++ "self_type" : "type-341", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String16.h", + "unique_id" : "_ZTSN7android8String16E" +@@ -33293,14 +34705,14 @@ + { + "access" : "private", + "field_name" : "mString", +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], + "linker_set_key" : "android::String8", + "name" : "android::String8", + "record_kind" : "class", +- "referenced_type" : "type-221", +- "self_type" : "type-221", ++ "referenced_type" : "type-220", ++ "self_type" : "type-220", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String8.h", + "unique_id" : "_ZTSN7android7String8E" +@@ -33320,25 +34732,25 @@ + "access" : "private", + "field_name" : "mCanCallJava", + "field_offset" : 32, +- "referenced_type" : "type-502" ++ "referenced_type" : "type-500" + }, + { + "access" : "private", + "field_name" : "mThread", + "field_offset" : 64, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "access" : "private", + "field_name" : "mLock", + "field_offset" : 96, +- "referenced_type" : "type-436" ++ "referenced_type" : "type-433" + }, + { + "access" : "private", + "field_name" : "mThreadExitedCondition", + "field_offset" : 128, +- "referenced_type" : "type-442" ++ "referenced_type" : "type-440" + }, + { + "access" : "private", +@@ -33350,19 +34762,19 @@ + "access" : "private", + "field_name" : "mExitPending", + "field_offset" : 192, +- "referenced_type" : "type-457" ++ "referenced_type" : "type-455" + }, + { + "access" : "private", + "field_name" : "mRunning", + "field_offset" : 200, +- "referenced_type" : "type-457" ++ "referenced_type" : "type-455" + }, + { + "access" : "private", + "field_name" : "mHoldSelf", + "field_offset" : 224, +- "referenced_type" : "type-499" ++ "referenced_type" : "type-497" + }, + { + "access" : "private", +@@ -33374,8 +34786,8 @@ + "linker_set_key" : "android::Thread", + "name" : "android::Thread", + "record_kind" : "class", +- "referenced_type" : "type-501", +- "self_type" : "type-501", ++ "referenced_type" : "type-499", ++ "self_type" : "type-499", + "size" : 44, + "source_file" : "/system/core/libutils/include/utils/Thread.h", + "unique_id" : "_ZTSN7android6ThreadE", +@@ -33465,17 +34877,17 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-244" ++ "referenced_type" : "type-243" + } + ], + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-432", +- "self_type" : "type-432", ++ "referenced_type" : "type-430", ++ "self_type" : "type-430", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", +- "template_args" : [ "type-68" ], ++ "template_args" : [ "type-67" ], + "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE", + "vtable_components" : + [ +@@ -33520,14 +34932,14 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-244" ++ "referenced_type" : "type-243" + } + ], + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-431", +- "self_type" : "type-431", ++ "referenced_type" : "type-429", ++ "self_type" : "type-429", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", + "template_args" : [ "type-35" ], +@@ -33575,17 +34987,17 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-244" ++ "referenced_type" : "type-243" + } + ], + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-252", +- "self_type" : "type-252", ++ "referenced_type" : "type-251", ++ "self_type" : "type-251", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", +- "template_args" : [ "type-221" ], ++ "template_args" : [ "type-220" ], + "unique_id" : "_ZTSN7android6VectorINS_7String8EEE", + "vtable_components" : + [ +@@ -33630,17 +35042,17 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-244" ++ "referenced_type" : "type-243" + } + ], + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-430", +- "self_type" : "type-430", ++ "referenced_type" : "type-428", ++ "self_type" : "type-428", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", +- "template_args" : [ "type-384" ], ++ "template_args" : [ "type-383" ], + "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE", + "vtable_components" : + [ +@@ -33685,17 +35097,17 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-244" ++ "referenced_type" : "type-243" + } + ], + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-2409", +- "self_type" : "type-2409", ++ "referenced_type" : "type-2404", ++ "self_type" : "type-2404", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", +- "template_args" : [ "type-2373" ], ++ "template_args" : [ "type-2368" ], + "unique_id" : "_ZTSN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE", + "vtable_components" : + [ +@@ -33740,17 +35152,17 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-244" ++ "referenced_type" : "type-243" + } + ], + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-428", +- "self_type" : "type-428", ++ "referenced_type" : "type-426", ++ "self_type" : "type-426", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", +- "template_args" : [ "type-429" ], ++ "template_args" : [ "type-427" ], + "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE", + "vtable_components" : + [ +@@ -33795,17 +35207,17 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-244" ++ "referenced_type" : "type-243" + } + ], + "linker_set_key" : "android::Vector >", + "name" : "android::Vector >", + "record_kind" : "class", +- "referenced_type" : "type-2516", +- "self_type" : "type-2516", ++ "referenced_type" : "type-2511", ++ "self_type" : "type-2511", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", +- "template_args" : [ "type-2468" ], ++ "template_args" : [ "type-2463" ], + "unique_id" : "_ZTSN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE", + "vtable_components" : + [ +@@ -33850,14 +35262,14 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-244" ++ "referenced_type" : "type-243" + } + ], + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-2512", +- "self_type" : "type-2512", ++ "referenced_type" : "type-2507", ++ "self_type" : "type-2507", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", + "template_args" : [ "type-19" ], +@@ -33907,7 +35319,7 @@ + "access" : "private", + "field_name" : "mStorage", + "field_offset" : 32, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "access" : "private", +@@ -33919,20 +35331,20 @@ + "access" : "private", + "field_name" : "mFlags", + "field_offset" : 96, +- "referenced_type" : "type-246" ++ "referenced_type" : "type-245" + }, + { + "access" : "private", + "field_name" : "mItemSize", + "field_offset" : 128, +- "referenced_type" : "type-246" ++ "referenced_type" : "type-245" + } + ], + "linker_set_key" : "android::VectorImpl", + "name" : "android::VectorImpl", + "record_kind" : "class", +- "referenced_type" : "type-244", +- "self_type" : "type-244", ++ "referenced_type" : "type-243", ++ "self_type" : "type-243", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/VectorImpl.h", + "unique_id" : "_ZTSN7android10VectorImplE", +@@ -33984,14 +35396,14 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-180" ++ "referenced_type" : "type-179" + } + ], + "linker_set_key" : "android::VirtualLightRefBase", + "name" : "android::VirtualLightRefBase", + "record_kind" : "class", +- "referenced_type" : "type-182", +- "self_type" : "type-182", ++ "referenced_type" : "type-181", ++ "self_type" : "type-181", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/LightRefBase.h", + "unique_id" : "_ZTSN7android19VirtualLightRefBaseE", +@@ -34018,22 +35430,22 @@ + "alignment" : 1, + "linker_set_key" : "android::aggregate_traits >", + "name" : "android::aggregate_traits >", +- "referenced_type" : "type-3869", +- "self_type" : "type-3869", ++ "referenced_type" : "type-3862", ++ "self_type" : "type-3862", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-342", "type-71" ], ++ "template_args" : [ "type-341", "type-70" ], + "unique_id" : "_ZTSN7android16aggregate_traitsINS_8String16ENS_2spINS_8hardware7IBinderEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::aggregate_traits", + "name" : "android::aggregate_traits", +- "referenced_type" : "type-2466", +- "self_type" : "type-2466", ++ "referenced_type" : "type-2461", ++ "self_type" : "type-2461", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-139", "type-2344" ], ++ "template_args" : [ "type-138", "type-2339" ], + "unique_id" : "_ZTSN7android16aggregate_traitsIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { +@@ -34041,7 +35453,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2328" ++ "referenced_type" : "type-2323" + } + ], + "fields" : +@@ -34062,20 +35474,20 @@ + "access" : "private", + "field_name" : "mExtras", + "field_offset" : 96, +- "referenced_type" : "type-2334" ++ "referenced_type" : "type-2329" + }, + { + "access" : "private", + "field_name" : "mReserved0", + "field_offset" : 128, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], + "linker_set_key" : "android::hardware::BHwBinder", + "name" : "android::hardware::BHwBinder", + "record_kind" : "class", +- "referenced_type" : "type-2333", +- "self_type" : "type-2333", ++ "referenced_type" : "type-2328", ++ "self_type" : "type-2328", + "size" : 28, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h", + "unique_id" : "_ZTSN7android8hardware9BHwBinderE", +@@ -34181,7 +35593,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2328" ++ "referenced_type" : "type-2323" + } + ], + "fields" : +@@ -34196,50 +35608,50 @@ + "access" : "private", + "field_name" : "mLock", + "field_offset" : 64, +- "referenced_type" : "type-436" ++ "referenced_type" : "type-433" + }, + { + "access" : "private", + "field_name" : "mAlive", + "field_offset" : 96, +- "referenced_type" : "type-2337" ++ "referenced_type" : "type-2332" + }, + { + "access" : "private", + "field_name" : "mObitsSent", + "field_offset" : 128, +- "referenced_type" : "type-2337" ++ "referenced_type" : "type-2332" + }, + { + "access" : "private", + "field_name" : "mObituaries", + "field_offset" : 160, +- "referenced_type" : "type-2338" ++ "referenced_type" : "type-2333" + }, + { + "access" : "private", + "field_name" : "mObjects", + "field_offset" : 192, +- "referenced_type" : "type-2340" ++ "referenced_type" : "type-2335" + }, + { + "access" : "private", + "field_name" : "mConstantData", + "field_offset" : 352, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "access" : "private", + "field_name" : "mDescriptorCache", + "field_offset" : 384, +- "referenced_type" : "type-342" ++ "referenced_type" : "type-341" + } + ], + "linker_set_key" : "android::hardware::BpHwBinder", + "name" : "android::hardware::BpHwBinder", + "record_kind" : "class", +- "referenced_type" : "type-2336", +- "self_type" : "type-2336", ++ "referenced_type" : "type-2331", ++ "self_type" : "type-2331", + "size" : 60, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h", + "unique_id" : "_ZTSN7android8hardware10BpHwBinderE", +@@ -34356,12 +35768,12 @@ + [ + { + "field_name" : "recipient", +- "referenced_type" : "type-944" ++ "referenced_type" : "type-941" + }, + { + "field_name" : "cookie", + "field_offset" : 64, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "field_name" : "flags", +@@ -34371,8 +35783,8 @@ + ], + "linker_set_key" : "android::hardware::BpHwBinder::Obituary", + "name" : "android::hardware::BpHwBinder::Obituary", +- "referenced_type" : "type-2373", +- "self_type" : "type-2373", ++ "referenced_type" : "type-2368", ++ "self_type" : "type-2368", + "size" : 16, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h", + "unique_id" : "_ZTSN7android8hardware10BpHwBinder8ObituaryE" +@@ -34384,14 +35796,14 @@ + { + "access" : "private", + "field_name" : "mObjects", +- "referenced_type" : "type-2341" ++ "referenced_type" : "type-2336" + } + ], + "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager", + "name" : "android::hardware::BpHwBinder::ObjectManager", + "record_kind" : "class", +- "referenced_type" : "type-2340", +- "self_type" : "type-2340", ++ "referenced_type" : "type-2335", ++ "self_type" : "type-2335", + "size" : 20, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h", + "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManagerE" +@@ -34403,23 +35815,23 @@ + [ + { + "field_name" : "object", +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "field_name" : "cleanupCookie", + "field_offset" : 32, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "field_name" : "func", + "field_offset" : 64, +- "referenced_type" : "type-2345" ++ "referenced_type" : "type-2340" + } + ], + "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager::entry_t", + "name" : "android::hardware::BpHwBinder::ObjectManager::entry_t", +- "referenced_type" : "type-2344", +- "self_type" : "type-2344", ++ "referenced_type" : "type-2339", ++ "self_type" : "type-2339", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h", + "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManager7entry_tE" +@@ -34439,7 +35851,7 @@ + "access" : "private", + "field_name" : "mRemote", + "field_offset" : 32, +- "referenced_type" : "type-2365" ++ "referenced_type" : "type-2360" + }, + { + "access" : "private", +@@ -34451,14 +35863,14 @@ + "access" : "private", + "field_name" : "mState", + "field_offset" : 96, +- "referenced_type" : "type-2367" ++ "referenced_type" : "type-2362" + } + ], + "linker_set_key" : "android::hardware::BpHwRefBase", + "name" : "android::hardware::BpHwRefBase", + "record_kind" : "class", +- "referenced_type" : "type-2364", +- "self_type" : "type-2364", ++ "referenced_type" : "type-2359", ++ "self_type" : "type-2359", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h", + "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE", +@@ -34546,7 +35958,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2472" ++ "referenced_type" : "type-2467" + } + ], + "fields" : +@@ -34573,20 +35985,20 @@ + "access" : "private", + "field_name" : "mLock", + "field_offset" : 128, +- "referenced_type" : "type-436" ++ "referenced_type" : "type-433" + }, + { + "access" : "private", + "field_name" : "mGlobalState", + "field_offset" : 160, +- "referenced_type" : "type-2469" ++ "referenced_type" : "type-2464" + } + ], + "linker_set_key" : "android::hardware::BufferedTextOutput", + "name" : "android::hardware::BufferedTextOutput", + "record_kind" : "class", +- "referenced_type" : "type-2504", +- "self_type" : "type-2504", ++ "referenced_type" : "type-2499", ++ "self_type" : "type-2499", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h", + "unique_id" : "_ZTSN7android8hardware18BufferedTextOutputE", +@@ -34658,23 +36070,23 @@ + { + "access" : "private", + "field_name" : "mMutex", +- "referenced_type" : "type-42" ++ "referenced_type" : "type-41" + }, + { + "access" : "private", + "field_name" : "mMap", + "field_offset" : 32, +- "referenced_type" : "type-43" ++ "referenced_type" : "type-42" + } + ], + "linker_set_key" : "android::hardware::ConcurrentMap, bool>", + "name" : "android::hardware::ConcurrentMap, bool>", + "record_kind" : "class", +- "referenced_type" : "type-41", +- "self_type" : "type-41", ++ "referenced_type" : "type-40", ++ "self_type" : "type-40", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-32", "type-44" ], ++ "template_args" : [ "type-32", "type-43" ], + "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEE" + }, + { +@@ -34684,23 +36096,23 @@ + { + "access" : "private", + "field_name" : "mMutex", +- "referenced_type" : "type-379" ++ "referenced_type" : "type-378" + }, + { + "access" : "private", + "field_name" : "mMap", + "field_offset" : 32, +- "referenced_type" : "type-380" ++ "referenced_type" : "type-379" + } + ], + "linker_set_key" : "android::hardware::ConcurrentMap >", + "name" : "android::hardware::ConcurrentMap >", + "record_kind" : "class", +- "referenced_type" : "type-378", +- "self_type" : "type-378", ++ "referenced_type" : "type-377", ++ "self_type" : "type-377", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-381", "type-383" ], ++ "template_args" : [ "type-380", "type-382" ], + "unique_id" : "_ZTSN7android8hardware13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEE" + }, + { +@@ -34710,23 +36122,23 @@ + { + "access" : "private", + "field_name" : "mMutex", +- "referenced_type" : "type-636" ++ "referenced_type" : "type-634" + }, + { + "access" : "private", + "field_name" : "mMap", + "field_offset" : 32, +- "referenced_type" : "type-637" ++ "referenced_type" : "type-635" + } + ], + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "record_kind" : "class", +- "referenced_type" : "type-635", +- "self_type" : "type-635", ++ "referenced_type" : "type-633", ++ "self_type" : "type-633", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-638", "type-639" ], ++ "template_args" : [ "type-636", "type-637" ], + "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEE" + }, + { +@@ -34736,23 +36148,23 @@ + { + "access" : "private", + "field_name" : "mMutex", +- "referenced_type" : "type-399" ++ "referenced_type" : "type-397" + }, + { + "access" : "private", + "field_name" : "mMap", + "field_offset" : 32, +- "referenced_type" : "type-400" ++ "referenced_type" : "type-398" + } + ], + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "record_kind" : "class", +- "referenced_type" : "type-398", +- "self_type" : "type-398", ++ "referenced_type" : "type-396", ++ "self_type" : "type-396", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-401", "type-402" ], ++ "template_args" : [ "type-399", "type-400" ], + "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS0_7IBinderEEEPvEEEEE" + }, + { +@@ -34781,8 +36193,8 @@ + ], + "linker_set_key" : "android::hardware::GrantorDescriptor", + "name" : "android::hardware::GrantorDescriptor", +- "referenced_type" : "type-319", +- "self_type" : "type-319", ++ "referenced_type" : "type-318", ++ "self_type" : "type-318", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h", + "unique_id" : "_ZTSN7android8hardware17GrantorDescriptorE" +@@ -34794,7 +36206,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { + "access" : "private", +@@ -34824,14 +36236,14 @@ + "access" : "private", + "field_name" : "mCArrayStyle", + "field_offset" : 160, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::HexDump", + "name" : "android::hardware::HexDump", + "record_kind" : "class", +- "referenced_type" : "type-2484", +- "self_type" : "type-2484", ++ "referenced_type" : "type-2479", ++ "self_type" : "type-2479", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h", + "unique_id" : "_ZTSN7android8hardware7HexDumpE" +@@ -34842,7 +36254,7 @@ + [ + { + "is_virtual" : true, +- "referenced_type" : "type-121" ++ "referenced_type" : "type-120" + }, + { + "is_virtual" : true, +@@ -34852,8 +36264,8 @@ + "linker_set_key" : "android::hardware::HidlMemory", + "name" : "android::hardware::HidlMemory", + "record_kind" : "class", +- "referenced_type" : "type-159", +- "self_type" : "type-159", ++ "referenced_type" : "type-158", ++ "self_type" : "type-158", + "size" : 56, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "unique_id" : "_ZTSN7android8hardware10HidlMemoryE", +@@ -34940,8 +36352,8 @@ + "linker_set_key" : "android::hardware::IBinder", + "name" : "android::hardware::IBinder", + "record_kind" : "class", +- "referenced_type" : "type-2328", +- "self_type" : "type-2328", ++ "referenced_type" : "type-2323", ++ "self_type" : "type-2323", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h", + "unique_id" : "_ZTSN7android8hardware7IBinderE", +@@ -35057,8 +36469,8 @@ + "linker_set_key" : "android::hardware::IBinder::DeathRecipient", + "name" : "android::hardware::IBinder::DeathRecipient", + "record_kind" : "class", +- "referenced_type" : "type-2378", +- "self_type" : "type-2378", ++ "referenced_type" : "type-2373", ++ "self_type" : "type-2373", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h", + "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE", +@@ -35145,8 +36557,8 @@ + "linker_set_key" : "android::hardware::IInterface", + "name" : "android::hardware::IInterface", + "record_kind" : "class", +- "referenced_type" : "type-2374", +- "self_type" : "type-2374", ++ "referenced_type" : "type-2369", ++ "self_type" : "type-2369", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h", + "unique_id" : "_ZTSN7android8hardware10IInterfaceE", +@@ -35228,43 +36640,43 @@ + { + "access" : "private", + "field_name" : "mProcess", +- "referenced_type" : "type-496" ++ "referenced_type" : "type-494" + }, + { + "access" : "private", + "field_name" : "mPendingStrongDerefs", + "field_offset" : 32, +- "referenced_type" : "type-430" ++ "referenced_type" : "type-428" + }, + { + "access" : "private", + "field_name" : "mPendingWeakDerefs", + "field_offset" : 192, +- "referenced_type" : "type-431" ++ "referenced_type" : "type-429" + }, + { + "access" : "private", + "field_name" : "mPostWriteStrongDerefs", + "field_offset" : 352, +- "referenced_type" : "type-432" ++ "referenced_type" : "type-430" + }, + { + "access" : "private", + "field_name" : "mPostWriteWeakDerefs", + "field_offset" : 512, +- "referenced_type" : "type-431" ++ "referenced_type" : "type-429" + }, + { + "access" : "private", + "field_name" : "mIn", + "field_offset" : 672, +- "referenced_type" : "type-2348" ++ "referenced_type" : "type-2343" + }, + { + "access" : "private", + "field_name" : "mOut", + "field_offset" : 1216, +- "referenced_type" : "type-2348" ++ "referenced_type" : "type-2343" + }, + { + "access" : "private", +@@ -35282,7 +36694,7 @@ + "access" : "private", + "field_name" : "mCallingSid", + "field_offset" : 1824, +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { + "access" : "private", +@@ -35306,44 +36718,44 @@ + "access" : "private", + "field_name" : "mContextObject", + "field_offset" : 1952, +- "referenced_type" : "type-472" ++ "referenced_type" : "type-470" + }, + { + "access" : "private", + "field_name" : "mIsLooper", + "field_offset" : 1984, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "access" : "private", + "field_name" : "mIsPollingThread", + "field_offset" : 1992, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "access" : "private", + "field_name" : "mPostCommandTasks", + "field_offset" : 2016, +- "referenced_type" : "type-2435" ++ "referenced_type" : "type-2430" + }, + { + "access" : "private", + "field_name" : "mIPCThreadStateBase", + "field_offset" : 2112, +- "referenced_type" : "type-2436" ++ "referenced_type" : "type-2431" + }, + { + "access" : "private", + "field_name" : "mCallRestriction", + "field_offset" : 2144, +- "referenced_type" : "type-2432" ++ "referenced_type" : "type-2427" + } + ], + "linker_set_key" : "android::hardware::IPCThreadState", + "name" : "android::hardware::IPCThreadState", + "record_kind" : "class", +- "referenced_type" : "type-2433", +- "self_type" : "type-2433", ++ "referenced_type" : "type-2428", ++ "self_type" : "type-2428", + "size" : 272, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h", + "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE" +@@ -35355,14 +36767,14 @@ + { + "access" : "private", + "field_name" : "mImpl", +- "referenced_type" : "type-531" ++ "referenced_type" : "type-529" + } + ], + "linker_set_key" : "android::hardware::LazyServiceRegistrar", + "name" : "android::hardware::LazyServiceRegistrar", + "record_kind" : "class", +- "referenced_type" : "type-530", +- "self_type" : "type-530", ++ "referenced_type" : "type-528", ++ "self_type" : "type-528", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h", + "unique_id" : "_ZTSN7android8hardware20LazyServiceRegistrarE" +@@ -35374,13 +36786,13 @@ + { + "access" : "private", + "field_name" : "mGrantors", +- "referenced_type" : "type-330" ++ "referenced_type" : "type-329" + }, + { + "access" : "private", + "field_name" : "mHandle", + "field_offset" : 128, +- "referenced_type" : "type-324" ++ "referenced_type" : "type-323" + }, + { + "access" : "private", +@@ -35397,11 +36809,11 @@ + ], + "linker_set_key" : "android::hardware::MQDescriptor", + "name" : "android::hardware::MQDescriptor", +- "referenced_type" : "type-1032", +- "self_type" : "type-1032", ++ "referenced_type" : "type-1029", ++ "self_type" : "type-1029", + "size" : 32, + "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h", +- "template_args" : [ "type-48" ], ++ "template_args" : [ "type-47" ], + "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EEE" + }, + { +@@ -35417,7 +36829,7 @@ + "access" : "private", + "field_name" : "mBufCache", + "field_offset" : 32, +- "referenced_type" : "type-2349" ++ "referenced_type" : "type-2344" + }, + { + "access" : "private", +@@ -35429,7 +36841,7 @@ + "access" : "private", + "field_name" : "mData", + "field_offset" : 160, +- "referenced_type" : "type-291" ++ "referenced_type" : "type-290" + }, + { + "access" : "private", +@@ -35453,7 +36865,7 @@ + "access" : "private", + "field_name" : "mObjects", + "field_offset" : 288, +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + }, + { + "access" : "private", +@@ -35483,38 +36895,38 @@ + "access" : "private", + "field_name" : "mFdsKnown", + "field_offset" : 448, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "access" : "private", + "field_name" : "mHasFds", + "field_offset" : 456, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "access" : "private", + "field_name" : "mAllowFds", + "field_offset" : 464, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "access" : "private", + "field_name" : "mOwner", + "field_offset" : 480, +- "referenced_type" : "type-2350" ++ "referenced_type" : "type-2345" + }, + { + "access" : "private", + "field_name" : "mOwnerCookie", + "field_offset" : 512, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], + "linker_set_key" : "android::hardware::Parcel", + "name" : "android::hardware::Parcel", + "record_kind" : "class", +- "referenced_type" : "type-2348", +- "self_type" : "type-2348", ++ "referenced_type" : "type-2343", ++ "self_type" : "type-2343", + "size" : 68, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", + "unique_id" : "_ZTSN7android8hardware6ParcelE" +@@ -35541,8 +36953,8 @@ + ], + "linker_set_key" : "android::hardware::Parcel::BufferInfo", + "name" : "android::hardware::Parcel::BufferInfo", +- "referenced_type" : "type-2375", +- "self_type" : "type-2375", ++ "referenced_type" : "type-2370", ++ "self_type" : "type-2370", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", + "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE" +@@ -35568,19 +36980,19 @@ + "access" : "private", + "field_name" : "mVMStart", + "field_offset" : 64, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "access" : "private", + "field_name" : "mThreadCountLock", + "field_offset" : 96, +- "referenced_type" : "type-2439" ++ "referenced_type" : "type-2434" + }, + { + "access" : "private", + "field_name" : "mThreadCountDecrement", + "field_offset" : 128, +- "referenced_type" : "type-2440" ++ "referenced_type" : "type-2435" + }, + { + "access" : "private", +@@ -35604,80 +37016,80 @@ + "access" : "private", + "field_name" : "mLock", + "field_offset" : 320, +- "referenced_type" : "type-436" ++ "referenced_type" : "type-433" + }, + { + "access" : "private", + "field_name" : "mHandleToObject", + "field_offset" : 352, +- "referenced_type" : "type-428" ++ "referenced_type" : "type-426" + }, + { + "access" : "private", + "field_name" : "mManagesContexts", + "field_offset" : 512, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "access" : "private", + "field_name" : "mBinderContextCheckFunc", + "field_offset" : 544, +- "referenced_type" : "type-2431" ++ "referenced_type" : "type-2426" + }, + { + "access" : "private", + "field_name" : "mBinderContextUserData", + "field_offset" : 576, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "access" : "private", + "field_name" : "mContexts", + "field_offset" : 608, +- "referenced_type" : "type-433" ++ "referenced_type" : "type-431" + }, + { + "access" : "private", + "field_name" : "mRootDir", + "field_offset" : 768, +- "referenced_type" : "type-221" ++ "referenced_type" : "type-220" + }, + { + "access" : "private", + "field_name" : "mThreadPoolStarted", + "field_offset" : 800, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "access" : "private", + "field_name" : "mSpawnThreadOnStart", + "field_offset" : 808, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "access" : "private", + "field_name" : "mThreadPoolSeq", + "field_offset" : 832, +- "referenced_type" : "type-2337" ++ "referenced_type" : "type-2332" + }, + { + "access" : "private", + "field_name" : "mMmapSize", + "field_offset" : 864, +- "referenced_type" : "type-246" ++ "referenced_type" : "type-245" + }, + { + "access" : "private", + "field_name" : "mCallRestriction", + "field_offset" : 896, +- "referenced_type" : "type-2432" ++ "referenced_type" : "type-2427" + } + ], + "linker_set_key" : "android::hardware::ProcessState", + "name" : "android::hardware::ProcessState", + "record_kind" : "class", +- "referenced_type" : "type-2438", +- "self_type" : "type-2438", ++ "referenced_type" : "type-2433", ++ "self_type" : "type-2433", + "size" : 128, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h", + "unique_id" : "_ZTSN7android8hardware12ProcessStateE", +@@ -35755,7 +37167,7 @@ + [ + { + "field_name" : "binder", +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + }, + { + "field_name" : "refs", +@@ -35765,8 +37177,8 @@ + ], + "linker_set_key" : "android::hardware::ProcessState::handle_entry", + "name" : "android::hardware::ProcessState::handle_entry", +- "referenced_type" : "type-2415", +- "self_type" : "type-2415", ++ "referenced_type" : "type-2410", ++ "self_type" : "type-2410", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h", + "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE" +@@ -35776,7 +37188,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-103" ++ "referenced_type" : "type-102" + } + ], + "fields" : +@@ -35785,17 +37197,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 168, +- "referenced_type" : "type-546" ++ "referenced_type" : "type-544" + } + ], + "linker_set_key" : "android::hardware::Return", + "name" : "android::hardware::Return", + "record_kind" : "class", +- "referenced_type" : "type-807", +- "self_type" : "type-807", ++ "referenced_type" : "type-804", ++ "self_type" : "type-804", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-546" ], ++ "template_args" : [ "type-544" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_4hidl7manager4V1_015IServiceManager9TransportEEE" + }, + { +@@ -35803,7 +37215,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-103" ++ "referenced_type" : "type-102" + } + ], + "fields" : +@@ -35812,17 +37224,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 192, +- "referenced_type" : "type-356" ++ "referenced_type" : "type-355" + } + ], + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-801", +- "self_type" : "type-801", ++ "referenced_type" : "type-798", ++ "self_type" : "type-798", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-356" ], ++ "template_args" : [ "type-355" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl4base4V1_05IBaseEEEEE" + }, + { +@@ -35830,7 +37242,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-103" ++ "referenced_type" : "type-102" + } + ], + "fields" : +@@ -35839,17 +37251,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 192, +- "referenced_type" : "type-575" ++ "referenced_type" : "type-573" + } + ], + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-986", +- "self_type" : "type-986", ++ "referenced_type" : "type-983", ++ "self_type" : "type-983", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-575" ], ++ "template_args" : [ "type-573" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEE" + }, + { +@@ -35857,7 +37269,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-103" ++ "referenced_type" : "type-102" + } + ], + "fields" : +@@ -35866,17 +37278,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 192, +- "referenced_type" : "type-590" ++ "referenced_type" : "type-588" + } + ], + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-1093", +- "self_type" : "type-1093", ++ "referenced_type" : "type-1090", ++ "self_type" : "type-1090", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-590" ], ++ "template_args" : [ "type-588" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEE" + }, + { +@@ -35884,7 +37296,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-103" ++ "referenced_type" : "type-102" + } + ], + "fields" : +@@ -35893,17 +37305,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 192, +- "referenced_type" : "type-580" ++ "referenced_type" : "type-578" + } + ], + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-1153", +- "self_type" : "type-1153", ++ "referenced_type" : "type-1150", ++ "self_type" : "type-1150", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-580" ], ++ "template_args" : [ "type-578" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEE" + }, + { +@@ -35911,7 +37323,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-103" ++ "referenced_type" : "type-102" + } + ], + "fields" : +@@ -35920,17 +37332,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 192, +- "referenced_type" : "type-595" ++ "referenced_type" : "type-593" + } + ], + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-1213", +- "self_type" : "type-1213", ++ "referenced_type" : "type-1210", ++ "self_type" : "type-1210", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-595" ], ++ "template_args" : [ "type-593" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEE" + }, + { +@@ -35938,7 +37350,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-103" ++ "referenced_type" : "type-102" + } + ], + "fields" : +@@ -35947,17 +37359,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 192, +- "referenced_type" : "type-585" ++ "referenced_type" : "type-583" + } + ], + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-1284", +- "self_type" : "type-1284", ++ "referenced_type" : "type-1281", ++ "self_type" : "type-1281", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-585" ], ++ "template_args" : [ "type-583" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEE" + }, + { +@@ -35965,7 +37377,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-103" ++ "referenced_type" : "type-102" + } + ], + "fields" : +@@ -35974,17 +37386,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 168, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::Return", + "name" : "android::hardware::Return", + "record_kind" : "class", +- "referenced_type" : "type-309", +- "self_type" : "type-309", ++ "referenced_type" : "type-308", ++ "self_type" : "type-308", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-44" ], ++ "template_args" : [ "type-43" ], + "unique_id" : "_ZTSN7android8hardware6ReturnIbEE" + }, + { +@@ -35992,17 +37404,17 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-103" ++ "referenced_type" : "type-102" + } + ], + "linker_set_key" : "android::hardware::Return", + "name" : "android::hardware::Return", + "record_kind" : "class", +- "referenced_type" : "type-102", +- "self_type" : "type-102", ++ "referenced_type" : "type-101", ++ "self_type" : "type-101", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-106" ], ++ "template_args" : [ "type-105" ], + "unique_id" : "_ZTSN7android8hardware6ReturnIvEE" + }, + { +@@ -36024,14 +37436,14 @@ + "access" : "private", + "field_name" : "mMessage", + "field_offset" : 64, +- "referenced_type" : "type-105" ++ "referenced_type" : "type-104" + } + ], + "linker_set_key" : "android::hardware::Status", + "name" : "android::hardware::Status", + "record_kind" : "class", +- "referenced_type" : "type-104", +- "self_type" : "type-104", ++ "referenced_type" : "type-103", ++ "self_type" : "type-103", + "size" : 20, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", + "unique_id" : "_ZTSN7android8hardware6StatusE" +@@ -36041,8 +37453,8 @@ + "linker_set_key" : "android::hardware::TextOutput", + "name" : "android::hardware::TextOutput", + "record_kind" : "class", +- "referenced_type" : "type-2472", +- "self_type" : "type-2472", ++ "referenced_type" : "type-2467", ++ "self_type" : "type-2467", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h", + "unique_id" : "_ZTSN7android8hardware10TextOutputE", +@@ -36088,14 +37500,14 @@ + { + "access" : "private", + "field_name" : "mTO", +- "referenced_type" : "type-2474" ++ "referenced_type" : "type-2469" + } + ], + "linker_set_key" : "android::hardware::TextOutput::Bundle", + "name" : "android::hardware::TextOutput::Bundle", + "record_kind" : "class", +- "referenced_type" : "type-2473", +- "self_type" : "type-2473", ++ "referenced_type" : "type-2468", ++ "self_type" : "type-2468", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h", + "unique_id" : "_ZTSN7android8hardware10TextOutput6BundleE" +@@ -36113,8 +37525,8 @@ + "linker_set_key" : "android::hardware::TypeCode", + "name" : "android::hardware::TypeCode", + "record_kind" : "class", +- "referenced_type" : "type-2480", +- "self_type" : "type-2480", ++ "referenced_type" : "type-2475", ++ "self_type" : "type-2475", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h", + "unique_id" : "_ZTSN7android8hardware8TypeCodeE" +@@ -36126,14 +37538,14 @@ + { + "access" : "private", + "field_name" : "buffer", +- "referenced_type" : "type-47" ++ "referenced_type" : "type-46" + } + ], + "linker_set_key" : "android::hardware::details::DoNotDestruct, android::hardware::details::SchedPrio> >", + "name" : "android::hardware::details::DoNotDestruct, android::hardware::details::SchedPrio> >", + "record_kind" : "class", +- "referenced_type" : "type-46", +- "self_type" : "type-46", ++ "referenced_type" : "type-45", ++ "self_type" : "type-45", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", + "template_args" : [ "type-29" ], +@@ -36146,17 +37558,17 @@ + { + "access" : "private", + "field_name" : "buffer", +- "referenced_type" : "type-47" ++ "referenced_type" : "type-46" + } + ], + "linker_set_key" : "android::hardware::details::DoNotDestruct, bool> >", + "name" : "android::hardware::details::DoNotDestruct, bool> >", + "record_kind" : "class", +- "referenced_type" : "type-51", +- "self_type" : "type-51", ++ "referenced_type" : "type-50", ++ "self_type" : "type-50", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-41" ], ++ "template_args" : [ "type-40" ], + "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEEEE" + }, + { +@@ -36166,17 +37578,17 @@ + { + "access" : "private", + "field_name" : "buffer", +- "referenced_type" : "type-47" ++ "referenced_type" : "type-46" + } + ], + "linker_set_key" : "android::hardware::details::DoNotDestruct > >", + "name" : "android::hardware::details::DoNotDestruct > >", + "record_kind" : "class", +- "referenced_type" : "type-412", +- "self_type" : "type-412", ++ "referenced_type" : "type-410", ++ "self_type" : "type-410", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-378" ], ++ "template_args" : [ "type-377" ], + "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEEEE" + }, + { +@@ -36186,17 +37598,17 @@ + { + "access" : "private", + "field_name" : "buffer", +- "referenced_type" : "type-47" ++ "referenced_type" : "type-46" + } + ], + "linker_set_key" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > >", + "name" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > >", + "record_kind" : "class", +- "referenced_type" : "type-649", +- "self_type" : "type-649", ++ "referenced_type" : "type-647", ++ "self_type" : "type-647", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-635" ], ++ "template_args" : [ "type-633" ], + "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEEEE" + }, + { +@@ -36206,17 +37618,17 @@ + { + "access" : "private", + "field_name" : "buffer", +- "referenced_type" : "type-47" ++ "referenced_type" : "type-46" + } + ], + "linker_set_key" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > >", + "name" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > >", + "record_kind" : "class", +- "referenced_type" : "type-414", +- "self_type" : "type-414", ++ "referenced_type" : "type-412", ++ "self_type" : "type-412", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-398" ], ++ "template_args" : [ "type-396" ], + "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS0_7IBinderEEEPvEEEEEEE" + }, + { +@@ -36227,31 +37639,31 @@ + "access" : "protected", + "field_name" : "mInstrumentationCallbacks", + "field_offset" : 32, +- "referenced_type" : "type-146" ++ "referenced_type" : "type-145" + }, + { + "access" : "protected", + "field_name" : "mEnableInstrumentation", + "field_offset" : 128, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "access" : "protected", + "field_name" : "mInstrumentationLibPackage", + "field_offset" : 160, +- "referenced_type" : "type-147" ++ "referenced_type" : "type-146" + }, + { + "access" : "protected", + "field_name" : "mInterfaceName", + "field_offset" : 256, +- "referenced_type" : "type-148" ++ "referenced_type" : "type-147" + } + ], + "linker_set_key" : "android::hardware::details::HidlInstrumentor", + "name" : "android::hardware::details::HidlInstrumentor", +- "referenced_type" : "type-145", +- "self_type" : "type-145", ++ "referenced_type" : "type-144", ++ "self_type" : "type-144", + "size" : 44, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE", +@@ -36303,14 +37715,14 @@ + { + "access" : "private", + "field_name" : "mQueue", +- "referenced_type" : "type-270" ++ "referenced_type" : "type-269" + } + ], + "linker_set_key" : "android::hardware::details::TaskRunner", + "name" : "android::hardware::details::TaskRunner", + "record_kind" : "class", +- "referenced_type" : "type-269", +- "self_type" : "type-269", ++ "referenced_type" : "type-268", ++ "self_type" : "type-268", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h", + "unique_id" : "_ZTSN7android8hardware7details10TaskRunnerE" +@@ -36319,8 +37731,8 @@ + "alignment" : 1, + "linker_set_key" : "android::hardware::details::bnhw_tag", + "name" : "android::hardware::details::bnhw_tag", +- "referenced_type" : "type-234", +- "self_type" : "type-234", ++ "referenced_type" : "type-233", ++ "self_type" : "type-233", + "size" : 1, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE" +@@ -36329,8 +37741,8 @@ + "alignment" : 1, + "linker_set_key" : "android::hardware::details::bphw_tag", + "name" : "android::hardware::details::bphw_tag", +- "referenced_type" : "type-284", +- "self_type" : "type-284", ++ "referenced_type" : "type-283", ++ "self_type" : "type-283", + "size" : 1, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE" +@@ -36339,8 +37751,8 @@ + "alignment" : 1, + "linker_set_key" : "android::hardware::details::bs_tag", + "name" : "android::hardware::details::bs_tag", +- "referenced_type" : "type-295", +- "self_type" : "type-295", ++ "referenced_type" : "type-294", ++ "self_type" : "type-294", + "size" : 1, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details6bs_tagE" +@@ -36352,7 +37764,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-318" ++ "referenced_type" : "type-317" + }, + { + "field_name" : "_pad", +@@ -36363,8 +37775,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-317", +- "self_type" : "type-317", ++ "referenced_type" : "type-316", ++ "self_type" : "type-316", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E" +@@ -36376,7 +37788,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-837" ++ "referenced_type" : "type-834" + }, + { + "field_name" : "_pad", +@@ -36387,8 +37799,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-836", +- "self_type" : "type-836", ++ "referenced_type" : "type-833", ++ "self_type" : "type-833", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEUt_E" +@@ -36399,16 +37811,16 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-317" ++ "referenced_type" : "type-316" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer", + "name" : "android::hardware::details::hidl_pointer", +- "referenced_type" : "type-316", +- "self_type" : "type-316", ++ "referenced_type" : "type-315", ++ "self_type" : "type-315", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", +- "template_args" : [ "type-319" ], ++ "template_args" : [ "type-318" ], + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEE" + }, + { +@@ -36417,16 +37829,16 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-1010" ++ "referenced_type" : "type-1007" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer >", + "name" : "android::hardware::details::hidl_pointer >", +- "referenced_type" : "type-1009", +- "self_type" : "type-1009", ++ "referenced_type" : "type-1006", ++ "self_type" : "type-1006", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", +- "template_args" : [ "type-1012" ], ++ "template_args" : [ "type-1009" ], + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEE" + }, + { +@@ -36435,16 +37847,16 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-621" ++ "referenced_type" : "type-619" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer", + "name" : "android::hardware::details::hidl_pointer", +- "referenced_type" : "type-620", +- "self_type" : "type-620", ++ "referenced_type" : "type-618", ++ "self_type" : "type-618", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", +- "template_args" : [ "type-96" ], ++ "template_args" : [ "type-95" ], + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEE" + }, + { +@@ -36453,16 +37865,16 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-836" ++ "referenced_type" : "type-833" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer", + "name" : "android::hardware::details::hidl_pointer", +- "referenced_type" : "type-835", +- "self_type" : "type-835", ++ "referenced_type" : "type-832", ++ "self_type" : "type-832", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", +- "template_args" : [ "type-548" ], ++ "template_args" : [ "type-546" ], + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE" + }, + { +@@ -36471,16 +37883,16 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-1026" ++ "referenced_type" : "type-1023" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer", + "name" : "android::hardware::details::hidl_pointer", +- "referenced_type" : "type-1025", +- "self_type" : "type-1025", ++ "referenced_type" : "type-1022", ++ "self_type" : "type-1022", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", +- "template_args" : [ "type-48" ], ++ "template_args" : [ "type-47" ], + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEE" + }, + { +@@ -36490,7 +37902,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-243" ++ "referenced_type" : "type-242" + }, + { + "field_name" : "_pad", +@@ -36501,8 +37913,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-1026", +- "self_type" : "type-1026", ++ "referenced_type" : "type-1023", ++ "self_type" : "type-1023", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEUt_E" +@@ -36513,16 +37925,16 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-98" ++ "referenced_type" : "type-97" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer", + "name" : "android::hardware::details::hidl_pointer", +- "referenced_type" : "type-97", +- "self_type" : "type-97", ++ "referenced_type" : "type-96", ++ "self_type" : "type-96", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", +- "template_args" : [ "type-100" ], ++ "template_args" : [ "type-99" ], + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE" + }, + { +@@ -36532,7 +37944,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { + "field_name" : "_pad", +@@ -36543,8 +37955,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-98", +- "self_type" : "type-98", ++ "referenced_type" : "type-97", ++ "self_type" : "type-97", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEUt_E" +@@ -36598,7 +38010,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-1011" ++ "referenced_type" : "type-1008" + }, + { + "field_name" : "_pad", +@@ -36609,8 +38021,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-1010", +- "self_type" : "type-1010", ++ "referenced_type" : "type-1007", ++ "self_type" : "type-1007", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEUt_E" +@@ -36622,7 +38034,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { + "field_name" : "_pad", +@@ -36633,8 +38045,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-621", +- "self_type" : "type-621", ++ "referenced_type" : "type-619", ++ "self_type" : "type-619", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEUt_E" +@@ -36645,13 +38057,13 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-520" ++ "referenced_type" : "type-518" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer", + "name" : "android::hardware::details::hidl_pointer", +- "referenced_type" : "type-519", +- "self_type" : "type-519", ++ "referenced_type" : "type-517", ++ "self_type" : "type-517", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "template_args" : [ "type-19" ], +@@ -36664,7 +38076,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-521" ++ "referenced_type" : "type-519" + }, + { + "field_name" : "_pad", +@@ -36675,8 +38087,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-520", +- "self_type" : "type-520", ++ "referenced_type" : "type-518", ++ "self_type" : "type-518", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEUt_E" +@@ -36687,13 +38099,13 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-325" ++ "referenced_type" : "type-324" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer", + "name" : "android::hardware::details::hidl_pointer", +- "referenced_type" : "type-324", +- "self_type" : "type-324", ++ "referenced_type" : "type-323", ++ "self_type" : "type-323", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "template_args" : [ "type-18" ], +@@ -36706,7 +38118,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-91" ++ "referenced_type" : "type-90" + }, + { + "field_name" : "_pad", +@@ -36717,8 +38129,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-325", +- "self_type" : "type-325", ++ "referenced_type" : "type-324", ++ "self_type" : "type-324", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E" +@@ -36727,8 +38139,8 @@ + "alignment" : 1, + "linker_set_key" : "android::hardware::details::i_tag", + "name" : "android::hardware::details::i_tag", +- "referenced_type" : "type-133", +- "self_type" : "type-133", ++ "referenced_type" : "type-132", ++ "self_type" : "type-132", + "size" : 1, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details5i_tagE" +@@ -36740,20 +38152,20 @@ + { + "access" : "private", + "field_name" : "mStatus", +- "referenced_type" : "type-104" ++ "referenced_type" : "type-103" + }, + { + "access" : "private", + "field_name" : "mCheckedStatus", + "field_offset" : 160, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::details::return_status", + "name" : "android::hardware::details::return_status", + "record_kind" : "class", +- "referenced_type" : "type-103", +- "self_type" : "type-103", ++ "referenced_type" : "type-102", ++ "self_type" : "type-102", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", + "unique_id" : "_ZTSN7android8hardware7details13return_statusE" +@@ -36762,11 +38174,11 @@ + "alignment" : 1, + "linker_set_key" : "android::hardware::details::std_array", + "name" : "android::hardware::details::std_array", +- "referenced_type" : "type-1029", +- "self_type" : "type-1029", ++ "referenced_type" : "type-1025", ++ "self_type" : "type-1025", + "size" : 1, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", +- "template_args" : [ "type-199" ], ++ "template_args" : [ "type-198" ], + "unique_id" : "_ZTSN7android8hardware7details9std_arrayIhLj32EJEEE" + }, + { +@@ -36776,16 +38188,16 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-1013" ++ "referenced_type" : "type-1010" + } + ], + "linker_set_key" : "android::hardware::hidl_array", + "name" : "android::hardware::hidl_array", +- "referenced_type" : "type-1012", +- "self_type" : "type-1012", ++ "referenced_type" : "type-1009", ++ "self_type" : "type-1009", + "size" : 32, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", +- "template_args" : [ "type-199" ], ++ "template_args" : [ "type-198" ], + "unique_id" : "_ZTSN7android8hardware10hidl_arrayIhLj32EJEEE" + }, + { +@@ -36793,7 +38205,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-362" ++ "referenced_type" : "type-361" + } + ], + "fields" : +@@ -36802,7 +38214,7 @@ + "access" : "private", + "field_name" : "mRecipient", + "field_offset" : 32, +- "referenced_type" : "type-361" ++ "referenced_type" : "type-360" + }, + { + "access" : "private", +@@ -36819,8 +38231,8 @@ + ], + "linker_set_key" : "android::hardware::hidl_binder_death_recipient", + "name" : "android::hardware::hidl_binder_death_recipient", +- "referenced_type" : "type-360", +- "self_type" : "type-360", ++ "referenced_type" : "type-359", ++ "self_type" : "type-359", + "size" : 40, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h", + "unique_id" : "_ZTSN7android8hardware27hidl_binder_death_recipientE", +@@ -36905,8 +38317,8 @@ + ], + "linker_set_key" : "android::hardware::hidl_death_recipient", + "name" : "android::hardware::hidl_death_recipient", +- "referenced_type" : "type-144", +- "self_type" : "type-144", ++ "referenced_type" : "type-143", ++ "self_type" : "type-143", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE", +@@ -36994,13 +38406,13 @@ + "access" : "private", + "field_name" : "mOwnsHandle", + "field_offset" : 64, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::hidl_handle", + "name" : "android::hardware::hidl_handle", +- "referenced_type" : "type-77", +- "self_type" : "type-77", ++ "referenced_type" : "type-76", ++ "self_type" : "type-76", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "unique_id" : "_ZTSN7android8hardware11hidl_handleE" +@@ -37012,7 +38424,7 @@ + { + "access" : "private", + "field_name" : "mHandle", +- "referenced_type" : "type-77" ++ "referenced_type" : "type-76" + }, + { + "access" : "private", +@@ -37024,13 +38436,13 @@ + "access" : "private", + "field_name" : "mName", + "field_offset" : 192, +- "referenced_type" : "type-96" ++ "referenced_type" : "type-95" + } + ], + "linker_set_key" : "android::hardware::hidl_memory", + "name" : "android::hardware::hidl_memory", +- "referenced_type" : "type-121", +- "self_type" : "type-121", ++ "referenced_type" : "type-120", ++ "self_type" : "type-120", + "size" : 40, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "unique_id" : "_ZTSN7android8hardware11hidl_memoryE" +@@ -37042,7 +38454,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-97" ++ "referenced_type" : "type-96" + }, + { + "access" : "private", +@@ -37054,13 +38466,13 @@ + "access" : "private", + "field_name" : "mOwnsBuffer", + "field_offset" : 96, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::hidl_string", + "name" : "android::hardware::hidl_string", +- "referenced_type" : "type-96", +- "self_type" : "type-96", ++ "referenced_type" : "type-95", ++ "self_type" : "type-95", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "unique_id" : "_ZTSN7android8hardware11hidl_stringE" +@@ -37072,7 +38484,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-316" ++ "referenced_type" : "type-315" + }, + { + "access" : "private", +@@ -37084,16 +38496,16 @@ + "access" : "private", + "field_name" : "mOwnsBuffer", + "field_offset" : 96, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::hidl_vec", + "name" : "android::hardware::hidl_vec", +- "referenced_type" : "type-330", +- "self_type" : "type-330", ++ "referenced_type" : "type-329", ++ "self_type" : "type-329", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", +- "template_args" : [ "type-319" ], ++ "template_args" : [ "type-318" ], + "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_17GrantorDescriptorEEE" + }, + { +@@ -37103,7 +38515,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-1009" ++ "referenced_type" : "type-1006" + }, + { + "access" : "private", +@@ -37115,16 +38527,16 @@ + "access" : "private", + "field_name" : "mOwnsBuffer", + "field_offset" : 96, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::hidl_vec >", + "name" : "android::hardware::hidl_vec >", +- "referenced_type" : "type-1008", +- "self_type" : "type-1008", ++ "referenced_type" : "type-1005", ++ "self_type" : "type-1005", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", +- "template_args" : [ "type-1012" ], ++ "template_args" : [ "type-1009" ], + "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEE" + }, + { +@@ -37134,7 +38546,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-620" ++ "referenced_type" : "type-618" + }, + { + "access" : "private", +@@ -37146,16 +38558,16 @@ + "access" : "private", + "field_name" : "mOwnsBuffer", + "field_offset" : 96, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::hidl_vec", + "name" : "android::hardware::hidl_vec", +- "referenced_type" : "type-619", +- "self_type" : "type-619", ++ "referenced_type" : "type-617", ++ "self_type" : "type-617", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", +- "template_args" : [ "type-96" ], ++ "template_args" : [ "type-95" ], + "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEEE" + }, + { +@@ -37165,7 +38577,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-835" ++ "referenced_type" : "type-832" + }, + { + "access" : "private", +@@ -37177,16 +38589,16 @@ + "access" : "private", + "field_name" : "mOwnsBuffer", + "field_offset" : 96, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::hidl_vec", + "name" : "android::hardware::hidl_vec", +- "referenced_type" : "type-834", +- "self_type" : "type-834", ++ "referenced_type" : "type-831", ++ "self_type" : "type-831", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", +- "template_args" : [ "type-548" ], ++ "template_args" : [ "type-546" ], + "unique_id" : "_ZTSN7android8hardware8hidl_vecINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE" + }, + { +@@ -37196,7 +38608,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-1025" ++ "referenced_type" : "type-1022" + }, + { + "access" : "private", +@@ -37208,16 +38620,16 @@ + "access" : "private", + "field_name" : "mOwnsBuffer", + "field_offset" : 96, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::hidl_vec", + "name" : "android::hardware::hidl_vec", +- "referenced_type" : "type-1024", +- "self_type" : "type-1024", ++ "referenced_type" : "type-1021", ++ "self_type" : "type-1021", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", +- "template_args" : [ "type-48" ], ++ "template_args" : [ "type-47" ], + "unique_id" : "_ZTSN7android8hardware8hidl_vecIcEE" + }, + { +@@ -37225,7 +38637,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-626" ++ "referenced_type" : "type-623" + } + ], + "fields" : +@@ -37233,14 +38645,14 @@ + { + "access" : "private", + "field_name" : "mPtr", +- "referenced_type" : "type-117" ++ "referenced_type" : "type-116" + } + ], + "linker_set_key" : "android::hardware::hidl_vec::iter", + "name" : "android::hardware::hidl_vec::iter", + "record_kind" : "class", +- "referenced_type" : "type-625", +- "self_type" : "type-625", ++ "referenced_type" : "type-622", ++ "self_type" : "type-622", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEE4iterILb1EEE" +@@ -37252,7 +38664,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-519" ++ "referenced_type" : "type-517" + }, + { + "access" : "private", +@@ -37264,13 +38676,13 @@ + "access" : "private", + "field_name" : "mOwnsBuffer", + "field_offset" : 96, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::hidl_vec", + "name" : "android::hardware::hidl_vec", +- "referenced_type" : "type-518", +- "self_type" : "type-518", ++ "referenced_type" : "type-516", ++ "self_type" : "type-516", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "template_args" : [ "type-19" ], +@@ -37283,19 +38695,19 @@ + { + "access" : "private", + "field_name" : "mMajor", +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + }, + { + "access" : "private", + "field_name" : "mMinor", + "field_offset" : 16, +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + } + ], + "linker_set_key" : "android::hardware::hidl_version", + "name" : "android::hardware::hidl_version", +- "referenced_type" : "type-131", +- "self_type" : "type-131", ++ "referenced_type" : "type-130", ++ "self_type" : "type-130", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "unique_id" : "_ZTSN7android8hardware12hidl_versionE" +@@ -37305,10 +38717,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-357" ++ "referenced_type" : "type-356" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -37317,13 +38729,13 @@ + "access" : "private", + "field_name" : "_hidl_mImpl", + "field_offset" : 512, +- "referenced_type" : "type-356" ++ "referenced_type" : "type-355" + } + ], + "linker_set_key" : "android::hidl::base::V1_0::BnHwBase", + "name" : "android::hidl::base::V1_0::BnHwBase", +- "referenced_type" : "type-355", +- "self_type" : "type-355", ++ "referenced_type" : "type-354", ++ "self_type" : "type-354", + "size" : 76, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h", + "unique_id" : "_ZTSN7android4hidl4base4V1_08BnHwBaseE", +@@ -37445,10 +38857,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-422" ++ "referenced_type" : "type-420" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -37457,19 +38869,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 544, +- "referenced_type" : "type-420" ++ "referenced_type" : "type-418" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 576, +- "referenced_type" : "type-421" ++ "referenced_type" : "type-419" + } + ], + "linker_set_key" : "android::hidl::base::V1_0::BpHwBase", + "name" : "android::hidl::base::V1_0::BpHwBase", +- "referenced_type" : "type-419", +- "self_type" : "type-419", ++ "referenced_type" : "type-417", ++ "self_type" : "type-417", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h", + "unique_id" : "_ZTSN7android4hidl4base4V1_08BpHwBaseE", +@@ -37655,7 +39067,7 @@ + "referenced_type" : "type-34" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -37664,19 +39076,19 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 384, +- "referenced_type" : "type-459" ++ "referenced_type" : "type-456" + }, + { + "access" : "private", + "field_name" : "mOnewayQueue", + "field_offset" : 416, +- "referenced_type" : "type-269" ++ "referenced_type" : "type-268" + } + ], + "linker_set_key" : "android::hidl::base::V1_0::BsBase", + "name" : "android::hidl::base::V1_0::BsBase", +- "referenced_type" : "type-2248", +- "self_type" : "type-2248", ++ "referenced_type" : "type-2243", ++ "self_type" : "type-2243", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h", + "unique_id" : "_ZTSN7android4hidl4base4V1_06BsBaseE", +@@ -37812,13 +39224,13 @@ + { + "field_name" : "arch", + "field_offset" : 128, +- "referenced_type" : "type-336" ++ "referenced_type" : "type-335" + } + ], + "linker_set_key" : "android::hidl::base::V1_0::DebugInfo", + "name" : "android::hidl::base::V1_0::DebugInfo", +- "referenced_type" : "type-335", +- "self_type" : "type-335", ++ "referenced_type" : "type-334", ++ "self_type" : "type-334", + "size" : 24, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h", + "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfoE" +@@ -37944,7 +39356,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-355" ++ "referenced_type" : "type-354" + } + ], + "fields" : +@@ -37953,13 +39365,13 @@ + "access" : "private", + "field_name" : "_hidl_mImpl", + "field_offset" : 544, +- "referenced_type" : "type-575" ++ "referenced_type" : "type-573" + } + ], + "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager", + "name" : "android::hidl::manager::V1_0::BnHwServiceManager", +- "referenced_type" : "type-871", +- "self_type" : "type-871", ++ "referenced_type" : "type-868", ++ "self_type" : "type-868", + "size" : 80, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_018BnHwServiceManagerE", +@@ -38081,7 +39493,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-355" ++ "referenced_type" : "type-354" + } + ], + "fields" : +@@ -38090,13 +39502,13 @@ + "access" : "private", + "field_name" : "_hidl_mImpl", + "field_offset" : 544, +- "referenced_type" : "type-590" ++ "referenced_type" : "type-588" + } + ], + "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification", + "name" : "android::hidl::manager::V1_0::BnHwServiceNotification", +- "referenced_type" : "type-862", +- "self_type" : "type-862", ++ "referenced_type" : "type-859", ++ "self_type" : "type-859", + "size" : 80, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_023BnHwServiceNotificationE", +@@ -38218,10 +39630,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-876" ++ "referenced_type" : "type-873" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -38230,19 +39642,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 544, +- "referenced_type" : "type-874" ++ "referenced_type" : "type-871" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 576, +- "referenced_type" : "type-875" ++ "referenced_type" : "type-872" + } + ], + "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager", + "name" : "android::hidl::manager::V1_0::BpHwServiceManager", +- "referenced_type" : "type-873", +- "self_type" : "type-873", ++ "referenced_type" : "type-870", ++ "self_type" : "type-870", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_018BpHwServiceManagerE", +@@ -38449,10 +39861,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-867" ++ "referenced_type" : "type-864" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -38461,19 +39873,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 544, +- "referenced_type" : "type-865" ++ "referenced_type" : "type-862" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 576, +- "referenced_type" : "type-866" ++ "referenced_type" : "type-863" + } + ], + "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification", + "name" : "android::hidl::manager::V1_0::BpHwServiceNotification", +- "referenced_type" : "type-864", +- "self_type" : "type-864", ++ "referenced_type" : "type-861", ++ "self_type" : "type-861", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_023BpHwServiceNotificationE", +@@ -38659,10 +40071,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-552" ++ "referenced_type" : "type-548" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -38671,19 +40083,19 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 384, +- "referenced_type" : "type-578" ++ "referenced_type" : "type-576" + }, + { + "access" : "private", + "field_name" : "mOnewayQueue", + "field_offset" : 416, +- "referenced_type" : "type-269" ++ "referenced_type" : "type-268" + } + ], + "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager", + "name" : "android::hidl::manager::V1_0::BsServiceManager", +- "referenced_type" : "type-957", +- "self_type" : "type-957", ++ "referenced_type" : "type-954", ++ "self_type" : "type-954", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_016BsServiceManagerE", +@@ -38832,10 +40244,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-541" ++ "referenced_type" : "type-539" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -38844,19 +40256,19 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 384, +- "referenced_type" : "type-593" ++ "referenced_type" : "type-591" + }, + { + "access" : "private", + "field_name" : "mOnewayQueue", + "field_offset" : 416, +- "referenced_type" : "type-269" ++ "referenced_type" : "type-268" + } + ], + "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification", + "name" : "android::hidl::manager::V1_0::BsServiceNotification", +- "referenced_type" : "type-1084", +- "self_type" : "type-1084", ++ "referenced_type" : "type-1081", ++ "self_type" : "type-1081", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_021BsServiceNotificationE", +@@ -38989,8 +40401,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager", + "name" : "android::hidl::manager::V1_0::IServiceManager", +- "referenced_type" : "type-552", +- "self_type" : "type-552", ++ "referenced_type" : "type-548", ++ "self_type" : "type-548", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManagerE", +@@ -39132,12 +40544,12 @@ + [ + { + "field_name" : "interfaceName", +- "referenced_type" : "type-96" ++ "referenced_type" : "type-95" + }, + { + "field_name" : "instanceName", + "field_offset" : 128, +- "referenced_type" : "type-96" ++ "referenced_type" : "type-95" + }, + { + "field_name" : "pid", +@@ -39147,18 +40559,18 @@ + { + "field_name" : "clientPids", + "field_offset" : 320, +- "referenced_type" : "type-518" ++ "referenced_type" : "type-516" + }, + { + "field_name" : "arch", + "field_offset" : 448, +- "referenced_type" : "type-336" ++ "referenced_type" : "type-335" + } + ], + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo", + "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo", +- "referenced_type" : "type-548", +- "self_type" : "type-548", ++ "referenced_type" : "type-546", ++ "self_type" : "type-546", + "size" : 64, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoE" +@@ -39173,8 +40585,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification", + "name" : "android::hidl::manager::V1_0::IServiceNotification", +- "referenced_type" : "type-541", +- "self_type" : "type-541", ++ "referenced_type" : "type-539", ++ "self_type" : "type-539", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_020IServiceNotificationE", +@@ -39287,7 +40699,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-355" ++ "referenced_type" : "type-354" + } + ], + "fields" : +@@ -39296,13 +40708,13 @@ + "access" : "private", + "field_name" : "_hidl_mImpl", + "field_offset" : 544, +- "referenced_type" : "type-580" ++ "referenced_type" : "type-578" + } + ], + "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager", + "name" : "android::hidl::manager::V1_1::BnHwServiceManager", +- "referenced_type" : "type-879", +- "self_type" : "type-879", ++ "referenced_type" : "type-876", ++ "self_type" : "type-876", + "size" : 80, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_118BnHwServiceManagerE", +@@ -39424,10 +40836,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-884" ++ "referenced_type" : "type-881" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -39436,19 +40848,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 544, +- "referenced_type" : "type-882" ++ "referenced_type" : "type-879" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 576, +- "referenced_type" : "type-883" ++ "referenced_type" : "type-880" + } + ], + "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager", + "name" : "android::hidl::manager::V1_1::BpHwServiceManager", +- "referenced_type" : "type-881", +- "self_type" : "type-881", ++ "referenced_type" : "type-878", ++ "self_type" : "type-878", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_118BpHwServiceManagerE", +@@ -39658,10 +41070,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-562" ++ "referenced_type" : "type-560" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -39670,19 +41082,19 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 384, +- "referenced_type" : "type-583" ++ "referenced_type" : "type-581" + }, + { + "access" : "private", + "field_name" : "mOnewayQueue", + "field_offset" : 416, +- "referenced_type" : "type-269" ++ "referenced_type" : "type-268" + } + ], + "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager", + "name" : "android::hidl::manager::V1_1::BsServiceManager", +- "referenced_type" : "type-1140", +- "self_type" : "type-1140", ++ "referenced_type" : "type-1137", ++ "self_type" : "type-1137", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_116BsServiceManagerE", +@@ -39834,13 +41246,13 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-552" ++ "referenced_type" : "type-548" + } + ], + "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager", + "name" : "android::hidl::manager::V1_1::IServiceManager", +- "referenced_type" : "type-562", +- "self_type" : "type-562", ++ "referenced_type" : "type-560", ++ "self_type" : "type-560", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_115IServiceManagerE", +@@ -39985,7 +41397,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-355" ++ "referenced_type" : "type-354" + } + ], + "fields" : +@@ -39994,13 +41406,13 @@ + "access" : "private", + "field_name" : "_hidl_mImpl", + "field_offset" : 544, +- "referenced_type" : "type-595" ++ "referenced_type" : "type-593" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback", + "name" : "android::hidl::manager::V1_2::BnHwClientCallback", +- "referenced_type" : "type-888", +- "self_type" : "type-888", ++ "referenced_type" : "type-884", ++ "self_type" : "type-884", + "size" : 80, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_218BnHwClientCallbackE", +@@ -40122,7 +41534,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-355" ++ "referenced_type" : "type-354" + } + ], + "fields" : +@@ -40131,13 +41543,13 @@ + "access" : "private", + "field_name" : "_hidl_mImpl", + "field_offset" : 544, +- "referenced_type" : "type-585" ++ "referenced_type" : "type-583" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager", + "name" : "android::hidl::manager::V1_2::BnHwServiceManager", +- "referenced_type" : "type-845", +- "self_type" : "type-845", ++ "referenced_type" : "type-842", ++ "self_type" : "type-842", + "size" : 80, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_218BnHwServiceManagerE", +@@ -40259,10 +41671,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-893" ++ "referenced_type" : "type-890" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -40271,19 +41683,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 544, +- "referenced_type" : "type-891" ++ "referenced_type" : "type-888" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 576, +- "referenced_type" : "type-892" ++ "referenced_type" : "type-889" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback", + "name" : "android::hidl::manager::V1_2::BpHwClientCallback", +- "referenced_type" : "type-890", +- "self_type" : "type-890", ++ "referenced_type" : "type-887", ++ "self_type" : "type-887", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_218BpHwClientCallbackE", +@@ -40469,10 +41881,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-777" ++ "referenced_type" : "type-773" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -40481,19 +41893,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 544, +- "referenced_type" : "type-775" ++ "referenced_type" : "type-771" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 576, +- "referenced_type" : "type-776" ++ "referenced_type" : "type-772" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager", + "name" : "android::hidl::manager::V1_2::BpHwServiceManager", +- "referenced_type" : "type-774", +- "self_type" : "type-774", ++ "referenced_type" : "type-770", ++ "self_type" : "type-770", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_218BpHwServiceManagerE", +@@ -40718,10 +42130,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-544" ++ "referenced_type" : "type-542" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -40730,19 +42142,19 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 384, +- "referenced_type" : "type-600" ++ "referenced_type" : "type-598" + }, + { + "access" : "private", + "field_name" : "mOnewayQueue", + "field_offset" : 416, +- "referenced_type" : "type-269" ++ "referenced_type" : "type-268" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback", + "name" : "android::hidl::manager::V1_2::BsClientCallback", +- "referenced_type" : "type-1197", +- "self_type" : "type-1197", ++ "referenced_type" : "type-1194", ++ "self_type" : "type-1194", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_216BsClientCallbackE", +@@ -40870,10 +42282,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-565" ++ "referenced_type" : "type-563" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -40882,19 +42294,19 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 384, +- "referenced_type" : "type-588" ++ "referenced_type" : "type-586" + }, + { + "access" : "private", + "field_name" : "mOnewayQueue", + "field_offset" : 416, +- "referenced_type" : "type-269" ++ "referenced_type" : "type-268" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager", + "name" : "android::hidl::manager::V1_2::BsServiceManager", +- "referenced_type" : "type-1271", +- "self_type" : "type-1271", ++ "referenced_type" : "type-1268", ++ "self_type" : "type-1268", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_216BsServiceManagerE", +@@ -41066,8 +42478,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback", + "name" : "android::hidl::manager::V1_2::IClientCallback", +- "referenced_type" : "type-544", +- "self_type" : "type-544", ++ "referenced_type" : "type-542", ++ "self_type" : "type-542", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_215IClientCallbackE", +@@ -41180,13 +42592,13 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-562" ++ "referenced_type" : "type-560" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager", + "name" : "android::hidl::manager::V1_2::IServiceManager", +- "referenced_type" : "type-565", +- "self_type" : "type-565", ++ "referenced_type" : "type-563", ++ "self_type" : "type-563", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_215IServiceManagerE", +@@ -41352,21 +42764,21 @@ + [ + { + "field_name" : "key", +- "referenced_type" : "type-342" ++ "referenced_type" : "type-341" + }, + { + "field_name" : "value", + "field_offset" : 32, +- "referenced_type" : "type-71" ++ "referenced_type" : "type-70" + } + ], + "linker_set_key" : "android::key_value_pair_t >", + "name" : "android::key_value_pair_t >", +- "referenced_type" : "type-3805", +- "self_type" : "type-3805", ++ "referenced_type" : "type-3798", ++ "self_type" : "type-3798", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-342", "type-71" ], ++ "template_args" : [ "type-341", "type-70" ], + "unique_id" : "_ZTSN7android16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEE" + }, + { +@@ -41375,21 +42787,21 @@ + [ + { + "field_name" : "key", +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { + "field_name" : "value", + "field_offset" : 32, +- "referenced_type" : "type-2344" ++ "referenced_type" : "type-2339" + } + ], + "linker_set_key" : "android::key_value_pair_t", + "name" : "android::key_value_pair_t", +- "referenced_type" : "type-2383", +- "self_type" : "type-2383", ++ "referenced_type" : "type-2378", ++ "self_type" : "type-2378", + "size" : 16, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-139", "type-2344" ], ++ "template_args" : [ "type-138", "type-2339" ], + "unique_id" : "_ZTSN7android16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { +@@ -41399,17 +42811,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-500" ++ "referenced_type" : "type-498" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-499", +- "self_type" : "type-499", ++ "referenced_type" : "type-497", ++ "self_type" : "type-497", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-501" ], ++ "template_args" : [ "type-499" ], + "unique_id" : "_ZTSN7android2spINS_6ThreadEEE" + }, + { +@@ -41419,17 +42831,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-384" ++ "referenced_type" : "type-383" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-472", +- "self_type" : "type-472", ++ "referenced_type" : "type-470", ++ "self_type" : "type-470", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-473" ], ++ "template_args" : [ "type-471" ], + "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE" + }, + { +@@ -41439,17 +42851,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-2469" ++ "referenced_type" : "type-2464" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-2468", +- "self_type" : "type-2468", ++ "referenced_type" : "type-2463", ++ "self_type" : "type-2463", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-2471" ], ++ "template_args" : [ "type-2466" ], + "unique_id" : "_ZTSN7android2spINS_8hardware18BufferedTextOutput11BufferStateEEE" + }, + { +@@ -41459,17 +42871,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-158" ++ "referenced_type" : "type-157" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-157", +- "self_type" : "type-157", ++ "referenced_type" : "type-156", ++ "self_type" : "type-156", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-159" ], ++ "template_args" : [ "type-158" ], + "unique_id" : "_ZTSN7android2spINS_8hardware10HidlMemoryEEE" + }, + { +@@ -41479,17 +42891,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-945" ++ "referenced_type" : "type-942" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-962", +- "self_type" : "type-962", ++ "referenced_type" : "type-959", ++ "self_type" : "type-959", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-963" ], ++ "template_args" : [ "type-960" ], + "unique_id" : "_ZTSN7android2spINS_8hardware7IBinder14DeathRecipientEEE" + }, + { +@@ -41499,17 +42911,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-72" ++ "referenced_type" : "type-71" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-71", +- "self_type" : "type-71", ++ "referenced_type" : "type-70", ++ "self_type" : "type-70", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-74" ], ++ "template_args" : [ "type-73" ], + "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE" + }, + { +@@ -41519,17 +42931,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-969" ++ "referenced_type" : "type-966" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-968", +- "self_type" : "type-968", ++ "referenced_type" : "type-965", ++ "self_type" : "type-965", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-971" ], ++ "template_args" : [ "type-968" ], + "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE" + }, + { +@@ -41539,17 +42951,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-767" ++ "referenced_type" : "type-764" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-766", +- "self_type" : "type-766", ++ "referenced_type" : "type-763", ++ "self_type" : "type-763", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-769" ], ++ "template_args" : [ "type-766" ], + "unique_id" : "_ZTSN7android2spINS_8hardware25PassthroughServiceManagerEEE" + }, + { +@@ -41559,17 +42971,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-492" ++ "referenced_type" : "type-490" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-491", +- "self_type" : "type-491", ++ "referenced_type" : "type-489", ++ "self_type" : "type-489", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-494" ], ++ "template_args" : [ "type-492" ], + "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE" + }, + { +@@ -41579,17 +42991,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-598" ++ "referenced_type" : "type-596" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-602", +- "self_type" : "type-602", ++ "referenced_type" : "type-600", ++ "self_type" : "type-600", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-603" ], ++ "template_args" : [ "type-601" ], + "unique_id" : "_ZTSN7android2spINS_8hardware7details21ClientCounterCallbackEEE" + }, + { +@@ -41599,17 +43011,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-784" ++ "referenced_type" : "type-781" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-789", +- "self_type" : "type-789", ++ "referenced_type" : "type-786", ++ "self_type" : "type-786", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-790" ], ++ "template_args" : [ "type-787" ], + "unique_id" : "_ZTSN7android2spINS_8hardware7details6WaiterEEE" + }, + { +@@ -41619,17 +43031,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-363" ++ "referenced_type" : "type-362" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-951", +- "self_type" : "type-951", ++ "referenced_type" : "type-948", ++ "self_type" : "type-948", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-360" ], ++ "template_args" : [ "type-359" ], + "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE" + }, + { +@@ -41639,17 +43051,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-143" ++ "referenced_type" : "type-142" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-142", +- "self_type" : "type-142", ++ "referenced_type" : "type-141", ++ "self_type" : "type-141", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-144" ], ++ "template_args" : [ "type-143" ], + "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE" + }, + { +@@ -41665,8 +43077,8 @@ + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-356", +- "self_type" : "type-356", ++ "referenced_type" : "type-355", ++ "self_type" : "type-355", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", + "template_args" : [ "type-34" ], +@@ -41679,17 +43091,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-575", +- "self_type" : "type-575", ++ "referenced_type" : "type-573", ++ "self_type" : "type-573", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-552" ], ++ "template_args" : [ "type-548" ], + "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE" + }, + { +@@ -41699,17 +43111,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-590", +- "self_type" : "type-590", ++ "referenced_type" : "type-588", ++ "self_type" : "type-588", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-541" ], ++ "template_args" : [ "type-539" ], + "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE" + }, + { +@@ -41719,17 +43131,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-580", +- "self_type" : "type-580", ++ "referenced_type" : "type-578", ++ "self_type" : "type-578", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-562" ], ++ "template_args" : [ "type-560" ], + "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE" + }, + { +@@ -41739,17 +43151,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-595", +- "self_type" : "type-595", ++ "referenced_type" : "type-593", ++ "self_type" : "type-593", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-544" ], ++ "template_args" : [ "type-542" ], + "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IClientCallbackEEE" + }, + { +@@ -41759,36 +43171,36 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-585", +- "self_type" : "type-585", ++ "referenced_type" : "type-583", ++ "self_type" : "type-583", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-565" ], ++ "template_args" : [ "type-563" ], + "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3744", +- "self_type" : "type-3744", ++ "referenced_type" : "type-3737", ++ "self_type" : "type-3737", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-68" ], ++ "template_args" : [ "type-67" ], + "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBaseEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3743", +- "self_type" : "type-3743", ++ "referenced_type" : "type-3736", ++ "self_type" : "type-3736", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-35" ], +@@ -41798,118 +43210,118 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3863", +- "self_type" : "type-3863", ++ "referenced_type" : "type-3856", ++ "self_type" : "type-3856", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-342" ], ++ "template_args" : [ "type-341" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_8String16EEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3742", +- "self_type" : "type-3742", ++ "referenced_type" : "type-3735", ++ "self_type" : "type-3735", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2332" ], ++ "template_args" : [ "type-2327" ], + "unique_id" : "_ZTSN7android13trait_pointerIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-2461", +- "self_type" : "type-2461", ++ "referenced_type" : "type-2456", ++ "self_type" : "type-2456", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2373" ], ++ "template_args" : [ "type-2368" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-2460", +- "self_type" : "type-2460", ++ "referenced_type" : "type-2455", ++ "self_type" : "type-2455", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2344" ], ++ "template_args" : [ "type-2339" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3861", +- "self_type" : "type-3861", ++ "referenced_type" : "type-3854", ++ "self_type" : "type-3854", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2415" ], ++ "template_args" : [ "type-2410" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer > >", + "name" : "android::trait_pointer > >", +- "referenced_type" : "type-3862", +- "self_type" : "type-3862", ++ "referenced_type" : "type-3855", ++ "self_type" : "type-3855", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3805" ], ++ "template_args" : [ "type-3798" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer >", + "name" : "android::trait_pointer >", +- "referenced_type" : "type-2458", +- "self_type" : "type-2458", ++ "referenced_type" : "type-2453", ++ "self_type" : "type-2453", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2383" ], ++ "template_args" : [ "type-2378" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer >", + "name" : "android::trait_pointer >", +- "referenced_type" : "type-2528", +- "self_type" : "type-2528", ++ "referenced_type" : "type-2523", ++ "self_type" : "type-2523", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2468" ], ++ "template_args" : [ "type-2463" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer >", + "name" : "android::trait_pointer >", +- "referenced_type" : "type-3864", +- "self_type" : "type-3864", ++ "referenced_type" : "type-3857", ++ "self_type" : "type-3857", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-71" ], ++ "template_args" : [ "type-70" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware7IBinderEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-2459", +- "self_type" : "type-2459", ++ "referenced_type" : "type-2454", ++ "self_type" : "type-2454", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-139" ], ++ "template_args" : [ "type-138" ], + "unique_id" : "_ZTSN7android13trait_pointerIPKvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3882", +- "self_type" : "type-3882", ++ "referenced_type" : "type-3875", ++ "self_type" : "type-3875", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-19" ], +@@ -41919,19 +43331,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-3738", +- "self_type" : "type-3738", ++ "referenced_type" : "type-3731", ++ "self_type" : "type-3731", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-68" ], ++ "template_args" : [ "type-67" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBaseEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-3737", +- "self_type" : "type-3737", ++ "referenced_type" : "type-3730", ++ "self_type" : "type-3730", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-35" ], +@@ -41941,140 +43353,140 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-3855", +- "self_type" : "type-3855", ++ "referenced_type" : "type-3848", ++ "self_type" : "type-3848", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-342" ], ++ "template_args" : [ "type-341" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8String16EEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-3734", +- "self_type" : "type-3734", ++ "referenced_type" : "type-3727", ++ "self_type" : "type-3727", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2332" ], ++ "template_args" : [ "type-2327" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-2453", +- "self_type" : "type-2453", ++ "referenced_type" : "type-2448", ++ "self_type" : "type-2448", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2373" ], ++ "template_args" : [ "type-2368" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-2451", +- "self_type" : "type-2451", ++ "referenced_type" : "type-2446", ++ "self_type" : "type-2446", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2344" ], ++ "template_args" : [ "type-2339" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-3854", +- "self_type" : "type-3854", ++ "referenced_type" : "type-3847", ++ "self_type" : "type-3847", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2415" ], ++ "template_args" : [ "type-2410" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy > >", + "name" : "android::trait_trivial_copy > >", +- "referenced_type" : "type-3857", +- "self_type" : "type-3857", ++ "referenced_type" : "type-3850", ++ "self_type" : "type-3850", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3805" ], ++ "template_args" : [ "type-3798" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy >", + "name" : "android::trait_trivial_copy >", +- "referenced_type" : "type-2452", +- "self_type" : "type-2452", ++ "referenced_type" : "type-2447", ++ "self_type" : "type-2447", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2383" ], ++ "template_args" : [ "type-2378" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy >", + "name" : "android::trait_trivial_copy >", +- "referenced_type" : "type-2526", +- "self_type" : "type-2526", ++ "referenced_type" : "type-2521", ++ "self_type" : "type-2521", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2468" ], ++ "template_args" : [ "type-2463" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy >", + "name" : "android::trait_trivial_copy >", +- "referenced_type" : "type-3856", +- "self_type" : "type-3856", ++ "referenced_type" : "type-3849", ++ "self_type" : "type-3849", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-71" ], ++ "template_args" : [ "type-70" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware7IBinderEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-191", +- "self_type" : "type-191", ++ "referenced_type" : "type-190", ++ "self_type" : "type-190", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-44" ], ++ "template_args" : [ "type-43" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-196", +- "self_type" : "type-196", ++ "referenced_type" : "type-195", ++ "self_type" : "type-195", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-48" ], ++ "template_args" : [ "type-47" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-2450", +- "self_type" : "type-2450", ++ "referenced_type" : "type-2445", ++ "self_type" : "type-2445", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-139" ], ++ "template_args" : [ "type-138" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIPKvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-529", +- "self_type" : "type-529", ++ "referenced_type" : "type-527", ++ "self_type" : "type-527", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-4" ], +@@ -42084,19 +43496,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-512", +- "self_type" : "type-512", ++ "referenced_type" : "type-511", ++ "self_type" : "type-511", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-298" ], ++ "template_args" : [ "type-297" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-326", +- "self_type" : "type-326", ++ "referenced_type" : "type-325", ++ "self_type" : "type-325", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-19" ], +@@ -42106,8 +43518,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-466", +- "self_type" : "type-466", ++ "referenced_type" : "type-465", ++ "self_type" : "type-465", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-447" ], +@@ -42117,19 +43529,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-395", +- "self_type" : "type-395", ++ "referenced_type" : "type-394", ++ "self_type" : "type-394", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-111" ], ++ "template_args" : [ "type-110" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-205", +- "self_type" : "type-205", ++ "referenced_type" : "type-204", ++ "self_type" : "type-204", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-2" ], +@@ -42139,19 +43551,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-201", +- "self_type" : "type-201", ++ "referenced_type" : "type-200", ++ "self_type" : "type-200", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-199" ], ++ "template_args" : [ "type-198" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-354", +- "self_type" : "type-354", ++ "referenced_type" : "type-353", ++ "self_type" : "type-353", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-1" ], +@@ -42161,8 +43573,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-504", +- "self_type" : "type-504", ++ "referenced_type" : "type-502", ++ "self_type" : "type-502", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-21" ], +@@ -42172,52 +43584,52 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-434", +- "self_type" : "type-434", ++ "referenced_type" : "type-432", ++ "self_type" : "type-432", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-416" ], ++ "template_args" : [ "type-415" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyImEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-211", +- "self_type" : "type-211", ++ "referenced_type" : "type-210", ++ "self_type" : "type-210", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-132" ], ++ "template_args" : [ "type-131" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyItEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-187", +- "self_type" : "type-187", ++ "referenced_type" : "type-186", ++ "self_type" : "type-186", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-106" ], ++ "template_args" : [ "type-105" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-3681", +- "self_type" : "type-3681", ++ "referenced_type" : "type-3674", ++ "self_type" : "type-3674", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-68" ], ++ "template_args" : [ "type-67" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBaseEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-3671", +- "self_type" : "type-3671", ++ "referenced_type" : "type-3664", ++ "self_type" : "type-3664", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-35" ], +@@ -42227,140 +43639,140 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-3848", +- "self_type" : "type-3848", ++ "referenced_type" : "type-3841", ++ "self_type" : "type-3841", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-342" ], ++ "template_args" : [ "type-341" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8String16EEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-3660", +- "self_type" : "type-3660", ++ "referenced_type" : "type-3653", ++ "self_type" : "type-3653", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2332" ], ++ "template_args" : [ "type-2327" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-2445", +- "self_type" : "type-2445", ++ "referenced_type" : "type-2440", ++ "self_type" : "type-2440", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2373" ], ++ "template_args" : [ "type-2368" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-2444", +- "self_type" : "type-2444", ++ "referenced_type" : "type-2439", ++ "self_type" : "type-2439", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2344" ], ++ "template_args" : [ "type-2339" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-3846", +- "self_type" : "type-3846", ++ "referenced_type" : "type-3839", ++ "self_type" : "type-3839", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2415" ], ++ "template_args" : [ "type-2410" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor > >", + "name" : "android::trait_trivial_ctor > >", +- "referenced_type" : "type-3847", +- "self_type" : "type-3847", ++ "referenced_type" : "type-3840", ++ "self_type" : "type-3840", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3805" ], ++ "template_args" : [ "type-3798" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor >", + "name" : "android::trait_trivial_ctor >", +- "referenced_type" : "type-2442", +- "self_type" : "type-2442", ++ "referenced_type" : "type-2437", ++ "self_type" : "type-2437", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2383" ], ++ "template_args" : [ "type-2378" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor >", + "name" : "android::trait_trivial_ctor >", +- "referenced_type" : "type-2467", +- "self_type" : "type-2467", ++ "referenced_type" : "type-2462", ++ "self_type" : "type-2462", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2468" ], ++ "template_args" : [ "type-2463" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor >", + "name" : "android::trait_trivial_ctor >", +- "referenced_type" : "type-3849", +- "self_type" : "type-3849", ++ "referenced_type" : "type-3842", ++ "self_type" : "type-3842", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-71" ], ++ "template_args" : [ "type-70" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware7IBinderEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-189", +- "self_type" : "type-189", ++ "referenced_type" : "type-188", ++ "self_type" : "type-188", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-44" ], ++ "template_args" : [ "type-43" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-193", +- "self_type" : "type-193", ++ "referenced_type" : "type-192", ++ "self_type" : "type-192", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-48" ], ++ "template_args" : [ "type-47" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-2443", +- "self_type" : "type-2443", ++ "referenced_type" : "type-2438", ++ "self_type" : "type-2438", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-139" ], ++ "template_args" : [ "type-138" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIPKvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-522", +- "self_type" : "type-522", ++ "referenced_type" : "type-520", ++ "self_type" : "type-520", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-4" ], +@@ -42370,19 +43782,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-508", +- "self_type" : "type-508", ++ "referenced_type" : "type-506", ++ "self_type" : "type-506", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-298" ], ++ "template_args" : [ "type-297" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-213", +- "self_type" : "type-213", ++ "referenced_type" : "type-212", ++ "self_type" : "type-212", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-19" ], +@@ -42403,19 +43815,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-364", +- "self_type" : "type-364", ++ "referenced_type" : "type-363", ++ "self_type" : "type-363", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-111" ], ++ "template_args" : [ "type-110" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-203", +- "self_type" : "type-203", ++ "referenced_type" : "type-202", ++ "self_type" : "type-202", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-2" ], +@@ -42425,19 +43837,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-198", +- "self_type" : "type-198", ++ "referenced_type" : "type-197", ++ "self_type" : "type-197", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-199" ], ++ "template_args" : [ "type-198" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-337", +- "self_type" : "type-337", ++ "referenced_type" : "type-336", ++ "self_type" : "type-336", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-1" ], +@@ -42447,8 +43859,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-486", +- "self_type" : "type-486", ++ "referenced_type" : "type-485", ++ "self_type" : "type-485", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-21" ], +@@ -42458,52 +43870,52 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-415", +- "self_type" : "type-415", ++ "referenced_type" : "type-414", ++ "self_type" : "type-414", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-416" ], ++ "template_args" : [ "type-415" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorImEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-209", +- "self_type" : "type-209", ++ "referenced_type" : "type-208", ++ "self_type" : "type-208", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-132" ], ++ "template_args" : [ "type-131" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-185", +- "self_type" : "type-185", ++ "referenced_type" : "type-184", ++ "self_type" : "type-184", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-106" ], ++ "template_args" : [ "type-105" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-3732", +- "self_type" : "type-3732", ++ "referenced_type" : "type-3725", ++ "self_type" : "type-3725", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-68" ], ++ "template_args" : [ "type-67" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBaseEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-3724", +- "self_type" : "type-3724", ++ "referenced_type" : "type-3717", ++ "self_type" : "type-3717", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-35" ], +@@ -42513,140 +43925,140 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-3851", +- "self_type" : "type-3851", ++ "referenced_type" : "type-3844", ++ "self_type" : "type-3844", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-342" ], ++ "template_args" : [ "type-341" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8String16EEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-3713", +- "self_type" : "type-3713", ++ "referenced_type" : "type-3706", ++ "self_type" : "type-3706", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2332" ], ++ "template_args" : [ "type-2327" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-2449", +- "self_type" : "type-2449", ++ "referenced_type" : "type-2444", ++ "self_type" : "type-2444", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2373" ], ++ "template_args" : [ "type-2368" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-2447", +- "self_type" : "type-2447", ++ "referenced_type" : "type-2442", ++ "self_type" : "type-2442", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2344" ], ++ "template_args" : [ "type-2339" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-3850", +- "self_type" : "type-3850", ++ "referenced_type" : "type-3843", ++ "self_type" : "type-3843", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2415" ], ++ "template_args" : [ "type-2410" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor > >", + "name" : "android::trait_trivial_dtor > >", +- "referenced_type" : "type-3853", +- "self_type" : "type-3853", ++ "referenced_type" : "type-3846", ++ "self_type" : "type-3846", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3805" ], ++ "template_args" : [ "type-3798" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor >", + "name" : "android::trait_trivial_dtor >", +- "referenced_type" : "type-2448", +- "self_type" : "type-2448", ++ "referenced_type" : "type-2443", ++ "self_type" : "type-2443", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2383" ], ++ "template_args" : [ "type-2378" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor >", + "name" : "android::trait_trivial_dtor >", +- "referenced_type" : "type-2525", +- "self_type" : "type-2525", ++ "referenced_type" : "type-2520", ++ "self_type" : "type-2520", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2468" ], ++ "template_args" : [ "type-2463" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor >", + "name" : "android::trait_trivial_dtor >", +- "referenced_type" : "type-3852", +- "self_type" : "type-3852", ++ "referenced_type" : "type-3845", ++ "self_type" : "type-3845", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-71" ], ++ "template_args" : [ "type-70" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware7IBinderEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-190", +- "self_type" : "type-190", ++ "referenced_type" : "type-189", ++ "self_type" : "type-189", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-44" ], ++ "template_args" : [ "type-43" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-195", +- "self_type" : "type-195", ++ "referenced_type" : "type-194", ++ "self_type" : "type-194", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-48" ], ++ "template_args" : [ "type-47" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-2446", +- "self_type" : "type-2446", ++ "referenced_type" : "type-2441", ++ "self_type" : "type-2441", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-139" ], ++ "template_args" : [ "type-138" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIPKvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-526", +- "self_type" : "type-526", ++ "referenced_type" : "type-524", ++ "self_type" : "type-524", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-4" ], +@@ -42656,19 +44068,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-509", +- "self_type" : "type-509", ++ "referenced_type" : "type-507", ++ "self_type" : "type-507", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-298" ], ++ "template_args" : [ "type-297" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-323", +- "self_type" : "type-323", ++ "referenced_type" : "type-322", ++ "self_type" : "type-322", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-19" ], +@@ -42678,8 +44090,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-458", +- "self_type" : "type-458", ++ "referenced_type" : "type-457", ++ "self_type" : "type-457", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-447" ], +@@ -42689,19 +44101,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-375", +- "self_type" : "type-375", ++ "referenced_type" : "type-374", ++ "self_type" : "type-374", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-111" ], ++ "template_args" : [ "type-110" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-204", +- "self_type" : "type-204", ++ "referenced_type" : "type-203", ++ "self_type" : "type-203", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-2" ], +@@ -42711,19 +44123,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-200", +- "self_type" : "type-200", ++ "referenced_type" : "type-199", ++ "self_type" : "type-199", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-199" ], ++ "template_args" : [ "type-198" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-346", +- "self_type" : "type-346", ++ "referenced_type" : "type-345", ++ "self_type" : "type-345", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-1" ], +@@ -42733,8 +44145,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-497", +- "self_type" : "type-497", ++ "referenced_type" : "type-496", ++ "self_type" : "type-496", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-21" ], +@@ -42744,52 +44156,52 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-425", +- "self_type" : "type-425", ++ "referenced_type" : "type-423", ++ "self_type" : "type-423", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-416" ], ++ "template_args" : [ "type-415" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorImEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-210", +- "self_type" : "type-210", ++ "referenced_type" : "type-209", ++ "self_type" : "type-209", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-132" ], ++ "template_args" : [ "type-131" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-186", +- "self_type" : "type-186", ++ "referenced_type" : "type-185", ++ "self_type" : "type-185", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-106" ], ++ "template_args" : [ "type-105" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-3741", +- "self_type" : "type-3741", ++ "referenced_type" : "type-3734", ++ "self_type" : "type-3734", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-68" ], ++ "template_args" : [ "type-67" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBaseEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-3740", +- "self_type" : "type-3740", ++ "referenced_type" : "type-3733", ++ "self_type" : "type-3733", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-35" ], +@@ -42799,151 +44211,151 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-353", +- "self_type" : "type-353", ++ "referenced_type" : "type-352", ++ "self_type" : "type-352", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/String16.h", +- "template_args" : [ "type-342" ], ++ "template_args" : [ "type-341" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-228", +- "self_type" : "type-228", ++ "referenced_type" : "type-227", ++ "self_type" : "type-227", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/String8.h", +- "template_args" : [ "type-221" ], ++ "template_args" : [ "type-220" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-3739", +- "self_type" : "type-3739", ++ "referenced_type" : "type-3732", ++ "self_type" : "type-3732", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2332" ], ++ "template_args" : [ "type-2327" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-2457", +- "self_type" : "type-2457", ++ "referenced_type" : "type-2452", ++ "self_type" : "type-2452", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2373" ], ++ "template_args" : [ "type-2368" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-2455", +- "self_type" : "type-2455", ++ "referenced_type" : "type-2450", ++ "self_type" : "type-2450", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2344" ], ++ "template_args" : [ "type-2339" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-3858", +- "self_type" : "type-3858", ++ "referenced_type" : "type-3851", ++ "self_type" : "type-3851", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2415" ], ++ "template_args" : [ "type-2410" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move > >", + "name" : "android::trait_trivial_move > >", +- "referenced_type" : "type-3860", +- "self_type" : "type-3860", ++ "referenced_type" : "type-3853", ++ "self_type" : "type-3853", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3805" ], ++ "template_args" : [ "type-3798" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move >", + "name" : "android::trait_trivial_move >", +- "referenced_type" : "type-2456", +- "self_type" : "type-2456", ++ "referenced_type" : "type-2451", ++ "self_type" : "type-2451", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2383" ], ++ "template_args" : [ "type-2378" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move >", + "name" : "android::trait_trivial_move >", +- "referenced_type" : "type-2527", +- "self_type" : "type-2527", ++ "referenced_type" : "type-2522", ++ "self_type" : "type-2522", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2468" ], ++ "template_args" : [ "type-2463" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move >", + "name" : "android::trait_trivial_move >", +- "referenced_type" : "type-3859", +- "self_type" : "type-3859", ++ "referenced_type" : "type-3852", ++ "self_type" : "type-3852", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-71" ], ++ "template_args" : [ "type-70" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware7IBinderEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-192", +- "self_type" : "type-192", ++ "referenced_type" : "type-191", ++ "self_type" : "type-191", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-44" ], ++ "template_args" : [ "type-43" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-197", +- "self_type" : "type-197", ++ "referenced_type" : "type-196", ++ "self_type" : "type-196", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-48" ], ++ "template_args" : [ "type-47" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-2454", +- "self_type" : "type-2454", ++ "referenced_type" : "type-2449", ++ "self_type" : "type-2449", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-139" ], ++ "template_args" : [ "type-138" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIPKvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-536", +- "self_type" : "type-536", ++ "referenced_type" : "type-534", ++ "self_type" : "type-534", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-4" ], +@@ -42953,19 +44365,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-514", +- "self_type" : "type-514", ++ "referenced_type" : "type-512", ++ "self_type" : "type-512", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-298" ], ++ "template_args" : [ "type-297" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-331", +- "self_type" : "type-331", ++ "referenced_type" : "type-330", ++ "self_type" : "type-330", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-19" ], +@@ -42975,8 +44387,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-477", +- "self_type" : "type-477", ++ "referenced_type" : "type-475", ++ "self_type" : "type-475", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-447" ], +@@ -42986,19 +44398,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-406", +- "self_type" : "type-406", ++ "referenced_type" : "type-405", ++ "self_type" : "type-405", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-111" ], ++ "template_args" : [ "type-110" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-208", +- "self_type" : "type-208", ++ "referenced_type" : "type-207", ++ "self_type" : "type-207", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-2" ], +@@ -43008,19 +44420,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-202", +- "self_type" : "type-202", ++ "referenced_type" : "type-201", ++ "self_type" : "type-201", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-199" ], ++ "template_args" : [ "type-198" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-359", +- "self_type" : "type-359", ++ "referenced_type" : "type-358", ++ "self_type" : "type-358", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-1" ], +@@ -43030,8 +44442,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-505", +- "self_type" : "type-505", ++ "referenced_type" : "type-503", ++ "self_type" : "type-503", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-21" ], +@@ -43045,48 +44457,48 @@ + "self_type" : "type-435", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-416" ], ++ "template_args" : [ "type-415" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveImEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-212", +- "self_type" : "type-212", ++ "referenced_type" : "type-211", ++ "self_type" : "type-211", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-132" ], ++ "template_args" : [ "type-131" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveItEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-188", +- "self_type" : "type-188", ++ "referenced_type" : "type-187", ++ "self_type" : "type-187", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-106" ], ++ "template_args" : [ "type-105" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3747", +- "self_type" : "type-3747", ++ "referenced_type" : "type-3740", ++ "self_type" : "type-3740", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-68" ], ++ "template_args" : [ "type-67" ], + "unique_id" : "_ZTSN7android6traitsIPNS_7RefBaseEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3746", +- "self_type" : "type-3746", ++ "referenced_type" : "type-3739", ++ "self_type" : "type-3739", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-35" ], +@@ -43096,118 +44508,118 @@ + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3867", +- "self_type" : "type-3867", ++ "referenced_type" : "type-3860", ++ "self_type" : "type-3860", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-342" ], ++ "template_args" : [ "type-341" ], + "unique_id" : "_ZTSN7android6traitsINS_8String16EEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3745", +- "self_type" : "type-3745", ++ "referenced_type" : "type-3738", ++ "self_type" : "type-3738", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2332" ], ++ "template_args" : [ "type-2327" ], + "unique_id" : "_ZTSN7android6traitsIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-2465", +- "self_type" : "type-2465", ++ "referenced_type" : "type-2460", ++ "self_type" : "type-2460", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2373" ], ++ "template_args" : [ "type-2368" ], + "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-2464", +- "self_type" : "type-2464", ++ "referenced_type" : "type-2459", ++ "self_type" : "type-2459", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2344" ], ++ "template_args" : [ "type-2339" ], + "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3865", +- "self_type" : "type-3865", ++ "referenced_type" : "type-3858", ++ "self_type" : "type-3858", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2415" ], ++ "template_args" : [ "type-2410" ], + "unique_id" : "_ZTSN7android6traitsINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits > >", + "name" : "android::traits > >", +- "referenced_type" : "type-3866", +- "self_type" : "type-3866", ++ "referenced_type" : "type-3859", ++ "self_type" : "type-3859", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3805" ], ++ "template_args" : [ "type-3798" ], + "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits >", + "name" : "android::traits >", +- "referenced_type" : "type-2462", +- "self_type" : "type-2462", ++ "referenced_type" : "type-2457", ++ "self_type" : "type-2457", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2383" ], ++ "template_args" : [ "type-2378" ], + "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits >", + "name" : "android::traits >", +- "referenced_type" : "type-2529", +- "self_type" : "type-2529", ++ "referenced_type" : "type-2524", ++ "self_type" : "type-2524", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2468" ], ++ "template_args" : [ "type-2463" ], + "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits >", + "name" : "android::traits >", +- "referenced_type" : "type-3868", +- "self_type" : "type-3868", ++ "referenced_type" : "type-3861", ++ "self_type" : "type-3861", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-71" ], ++ "template_args" : [ "type-70" ], + "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware7IBinderEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-2463", +- "self_type" : "type-2463", ++ "referenced_type" : "type-2458", ++ "self_type" : "type-2458", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-139" ], ++ "template_args" : [ "type-138" ], + "unique_id" : "_ZTSN7android6traitsIPKvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3883", +- "self_type" : "type-3883", ++ "referenced_type" : "type-3876", ++ "self_type" : "type-3876", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-19" ], +@@ -43218,16 +44630,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3616" ++ "referenced_type" : "type-3609" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-3615", +- "self_type" : "type-3615", ++ "referenced_type" : "type-3608", ++ "self_type" : "type-3608", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-68" ], ++ "template_args" : [ "type-67" ], + "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBaseEEE" + }, + { +@@ -43235,13 +44647,13 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3614" ++ "referenced_type" : "type-3607" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-3613", +- "self_type" : "type-3613", ++ "referenced_type" : "type-3606", ++ "self_type" : "type-3606", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-35" ], +@@ -43252,16 +44664,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3612" ++ "referenced_type" : "type-3605" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-3611", +- "self_type" : "type-3611", ++ "referenced_type" : "type-3604", ++ "self_type" : "type-3604", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2332" ], ++ "template_args" : [ "type-2327" ], + "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_8hardware9BHwBinderEEE" + }, + { +@@ -43269,16 +44681,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2395" ++ "referenced_type" : "type-2390" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-2394", +- "self_type" : "type-2394", ++ "referenced_type" : "type-2389", ++ "self_type" : "type-2389", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2373" ], ++ "template_args" : [ "type-2368" ], + "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { +@@ -43286,16 +44698,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3814" ++ "referenced_type" : "type-3807" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-3813", +- "self_type" : "type-3813", ++ "referenced_type" : "type-3806", ++ "self_type" : "type-3806", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2415" ], ++ "template_args" : [ "type-2410" ], + "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware12ProcessState12handle_entryEEE" + }, + { +@@ -43303,16 +44715,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3816" ++ "referenced_type" : "type-3809" + } + ], + "linker_set_key" : "android::use_trivial_move > >", + "name" : "android::use_trivial_move > >", +- "referenced_type" : "type-3815", +- "self_type" : "type-3815", ++ "referenced_type" : "type-3808", ++ "self_type" : "type-3808", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3805" ], ++ "template_args" : [ "type-3798" ], + "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { +@@ -43320,16 +44732,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2393" ++ "referenced_type" : "type-2388" + } + ], + "linker_set_key" : "android::use_trivial_move >", + "name" : "android::use_trivial_move >", +- "referenced_type" : "type-2392", +- "self_type" : "type-2392", ++ "referenced_type" : "type-2387", ++ "self_type" : "type-2387", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2383" ], ++ "template_args" : [ "type-2378" ], + "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { +@@ -43337,16 +44749,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2531" ++ "referenced_type" : "type-2526" + } + ], + "linker_set_key" : "android::use_trivial_move >", + "name" : "android::use_trivial_move >", +- "referenced_type" : "type-2530", +- "self_type" : "type-2530", ++ "referenced_type" : "type-2525", ++ "self_type" : "type-2525", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2468" ], ++ "template_args" : [ "type-2463" ], + "unique_id" : "_ZTSN7android16use_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { +@@ -43354,13 +44766,13 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3871" ++ "referenced_type" : "type-3864" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-3870", +- "self_type" : "type-3870", ++ "referenced_type" : "type-3863", ++ "self_type" : "type-3863", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-19" ], +@@ -43373,7 +44785,7 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-384" ++ "referenced_type" : "type-383" + }, + { + "access" : "private", +@@ -43385,11 +44797,11 @@ + "linker_set_key" : "android::wp", + "name" : "android::wp", + "record_kind" : "class", +- "referenced_type" : "type-383", +- "self_type" : "type-383", ++ "referenced_type" : "type-382", ++ "self_type" : "type-382", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h", +- "template_args" : [ "type-386" ], ++ "template_args" : [ "type-385" ], + "unique_id" : "_ZTSN7android2wpINS_8hardware9BHwBinderEEE" + }, + { +@@ -43399,7 +44811,7 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-945" ++ "referenced_type" : "type-942" + }, + { + "access" : "private", +@@ -43411,11 +44823,11 @@ + "linker_set_key" : "android::wp", + "name" : "android::wp", + "record_kind" : "class", +- "referenced_type" : "type-944", +- "self_type" : "type-944", ++ "referenced_type" : "type-941", ++ "self_type" : "type-941", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h", +- "template_args" : [ "type-948" ], ++ "template_args" : [ "type-945" ], + "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinder14DeathRecipientEEE" + }, + { +@@ -43425,7 +44837,7 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + }, + { + "access" : "private", +@@ -43437,11 +44849,11 @@ + "linker_set_key" : "android::wp", + "name" : "android::wp", + "record_kind" : "class", +- "referenced_type" : "type-2381", +- "self_type" : "type-2381", ++ "referenced_type" : "type-2376", ++ "self_type" : "type-2376", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h", +- "template_args" : [ "type-2328" ], ++ "template_args" : [ "type-2323" ], + "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinderEEE" + }, + { +@@ -43451,7 +44863,7 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-143" ++ "referenced_type" : "type-142" + }, + { + "access" : "private", +@@ -43463,11 +44875,11 @@ + "linker_set_key" : "android::wp", + "name" : "android::wp", + "record_kind" : "class", +- "referenced_type" : "type-361", +- "self_type" : "type-361", ++ "referenced_type" : "type-360", ++ "self_type" : "type-360", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h", +- "template_args" : [ "type-144" ], ++ "template_args" : [ "type-143" ], + "unique_id" : "_ZTSN7android2wpINS_8hardware20hidl_death_recipientEEE" + }, + { +@@ -43502,18 +44914,18 @@ + [ + { + "field_name" : "maxContentLightLevel", +- "referenced_type" : "type-298" ++ "referenced_type" : "type-297" + }, + { + "field_name" : "maxFrameAverageLightLevel", + "field_offset" : 32, +- "referenced_type" : "type-298" ++ "referenced_type" : "type-297" + } + ], + "linker_set_key" : "android_cta861_3_metadata", + "name" : "android_cta861_3_metadata", +- "referenced_type" : "type-302", +- "self_type" : "type-302", ++ "referenced_type" : "type-301", ++ "self_type" : "type-301", + "size" : 8, + "source_file" : "/system/core/libsystem/include/system/graphics.h", + "unique_id" : "android_cta861_3_metadata" +@@ -43529,18 +44941,18 @@ + { + "field_name" : "reserved", + "field_offset" : 32, +- "referenced_type" : "type-288" ++ "referenced_type" : "type-287" + }, + { + "field_name" : "xyzc_points", + "field_offset" : 288, +- "referenced_type" : "type-297" ++ "referenced_type" : "type-296" + } + ], + "linker_set_key" : "android_depth_points", + "name" : "android_depth_points", +- "referenced_type" : "type-296", +- "self_type" : "type-296", ++ "referenced_type" : "type-295", ++ "self_type" : "type-295", + "size" : 36, + "source_file" : "/system/core/libsystem/include/system/graphics.h", + "unique_id" : "android_depth_points" +@@ -43551,7 +44963,7 @@ + [ + { + "field_name" : "format", +- "referenced_type" : "type-292" ++ "referenced_type" : "type-291" + }, + { + "field_name" : "num_planes", +@@ -43561,13 +44973,13 @@ + { + "field_name" : "planes", + "field_offset" : 64, +- "referenced_type" : "type-294" ++ "referenced_type" : "type-293" + } + ], + "linker_set_key" : "android_flex_layout", + "name" : "android_flex_layout", +- "referenced_type" : "type-293", +- "self_type" : "type-293", ++ "referenced_type" : "type-292", ++ "self_type" : "type-292", + "size" : 12, + "source_file" : "/system/core/libsystem/include/system/graphics.h", + "unique_id" : "android_flex_layout" +@@ -43578,12 +44990,12 @@ + [ + { + "field_name" : "top_left", +- "referenced_type" : "type-291" ++ "referenced_type" : "type-290" + }, + { + "field_name" : "component", + "field_offset" : 32, +- "referenced_type" : "type-289" ++ "referenced_type" : "type-288" + }, + { + "field_name" : "bits_per_component", +@@ -43618,8 +45030,8 @@ + ], + "linker_set_key" : "android_flex_plane", + "name" : "android_flex_plane", +- "referenced_type" : "type-290", +- "self_type" : "type-290", ++ "referenced_type" : "type-289", ++ "self_type" : "type-289", + "size" : 32, + "source_file" : "/system/core/libsystem/include/system/graphics.h", + "unique_id" : "android_flex_plane" +@@ -43630,38 +45042,38 @@ + [ + { + "field_name" : "displayPrimaryRed", +- "referenced_type" : "type-299" ++ "referenced_type" : "type-298" + }, + { + "field_name" : "displayPrimaryGreen", + "field_offset" : 64, +- "referenced_type" : "type-299" ++ "referenced_type" : "type-298" + }, + { + "field_name" : "displayPrimaryBlue", + "field_offset" : 128, +- "referenced_type" : "type-299" ++ "referenced_type" : "type-298" + }, + { + "field_name" : "whitePoint", + "field_offset" : 192, +- "referenced_type" : "type-299" ++ "referenced_type" : "type-298" + }, + { + "field_name" : "maxLuminance", + "field_offset" : 256, +- "referenced_type" : "type-298" ++ "referenced_type" : "type-297" + }, + { + "field_name" : "minLuminance", + "field_offset" : 288, +- "referenced_type" : "type-298" ++ "referenced_type" : "type-297" + } + ], + "linker_set_key" : "android_smpte2086_metadata", + "name" : "android_smpte2086_metadata", +- "referenced_type" : "type-300", +- "self_type" : "type-300", ++ "referenced_type" : "type-299", ++ "self_type" : "type-299", + "size" : 40, + "source_file" : "/system/core/libsystem/include/system/graphics.h", + "unique_id" : "android_smpte2086_metadata" +@@ -43672,18 +45084,18 @@ + [ + { + "field_name" : "x", +- "referenced_type" : "type-298" ++ "referenced_type" : "type-297" + }, + { + "field_name" : "y", + "field_offset" : 32, +- "referenced_type" : "type-298" ++ "referenced_type" : "type-297" + } + ], + "linker_set_key" : "android_xy_color", + "name" : "android_xy_color", +- "referenced_type" : "type-299", +- "self_type" : "type-299", ++ "referenced_type" : "type-298", ++ "self_type" : "type-298", + "size" : 8, + "source_file" : "/system/core/libsystem/include/system/graphics.h", + "unique_id" : "android_xy_color" +@@ -43694,17 +45106,17 @@ + [ + { + "field_name" : "y", +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "field_name" : "cb", + "field_offset" : 32, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "field_name" : "cr", + "field_offset" : 64, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "field_name" : "ystride", +@@ -43724,13 +45136,13 @@ + { + "field_name" : "reserved", + "field_offset" : 192, +- "referenced_type" : "type-288" ++ "referenced_type" : "type-287" + } + ], + "linker_set_key" : "android_ycbcr", + "name" : "android_ycbcr", +- "referenced_type" : "type-287", +- "self_type" : "type-287", ++ "referenced_type" : "type-286", ++ "self_type" : "type-286", + "size" : 56, + "source_file" : "/system/core/libsystem/include/system/graphics.h", + "unique_id" : "android_ycbcr" +@@ -43740,13 +45152,13 @@ + "fields" : + [ + { +- "referenced_type" : "type-237" ++ "referenced_type" : "type-236" + } + ], + "linker_set_key" : "log_msg", + "name" : "log_msg", +- "referenced_type" : "type-236", +- "self_type" : "type-236", ++ "referenced_type" : "type-235", ++ "self_type" : "type-235", + "size" : 5124, + "source_file" : "/system/core/liblog/include/log/log_read.h", + "unique_id" : "log_msg" +@@ -43757,35 +45169,35 @@ + [ + { + "field_name" : "buf", +- "referenced_type" : "type-238" ++ "referenced_type" : "type-237" + }, + { + "field_name" : "entry", +- "referenced_type" : "type-235" ++ "referenced_type" : "type-234" + }, + { + "field_name" : "entry_v4", +- "referenced_type" : "type-235" ++ "referenced_type" : "type-234" + }, + { + "field_name" : "entry_v3", +- "referenced_type" : "type-233" ++ "referenced_type" : "type-232" + }, + { + "field_name" : "entry_v2", +- "referenced_type" : "type-232" ++ "referenced_type" : "type-231" + }, + { + "field_name" : "entry_v1", +- "referenced_type" : "type-230" ++ "referenced_type" : "type-229" + } + ], + "is_anonymous" : true, + "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3", + "name" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3", + "record_kind" : "union", +- "referenced_type" : "type-237", +- "self_type" : "type-237", ++ "referenced_type" : "type-236", ++ "self_type" : "type-236", + "size" : 5124, + "source_file" : "/system/core/liblog/include/log/log_read.h", + "unique_id" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3)" +@@ -43806,8 +45218,8 @@ + ], + "linker_set_key" : "log_time", + "name" : "log_time", +- "referenced_type" : "type-229", +- "self_type" : "type-229", ++ "referenced_type" : "type-228", ++ "self_type" : "type-228", + "size" : 8, + "source_file" : "/system/core/liblog/include_vndk/log/log_time.h", + "unique_id" : "_ZTS8log_time" +@@ -43818,12 +45230,12 @@ + [ + { + "field_name" : "len", +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + }, + { + "field_name" : "__pad", + "field_offset" : 16, +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + }, + { + "field_name" : "pid", +@@ -43848,13 +45260,13 @@ + { + "field_name" : "msg", + "field_offset" : 160, +- "referenced_type" : "type-231" ++ "referenced_type" : "type-230" + } + ], + "linker_set_key" : "logger_entry", + "name" : "logger_entry", +- "referenced_type" : "type-230", +- "self_type" : "type-230", ++ "referenced_type" : "type-229", ++ "self_type" : "type-229", + "size" : 20, + "source_file" : "/system/core/liblog/include/log/log_read.h", + "unique_id" : "logger_entry" +@@ -43865,12 +45277,12 @@ + [ + { + "field_name" : "len", +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + }, + { + "field_name" : "hdr_size", + "field_offset" : 16, +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + }, + { + "field_name" : "pid", +@@ -43900,13 +45312,13 @@ + { + "field_name" : "msg", + "field_offset" : 192, +- "referenced_type" : "type-231" ++ "referenced_type" : "type-230" + } + ], + "linker_set_key" : "logger_entry_v2", + "name" : "logger_entry_v2", +- "referenced_type" : "type-232", +- "self_type" : "type-232", ++ "referenced_type" : "type-231", ++ "self_type" : "type-231", + "size" : 24, + "source_file" : "/system/core/liblog/include/log/log_read.h", + "unique_id" : "logger_entry_v2" +@@ -43917,12 +45329,12 @@ + [ + { + "field_name" : "len", +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + }, + { + "field_name" : "hdr_size", + "field_offset" : 16, +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + }, + { + "field_name" : "pid", +@@ -43952,13 +45364,13 @@ + { + "field_name" : "msg", + "field_offset" : 192, +- "referenced_type" : "type-231" ++ "referenced_type" : "type-230" + } + ], + "linker_set_key" : "logger_entry_v3", + "name" : "logger_entry_v3", +- "referenced_type" : "type-233", +- "self_type" : "type-233", ++ "referenced_type" : "type-232", ++ "self_type" : "type-232", + "size" : 24, + "source_file" : "/system/core/liblog/include/log/log_read.h", + "unique_id" : "logger_entry_v3" +@@ -43969,12 +45381,12 @@ + [ + { + "field_name" : "len", +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + }, + { + "field_name" : "hdr_size", + "field_offset" : 16, +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + }, + { + "field_name" : "pid", +@@ -44009,13 +45421,13 @@ + { + "field_name" : "msg", + "field_offset" : 224, +- "referenced_type" : "type-231" ++ "referenced_type" : "type-230" + } + ], + "linker_set_key" : "logger_entry_v4", + "name" : "logger_entry_v4", +- "referenced_type" : "type-235", +- "self_type" : "type-235", ++ "referenced_type" : "type-234", ++ "self_type" : "type-234", + "size" : 28, + "source_file" : "/system/core/liblog/include/log/log_read.h", + "unique_id" : "logger_entry_v4" +@@ -44058,7 +45470,7 @@ + [ + { + "field_name" : "lock", +- "referenced_type" : "type-2511" ++ "referenced_type" : "type-2506" + }, + { + "field_name" : "has_tls", +@@ -44073,8 +45485,8 @@ + ], + "linker_set_key" : "thread_store_t", + "name" : "thread_store_t", +- "referenced_type" : "type-2510", +- "self_type" : "type-2510", ++ "referenced_type" : "type-2505", ++ "self_type" : "type-2505", + "size" : 12, + "source_file" : "/system/core/libcutils/include/cutils/threads.h", + "unique_id" : "thread_store_t" +@@ -44086,8 +45498,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return &&", + "name" : "android::hardware::Return &&", +- "referenced_type" : "type-807", +- "self_type" : "type-809", ++ "referenced_type" : "type-804", ++ "self_type" : "type-806", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44095,8 +45507,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-801", +- "self_type" : "type-803", ++ "referenced_type" : "type-798", ++ "self_type" : "type-800", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44104,8 +45516,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-986", +- "self_type" : "type-988", ++ "referenced_type" : "type-983", ++ "self_type" : "type-985", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44113,8 +45525,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-1093", +- "self_type" : "type-1095", ++ "referenced_type" : "type-1090", ++ "self_type" : "type-1092", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44122,8 +45534,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-1153", +- "self_type" : "type-1155", ++ "referenced_type" : "type-1150", ++ "self_type" : "type-1152", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44131,8 +45543,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-1213", +- "self_type" : "type-1215", ++ "referenced_type" : "type-1210", ++ "self_type" : "type-1212", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44140,8 +45552,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-1284", +- "self_type" : "type-1286", ++ "referenced_type" : "type-1281", ++ "self_type" : "type-1283", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44149,8 +45561,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return &&", + "name" : "android::hardware::Return &&", +- "referenced_type" : "type-309", +- "self_type" : "type-311", ++ "referenced_type" : "type-308", ++ "self_type" : "type-310", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44158,8 +45570,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return &&", + "name" : "android::hardware::Return &&", +- "referenced_type" : "type-102", +- "self_type" : "type-178", ++ "referenced_type" : "type-101", ++ "self_type" : "type-177", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44167,8 +45579,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Status &&", + "name" : "android::hardware::Status &&", +- "referenced_type" : "type-104", +- "self_type" : "type-169", ++ "referenced_type" : "type-103", ++ "self_type" : "type-168", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44177,7 +45589,7 @@ + "linker_set_key" : "android::hardware::details::SchedPrio &&", + "name" : "android::hardware::details::SchedPrio &&", + "referenced_type" : "type-37", +- "self_type" : "type-40", ++ "self_type" : "type-39", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44185,8 +45597,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer &&", + "name" : "android::hardware::details::hidl_pointer &&", +- "referenced_type" : "type-97", +- "self_type" : "type-151", ++ "referenced_type" : "type-96", ++ "self_type" : "type-150", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -44194,8 +45606,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::return_status &&", + "name" : "android::hardware::details::return_status &&", +- "referenced_type" : "type-103", +- "self_type" : "type-173", ++ "referenced_type" : "type-102", ++ "self_type" : "type-172", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44203,7 +45615,7 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_handle &&", + "name" : "android::hardware::hidl_handle &&", +- "referenced_type" : "type-77", ++ "referenced_type" : "type-76", + "self_type" : "type-86", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" +@@ -44212,8 +45624,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_memory &&", + "name" : "android::hardware::hidl_memory &&", +- "referenced_type" : "type-121", +- "self_type" : "type-126", ++ "referenced_type" : "type-120", ++ "self_type" : "type-125", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -44221,8 +45633,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_string &&", + "name" : "android::hardware::hidl_string &&", +- "referenced_type" : "type-96", +- "self_type" : "type-116", ++ "referenced_type" : "type-95", ++ "self_type" : "type-115", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -44230,8 +45642,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec &&", + "name" : "android::hardware::hidl_vec &&", +- "referenced_type" : "type-518", +- "self_type" : "type-828", ++ "referenced_type" : "type-516", ++ "self_type" : "type-825", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -44239,8 +45651,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-472", +- "self_type" : "type-484", ++ "referenced_type" : "type-470", ++ "self_type" : "type-482", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44248,8 +45660,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-157", +- "self_type" : "type-161", ++ "referenced_type" : "type-156", ++ "self_type" : "type-160", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44257,8 +45669,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-962", +- "self_type" : "type-2421", ++ "referenced_type" : "type-959", ++ "self_type" : "type-2416", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44266,8 +45678,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-71", +- "self_type" : "type-483", ++ "referenced_type" : "type-70", ++ "self_type" : "type-481", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44275,8 +45687,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-951", +- "self_type" : "type-983", ++ "referenced_type" : "type-948", ++ "self_type" : "type-979", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44284,8 +45696,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-142", +- "self_type" : "type-476", ++ "referenced_type" : "type-141", ++ "self_type" : "type-474", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44293,8 +45705,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-356", +- "self_type" : "type-571", ++ "referenced_type" : "type-355", ++ "self_type" : "type-569", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44302,8 +45714,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-575", +- "self_type" : "type-975", ++ "referenced_type" : "type-573", ++ "self_type" : "type-972", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44311,8 +45723,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-590", +- "self_type" : "type-980", ++ "referenced_type" : "type-588", ++ "self_type" : "type-977", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44320,8 +45732,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-580", +- "self_type" : "type-763", ++ "referenced_type" : "type-578", ++ "self_type" : "type-760", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44329,8 +45741,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-595", +- "self_type" : "type-1209", ++ "referenced_type" : "type-593", ++ "self_type" : "type-1206", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44338,8 +45750,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-585", +- "self_type" : "type-911", ++ "referenced_type" : "type-583", ++ "self_type" : "type-907", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44347,35 +45759,17 @@ + "alignment" : 4, + "linker_set_key" : "android::wp &&", + "name" : "android::wp &&", +- "referenced_type" : "type-383", ++ "referenced_type" : "type-382", + "self_type" : "type-392", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +- { +- "alignment" : 4, +- "linker_set_key" : "android::wp &&", +- "name" : "android::wp &&", +- "referenced_type" : "type-32", +- "self_type" : "type-39", +- "size" : 4, +- "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "const android::hidl::base::V1_0::IBase *&&", +- "name" : "const android::hidl::base::V1_0::IBase *&&", +- "referenced_type" : "type-381", +- "self_type" : "type-391", +- "size" : 4, +- "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" +- }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1056", +- "self_type" : "type-1055", ++ "referenced_type" : "type-1053", ++ "self_type" : "type-1052", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44383,8 +45777,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1117", +- "self_type" : "type-1116", ++ "referenced_type" : "type-1114", ++ "self_type" : "type-1113", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44392,8 +45786,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1178", +- "self_type" : "type-1177", ++ "referenced_type" : "type-1175", ++ "self_type" : "type-1174", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44401,8 +45795,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1238", +- "self_type" : "type-1237", ++ "referenced_type" : "type-1235", ++ "self_type" : "type-1234", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44410,8 +45804,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1316", +- "self_type" : "type-1315", ++ "referenced_type" : "type-1313", ++ "self_type" : "type-1312", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44419,8 +45813,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1981", +- "self_type" : "type-1980", ++ "referenced_type" : "type-1976", ++ "self_type" : "type-1975", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44428,8 +45822,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-2039", +- "self_type" : "type-2038", ++ "referenced_type" : "type-2034", ++ "self_type" : "type-2033", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44437,8 +45831,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-2098", +- "self_type" : "type-2097", ++ "referenced_type" : "type-2093", ++ "self_type" : "type-2092", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44446,8 +45840,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-2156", +- "self_type" : "type-2155", ++ "referenced_type" : "type-2151", ++ "self_type" : "type-2150", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44455,8 +45849,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-2233", +- "self_type" : "type-2232", ++ "referenced_type" : "type-2228", ++ "self_type" : "type-2227", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44464,8 +45858,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-2286", +- "self_type" : "type-2285", ++ "referenced_type" : "type-2280", ++ "self_type" : "type-2279", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44473,8 +45867,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-3119", +- "self_type" : "type-3118", ++ "referenced_type" : "type-3112", ++ "self_type" : "type-3111", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44482,8 +45876,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-3173", +- "self_type" : "type-3172", ++ "referenced_type" : "type-3166", ++ "self_type" : "type-3165", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44491,8 +45885,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-3240", +- "self_type" : "type-3239", ++ "referenced_type" : "type-3233", ++ "self_type" : "type-3232", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44500,8 +45894,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-3295", +- "self_type" : "type-3294", ++ "referenced_type" : "type-3288", ++ "self_type" : "type-3287", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44509,8 +45903,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-3362", +- "self_type" : "type-3361", ++ "referenced_type" : "type-3355", ++ "self_type" : "type-3354", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44518,8 +45912,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-3415", +- "self_type" : "type-3414", ++ "referenced_type" : "type-3408", ++ "self_type" : "type-3407", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44527,8 +45921,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1061", +- "self_type" : "type-1060", ++ "referenced_type" : "type-1058", ++ "self_type" : "type-1057", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44536,8 +45930,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1121", +- "self_type" : "type-1120", ++ "referenced_type" : "type-1118", ++ "self_type" : "type-1117", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44545,8 +45939,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1182", +- "self_type" : "type-1181", ++ "referenced_type" : "type-1179", ++ "self_type" : "type-1178", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44554,8 +45948,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1243", +- "self_type" : "type-1242", ++ "referenced_type" : "type-1240", ++ "self_type" : "type-1239", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44563,8 +45957,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1320", +- "self_type" : "type-1319", ++ "referenced_type" : "type-1317", ++ "self_type" : "type-1316", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44572,8 +45966,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1986", +- "self_type" : "type-1985", ++ "referenced_type" : "type-1981", ++ "self_type" : "type-1980", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44581,8 +45975,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2043", +- "self_type" : "type-2042", ++ "referenced_type" : "type-2038", ++ "self_type" : "type-2037", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44590,8 +45984,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2102", +- "self_type" : "type-2101", ++ "referenced_type" : "type-2097", ++ "self_type" : "type-2096", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44599,8 +45993,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2161", +- "self_type" : "type-2160", ++ "referenced_type" : "type-2156", ++ "self_type" : "type-2155", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44608,8 +46002,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2237", +- "self_type" : "type-2236", ++ "referenced_type" : "type-2232", ++ "self_type" : "type-2231", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44617,8 +46011,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2290", +- "self_type" : "type-2289", ++ "referenced_type" : "type-2285", ++ "self_type" : "type-2284", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44626,8 +46020,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3123", +- "self_type" : "type-3122", ++ "referenced_type" : "type-3116", ++ "self_type" : "type-3115", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44635,8 +46029,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3177", +- "self_type" : "type-3176", ++ "referenced_type" : "type-3170", ++ "self_type" : "type-3169", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44644,8 +46038,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3244", +- "self_type" : "type-3243", ++ "referenced_type" : "type-3237", ++ "self_type" : "type-3236", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44653,8 +46047,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3299", +- "self_type" : "type-3298", ++ "referenced_type" : "type-3292", ++ "self_type" : "type-3291", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44662,8 +46056,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3366", +- "self_type" : "type-3365", ++ "referenced_type" : "type-3359", ++ "self_type" : "type-3358", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44671,8 +46065,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3419", +- "self_type" : "type-3418", ++ "referenced_type" : "type-3412", ++ "self_type" : "type-3411", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44680,8 +46074,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1058", +- "self_type" : "type-1057", ++ "referenced_type" : "type-1055", ++ "self_type" : "type-1054", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44689,8 +46083,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1119", +- "self_type" : "type-1118", ++ "referenced_type" : "type-1116", ++ "self_type" : "type-1115", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44698,8 +46092,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1180", +- "self_type" : "type-1179", ++ "referenced_type" : "type-1177", ++ "self_type" : "type-1176", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44707,8 +46101,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1241", +- "self_type" : "type-1240", ++ "referenced_type" : "type-1237", ++ "self_type" : "type-1236", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44716,8 +46110,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1318", +- "self_type" : "type-1317", ++ "referenced_type" : "type-1315", ++ "self_type" : "type-1314", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44725,8 +46119,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1983", +- "self_type" : "type-1982", ++ "referenced_type" : "type-1978", ++ "self_type" : "type-1977", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44734,8 +46128,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2041", +- "self_type" : "type-2040", ++ "referenced_type" : "type-2036", ++ "self_type" : "type-2035", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44743,8 +46137,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2100", +- "self_type" : "type-2099", ++ "referenced_type" : "type-2095", ++ "self_type" : "type-2094", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44752,8 +46146,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2159", +- "self_type" : "type-2158", ++ "referenced_type" : "type-2153", ++ "self_type" : "type-2152", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44761,8 +46155,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2235", +- "self_type" : "type-2234", ++ "referenced_type" : "type-2230", ++ "self_type" : "type-2229", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44770,8 +46164,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2288", +- "self_type" : "type-2287", ++ "referenced_type" : "type-2283", ++ "self_type" : "type-2282", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44779,8 +46173,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3121", +- "self_type" : "type-3120", ++ "referenced_type" : "type-3114", ++ "self_type" : "type-3113", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44788,8 +46182,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3175", +- "self_type" : "type-3174", ++ "referenced_type" : "type-3168", ++ "self_type" : "type-3167", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44797,8 +46191,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3242", +- "self_type" : "type-3241", ++ "referenced_type" : "type-3235", ++ "self_type" : "type-3234", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44806,8 +46200,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3297", +- "self_type" : "type-3296", ++ "referenced_type" : "type-3290", ++ "self_type" : "type-3289", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44815,8 +46209,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3364", +- "self_type" : "type-3363", ++ "referenced_type" : "type-3357", ++ "self_type" : "type-3356", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44824,8 +46218,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3417", +- "self_type" : "type-3416", ++ "referenced_type" : "type-3410", ++ "self_type" : "type-3409", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + } +diff --git a/29/32/arm_armv7-a-neon/source-based/libhwbinder_noltopgo.so.lsdump b/29/32/arm_armv7-a-neon/source-based/libhwbinder_noltopgo.so.lsdump +index b5c11da..9ccd7fd 100644 +--- a/29/32/arm_armv7-a-neon/source-based/libhwbinder_noltopgo.so.lsdump ++++ b/29/32/arm_armv7-a-neon/source-based/libhwbinder_noltopgo.so.lsdump +@@ -895,30 +895,6 @@ + { + "name" : "_ZN7android8hardware6Parcel12restartWriteEj" + }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIdEEiT_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIfEEiT_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIiEEiT_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIjEEiT_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIxEEiT_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIyEEiT_" +- }, + { + "name" : "_ZN7android8hardware6Parcel12writeCStringEPKc" + }, +@@ -5230,114 +5206,6 @@ + "return_type" : "type-19", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIdEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-69" +- }, +- { +- "referenced_type" : "type-96" +- } +- ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-96" ] +- }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIfEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-69" +- }, +- { +- "referenced_type" : "type-94" +- } +- ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-94" ] +- }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIiEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-69" +- }, +- { +- "referenced_type" : "type-19" +- } +- ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-19" ] +- }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIjEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-69" +- }, +- { +- "referenced_type" : "type-4" +- } +- ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-4" ] +- }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIxEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-69" +- }, +- { +- "referenced_type" : "type-90" +- } +- ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-90" ] +- }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIyEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-69" +- }, +- { +- "referenced_type" : "type-92" +- } +- ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-92" ] +- }, + { + "function_name" : "android::hardware::Parcel::writeCString", + "linker_set_key" : "_ZN7android8hardware6Parcel12writeCStringEPKc", +diff --git a/29/32/arm_armv7-a-neon/source-based/libprotobuf-cpp-full.so.lsdump b/29/32/arm_armv7-a-neon/source-based/libprotobuf-cpp-full.so.lsdump +index a41efb9..db5250a 100644 +--- a/29/32/arm_armv7-a-neon/source-based/libprotobuf-cpp-full.so.lsdump ++++ b/29/32/arm_armv7-a-neon/source-based/libprotobuf-cpp-full.so.lsdump +@@ -3342,6 +3342,10 @@ + "binding" : "weak", + "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexINSt3__14pairIPKviEEE13FindExtensionERKNS3_12basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEEi" + }, ++ { ++ "binding" : "weak", ++ "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexINSt3__14pairIPKviEEE18ValidateSymbolNameERKNS3_12basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE" ++ }, + { + "binding" : "weak", + "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexINSt3__14pairIPKviEEE19AddNestedExtensionsERKNS0_15DescriptorProtoES7_" +@@ -3370,6 +3374,10 @@ + "binding" : "weak", + "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexIPKNS0_19FileDescriptorProtoEE12AddExtensionERKNS0_20FieldDescriptorProtoES5_" + }, ++ { ++ "binding" : "weak", ++ "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexIPKNS0_19FileDescriptorProtoEE18ValidateSymbolNameERKNSt3__112basic_stringIcNS7_11char_traitsIcEENS7_9allocatorIcEEEE" ++ }, + { + "binding" : "weak", + "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexIPKNS0_19FileDescriptorProtoEE19AddNestedExtensionsERKNS0_15DescriptorProtoES5_" +@@ -15598,8 +15606,8 @@ + ], + "linker_set_key" : "google::protobuf::util::converter::JsonStreamParser::NumberResult::Type", + "name" : "google::protobuf::util::converter::JsonStreamParser::NumberResult::Type", +- "referenced_type" : "type-19293", +- "self_type" : "type-19293", ++ "referenced_type" : "type-15538", ++ "self_type" : "type-15538", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h", + "underlying_type" : "type-4", +@@ -15637,8 +15645,8 @@ + ], + "linker_set_key" : "google::protobuf::util::converter::JsonStreamParser::ParseType", + "name" : "google::protobuf::util::converter::JsonStreamParser::ParseType", +- "referenced_type" : "type-19291", +- "self_type" : "type-19291", ++ "referenced_type" : "type-15536", ++ "self_type" : "type-15536", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h", + "underlying_type" : "type-4", +@@ -15704,8 +15712,8 @@ + ], + "linker_set_key" : "google::protobuf::util::converter::JsonStreamParser::TokenType", + "name" : "google::protobuf::util::converter::JsonStreamParser::TokenType", +- "referenced_type" : "type-19290", +- "self_type" : "type-19290", ++ "referenced_type" : "type-15535", ++ "self_type" : "type-15535", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h", + "underlying_type" : "type-4", +@@ -15730,8 +15738,8 @@ + ], + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Item::ItemType", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Item::ItemType", +- "referenced_type" : "type-19455", +- "self_type" : "type-19455", ++ "referenced_type" : "type-15699", ++ "self_type" : "type-15699", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h", + "underlying_type" : "type-4", +@@ -16006,7 +16014,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -16018,9 +16026,9 @@ + "referenced_type" : "type-15297" + } + ], +- "referenced_type" : "type-19321", ++ "referenced_type" : "type-15566", + "return_type" : "type-76", +- "self_type" : "type-19321", ++ "self_type" : "type-15566", + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, + { +@@ -16030,15 +16038,15 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-15001" + } + ], +- "referenced_type" : "type-19454", ++ "referenced_type" : "type-15698", + "return_type" : "type-76", +- "self_type" : "type-19454", ++ "self_type" : "type-15698", + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, + { +@@ -16048,15 +16056,15 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-27" + } + ], +- "referenced_type" : "type-19440", ++ "referenced_type" : "type-15684", + "return_type" : "type-76", +- "self_type" : "type-19440", ++ "self_type" : "type-15684", + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, + { +@@ -28574,6 +28582,23 @@ + "return_type" : "type-4556", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, ++ { ++ "access" : "private", ++ "function_name" : "google::protobuf::SimpleDescriptorDatabase::DescriptorIndex >::ValidateSymbolName", ++ "linker_set_key" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexINSt3__14pairIPKviEEE18ValidateSymbolNameERKNS3_12basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3892" ++ }, ++ { ++ "referenced_type" : "type-3880" ++ } ++ ], ++ "return_type" : "type-12", ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" ++ }, + { + "function_name" : "google::protobuf::SimpleDescriptorDatabase::DescriptorIndex >::AddNestedExtensions", + "linker_set_key" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexINSt3__14pairIPKviEEE19AddNestedExtensionsERKNS0_15DescriptorProtoES7_", +@@ -28706,6 +28731,23 @@ + "return_type" : "type-12", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, ++ { ++ "access" : "private", ++ "function_name" : "google::protobuf::SimpleDescriptorDatabase::DescriptorIndex::ValidateSymbolName", ++ "linker_set_key" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexIPKNS0_19FileDescriptorProtoEE18ValidateSymbolNameERKNSt3__112basic_stringIcNS7_11char_traitsIcEENS7_9allocatorIcEEEE", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3891" ++ }, ++ { ++ "referenced_type" : "type-3880" ++ } ++ ], ++ "return_type" : "type-12", ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" ++ }, + { + "function_name" : "google::protobuf::SimpleDescriptorDatabase::DescriptorIndex::AddNestedExtensions", + "linker_set_key" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexIPKNS0_19FileDescriptorProtoEE19AddNestedExtensionsERKNS0_15DescriptorProtoES5_", +@@ -36131,7 +36173,7 @@ + "referenced_type" : "type-6362" + } + ], +- "return_type" : "type-17340", ++ "return_type" : "type-18113", + "source_file" : "/external/protobuf/src/google/protobuf/util/field_mask_util.h" + }, + { +@@ -38515,7 +38557,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-27" +@@ -38535,7 +38577,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-2337" +@@ -38552,7 +38594,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-2293" +@@ -38569,7 +38611,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-2337" +@@ -38589,7 +38631,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-27" +@@ -38608,13 +38650,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-19462", ++ "return_type" : "type-15706", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38625,7 +38667,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-27" +@@ -38645,7 +38687,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-27" +@@ -38661,7 +38703,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19460" ++ "referenced_type" : "type-15704" + }, + { + "referenced_type" : "type-2293" +@@ -38677,7 +38719,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19460" ++ "referenced_type" : "type-15704" + }, + { + "referenced_type" : "type-1" +@@ -38693,7 +38735,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19460" ++ "referenced_type" : "type-15704" + }, + { + "referenced_type" : "type-1" +@@ -38709,10 +38751,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19460" ++ "referenced_type" : "type-15704" + } + ], +- "return_type" : "type-19460", ++ "return_type" : "type-15704", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38722,7 +38764,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19460" ++ "referenced_type" : "type-15704" + }, + { + "referenced_type" : "type-15301" +@@ -38731,7 +38773,7 @@ + "referenced_type" : "type-2421" + }, + { +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + } + ], + "return_type" : "type-81", +@@ -38744,10 +38786,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19460" ++ "referenced_type" : "type-15704" + }, + { +- "referenced_type" : "type-19460" ++ "referenced_type" : "type-15704" + }, + { + "referenced_type" : "type-2293" +@@ -38769,7 +38811,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19460" ++ "referenced_type" : "type-15704" + }, + { + "referenced_type" : "type-15301" +@@ -38778,7 +38820,7 @@ + "referenced_type" : "type-2421" + }, + { +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + } + ], + "return_type" : "type-81", +@@ -38791,10 +38833,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19460" ++ "referenced_type" : "type-15704" + }, + { +- "referenced_type" : "type-19460" ++ "referenced_type" : "type-15704" + }, + { + "referenced_type" : "type-2293" +@@ -38817,7 +38859,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-2337" +@@ -38826,7 +38868,7 @@ + "referenced_type" : "type-2421" + } + ], +- "return_type" : "type-19462", ++ "return_type" : "type-15706", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38836,7 +38878,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-27" +@@ -38845,7 +38887,7 @@ + "referenced_type" : "type-15001" + } + ], +- "return_type" : "type-19462", ++ "return_type" : "type-15706", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38856,7 +38898,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-2337" +@@ -38865,7 +38907,7 @@ + "referenced_type" : "type-2421" + } + ], +- "return_type" : "type-19462", ++ "return_type" : "type-15706", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38876,7 +38918,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + } + ], + "return_type" : "type-81", +@@ -38890,7 +38932,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-2337" +@@ -38902,7 +38944,7 @@ + "referenced_type" : "type-15001" + } + ], +- "return_type" : "type-19462", ++ "return_type" : "type-15706", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38913,7 +38955,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-27" +@@ -38929,10 +38971,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + } + ], +- "return_type" : "type-19462", ++ "return_type" : "type-15706", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38943,7 +38985,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-2337" +@@ -38959,10 +39001,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + } + ], +- "return_type" : "type-19462", ++ "return_type" : "type-15706", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38972,13 +39014,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-19462", ++ "return_type" : "type-15706", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38989,7 +39031,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-15301" +@@ -39014,7 +39056,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-15276" +@@ -39040,7 +39082,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-15301" +@@ -39065,7 +39107,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-15276" +@@ -39090,7 +39132,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + } + ], + "return_type" : "type-81", +@@ -39103,7 +39145,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + } + ], + "return_type" : "type-81", +@@ -39116,7 +39158,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + } + ], + "return_type" : "type-81", +@@ -39300,7 +39342,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + }, + { + "referenced_type" : "type-27" +@@ -39309,7 +39351,7 @@ + "referenced_type" : "type-12" + } + ], +- "return_type" : "type-19152", ++ "return_type" : "type-15397", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39319,13 +39361,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-19152", ++ "return_type" : "type-15397", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39335,7 +39377,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + }, + { + "referenced_type" : "type-27" +@@ -39344,7 +39386,7 @@ + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-19152", ++ "return_type" : "type-15397", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39354,7 +39396,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + }, + { + "referenced_type" : "type-27" +@@ -39363,7 +39405,7 @@ + "referenced_type" : "type-96" + } + ], +- "return_type" : "type-19152", ++ "return_type" : "type-15397", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39373,7 +39415,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + }, + { + "referenced_type" : "type-27" +@@ -39382,7 +39424,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19152", ++ "return_type" : "type-15397", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39392,7 +39434,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + }, + { + "referenced_type" : "type-27" +@@ -39401,7 +39443,7 @@ + "referenced_type" : "type-89" + } + ], +- "return_type" : "type-19152", ++ "return_type" : "type-15397", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39411,13 +39453,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-19152", ++ "return_type" : "type-15397", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39428,7 +39470,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + }, + { + "referenced_type" : "type-27" +@@ -39444,7 +39486,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + }, + { + "referenced_type" : "type-27" +@@ -39453,7 +39495,7 @@ + "referenced_type" : "type-98" + } + ], +- "return_type" : "type-19152", ++ "return_type" : "type-15397", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39463,7 +39505,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + }, + { + "referenced_type" : "type-27" +@@ -39472,7 +39514,7 @@ + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-19152", ++ "return_type" : "type-15397", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39482,7 +39524,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + }, + { + "referenced_type" : "type-27" +@@ -39491,7 +39533,7 @@ + "referenced_type" : "type-4" + } + ], +- "return_type" : "type-19152", ++ "return_type" : "type-15397", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39501,7 +39543,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + }, + { + "referenced_type" : "type-27" +@@ -39510,7 +39552,7 @@ + "referenced_type" : "type-91" + } + ], +- "return_type" : "type-19152", ++ "return_type" : "type-15397", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39520,10 +39562,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + } + ], +- "return_type" : "type-19152", ++ "return_type" : "type-15397", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39533,10 +39575,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + } + ], +- "return_type" : "type-19152", ++ "return_type" : "type-15397", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39546,13 +39588,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-19152", ++ "return_type" : "type-15397", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39562,7 +39604,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + } + ], + "return_type" : "type-81", +@@ -39575,7 +39617,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + } + ], + "return_type" : "type-81", +@@ -39588,7 +39630,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + } + ], + "return_type" : "type-81", +@@ -39602,7 +39644,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + }, + { + "referenced_type" : "type-27" +@@ -39619,10 +39661,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + }, + { +- "referenced_type" : "type-19290" ++ "referenced_type" : "type-15535" + } + ], + "return_type" : "type-76", +@@ -39636,7 +39678,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-76", +@@ -39650,10 +39692,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + }, + { +- "referenced_type" : "type-19290" ++ "referenced_type" : "type-15535" + } + ], + "return_type" : "type-76", +@@ -39666,7 +39708,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-76", +@@ -39680,7 +39722,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-76", +@@ -39694,7 +39736,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-76", +@@ -39708,10 +39750,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + }, + { +- "referenced_type" : "type-19290" ++ "referenced_type" : "type-15535" + } + ], + "return_type" : "type-76", +@@ -39725,10 +39767,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + }, + { +- "referenced_type" : "type-19290" ++ "referenced_type" : "type-15535" + } + ], + "return_type" : "type-76", +@@ -39742,7 +39784,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + }, + { + "referenced_type" : "type-27" +@@ -39759,7 +39801,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + }, + { + "referenced_type" : "type-27" +@@ -39776,10 +39818,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + }, + { +- "referenced_type" : "type-19290" ++ "referenced_type" : "type-15535" + } + ], + "return_type" : "type-76", +@@ -39793,7 +39835,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-81", +@@ -39807,10 +39849,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + }, + { +- "referenced_type" : "type-19290" ++ "referenced_type" : "type-15535" + } + ], + "return_type" : "type-76", +@@ -39824,10 +39866,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], +- "return_type" : "type-19290", ++ "return_type" : "type-15535", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h" + }, + { +@@ -39838,7 +39880,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-76", +@@ -39852,7 +39894,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-76", +@@ -39866,10 +39908,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + }, + { +- "referenced_type" : "type-19295" ++ "referenced_type" : "type-15540" + } + ], + "return_type" : "type-76", +@@ -39883,7 +39925,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-76", +@@ -39897,7 +39939,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-76", +@@ -39910,7 +39952,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + }, + { + "referenced_type" : "type-27" +@@ -39927,7 +39969,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-81", +@@ -39941,7 +39983,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-76", +@@ -39955,7 +39997,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-76", +@@ -39969,7 +40011,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-76", +@@ -39983,7 +40025,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-76", +@@ -39996,7 +40038,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + }, + { + "referenced_type" : "type-15297" +@@ -40012,7 +40054,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + }, + { + "referenced_type" : "type-15297" +@@ -40028,7 +40070,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-81", +@@ -40041,7 +40083,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-81", +@@ -40054,7 +40096,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-81", +@@ -40108,7 +40150,7 @@ + "referenced_type" : "type-15347" + } + ], +- "return_type" : "type-17347", ++ "return_type" : "type-18121", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/field_mask_utility.h" + }, + { +@@ -40181,7 +40223,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40203,7 +40245,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40225,7 +40267,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40247,7 +40289,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40269,7 +40311,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40291,7 +40333,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40313,7 +40355,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40335,7 +40377,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40357,7 +40399,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40379,7 +40421,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40401,7 +40443,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40430,7 +40472,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40452,7 +40494,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40474,10 +40516,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19340" ++ "referenced_type" : "type-15584" + } + ], +- "return_type" : "type-19431", ++ "return_type" : "type-15675", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h" + }, + { +@@ -40494,7 +40536,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40516,7 +40558,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40538,7 +40580,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40561,7 +40603,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19430" ++ "referenced_type" : "type-15674" + }, + { + "referenced_type" : "type-612" +@@ -40583,7 +40625,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19430" ++ "referenced_type" : "type-15674" + }, + { + "referenced_type" : "type-612" +@@ -40606,7 +40648,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19430" ++ "referenced_type" : "type-15674" + }, + { + "referenced_type" : "type-612" +@@ -40628,7 +40670,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19430" ++ "referenced_type" : "type-15674" + }, + { + "referenced_type" : "type-612" +@@ -40650,7 +40692,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19430" ++ "referenced_type" : "type-15674" + } + ], + "return_type" : "type-81", +@@ -40663,7 +40705,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19430" ++ "referenced_type" : "type-15674" + } + ], + "return_type" : "type-81", +@@ -40676,7 +40718,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19430" ++ "referenced_type" : "type-15674" + } + ], + "return_type" : "type-81", +@@ -40689,13 +40731,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-19441", ++ "return_type" : "type-15685", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, + { +@@ -40706,7 +40748,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-27" +@@ -40723,7 +40765,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-2337" +@@ -40740,7 +40782,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + } + ], + "return_type" : "type-81", +@@ -40753,7 +40795,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-15001" +@@ -40776,7 +40818,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-27" +@@ -40785,7 +40827,7 @@ + "referenced_type" : "type-15001" + } + ], +- "return_type" : "type-19441", ++ "return_type" : "type-15685", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, + { +@@ -40795,7 +40837,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-15001" +@@ -40811,7 +40853,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-15001" +@@ -40827,10 +40869,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19476" ++ "referenced_type" : "type-15720" + } + ], +- "return_type" : "type-19452", ++ "return_type" : "type-15696", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, + { +@@ -40848,7 +40890,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-2337" +@@ -40864,7 +40906,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-15001" +@@ -40880,7 +40922,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-15001" +@@ -40897,7 +40939,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + } + ], + "return_type" : "type-81", +@@ -40910,7 +40952,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19444" ++ "referenced_type" : "type-15688" + }, + { + "referenced_type" : "type-27" +@@ -40926,13 +40968,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19444" ++ "referenced_type" : "type-15688" + }, + { +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { +- "referenced_type" : "type-19455" ++ "referenced_type" : "type-15699" + }, + { + "referenced_type" : "type-12" +@@ -40951,13 +40993,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19444" ++ "referenced_type" : "type-15688" + }, + { +- "referenced_type" : "type-19444" ++ "referenced_type" : "type-15688" + }, + { +- "referenced_type" : "type-19455" ++ "referenced_type" : "type-15699" + }, + { + "referenced_type" : "type-12" +@@ -40976,13 +41018,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19444" ++ "referenced_type" : "type-15688" + }, + { +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { +- "referenced_type" : "type-19455" ++ "referenced_type" : "type-15699" + }, + { + "referenced_type" : "type-12" +@@ -41001,13 +41043,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19444" ++ "referenced_type" : "type-15688" + }, + { +- "referenced_type" : "type-19444" ++ "referenced_type" : "type-15688" + }, + { +- "referenced_type" : "type-19455" ++ "referenced_type" : "type-15699" + }, + { + "referenced_type" : "type-12" +@@ -41027,13 +41069,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-19455" ++ "referenced_type" : "type-15699" + }, + { + "referenced_type" : "type-12" +@@ -41053,7 +41095,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-2337" +@@ -41070,7 +41112,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-2337" +@@ -41086,10 +41128,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + } + ], +- "return_type" : "type-19441", ++ "return_type" : "type-15685", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, + { +@@ -41100,7 +41142,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-2337" +@@ -41116,7 +41158,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19447" ++ "referenced_type" : "type-15691" + }, + { + "referenced_type" : "type-27" +@@ -41132,7 +41174,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19447" ++ "referenced_type" : "type-15691" + }, + { + "referenced_type" : "type-27" +@@ -41151,7 +41193,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19447" ++ "referenced_type" : "type-15691" + } + ], + "return_type" : "type-81", +@@ -41165,7 +41207,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19447" ++ "referenced_type" : "type-15691" + }, + { + "referenced_type" : "type-15001" +@@ -41182,7 +41224,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19447" ++ "referenced_type" : "type-15691" + } + ], + "return_type" : "type-81", +@@ -41195,7 +41237,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19447" ++ "referenced_type" : "type-15691" + } + ], + "return_type" : "type-12", +@@ -41208,7 +41250,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19447" ++ "referenced_type" : "type-15691" + }, + { + "referenced_type" : "type-27" +@@ -41224,10 +41266,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19447" ++ "referenced_type" : "type-15691" + }, + { +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + } + ], + "return_type" : "type-81", +@@ -41240,10 +41282,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19447" ++ "referenced_type" : "type-15691" + }, + { +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + } + ], + "return_type" : "type-81", +@@ -41256,7 +41298,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19447" ++ "referenced_type" : "type-15691" + } + ], + "return_type" : "type-81", +@@ -41269,7 +41311,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19447" ++ "referenced_type" : "type-15691" + } + ], + "return_type" : "type-81", +@@ -41282,10 +41324,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + } + ], +- "return_type" : "type-19441", ++ "return_type" : "type-15685", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, + { +@@ -41295,13 +41337,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-19441", ++ "return_type" : "type-15685", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, + { +@@ -41312,7 +41354,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-15301" +@@ -41337,7 +41379,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-15276" +@@ -41353,7 +41395,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-19640" ++ "referenced_type" : "type-15884" + } + ], + "return_type" : "type-81", +@@ -41367,7 +41409,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-15301" +@@ -41392,7 +41434,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-15276" +@@ -41408,7 +41450,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-19640" ++ "referenced_type" : "type-15884" + } + ], + "return_type" : "type-81", +@@ -41421,7 +41463,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + } + ], + "return_type" : "type-81", +@@ -41434,7 +41476,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + } + ], + "return_type" : "type-81", +@@ -41447,7 +41489,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + } + ], + "return_type" : "type-81", +@@ -42224,7 +42266,7 @@ + "referenced_type" : "type-24467" + } + ], +- "return_type" : "type-19430", ++ "return_type" : "type-15674", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/type_info_test_helper.h" + }, + { +@@ -42246,10 +42288,10 @@ + "referenced_type" : "type-15333" + }, + { +- "referenced_type" : "type-19640" ++ "referenced_type" : "type-15884" + } + ], +- "return_type" : "type-19441", ++ "return_type" : "type-15685", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/type_info_test_helper.h" + }, + { +@@ -64029,10 +64071,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19636" ++ "referenced_type" : "type-15880" + } + ], +- "return_type" : "type-21874", ++ "return_type" : "type-18122", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -64043,7 +64085,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2293" +@@ -64069,7 +64111,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2293" +@@ -64091,7 +64133,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-27" +@@ -64111,7 +64153,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2293" +@@ -64131,7 +64173,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -64160,7 +64202,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -64180,13 +64222,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" + } + ], +- "return_type" : "type-21876", ++ "return_type" : "type-18124", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h" + }, + { +@@ -64197,7 +64239,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2293" +@@ -64220,13 +64262,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2337" + } + ], +- "return_type" : "type-19338", ++ "return_type" : "type-15582", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h" + }, + { +@@ -64237,7 +64279,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-27" +@@ -64257,7 +64299,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2337" +@@ -64274,7 +64316,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2293" +@@ -64541,7 +64583,7 @@ + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-17348", ++ "return_type" : "type-18125", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, + { +@@ -69861,10 +69903,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19636" ++ "referenced_type" : "type-15880" + } + ], +- "return_type" : "type-21877", ++ "return_type" : "type-18126", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -71630,14 +71672,14 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf4util9converter23ProtoStreamObjectSource10renderers_E", + "name" : "google::protobuf::util::converter::ProtoStreamObjectSource::renderers_", +- "referenced_type" : "type-19341", ++ "referenced_type" : "type-15585", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h" + }, + { + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf4util9converter23ProtoStreamObjectWriter10renderers_E", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter::renderers_", +- "referenced_type" : "type-19483", ++ "referenced_type" : "type-15727", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, + { +@@ -72457,7 +72499,7 @@ + { + "linker_set_key" : "_ZZN6google8protobuf4util9converter23ProtoStreamObjectWriter7Options8DefaultsEvE8defaults", + "name" : "defaults", +- "referenced_type" : "type-19457", ++ "referenced_type" : "type-15701", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + } + ], +@@ -72533,71 +72575,71 @@ + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-16498", +- "self_type" : "type-16500", ++ "referenced_type" : "type-17268", ++ "self_type" : "type-17270", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-16814", +- "self_type" : "type-16813", ++ "referenced_type" : "type-17584", ++ "self_type" : "type-17583", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-17065", +- "self_type" : "type-17067", ++ "referenced_type" : "type-17835", ++ "self_type" : "type-17837", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-17184", +- "self_type" : "type-17186", ++ "referenced_type" : "type-17954", ++ "self_type" : "type-17956", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-17451", +- "self_type" : "type-17453", ++ "referenced_type" : "type-18229", ++ "self_type" : "type-18231", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-18901", +- "self_type" : "type-18903", ++ "referenced_type" : "type-19679", ++ "self_type" : "type-19681", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-21030", +- "self_type" : "type-21032", ++ "referenced_type" : "type-21038", ++ "self_type" : "type-21040", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-21346", +- "self_type" : "type-21345", ++ "referenced_type" : "type-21354", ++ "self_type" : "type-21353", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-21597", +- "self_type" : "type-21599", ++ "referenced_type" : "type-21605", ++ "self_type" : "type-21607", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-21716", +- "self_type" : "type-21718", ++ "referenced_type" : "type-21724", ++ "self_type" : "type-21726", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { +@@ -72806,71 +72848,71 @@ + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-16501", +- "self_type" : "type-16503", ++ "referenced_type" : "type-17271", ++ "self_type" : "type-17273", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-16816", +- "self_type" : "type-16818", ++ "referenced_type" : "type-17586", ++ "self_type" : "type-17588", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-17068", +- "self_type" : "type-17070", ++ "referenced_type" : "type-17838", ++ "self_type" : "type-17840", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-17187", +- "self_type" : "type-17189", ++ "referenced_type" : "type-17957", ++ "self_type" : "type-17959", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-17454", +- "self_type" : "type-17456", ++ "referenced_type" : "type-18232", ++ "self_type" : "type-18234", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-18904", +- "self_type" : "type-18906", ++ "referenced_type" : "type-19682", ++ "self_type" : "type-19684", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-21033", +- "self_type" : "type-21035", ++ "referenced_type" : "type-21041", ++ "self_type" : "type-21043", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-21348", +- "self_type" : "type-21350", ++ "referenced_type" : "type-21356", ++ "self_type" : "type-21358", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-21600", +- "self_type" : "type-21602", ++ "referenced_type" : "type-21608", ++ "self_type" : "type-21610", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-21719", +- "self_type" : "type-21721", ++ "referenced_type" : "type-21727", ++ "self_type" : "type-21729", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { +@@ -73355,8 +73397,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-15941", +- "self_type" : "type-15944", ++ "referenced_type" : "type-15427", ++ "self_type" : "type-15430", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73364,8 +73406,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-17010", +- "self_type" : "type-17013", ++ "referenced_type" : "type-15757", ++ "self_type" : "type-15760", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73373,8 +73415,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-18569", +- "self_type" : "type-18572", ++ "referenced_type" : "type-15928", ++ "self_type" : "type-15931", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73382,8 +73424,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-18653", +- "self_type" : "type-18656", ++ "referenced_type" : "type-16094", ++ "self_type" : "type-16097", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73391,8 +73433,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-18843", +- "self_type" : "type-18846", ++ "referenced_type" : "type-16712", ++ "self_type" : "type-16715", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73400,8 +73442,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-18940", +- "self_type" : "type-18944", ++ "referenced_type" : "type-17780", ++ "self_type" : "type-17783", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73418,8 +73460,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-19182", +- "self_type" : "type-19185", ++ "referenced_type" : "type-19347", ++ "self_type" : "type-19350", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73427,8 +73469,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-19513", +- "self_type" : "type-19516", ++ "referenced_type" : "type-19431", ++ "self_type" : "type-19434", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73436,8 +73478,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-19684", +- "self_type" : "type-19687", ++ "referenced_type" : "type-19621", ++ "self_type" : "type-19624", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73445,8 +73487,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-19850", +- "self_type" : "type-19853", ++ "referenced_type" : "type-19718", ++ "self_type" : "type-19722", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73454,8 +73496,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-20473", +- "self_type" : "type-20476", ++ "referenced_type" : "type-20480", ++ "self_type" : "type-20483", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73463,8 +73505,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-21542", +- "self_type" : "type-21545", ++ "referenced_type" : "type-21550", ++ "self_type" : "type-21553", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73877,8 +73919,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-15945", +- "self_type" : "type-15948", ++ "referenced_type" : "type-15431", ++ "self_type" : "type-15436", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73886,8 +73928,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-17014", +- "self_type" : "type-17017", ++ "referenced_type" : "type-15761", ++ "self_type" : "type-15764", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73895,8 +73937,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-18573", +- "self_type" : "type-18576", ++ "referenced_type" : "type-15932", ++ "self_type" : "type-15935", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73904,8 +73946,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-18657", +- "self_type" : "type-18660", ++ "referenced_type" : "type-16098", ++ "self_type" : "type-16102", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73913,8 +73955,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-18847", +- "self_type" : "type-18850", ++ "referenced_type" : "type-16716", ++ "self_type" : "type-16719", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73922,8 +73964,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-18945", +- "self_type" : "type-18948", ++ "referenced_type" : "type-17784", ++ "self_type" : "type-17787", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73940,8 +73982,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-19186", +- "self_type" : "type-19191", ++ "referenced_type" : "type-19351", ++ "self_type" : "type-19354", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73949,8 +73991,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-19517", +- "self_type" : "type-19520", ++ "referenced_type" : "type-19435", ++ "self_type" : "type-19438", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73958,8 +74000,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-19688", +- "self_type" : "type-19691", ++ "referenced_type" : "type-19625", ++ "self_type" : "type-19628", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73967,8 +74009,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-19854", +- "self_type" : "type-19858", ++ "referenced_type" : "type-19723", ++ "self_type" : "type-19726", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73976,8 +74018,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-20477", +- "self_type" : "type-20480", ++ "referenced_type" : "type-20484", ++ "self_type" : "type-20487", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73985,8 +74027,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-21546", +- "self_type" : "type-21549", ++ "referenced_type" : "type-21554", ++ "self_type" : "type-21557", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74471,8 +74513,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-15937", +- "self_type" : "type-15940", ++ "referenced_type" : "type-15423", ++ "self_type" : "type-15426", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74480,8 +74522,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-17006", +- "self_type" : "type-17009", ++ "referenced_type" : "type-15753", ++ "self_type" : "type-15756", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74489,8 +74531,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-18565", +- "self_type" : "type-18568", ++ "referenced_type" : "type-15924", ++ "self_type" : "type-15927", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74498,8 +74540,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-18649", +- "self_type" : "type-18652", ++ "referenced_type" : "type-16088", ++ "self_type" : "type-16093", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74507,8 +74549,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-18839", +- "self_type" : "type-18842", ++ "referenced_type" : "type-16708", ++ "self_type" : "type-16711", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74516,8 +74558,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-18935", +- "self_type" : "type-18939", ++ "referenced_type" : "type-17776", ++ "self_type" : "type-17779", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74525,8 +74567,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-19178", +- "self_type" : "type-19181", ++ "referenced_type" : "type-1932", ++ "self_type" : "type-1963", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74534,8 +74576,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-1932", +- "self_type" : "type-1963", ++ "referenced_type" : "type-19343", ++ "self_type" : "type-19346", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74543,8 +74585,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-19509", +- "self_type" : "type-19512", ++ "referenced_type" : "type-19427", ++ "self_type" : "type-19430", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74552,8 +74594,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-19680", +- "self_type" : "type-19683", ++ "referenced_type" : "type-19617", ++ "self_type" : "type-19620", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74561,8 +74603,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-19844", +- "self_type" : "type-19849", ++ "referenced_type" : "type-19713", ++ "self_type" : "type-19717", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74570,8 +74612,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-20469", +- "self_type" : "type-20472", ++ "referenced_type" : "type-20476", ++ "self_type" : "type-20479", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74579,8 +74621,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-21538", +- "self_type" : "type-21541", ++ "referenced_type" : "type-21546", ++ "self_type" : "type-21549", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75002,8 +75044,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-15957", +- "self_type" : "type-15966", ++ "referenced_type" : "type-15445", ++ "self_type" : "type-15457", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75011,8 +75053,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-17026", +- "self_type" : "type-17036", ++ "referenced_type" : "type-15773", ++ "self_type" : "type-15784", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75020,8 +75062,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-18586", +- "self_type" : "type-18595", ++ "referenced_type" : "type-15945", ++ "self_type" : "type-15954", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75029,8 +75071,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-18671", +- "self_type" : "type-18680", ++ "referenced_type" : "type-16113", ++ "self_type" : "type-16124", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75038,8 +75080,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-18862", +- "self_type" : "type-18871", ++ "referenced_type" : "type-16728", ++ "self_type" : "type-16737", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75047,8 +75089,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-18959", +- "self_type" : "type-18969", ++ "referenced_type" : "type-17796", ++ "self_type" : "type-17806", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75056,8 +75098,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-19200", +- "self_type" : "type-19212", ++ "referenced_type" : "type-19364", ++ "self_type" : "type-19373", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75074,8 +75116,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-19529", +- "self_type" : "type-19540", ++ "referenced_type" : "type-19449", ++ "self_type" : "type-19458", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75083,8 +75125,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-19701", +- "self_type" : "type-19710", ++ "referenced_type" : "type-19640", ++ "self_type" : "type-19649", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75092,8 +75134,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-19869", +- "self_type" : "type-19880", ++ "referenced_type" : "type-19737", ++ "self_type" : "type-19747", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75101,8 +75143,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-20489", +- "self_type" : "type-20498", ++ "referenced_type" : "type-20496", ++ "self_type" : "type-20505", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75110,8 +75152,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-21558", +- "self_type" : "type-21568", ++ "referenced_type" : "type-21566", ++ "self_type" : "type-21576", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -76046,80 +76088,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-15701", +- "self_type" : "type-15703", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "const google::protobuf::MapKey &", +- "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-15871", +- "self_type" : "type-15873", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "const google::protobuf::MapKey &", +- "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-15974", +- "self_type" : "type-15976", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "const google::protobuf::MapKey &", +- "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-16113", +- "self_type" : "type-16115", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "const google::protobuf::MapKey &", +- "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-16262", +- "self_type" : "type-16264", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "const google::protobuf::MapKey &", +- "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-16355", +- "self_type" : "type-16357", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "const google::protobuf::MapKey &", +- "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-16455", +- "self_type" : "type-16457", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "const google::protobuf::MapKey &", +- "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-16637", +- "self_type" : "type-16639", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "const google::protobuf::MapKey &", +- "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-16717", +- "self_type" : "type-16719", ++ "referenced_type" : "type-15462", ++ "self_type" : "type-15464", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76127,8 +76097,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-16775", +- "self_type" : "type-16777", ++ "referenced_type" : "type-15612", ++ "self_type" : "type-15614", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76136,26 +76106,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-17247", +- "self_type" : "type-17249", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "const google::protobuf::MapKey &", +- "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-17354", +- "self_type" : "type-17356", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "const google::protobuf::MapKey &", +- "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-17696", +- "self_type" : "type-17698", ++ "referenced_type" : "type-15799", ++ "self_type" : "type-15801", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76163,8 +76115,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-17854", +- "self_type" : "type-17856", ++ "referenced_type" : "type-15970", ++ "self_type" : "type-15972", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76172,8 +76124,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-17942", +- "self_type" : "type-17944", ++ "referenced_type" : "type-16129", ++ "self_type" : "type-16131", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76181,8 +76133,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-18031", +- "self_type" : "type-18033", ++ "referenced_type" : "type-16474", ++ "self_type" : "type-16476", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76190,8 +76142,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-18115", +- "self_type" : "type-18117", ++ "referenced_type" : "type-16644", ++ "self_type" : "type-16646", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76199,8 +76151,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-18182", +- "self_type" : "type-18184", ++ "referenced_type" : "type-16745", ++ "self_type" : "type-16747", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76208,8 +76160,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-18344", +- "self_type" : "type-18346", ++ "referenced_type" : "type-16883", ++ "self_type" : "type-16885", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76217,8 +76169,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-18469", +- "self_type" : "type-18471", ++ "referenced_type" : "type-17032", ++ "self_type" : "type-17034", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76226,8 +76178,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-18604", +- "self_type" : "type-18606", ++ "referenced_type" : "type-17125", ++ "self_type" : "type-17127", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76235,8 +76187,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-18695", +- "self_type" : "type-18697", ++ "referenced_type" : "type-17225", ++ "self_type" : "type-17227", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76244,8 +76196,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-18974", +- "self_type" : "type-18976", ++ "referenced_type" : "type-17407", ++ "self_type" : "type-17409", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76253,8 +76205,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-19217", +- "self_type" : "type-19219", ++ "referenced_type" : "type-17487", ++ "self_type" : "type-17489", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76262,8 +76214,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-19368", +- "self_type" : "type-19370", ++ "referenced_type" : "type-17545", ++ "self_type" : "type-17547", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76271,8 +76223,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-19555", +- "self_type" : "type-19557", ++ "referenced_type" : "type-18017", ++ "self_type" : "type-18019", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76280,8 +76232,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-19726", +- "self_type" : "type-19728", ++ "referenced_type" : "type-18132", ++ "self_type" : "type-18134", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76289,8 +76241,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-19885", +- "self_type" : "type-19887", ++ "referenced_type" : "type-18474", ++ "self_type" : "type-18476", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76298,8 +76250,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-20234", +- "self_type" : "type-20236", ++ "referenced_type" : "type-18632", ++ "self_type" : "type-18634", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76307,8 +76259,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-20405", +- "self_type" : "type-20407", ++ "referenced_type" : "type-18720", ++ "self_type" : "type-18722", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76316,8 +76268,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-20506", +- "self_type" : "type-20508", ++ "referenced_type" : "type-18809", ++ "self_type" : "type-18811", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76325,8 +76277,98 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-20644", +- "self_type" : "type-20646", ++ "referenced_type" : "type-18893", ++ "self_type" : "type-18895", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/message.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "const google::protobuf::MapKey &", ++ "name" : "const google::protobuf::MapKey &", ++ "referenced_type" : "type-18960", ++ "self_type" : "type-18962", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/message.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "const google::protobuf::MapKey &", ++ "name" : "const google::protobuf::MapKey &", ++ "referenced_type" : "type-19122", ++ "self_type" : "type-19124", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/message.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "const google::protobuf::MapKey &", ++ "name" : "const google::protobuf::MapKey &", ++ "referenced_type" : "type-19247", ++ "self_type" : "type-19249", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/message.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "const google::protobuf::MapKey &", ++ "name" : "const google::protobuf::MapKey &", ++ "referenced_type" : "type-19382", ++ "self_type" : "type-19384", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/message.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "const google::protobuf::MapKey &", ++ "name" : "const google::protobuf::MapKey &", ++ "referenced_type" : "type-19473", ++ "self_type" : "type-19475", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/message.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "const google::protobuf::MapKey &", ++ "name" : "const google::protobuf::MapKey &", ++ "referenced_type" : "type-19752", ++ "self_type" : "type-19754", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/message.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "const google::protobuf::MapKey &", ++ "name" : "const google::protobuf::MapKey &", ++ "referenced_type" : "type-20238", ++ "self_type" : "type-20240", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/message.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "const google::protobuf::MapKey &", ++ "name" : "const google::protobuf::MapKey &", ++ "referenced_type" : "type-20409", ++ "self_type" : "type-20411", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/message.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "const google::protobuf::MapKey &", ++ "name" : "const google::protobuf::MapKey &", ++ "referenced_type" : "type-20513", ++ "self_type" : "type-20515", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/message.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "const google::protobuf::MapKey &", ++ "name" : "const google::protobuf::MapKey &", ++ "referenced_type" : "type-20652", ++ "self_type" : "type-20654", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76343,8 +76385,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-20793", +- "self_type" : "type-20795", ++ "referenced_type" : "type-20801", ++ "self_type" : "type-20803", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76352,8 +76394,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-20886", +- "self_type" : "type-20888", ++ "referenced_type" : "type-20894", ++ "self_type" : "type-20896", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76361,8 +76403,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-20987", +- "self_type" : "type-20989", ++ "referenced_type" : "type-20995", ++ "self_type" : "type-20997", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76370,8 +76412,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-21169", +- "self_type" : "type-21171", ++ "referenced_type" : "type-21177", ++ "self_type" : "type-21179", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76379,8 +76421,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-21249", +- "self_type" : "type-21251", ++ "referenced_type" : "type-21257", ++ "self_type" : "type-21259", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76388,8 +76430,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-21307", +- "self_type" : "type-21309", ++ "referenced_type" : "type-21315", ++ "self_type" : "type-21317", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76397,8 +76439,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-21779", +- "self_type" : "type-21781", ++ "referenced_type" : "type-21787", ++ "self_type" : "type-21789", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77513,8 +77555,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-17547", +- "self_type" : "type-17546", ++ "referenced_type" : "type-1790", ++ "self_type" : "type-1789", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77522,8 +77564,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-1790", +- "self_type" : "type-1789", ++ "referenced_type" : "type-18325", ++ "self_type" : "type-18324", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77531,8 +77573,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-18252", +- "self_type" : "type-18251", ++ "referenced_type" : "type-19030", ++ "self_type" : "type-19029", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77540,8 +77582,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-18772", +- "self_type" : "type-18771", ++ "referenced_type" : "type-19550", ++ "self_type" : "type-19549", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77549,8 +77591,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-18860", +- "self_type" : "type-18859", ++ "referenced_type" : "type-19638", ++ "self_type" : "type-19637", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77855,8 +77897,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-15935", +- "self_type" : "type-15934", ++ "referenced_type" : "type-15412", ++ "self_type" : "type-15419", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77864,8 +77906,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-17000", +- "self_type" : "type-17005", ++ "referenced_type" : "type-15748", ++ "self_type" : "type-15752", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77873,8 +77915,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-18560", +- "self_type" : "type-18564", ++ "referenced_type" : "type-15917", ++ "self_type" : "type-15921", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77882,8 +77924,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-18642", +- "self_type" : "type-18648", ++ "referenced_type" : "type-16079", ++ "self_type" : "type-16085", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77891,8 +77933,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-18833", +- "self_type" : "type-18838", ++ "referenced_type" : "type-16706", ++ "self_type" : "type-16705", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77900,8 +77942,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-18927", +- "self_type" : "type-18933", ++ "referenced_type" : "type-17770", ++ "self_type" : "type-17775", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77909,8 +77951,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-19167", +- "self_type" : "type-19174", ++ "referenced_type" : "type-19338", ++ "self_type" : "type-19342", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77918,8 +77960,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-1944", +- "self_type" : "type-1955", ++ "referenced_type" : "type-19420", ++ "self_type" : "type-19426", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77927,8 +77969,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-19504", +- "self_type" : "type-19508", ++ "referenced_type" : "type-1944", ++ "self_type" : "type-1955", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77936,8 +77978,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-19673", +- "self_type" : "type-19677", ++ "referenced_type" : "type-19611", ++ "self_type" : "type-19616", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77945,8 +77987,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-19835", +- "self_type" : "type-19841", ++ "referenced_type" : "type-19705", ++ "self_type" : "type-19711", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77954,8 +77996,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-20467", +- "self_type" : "type-20466", ++ "referenced_type" : "type-20474", ++ "self_type" : "type-20473", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77963,8 +78005,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-21532", +- "self_type" : "type-21537", ++ "referenced_type" : "type-21540", ++ "self_type" : "type-21545", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78377,8 +78419,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-15953", +- "self_type" : "type-15956", ++ "referenced_type" : "type-15441", ++ "self_type" : "type-15444", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78386,8 +78428,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-17022", +- "self_type" : "type-17025", ++ "referenced_type" : "type-15769", ++ "self_type" : "type-15772", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78395,8 +78437,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-18582", +- "self_type" : "type-18585", ++ "referenced_type" : "type-15941", ++ "self_type" : "type-15944", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78404,8 +78446,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-18665", +- "self_type" : "type-18668", ++ "referenced_type" : "type-16108", ++ "self_type" : "type-16111", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78413,8 +78455,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-18855", +- "self_type" : "type-18858", ++ "referenced_type" : "type-16724", ++ "self_type" : "type-16727", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78422,8 +78464,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-18954", +- "self_type" : "type-18958", ++ "referenced_type" : "type-17792", ++ "self_type" : "type-17795", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78440,8 +78482,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-19196", +- "self_type" : "type-19199", ++ "referenced_type" : "type-19360", ++ "self_type" : "type-19363", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78449,8 +78491,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-19525", +- "self_type" : "type-19528", ++ "referenced_type" : "type-19443", ++ "self_type" : "type-19446", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78458,8 +78500,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-19697", +- "self_type" : "type-19700", ++ "referenced_type" : "type-19633", ++ "self_type" : "type-19636", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78467,8 +78509,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-19864", +- "self_type" : "type-19867", ++ "referenced_type" : "type-19732", ++ "self_type" : "type-19736", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78476,8 +78518,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-20485", +- "self_type" : "type-20488", ++ "referenced_type" : "type-20492", ++ "self_type" : "type-20495", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78485,8 +78527,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-21554", +- "self_type" : "type-21557", ++ "referenced_type" : "type-21562", ++ "self_type" : "type-21565", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -79160,8 +79202,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-15725", +- "self_type" : "type-15724", ++ "referenced_type" : "type-15518", ++ "self_type" : "type-15517", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79169,8 +79211,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-15898", +- "self_type" : "type-15897", ++ "referenced_type" : "type-15661", ++ "self_type" : "type-15660", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79178,8 +79220,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16178", +- "self_type" : "type-16177", ++ "referenced_type" : "type-15865", ++ "self_type" : "type-15864", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79187,8 +79229,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16281", +- "self_type" : "type-16280", ++ "referenced_type" : "type-16034", ++ "self_type" : "type-16033", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79196,8 +79238,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16421", +- "self_type" : "type-16420", ++ "referenced_type" : "type-16190", ++ "self_type" : "type-16189", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79205,8 +79247,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16478", +- "self_type" : "type-16477", ++ "referenced_type" : "type-16498", ++ "self_type" : "type-16497", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79214,8 +79256,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16658", +- "self_type" : "type-16657", ++ "referenced_type" : "type-16671", ++ "self_type" : "type-16670", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79223,8 +79265,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16796", +- "self_type" : "type-16795", ++ "referenced_type" : "type-16948", ++ "self_type" : "type-16947", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79232,8 +79274,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17301", +- "self_type" : "type-17300", ++ "referenced_type" : "type-17051", ++ "self_type" : "type-17050", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79241,8 +79283,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17375", +- "self_type" : "type-17374", ++ "referenced_type" : "type-17191", ++ "self_type" : "type-17190", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79250,8 +79292,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17421", +- "self_type" : "type-17420", ++ "referenced_type" : "type-17248", ++ "self_type" : "type-17247", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79259,8 +79301,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17778", +- "self_type" : "type-17777", ++ "referenced_type" : "type-17428", ++ "self_type" : "type-17427", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79268,8 +79310,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17879", +- "self_type" : "type-17878", ++ "referenced_type" : "type-17566", ++ "self_type" : "type-17565", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79277,8 +79319,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17971", +- "self_type" : "type-17970", ++ "referenced_type" : "type-18071", ++ "self_type" : "type-18070", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79286,8 +79328,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18082", +- "self_type" : "type-18081", ++ "referenced_type" : "type-18153", ++ "self_type" : "type-18152", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79295,8 +79337,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18134", +- "self_type" : "type-18133", ++ "referenced_type" : "type-18199", ++ "self_type" : "type-18198", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79304,8 +79346,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18221", +- "self_type" : "type-18220", ++ "referenced_type" : "type-18556", ++ "self_type" : "type-18555", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79313,8 +79355,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18394", +- "self_type" : "type-18393", ++ "referenced_type" : "type-18657", ++ "self_type" : "type-18656", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79322,8 +79364,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18521", +- "self_type" : "type-18520", ++ "referenced_type" : "type-18749", ++ "self_type" : "type-18748", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79331,8 +79373,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18753", +- "self_type" : "type-18752", ++ "referenced_type" : "type-18860", ++ "self_type" : "type-18859", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79340,8 +79382,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18884", +- "self_type" : "type-18883", ++ "referenced_type" : "type-18912", ++ "self_type" : "type-18911", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79349,8 +79391,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19033", +- "self_type" : "type-19032", ++ "referenced_type" : "type-18999", ++ "self_type" : "type-18998", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79358,8 +79400,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19273", +- "self_type" : "type-19272", ++ "referenced_type" : "type-19172", ++ "self_type" : "type-19171", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79367,8 +79409,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19417", +- "self_type" : "type-19416", ++ "referenced_type" : "type-19299", ++ "self_type" : "type-19298", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79376,8 +79418,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19621", +- "self_type" : "type-19620", ++ "referenced_type" : "type-19531", ++ "self_type" : "type-19530", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79385,8 +79427,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19790", +- "self_type" : "type-19789", ++ "referenced_type" : "type-19662", ++ "self_type" : "type-19661", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79394,8 +79436,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19946", +- "self_type" : "type-19945", ++ "referenced_type" : "type-19811", ++ "self_type" : "type-19810", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79403,8 +79445,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-20259", +- "self_type" : "type-20258", ++ "referenced_type" : "type-20263", ++ "self_type" : "type-20262", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79412,8 +79454,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-20432", +- "self_type" : "type-20431", ++ "referenced_type" : "type-20436", ++ "self_type" : "type-20435", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79421,8 +79463,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-20709", +- "self_type" : "type-20708", ++ "referenced_type" : "type-20717", ++ "self_type" : "type-20716", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79430,8 +79472,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-20812", +- "self_type" : "type-20811", ++ "referenced_type" : "type-20820", ++ "self_type" : "type-20819", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79439,8 +79481,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-20952", +- "self_type" : "type-20951", ++ "referenced_type" : "type-20960", ++ "self_type" : "type-20959", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79448,8 +79490,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-21010", +- "self_type" : "type-21009", ++ "referenced_type" : "type-21018", ++ "self_type" : "type-21017", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79466,8 +79508,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-21190", +- "self_type" : "type-21189", ++ "referenced_type" : "type-21198", ++ "self_type" : "type-21197", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79475,8 +79517,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-21328", +- "self_type" : "type-21327", ++ "referenced_type" : "type-21336", ++ "self_type" : "type-21335", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79484,8 +79526,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-21833", +- "self_type" : "type-21832", ++ "referenced_type" : "type-21841", ++ "self_type" : "type-21840", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80492,8 +80534,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16174", +- "self_type" : "type-16173", ++ "referenced_type" : "type-15514", ++ "self_type" : "type-15513", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80501,8 +80543,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17297", +- "self_type" : "type-17296", ++ "referenced_type" : "type-15657", ++ "self_type" : "type-15656", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80510,8 +80552,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17773", +- "self_type" : "type-17772", ++ "referenced_type" : "type-15861", ++ "self_type" : "type-15860", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80519,8 +80561,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18078", +- "self_type" : "type-18077", ++ "referenced_type" : "type-16029", ++ "self_type" : "type-16028", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80528,8 +80570,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18389", +- "self_type" : "type-18388", ++ "referenced_type" : "type-16186", ++ "self_type" : "type-16185", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80537,8 +80579,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18517", +- "self_type" : "type-18516", ++ "referenced_type" : "type-16944", ++ "self_type" : "type-16943", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80546,8 +80588,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18749", +- "self_type" : "type-18748", ++ "referenced_type" : "type-18067", ++ "self_type" : "type-18066", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80555,8 +80597,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19029", +- "self_type" : "type-19028", ++ "referenced_type" : "type-18551", ++ "self_type" : "type-18550", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80564,8 +80606,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19269", +- "self_type" : "type-19268", ++ "referenced_type" : "type-18856", ++ "self_type" : "type-18855", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80573,8 +80615,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19413", +- "self_type" : "type-19412", ++ "referenced_type" : "type-19167", ++ "self_type" : "type-19166", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80582,8 +80624,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19617", +- "self_type" : "type-19616", ++ "referenced_type" : "type-19295", ++ "self_type" : "type-19294", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80591,8 +80633,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19785", +- "self_type" : "type-19784", ++ "referenced_type" : "type-19527", ++ "self_type" : "type-19526", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80600,8 +80642,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19942", +- "self_type" : "type-19941", ++ "referenced_type" : "type-19807", ++ "self_type" : "type-19806", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80609,8 +80651,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-20705", +- "self_type" : "type-20704", ++ "referenced_type" : "type-20713", ++ "self_type" : "type-20712", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80618,8 +80660,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-21829", +- "self_type" : "type-21828", ++ "referenced_type" : "type-21837", ++ "self_type" : "type-21836", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81131,8 +81173,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16170", +- "self_type" : "type-16169", ++ "referenced_type" : "type-15509", ++ "self_type" : "type-15508", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81140,8 +81182,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17293", +- "self_type" : "type-17292", ++ "referenced_type" : "type-15653", ++ "self_type" : "type-15652", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81149,8 +81191,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17769", +- "self_type" : "type-17768", ++ "referenced_type" : "type-15857", ++ "self_type" : "type-15856", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81158,8 +81200,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18073", +- "self_type" : "type-18072", ++ "referenced_type" : "type-16025", ++ "self_type" : "type-16024", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81167,8 +81209,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18385", +- "self_type" : "type-18384", ++ "referenced_type" : "type-16182", ++ "self_type" : "type-16181", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81176,8 +81218,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18513", +- "self_type" : "type-18512", ++ "referenced_type" : "type-16940", ++ "self_type" : "type-16939", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81185,8 +81227,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18745", +- "self_type" : "type-18744", ++ "referenced_type" : "type-18063", ++ "self_type" : "type-18062", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81194,8 +81236,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19025", +- "self_type" : "type-19024", ++ "referenced_type" : "type-18547", ++ "self_type" : "type-18546", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81203,8 +81245,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19264", +- "self_type" : "type-19263", ++ "referenced_type" : "type-18851", ++ "self_type" : "type-18850", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81212,8 +81254,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19409", +- "self_type" : "type-19408", ++ "referenced_type" : "type-19163", ++ "self_type" : "type-19162", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81221,8 +81263,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19613", +- "self_type" : "type-19612", ++ "referenced_type" : "type-19291", ++ "self_type" : "type-19290", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81230,8 +81272,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19781", +- "self_type" : "type-19780", ++ "referenced_type" : "type-19523", ++ "self_type" : "type-19522", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81239,8 +81281,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19938", +- "self_type" : "type-19937", ++ "referenced_type" : "type-19803", ++ "self_type" : "type-19802", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81248,8 +81290,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-20701", +- "self_type" : "type-20700", ++ "referenced_type" : "type-20709", ++ "self_type" : "type-20708", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81257,8 +81299,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-21825", +- "self_type" : "type-21824", ++ "referenced_type" : "type-21833", ++ "self_type" : "type-21832", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81671,8 +81713,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18729", +- "self_type" : "type-18728", ++ "referenced_type" : "type-15493", ++ "self_type" : "type-15492", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81680,8 +81722,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19009", +- "self_type" : "type-19008", ++ "referenced_type" : "type-15839", ++ "self_type" : "type-15838", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81689,8 +81731,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19248", +- "self_type" : "type-19247", ++ "referenced_type" : "type-16008", ++ "self_type" : "type-16007", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81698,8 +81740,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19595", +- "self_type" : "type-19594", ++ "referenced_type" : "type-16165", ++ "self_type" : "type-16164", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81707,8 +81749,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19764", +- "self_type" : "type-19763", ++ "referenced_type" : "type-19507", ++ "self_type" : "type-19506", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81716,8 +81758,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19921", +- "self_type" : "type-19920", ++ "referenced_type" : "type-19787", ++ "self_type" : "type-19786", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82013,8 +82055,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16158", +- "self_type" : "type-16157", ++ "referenced_type" : "type-15497", ++ "self_type" : "type-15496", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82022,8 +82064,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17281", +- "self_type" : "type-17280", ++ "referenced_type" : "type-15641", ++ "self_type" : "type-15640", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82031,8 +82073,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17756", +- "self_type" : "type-17755", ++ "referenced_type" : "type-15843", ++ "self_type" : "type-15842", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82040,8 +82082,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18061", +- "self_type" : "type-18060", ++ "referenced_type" : "type-16012", ++ "self_type" : "type-16011", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82049,8 +82091,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18373", +- "self_type" : "type-18372", ++ "referenced_type" : "type-16169", ++ "self_type" : "type-16168", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82058,8 +82100,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18501", +- "self_type" : "type-18500", ++ "referenced_type" : "type-16928", ++ "self_type" : "type-16927", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82067,8 +82109,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18733", +- "self_type" : "type-18732", ++ "referenced_type" : "type-18051", ++ "self_type" : "type-18050", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82076,8 +82118,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19013", +- "self_type" : "type-19012", ++ "referenced_type" : "type-18534", ++ "self_type" : "type-18533", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82085,8 +82127,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19252", +- "self_type" : "type-19251", ++ "referenced_type" : "type-18839", ++ "self_type" : "type-18838", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82094,8 +82136,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19397", +- "self_type" : "type-19396", ++ "referenced_type" : "type-19151", ++ "self_type" : "type-19150", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82103,8 +82145,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19599", +- "self_type" : "type-19598", ++ "referenced_type" : "type-19279", ++ "self_type" : "type-19278", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82112,8 +82154,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19768", +- "self_type" : "type-19767", ++ "referenced_type" : "type-19511", ++ "self_type" : "type-19510", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82121,8 +82163,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19925", +- "self_type" : "type-19924", ++ "referenced_type" : "type-19791", ++ "self_type" : "type-19790", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82130,8 +82172,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-20689", +- "self_type" : "type-20688", ++ "referenced_type" : "type-20697", ++ "self_type" : "type-20696", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82139,8 +82181,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-21813", +- "self_type" : "type-21812", ++ "referenced_type" : "type-21821", ++ "self_type" : "type-21820", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82652,8 +82694,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16162", +- "self_type" : "type-16161", ++ "referenced_type" : "type-15501", ++ "self_type" : "type-15500", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82661,8 +82703,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17285", +- "self_type" : "type-17284", ++ "referenced_type" : "type-15645", ++ "self_type" : "type-15644", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82670,8 +82712,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17760", +- "self_type" : "type-17759", ++ "referenced_type" : "type-15849", ++ "self_type" : "type-15848", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82679,8 +82721,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18065", +- "self_type" : "type-18064", ++ "referenced_type" : "type-16016", ++ "self_type" : "type-16015", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82688,8 +82730,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18377", +- "self_type" : "type-18376", ++ "referenced_type" : "type-16173", ++ "self_type" : "type-16172", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82697,8 +82739,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18505", +- "self_type" : "type-18504", ++ "referenced_type" : "type-16932", ++ "self_type" : "type-16931", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82706,8 +82748,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18737", +- "self_type" : "type-18736", ++ "referenced_type" : "type-18055", ++ "self_type" : "type-18054", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82715,8 +82757,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19017", +- "self_type" : "type-19016", ++ "referenced_type" : "type-18538", ++ "self_type" : "type-18537", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82724,8 +82766,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19256", +- "self_type" : "type-19255", ++ "referenced_type" : "type-18843", ++ "self_type" : "type-18842", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82733,8 +82775,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19401", +- "self_type" : "type-19400", ++ "referenced_type" : "type-19155", ++ "self_type" : "type-19154", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82742,8 +82784,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19605", +- "self_type" : "type-19604", ++ "referenced_type" : "type-19283", ++ "self_type" : "type-19282", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82751,8 +82793,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19772", +- "self_type" : "type-19771", ++ "referenced_type" : "type-19515", ++ "self_type" : "type-19514", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82760,8 +82802,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19929", +- "self_type" : "type-19928", ++ "referenced_type" : "type-19795", ++ "self_type" : "type-19794", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82769,8 +82811,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-20693", +- "self_type" : "type-20692", ++ "referenced_type" : "type-20701", ++ "self_type" : "type-20700", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82778,8 +82820,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-21817", +- "self_type" : "type-21816", ++ "referenced_type" : "type-21825", ++ "self_type" : "type-21824", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83291,8 +83333,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16166", +- "self_type" : "type-16165", ++ "referenced_type" : "type-15505", ++ "self_type" : "type-15504", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83300,8 +83342,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17289", +- "self_type" : "type-17288", ++ "referenced_type" : "type-15649", ++ "self_type" : "type-15648", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83309,8 +83351,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17765", +- "self_type" : "type-17764", ++ "referenced_type" : "type-15853", ++ "self_type" : "type-15852", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83318,8 +83360,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18069", +- "self_type" : "type-18068", ++ "referenced_type" : "type-16021", ++ "self_type" : "type-16020", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83327,8 +83369,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18381", +- "self_type" : "type-18380", ++ "referenced_type" : "type-16177", ++ "self_type" : "type-16176", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83336,8 +83378,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18509", +- "self_type" : "type-18508", ++ "referenced_type" : "type-16936", ++ "self_type" : "type-16935", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83345,8 +83387,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18741", +- "self_type" : "type-18740", ++ "referenced_type" : "type-18059", ++ "self_type" : "type-18058", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83354,8 +83396,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19021", +- "self_type" : "type-19020", ++ "referenced_type" : "type-18543", ++ "self_type" : "type-18542", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83363,8 +83405,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19260", +- "self_type" : "type-19259", ++ "referenced_type" : "type-18847", ++ "self_type" : "type-18846", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83372,8 +83414,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19405", +- "self_type" : "type-19404", ++ "referenced_type" : "type-19159", ++ "self_type" : "type-19158", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83381,8 +83423,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19609", +- "self_type" : "type-19608", ++ "referenced_type" : "type-19287", ++ "self_type" : "type-19286", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83390,8 +83432,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19777", +- "self_type" : "type-19776", ++ "referenced_type" : "type-19519", ++ "self_type" : "type-19518", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83399,8 +83441,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19933", +- "self_type" : "type-19932", ++ "referenced_type" : "type-19799", ++ "self_type" : "type-19798", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83408,8 +83450,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-20697", +- "self_type" : "type-20696", ++ "referenced_type" : "type-20705", ++ "self_type" : "type-20704", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83417,8 +83459,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-21821", +- "self_type" : "type-21820", ++ "referenced_type" : "type-21829", ++ "self_type" : "type-21828", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -84191,8 +84233,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-15710", +- "self_type" : "type-15709", ++ "referenced_type" : "type-15470", ++ "self_type" : "type-15469", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84200,8 +84242,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-15879", +- "self_type" : "type-15878", ++ "referenced_type" : "type-15620", ++ "self_type" : "type-15619", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84209,8 +84251,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-15987", +- "self_type" : "type-15986", ++ "referenced_type" : "type-15808", ++ "self_type" : "type-15807", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84218,8 +84260,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-16121", +- "self_type" : "type-16120", ++ "referenced_type" : "type-15978", ++ "self_type" : "type-15977", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84227,8 +84269,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-16270", +- "self_type" : "type-16269", ++ "referenced_type" : "type-16138", ++ "self_type" : "type-16137", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84236,8 +84278,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-16363", +- "self_type" : "type-16362", ++ "referenced_type" : "type-16483", ++ "self_type" : "type-16482", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84245,8 +84287,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-16463", +- "self_type" : "type-16462", ++ "referenced_type" : "type-16652", ++ "self_type" : "type-16651", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84254,8 +84296,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-16645", +- "self_type" : "type-16644", ++ "referenced_type" : "type-16758", ++ "self_type" : "type-16757", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84263,8 +84305,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-16725", +- "self_type" : "type-16724", ++ "referenced_type" : "type-16891", ++ "self_type" : "type-16890", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84272,8 +84314,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-16783", +- "self_type" : "type-16782", ++ "referenced_type" : "type-17040", ++ "self_type" : "type-17039", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84281,8 +84323,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-16857", +- "self_type" : "type-16856", ++ "referenced_type" : "type-17133", ++ "self_type" : "type-17132", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84290,8 +84332,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-17255", +- "self_type" : "type-17254", ++ "referenced_type" : "type-17233", ++ "self_type" : "type-17232", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84299,8 +84341,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-17362", +- "self_type" : "type-17361", ++ "referenced_type" : "type-17415", ++ "self_type" : "type-17414", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84308,8 +84350,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-17862", +- "self_type" : "type-17861", ++ "referenced_type" : "type-17495", ++ "self_type" : "type-17494", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84317,8 +84359,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-17950", +- "self_type" : "type-17949", ++ "referenced_type" : "type-17553", ++ "self_type" : "type-17552", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84326,8 +84368,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-18040", +- "self_type" : "type-18039", ++ "referenced_type" : "type-17627", ++ "self_type" : "type-17626", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84335,8 +84377,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-18123", +- "self_type" : "type-18122", ++ "referenced_type" : "type-18025", ++ "self_type" : "type-18024", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84344,8 +84386,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-18190", +- "self_type" : "type-18189", ++ "referenced_type" : "type-18140", ++ "self_type" : "type-18139", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84353,8 +84395,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-18352", +- "self_type" : "type-18351", ++ "referenced_type" : "type-18640", ++ "self_type" : "type-18639", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84362,8 +84404,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-18477", +- "self_type" : "type-18476", ++ "referenced_type" : "type-18728", ++ "self_type" : "type-18727", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84371,8 +84413,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-18619", +- "self_type" : "type-18618", ++ "referenced_type" : "type-18818", ++ "self_type" : "type-18817", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84380,8 +84422,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-18703", +- "self_type" : "type-18702", ++ "referenced_type" : "type-18901", ++ "self_type" : "type-18900", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84389,8 +84431,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-18983", +- "self_type" : "type-18982", ++ "referenced_type" : "type-18968", ++ "self_type" : "type-18967", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84398,8 +84440,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-19225", +- "self_type" : "type-19224", ++ "referenced_type" : "type-19130", ++ "self_type" : "type-19129", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84407,8 +84449,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-19376", +- "self_type" : "type-19375", ++ "referenced_type" : "type-19255", ++ "self_type" : "type-19254", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84416,8 +84458,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-19564", +- "self_type" : "type-19563", ++ "referenced_type" : "type-19397", ++ "self_type" : "type-19396", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84425,8 +84467,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-19734", +- "self_type" : "type-19733", ++ "referenced_type" : "type-19481", ++ "self_type" : "type-19480", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84434,8 +84476,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-19894", +- "self_type" : "type-19893", ++ "referenced_type" : "type-19761", ++ "self_type" : "type-19760", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84443,8 +84485,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-20243", +- "self_type" : "type-20242", ++ "referenced_type" : "type-20247", ++ "self_type" : "type-20246", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84452,8 +84494,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-20413", +- "self_type" : "type-20412", ++ "referenced_type" : "type-20417", ++ "self_type" : "type-20416", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84461,8 +84503,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-20519", +- "self_type" : "type-20518", ++ "referenced_type" : "type-20526", ++ "self_type" : "type-20525", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84470,8 +84512,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-20652", +- "self_type" : "type-20651", ++ "referenced_type" : "type-20660", ++ "self_type" : "type-20659", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84479,8 +84521,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-20801", +- "self_type" : "type-20800", ++ "referenced_type" : "type-20809", ++ "self_type" : "type-20808", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84497,8 +84539,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-20894", +- "self_type" : "type-20893", ++ "referenced_type" : "type-20902", ++ "self_type" : "type-20901", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84506,8 +84548,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-20995", +- "self_type" : "type-20994", ++ "referenced_type" : "type-21003", ++ "self_type" : "type-21002", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84515,8 +84557,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-21177", +- "self_type" : "type-21176", ++ "referenced_type" : "type-21185", ++ "self_type" : "type-21184", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84524,8 +84566,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-21257", +- "self_type" : "type-21256", ++ "referenced_type" : "type-21265", ++ "self_type" : "type-21264", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84533,8 +84575,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-21315", +- "self_type" : "type-21314", ++ "referenced_type" : "type-21323", ++ "self_type" : "type-21322", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84542,8 +84584,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-21389", +- "self_type" : "type-21388", ++ "referenced_type" : "type-21397", ++ "self_type" : "type-21396", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84551,8 +84593,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-21787", +- "self_type" : "type-21786", ++ "referenced_type" : "type-21795", ++ "self_type" : "type-21794", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85649,8 +85691,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", +- "referenced_type" : "type-15982", +- "self_type" : "type-15981", ++ "referenced_type" : "type-16753", ++ "self_type" : "type-16752", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85658,8 +85700,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", +- "referenced_type" : "type-18614", +- "self_type" : "type-18613", ++ "referenced_type" : "type-19392", ++ "self_type" : "type-19391", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85667,8 +85709,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", +- "referenced_type" : "type-20514", +- "self_type" : "type-20513", ++ "referenced_type" : "type-20521", ++ "self_type" : "type-20520", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85847,8 +85889,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-15949", +- "self_type" : "type-15952", ++ "referenced_type" : "type-15437", ++ "self_type" : "type-15440", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85856,8 +85898,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-17018", +- "self_type" : "type-17021", ++ "referenced_type" : "type-15765", ++ "self_type" : "type-15768", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85865,8 +85907,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-18577", +- "self_type" : "type-18581", ++ "referenced_type" : "type-15936", ++ "self_type" : "type-15939", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85874,8 +85916,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-18661", +- "self_type" : "type-18664", ++ "referenced_type" : "type-16103", ++ "self_type" : "type-16107", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85883,8 +85925,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-18851", +- "self_type" : "type-18854", ++ "referenced_type" : "type-16720", ++ "self_type" : "type-16723", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85892,8 +85934,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-18949", +- "self_type" : "type-18953", ++ "referenced_type" : "type-17788", ++ "self_type" : "type-17791", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85910,8 +85952,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-19192", +- "self_type" : "type-19195", ++ "referenced_type" : "type-19355", ++ "self_type" : "type-19359", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85919,8 +85961,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-19521", +- "self_type" : "type-19524", ++ "referenced_type" : "type-19439", ++ "self_type" : "type-19442", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85928,8 +85970,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-19692", +- "self_type" : "type-19695", ++ "referenced_type" : "type-19629", ++ "self_type" : "type-19632", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85937,8 +85979,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-19859", +- "self_type" : "type-19863", ++ "referenced_type" : "type-19727", ++ "self_type" : "type-19731", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85946,8 +85988,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-20481", +- "self_type" : "type-20484", ++ "referenced_type" : "type-20488", ++ "self_type" : "type-20491", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85955,8 +85997,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-21550", +- "self_type" : "type-21553", ++ "referenced_type" : "type-21558", ++ "self_type" : "type-21561", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86603,8 +86645,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::hash_set, std::equal_to > &", + "name" : "const google::protobuf::hash_set, std::equal_to > &", +- "referenced_type" : "type-19812", +- "self_type" : "type-19813", ++ "referenced_type" : "type-16056", ++ "self_type" : "type-16057", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -86900,8 +86942,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::StatusOr &", + "name" : "const google::protobuf::util::StatusOr &", +- "referenced_type" : "type-19958", +- "self_type" : "type-19959", ++ "referenced_type" : "type-16202", ++ "self_type" : "type-16203", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -86910,7 +86952,7 @@ + "linker_set_key" : "const google::protobuf::util::StatusOr &", + "name" : "const google::protobuf::util::StatusOr &", + "referenced_type" : "type-15278", +- "self_type" : "type-19953", ++ "self_type" : "type-16197", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -86936,8 +86978,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::converter::ProtoStreamObjectWriter::Options &", + "name" : "const google::protobuf::util::converter::ProtoStreamObjectWriter::Options &", +- "referenced_type" : "type-19456", +- "self_type" : "type-19640", ++ "referenced_type" : "type-15700", ++ "self_type" : "type-15884", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, +@@ -87002,71 +87044,71 @@ + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-16495", +- "self_type" : "type-16497", ++ "referenced_type" : "type-17265", ++ "self_type" : "type-17267", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-16887", +- "self_type" : "type-16889", ++ "referenced_type" : "type-17657", ++ "self_type" : "type-17659", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-17062", +- "self_type" : "type-17064", ++ "referenced_type" : "type-17832", ++ "self_type" : "type-17834", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-17181", +- "self_type" : "type-17183", ++ "referenced_type" : "type-17951", ++ "self_type" : "type-17953", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-17448", +- "self_type" : "type-17450", ++ "referenced_type" : "type-18226", ++ "self_type" : "type-18228", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-18898", +- "self_type" : "type-18900", ++ "referenced_type" : "type-19676", ++ "self_type" : "type-19678", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-21027", +- "self_type" : "type-21029", ++ "referenced_type" : "type-21035", ++ "self_type" : "type-21037", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-21419", +- "self_type" : "type-21421", ++ "referenced_type" : "type-21427", ++ "self_type" : "type-21429", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-21594", +- "self_type" : "type-21596", ++ "referenced_type" : "type-21602", ++ "self_type" : "type-21604", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-21713", +- "self_type" : "type-21715", ++ "referenced_type" : "type-21721", ++ "self_type" : "type-21723", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { +@@ -87245,8 +87287,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> > &", + "name" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> > &", +- "referenced_type" : "type-16978", +- "self_type" : "type-16980", ++ "referenced_type" : "type-17748", ++ "self_type" : "type-17750", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87254,8 +87296,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> > &", + "name" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> > &", +- "referenced_type" : "type-21510", +- "self_type" : "type-21512", ++ "referenced_type" : "type-21518", ++ "self_type" : "type-21520", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87317,8 +87359,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", + "name" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", +- "referenced_type" : "type-17564", +- "self_type" : "type-17566", ++ "referenced_type" : "type-18342", ++ "self_type" : "type-18344", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87362,8 +87404,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> > &", + "name" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> > &", +- "referenced_type" : "type-16988", +- "self_type" : "type-16990", ++ "referenced_type" : "type-17758", ++ "self_type" : "type-17760", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87371,8 +87413,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> > &", + "name" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> > &", +- "referenced_type" : "type-21520", +- "self_type" : "type-21522", ++ "referenced_type" : "type-21528", ++ "self_type" : "type-21530", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87443,8 +87485,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", + "name" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", +- "referenced_type" : "type-17574", +- "self_type" : "type-17576", ++ "referenced_type" : "type-18352", ++ "self_type" : "type-18354", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87452,8 +87494,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", + "name" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", +- "referenced_type" : "type-18827", +- "self_type" : "type-18829", ++ "referenced_type" : "type-19605", ++ "self_type" : "type-19607", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87515,8 +87557,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-16062", +- "self_type" : "type-16064", ++ "referenced_type" : "type-16833", ++ "self_type" : "type-16835", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87524,8 +87566,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-20594", +- "self_type" : "type-20596", ++ "referenced_type" : "type-20601", ++ "self_type" : "type-20603", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87587,8 +87629,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator &)> > &", + "name" : "const std::allocator &)> > &", +- "referenced_type" : "type-17142", +- "self_type" : "type-17144", ++ "referenced_type" : "type-17912", ++ "self_type" : "type-17914", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87596,8 +87638,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator &)> > &", + "name" : "const std::allocator &)> > &", +- "referenced_type" : "type-21674", +- "self_type" : "type-21676", ++ "referenced_type" : "type-21682", ++ "self_type" : "type-21684", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87650,8 +87692,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-16551", +- "self_type" : "type-16553", ++ "referenced_type" : "type-17321", ++ "self_type" : "type-17323", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87659,8 +87701,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-21083", +- "self_type" : "type-21085", ++ "referenced_type" : "type-21091", ++ "self_type" : "type-21093", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87722,8 +87764,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-17148", +- "self_type" : "type-17150", ++ "referenced_type" : "type-17918", ++ "self_type" : "type-17920", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87731,8 +87773,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-21680", +- "self_type" : "type-21682", ++ "referenced_type" : "type-21688", ++ "self_type" : "type-21690", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87776,8 +87818,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > &", + "name" : "const std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > &", +- "referenced_type" : "type-19487", +- "self_type" : "type-19489", ++ "referenced_type" : "type-15731", ++ "self_type" : "type-15733", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87803,8 +87845,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > &", + "name" : "const std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > &", +- "referenced_type" : "type-19345", +- "self_type" : "type-19347", ++ "referenced_type" : "type-15589", ++ "self_type" : "type-15591", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87839,8 +87881,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> > &", + "name" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> > &", +- "referenced_type" : "type-16070", +- "self_type" : "type-16072", ++ "referenced_type" : "type-16841", ++ "self_type" : "type-16843", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87848,8 +87890,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> > &", + "name" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> > &", +- "referenced_type" : "type-20602", +- "self_type" : "type-20604", ++ "referenced_type" : "type-20609", ++ "self_type" : "type-20611", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87920,8 +87962,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> > &", + "name" : "const std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> > &", +- "referenced_type" : "type-18440", +- "self_type" : "type-18442", ++ "referenced_type" : "type-19218", ++ "self_type" : "type-19220", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87956,8 +87998,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, int> > &", + "name" : "const std::allocator, std::allocator >, int> > &", +- "referenced_type" : "type-19043", +- "self_type" : "type-19045", ++ "referenced_type" : "type-19821", ++ "self_type" : "type-19823", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -88010,8 +88052,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, google::protobuf::internal::ExtensionInfo> > &", + "name" : "const std::allocator, google::protobuf::internal::ExtensionInfo> > &", +- "referenced_type" : "type-17470", +- "self_type" : "type-17475", ++ "referenced_type" : "type-18248", ++ "self_type" : "type-18253", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -88991,8 +89033,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15396", +- "self_type" : "type-15398", ++ "referenced_type" : "type-15374", ++ "self_type" : "type-15376", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89000,8 +89042,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15408", +- "self_type" : "type-15410", ++ "referenced_type" : "type-1547", ++ "self_type" : "type-1549", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89009,8 +89051,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15444", +- "self_type" : "type-15446", ++ "referenced_type" : "type-155", ++ "self_type" : "type-159", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89018,8 +89060,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1547", +- "self_type" : "type-1549", ++ "referenced_type" : "type-15549", ++ "self_type" : "type-15551", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89027,8 +89069,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15477", +- "self_type" : "type-15479", ++ "referenced_type" : "type-15554", ++ "self_type" : "type-15556", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89036,8 +89078,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-155", +- "self_type" : "type-159", ++ "referenced_type" : "type-15582", ++ "self_type" : "type-15584", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89045,8 +89087,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15510", +- "self_type" : "type-15512", ++ "referenced_type" : "type-15715", ++ "self_type" : "type-15726", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89054,10 +89096,10 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15568", +- "self_type" : "type-15579", ++ "referenced_type" : "type-15718", ++ "self_type" : "type-15720", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, +@@ -89072,8 +89114,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15818", +- "self_type" : "type-15820", ++ "referenced_type" : "type-15890", ++ "self_type" : "type-15894", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89081,8 +89123,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15831", +- "self_type" : "type-15833", ++ "referenced_type" : "type-15904", ++ "self_type" : "type-15906", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89090,8 +89132,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15895", +- "self_type" : "type-15909", ++ "referenced_type" : "type-16064", ++ "self_type" : "type-16066", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89099,8 +89141,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15927", +- "self_type" : "type-15929", ++ "referenced_type" : "type-16160", ++ "self_type" : "type-16179", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89108,8 +89150,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15932", +- "self_type" : "type-16001", ++ "referenced_type" : "type-16250", ++ "self_type" : "type-16252", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89117,8 +89159,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16020", +- "self_type" : "type-16035", ++ "referenced_type" : "type-16283", ++ "self_type" : "type-16285", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89126,17 +89168,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16039", +- "self_type" : "type-16051", ++ "referenced_type" : "type-16341", ++ "self_type" : "type-16352", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16181", +- "self_type" : "type-16186", ++ "referenced_type" : "type-16591", ++ "self_type" : "type-16593", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89144,8 +89186,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16232", +- "self_type" : "type-16234", ++ "referenced_type" : "type-16604", ++ "self_type" : "type-16606", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89153,8 +89195,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16259", +- "self_type" : "type-16261", ++ "referenced_type" : "type-16668", ++ "self_type" : "type-16682", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89162,8 +89204,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16329", +- "self_type" : "type-16331", ++ "referenced_type" : "type-16698", ++ "self_type" : "type-16700", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89171,8 +89213,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16332", +- "self_type" : "type-16334", ++ "referenced_type" : "type-16703", ++ "self_type" : "type-16772", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89180,8 +89222,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16407", +- "self_type" : "type-16415", ++ "referenced_type" : "type-16791", ++ "self_type" : "type-16806", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89189,8 +89231,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16436", +- "self_type" : "type-16438", ++ "referenced_type" : "type-16810", ++ "self_type" : "type-16822", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89198,8 +89240,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16534", +- "self_type" : "type-16536", ++ "referenced_type" : "type-16951", ++ "self_type" : "type-16956", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89207,8 +89249,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16578", +- "self_type" : "type-16580", ++ "referenced_type" : "type-170", ++ "self_type" : "type-172", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89216,8 +89258,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16614", +- "self_type" : "type-16616", ++ "referenced_type" : "type-17002", ++ "self_type" : "type-17004", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89225,8 +89267,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16635", +- "self_type" : "type-16672", ++ "referenced_type" : "type-17029", ++ "self_type" : "type-17031", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89234,8 +89276,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16679", +- "self_type" : "type-16681", ++ "referenced_type" : "type-17099", ++ "self_type" : "type-17101", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89243,8 +89285,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16686", +- "self_type" : "type-16689", ++ "referenced_type" : "type-17102", ++ "self_type" : "type-17104", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89252,8 +89294,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16745", +- "self_type" : "type-16747", ++ "referenced_type" : "type-17177", ++ "self_type" : "type-17185", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89261,8 +89303,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16810", +- "self_type" : "type-16812", ++ "referenced_type" : "type-17206", ++ "self_type" : "type-17208", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89270,8 +89312,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16825", +- "self_type" : "type-16827", ++ "referenced_type" : "type-17304", ++ "self_type" : "type-17306", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89279,8 +89321,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16848", +- "self_type" : "type-16891", ++ "referenced_type" : "type-17348", ++ "self_type" : "type-17350", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89288,8 +89330,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16896", +- "self_type" : "type-16898", ++ "referenced_type" : "type-17384", ++ "self_type" : "type-17386", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89297,8 +89339,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-170", +- "self_type" : "type-172", ++ "referenced_type" : "type-17405", ++ "self_type" : "type-17442", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89306,8 +89348,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17120", +- "self_type" : "type-17119", ++ "referenced_type" : "type-17449", ++ "self_type" : "type-17451", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89315,8 +89357,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17230", +- "self_type" : "type-17232", ++ "referenced_type" : "type-17456", ++ "self_type" : "type-17459", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89324,8 +89366,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17240", +- "self_type" : "type-17307", ++ "referenced_type" : "type-17515", ++ "self_type" : "type-17517", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89333,8 +89375,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17313", +- "self_type" : "type-17315", ++ "referenced_type" : "type-17580", ++ "self_type" : "type-17582", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89342,8 +89384,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17325", +- "self_type" : "type-17327", ++ "referenced_type" : "type-17595", ++ "self_type" : "type-17597", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89351,8 +89393,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17385", +- "self_type" : "type-17387", ++ "referenced_type" : "type-17618", ++ "self_type" : "type-17661", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89360,8 +89402,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17398", +- "self_type" : "type-17459", ++ "referenced_type" : "type-17666", ++ "self_type" : "type-17668", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89369,8 +89411,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17640", +- "self_type" : "type-17642", ++ "referenced_type" : "type-1785", ++ "self_type" : "type-1787", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89378,8 +89420,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17654", +- "self_type" : "type-17656", ++ "referenced_type" : "type-17890", ++ "self_type" : "type-17889", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89387,8 +89429,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17822", +- "self_type" : "type-17824", ++ "referenced_type" : "type-180", ++ "self_type" : "type-182", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89396,8 +89438,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1785", +- "self_type" : "type-1787", ++ "referenced_type" : "type-18000", ++ "self_type" : "type-18002", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89405,8 +89447,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17910", +- "self_type" : "type-17912", ++ "referenced_type" : "type-18010", ++ "self_type" : "type-18077", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89414,8 +89456,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17986", +- "self_type" : "type-17989", ++ "referenced_type" : "type-18083", ++ "self_type" : "type-18085", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89423,8 +89465,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-180", +- "self_type" : "type-182", ++ "referenced_type" : "type-18095", ++ "self_type" : "type-18097", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89432,8 +89474,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18095", +- "self_type" : "type-18097", ++ "referenced_type" : "type-18163", ++ "self_type" : "type-18165", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89441,8 +89483,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18150", +- "self_type" : "type-18152", ++ "referenced_type" : "type-18176", ++ "self_type" : "type-18237", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89450,8 +89492,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18179", +- "self_type" : "type-18181", ++ "referenced_type" : "type-18418", ++ "self_type" : "type-18420", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89459,8 +89501,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18256", +- "self_type" : "type-18258", ++ "referenced_type" : "type-18432", ++ "self_type" : "type-18434", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89468,17 +89510,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18270", +- "self_type" : "type-18272", ++ "referenced_type" : "type-1860", ++ "self_type" : "type-1880", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18292", +- "self_type" : "type-18294", ++ "referenced_type" : "type-18600", ++ "self_type" : "type-18602", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89486,8 +89528,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18300", +- "self_type" : "type-18302", ++ "referenced_type" : "type-18688", ++ "self_type" : "type-18690", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89495,8 +89537,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18311", +- "self_type" : "type-18313", ++ "referenced_type" : "type-18764", ++ "self_type" : "type-18767", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89504,8 +89546,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18318", +- "self_type" : "type-18468", ++ "referenced_type" : "type-18873", ++ "self_type" : "type-18875", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89513,8 +89555,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18432", +- "self_type" : "type-18434", ++ "referenced_type" : "type-18928", ++ "self_type" : "type-18930", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89522,8 +89564,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18447", +- "self_type" : "type-18467", ++ "referenced_type" : "type-18957", ++ "self_type" : "type-18959", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89531,8 +89573,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18558", +- "self_type" : "type-18628", ++ "referenced_type" : "type-19034", ++ "self_type" : "type-19036", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89540,8 +89582,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18599", +- "self_type" : "type-18723", ++ "referenced_type" : "type-19048", ++ "self_type" : "type-19050", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89549,17 +89591,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1860", +- "self_type" : "type-1880", ++ "referenced_type" : "type-19070", ++ "self_type" : "type-19072", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18639", +- "self_type" : "type-18638", ++ "referenced_type" : "type-19078", ++ "self_type" : "type-19080", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89567,8 +89609,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18774", +- "self_type" : "type-18776", ++ "referenced_type" : "type-19089", ++ "self_type" : "type-19091", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89576,8 +89618,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18811", +- "self_type" : "type-18821", ++ "referenced_type" : "type-19096", ++ "self_type" : "type-19246", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89585,8 +89627,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18917", +- "self_type" : "type-18919", ++ "referenced_type" : "type-19210", ++ "self_type" : "type-19212", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89594,8 +89636,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19102", +- "self_type" : "type-19104", ++ "referenced_type" : "type-19225", ++ "self_type" : "type-19245", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89603,8 +89645,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19116", +- "self_type" : "type-19118", ++ "referenced_type" : "type-193", ++ "self_type" : "type-195", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89612,8 +89654,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19124", +- "self_type" : "type-19126", ++ "referenced_type" : "type-19336", ++ "self_type" : "type-19406", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89621,8 +89663,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19129", +- "self_type" : "type-19131", ++ "referenced_type" : "type-19377", ++ "self_type" : "type-19501", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89630,8 +89672,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-193", +- "self_type" : "type-195", ++ "referenced_type" : "type-19417", ++ "self_type" : "type-19416", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89639,8 +89681,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19304", +- "self_type" : "type-19306", ++ "referenced_type" : "type-19552", ++ "self_type" : "type-19554", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89648,8 +89690,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19309", +- "self_type" : "type-19311", ++ "referenced_type" : "type-19589", ++ "self_type" : "type-19599", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89657,8 +89699,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19338", +- "self_type" : "type-19340", ++ "referenced_type" : "type-19695", ++ "self_type" : "type-19697", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89666,8 +89708,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19471", +- "self_type" : "type-19482", ++ "referenced_type" : "type-19880", ++ "self_type" : "type-19882", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89675,8 +89717,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19474", +- "self_type" : "type-19476", ++ "referenced_type" : "type-19894", ++ "self_type" : "type-19896", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89684,8 +89726,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19646", +- "self_type" : "type-19650", ++ "referenced_type" : "type-19902", ++ "self_type" : "type-19904", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89693,8 +89735,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19660", +- "self_type" : "type-19662", ++ "referenced_type" : "type-19929", ++ "self_type" : "type-19931", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89702,8 +89744,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19820", +- "self_type" : "type-19822", ++ "referenced_type" : "type-19941", ++ "self_type" : "type-19943", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89711,8 +89753,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19916", +- "self_type" : "type-19935", ++ "referenced_type" : "type-19977", ++ "self_type" : "type-19979", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89720,8 +89762,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20006", +- "self_type" : "type-20008", ++ "referenced_type" : "type-20010", ++ "self_type" : "type-20012", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89729,8 +89771,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20043", +- "self_type" : "type-20045", ++ "referenced_type" : "type-20047", ++ "self_type" : "type-20049", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89738,8 +89780,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20101", +- "self_type" : "type-20112", ++ "referenced_type" : "type-20105", ++ "self_type" : "type-20116", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, +@@ -89747,8 +89789,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20352", +- "self_type" : "type-20354", ++ "referenced_type" : "type-20356", ++ "self_type" : "type-20358", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89756,8 +89798,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20365", +- "self_type" : "type-20367", ++ "referenced_type" : "type-20369", ++ "self_type" : "type-20371", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89765,8 +89807,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20429", +- "self_type" : "type-20443", ++ "referenced_type" : "type-20433", ++ "self_type" : "type-20447", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89774,8 +89816,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20459", +- "self_type" : "type-20461", ++ "referenced_type" : "type-20466", ++ "self_type" : "type-20468", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89783,8 +89825,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20464", +- "self_type" : "type-20533", ++ "referenced_type" : "type-20471", ++ "self_type" : "type-20540", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89792,8 +89834,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20552", +- "self_type" : "type-20567", ++ "referenced_type" : "type-20559", ++ "self_type" : "type-20574", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89801,8 +89843,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20571", +- "self_type" : "type-20583", ++ "referenced_type" : "type-20578", ++ "self_type" : "type-20590", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89819,8 +89861,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20712", +- "self_type" : "type-20717", ++ "referenced_type" : "type-20720", ++ "self_type" : "type-20725", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89828,8 +89870,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20763", +- "self_type" : "type-20765", ++ "referenced_type" : "type-20771", ++ "self_type" : "type-20773", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89837,8 +89879,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20790", +- "self_type" : "type-20792", ++ "referenced_type" : "type-20798", ++ "self_type" : "type-20800", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89846,8 +89888,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20860", +- "self_type" : "type-20862", ++ "referenced_type" : "type-20868", ++ "self_type" : "type-20870", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89855,8 +89897,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20863", +- "self_type" : "type-20865", ++ "referenced_type" : "type-20871", ++ "self_type" : "type-20873", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89864,8 +89906,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20938", +- "self_type" : "type-20946", ++ "referenced_type" : "type-20946", ++ "self_type" : "type-20954", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89873,8 +89915,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20967", +- "self_type" : "type-20969", ++ "referenced_type" : "type-20975", ++ "self_type" : "type-20977", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89882,8 +89924,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21066", +- "self_type" : "type-21068", ++ "referenced_type" : "type-21074", ++ "self_type" : "type-21076", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89891,8 +89933,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21110", +- "self_type" : "type-21112", ++ "referenced_type" : "type-21118", ++ "self_type" : "type-21120", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89900,8 +89942,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21146", +- "self_type" : "type-21148", ++ "referenced_type" : "type-21154", ++ "self_type" : "type-21156", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89909,8 +89951,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21167", +- "self_type" : "type-21204", ++ "referenced_type" : "type-21175", ++ "self_type" : "type-21212", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89918,8 +89960,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21211", +- "self_type" : "type-21213", ++ "referenced_type" : "type-21219", ++ "self_type" : "type-21221", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89927,8 +89969,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21218", +- "self_type" : "type-21221", ++ "referenced_type" : "type-21226", ++ "self_type" : "type-21229", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89936,8 +89978,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21277", +- "self_type" : "type-21279", ++ "referenced_type" : "type-21285", ++ "self_type" : "type-21287", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89945,8 +89987,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21342", +- "self_type" : "type-21344", ++ "referenced_type" : "type-21350", ++ "self_type" : "type-21352", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89954,8 +89996,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21357", +- "self_type" : "type-21359", ++ "referenced_type" : "type-21365", ++ "self_type" : "type-21367", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89963,8 +90005,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21380", +- "self_type" : "type-21423", ++ "referenced_type" : "type-21388", ++ "self_type" : "type-21431", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89972,8 +90014,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21428", +- "self_type" : "type-21430", ++ "referenced_type" : "type-21436", ++ "self_type" : "type-21438", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89981,8 +90023,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21652", +- "self_type" : "type-21651", ++ "referenced_type" : "type-21660", ++ "self_type" : "type-21659", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89990,8 +90032,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21762", +- "self_type" : "type-21764", ++ "referenced_type" : "type-21770", ++ "self_type" : "type-21772", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89999,8 +90041,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21772", +- "self_type" : "type-21839", ++ "referenced_type" : "type-21780", ++ "self_type" : "type-21847", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90008,8 +90050,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21845", +- "self_type" : "type-21847", ++ "referenced_type" : "type-21853", ++ "self_type" : "type-21855", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90017,8 +90059,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21857", +- "self_type" : "type-21859", ++ "referenced_type" : "type-21865", ++ "self_type" : "type-21867", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92924,8 +92966,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-16548", +- "self_type" : "type-16550", ++ "referenced_type" : "type-17318", ++ "self_type" : "type-17320", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -92933,8 +92975,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-17145", +- "self_type" : "type-17147", ++ "referenced_type" : "type-17915", ++ "self_type" : "type-17917", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -92942,8 +92984,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-21080", +- "self_type" : "type-21082", ++ "referenced_type" : "type-21088", ++ "self_type" : "type-21090", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -92951,8 +92993,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-21677", +- "self_type" : "type-21679", ++ "referenced_type" : "type-21685", ++ "self_type" : "type-21687", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93050,8 +93092,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-16909", +- "self_type" : "type-16911", ++ "referenced_type" : "type-17679", ++ "self_type" : "type-17681", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -93059,8 +93101,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-21441", +- "self_type" : "type-21443", ++ "referenced_type" : "type-21449", ++ "self_type" : "type-21451", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -93158,8 +93200,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-16067", +- "self_type" : "type-16069", ++ "referenced_type" : "type-15586", ++ "self_type" : "type-15588", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93167,17 +93209,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-17491", +- "self_type" : "type-17493", ++ "referenced_type" : "type-15728", ++ "self_type" : "type-15730", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/arena.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-18437", +- "self_type" : "type-18439", ++ "referenced_type" : "type-16838", ++ "self_type" : "type-16840", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93185,17 +93227,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-19040", +- "self_type" : "type-19042", ++ "referenced_type" : "type-18269", ++ "self_type" : "type-18271", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-19342", +- "self_type" : "type-19344", ++ "referenced_type" : "type-19215", ++ "self_type" : "type-19217", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93203,8 +93245,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-19484", +- "self_type" : "type-19486", ++ "referenced_type" : "type-19818", ++ "self_type" : "type-19820", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93212,8 +93254,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-20599", +- "self_type" : "type-20601", ++ "referenced_type" : "type-20606", ++ "self_type" : "type-20608", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93392,8 +93434,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to > &", + "name" : "const std::equal_to > &", +- "referenced_type" : "type-17467", +- "self_type" : "type-17469", ++ "referenced_type" : "type-18245", ++ "self_type" : "type-18247", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93473,8 +93515,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator > > &", + "name" : "const std::map, std::allocator > > &", +- "referenced_type" : "type-17798", +- "self_type" : "type-17800", ++ "referenced_type" : "type-18576", ++ "self_type" : "type-18578", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93527,8 +93569,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > > &", + "name" : "const std::map >, std::less, std::allocator > > > > &", +- "referenced_type" : "type-17810", +- "self_type" : "type-17812", ++ "referenced_type" : "type-18588", ++ "self_type" : "type-18590", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93581,8 +93623,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > > &", + "name" : "const std::map >, std::less, std::allocator > > > > &", +- "referenced_type" : "type-17804", +- "self_type" : "type-17806", ++ "referenced_type" : "type-18582", ++ "self_type" : "type-18584", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93617,8 +93659,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator > > &", + "name" : "const std::map, std::allocator > > &", +- "referenced_type" : "type-19966", +- "self_type" : "type-19968", ++ "referenced_type" : "type-16210", ++ "self_type" : "type-16212", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93653,8 +93695,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > &", + "name" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > &", +- "referenced_type" : "type-16301", +- "self_type" : "type-16303", ++ "referenced_type" : "type-17071", ++ "self_type" : "type-17073", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93662,8 +93704,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > &", + "name" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > &", +- "referenced_type" : "type-20832", +- "self_type" : "type-20834", ++ "referenced_type" : "type-20840", ++ "self_type" : "type-20842", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93734,8 +93776,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > > &", + "name" : "const std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > > &", +- "referenced_type" : "type-18277", +- "self_type" : "type-18279", ++ "referenced_type" : "type-19055", ++ "self_type" : "type-19057", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -93770,8 +93812,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > &", + "name" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > &", +- "referenced_type" : "type-16313", +- "self_type" : "type-16315", ++ "referenced_type" : "type-17083", ++ "self_type" : "type-17085", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93779,8 +93821,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > &", + "name" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > &", +- "referenced_type" : "type-20844", +- "self_type" : "type-20846", ++ "referenced_type" : "type-20852", ++ "self_type" : "type-20854", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93851,8 +93893,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::pair, std::less >, std::allocator, std::pair > > > &", + "name" : "const std::map, std::pair, std::less >, std::allocator, std::pair > > > &", +- "referenced_type" : "type-18551", +- "self_type" : "type-18553", ++ "referenced_type" : "type-19329", ++ "self_type" : "type-19331", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93887,8 +93929,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > &", + "name" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > &", +- "referenced_type" : "type-16304", +- "self_type" : "type-16306", ++ "referenced_type" : "type-17074", ++ "self_type" : "type-17076", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93896,8 +93938,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > &", + "name" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > &", +- "referenced_type" : "type-20835", +- "self_type" : "type-20837", ++ "referenced_type" : "type-20843", ++ "self_type" : "type-20845", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93959,8 +94001,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > &", + "name" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > &", +- "referenced_type" : "type-16316", +- "self_type" : "type-16318", ++ "referenced_type" : "type-17086", ++ "self_type" : "type-17088", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93968,8 +94010,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > &", + "name" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > &", +- "referenced_type" : "type-20847", +- "self_type" : "type-20849", ++ "referenced_type" : "type-20855", ++ "self_type" : "type-20857", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94031,8 +94073,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-16025", +- "self_type" : "type-16027", ++ "referenced_type" : "type-16796", ++ "self_type" : "type-16798", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94040,8 +94082,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-20557", +- "self_type" : "type-20559", ++ "referenced_type" : "type-20564", ++ "self_type" : "type-20566", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94103,8 +94145,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &)> &", + "name" : "const std::pair &)> &", +- "referenced_type" : "type-17123", +- "self_type" : "type-17125", ++ "referenced_type" : "type-17893", ++ "self_type" : "type-17895", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94112,8 +94154,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &)> &", + "name" : "const std::pair &)> &", +- "referenced_type" : "type-21655", +- "self_type" : "type-21657", ++ "referenced_type" : "type-21663", ++ "self_type" : "type-21665", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94166,8 +94208,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-16018", +- "self_type" : "type-16022", ++ "referenced_type" : "type-16789", ++ "self_type" : "type-16793", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94175,8 +94217,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-20550", +- "self_type" : "type-20554", ++ "referenced_type" : "type-20557", ++ "self_type" : "type-20561", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94238,8 +94280,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-17127", +- "self_type" : "type-17129", ++ "referenced_type" : "type-17897", ++ "self_type" : "type-17899", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94247,8 +94289,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-21659", +- "self_type" : "type-21661", ++ "referenced_type" : "type-21667", ++ "self_type" : "type-21669", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94310,8 +94352,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-18554", +- "self_type" : "type-18556", ++ "referenced_type" : "type-19332", ++ "self_type" : "type-19334", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94364,8 +94406,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-17395", +- "self_type" : "type-17405", ++ "referenced_type" : "type-18173", ++ "self_type" : "type-18183", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -94427,8 +94469,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-19975", +- "self_type" : "type-19977", ++ "referenced_type" : "type-16219", ++ "self_type" : "type-16221", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94463,8 +94505,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *> &", + "name" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *> &", +- "referenced_type" : "type-16205", +- "self_type" : "type-16207", ++ "referenced_type" : "type-16975", ++ "self_type" : "type-16977", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94472,8 +94514,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *> &", + "name" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *> &", +- "referenced_type" : "type-20736", +- "self_type" : "type-20738", ++ "referenced_type" : "type-20744", ++ "self_type" : "type-20746", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94535,8 +94577,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int> &", + "name" : "const std::pair, std::allocator >, int> &", +- "referenced_type" : "type-19091", +- "self_type" : "type-19093", ++ "referenced_type" : "type-19869", ++ "self_type" : "type-19871", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94571,8 +94613,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, std::pair > &", + "name" : "const std::pair, std::allocator >, std::pair > &", +- "referenced_type" : "type-16217", +- "self_type" : "type-16219", ++ "referenced_type" : "type-16987", ++ "self_type" : "type-16989", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94580,8 +94622,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, std::pair > &", + "name" : "const std::pair, std::allocator >, std::pair > &", +- "referenced_type" : "type-20748", +- "self_type" : "type-20750", ++ "referenced_type" : "type-20756", ++ "self_type" : "type-20758", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94643,8 +94685,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, const google::protobuf::FieldDescriptor *> &", + "name" : "const std::pair, const google::protobuf::FieldDescriptor *> &", +- "referenced_type" : "type-16031", +- "self_type" : "type-16033", ++ "referenced_type" : "type-16802", ++ "self_type" : "type-16804", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94652,8 +94694,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, const google::protobuf::FieldDescriptor *> &", + "name" : "const std::pair, const google::protobuf::FieldDescriptor *> &", +- "referenced_type" : "type-20563", +- "self_type" : "type-20565", ++ "referenced_type" : "type-20570", ++ "self_type" : "type-20572", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94733,8 +94775,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, google::protobuf::internal::ExtensionInfo> &", + "name" : "const std::pair, google::protobuf::internal::ExtensionInfo> &", +- "referenced_type" : "type-18029", +- "self_type" : "type-18034", ++ "referenced_type" : "type-18807", ++ "self_type" : "type-18812", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94805,8 +94847,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> &", + "name" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> &", +- "referenced_type" : "type-16211", +- "self_type" : "type-16213", ++ "referenced_type" : "type-16981", ++ "self_type" : "type-16983", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94814,8 +94856,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> &", + "name" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> &", +- "referenced_type" : "type-20742", +- "self_type" : "type-20744", ++ "referenced_type" : "type-20750", ++ "self_type" : "type-20752", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94877,8 +94919,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int>, std::pair > &", + "name" : "const std::pair, std::allocator >, int>, std::pair > &", +- "referenced_type" : "type-16223", +- "self_type" : "type-16225", ++ "referenced_type" : "type-16993", ++ "self_type" : "type-16995", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94886,8 +94928,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int>, std::pair > &", + "name" : "const std::pair, std::allocator >, int>, std::pair > &", +- "referenced_type" : "type-20754", +- "self_type" : "type-20756", ++ "referenced_type" : "type-20762", ++ "self_type" : "type-20764", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94949,8 +94991,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-16311", +- "self_type" : "type-16310", ++ "referenced_type" : "type-17081", ++ "self_type" : "type-17080", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94958,8 +95000,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-20842", +- "self_type" : "type-20841", ++ "referenced_type" : "type-20850", ++ "self_type" : "type-20849", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -95021,8 +95063,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int> &", + "name" : "const std::pair, std::allocator >, int> &", +- "referenced_type" : "type-16307", +- "self_type" : "type-16309", ++ "referenced_type" : "type-17077", ++ "self_type" : "type-17079", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -95030,8 +95072,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int> &", + "name" : "const std::pair, std::allocator >, int> &", +- "referenced_type" : "type-20838", +- "self_type" : "type-20840", ++ "referenced_type" : "type-20846", ++ "self_type" : "type-20848", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -95093,8 +95135,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > &", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > &", +- "referenced_type" : "type-16951", +- "self_type" : "type-16954", ++ "referenced_type" : "type-17721", ++ "self_type" : "type-17724", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -95102,8 +95144,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > &", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > &", +- "referenced_type" : "type-21483", +- "self_type" : "type-21486", ++ "referenced_type" : "type-21491", ++ "self_type" : "type-21494", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -95165,8 +95207,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > &", + "name" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > &", +- "referenced_type" : "type-17528", +- "self_type" : "type-17531", ++ "referenced_type" : "type-18306", ++ "self_type" : "type-18309", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -95246,8 +95288,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-16873", +- "self_type" : "type-16875", ++ "referenced_type" : "type-17643", ++ "self_type" : "type-17645", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -95255,8 +95297,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-21405", +- "self_type" : "type-21407", ++ "referenced_type" : "type-21413", ++ "self_type" : "type-21415", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -95327,8 +95369,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-16250", +- "self_type" : "type-16252", ++ "referenced_type" : "type-17020", ++ "self_type" : "type-17022", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -95336,8 +95378,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-20781", +- "self_type" : "type-20783", ++ "referenced_type" : "type-20789", ++ "self_type" : "type-20791", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -95435,8 +95477,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-16087", +- "self_type" : "type-16090", ++ "referenced_type" : "type-16857", ++ "self_type" : "type-16860", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -95444,8 +95486,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-18284", +- "self_type" : "type-18286", ++ "referenced_type" : "type-19062", ++ "self_type" : "type-19064", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -95453,8 +95495,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-20618", +- "self_type" : "type-20621", ++ "referenced_type" : "type-20626", ++ "self_type" : "type-20629", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -95732,8 +95774,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-15482", +- "self_type" : "type-15487", ++ "referenced_type" : "type-15525", ++ "self_type" : "type-15527", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95741,8 +95783,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-16007", +- "self_type" : "type-16009", ++ "referenced_type" : "type-15544", ++ "self_type" : "type-15546", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95750,8 +95792,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-16295", +- "self_type" : "type-16297", ++ "referenced_type" : "type-15558", ++ "self_type" : "type-15560", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95759,8 +95801,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-1631", +- "self_type" : "type-1633", ++ "referenced_type" : "type-15895", ++ "self_type" : "type-15897", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95768,17 +95810,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-16341", +- "self_type" : "type-16343", ++ "referenced_type" : "type-16052", ++ "self_type" : "type-16054", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-16446", +- "self_type" : "type-16449", ++ "referenced_type" : "type-16207", ++ "self_type" : "type-16209", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95786,8 +95828,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-16633", +- "self_type" : "type-16632", ++ "referenced_type" : "type-16255", ++ "self_type" : "type-16260", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95795,8 +95837,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-17112", +- "self_type" : "type-17114", ++ "referenced_type" : "type-1631", ++ "self_type" : "type-1633", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95804,8 +95846,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-17308", +- "self_type" : "type-17310", ++ "referenced_type" : "type-16778", ++ "self_type" : "type-16780", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95813,8 +95855,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-17645", +- "self_type" : "type-17648", ++ "referenced_type" : "type-17065", ++ "self_type" : "type-17067", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95822,17 +95864,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-17792", +- "self_type" : "type-17794", ++ "referenced_type" : "type-17111", ++ "self_type" : "type-17113", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-18295", +- "self_type" : "type-18297", ++ "referenced_type" : "type-17216", ++ "self_type" : "type-17219", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95840,8 +95882,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-18425", +- "self_type" : "type-18427", ++ "referenced_type" : "type-17403", ++ "self_type" : "type-17402", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95849,8 +95891,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-18545", +- "self_type" : "type-18547", ++ "referenced_type" : "type-17882", ++ "self_type" : "type-17884", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95858,8 +95900,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-18763", +- "self_type" : "type-18765", ++ "referenced_type" : "type-18078", ++ "self_type" : "type-18080", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95867,8 +95909,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-18907", +- "self_type" : "type-18909", ++ "referenced_type" : "type-18423", ++ "self_type" : "type-18426", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95876,17 +95918,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-18915", +- "self_type" : "type-18914", ++ "referenced_type" : "type-18570", ++ "self_type" : "type-18572", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-19110", +- "self_type" : "type-19112", ++ "referenced_type" : "type-19073", ++ "self_type" : "type-19075", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95894,8 +95936,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-19280", +- "self_type" : "type-19282", ++ "referenced_type" : "type-19203", ++ "self_type" : "type-19205", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95903,8 +95945,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-19299", +- "self_type" : "type-19301", ++ "referenced_type" : "type-19323", ++ "self_type" : "type-19325", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95912,8 +95954,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-19313", +- "self_type" : "type-19315", ++ "referenced_type" : "type-19541", ++ "self_type" : "type-19543", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95921,8 +95963,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-19651", +- "self_type" : "type-19653", ++ "referenced_type" : "type-19685", ++ "self_type" : "type-19687", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95930,26 +95972,26 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-198", +- "self_type" : "type-200", ++ "referenced_type" : "type-19693", ++ "self_type" : "type-19692", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-19808", +- "self_type" : "type-19810", ++ "referenced_type" : "type-198", ++ "self_type" : "type-200", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-19963", +- "self_type" : "type-19965", ++ "referenced_type" : "type-19888", ++ "self_type" : "type-19890", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95957,8 +95999,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-20011", +- "self_type" : "type-20016", ++ "referenced_type" : "type-20015", ++ "self_type" : "type-20020", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95966,8 +96008,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-20539", +- "self_type" : "type-20541", ++ "referenced_type" : "type-20546", ++ "self_type" : "type-20548", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95975,8 +96017,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-20826", +- "self_type" : "type-20828", ++ "referenced_type" : "type-20834", ++ "self_type" : "type-20836", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95984,8 +96026,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-20872", +- "self_type" : "type-20874", ++ "referenced_type" : "type-20880", ++ "self_type" : "type-20882", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, +@@ -95993,8 +96035,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-20977", +- "self_type" : "type-20980", ++ "referenced_type" : "type-20985", ++ "self_type" : "type-20988", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96011,8 +96053,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-21165", +- "self_type" : "type-21164", ++ "referenced_type" : "type-21173", ++ "self_type" : "type-21172", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96020,8 +96062,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-21644", +- "self_type" : "type-21646", ++ "referenced_type" : "type-21652", ++ "self_type" : "type-21654", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96029,8 +96071,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-21840", +- "self_type" : "type-21842", ++ "referenced_type" : "type-21848", ++ "self_type" : "type-21850", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -97505,8 +97547,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::TextFormat::Printer::TextGenerator &", + "name" : "google::protobuf::TextFormat::Printer::TextGenerator &", +- "referenced_type" : "type-17709", +- "self_type" : "type-17708", ++ "referenced_type" : "type-18487", ++ "self_type" : "type-18486", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, +@@ -97640,8 +97682,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > > &", + "name" : "google::protobuf::hash_map, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > > &", +- "referenced_type" : "type-19477", +- "self_type" : "type-19654", ++ "referenced_type" : "type-15721", ++ "self_type" : "type-15898", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -97649,8 +97691,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > > &", + "name" : "google::protobuf::hash_map, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > > &", +- "referenced_type" : "type-19317", +- "self_type" : "type-19316", ++ "referenced_type" : "type-15562", ++ "self_type" : "type-15561", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -97784,8 +97826,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::StatusOr &", + "name" : "google::protobuf::util::StatusOr &", +- "referenced_type" : "type-19955", +- "self_type" : "type-19957", ++ "referenced_type" : "type-16199", ++ "self_type" : "type-16201", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -97794,7 +97836,7 @@ + "linker_set_key" : "google::protobuf::util::StatusOr &", + "name" : "google::protobuf::util::StatusOr &", + "referenced_type" : "type-15277", +- "self_type" : "type-19954", ++ "self_type" : "type-16198", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -97811,8 +97853,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::JsonObjectWriter::Element *const &", + "name" : "google::protobuf::util::converter::JsonObjectWriter::Element *const &", +- "referenced_type" : "type-19136", +- "self_type" : "type-19142", ++ "referenced_type" : "type-15381", ++ "self_type" : "type-15387", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -97821,7 +97863,7 @@ + "linker_set_key" : "google::protobuf::util::converter::LocationTrackerInterface &", + "name" : "google::protobuf::util::converter::LocationTrackerInterface &", + "referenced_type" : "type-15337", +- "self_type" : "type-19554", ++ "self_type" : "type-15798", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -97829,8 +97871,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Item *const &", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Item *const &", +- "referenced_type" : "type-19570", +- "self_type" : "type-19572", ++ "referenced_type" : "type-15814", ++ "self_type" : "type-15816", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -97838,8 +97880,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoWriter::ProtoElement &", + "name" : "google::protobuf::util::converter::ProtoWriter::ProtoElement &", +- "referenced_type" : "type-19461", +- "self_type" : "type-19543", ++ "referenced_type" : "type-15705", ++ "self_type" : "type-15787", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -97847,8 +97889,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoWriter::ProtoElement *const &", + "name" : "google::protobuf::util::converter::ProtoWriter::ProtoElement *const &", +- "referenced_type" : "type-19739", +- "self_type" : "type-19740", ++ "referenced_type" : "type-15983", ++ "self_type" : "type-15984", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -97856,8 +97898,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::StructuredObjectWriter::BaseElement *const &", + "name" : "google::protobuf::util::converter::StructuredObjectWriter::BaseElement *const &", +- "referenced_type" : "type-19568", +- "self_type" : "type-19569", ++ "referenced_type" : "type-15812", ++ "self_type" : "type-15813", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -97919,37 +97961,37 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-15843", +- "self_type" : "type-15842", ++ "referenced_type" : "type-164", ++ "self_type" : "type-163", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/int128.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/status.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-16101", +- "self_type" : "type-16100", ++ "referenced_type" : "type-16616", ++ "self_type" : "type-16615", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/status.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/int128.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-16290", +- "self_type" : "type-16289", ++ "referenced_type" : "type-16871", ++ "self_type" : "type-16870", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/status.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-164", +- "self_type" : "type-163", ++ "referenced_type" : "type-17060", ++ "self_type" : "type-17059", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/status.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" + }, + { + "alignment" : 4, +@@ -97964,8 +98006,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-20377", +- "self_type" : "type-20376", ++ "referenced_type" : "type-20381", ++ "self_type" : "type-20380", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/int128.h" + }, +@@ -97973,8 +98015,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-20632", +- "self_type" : "type-20631", ++ "referenced_type" : "type-20640", ++ "self_type" : "type-20639", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/status.h" + }, +@@ -97982,8 +98024,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-20821", +- "self_type" : "type-20820", ++ "referenced_type" : "type-20829", ++ "self_type" : "type-20828", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" + }, +@@ -98243,17 +98285,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &", + "name" : "std::basic_string, std::allocator > &", +- "referenced_type" : "type-17538", +- "self_type" : "type-17537", ++ "referenced_type" : "type-15575", ++ "self_type" : "type-15574", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/map.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/status_macros.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &", + "name" : "std::basic_string, std::allocator > &", +- "referenced_type" : "type-18825", +- "self_type" : "type-18824", ++ "referenced_type" : "type-18316", ++ "self_type" : "type-18315", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -98261,10 +98303,10 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &", + "name" : "std::basic_string, std::allocator > &", +- "referenced_type" : "type-19331", +- "self_type" : "type-19330", ++ "referenced_type" : "type-19603", ++ "self_type" : "type-19602", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/status_macros.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "alignment" : 4, +@@ -98351,8 +98393,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *const &", + "name" : "std::basic_string, std::allocator > *const &", +- "referenced_type" : "type-16129", +- "self_type" : "type-16130", ++ "referenced_type" : "type-16899", ++ "self_type" : "type-16900", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -98360,8 +98402,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *const &", + "name" : "std::basic_string, std::allocator > *const &", +- "referenced_type" : "type-18707", +- "self_type" : "type-18708", ++ "referenced_type" : "type-19485", ++ "self_type" : "type-19486", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -98369,8 +98411,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *const &", + "name" : "std::basic_string, std::allocator > *const &", +- "referenced_type" : "type-20660", +- "self_type" : "type-20661", ++ "referenced_type" : "type-20668", ++ "self_type" : "type-20669", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -98450,8 +98492,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > &", + "name" : "std::map, std::allocator > > &", +- "referenced_type" : "type-18624", +- "self_type" : "type-18623", ++ "referenced_type" : "type-19402", ++ "self_type" : "type-19401", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -98486,8 +98528,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > &", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > &", +- "referenced_type" : "type-16017", +- "self_type" : "type-16016", ++ "referenced_type" : "type-16788", ++ "self_type" : "type-16787", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -98495,8 +98537,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > &", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > &", +- "referenced_type" : "type-20549", +- "self_type" : "type-20548", ++ "referenced_type" : "type-20556", ++ "self_type" : "type-20555", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -98550,7 +98592,7 @@ + "linker_set_key" : "unsigned int &", + "name" : "unsigned int &", + "referenced_type" : "type-4", +- "self_type" : "type-19329", ++ "self_type" : "type-15573", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/status_macros.h" + }, +@@ -98903,8 +98945,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-15375", +- "self_type" : "type-15377", ++ "referenced_type" : "type-15410", ++ "self_type" : "type-15416", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -98912,8 +98954,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-15399", +- "self_type" : "type-15401", ++ "referenced_type" : "type-15734", ++ "self_type" : "type-15738", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -98921,8 +98963,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-17908", +- "self_type" : "type-17907", ++ "referenced_type" : "type-18686", ++ "self_type" : "type-18685", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -98930,26 +98972,26 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-18339", +- "self_type" : "type-18341", ++ "referenced_type" : "type-1888", ++ "self_type" : "type-1887", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-1888", +- "self_type" : "type-1887", ++ "referenced_type" : "type-19117", ++ "self_type" : "type-19119", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-19165", +- "self_type" : "type-19171", ++ "referenced_type" : "type-19908", ++ "self_type" : "type-19910", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -98957,8 +98999,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-19490", +- "self_type" : "type-19494", ++ "referenced_type" : "type-19932", ++ "self_type" : "type-19934", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -99236,8 +99278,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DynamicMessage::TypeInfo *", + "name" : "const google::protobuf::DynamicMessage::TypeInfo *", +- "referenced_type" : "type-16543", +- "self_type" : "type-16542", ++ "referenced_type" : "type-17313", ++ "self_type" : "type-17312", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -99245,8 +99287,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DynamicMessage::TypeInfo *", + "name" : "const google::protobuf::DynamicMessage::TypeInfo *", +- "referenced_type" : "type-21075", +- "self_type" : "type-21074", ++ "referenced_type" : "type-21083", ++ "self_type" : "type-21082", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -99389,8 +99431,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-15941", +- "self_type" : "type-15943", ++ "referenced_type" : "type-15427", ++ "self_type" : "type-15429", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99398,8 +99440,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-17010", +- "self_type" : "type-17012", ++ "referenced_type" : "type-15757", ++ "self_type" : "type-15759", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99407,8 +99449,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-18569", +- "self_type" : "type-18571", ++ "referenced_type" : "type-15928", ++ "self_type" : "type-15930", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99416,8 +99458,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-18653", +- "self_type" : "type-18655", ++ "referenced_type" : "type-16094", ++ "self_type" : "type-16096", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99425,8 +99467,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-18843", +- "self_type" : "type-18845", ++ "referenced_type" : "type-16712", ++ "self_type" : "type-16714", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99434,8 +99476,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-18940", +- "self_type" : "type-18942", ++ "referenced_type" : "type-17780", ++ "self_type" : "type-17782", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99452,8 +99494,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-19182", +- "self_type" : "type-19184", ++ "referenced_type" : "type-19347", ++ "self_type" : "type-19349", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99461,8 +99503,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-19513", +- "self_type" : "type-19515", ++ "referenced_type" : "type-19431", ++ "self_type" : "type-19433", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99470,8 +99512,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-19684", +- "self_type" : "type-19686", ++ "referenced_type" : "type-19621", ++ "self_type" : "type-19623", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99479,8 +99521,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-19850", +- "self_type" : "type-19852", ++ "referenced_type" : "type-19718", ++ "self_type" : "type-19720", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99488,8 +99530,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-20473", +- "self_type" : "type-20475", ++ "referenced_type" : "type-20480", ++ "self_type" : "type-20482", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99497,8 +99539,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-21542", +- "self_type" : "type-21544", ++ "referenced_type" : "type-21550", ++ "self_type" : "type-21552", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99893,8 +99935,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-15945", +- "self_type" : "type-15947", ++ "referenced_type" : "type-15431", ++ "self_type" : "type-15435", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99902,8 +99944,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-17014", +- "self_type" : "type-17016", ++ "referenced_type" : "type-15761", ++ "self_type" : "type-15763", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99911,8 +99953,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-18573", +- "self_type" : "type-18575", ++ "referenced_type" : "type-15932", ++ "self_type" : "type-15934", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99920,8 +99962,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-18657", +- "self_type" : "type-18659", ++ "referenced_type" : "type-16098", ++ "self_type" : "type-16101", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99929,8 +99971,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-18847", +- "self_type" : "type-18849", ++ "referenced_type" : "type-16716", ++ "self_type" : "type-16718", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99938,8 +99980,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-18945", +- "self_type" : "type-18947", ++ "referenced_type" : "type-17784", ++ "self_type" : "type-17786", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99956,8 +99998,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-19186", +- "self_type" : "type-19190", ++ "referenced_type" : "type-19351", ++ "self_type" : "type-19353", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99965,8 +100007,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-19517", +- "self_type" : "type-19519", ++ "referenced_type" : "type-19435", ++ "self_type" : "type-19437", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99974,8 +100016,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-19688", +- "self_type" : "type-19690", ++ "referenced_type" : "type-19625", ++ "self_type" : "type-19627", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99983,8 +100025,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-19854", +- "self_type" : "type-19857", ++ "referenced_type" : "type-19723", ++ "self_type" : "type-19725", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99992,8 +100034,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-20477", +- "self_type" : "type-20479", ++ "referenced_type" : "type-20484", ++ "self_type" : "type-20486", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100001,8 +100043,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-21546", +- "self_type" : "type-21548", ++ "referenced_type" : "type-21554", ++ "self_type" : "type-21556", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100352,8 +100394,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldDescriptor *", + "name" : "const google::protobuf::FieldDescriptor *", +- "referenced_type" : "type-17446", +- "self_type" : "type-17445", ++ "referenced_type" : "type-18224", ++ "self_type" : "type-18223", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -100505,8 +100547,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-15937", +- "self_type" : "type-15939", ++ "referenced_type" : "type-15423", ++ "self_type" : "type-15425", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100514,8 +100556,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-17006", +- "self_type" : "type-17008", ++ "referenced_type" : "type-15753", ++ "self_type" : "type-15755", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100523,8 +100565,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-18565", +- "self_type" : "type-18567", ++ "referenced_type" : "type-15924", ++ "self_type" : "type-15926", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100532,8 +100574,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-18649", +- "self_type" : "type-18651", ++ "referenced_type" : "type-16088", ++ "self_type" : "type-16092", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100541,8 +100583,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-18839", +- "self_type" : "type-18841", ++ "referenced_type" : "type-16708", ++ "self_type" : "type-16710", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100550,8 +100592,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-18935", +- "self_type" : "type-18938", ++ "referenced_type" : "type-17776", ++ "self_type" : "type-17778", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100559,8 +100601,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-19178", +- "self_type" : "type-19180", ++ "referenced_type" : "type-1932", ++ "self_type" : "type-1931", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100568,8 +100610,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-1932", +- "self_type" : "type-1931", ++ "referenced_type" : "type-19343", ++ "self_type" : "type-19345", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100577,8 +100619,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-19509", +- "self_type" : "type-19511", ++ "referenced_type" : "type-19427", ++ "self_type" : "type-19429", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100586,8 +100628,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-19680", +- "self_type" : "type-19682", ++ "referenced_type" : "type-19617", ++ "self_type" : "type-19619", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100595,8 +100637,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-19844", +- "self_type" : "type-19848", ++ "referenced_type" : "type-19713", ++ "self_type" : "type-19716", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100604,8 +100646,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-20469", +- "self_type" : "type-20471", ++ "referenced_type" : "type-20476", ++ "self_type" : "type-20478", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100613,8 +100655,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-21538", +- "self_type" : "type-21540", ++ "referenced_type" : "type-21546", ++ "self_type" : "type-21548", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101324,8 +101366,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-15610", +- "self_type" : "type-15609", ++ "referenced_type" : "type-15448", ++ "self_type" : "type-15450", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101333,8 +101375,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-15844", +- "self_type" : "type-15846", ++ "referenced_type" : "type-15604", ++ "self_type" : "type-15606", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101342,8 +101384,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-15960", +- "self_type" : "type-15962", ++ "referenced_type" : "type-15778", ++ "self_type" : "type-15780", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101351,8 +101393,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-16084", +- "self_type" : "type-16086", ++ "referenced_type" : "type-15948", ++ "self_type" : "type-15950", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101360,8 +101402,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-16237", +- "self_type" : "type-16239", ++ "referenced_type" : "type-16116", ++ "self_type" : "type-16118", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101369,8 +101411,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-16348", +- "self_type" : "type-16350", ++ "referenced_type" : "type-16383", ++ "self_type" : "type-16382", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101378,8 +101420,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-16450", +- "self_type" : "type-16452", ++ "referenced_type" : "type-16617", ++ "self_type" : "type-16619", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101387,8 +101429,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-16573", +- "self_type" : "type-16575", ++ "referenced_type" : "type-16731", ++ "self_type" : "type-16733", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101396,8 +101438,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-16627", +- "self_type" : "type-16629", ++ "referenced_type" : "type-16854", ++ "self_type" : "type-16856", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101405,8 +101447,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-16692", +- "self_type" : "type-16694", ++ "referenced_type" : "type-17007", ++ "self_type" : "type-17009", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101414,8 +101456,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-16766", +- "self_type" : "type-16769", ++ "referenced_type" : "type-17118", ++ "self_type" : "type-17120", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101423,8 +101465,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-16842", +- "self_type" : "type-16844", ++ "referenced_type" : "type-17220", ++ "self_type" : "type-17222", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101432,8 +101474,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-17029", +- "self_type" : "type-17032", ++ "referenced_type" : "type-17343", ++ "self_type" : "type-17345", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101441,8 +101483,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-17164", +- "self_type" : "type-17166", ++ "referenced_type" : "type-17397", ++ "self_type" : "type-17399", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101450,8 +101492,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-17242", +- "self_type" : "type-17244", ++ "referenced_type" : "type-17462", ++ "self_type" : "type-17464", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101459,8 +101501,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-17349", +- "self_type" : "type-17351", ++ "referenced_type" : "type-17536", ++ "self_type" : "type-17539", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101468,8 +101510,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-17592", +- "self_type" : "type-17594", ++ "referenced_type" : "type-17612", ++ "self_type" : "type-17614", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101477,8 +101519,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-17670", +- "self_type" : "type-17673", ++ "referenced_type" : "type-17799", ++ "self_type" : "type-17802", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101486,8 +101528,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-17839", +- "self_type" : "type-17841", ++ "referenced_type" : "type-17934", ++ "self_type" : "type-17936", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101495,8 +101537,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-17930", +- "self_type" : "type-17932", ++ "referenced_type" : "type-18012", ++ "self_type" : "type-18014", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101504,8 +101546,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-18022", +- "self_type" : "type-18024", ++ "referenced_type" : "type-18127", ++ "self_type" : "type-18129", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101513,8 +101555,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-18109", +- "self_type" : "type-18111", ++ "referenced_type" : "type-18370", ++ "self_type" : "type-18372", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101522,8 +101564,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-18174", +- "self_type" : "type-18176", ++ "referenced_type" : "type-18448", ++ "self_type" : "type-18451", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101531,8 +101573,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-18324", +- "self_type" : "type-18326", ++ "referenced_type" : "type-18617", ++ "self_type" : "type-18619", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101540,8 +101582,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-18454", +- "self_type" : "type-18456", ++ "referenced_type" : "type-18708", ++ "self_type" : "type-18710", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101549,8 +101591,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-18589", +- "self_type" : "type-18591", ++ "referenced_type" : "type-18800", ++ "self_type" : "type-18802", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101558,8 +101600,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-18674", +- "self_type" : "type-18676", ++ "referenced_type" : "type-18887", ++ "self_type" : "type-18889", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101567,8 +101609,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-18865", +- "self_type" : "type-18867", ++ "referenced_type" : "type-18952", ++ "self_type" : "type-18954", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101576,8 +101618,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-18962", +- "self_type" : "type-18965", ++ "referenced_type" : "type-19102", ++ "self_type" : "type-19104", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101585,8 +101627,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-19203", +- "self_type" : "type-19205", ++ "referenced_type" : "type-19232", ++ "self_type" : "type-19234", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101594,8 +101636,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-19360", +- "self_type" : "type-19362", ++ "referenced_type" : "type-19367", ++ "self_type" : "type-19369", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101612,8 +101654,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-19534", +- "self_type" : "type-19536", ++ "referenced_type" : "type-19452", ++ "self_type" : "type-19454", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101621,8 +101663,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-19704", +- "self_type" : "type-19706", ++ "referenced_type" : "type-19643", ++ "self_type" : "type-19645", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101630,8 +101672,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-19872", +- "self_type" : "type-19874", ++ "referenced_type" : "type-19740", ++ "self_type" : "type-19743", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101639,8 +101681,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-20143", +- "self_type" : "type-20142", ++ "referenced_type" : "type-20147", ++ "self_type" : "type-20146", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101648,8 +101690,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-20378", +- "self_type" : "type-20380", ++ "referenced_type" : "type-20382", ++ "self_type" : "type-20384", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101657,8 +101699,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-20492", +- "self_type" : "type-20494", ++ "referenced_type" : "type-20499", ++ "self_type" : "type-20501", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101666,8 +101708,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-20615", +- "self_type" : "type-20617", ++ "referenced_type" : "type-20623", ++ "self_type" : "type-20625", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101675,8 +101717,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-20768", +- "self_type" : "type-20770", ++ "referenced_type" : "type-20776", ++ "self_type" : "type-20778", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101684,8 +101726,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-20879", +- "self_type" : "type-20881", ++ "referenced_type" : "type-20887", ++ "self_type" : "type-20889", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101693,8 +101735,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-20982", +- "self_type" : "type-20984", ++ "referenced_type" : "type-20990", ++ "self_type" : "type-20992", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101702,8 +101744,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-21105", +- "self_type" : "type-21107", ++ "referenced_type" : "type-21113", ++ "self_type" : "type-21115", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101711,8 +101753,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-21159", +- "self_type" : "type-21161", ++ "referenced_type" : "type-21167", ++ "self_type" : "type-21169", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101720,8 +101762,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-21224", +- "self_type" : "type-21226", ++ "referenced_type" : "type-21232", ++ "self_type" : "type-21234", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101729,8 +101771,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-21298", +- "self_type" : "type-21301", ++ "referenced_type" : "type-21306", ++ "self_type" : "type-21309", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101738,8 +101780,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-21374", +- "self_type" : "type-21376", ++ "referenced_type" : "type-21382", ++ "self_type" : "type-21384", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101747,8 +101789,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-21561", +- "self_type" : "type-21564", ++ "referenced_type" : "type-21569", ++ "self_type" : "type-21572", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101756,8 +101798,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-21696", +- "self_type" : "type-21698", ++ "referenced_type" : "type-21704", ++ "self_type" : "type-21706", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101765,8 +101807,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-21774", +- "self_type" : "type-21776", ++ "referenced_type" : "type-21782", ++ "self_type" : "type-21784", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102989,8 +103031,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-15957", +- "self_type" : "type-15959", ++ "referenced_type" : "type-15445", ++ "self_type" : "type-15447", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102998,8 +103040,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-17026", +- "self_type" : "type-17028", ++ "referenced_type" : "type-15773", ++ "self_type" : "type-15775", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103007,8 +103049,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-18586", +- "self_type" : "type-18588", ++ "referenced_type" : "type-15945", ++ "self_type" : "type-15947", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103016,8 +103058,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-18671", +- "self_type" : "type-18673", ++ "referenced_type" : "type-16113", ++ "self_type" : "type-16115", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103025,8 +103067,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-18862", +- "self_type" : "type-18864", ++ "referenced_type" : "type-16728", ++ "self_type" : "type-16730", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103034,8 +103076,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-18959", +- "self_type" : "type-18961", ++ "referenced_type" : "type-17796", ++ "self_type" : "type-17798", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103043,8 +103085,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-19200", +- "self_type" : "type-19202", ++ "referenced_type" : "type-19364", ++ "self_type" : "type-19366", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103061,8 +103103,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-19529", +- "self_type" : "type-19531", ++ "referenced_type" : "type-19449", ++ "self_type" : "type-19451", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103070,8 +103112,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-19701", +- "self_type" : "type-19703", ++ "referenced_type" : "type-19640", ++ "self_type" : "type-19642", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103079,8 +103121,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-19869", +- "self_type" : "type-19871", ++ "referenced_type" : "type-19737", ++ "self_type" : "type-19739", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103088,8 +103130,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-20489", +- "self_type" : "type-20491", ++ "referenced_type" : "type-20496", ++ "self_type" : "type-20498", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103097,8 +103139,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-21558", +- "self_type" : "type-21560", ++ "referenced_type" : "type-21566", ++ "self_type" : "type-21568", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103763,8 +103805,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-15935", +- "self_type" : "type-16002", ++ "referenced_type" : "type-15412", ++ "self_type" : "type-15414", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103772,8 +103814,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-17000", +- "self_type" : "type-17002", ++ "referenced_type" : "type-15748", ++ "self_type" : "type-15750", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103781,8 +103823,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-18560", +- "self_type" : "type-18562", ++ "referenced_type" : "type-15917", ++ "self_type" : "type-15919", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103790,8 +103832,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-18642", +- "self_type" : "type-18644", ++ "referenced_type" : "type-16079", ++ "self_type" : "type-16081", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103799,8 +103841,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-18833", +- "self_type" : "type-18835", ++ "referenced_type" : "type-16706", ++ "self_type" : "type-16773", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103808,8 +103850,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-18927", +- "self_type" : "type-18929", ++ "referenced_type" : "type-17770", ++ "self_type" : "type-17772", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103817,8 +103859,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-19167", +- "self_type" : "type-19169", ++ "referenced_type" : "type-19338", ++ "self_type" : "type-19340", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103826,8 +103868,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-1944", +- "self_type" : "type-1943", ++ "referenced_type" : "type-19420", ++ "self_type" : "type-19422", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103835,8 +103877,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-19504", +- "self_type" : "type-19506", ++ "referenced_type" : "type-1944", ++ "self_type" : "type-1943", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103844,8 +103886,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-19673", +- "self_type" : "type-19675", ++ "referenced_type" : "type-19611", ++ "self_type" : "type-19613", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103853,8 +103895,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-19835", +- "self_type" : "type-19837", ++ "referenced_type" : "type-19705", ++ "self_type" : "type-19707", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103862,8 +103904,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-20467", +- "self_type" : "type-20534", ++ "referenced_type" : "type-20474", ++ "self_type" : "type-20541", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103871,8 +103913,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-21532", +- "self_type" : "type-21534", ++ "referenced_type" : "type-21540", ++ "self_type" : "type-21542", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104267,8 +104309,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-15953", +- "self_type" : "type-15955", ++ "referenced_type" : "type-15441", ++ "self_type" : "type-15443", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104276,8 +104318,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-17022", +- "self_type" : "type-17024", ++ "referenced_type" : "type-15769", ++ "self_type" : "type-15771", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104285,8 +104327,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-18582", +- "self_type" : "type-18584", ++ "referenced_type" : "type-15941", ++ "self_type" : "type-15943", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104294,8 +104336,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-18665", +- "self_type" : "type-18667", ++ "referenced_type" : "type-16108", ++ "self_type" : "type-16110", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104303,8 +104345,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-18855", +- "self_type" : "type-18857", ++ "referenced_type" : "type-16724", ++ "self_type" : "type-16726", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104312,8 +104354,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-18954", +- "self_type" : "type-18956", ++ "referenced_type" : "type-17792", ++ "self_type" : "type-17794", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104330,8 +104372,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-19196", +- "self_type" : "type-19198", ++ "referenced_type" : "type-19360", ++ "self_type" : "type-19362", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104339,8 +104381,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-19525", +- "self_type" : "type-19527", ++ "referenced_type" : "type-19443", ++ "self_type" : "type-19445", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104348,8 +104390,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-19697", +- "self_type" : "type-19699", ++ "referenced_type" : "type-19633", ++ "self_type" : "type-19635", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104357,8 +104399,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-19864", +- "self_type" : "type-19866", ++ "referenced_type" : "type-19732", ++ "self_type" : "type-19734", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104366,8 +104408,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-20485", +- "self_type" : "type-20487", ++ "referenced_type" : "type-20492", ++ "self_type" : "type-20494", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104375,8 +104417,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-21554", +- "self_type" : "type-21556", ++ "referenced_type" : "type-21562", ++ "self_type" : "type-21564", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -105032,8 +105074,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-15725", +- "self_type" : "type-15727", ++ "referenced_type" : "type-15518", ++ "self_type" : "type-15520", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105041,8 +105083,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-15898", +- "self_type" : "type-15900", ++ "referenced_type" : "type-15661", ++ "self_type" : "type-15663", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105050,8 +105092,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16178", +- "self_type" : "type-16180", ++ "referenced_type" : "type-15865", ++ "self_type" : "type-15867", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105059,8 +105101,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16281", +- "self_type" : "type-16283", ++ "referenced_type" : "type-16034", ++ "self_type" : "type-16036", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105068,8 +105110,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16421", +- "self_type" : "type-16423", ++ "referenced_type" : "type-16190", ++ "self_type" : "type-16192", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105077,8 +105119,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16478", +- "self_type" : "type-16480", ++ "referenced_type" : "type-16498", ++ "self_type" : "type-16500", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105086,8 +105128,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16658", +- "self_type" : "type-16660", ++ "referenced_type" : "type-16671", ++ "self_type" : "type-16673", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105095,8 +105137,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16796", +- "self_type" : "type-16798", ++ "referenced_type" : "type-16948", ++ "self_type" : "type-16950", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105104,8 +105146,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17301", +- "self_type" : "type-17303", ++ "referenced_type" : "type-17051", ++ "self_type" : "type-17053", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105113,8 +105155,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17375", +- "self_type" : "type-17377", ++ "referenced_type" : "type-17191", ++ "self_type" : "type-17193", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105122,8 +105164,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17421", +- "self_type" : "type-17423", ++ "referenced_type" : "type-17248", ++ "self_type" : "type-17250", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105131,8 +105173,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17778", +- "self_type" : "type-17780", ++ "referenced_type" : "type-17428", ++ "self_type" : "type-17430", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105140,8 +105182,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17879", +- "self_type" : "type-17881", ++ "referenced_type" : "type-17566", ++ "self_type" : "type-17568", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105149,8 +105191,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17971", +- "self_type" : "type-17973", ++ "referenced_type" : "type-18071", ++ "self_type" : "type-18073", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105158,8 +105200,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18082", +- "self_type" : "type-18084", ++ "referenced_type" : "type-18153", ++ "self_type" : "type-18155", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105167,8 +105209,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18134", +- "self_type" : "type-18136", ++ "referenced_type" : "type-18199", ++ "self_type" : "type-18201", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105176,8 +105218,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18221", +- "self_type" : "type-18225", ++ "referenced_type" : "type-18556", ++ "self_type" : "type-18558", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105185,8 +105227,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18394", +- "self_type" : "type-18396", ++ "referenced_type" : "type-18657", ++ "self_type" : "type-18659", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105194,8 +105236,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18521", +- "self_type" : "type-18523", ++ "referenced_type" : "type-18749", ++ "self_type" : "type-18751", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105203,8 +105245,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18753", +- "self_type" : "type-18755", ++ "referenced_type" : "type-18860", ++ "self_type" : "type-18862", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105212,8 +105254,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18884", +- "self_type" : "type-18886", ++ "referenced_type" : "type-18912", ++ "self_type" : "type-18914", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105221,8 +105263,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19033", +- "self_type" : "type-19035", ++ "referenced_type" : "type-18999", ++ "self_type" : "type-19003", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105230,8 +105272,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19273", +- "self_type" : "type-19275", ++ "referenced_type" : "type-19172", ++ "self_type" : "type-19174", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105239,8 +105281,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19417", +- "self_type" : "type-19419", ++ "referenced_type" : "type-19299", ++ "self_type" : "type-19301", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105248,8 +105290,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19621", +- "self_type" : "type-19623", ++ "referenced_type" : "type-19531", ++ "self_type" : "type-19533", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105257,8 +105299,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19790", +- "self_type" : "type-19792", ++ "referenced_type" : "type-19662", ++ "self_type" : "type-19664", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105266,8 +105308,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19946", +- "self_type" : "type-19948", ++ "referenced_type" : "type-19811", ++ "self_type" : "type-19813", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105275,8 +105317,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-20259", +- "self_type" : "type-20261", ++ "referenced_type" : "type-20263", ++ "self_type" : "type-20265", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105284,8 +105326,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-20432", +- "self_type" : "type-20434", ++ "referenced_type" : "type-20436", ++ "self_type" : "type-20438", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105293,8 +105335,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-20709", +- "self_type" : "type-20711", ++ "referenced_type" : "type-20717", ++ "self_type" : "type-20719", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105302,8 +105344,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-20812", +- "self_type" : "type-20814", ++ "referenced_type" : "type-20820", ++ "self_type" : "type-20822", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105311,8 +105353,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-20952", +- "self_type" : "type-20954", ++ "referenced_type" : "type-20960", ++ "self_type" : "type-20962", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105320,8 +105362,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-21010", +- "self_type" : "type-21012", ++ "referenced_type" : "type-21018", ++ "self_type" : "type-21020", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105338,8 +105380,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-21190", +- "self_type" : "type-21192", ++ "referenced_type" : "type-21198", ++ "self_type" : "type-21200", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105347,8 +105389,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-21328", +- "self_type" : "type-21330", ++ "referenced_type" : "type-21336", ++ "self_type" : "type-21338", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105356,8 +105398,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-21833", +- "self_type" : "type-21835", ++ "referenced_type" : "type-21841", ++ "self_type" : "type-21843", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106364,8 +106406,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16174", +- "self_type" : "type-16176", ++ "referenced_type" : "type-15514", ++ "self_type" : "type-15516", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106373,8 +106415,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17297", +- "self_type" : "type-17299", ++ "referenced_type" : "type-15657", ++ "self_type" : "type-15659", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106382,8 +106424,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17773", +- "self_type" : "type-17776", ++ "referenced_type" : "type-15861", ++ "self_type" : "type-15863", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106391,8 +106433,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18078", +- "self_type" : "type-18080", ++ "referenced_type" : "type-16029", ++ "self_type" : "type-16032", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106400,8 +106442,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18389", +- "self_type" : "type-18392", ++ "referenced_type" : "type-16186", ++ "self_type" : "type-16188", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106409,8 +106451,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18517", +- "self_type" : "type-18519", ++ "referenced_type" : "type-16944", ++ "self_type" : "type-16946", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106418,8 +106460,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18749", +- "self_type" : "type-18751", ++ "referenced_type" : "type-18067", ++ "self_type" : "type-18069", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106427,8 +106469,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19029", +- "self_type" : "type-19031", ++ "referenced_type" : "type-18551", ++ "self_type" : "type-18554", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106436,8 +106478,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19269", +- "self_type" : "type-19271", ++ "referenced_type" : "type-18856", ++ "self_type" : "type-18858", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106445,8 +106487,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19413", +- "self_type" : "type-19415", ++ "referenced_type" : "type-19167", ++ "self_type" : "type-19170", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106454,8 +106496,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19617", +- "self_type" : "type-19619", ++ "referenced_type" : "type-19295", ++ "self_type" : "type-19297", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106463,8 +106505,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19785", +- "self_type" : "type-19788", ++ "referenced_type" : "type-19527", ++ "self_type" : "type-19529", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106472,8 +106514,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19942", +- "self_type" : "type-19944", ++ "referenced_type" : "type-19807", ++ "self_type" : "type-19809", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106481,8 +106523,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-20705", +- "self_type" : "type-20707", ++ "referenced_type" : "type-20713", ++ "self_type" : "type-20715", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106490,8 +106532,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-21829", +- "self_type" : "type-21831", ++ "referenced_type" : "type-21837", ++ "self_type" : "type-21839", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107003,8 +107045,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16170", +- "self_type" : "type-16172", ++ "referenced_type" : "type-15509", ++ "self_type" : "type-15512", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107012,8 +107054,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17293", +- "self_type" : "type-17295", ++ "referenced_type" : "type-15653", ++ "self_type" : "type-15655", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107021,8 +107063,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17769", +- "self_type" : "type-17771", ++ "referenced_type" : "type-15857", ++ "self_type" : "type-15859", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107030,8 +107072,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18073", +- "self_type" : "type-18076", ++ "referenced_type" : "type-16025", ++ "self_type" : "type-16027", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107039,8 +107081,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18385", +- "self_type" : "type-18387", ++ "referenced_type" : "type-16182", ++ "self_type" : "type-16184", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107048,8 +107090,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18513", +- "self_type" : "type-18515", ++ "referenced_type" : "type-16940", ++ "self_type" : "type-16942", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107057,8 +107099,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18745", +- "self_type" : "type-18747", ++ "referenced_type" : "type-18063", ++ "self_type" : "type-18065", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107066,8 +107108,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19025", +- "self_type" : "type-19027", ++ "referenced_type" : "type-18547", ++ "self_type" : "type-18549", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107075,8 +107117,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19264", +- "self_type" : "type-19267", ++ "referenced_type" : "type-18851", ++ "self_type" : "type-18854", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107084,8 +107126,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19409", +- "self_type" : "type-19411", ++ "referenced_type" : "type-19163", ++ "self_type" : "type-19165", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107093,8 +107135,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19613", +- "self_type" : "type-19615", ++ "referenced_type" : "type-19291", ++ "self_type" : "type-19293", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107102,8 +107144,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19781", +- "self_type" : "type-19783", ++ "referenced_type" : "type-19523", ++ "self_type" : "type-19525", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107111,8 +107153,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19938", +- "self_type" : "type-19940", ++ "referenced_type" : "type-19803", ++ "self_type" : "type-19805", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107120,8 +107162,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-20701", +- "self_type" : "type-20703", ++ "referenced_type" : "type-20709", ++ "self_type" : "type-20711", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107129,8 +107171,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-21825", +- "self_type" : "type-21827", ++ "referenced_type" : "type-21833", ++ "self_type" : "type-21835", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107543,8 +107585,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18729", +- "self_type" : "type-18731", ++ "referenced_type" : "type-15493", ++ "self_type" : "type-15495", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107552,8 +107594,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19009", +- "self_type" : "type-19011", ++ "referenced_type" : "type-15839", ++ "self_type" : "type-15841", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107561,8 +107603,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19248", +- "self_type" : "type-19250", ++ "referenced_type" : "type-16008", ++ "self_type" : "type-16010", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107570,8 +107612,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19595", +- "self_type" : "type-19597", ++ "referenced_type" : "type-16165", ++ "self_type" : "type-16167", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107579,8 +107621,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19764", +- "self_type" : "type-19766", ++ "referenced_type" : "type-19507", ++ "self_type" : "type-19509", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107588,8 +107630,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19921", +- "self_type" : "type-19923", ++ "referenced_type" : "type-19787", ++ "self_type" : "type-19789", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107885,8 +107927,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16158", +- "self_type" : "type-16160", ++ "referenced_type" : "type-15497", ++ "self_type" : "type-15499", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107894,8 +107936,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17281", +- "self_type" : "type-17283", ++ "referenced_type" : "type-15641", ++ "self_type" : "type-15643", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107903,8 +107945,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17756", +- "self_type" : "type-17758", ++ "referenced_type" : "type-15843", ++ "self_type" : "type-15845", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107912,8 +107954,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18061", +- "self_type" : "type-18063", ++ "referenced_type" : "type-16012", ++ "self_type" : "type-16014", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107921,8 +107963,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18373", +- "self_type" : "type-18375", ++ "referenced_type" : "type-16169", ++ "self_type" : "type-16171", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107930,8 +107972,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18501", +- "self_type" : "type-18503", ++ "referenced_type" : "type-16928", ++ "self_type" : "type-16930", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107939,8 +107981,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18733", +- "self_type" : "type-18735", ++ "referenced_type" : "type-18051", ++ "self_type" : "type-18053", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107948,8 +107990,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19013", +- "self_type" : "type-19015", ++ "referenced_type" : "type-18534", ++ "self_type" : "type-18536", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107957,8 +107999,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19252", +- "self_type" : "type-19254", ++ "referenced_type" : "type-18839", ++ "self_type" : "type-18841", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107966,8 +108008,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19397", +- "self_type" : "type-19399", ++ "referenced_type" : "type-19151", ++ "self_type" : "type-19153", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107975,8 +108017,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19599", +- "self_type" : "type-19601", ++ "referenced_type" : "type-19279", ++ "self_type" : "type-19281", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107984,8 +108026,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19768", +- "self_type" : "type-19770", ++ "referenced_type" : "type-19511", ++ "self_type" : "type-19513", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107993,8 +108035,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19925", +- "self_type" : "type-19927", ++ "referenced_type" : "type-19791", ++ "self_type" : "type-19793", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108002,8 +108044,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-20689", +- "self_type" : "type-20691", ++ "referenced_type" : "type-20697", ++ "self_type" : "type-20699", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108011,8 +108053,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-21813", +- "self_type" : "type-21815", ++ "referenced_type" : "type-21821", ++ "self_type" : "type-21823", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108524,8 +108566,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16162", +- "self_type" : "type-16164", ++ "referenced_type" : "type-15501", ++ "self_type" : "type-15503", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108533,8 +108575,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17285", +- "self_type" : "type-17287", ++ "referenced_type" : "type-15645", ++ "self_type" : "type-15647", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108542,8 +108584,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17760", +- "self_type" : "type-17763", ++ "referenced_type" : "type-15849", ++ "self_type" : "type-15851", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108551,8 +108593,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18065", +- "self_type" : "type-18067", ++ "referenced_type" : "type-16016", ++ "self_type" : "type-16018", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108560,8 +108602,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18377", +- "self_type" : "type-18379", ++ "referenced_type" : "type-16173", ++ "self_type" : "type-16175", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108569,8 +108611,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18505", +- "self_type" : "type-18507", ++ "referenced_type" : "type-16932", ++ "self_type" : "type-16934", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108578,8 +108620,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18737", +- "self_type" : "type-18739", ++ "referenced_type" : "type-18055", ++ "self_type" : "type-18057", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108587,8 +108629,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19017", +- "self_type" : "type-19019", ++ "referenced_type" : "type-18538", ++ "self_type" : "type-18541", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108596,8 +108638,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19256", +- "self_type" : "type-19258", ++ "referenced_type" : "type-18843", ++ "self_type" : "type-18845", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108605,8 +108647,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19401", +- "self_type" : "type-19403", ++ "referenced_type" : "type-19155", ++ "self_type" : "type-19157", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108614,8 +108656,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19605", +- "self_type" : "type-19607", ++ "referenced_type" : "type-19283", ++ "self_type" : "type-19285", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108623,8 +108665,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19772", +- "self_type" : "type-19774", ++ "referenced_type" : "type-19515", ++ "self_type" : "type-19517", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108632,8 +108674,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19929", +- "self_type" : "type-19931", ++ "referenced_type" : "type-19795", ++ "self_type" : "type-19797", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108641,8 +108683,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-20693", +- "self_type" : "type-20695", ++ "referenced_type" : "type-20701", ++ "self_type" : "type-20703", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108650,8 +108692,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-21817", +- "self_type" : "type-21819", ++ "referenced_type" : "type-21825", ++ "self_type" : "type-21827", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109163,8 +109205,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16166", +- "self_type" : "type-16168", ++ "referenced_type" : "type-15505", ++ "self_type" : "type-15507", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109172,8 +109214,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17289", +- "self_type" : "type-17291", ++ "referenced_type" : "type-15649", ++ "self_type" : "type-15651", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109181,8 +109223,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17765", +- "self_type" : "type-17767", ++ "referenced_type" : "type-15853", ++ "self_type" : "type-15855", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109190,8 +109232,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18069", +- "self_type" : "type-18071", ++ "referenced_type" : "type-16021", ++ "self_type" : "type-16023", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109199,8 +109241,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18381", +- "self_type" : "type-18383", ++ "referenced_type" : "type-16177", ++ "self_type" : "type-16180", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109208,8 +109250,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18509", +- "self_type" : "type-18511", ++ "referenced_type" : "type-16936", ++ "self_type" : "type-16938", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109217,8 +109259,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18741", +- "self_type" : "type-18743", ++ "referenced_type" : "type-18059", ++ "self_type" : "type-18061", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109226,8 +109268,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19021", +- "self_type" : "type-19023", ++ "referenced_type" : "type-18543", ++ "self_type" : "type-18545", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109235,8 +109277,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19260", +- "self_type" : "type-19262", ++ "referenced_type" : "type-18847", ++ "self_type" : "type-18849", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109244,8 +109286,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19405", +- "self_type" : "type-19407", ++ "referenced_type" : "type-19159", ++ "self_type" : "type-19161", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109253,8 +109295,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19609", +- "self_type" : "type-19611", ++ "referenced_type" : "type-19287", ++ "self_type" : "type-19289", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109262,8 +109304,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19777", +- "self_type" : "type-19779", ++ "referenced_type" : "type-19519", ++ "self_type" : "type-19521", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109271,8 +109313,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19933", +- "self_type" : "type-19936", ++ "referenced_type" : "type-19799", ++ "self_type" : "type-19801", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109280,8 +109322,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-20697", +- "self_type" : "type-20699", ++ "referenced_type" : "type-20705", ++ "self_type" : "type-20707", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109289,8 +109331,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-21821", +- "self_type" : "type-21823", ++ "referenced_type" : "type-21829", ++ "self_type" : "type-21831", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110117,8 +110159,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-15728", +- "self_type" : "type-15731", ++ "referenced_type" : "type-15521", ++ "self_type" : "type-15523", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110126,8 +110168,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-15901", +- "self_type" : "type-15903", ++ "referenced_type" : "type-15664", ++ "self_type" : "type-15666", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110135,8 +110177,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16183", +- "self_type" : "type-16185", ++ "referenced_type" : "type-15868", ++ "self_type" : "type-15870", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110144,8 +110186,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16284", +- "self_type" : "type-16286", ++ "referenced_type" : "type-16037", ++ "self_type" : "type-16039", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110153,8 +110195,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16424", +- "self_type" : "type-16426", ++ "referenced_type" : "type-16193", ++ "self_type" : "type-16195", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110162,8 +110204,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16481", +- "self_type" : "type-16483", ++ "referenced_type" : "type-16501", ++ "self_type" : "type-16504", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110171,8 +110213,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16593", +- "self_type" : "type-16595", ++ "referenced_type" : "type-16674", ++ "self_type" : "type-16676", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110180,8 +110222,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16661", +- "self_type" : "type-16663", ++ "referenced_type" : "type-16953", ++ "self_type" : "type-16955", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110189,8 +110231,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16714", +- "self_type" : "type-16716", ++ "referenced_type" : "type-17054", ++ "self_type" : "type-17056", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110198,8 +110240,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16799", +- "self_type" : "type-16801", ++ "referenced_type" : "type-17194", ++ "self_type" : "type-17196", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110207,8 +110249,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16867", +- "self_type" : "type-16869", ++ "referenced_type" : "type-17251", ++ "self_type" : "type-17253", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110216,8 +110258,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17106", +- "self_type" : "type-17108", ++ "referenced_type" : "type-17363", ++ "self_type" : "type-17365", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110225,8 +110267,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17304", +- "self_type" : "type-17306", ++ "referenced_type" : "type-17431", ++ "self_type" : "type-17433", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110234,8 +110276,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17378", +- "self_type" : "type-17380", ++ "referenced_type" : "type-17484", ++ "self_type" : "type-17486", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110243,8 +110285,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17424", +- "self_type" : "type-17426", ++ "referenced_type" : "type-17569", ++ "self_type" : "type-17571", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110252,8 +110294,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17781", +- "self_type" : "type-17783", ++ "referenced_type" : "type-17637", ++ "self_type" : "type-17639", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110261,8 +110303,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17882", +- "self_type" : "type-17884", ++ "referenced_type" : "type-17876", ++ "self_type" : "type-17878", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110270,8 +110312,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17974", +- "self_type" : "type-17976", ++ "referenced_type" : "type-18074", ++ "self_type" : "type-18076", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110279,8 +110321,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18085", +- "self_type" : "type-18087", ++ "referenced_type" : "type-18156", ++ "self_type" : "type-18158", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110288,8 +110330,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18137", +- "self_type" : "type-18139", ++ "referenced_type" : "type-18202", ++ "self_type" : "type-18204", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110297,8 +110339,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18226", +- "self_type" : "type-18228", ++ "referenced_type" : "type-18559", ++ "self_type" : "type-18561", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110306,8 +110348,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18397", +- "self_type" : "type-18399", ++ "referenced_type" : "type-18660", ++ "self_type" : "type-18662", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110315,8 +110357,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18524", +- "self_type" : "type-18526", ++ "referenced_type" : "type-18752", ++ "self_type" : "type-18754", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110324,8 +110366,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18756", +- "self_type" : "type-18758", ++ "referenced_type" : "type-18863", ++ "self_type" : "type-18865", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110333,8 +110375,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18888", +- "self_type" : "type-18890", ++ "referenced_type" : "type-18915", ++ "self_type" : "type-18917", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110342,8 +110384,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19036", +- "self_type" : "type-19038", ++ "referenced_type" : "type-19004", ++ "self_type" : "type-19006", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110351,8 +110393,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19276", +- "self_type" : "type-19278", ++ "referenced_type" : "type-19175", ++ "self_type" : "type-19177", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110360,8 +110402,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19420", +- "self_type" : "type-19422", ++ "referenced_type" : "type-19302", ++ "self_type" : "type-19304", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110369,8 +110411,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19624", +- "self_type" : "type-19626", ++ "referenced_type" : "type-19534", ++ "self_type" : "type-19536", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110378,8 +110420,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19793", +- "self_type" : "type-19795", ++ "referenced_type" : "type-19666", ++ "self_type" : "type-19668", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110387,8 +110429,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19949", +- "self_type" : "type-19951", ++ "referenced_type" : "type-19814", ++ "self_type" : "type-19816", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110396,8 +110438,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20262", +- "self_type" : "type-20265", ++ "referenced_type" : "type-20266", ++ "self_type" : "type-20269", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110405,8 +110447,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20435", +- "self_type" : "type-20437", ++ "referenced_type" : "type-20439", ++ "self_type" : "type-20441", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110414,8 +110456,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20714", +- "self_type" : "type-20716", ++ "referenced_type" : "type-20722", ++ "self_type" : "type-20724", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110423,8 +110465,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20815", +- "self_type" : "type-20817", ++ "referenced_type" : "type-20823", ++ "self_type" : "type-20825", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110432,8 +110474,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20955", +- "self_type" : "type-20957", ++ "referenced_type" : "type-20963", ++ "self_type" : "type-20965", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110441,8 +110483,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21013", +- "self_type" : "type-21015", ++ "referenced_type" : "type-21021", ++ "self_type" : "type-21023", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110459,8 +110501,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21125", +- "self_type" : "type-21127", ++ "referenced_type" : "type-21133", ++ "self_type" : "type-21135", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110468,8 +110510,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21193", +- "self_type" : "type-21195", ++ "referenced_type" : "type-21201", ++ "self_type" : "type-21203", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110477,8 +110519,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21246", +- "self_type" : "type-21248", ++ "referenced_type" : "type-21254", ++ "self_type" : "type-21256", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110486,8 +110528,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21331", +- "self_type" : "type-21333", ++ "referenced_type" : "type-21339", ++ "self_type" : "type-21341", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110495,8 +110537,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21399", +- "self_type" : "type-21401", ++ "referenced_type" : "type-21407", ++ "self_type" : "type-21409", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110504,8 +110546,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21638", +- "self_type" : "type-21640", ++ "referenced_type" : "type-21646", ++ "self_type" : "type-21648", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110513,8 +110555,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21836", +- "self_type" : "type-21838", ++ "referenced_type" : "type-21844", ++ "self_type" : "type-21846", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111755,8 +111797,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-15949", +- "self_type" : "type-15951", ++ "referenced_type" : "type-15437", ++ "self_type" : "type-15439", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111764,8 +111806,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-17018", +- "self_type" : "type-17020", ++ "referenced_type" : "type-15765", ++ "self_type" : "type-15767", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111773,8 +111815,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-18577", +- "self_type" : "type-18579", ++ "referenced_type" : "type-15936", ++ "self_type" : "type-15938", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111782,8 +111824,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-18661", +- "self_type" : "type-18663", ++ "referenced_type" : "type-16103", ++ "self_type" : "type-16105", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111791,8 +111833,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-18851", +- "self_type" : "type-18853", ++ "referenced_type" : "type-16720", ++ "self_type" : "type-16722", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111800,8 +111842,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-18949", +- "self_type" : "type-18951", ++ "referenced_type" : "type-17788", ++ "self_type" : "type-17790", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111818,8 +111860,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-19192", +- "self_type" : "type-19194", ++ "referenced_type" : "type-19355", ++ "self_type" : "type-19357", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111827,8 +111869,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-19521", +- "self_type" : "type-19523", ++ "referenced_type" : "type-19439", ++ "self_type" : "type-19441", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111836,8 +111878,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-19692", +- "self_type" : "type-19694", ++ "referenced_type" : "type-19629", ++ "self_type" : "type-19631", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111845,8 +111887,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-19859", +- "self_type" : "type-19861", ++ "referenced_type" : "type-19727", ++ "self_type" : "type-19729", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111854,8 +111896,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-20481", +- "self_type" : "type-20483", ++ "referenced_type" : "type-20488", ++ "self_type" : "type-20490", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111863,8 +111905,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-21550", +- "self_type" : "type-21552", ++ "referenced_type" : "type-21558", ++ "self_type" : "type-21560", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112232,8 +112274,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-15963", +- "self_type" : "type-15965", ++ "referenced_type" : "type-15452", ++ "self_type" : "type-15454", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112241,8 +112283,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-17033", +- "self_type" : "type-17035", ++ "referenced_type" : "type-15781", ++ "self_type" : "type-15783", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112250,8 +112292,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-18592", +- "self_type" : "type-18594", ++ "referenced_type" : "type-15951", ++ "self_type" : "type-15953", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112259,8 +112301,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-18677", +- "self_type" : "type-18679", ++ "referenced_type" : "type-16121", ++ "self_type" : "type-16123", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112268,8 +112310,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-18868", +- "self_type" : "type-18870", ++ "referenced_type" : "type-16734", ++ "self_type" : "type-16736", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112277,8 +112319,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-18966", +- "self_type" : "type-18968", ++ "referenced_type" : "type-17803", ++ "self_type" : "type-17805", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112286,8 +112328,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-19207", +- "self_type" : "type-19209", ++ "referenced_type" : "type-19370", ++ "self_type" : "type-19372", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112304,8 +112346,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-19537", +- "self_type" : "type-19539", ++ "referenced_type" : "type-19455", ++ "self_type" : "type-19457", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112313,8 +112355,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-19707", +- "self_type" : "type-19709", ++ "referenced_type" : "type-19646", ++ "self_type" : "type-19648", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112322,8 +112364,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-19877", +- "self_type" : "type-19879", ++ "referenced_type" : "type-19744", ++ "self_type" : "type-19746", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112331,8 +112373,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-20495", +- "self_type" : "type-20497", ++ "referenced_type" : "type-20502", ++ "self_type" : "type-20504", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112340,8 +112382,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-21565", +- "self_type" : "type-21567", ++ "referenced_type" : "type-21573", ++ "self_type" : "type-21575", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112880,8 +112922,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::hash *", + "name" : "const google::protobuf::hash *", +- "referenced_type" : "type-19663", +- "self_type" : "type-19664", ++ "referenced_type" : "type-15907", ++ "self_type" : "type-15908", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -112979,8 +113021,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", + "name" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", +- "referenced_type" : "type-18895", +- "self_type" : "type-18897", ++ "referenced_type" : "type-19673", ++ "self_type" : "type-19675", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, +@@ -113402,8 +113444,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19884", +- "self_type" : "type-19892", ++ "referenced_type" : "type-16128", ++ "self_type" : "type-16136", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113420,8 +113462,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr > *", + "name" : "const google::protobuf::internal::scoped_ptr > *", +- "referenced_type" : "type-19638", +- "self_type" : "type-19643", ++ "referenced_type" : "type-15882", ++ "self_type" : "type-15887", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113456,8 +113498,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19862", +- "self_type" : "type-19868", ++ "referenced_type" : "type-16106", ++ "self_type" : "type-16112", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113483,8 +113525,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19549", +- "self_type" : "type-19553", ++ "referenced_type" : "type-15793", ++ "self_type" : "type-15797", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113519,8 +113561,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19172", +- "self_type" : "type-19177", ++ "referenced_type" : "type-15417", ++ "self_type" : "type-15422", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113528,8 +113570,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19560", +- "self_type" : "type-19571", ++ "referenced_type" : "type-15804", ++ "self_type" : "type-15815", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113537,8 +113579,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19628", +- "self_type" : "type-19629", ++ "referenced_type" : "type-15872", ++ "self_type" : "type-15873", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113546,8 +113588,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19631", +- "self_type" : "type-19632", ++ "referenced_type" : "type-15875", ++ "self_type" : "type-15876", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113555,8 +113597,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19586", +- "self_type" : "type-19593", ++ "referenced_type" : "type-15830", ++ "self_type" : "type-15837", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113564,8 +113606,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19544", +- "self_type" : "type-19545", ++ "referenced_type" : "type-15788", ++ "self_type" : "type-15789", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113573,8 +113615,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19159", +- "self_type" : "type-19160", ++ "referenced_type" : "type-15404", ++ "self_type" : "type-15405", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113834,8 +113876,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::FieldContext *", + "name" : "const google::protobuf::util::FieldContext *", +- "referenced_type" : "type-18631", +- "self_type" : "type-18633", ++ "referenced_type" : "type-19409", ++ "self_type" : "type-19411", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/field_comparator.h" + }, +@@ -113906,8 +113948,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::StatusOr *", + "name" : "const google::protobuf::util::StatusOr *", +- "referenced_type" : "type-19958", +- "self_type" : "type-19960", ++ "referenced_type" : "type-16202", ++ "self_type" : "type-16204", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -114005,8 +114047,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::converter::ObjectLocationTracker *", + "name" : "const google::protobuf::util::converter::ObjectLocationTracker *", +- "referenced_type" : "type-19648", +- "self_type" : "type-19649", ++ "referenced_type" : "type-15892", ++ "self_type" : "type-15893", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/object_location_tracker.h" + }, +@@ -114014,8 +114056,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::converter::ObjectSource *", + "name" : "const google::protobuf::util::converter::ObjectSource *", +- "referenced_type" : "type-19428", +- "self_type" : "type-19429", ++ "referenced_type" : "type-15672", ++ "self_type" : "type-15673", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/object_source.h" + }, +@@ -114032,8 +114074,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::converter::ProtoStreamObjectSource *", + "name" : "const google::protobuf::util::converter::ProtoStreamObjectSource *", +- "referenced_type" : "type-19323", +- "self_type" : "type-19322", ++ "referenced_type" : "type-15568", ++ "self_type" : "type-15567", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -114041,8 +114083,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::converter::ProtoStreamObjectWriter::Item *", + "name" : "const google::protobuf::util::converter::ProtoStreamObjectWriter::Item *", +- "referenced_type" : "type-19641", +- "self_type" : "type-19642", ++ "referenced_type" : "type-15885", ++ "self_type" : "type-15886", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, +@@ -114050,8 +114092,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::converter::ProtoWriter::ProtoElement *", + "name" : "const google::protobuf::util::converter::ProtoWriter::ProtoElement *", +- "referenced_type" : "type-19635", +- "self_type" : "type-19636", ++ "referenced_type" : "type-15879", ++ "self_type" : "type-15880", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, +@@ -114059,8 +114101,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::converter::StructuredObjectWriter::BaseElement *", + "name" : "const google::protobuf::util::converter::StructuredObjectWriter::BaseElement *", +- "referenced_type" : "type-19145", +- "self_type" : "type-19146", ++ "referenced_type" : "type-15390", ++ "self_type" : "type-15391", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/structured_objectwriter.h" + }, +@@ -114104,8 +114146,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node *", + "name" : "const std::__tree_node *", +- "referenced_type" : "type-16940", +- "self_type" : "type-16942", ++ "referenced_type" : "type-17710", ++ "self_type" : "type-17712", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114113,8 +114155,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node *", + "name" : "const std::__tree_node *", +- "referenced_type" : "type-21472", +- "self_type" : "type-21474", ++ "referenced_type" : "type-21480", ++ "self_type" : "type-21482", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114167,8 +114209,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node *>, void *> *", + "name" : "const std::__tree_node *>, void *> *", +- "referenced_type" : "type-16930", +- "self_type" : "type-16932", ++ "referenced_type" : "type-17700", ++ "self_type" : "type-17702", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114176,8 +114218,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node *>, void *> *", + "name" : "const std::__tree_node *>, void *> *", +- "referenced_type" : "type-21462", +- "self_type" : "type-21464", ++ "referenced_type" : "type-21470", ++ "self_type" : "type-21472", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114239,8 +114281,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", + "name" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", +- "referenced_type" : "type-17514", +- "self_type" : "type-17516", ++ "referenced_type" : "type-18292", ++ "self_type" : "type-18294", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114293,8 +114335,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node, std::allocator > *, void *> *", + "name" : "const std::__tree_node, std::allocator > *, void *> *", +- "referenced_type" : "type-17522", +- "self_type" : "type-17524", ++ "referenced_type" : "type-18300", ++ "self_type" : "type-18302", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114842,8 +114884,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-15510", +- "self_type" : "type-15565", ++ "referenced_type" : "type-15374", ++ "self_type" : "type-15406", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114851,8 +114893,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-15818", +- "self_type" : "type-15837", ++ "referenced_type" : "type-15582", ++ "self_type" : "type-15598", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114860,8 +114902,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-15932", +- "self_type" : "type-15931", ++ "referenced_type" : "type-15718", ++ "self_type" : "type-15747", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114869,8 +114911,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16039", +- "self_type" : "type-16075", ++ "referenced_type" : "type-15904", ++ "self_type" : "type-15914", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114878,17 +114920,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16232", +- "self_type" : "type-16235", ++ "referenced_type" : "type-16064", ++ "self_type" : "type-16073", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16329", +- "self_type" : "type-16340", ++ "referenced_type" : "type-16283", ++ "self_type" : "type-16338", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114896,8 +114938,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16436", +- "self_type" : "type-16442", ++ "referenced_type" : "type-16591", ++ "self_type" : "type-16610", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114905,8 +114947,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16534", +- "self_type" : "type-16570", ++ "referenced_type" : "type-16703", ++ "self_type" : "type-16702", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114914,17 +114956,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16614", +- "self_type" : "type-16622", ++ "referenced_type" : "type-16810", ++ "self_type" : "type-16845", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16679", +- "self_type" : "type-16684", ++ "referenced_type" : "type-17002", ++ "self_type" : "type-17005", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114932,8 +114974,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16745", +- "self_type" : "type-16757", ++ "referenced_type" : "type-17099", ++ "self_type" : "type-17110", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114941,35 +114983,35 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16825", +- "self_type" : "type-16828", ++ "referenced_type" : "type-17206", ++ "self_type" : "type-17212", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16848", +- "self_type" : "type-16847", ++ "referenced_type" : "type-17304", ++ "self_type" : "type-17340", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16896", +- "self_type" : "type-16999", ++ "referenced_type" : "type-17384", ++ "self_type" : "type-17392", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-17120", +- "self_type" : "type-17160", ++ "referenced_type" : "type-17449", ++ "self_type" : "type-17454", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114977,26 +115019,26 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-17230", +- "self_type" : "type-17238", ++ "referenced_type" : "type-17515", ++ "self_type" : "type-17527", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-17325", +- "self_type" : "type-17333", ++ "referenced_type" : "type-17595", ++ "self_type" : "type-17598", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-17385", +- "self_type" : "type-17657", ++ "referenced_type" : "type-17618", ++ "self_type" : "type-17617", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115004,44 +115046,44 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-17398", +- "self_type" : "type-17543", ++ "referenced_type" : "type-17666", ++ "self_type" : "type-17769", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/map.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-17654", +- "self_type" : "type-17658", ++ "referenced_type" : "type-1785", ++ "self_type" : "type-1857", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-17822", +- "self_type" : "type-17832", ++ "referenced_type" : "type-17890", ++ "self_type" : "type-17930", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-1785", +- "self_type" : "type-1857", ++ "referenced_type" : "type-18000", ++ "self_type" : "type-18008", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-17910", +- "self_type" : "type-17922", ++ "referenced_type" : "type-18095", ++ "self_type" : "type-18103", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115049,8 +115091,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-17986", +- "self_type" : "type-18013", ++ "referenced_type" : "type-18163", ++ "self_type" : "type-18435", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115058,26 +115100,26 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18095", +- "self_type" : "type-18103", ++ "referenced_type" : "type-18176", ++ "self_type" : "type-18321", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18150", +- "self_type" : "type-18167", ++ "referenced_type" : "type-18432", ++ "self_type" : "type-18436", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18179", +- "self_type" : "type-18205", ++ "referenced_type" : "type-18600", ++ "self_type" : "type-18610", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115085,17 +115127,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18311", +- "self_type" : "type-18314", ++ "referenced_type" : "type-18688", ++ "self_type" : "type-18700", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18318", +- "self_type" : "type-18317", ++ "referenced_type" : "type-18764", ++ "self_type" : "type-18791", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115103,26 +115145,26 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18432", +- "self_type" : "type-18446", ++ "referenced_type" : "type-18873", ++ "self_type" : "type-18881", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18558", +- "self_type" : "type-18557", ++ "referenced_type" : "type-18928", ++ "self_type" : "type-18945", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18599", +- "self_type" : "type-18598", ++ "referenced_type" : "type-18957", ++ "self_type" : "type-18983", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115130,8 +115172,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18639", +- "self_type" : "type-18641", ++ "referenced_type" : "type-19089", ++ "self_type" : "type-19092", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115139,35 +115181,35 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18774", +- "self_type" : "type-18826", ++ "referenced_type" : "type-19096", ++ "self_type" : "type-19095", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/map.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18811", +- "self_type" : "type-18913", ++ "referenced_type" : "type-19210", ++ "self_type" : "type-19224", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18917", +- "self_type" : "type-18923", ++ "referenced_type" : "type-19336", ++ "self_type" : "type-19335", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-19129", +- "self_type" : "type-19161", ++ "referenced_type" : "type-19377", ++ "self_type" : "type-19376", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115175,35 +115217,35 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-19338", +- "self_type" : "type-19354", ++ "referenced_type" : "type-19417", ++ "self_type" : "type-19419", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-19474", +- "self_type" : "type-19503", ++ "referenced_type" : "type-19552", ++ "self_type" : "type-19604", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-19660", +- "self_type" : "type-19670", ++ "referenced_type" : "type-19589", ++ "self_type" : "type-19691", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-19820", +- "self_type" : "type-19829", ++ "referenced_type" : "type-19695", ++ "self_type" : "type-19701", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115211,8 +115253,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-20043", +- "self_type" : "type-20098", ++ "referenced_type" : "type-20047", ++ "self_type" : "type-20102", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115220,8 +115262,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-20352", +- "self_type" : "type-20371", ++ "referenced_type" : "type-20356", ++ "self_type" : "type-20375", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115229,8 +115271,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-20464", +- "self_type" : "type-20463", ++ "referenced_type" : "type-20471", ++ "self_type" : "type-20470", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115238,8 +115280,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-20571", +- "self_type" : "type-20606", ++ "referenced_type" : "type-20578", ++ "self_type" : "type-20614", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115247,8 +115289,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-20763", +- "self_type" : "type-20766", ++ "referenced_type" : "type-20771", ++ "self_type" : "type-20774", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115256,8 +115298,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-20860", +- "self_type" : "type-20871", ++ "referenced_type" : "type-20868", ++ "self_type" : "type-20879", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115265,8 +115307,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-20967", +- "self_type" : "type-20973", ++ "referenced_type" : "type-20975", ++ "self_type" : "type-20981", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115274,8 +115316,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21066", +- "self_type" : "type-21102", ++ "referenced_type" : "type-21074", ++ "self_type" : "type-21110", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115283,8 +115325,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21146", +- "self_type" : "type-21154", ++ "referenced_type" : "type-21154", ++ "self_type" : "type-21162", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115292,8 +115334,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21211", +- "self_type" : "type-21216", ++ "referenced_type" : "type-21219", ++ "self_type" : "type-21224", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115301,8 +115343,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21277", +- "self_type" : "type-21289", ++ "referenced_type" : "type-21285", ++ "self_type" : "type-21297", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115310,8 +115352,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21357", +- "self_type" : "type-21360", ++ "referenced_type" : "type-21365", ++ "self_type" : "type-21368", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -115319,8 +115361,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21380", +- "self_type" : "type-21379", ++ "referenced_type" : "type-21388", ++ "self_type" : "type-21387", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115328,8 +115370,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21428", +- "self_type" : "type-21531", ++ "referenced_type" : "type-21436", ++ "self_type" : "type-21539", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115337,8 +115379,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21652", +- "self_type" : "type-21692", ++ "referenced_type" : "type-21660", ++ "self_type" : "type-21700", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115346,8 +115388,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21762", +- "self_type" : "type-21770", ++ "referenced_type" : "type-21770", ++ "self_type" : "type-21778", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115355,8 +115397,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21857", +- "self_type" : "type-21865", ++ "referenced_type" : "type-21865", ++ "self_type" : "type-21873", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -117200,8 +117242,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-15565", +- "self_type" : "type-15617", ++ "referenced_type" : "type-15406", ++ "self_type" : "type-15418", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117209,8 +117251,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-15837", +- "self_type" : "type-15841", ++ "referenced_type" : "type-15598", ++ "self_type" : "type-15602", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117218,8 +117260,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-15931", +- "self_type" : "type-15930", ++ "referenced_type" : "type-15747", ++ "self_type" : "type-15751", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117227,8 +117269,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-16075", +- "self_type" : "type-16076", ++ "referenced_type" : "type-15914", ++ "self_type" : "type-15920", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117236,8 +117278,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-16235", +- "self_type" : "type-16236", ++ "referenced_type" : "type-16073", ++ "self_type" : "type-16084", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117245,8 +117287,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-16340", +- "self_type" : "type-16347", ++ "referenced_type" : "type-16338", ++ "self_type" : "type-16390", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117254,8 +117296,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-16442", +- "self_type" : "type-16448", ++ "referenced_type" : "type-16610", ++ "self_type" : "type-16614", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117263,8 +117305,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-16570", +- "self_type" : "type-16571", ++ "referenced_type" : "type-16702", ++ "self_type" : "type-16701", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117272,8 +117314,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-16622", +- "self_type" : "type-16626", ++ "referenced_type" : "type-16845", ++ "self_type" : "type-16846", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117281,8 +117323,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-16684", +- "self_type" : "type-16688", ++ "referenced_type" : "type-17005", ++ "self_type" : "type-17006", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117290,8 +117332,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-16757", +- "self_type" : "type-16762", ++ "referenced_type" : "type-17110", ++ "self_type" : "type-17117", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117299,8 +117341,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-16828", +- "self_type" : "type-16841", ++ "referenced_type" : "type-17212", ++ "self_type" : "type-17218", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117308,8 +117350,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-16999", +- "self_type" : "type-17004", ++ "referenced_type" : "type-17340", ++ "self_type" : "type-17341", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117317,8 +117359,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-17160", +- "self_type" : "type-17161", ++ "referenced_type" : "type-17392", ++ "self_type" : "type-17396", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117326,8 +117368,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-17238", +- "self_type" : "type-17239", ++ "referenced_type" : "type-17454", ++ "self_type" : "type-17458", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117335,8 +117377,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-17333", +- "self_type" : "type-17337", ++ "referenced_type" : "type-17527", ++ "self_type" : "type-17532", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117344,8 +117386,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-17543", +- "self_type" : "type-17588", ++ "referenced_type" : "type-17598", ++ "self_type" : "type-17611", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117353,8 +117395,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-17658", +- "self_type" : "type-17661", ++ "referenced_type" : "type-17769", ++ "self_type" : "type-17774", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117362,8 +117404,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-17832", +- "self_type" : "type-17838", ++ "referenced_type" : "type-17930", ++ "self_type" : "type-17931", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117371,8 +117413,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-17922", +- "self_type" : "type-17928", ++ "referenced_type" : "type-18008", ++ "self_type" : "type-18009", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117380,8 +117422,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-18013", +- "self_type" : "type-18018", ++ "referenced_type" : "type-18103", ++ "self_type" : "type-18107", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117389,8 +117431,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-18103", +- "self_type" : "type-18108", ++ "referenced_type" : "type-18321", ++ "self_type" : "type-18366", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117398,8 +117440,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-18167", +- "self_type" : "type-18173", ++ "referenced_type" : "type-18436", ++ "self_type" : "type-18439", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117407,8 +117449,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-18314", +- "self_type" : "type-18320", ++ "referenced_type" : "type-1857", ++ "self_type" : "type-1950", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117416,8 +117458,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-18446", +- "self_type" : "type-18449", ++ "referenced_type" : "type-18610", ++ "self_type" : "type-18616", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117425,8 +117467,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-18557", +- "self_type" : "type-18563", ++ "referenced_type" : "type-18700", ++ "self_type" : "type-18706", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117434,8 +117476,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-1857", +- "self_type" : "type-1950", ++ "referenced_type" : "type-18791", ++ "self_type" : "type-18796", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117443,8 +117485,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-18641", +- "self_type" : "type-18647", ++ "referenced_type" : "type-18881", ++ "self_type" : "type-18886", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117452,8 +117494,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-18826", +- "self_type" : "type-18837", ++ "referenced_type" : "type-18945", ++ "self_type" : "type-18951", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117461,8 +117503,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-18923", +- "self_type" : "type-18932", ++ "referenced_type" : "type-19092", ++ "self_type" : "type-19098", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117470,8 +117512,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-19161", +- "self_type" : "type-19173", ++ "referenced_type" : "type-19224", ++ "self_type" : "type-19227", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117479,8 +117521,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-19354", +- "self_type" : "type-19358", ++ "referenced_type" : "type-19335", ++ "self_type" : "type-19341", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117488,8 +117530,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-19503", +- "self_type" : "type-19507", ++ "referenced_type" : "type-19419", ++ "self_type" : "type-19425", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117497,8 +117539,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-19670", +- "self_type" : "type-19676", ++ "referenced_type" : "type-19604", ++ "self_type" : "type-19615", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117506,8 +117548,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-19829", +- "self_type" : "type-19840", ++ "referenced_type" : "type-19701", ++ "self_type" : "type-19710", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117515,8 +117557,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-20098", +- "self_type" : "type-20150", ++ "referenced_type" : "type-20102", ++ "self_type" : "type-20154", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117524,8 +117566,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-20371", +- "self_type" : "type-20375", ++ "referenced_type" : "type-20375", ++ "self_type" : "type-20379", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117533,8 +117575,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-20463", +- "self_type" : "type-20462", ++ "referenced_type" : "type-20470", ++ "self_type" : "type-20469", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117542,8 +117584,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-20606", +- "self_type" : "type-20607", ++ "referenced_type" : "type-20614", ++ "self_type" : "type-20615", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117551,8 +117593,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-20766", +- "self_type" : "type-20767", ++ "referenced_type" : "type-20774", ++ "self_type" : "type-20775", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117560,8 +117602,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-20871", +- "self_type" : "type-20878", ++ "referenced_type" : "type-20879", ++ "self_type" : "type-20886", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117569,8 +117611,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-20973", +- "self_type" : "type-20979", ++ "referenced_type" : "type-20981", ++ "self_type" : "type-20987", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117578,8 +117620,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-21102", +- "self_type" : "type-21103", ++ "referenced_type" : "type-21110", ++ "self_type" : "type-21111", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117587,8 +117629,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-21154", +- "self_type" : "type-21158", ++ "referenced_type" : "type-21162", ++ "self_type" : "type-21166", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117596,8 +117638,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-21216", +- "self_type" : "type-21220", ++ "referenced_type" : "type-21224", ++ "self_type" : "type-21228", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117605,8 +117647,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-21289", +- "self_type" : "type-21294", ++ "referenced_type" : "type-21297", ++ "self_type" : "type-21302", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117614,8 +117656,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-21360", +- "self_type" : "type-21373", ++ "referenced_type" : "type-21368", ++ "self_type" : "type-21381", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117623,8 +117665,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-21531", +- "self_type" : "type-21536", ++ "referenced_type" : "type-21539", ++ "self_type" : "type-21544", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117632,8 +117674,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-21692", +- "self_type" : "type-21693", ++ "referenced_type" : "type-21700", ++ "self_type" : "type-21701", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117641,8 +117683,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-21770", +- "self_type" : "type-21771", ++ "referenced_type" : "type-21778", ++ "self_type" : "type-21779", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117650,8 +117692,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-21865", +- "self_type" : "type-21869", ++ "referenced_type" : "type-21873", ++ "self_type" : "type-21877", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118829,8 +118871,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair *", + "name" : "const std::pair *", +- "referenced_type" : "type-18549", +- "self_type" : "type-18548", ++ "referenced_type" : "type-19327", ++ "self_type" : "type-19326", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -118865,8 +118907,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", +- "referenced_type" : "type-16951", +- "self_type" : "type-16953", ++ "referenced_type" : "type-17721", ++ "self_type" : "type-17723", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -118874,8 +118916,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", +- "referenced_type" : "type-21483", +- "self_type" : "type-21485", ++ "referenced_type" : "type-21491", ++ "self_type" : "type-21493", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -118937,8 +118979,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", + "name" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", +- "referenced_type" : "type-17528", +- "self_type" : "type-17530", ++ "referenced_type" : "type-18306", ++ "self_type" : "type-18308", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -119495,8 +119537,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-15389", +- "self_type" : "type-15391", ++ "referenced_type" : "type-15400", ++ "self_type" : "type-15402", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119504,8 +119546,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-15560", +- "self_type" : "type-15562", ++ "referenced_type" : "type-15595", ++ "self_type" : "type-15597", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119513,8 +119555,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-15834", +- "self_type" : "type-15836", ++ "referenced_type" : "type-15609", ++ "self_type" : "type-15611", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119522,8 +119564,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-15971", +- "self_type" : "type-15973", ++ "referenced_type" : "type-15790", ++ "self_type" : "type-15792", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119531,8 +119573,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16103", +- "self_type" : "type-16105", ++ "referenced_type" : "type-15960", ++ "self_type" : "type-15962", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119540,8 +119582,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16253", +- "self_type" : "type-16255", ++ "referenced_type" : "type-16069", ++ "self_type" : "type-16072", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119549,8 +119591,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16337", +- "self_type" : "type-16339", ++ "referenced_type" : "type-16333", ++ "self_type" : "type-16335", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119558,8 +119600,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16439", +- "self_type" : "type-16441", ++ "referenced_type" : "type-16607", ++ "self_type" : "type-16609", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119567,8 +119609,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16565", +- "self_type" : "type-16567", ++ "referenced_type" : "type-16742", ++ "self_type" : "type-16744", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119576,8 +119618,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16617", +- "self_type" : "type-16619", ++ "referenced_type" : "type-16873", ++ "self_type" : "type-16875", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119585,8 +119627,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16700", +- "self_type" : "type-16702", ++ "referenced_type" : "type-17023", ++ "self_type" : "type-17025", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119594,8 +119636,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16749", +- "self_type" : "type-16748", ++ "referenced_type" : "type-17107", ++ "self_type" : "type-17109", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119603,8 +119645,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16753", +- "self_type" : "type-16755", ++ "referenced_type" : "type-17209", ++ "self_type" : "type-17211", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119612,8 +119654,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16831", +- "self_type" : "type-16833", ++ "referenced_type" : "type-17335", ++ "self_type" : "type-17337", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119621,8 +119663,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16899", +- "self_type" : "type-16901", ++ "referenced_type" : "type-17387", ++ "self_type" : "type-17389", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119630,8 +119672,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16936", +- "self_type" : "type-16950", ++ "referenced_type" : "type-17470", ++ "self_type" : "type-17472", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119639,8 +119681,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-17153", +- "self_type" : "type-17155", ++ "referenced_type" : "type-17519", ++ "self_type" : "type-17518", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119648,8 +119690,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-17235", +- "self_type" : "type-17237", ++ "referenced_type" : "type-17523", ++ "self_type" : "type-17525", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119657,8 +119699,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-17328", +- "self_type" : "type-17330", ++ "referenced_type" : "type-17601", ++ "self_type" : "type-17603", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119666,8 +119708,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-17485", +- "self_type" : "type-17487", ++ "referenced_type" : "type-17669", ++ "self_type" : "type-17671", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119675,8 +119717,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-17590", +- "self_type" : "type-17597", ++ "referenced_type" : "type-17706", ++ "self_type" : "type-17720", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119684,8 +119726,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-17685", +- "self_type" : "type-17687", ++ "referenced_type" : "type-17923", ++ "self_type" : "type-17925", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119693,8 +119735,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-17827", +- "self_type" : "type-17830", ++ "referenced_type" : "type-18005", ++ "self_type" : "type-18007", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119702,8 +119744,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-17917", +- "self_type" : "type-17919", ++ "referenced_type" : "type-18098", ++ "self_type" : "type-18100", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119711,8 +119753,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18007", +- "self_type" : "type-18009", ++ "referenced_type" : "type-18263", ++ "self_type" : "type-18265", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119720,8 +119762,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18100", +- "self_type" : "type-18102", ++ "referenced_type" : "type-18368", ++ "self_type" : "type-18375", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119729,8 +119771,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18155", +- "self_type" : "type-18157", ++ "referenced_type" : "type-18463", ++ "self_type" : "type-18465", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119738,8 +119780,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18281", +- "self_type" : "type-18291", ++ "referenced_type" : "type-1851", ++ "self_type" : "type-1854", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119747,8 +119789,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18333", +- "self_type" : "type-18335", ++ "referenced_type" : "type-18605", ++ "self_type" : "type-18608", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119756,8 +119798,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18459", +- "self_type" : "type-18461", ++ "referenced_type" : "type-18695", ++ "self_type" : "type-18697", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119765,8 +119807,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-1851", +- "self_type" : "type-1854", ++ "referenced_type" : "type-18785", ++ "self_type" : "type-18787", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119774,8 +119816,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18537", +- "self_type" : "type-18544", ++ "referenced_type" : "type-18878", ++ "self_type" : "type-18880", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119783,8 +119825,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18601", +- "self_type" : "type-18603", ++ "referenced_type" : "type-18933", ++ "self_type" : "type-18935", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119792,8 +119834,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18683", +- "self_type" : "type-18685", ++ "referenced_type" : "type-19059", ++ "self_type" : "type-19069", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119801,8 +119843,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18808", +- "self_type" : "type-18810", ++ "referenced_type" : "type-19111", ++ "self_type" : "type-19113", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119810,8 +119852,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18877", +- "self_type" : "type-18887", ++ "referenced_type" : "type-19237", ++ "self_type" : "type-19239", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119819,8 +119861,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18920", +- "self_type" : "type-18922", ++ "referenced_type" : "type-19315", ++ "self_type" : "type-19322", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119828,8 +119870,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-19155", +- "self_type" : "type-19157", ++ "referenced_type" : "type-19379", ++ "self_type" : "type-19381", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119837,8 +119879,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-19351", +- "self_type" : "type-19353", ++ "referenced_type" : "type-19461", ++ "self_type" : "type-19463", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119846,8 +119888,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-19365", +- "self_type" : "type-19367", ++ "referenced_type" : "type-19586", ++ "self_type" : "type-19588", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119855,8 +119897,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-19546", +- "self_type" : "type-19548", ++ "referenced_type" : "type-19655", ++ "self_type" : "type-19665", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119864,8 +119906,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-19716", +- "self_type" : "type-19718", ++ "referenced_type" : "type-19698", ++ "self_type" : "type-19700", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119873,8 +119915,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-19825", +- "self_type" : "type-19828", ++ "referenced_type" : "type-19922", ++ "self_type" : "type-19924", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119882,8 +119924,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-20093", +- "self_type" : "type-20095", ++ "referenced_type" : "type-20097", ++ "self_type" : "type-20099", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119891,8 +119933,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-20368", +- "self_type" : "type-20370", ++ "referenced_type" : "type-20372", ++ "self_type" : "type-20374", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119900,8 +119942,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-20503", +- "self_type" : "type-20505", ++ "referenced_type" : "type-20510", ++ "self_type" : "type-20512", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119909,8 +119951,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-20634", +- "self_type" : "type-20636", ++ "referenced_type" : "type-20642", ++ "self_type" : "type-20644", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119918,8 +119960,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-20784", +- "self_type" : "type-20786", ++ "referenced_type" : "type-20792", ++ "self_type" : "type-20794", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119927,8 +119969,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-20868", +- "self_type" : "type-20870", ++ "referenced_type" : "type-20876", ++ "self_type" : "type-20878", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119936,8 +119978,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-20970", +- "self_type" : "type-20972", ++ "referenced_type" : "type-20978", ++ "self_type" : "type-20980", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119945,8 +119987,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21097", +- "self_type" : "type-21099", ++ "referenced_type" : "type-21105", ++ "self_type" : "type-21107", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119954,8 +119996,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21149", +- "self_type" : "type-21151", ++ "referenced_type" : "type-21157", ++ "self_type" : "type-21159", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119963,8 +120005,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21232", +- "self_type" : "type-21234", ++ "referenced_type" : "type-21240", ++ "self_type" : "type-21242", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119972,8 +120014,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21281", +- "self_type" : "type-21280", ++ "referenced_type" : "type-21289", ++ "self_type" : "type-21288", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119981,8 +120023,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21285", +- "self_type" : "type-21287", ++ "referenced_type" : "type-21293", ++ "self_type" : "type-21295", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119990,8 +120032,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21363", +- "self_type" : "type-21365", ++ "referenced_type" : "type-21371", ++ "self_type" : "type-21373", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119999,8 +120041,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21431", +- "self_type" : "type-21433", ++ "referenced_type" : "type-21439", ++ "self_type" : "type-21441", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120008,8 +120050,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21468", +- "self_type" : "type-21482", ++ "referenced_type" : "type-21476", ++ "self_type" : "type-21490", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120017,8 +120059,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21685", +- "self_type" : "type-21687", ++ "referenced_type" : "type-21693", ++ "self_type" : "type-21695", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120026,8 +120068,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21767", +- "self_type" : "type-21769", ++ "referenced_type" : "type-21775", ++ "self_type" : "type-21777", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120035,8 +120077,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21860", +- "self_type" : "type-21862", ++ "referenced_type" : "type-21868", ++ "self_type" : "type-21870", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121601,8 +121643,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *", + "name" : "const std::vector > *", +- "referenced_type" : "type-17808", +- "self_type" : "type-17807", ++ "referenced_type" : "type-18586", ++ "self_type" : "type-18585", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -121655,8 +121697,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *", + "name" : "const std::vector > *", +- "referenced_type" : "type-17802", +- "self_type" : "type-17801", ++ "referenced_type" : "type-18580", ++ "self_type" : "type-18579", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -122213,8 +122255,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-15584", +- "self_type" : "type-15583", ++ "referenced_type" : "type-15459", ++ "self_type" : "type-15458", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122222,8 +122264,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-15848", +- "self_type" : "type-15847", ++ "referenced_type" : "type-15608", ++ "self_type" : "type-15607", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122231,8 +122273,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-15968", +- "self_type" : "type-15967", ++ "referenced_type" : "type-15786", ++ "self_type" : "type-15785", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122240,8 +122282,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-16352", +- "self_type" : "type-16351", ++ "referenced_type" : "type-15956", ++ "self_type" : "type-15955", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122249,8 +122291,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-16454", +- "self_type" : "type-16453", ++ "referenced_type" : "type-16126", ++ "self_type" : "type-16125", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122258,8 +122300,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-16577", +- "self_type" : "type-16576", ++ "referenced_type" : "type-16357", ++ "self_type" : "type-16356", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122267,8 +122309,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-16631", +- "self_type" : "type-16630", ++ "referenced_type" : "type-16621", ++ "self_type" : "type-16620", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122276,8 +122318,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-16697", +- "self_type" : "type-16696", ++ "referenced_type" : "type-16739", ++ "self_type" : "type-16738", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122285,8 +122327,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-16771", +- "self_type" : "type-16770", ++ "referenced_type" : "type-17122", ++ "self_type" : "type-17121", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122294,8 +122336,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-16846", +- "self_type" : "type-16845", ++ "referenced_type" : "type-17224", ++ "self_type" : "type-17223", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122303,8 +122345,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-17038", +- "self_type" : "type-17037", ++ "referenced_type" : "type-17347", ++ "self_type" : "type-17346", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122312,8 +122354,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-17168", +- "self_type" : "type-17167", ++ "referenced_type" : "type-17401", ++ "self_type" : "type-17400", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122321,8 +122363,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-17246", +- "self_type" : "type-17245", ++ "referenced_type" : "type-17467", ++ "self_type" : "type-17466", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122330,8 +122372,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-17353", +- "self_type" : "type-17352", ++ "referenced_type" : "type-17541", ++ "self_type" : "type-17540", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122339,8 +122381,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-17596", +- "self_type" : "type-17595", ++ "referenced_type" : "type-17616", ++ "self_type" : "type-17615", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122348,8 +122390,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-17677", +- "self_type" : "type-17676", ++ "referenced_type" : "type-17808", ++ "self_type" : "type-17807", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122357,8 +122399,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-17843", +- "self_type" : "type-17842", ++ "referenced_type" : "type-17938", ++ "self_type" : "type-17937", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122366,8 +122408,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-17935", +- "self_type" : "type-17934", ++ "referenced_type" : "type-18016", ++ "self_type" : "type-18015", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122375,8 +122417,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-18026", +- "self_type" : "type-18025", ++ "referenced_type" : "type-18131", ++ "self_type" : "type-18130", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122384,8 +122426,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-18113", +- "self_type" : "type-18112", ++ "referenced_type" : "type-18374", ++ "self_type" : "type-18373", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122393,8 +122435,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-18178", +- "self_type" : "type-18177", ++ "referenced_type" : "type-18455", ++ "self_type" : "type-18454", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122402,8 +122444,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-18458", +- "self_type" : "type-18457", ++ "referenced_type" : "type-18621", ++ "self_type" : "type-18620", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122411,8 +122453,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-18597", +- "self_type" : "type-18596", ++ "referenced_type" : "type-18713", ++ "self_type" : "type-18712", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122420,8 +122462,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-18682", +- "self_type" : "type-18681", ++ "referenced_type" : "type-18804", ++ "self_type" : "type-18803", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122429,8 +122471,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-18873", +- "self_type" : "type-18872", ++ "referenced_type" : "type-18891", ++ "self_type" : "type-18890", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122447,8 +122489,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-18971", +- "self_type" : "type-18970", ++ "referenced_type" : "type-18956", ++ "self_type" : "type-18955", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122456,8 +122498,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-19214", +- "self_type" : "type-19213", ++ "referenced_type" : "type-19236", ++ "self_type" : "type-19235", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122465,8 +122507,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-19364", +- "self_type" : "type-19363", ++ "referenced_type" : "type-19375", ++ "self_type" : "type-19374", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122474,8 +122516,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-19542", +- "self_type" : "type-19541", ++ "referenced_type" : "type-19460", ++ "self_type" : "type-19459", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122483,8 +122525,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-19712", +- "self_type" : "type-19711", ++ "referenced_type" : "type-19651", ++ "self_type" : "type-19650", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122492,8 +122534,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-19882", +- "self_type" : "type-19881", ++ "referenced_type" : "type-19749", ++ "self_type" : "type-19748", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122501,8 +122543,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-20117", +- "self_type" : "type-20116", ++ "referenced_type" : "type-20121", ++ "self_type" : "type-20120", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122510,8 +122552,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-20382", +- "self_type" : "type-20381", ++ "referenced_type" : "type-20386", ++ "self_type" : "type-20385", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122519,8 +122561,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-20500", +- "self_type" : "type-20499", ++ "referenced_type" : "type-20507", ++ "self_type" : "type-20506", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122528,8 +122570,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-20883", +- "self_type" : "type-20882", ++ "referenced_type" : "type-20891", ++ "self_type" : "type-20890", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122537,8 +122579,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-20986", +- "self_type" : "type-20985", ++ "referenced_type" : "type-20994", ++ "self_type" : "type-20993", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122546,8 +122588,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-21109", +- "self_type" : "type-21108", ++ "referenced_type" : "type-21117", ++ "self_type" : "type-21116", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122555,8 +122597,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-21163", +- "self_type" : "type-21162", ++ "referenced_type" : "type-21171", ++ "self_type" : "type-21170", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122564,8 +122606,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-21229", +- "self_type" : "type-21228", ++ "referenced_type" : "type-21237", ++ "self_type" : "type-21236", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122573,8 +122615,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-21303", +- "self_type" : "type-21302", ++ "referenced_type" : "type-21311", ++ "self_type" : "type-21310", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122582,8 +122624,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-21378", +- "self_type" : "type-21377", ++ "referenced_type" : "type-21386", ++ "self_type" : "type-21385", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122591,8 +122633,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-21570", +- "self_type" : "type-21569", ++ "referenced_type" : "type-21578", ++ "self_type" : "type-21577", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122600,8 +122642,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-21700", +- "self_type" : "type-21699", ++ "referenced_type" : "type-21708", ++ "self_type" : "type-21707", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122609,8 +122651,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-21778", +- "self_type" : "type-21777", ++ "referenced_type" : "type-21786", ++ "self_type" : "type-21785", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -124058,8 +124100,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-15497", +- "self_type" : "type-15496", ++ "referenced_type" : "type-15434", ++ "self_type" : "type-15433", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124067,8 +124109,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-15808", +- "self_type" : "type-15807", ++ "referenced_type" : "type-15579", ++ "self_type" : "type-15578", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124076,8 +124118,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-15992", +- "self_type" : "type-15991", ++ "referenced_type" : "type-15746", ++ "self_type" : "type-15745", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124085,8 +124127,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16045", +- "self_type" : "type-16044", ++ "referenced_type" : "type-15923", ++ "self_type" : "type-15922", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124094,8 +124136,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16229", +- "self_type" : "type-16228", ++ "referenced_type" : "type-16083", ++ "self_type" : "type-16082", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124103,8 +124145,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16326", +- "self_type" : "type-16325", ++ "referenced_type" : "type-16270", ++ "self_type" : "type-16269", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124112,8 +124154,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16432", +- "self_type" : "type-16431", ++ "referenced_type" : "type-16581", ++ "self_type" : "type-16580", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124121,8 +124163,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16526", +- "self_type" : "type-16525", ++ "referenced_type" : "type-16763", ++ "self_type" : "type-16762", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124130,8 +124172,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16611", +- "self_type" : "type-16610", ++ "referenced_type" : "type-16816", ++ "self_type" : "type-16815", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124139,8 +124181,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16678", +- "self_type" : "type-16677", ++ "referenced_type" : "type-16999", ++ "self_type" : "type-16998", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124148,8 +124190,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16740", +- "self_type" : "type-16739", ++ "referenced_type" : "type-17096", ++ "self_type" : "type-17095", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124157,8 +124199,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16820", +- "self_type" : "type-16819", ++ "referenced_type" : "type-17202", ++ "self_type" : "type-17201", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124166,8 +124208,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16903", +- "self_type" : "type-16902", ++ "referenced_type" : "type-17296", ++ "self_type" : "type-17295", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124175,8 +124217,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-17134", +- "self_type" : "type-17133", ++ "referenced_type" : "type-1735", ++ "self_type" : "type-1734", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124184,8 +124226,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-17229", +- "self_type" : "type-17228", ++ "referenced_type" : "type-17381", ++ "self_type" : "type-17380", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124193,8 +124235,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-17322", +- "self_type" : "type-17321", ++ "referenced_type" : "type-17448", ++ "self_type" : "type-17447", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124202,8 +124244,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-1735", +- "self_type" : "type-1734", ++ "referenced_type" : "type-17510", ++ "self_type" : "type-17509", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124211,8 +124253,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-17473", +- "self_type" : "type-17472", ++ "referenced_type" : "type-17590", ++ "self_type" : "type-17589", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124220,8 +124262,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-17653", +- "self_type" : "type-17652", ++ "referenced_type" : "type-17673", ++ "self_type" : "type-17672", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124229,8 +124271,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-17818", +- "self_type" : "type-17817", ++ "referenced_type" : "type-17904", ++ "self_type" : "type-17903", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124238,8 +124280,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-17900", +- "self_type" : "type-17899", ++ "referenced_type" : "type-17999", ++ "self_type" : "type-17998", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124247,8 +124289,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-17994", +- "self_type" : "type-17993", ++ "referenced_type" : "type-18092", ++ "self_type" : "type-18091", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124256,8 +124298,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-18089", +- "self_type" : "type-18088", ++ "referenced_type" : "type-18251", ++ "self_type" : "type-18250", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124265,8 +124307,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-18147", +- "self_type" : "type-18146", ++ "referenced_type" : "type-18431", ++ "self_type" : "type-18430", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124274,8 +124316,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-18310", +- "self_type" : "type-18309", ++ "referenced_type" : "type-18596", ++ "self_type" : "type-18595", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124283,8 +124325,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-18431", +- "self_type" : "type-18430", ++ "referenced_type" : "type-18678", ++ "self_type" : "type-18677", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124292,8 +124334,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-18612", +- "self_type" : "type-18611", ++ "referenced_type" : "type-18772", ++ "self_type" : "type-18771", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124301,8 +124343,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-18687", +- "self_type" : "type-18686", ++ "referenced_type" : "type-18867", ++ "self_type" : "type-18866", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124310,8 +124352,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-18778", +- "self_type" : "type-18777", ++ "referenced_type" : "type-18925", ++ "self_type" : "type-18924", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124319,8 +124361,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-18931", +- "self_type" : "type-18930", ++ "referenced_type" : "type-19088", ++ "self_type" : "type-19087", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124328,8 +124370,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-19189", +- "self_type" : "type-19188", ++ "referenced_type" : "type-19209", ++ "self_type" : "type-19208", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124337,8 +124379,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-19335", +- "self_type" : "type-19334", ++ "referenced_type" : "type-19390", ++ "self_type" : "type-19389", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124346,8 +124388,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-19502", +- "self_type" : "type-19501", ++ "referenced_type" : "type-19465", ++ "self_type" : "type-19464", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124355,8 +124397,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-19679", +- "self_type" : "type-19678", ++ "referenced_type" : "type-19556", ++ "self_type" : "type-19555", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124364,8 +124406,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-19839", +- "self_type" : "type-19838", ++ "referenced_type" : "type-19709", ++ "self_type" : "type-19708", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124373,8 +124415,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-20030", +- "self_type" : "type-20029", ++ "referenced_type" : "type-20034", ++ "self_type" : "type-20033", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124382,8 +124424,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-20342", +- "self_type" : "type-20341", ++ "referenced_type" : "type-20346", ++ "self_type" : "type-20345", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124391,8 +124433,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-20524", +- "self_type" : "type-20523", ++ "referenced_type" : "type-20531", ++ "self_type" : "type-20530", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124400,8 +124442,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-20577", +- "self_type" : "type-20576", ++ "referenced_type" : "type-20584", ++ "self_type" : "type-20583", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124409,8 +124451,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-20760", +- "self_type" : "type-20759", ++ "referenced_type" : "type-20768", ++ "self_type" : "type-20767", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124418,8 +124460,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-20857", +- "self_type" : "type-20856", ++ "referenced_type" : "type-20865", ++ "self_type" : "type-20864", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124427,8 +124469,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-20963", +- "self_type" : "type-20962", ++ "referenced_type" : "type-20971", ++ "self_type" : "type-20970", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124436,8 +124478,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-21058", +- "self_type" : "type-21057", ++ "referenced_type" : "type-21066", ++ "self_type" : "type-21065", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124445,8 +124487,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-21143", +- "self_type" : "type-21142", ++ "referenced_type" : "type-21151", ++ "self_type" : "type-21150", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124454,8 +124496,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-21210", +- "self_type" : "type-21209", ++ "referenced_type" : "type-21218", ++ "self_type" : "type-21217", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124463,8 +124505,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-21272", +- "self_type" : "type-21271", ++ "referenced_type" : "type-21280", ++ "self_type" : "type-21279", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124472,8 +124514,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-21352", +- "self_type" : "type-21351", ++ "referenced_type" : "type-21360", ++ "self_type" : "type-21359", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124481,8 +124523,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-21435", +- "self_type" : "type-21434", ++ "referenced_type" : "type-21443", ++ "self_type" : "type-21442", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124490,8 +124532,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-21666", +- "self_type" : "type-21665", ++ "referenced_type" : "type-21674", ++ "self_type" : "type-21673", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124499,8 +124541,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-21761", +- "self_type" : "type-21760", ++ "referenced_type" : "type-21769", ++ "self_type" : "type-21768", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124508,8 +124550,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-21854", +- "self_type" : "type-21853", ++ "referenced_type" : "type-21862", ++ "self_type" : "type-21861", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125768,8 +125810,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-16060", +- "self_type" : "type-16059", ++ "referenced_type" : "type-16831", ++ "self_type" : "type-16830", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125777,8 +125819,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-16528", +- "self_type" : "type-16527", ++ "referenced_type" : "type-17298", ++ "self_type" : "type-17297", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125786,8 +125828,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-17668", +- "self_type" : "type-17667", ++ "referenced_type" : "type-18446", ++ "self_type" : "type-18445", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125795,8 +125837,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-20592", +- "self_type" : "type-20591", ++ "referenced_type" : "type-20599", ++ "self_type" : "type-20598", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125804,8 +125846,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-21060", +- "self_type" : "type-21059", ++ "referenced_type" : "type-21068", ++ "self_type" : "type-21067", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -126308,8 +126350,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-16517", +- "self_type" : "type-16516", ++ "referenced_type" : "type-17287", ++ "self_type" : "type-17286", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126317,8 +126359,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-16835", +- "self_type" : "type-16834", ++ "referenced_type" : "type-17605", ++ "self_type" : "type-17604", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126326,8 +126368,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-17157", +- "self_type" : "type-17156", ++ "referenced_type" : "type-17927", ++ "self_type" : "type-17926", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126335,8 +126377,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-17497", +- "self_type" : "type-17496", ++ "referenced_type" : "type-18275", ++ "self_type" : "type-18274", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126344,8 +126386,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-18814", +- "self_type" : "type-18813", ++ "referenced_type" : "type-19592", ++ "self_type" : "type-19591", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126353,8 +126395,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-21049", +- "self_type" : "type-21048", ++ "referenced_type" : "type-21057", ++ "self_type" : "type-21056", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126362,8 +126404,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-21367", +- "self_type" : "type-21366", ++ "referenced_type" : "type-21375", ++ "self_type" : "type-21374", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126371,8 +126413,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-21689", +- "self_type" : "type-21688", ++ "referenced_type" : "type-21697", ++ "self_type" : "type-21696", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -127208,8 +127250,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-15705", +- "self_type" : "type-15704", ++ "referenced_type" : "type-15466", ++ "self_type" : "type-15465", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127217,8 +127259,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-15875", +- "self_type" : "type-15874", ++ "referenced_type" : "type-15616", ++ "self_type" : "type-15615", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127226,8 +127268,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-15978", +- "self_type" : "type-15977", ++ "referenced_type" : "type-15803", ++ "self_type" : "type-15802", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127235,8 +127277,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-16117", +- "self_type" : "type-16116", ++ "referenced_type" : "type-15974", ++ "self_type" : "type-15973", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127244,8 +127286,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-16266", +- "self_type" : "type-16265", ++ "referenced_type" : "type-16133", ++ "self_type" : "type-16132", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127253,8 +127295,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-16359", +- "self_type" : "type-16358", ++ "referenced_type" : "type-16478", ++ "self_type" : "type-16477", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127262,8 +127304,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-16459", +- "self_type" : "type-16458", ++ "referenced_type" : "type-16648", ++ "self_type" : "type-16647", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127271,8 +127313,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-16641", +- "self_type" : "type-16640", ++ "referenced_type" : "type-16749", ++ "self_type" : "type-16748", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127280,8 +127322,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-16721", +- "self_type" : "type-16720", ++ "referenced_type" : "type-16887", ++ "self_type" : "type-16886", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127289,8 +127331,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-16779", +- "self_type" : "type-16778", ++ "referenced_type" : "type-17036", ++ "self_type" : "type-17035", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127298,8 +127340,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-17251", +- "self_type" : "type-17250", ++ "referenced_type" : "type-17129", ++ "self_type" : "type-17128", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127307,8 +127349,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-17358", +- "self_type" : "type-17357", ++ "referenced_type" : "type-17229", ++ "self_type" : "type-17228", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127316,8 +127358,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-17700", +- "self_type" : "type-17699", ++ "referenced_type" : "type-17411", ++ "self_type" : "type-17410", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127325,8 +127367,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-17858", +- "self_type" : "type-17857", ++ "referenced_type" : "type-17491", ++ "self_type" : "type-17490", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127334,8 +127376,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-17946", +- "self_type" : "type-17945", ++ "referenced_type" : "type-17549", ++ "self_type" : "type-17548", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127343,8 +127385,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-18036", +- "self_type" : "type-18035", ++ "referenced_type" : "type-18021", ++ "self_type" : "type-18020", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127352,8 +127394,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-18119", +- "self_type" : "type-18118", ++ "referenced_type" : "type-18136", ++ "self_type" : "type-18135", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127361,8 +127403,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-18186", +- "self_type" : "type-18185", ++ "referenced_type" : "type-18478", ++ "self_type" : "type-18477", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127370,8 +127412,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-18348", +- "self_type" : "type-18347", ++ "referenced_type" : "type-18636", ++ "self_type" : "type-18635", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127379,8 +127421,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-18473", +- "self_type" : "type-18472", ++ "referenced_type" : "type-18724", ++ "self_type" : "type-18723", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127388,8 +127430,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-18608", +- "self_type" : "type-18607", ++ "referenced_type" : "type-18814", ++ "self_type" : "type-18813", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127397,8 +127439,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-18699", +- "self_type" : "type-18698", ++ "referenced_type" : "type-18897", ++ "self_type" : "type-18896", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127406,8 +127448,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-18978", +- "self_type" : "type-18977", ++ "referenced_type" : "type-18964", ++ "self_type" : "type-18963", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127415,8 +127457,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-19221", +- "self_type" : "type-19220", ++ "referenced_type" : "type-19126", ++ "self_type" : "type-19125", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127424,8 +127466,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-19372", +- "self_type" : "type-19371", ++ "referenced_type" : "type-19251", ++ "self_type" : "type-19250", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127433,8 +127475,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-19559", +- "self_type" : "type-19558", ++ "referenced_type" : "type-19386", ++ "self_type" : "type-19385", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127442,8 +127484,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-19730", +- "self_type" : "type-19729", ++ "referenced_type" : "type-19477", ++ "self_type" : "type-19476", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127451,8 +127493,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-19889", +- "self_type" : "type-19888", ++ "referenced_type" : "type-19756", ++ "self_type" : "type-19755", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127460,8 +127502,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-20238", +- "self_type" : "type-20237", ++ "referenced_type" : "type-20242", ++ "self_type" : "type-20241", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127469,8 +127511,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-20409", +- "self_type" : "type-20408", ++ "referenced_type" : "type-20413", ++ "self_type" : "type-20412", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127478,8 +127520,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-20510", +- "self_type" : "type-20509", ++ "referenced_type" : "type-20517", ++ "self_type" : "type-20516", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127487,8 +127529,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-20648", +- "self_type" : "type-20647", ++ "referenced_type" : "type-20656", ++ "self_type" : "type-20655", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127496,8 +127538,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-20797", +- "self_type" : "type-20796", ++ "referenced_type" : "type-2080", ++ "self_type" : "type-2079", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127505,8 +127547,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-2080", +- "self_type" : "type-2079", ++ "referenced_type" : "type-20805", ++ "self_type" : "type-20804", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127514,8 +127556,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-20890", +- "self_type" : "type-20889", ++ "referenced_type" : "type-20898", ++ "self_type" : "type-20897", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127523,8 +127565,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-20991", +- "self_type" : "type-20990", ++ "referenced_type" : "type-20999", ++ "self_type" : "type-20998", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127532,8 +127574,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-21173", +- "self_type" : "type-21172", ++ "referenced_type" : "type-21181", ++ "self_type" : "type-21180", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127541,8 +127583,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-21253", +- "self_type" : "type-21252", ++ "referenced_type" : "type-21261", ++ "self_type" : "type-21260", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127550,8 +127592,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-21311", +- "self_type" : "type-21310", ++ "referenced_type" : "type-21319", ++ "self_type" : "type-21318", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127559,8 +127601,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-21783", +- "self_type" : "type-21782", ++ "referenced_type" : "type-21791", ++ "self_type" : "type-21790", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128648,8 +128690,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-16872", +- "self_type" : "type-16871", ++ "referenced_type" : "type-17642", ++ "self_type" : "type-17641", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128657,8 +128699,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-17332", +- "self_type" : "type-17331", ++ "referenced_type" : "type-18102", ++ "self_type" : "type-18101", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128666,8 +128708,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-18463", +- "self_type" : "type-18462", ++ "referenced_type" : "type-19241", ++ "self_type" : "type-19240", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128675,8 +128717,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-18792", +- "self_type" : "type-18791", ++ "referenced_type" : "type-19570", ++ "self_type" : "type-19569", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128684,8 +128726,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-21404", +- "self_type" : "type-21403", ++ "referenced_type" : "type-21412", ++ "self_type" : "type-21411", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128693,8 +128735,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-21864", +- "self_type" : "type-21863", ++ "referenced_type" : "type-21872", ++ "self_type" : "type-21871", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -129017,8 +129059,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-15379", +- "self_type" : "type-15378", ++ "referenced_type" : "type-15421", ++ "self_type" : "type-15420", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129026,8 +129068,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-15403", +- "self_type" : "type-15402", ++ "referenced_type" : "type-15744", ++ "self_type" : "type-15743", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129035,8 +129077,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-17914", +- "self_type" : "type-17913", ++ "referenced_type" : "type-18692", ++ "self_type" : "type-18691", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129044,8 +129086,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-18343", +- "self_type" : "type-18342", ++ "referenced_type" : "type-19121", ++ "self_type" : "type-19120", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129053,8 +129095,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-19176", +- "self_type" : "type-19175", ++ "referenced_type" : "type-19912", ++ "self_type" : "type-19911", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129062,8 +129104,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-19500", +- "self_type" : "type-19499", ++ "referenced_type" : "type-19936", ++ "self_type" : "type-19935", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129710,8 +129752,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-15721", +- "self_type" : "type-15720", ++ "referenced_type" : "type-15489", ++ "self_type" : "type-15488", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129719,8 +129761,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-15892", +- "self_type" : "type-15891", ++ "referenced_type" : "type-15637", ++ "self_type" : "type-15636", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129728,8 +129770,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16154", +- "self_type" : "type-16153", ++ "referenced_type" : "type-15834", ++ "self_type" : "type-15833", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129737,8 +129779,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16277", +- "self_type" : "type-16276", ++ "referenced_type" : "type-16004", ++ "self_type" : "type-16003", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129746,8 +129788,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16417", +- "self_type" : "type-16416", ++ "referenced_type" : "type-16159", ++ "self_type" : "type-16158", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129755,8 +129797,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16474", +- "self_type" : "type-16473", ++ "referenced_type" : "type-16494", ++ "self_type" : "type-16493", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129764,8 +129806,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16654", +- "self_type" : "type-16653", ++ "referenced_type" : "type-16665", ++ "self_type" : "type-16664", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129773,8 +129815,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16792", +- "self_type" : "type-16791", ++ "referenced_type" : "type-16924", ++ "self_type" : "type-16923", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129782,8 +129824,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17277", +- "self_type" : "type-17276", ++ "referenced_type" : "type-17047", ++ "self_type" : "type-17046", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129791,8 +129833,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17371", +- "self_type" : "type-17370", ++ "referenced_type" : "type-17187", ++ "self_type" : "type-17186", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129800,8 +129842,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17417", +- "self_type" : "type-17416", ++ "referenced_type" : "type-17244", ++ "self_type" : "type-17243", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129809,8 +129851,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17751", +- "self_type" : "type-17750", ++ "referenced_type" : "type-17424", ++ "self_type" : "type-17423", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129818,8 +129860,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17874", +- "self_type" : "type-17873", ++ "referenced_type" : "type-17562", ++ "self_type" : "type-17561", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129827,8 +129869,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17967", +- "self_type" : "type-17966", ++ "referenced_type" : "type-18047", ++ "self_type" : "type-18046", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129836,8 +129878,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18057", +- "self_type" : "type-18056", ++ "referenced_type" : "type-18149", ++ "self_type" : "type-18148", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129845,8 +129887,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18130", +- "self_type" : "type-18129", ++ "referenced_type" : "type-18195", ++ "self_type" : "type-18194", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129854,8 +129896,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18216", +- "self_type" : "type-18215", ++ "referenced_type" : "type-18529", ++ "self_type" : "type-18528", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129863,8 +129905,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18369", +- "self_type" : "type-18368", ++ "referenced_type" : "type-18652", ++ "self_type" : "type-18651", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129872,8 +129914,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18497", +- "self_type" : "type-18496", ++ "referenced_type" : "type-18745", ++ "self_type" : "type-18744", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129881,8 +129923,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18725", +- "self_type" : "type-18724", ++ "referenced_type" : "type-18835", ++ "self_type" : "type-18834", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129890,8 +129932,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18880", +- "self_type" : "type-18879", ++ "referenced_type" : "type-18908", ++ "self_type" : "type-18907", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129899,8 +129941,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19005", +- "self_type" : "type-19004", ++ "referenced_type" : "type-18994", ++ "self_type" : "type-18993", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129908,8 +129950,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19244", +- "self_type" : "type-19243", ++ "referenced_type" : "type-19147", ++ "self_type" : "type-19146", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129917,8 +129959,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19393", +- "self_type" : "type-19392", ++ "referenced_type" : "type-19275", ++ "self_type" : "type-19274", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129926,8 +129968,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19590", +- "self_type" : "type-19589", ++ "referenced_type" : "type-19503", ++ "self_type" : "type-19502", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129935,8 +129977,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19760", +- "self_type" : "type-19759", ++ "referenced_type" : "type-19658", ++ "self_type" : "type-19657", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129944,8 +129986,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19915", +- "self_type" : "type-19914", ++ "referenced_type" : "type-19783", ++ "self_type" : "type-19782", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129953,8 +129995,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20255", +- "self_type" : "type-20254", ++ "referenced_type" : "type-20259", ++ "self_type" : "type-20258", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129962,8 +130004,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20426", +- "self_type" : "type-20425", ++ "referenced_type" : "type-20430", ++ "self_type" : "type-20429", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129971,8 +130013,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20685", +- "self_type" : "type-20684", ++ "referenced_type" : "type-20693", ++ "self_type" : "type-20692", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129980,8 +130022,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20808", +- "self_type" : "type-20807", ++ "referenced_type" : "type-20816", ++ "self_type" : "type-20815", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129989,8 +130031,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20948", +- "self_type" : "type-20947", ++ "referenced_type" : "type-20956", ++ "self_type" : "type-20955", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129998,8 +130040,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-21006", +- "self_type" : "type-21005", ++ "referenced_type" : "type-21014", ++ "self_type" : "type-21013", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130016,8 +130058,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-21186", +- "self_type" : "type-21185", ++ "referenced_type" : "type-21194", ++ "self_type" : "type-21193", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130025,8 +130067,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-21324", +- "self_type" : "type-21323", ++ "referenced_type" : "type-21332", ++ "self_type" : "type-21331", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130034,8 +130076,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-21809", +- "self_type" : "type-21808", ++ "referenced_type" : "type-21817", ++ "self_type" : "type-21816", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131051,8 +131093,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16152", +- "self_type" : "type-16151", ++ "referenced_type" : "type-15487", ++ "self_type" : "type-15486", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131060,8 +131102,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17275", +- "self_type" : "type-17274", ++ "referenced_type" : "type-15635", ++ "self_type" : "type-15634", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131069,8 +131111,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17749", +- "self_type" : "type-17748", ++ "referenced_type" : "type-15832", ++ "self_type" : "type-15831", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131078,8 +131120,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18055", +- "self_type" : "type-18054", ++ "referenced_type" : "type-16000", ++ "self_type" : "type-15999", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131087,8 +131129,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18367", +- "self_type" : "type-18366", ++ "referenced_type" : "type-16157", ++ "self_type" : "type-16156", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131096,8 +131138,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18495", +- "self_type" : "type-18494", ++ "referenced_type" : "type-16922", ++ "self_type" : "type-16921", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131105,8 +131147,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18722", +- "self_type" : "type-18721", ++ "referenced_type" : "type-18045", ++ "self_type" : "type-18044", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131114,8 +131156,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19003", +- "self_type" : "type-19002", ++ "referenced_type" : "type-18527", ++ "self_type" : "type-18526", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131123,8 +131165,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19242", +- "self_type" : "type-19241", ++ "referenced_type" : "type-18833", ++ "self_type" : "type-18832", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131132,8 +131174,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19391", +- "self_type" : "type-19390", ++ "referenced_type" : "type-19145", ++ "self_type" : "type-19144", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131141,8 +131183,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19588", +- "self_type" : "type-19587", ++ "referenced_type" : "type-19273", ++ "self_type" : "type-19272", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131150,8 +131192,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19756", +- "self_type" : "type-19755", ++ "referenced_type" : "type-19500", ++ "self_type" : "type-19499", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131159,8 +131201,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19913", +- "self_type" : "type-19912", ++ "referenced_type" : "type-19781", ++ "self_type" : "type-19780", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131168,8 +131210,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20683", +- "self_type" : "type-20682", ++ "referenced_type" : "type-20691", ++ "self_type" : "type-20690", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131177,8 +131219,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-21807", +- "self_type" : "type-21806", ++ "referenced_type" : "type-21815", ++ "self_type" : "type-21814", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131699,8 +131741,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16150", +- "self_type" : "type-16149", ++ "referenced_type" : "type-15485", ++ "self_type" : "type-15484", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131708,8 +131750,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17273", +- "self_type" : "type-17272", ++ "referenced_type" : "type-15633", ++ "self_type" : "type-15632", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131717,8 +131759,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17747", +- "self_type" : "type-17746", ++ "referenced_type" : "type-15829", ++ "self_type" : "type-15828", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131726,8 +131768,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18053", +- "self_type" : "type-18052", ++ "referenced_type" : "type-15998", ++ "self_type" : "type-15997", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131735,8 +131777,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18365", +- "self_type" : "type-18364", ++ "referenced_type" : "type-16155", ++ "self_type" : "type-16154", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131744,8 +131786,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18493", +- "self_type" : "type-18492", ++ "referenced_type" : "type-16920", ++ "self_type" : "type-16919", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131753,8 +131795,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18720", +- "self_type" : "type-18719", ++ "referenced_type" : "type-18043", ++ "self_type" : "type-18042", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131762,8 +131804,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19001", +- "self_type" : "type-19000", ++ "referenced_type" : "type-18525", ++ "self_type" : "type-18524", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131771,8 +131813,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19240", +- "self_type" : "type-19239", ++ "referenced_type" : "type-18831", ++ "self_type" : "type-18830", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131780,8 +131822,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19389", +- "self_type" : "type-19388", ++ "referenced_type" : "type-19143", ++ "self_type" : "type-19142", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131789,8 +131831,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19585", +- "self_type" : "type-19584", ++ "referenced_type" : "type-19271", ++ "self_type" : "type-19270", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131798,8 +131840,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19754", +- "self_type" : "type-19753", ++ "referenced_type" : "type-19498", ++ "self_type" : "type-19497", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131807,8 +131849,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19911", +- "self_type" : "type-19910", ++ "referenced_type" : "type-19779", ++ "self_type" : "type-19778", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131816,8 +131858,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20681", +- "self_type" : "type-20680", ++ "referenced_type" : "type-20689", ++ "self_type" : "type-20688", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131825,8 +131867,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-21805", +- "self_type" : "type-21804", ++ "referenced_type" : "type-21813", ++ "self_type" : "type-21812", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132248,8 +132290,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18712", +- "self_type" : "type-18711", ++ "referenced_type" : "type-15477", ++ "self_type" : "type-15476", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132257,8 +132299,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18993", +- "self_type" : "type-18992", ++ "referenced_type" : "type-15821", ++ "self_type" : "type-15820", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132266,8 +132308,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19232", +- "self_type" : "type-19231", ++ "referenced_type" : "type-15989", ++ "self_type" : "type-15988", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132275,8 +132317,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19577", +- "self_type" : "type-19576", ++ "referenced_type" : "type-16147", ++ "self_type" : "type-16146", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132284,8 +132326,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19745", +- "self_type" : "type-19744", ++ "referenced_type" : "type-19490", ++ "self_type" : "type-19489", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132293,8 +132335,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19903", +- "self_type" : "type-19902", ++ "referenced_type" : "type-19771", ++ "self_type" : "type-19770", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132599,8 +132641,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16144", +- "self_type" : "type-16143", ++ "referenced_type" : "type-15479", ++ "self_type" : "type-15478", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132608,8 +132650,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17267", +- "self_type" : "type-17266", ++ "referenced_type" : "type-15627", ++ "self_type" : "type-15626", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132617,8 +132659,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17740", +- "self_type" : "type-17739", ++ "referenced_type" : "type-15823", ++ "self_type" : "type-15822", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132626,8 +132668,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18047", +- "self_type" : "type-18046", ++ "referenced_type" : "type-15992", ++ "self_type" : "type-15991", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132635,8 +132677,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18359", +- "self_type" : "type-18358", ++ "referenced_type" : "type-16149", ++ "self_type" : "type-16148", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132644,8 +132686,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18487", +- "self_type" : "type-18486", ++ "referenced_type" : "type-16914", ++ "self_type" : "type-16913", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132653,8 +132695,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18714", +- "self_type" : "type-18713", ++ "referenced_type" : "type-18037", ++ "self_type" : "type-18036", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132662,8 +132704,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18995", +- "self_type" : "type-18994", ++ "referenced_type" : "type-18518", ++ "self_type" : "type-18517", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132671,8 +132713,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19234", +- "self_type" : "type-19233", ++ "referenced_type" : "type-18825", ++ "self_type" : "type-18824", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132680,8 +132722,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19383", +- "self_type" : "type-19382", ++ "referenced_type" : "type-19137", ++ "self_type" : "type-19136", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132689,8 +132731,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19579", +- "self_type" : "type-19578", ++ "referenced_type" : "type-19265", ++ "self_type" : "type-19264", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132698,8 +132740,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19748", +- "self_type" : "type-19747", ++ "referenced_type" : "type-19492", ++ "self_type" : "type-19491", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132707,8 +132749,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19905", +- "self_type" : "type-19904", ++ "referenced_type" : "type-19773", ++ "self_type" : "type-19772", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132716,8 +132758,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20675", +- "self_type" : "type-20674", ++ "referenced_type" : "type-20683", ++ "self_type" : "type-20682", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132725,8 +132767,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-21799", +- "self_type" : "type-21798", ++ "referenced_type" : "type-21807", ++ "self_type" : "type-21806", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133247,8 +133289,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16146", +- "self_type" : "type-16145", ++ "referenced_type" : "type-15481", ++ "self_type" : "type-15480", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133256,8 +133298,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17269", +- "self_type" : "type-17268", ++ "referenced_type" : "type-15629", ++ "self_type" : "type-15628", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133265,8 +133307,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17742", +- "self_type" : "type-17741", ++ "referenced_type" : "type-15825", ++ "self_type" : "type-15824", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133274,8 +133316,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18049", +- "self_type" : "type-18048", ++ "referenced_type" : "type-15994", ++ "self_type" : "type-15993", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133283,8 +133325,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18361", +- "self_type" : "type-18360", ++ "referenced_type" : "type-16151", ++ "self_type" : "type-16150", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133292,8 +133334,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18489", +- "self_type" : "type-18488", ++ "referenced_type" : "type-16916", ++ "self_type" : "type-16915", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133301,8 +133343,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18716", +- "self_type" : "type-18715", ++ "referenced_type" : "type-18039", ++ "self_type" : "type-18038", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133310,8 +133352,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18997", +- "self_type" : "type-18996", ++ "referenced_type" : "type-18520", ++ "self_type" : "type-18519", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133319,8 +133361,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19236", +- "self_type" : "type-19235", ++ "referenced_type" : "type-18827", ++ "self_type" : "type-18826", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133328,8 +133370,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19385", +- "self_type" : "type-19384", ++ "referenced_type" : "type-19139", ++ "self_type" : "type-19138", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133337,8 +133379,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19581", +- "self_type" : "type-19580", ++ "referenced_type" : "type-19267", ++ "self_type" : "type-19266", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133346,8 +133388,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19750", +- "self_type" : "type-19749", ++ "referenced_type" : "type-19494", ++ "self_type" : "type-19493", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133355,8 +133397,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19907", +- "self_type" : "type-19906", ++ "referenced_type" : "type-19775", ++ "self_type" : "type-19774", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133364,8 +133406,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20677", +- "self_type" : "type-20676", ++ "referenced_type" : "type-20685", ++ "self_type" : "type-20684", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133373,8 +133415,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-21801", +- "self_type" : "type-21800", ++ "referenced_type" : "type-21809", ++ "self_type" : "type-21808", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133895,8 +133937,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16148", +- "self_type" : "type-16147", ++ "referenced_type" : "type-15483", ++ "self_type" : "type-15482", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133904,8 +133946,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17271", +- "self_type" : "type-17270", ++ "referenced_type" : "type-15631", ++ "self_type" : "type-15630", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133913,8 +133955,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17745", +- "self_type" : "type-17744", ++ "referenced_type" : "type-15827", ++ "self_type" : "type-15826", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133922,8 +133964,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18051", +- "self_type" : "type-18050", ++ "referenced_type" : "type-15996", ++ "self_type" : "type-15995", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133931,8 +133973,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18363", +- "self_type" : "type-18362", ++ "referenced_type" : "type-16153", ++ "self_type" : "type-16152", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133940,8 +133982,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18491", +- "self_type" : "type-18490", ++ "referenced_type" : "type-16918", ++ "self_type" : "type-16917", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133949,8 +133991,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18718", +- "self_type" : "type-18717", ++ "referenced_type" : "type-18041", ++ "self_type" : "type-18040", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133958,8 +134000,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18999", +- "self_type" : "type-18998", ++ "referenced_type" : "type-18523", ++ "self_type" : "type-18522", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133967,8 +134009,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19238", +- "self_type" : "type-19237", ++ "referenced_type" : "type-18829", ++ "self_type" : "type-18828", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133976,8 +134018,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19387", +- "self_type" : "type-19386", ++ "referenced_type" : "type-19141", ++ "self_type" : "type-19140", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133985,8 +134027,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19583", +- "self_type" : "type-19582", ++ "referenced_type" : "type-19269", ++ "self_type" : "type-19268", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133994,8 +134036,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19752", +- "self_type" : "type-19751", ++ "referenced_type" : "type-19496", ++ "self_type" : "type-19495", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134003,8 +134045,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19909", +- "self_type" : "type-19908", ++ "referenced_type" : "type-19777", ++ "self_type" : "type-19776", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134012,8 +134054,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20679", +- "self_type" : "type-20678", ++ "referenced_type" : "type-20687", ++ "self_type" : "type-20686", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134021,8 +134063,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-21803", +- "self_type" : "type-21802", ++ "referenced_type" : "type-21811", ++ "self_type" : "type-21810", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134804,8 +134846,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-15713", +- "self_type" : "type-15712", ++ "referenced_type" : "type-15473", ++ "self_type" : "type-15472", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134813,8 +134855,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-15882", +- "self_type" : "type-15881", ++ "referenced_type" : "type-15623", ++ "self_type" : "type-15622", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134822,8 +134864,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-15990", +- "self_type" : "type-15989", ++ "referenced_type" : "type-15811", ++ "self_type" : "type-15810", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134831,8 +134873,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16124", +- "self_type" : "type-16123", ++ "referenced_type" : "type-15982", ++ "self_type" : "type-15981", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134840,8 +134882,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16273", +- "self_type" : "type-16272", ++ "referenced_type" : "type-16141", ++ "self_type" : "type-16140", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134849,8 +134891,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16366", +- "self_type" : "type-16365", ++ "referenced_type" : "type-16486", ++ "self_type" : "type-16485", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134858,8 +134900,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16466", +- "self_type" : "type-16465", ++ "referenced_type" : "type-16655", ++ "self_type" : "type-16654", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134867,8 +134909,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16648", +- "self_type" : "type-16647", ++ "referenced_type" : "type-16761", ++ "self_type" : "type-16760", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134876,8 +134918,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16728", +- "self_type" : "type-16727", ++ "referenced_type" : "type-16894", ++ "self_type" : "type-16893", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134885,8 +134927,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16786", +- "self_type" : "type-16785", ++ "referenced_type" : "type-17043", ++ "self_type" : "type-17042", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134894,8 +134936,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16860", +- "self_type" : "type-16859", ++ "referenced_type" : "type-17136", ++ "self_type" : "type-17135", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134903,8 +134945,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17258", +- "self_type" : "type-17257", ++ "referenced_type" : "type-17236", ++ "self_type" : "type-17235", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134912,8 +134954,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17365", +- "self_type" : "type-17364", ++ "referenced_type" : "type-17418", ++ "self_type" : "type-17417", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134921,8 +134963,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17865", +- "self_type" : "type-17864", ++ "referenced_type" : "type-17498", ++ "self_type" : "type-17497", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134930,8 +134972,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17953", +- "self_type" : "type-17952", ++ "referenced_type" : "type-17556", ++ "self_type" : "type-17555", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134939,8 +134981,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18043", +- "self_type" : "type-18042", ++ "referenced_type" : "type-17630", ++ "self_type" : "type-17629", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134948,8 +134990,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18126", +- "self_type" : "type-18125", ++ "referenced_type" : "type-18028", ++ "self_type" : "type-18027", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134957,8 +134999,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18193", +- "self_type" : "type-18192", ++ "referenced_type" : "type-18143", ++ "self_type" : "type-18142", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134966,8 +135008,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18355", +- "self_type" : "type-18354", ++ "referenced_type" : "type-18643", ++ "self_type" : "type-18642", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134975,8 +135017,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18480", +- "self_type" : "type-18479", ++ "referenced_type" : "type-18731", ++ "self_type" : "type-18730", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134984,8 +135026,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18622", +- "self_type" : "type-18621", ++ "referenced_type" : "type-18821", ++ "self_type" : "type-18820", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134993,8 +135035,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18706", +- "self_type" : "type-18705", ++ "referenced_type" : "type-18904", ++ "self_type" : "type-18903", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135002,8 +135044,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18986", +- "self_type" : "type-18985", ++ "referenced_type" : "type-18971", ++ "self_type" : "type-18970", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135011,8 +135053,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19228", +- "self_type" : "type-19227", ++ "referenced_type" : "type-19133", ++ "self_type" : "type-19132", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135020,8 +135062,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19379", +- "self_type" : "type-19378", ++ "referenced_type" : "type-19258", ++ "self_type" : "type-19257", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135029,8 +135071,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19567", +- "self_type" : "type-19566", ++ "referenced_type" : "type-19400", ++ "self_type" : "type-19399", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135038,8 +135080,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19738", +- "self_type" : "type-19737", ++ "referenced_type" : "type-19484", ++ "self_type" : "type-19483", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135047,8 +135089,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19897", +- "self_type" : "type-19896", ++ "referenced_type" : "type-19764", ++ "self_type" : "type-19763", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135056,8 +135098,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20246", +- "self_type" : "type-20245", ++ "referenced_type" : "type-20250", ++ "self_type" : "type-20249", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135065,8 +135107,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20416", +- "self_type" : "type-20415", ++ "referenced_type" : "type-20420", ++ "self_type" : "type-20419", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135074,8 +135116,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20522", +- "self_type" : "type-20521", ++ "referenced_type" : "type-20529", ++ "self_type" : "type-20528", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135083,8 +135125,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20655", +- "self_type" : "type-20654", ++ "referenced_type" : "type-20663", ++ "self_type" : "type-20662", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135092,8 +135134,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20804", +- "self_type" : "type-20803", ++ "referenced_type" : "type-20812", ++ "self_type" : "type-20811", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135110,8 +135152,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20897", +- "self_type" : "type-20896", ++ "referenced_type" : "type-20905", ++ "self_type" : "type-20904", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135119,8 +135161,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20998", +- "self_type" : "type-20997", ++ "referenced_type" : "type-21006", ++ "self_type" : "type-21005", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135128,8 +135170,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21180", +- "self_type" : "type-21179", ++ "referenced_type" : "type-21188", ++ "self_type" : "type-21187", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135137,8 +135179,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21260", +- "self_type" : "type-21259", ++ "referenced_type" : "type-21268", ++ "self_type" : "type-21267", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135146,8 +135188,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21318", +- "self_type" : "type-21317", ++ "referenced_type" : "type-21326", ++ "self_type" : "type-21325", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135155,8 +135197,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21392", +- "self_type" : "type-21391", ++ "referenced_type" : "type-21400", ++ "self_type" : "type-21399", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135164,8 +135206,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21790", +- "self_type" : "type-21789", ++ "referenced_type" : "type-21798", ++ "self_type" : "type-21797", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -136487,8 +136529,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-15723", +- "self_type" : "type-15722", ++ "referenced_type" : "type-15491", ++ "self_type" : "type-15490", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136496,8 +136538,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-15894", +- "self_type" : "type-15893", ++ "referenced_type" : "type-15639", ++ "self_type" : "type-15638", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136505,8 +136547,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16156", +- "self_type" : "type-16155", ++ "referenced_type" : "type-15836", ++ "self_type" : "type-15835", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136514,8 +136556,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16279", +- "self_type" : "type-16278", ++ "referenced_type" : "type-16006", ++ "self_type" : "type-16005", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136523,8 +136565,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16419", +- "self_type" : "type-16418", ++ "referenced_type" : "type-16163", ++ "self_type" : "type-16162", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136532,8 +136574,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16476", +- "self_type" : "type-16475", ++ "referenced_type" : "type-16496", ++ "self_type" : "type-16495", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136541,8 +136583,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16591", +- "self_type" : "type-16590", ++ "referenced_type" : "type-16667", ++ "self_type" : "type-16666", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136550,8 +136592,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16656", +- "self_type" : "type-16655", ++ "referenced_type" : "type-16926", ++ "self_type" : "type-16925", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136559,8 +136601,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16794", +- "self_type" : "type-16793", ++ "referenced_type" : "type-17049", ++ "self_type" : "type-17048", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136568,8 +136610,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16866", +- "self_type" : "type-16865", ++ "referenced_type" : "type-17189", ++ "self_type" : "type-17188", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136577,8 +136619,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17105", +- "self_type" : "type-17104", ++ "referenced_type" : "type-17246", ++ "self_type" : "type-17245", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136586,8 +136628,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17279", +- "self_type" : "type-17278", ++ "referenced_type" : "type-17361", ++ "self_type" : "type-17360", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136595,8 +136637,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17373", +- "self_type" : "type-17372", ++ "referenced_type" : "type-17426", ++ "self_type" : "type-17425", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136604,8 +136646,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17419", +- "self_type" : "type-17418", ++ "referenced_type" : "type-17564", ++ "self_type" : "type-17563", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136613,8 +136655,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17753", +- "self_type" : "type-17752", ++ "referenced_type" : "type-17636", ++ "self_type" : "type-17635", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136622,8 +136664,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17876", +- "self_type" : "type-17875", ++ "referenced_type" : "type-17875", ++ "self_type" : "type-17874", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136631,8 +136673,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17969", +- "self_type" : "type-17968", ++ "referenced_type" : "type-18049", ++ "self_type" : "type-18048", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136640,8 +136682,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18059", +- "self_type" : "type-18058", ++ "referenced_type" : "type-18151", ++ "self_type" : "type-18150", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136649,8 +136691,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18132", +- "self_type" : "type-18131", ++ "referenced_type" : "type-18197", ++ "self_type" : "type-18196", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136658,8 +136700,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18218", +- "self_type" : "type-18217", ++ "referenced_type" : "type-18531", ++ "self_type" : "type-18530", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136667,8 +136709,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18371", +- "self_type" : "type-18370", ++ "referenced_type" : "type-18654", ++ "self_type" : "type-18653", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136676,8 +136718,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18499", +- "self_type" : "type-18498", ++ "referenced_type" : "type-18747", ++ "self_type" : "type-18746", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136685,8 +136727,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18727", +- "self_type" : "type-18726", ++ "referenced_type" : "type-18837", ++ "self_type" : "type-18836", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136694,8 +136736,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18882", +- "self_type" : "type-18881", ++ "referenced_type" : "type-18910", ++ "self_type" : "type-18909", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136703,8 +136745,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19007", +- "self_type" : "type-19006", ++ "referenced_type" : "type-18996", ++ "self_type" : "type-18995", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136712,8 +136754,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19246", +- "self_type" : "type-19245", ++ "referenced_type" : "type-19149", ++ "self_type" : "type-19148", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136721,8 +136763,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19395", +- "self_type" : "type-19394", ++ "referenced_type" : "type-19277", ++ "self_type" : "type-19276", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136730,8 +136772,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19592", +- "self_type" : "type-19591", ++ "referenced_type" : "type-19505", ++ "self_type" : "type-19504", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136739,8 +136781,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19762", +- "self_type" : "type-19761", ++ "referenced_type" : "type-19660", ++ "self_type" : "type-19659", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136748,8 +136790,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19919", +- "self_type" : "type-19918", ++ "referenced_type" : "type-19785", ++ "self_type" : "type-19784", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136757,8 +136799,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20257", +- "self_type" : "type-20256", ++ "referenced_type" : "type-20261", ++ "self_type" : "type-20260", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136766,8 +136808,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20428", +- "self_type" : "type-20427", ++ "referenced_type" : "type-20432", ++ "self_type" : "type-20431", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136775,8 +136817,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20687", +- "self_type" : "type-20686", ++ "referenced_type" : "type-20695", ++ "self_type" : "type-20694", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136784,8 +136826,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20810", +- "self_type" : "type-20809", ++ "referenced_type" : "type-20818", ++ "self_type" : "type-20817", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136793,8 +136835,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20950", +- "self_type" : "type-20949", ++ "referenced_type" : "type-20958", ++ "self_type" : "type-20957", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136802,8 +136844,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21008", +- "self_type" : "type-21007", ++ "referenced_type" : "type-21016", ++ "self_type" : "type-21015", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136820,8 +136862,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21123", +- "self_type" : "type-21122", ++ "referenced_type" : "type-21131", ++ "self_type" : "type-21130", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136829,8 +136871,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21188", +- "self_type" : "type-21187", ++ "referenced_type" : "type-21196", ++ "self_type" : "type-21195", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136838,8 +136880,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21326", +- "self_type" : "type-21325", ++ "referenced_type" : "type-21334", ++ "self_type" : "type-21333", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136847,8 +136889,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21398", +- "self_type" : "type-21397", ++ "referenced_type" : "type-21406", ++ "self_type" : "type-21405", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136856,8 +136898,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21637", +- "self_type" : "type-21636", ++ "referenced_type" : "type-21645", ++ "self_type" : "type-21644", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136865,8 +136907,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21811", +- "self_type" : "type-21810", ++ "referenced_type" : "type-21819", ++ "self_type" : "type-21818", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137990,8 +138032,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField, std::allocator > > *", + "name" : "google::protobuf::RepeatedPtrField, std::allocator > > *", +- "referenced_type" : "type-15985", +- "self_type" : "type-15984", ++ "referenced_type" : "type-16756", ++ "self_type" : "type-16755", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -137999,8 +138041,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField, std::allocator > > *", + "name" : "google::protobuf::RepeatedPtrField, std::allocator > > *", +- "referenced_type" : "type-18617", +- "self_type" : "type-18616", ++ "referenced_type" : "type-19395", ++ "self_type" : "type-19394", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -138008,8 +138050,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField, std::allocator > > *", + "name" : "google::protobuf::RepeatedPtrField, std::allocator > > *", +- "referenced_type" : "type-20517", +- "self_type" : "type-20516", ++ "referenced_type" : "type-20524", ++ "self_type" : "type-20523", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -138359,8 +138401,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-15393", +- "self_type" : "type-15392", ++ "referenced_type" : "type-1544", ++ "self_type" : "type-1543", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138368,8 +138410,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-1544", +- "self_type" : "type-1543", ++ "referenced_type" : "type-15581", ++ "self_type" : "type-15580", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138377,8 +138419,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-15441", +- "self_type" : "type-15440", ++ "referenced_type" : "type-15668", ++ "self_type" : "type-15667", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138395,8 +138437,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-16082", +- "self_type" : "type-16081", ++ "referenced_type" : "type-15737", ++ "self_type" : "type-15736", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138404,8 +138446,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-16674", +- "self_type" : "type-16673", ++ "referenced_type" : "type-15916", ++ "self_type" : "type-15915", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138413,8 +138455,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-17138", +- "self_type" : "type-17137", ++ "referenced_type" : "type-16078", ++ "self_type" : "type-16077", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138422,8 +138464,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-17675", +- "self_type" : "type-17674", ++ "referenced_type" : "type-16852", ++ "self_type" : "type-16851", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138431,8 +138473,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-17985", +- "self_type" : "type-17984", ++ "referenced_type" : "type-17444", ++ "self_type" : "type-17443", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138440,8 +138482,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-18094", +- "self_type" : "type-18093", ++ "referenced_type" : "type-17908", ++ "self_type" : "type-17907", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138449,8 +138491,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-18316", +- "self_type" : "type-18315", ++ "referenced_type" : "type-18453", ++ "self_type" : "type-18452", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138458,8 +138500,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-18424", +- "self_type" : "type-18423", ++ "referenced_type" : "type-18763", ++ "self_type" : "type-18762", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138467,8 +138509,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-19099", +- "self_type" : "type-19098", ++ "referenced_type" : "type-18872", ++ "self_type" : "type-18871", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138476,8 +138518,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-19337", +- "self_type" : "type-19336", ++ "referenced_type" : "type-19094", ++ "self_type" : "type-19093", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138485,8 +138527,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-19424", +- "self_type" : "type-19423", ++ "referenced_type" : "type-19202", ++ "self_type" : "type-19201", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138494,8 +138536,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-19493", +- "self_type" : "type-19492", ++ "referenced_type" : "type-19877", ++ "self_type" : "type-19876", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138503,8 +138545,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-19672", +- "self_type" : "type-19671", ++ "referenced_type" : "type-19926", ++ "self_type" : "type-19925", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138512,8 +138554,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-19834", +- "self_type" : "type-19833", ++ "referenced_type" : "type-19974", ++ "self_type" : "type-19973", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138521,8 +138563,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-20613", +- "self_type" : "type-20612", ++ "referenced_type" : "type-20621", ++ "self_type" : "type-20620", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138530,8 +138572,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-21206", +- "self_type" : "type-21205", ++ "referenced_type" : "type-21214", ++ "self_type" : "type-21213", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138539,8 +138581,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-21670", +- "self_type" : "type-21669", ++ "referenced_type" : "type-21678", ++ "self_type" : "type-21677", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -139304,8 +139346,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::TextFormat::Parser::ParserImpl *", + "name" : "google::protobuf::TextFormat::Parser::ParserImpl *", +- "referenced_type" : "type-17714", +- "self_type" : "type-17713", ++ "referenced_type" : "type-18492", ++ "self_type" : "type-18491", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, +@@ -139691,8 +139733,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-16519", +- "self_type" : "type-16518", ++ "referenced_type" : "type-17289", ++ "self_type" : "type-17288", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139700,8 +139742,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-16837", +- "self_type" : "type-16836", ++ "referenced_type" : "type-17607", ++ "self_type" : "type-17606", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139709,8 +139751,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-17159", +- "self_type" : "type-17158", ++ "referenced_type" : "type-17929", ++ "self_type" : "type-17928", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139718,8 +139760,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-17499", +- "self_type" : "type-17498", ++ "referenced_type" : "type-18277", ++ "self_type" : "type-18276", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139727,8 +139769,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-18816", +- "self_type" : "type-18815", ++ "referenced_type" : "type-19594", ++ "self_type" : "type-19593", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139736,8 +139778,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-21051", +- "self_type" : "type-21050", ++ "referenced_type" : "type-21059", ++ "self_type" : "type-21058", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139745,8 +139787,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-21369", +- "self_type" : "type-21368", ++ "referenced_type" : "type-21377", ++ "self_type" : "type-21376", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139754,8 +139796,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-21691", +- "self_type" : "type-21690", ++ "referenced_type" : "type-21699", ++ "self_type" : "type-21698", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139934,8 +139976,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > > *", + "name" : "google::protobuf::hash_map, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > > *", +- "referenced_type" : "type-19477", +- "self_type" : "type-19483", ++ "referenced_type" : "type-15721", ++ "self_type" : "type-15727", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -139979,8 +140021,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > > *", + "name" : "google::protobuf::hash_map, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > > *", +- "referenced_type" : "type-19317", +- "self_type" : "type-19341", ++ "referenced_type" : "type-15562", ++ "self_type" : "type-15585", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -140078,8 +140120,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_set, std::equal_to > *", + "name" : "google::protobuf::hash_set, std::equal_to > *", +- "referenced_type" : "type-19464", +- "self_type" : "type-19665", ++ "referenced_type" : "type-15708", ++ "self_type" : "type-15909", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -140285,8 +140327,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::FunctionResultCallback_1_1 *", + "name" : "google::protobuf::internal::FunctionResultCallback_1_1 *", +- "referenced_type" : "type-19438", +- "self_type" : "type-19473", ++ "referenced_type" : "type-15682", ++ "self_type" : "type-15717", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -140699,8 +140741,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-15707", +- "self_type" : "type-15706", ++ "referenced_type" : "type-15468", ++ "self_type" : "type-15467", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140708,8 +140750,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-15877", +- "self_type" : "type-15876", ++ "referenced_type" : "type-15618", ++ "self_type" : "type-15617", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140717,8 +140759,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-15980", +- "self_type" : "type-15979", ++ "referenced_type" : "type-15806", ++ "self_type" : "type-15805", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140726,8 +140768,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-16119", +- "self_type" : "type-16118", ++ "referenced_type" : "type-15976", ++ "self_type" : "type-15975", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140735,8 +140777,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-16268", +- "self_type" : "type-16267", ++ "referenced_type" : "type-16135", ++ "self_type" : "type-16134", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140744,8 +140786,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-16361", +- "self_type" : "type-16360", ++ "referenced_type" : "type-16480", ++ "self_type" : "type-16479", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140753,8 +140795,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-16461", +- "self_type" : "type-16460", ++ "referenced_type" : "type-16650", ++ "self_type" : "type-16649", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140762,8 +140804,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-16643", +- "self_type" : "type-16642", ++ "referenced_type" : "type-16751", ++ "self_type" : "type-16750", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140771,8 +140813,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-16723", +- "self_type" : "type-16722", ++ "referenced_type" : "type-16889", ++ "self_type" : "type-16888", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140780,8 +140822,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-16781", +- "self_type" : "type-16780", ++ "referenced_type" : "type-17038", ++ "self_type" : "type-17037", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140789,8 +140831,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-17253", +- "self_type" : "type-17252", ++ "referenced_type" : "type-17131", ++ "self_type" : "type-17130", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140798,8 +140840,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-17360", +- "self_type" : "type-17359", ++ "referenced_type" : "type-17231", ++ "self_type" : "type-17230", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140807,8 +140849,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-17704", +- "self_type" : "type-17703", ++ "referenced_type" : "type-17413", ++ "self_type" : "type-17412", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140816,8 +140858,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-17860", +- "self_type" : "type-17859", ++ "referenced_type" : "type-17493", ++ "self_type" : "type-17492", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140825,8 +140867,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-17948", +- "self_type" : "type-17947", ++ "referenced_type" : "type-17551", ++ "self_type" : "type-17550", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140834,8 +140876,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-18038", +- "self_type" : "type-18037", ++ "referenced_type" : "type-18023", ++ "self_type" : "type-18022", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140843,8 +140885,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-18121", +- "self_type" : "type-18120", ++ "referenced_type" : "type-18138", ++ "self_type" : "type-18137", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140852,8 +140894,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-18188", +- "self_type" : "type-18187", ++ "referenced_type" : "type-18482", ++ "self_type" : "type-18481", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140861,8 +140903,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-18350", +- "self_type" : "type-18349", ++ "referenced_type" : "type-18638", ++ "self_type" : "type-18637", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140870,8 +140912,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-18475", +- "self_type" : "type-18474", ++ "referenced_type" : "type-18726", ++ "self_type" : "type-18725", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140879,8 +140921,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-18610", +- "self_type" : "type-18609", ++ "referenced_type" : "type-18816", ++ "self_type" : "type-18815", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140888,8 +140930,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-18701", +- "self_type" : "type-18700", ++ "referenced_type" : "type-18899", ++ "self_type" : "type-18898", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140897,8 +140939,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-18980", +- "self_type" : "type-18979", ++ "referenced_type" : "type-18966", ++ "self_type" : "type-18965", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140906,8 +140948,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-19223", +- "self_type" : "type-19222", ++ "referenced_type" : "type-19128", ++ "self_type" : "type-19127", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140915,8 +140957,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-19374", +- "self_type" : "type-19373", ++ "referenced_type" : "type-19253", ++ "self_type" : "type-19252", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140924,8 +140966,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-19562", +- "self_type" : "type-19561", ++ "referenced_type" : "type-19388", ++ "self_type" : "type-19387", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140933,8 +140975,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-19732", +- "self_type" : "type-19731", ++ "referenced_type" : "type-19479", ++ "self_type" : "type-19478", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140942,8 +140984,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-19891", +- "self_type" : "type-19890", ++ "referenced_type" : "type-19758", ++ "self_type" : "type-19757", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140951,8 +140993,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-20240", +- "self_type" : "type-20239", ++ "referenced_type" : "type-20244", ++ "self_type" : "type-20243", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140960,8 +141002,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-20411", +- "self_type" : "type-20410", ++ "referenced_type" : "type-20415", ++ "self_type" : "type-20414", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140969,8 +141011,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-20512", +- "self_type" : "type-20511", ++ "referenced_type" : "type-20519", ++ "self_type" : "type-20518", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140978,8 +141020,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-20650", +- "self_type" : "type-20649", ++ "referenced_type" : "type-20658", ++ "self_type" : "type-20657", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140987,8 +141029,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-20799", +- "self_type" : "type-20798", ++ "referenced_type" : "type-20807", ++ "self_type" : "type-20806", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141005,8 +141047,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-20892", +- "self_type" : "type-20891", ++ "referenced_type" : "type-20900", ++ "self_type" : "type-20899", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141014,8 +141056,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-20993", +- "self_type" : "type-20992", ++ "referenced_type" : "type-21001", ++ "self_type" : "type-21000", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141023,8 +141065,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-21175", +- "self_type" : "type-21174", ++ "referenced_type" : "type-21183", ++ "self_type" : "type-21182", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141032,8 +141074,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-21255", +- "self_type" : "type-21254", ++ "referenced_type" : "type-21263", ++ "self_type" : "type-21262", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141041,8 +141083,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-21313", +- "self_type" : "type-21312", ++ "referenced_type" : "type-21321", ++ "self_type" : "type-21320", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141050,8 +141092,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-21785", +- "self_type" : "type-21784", ++ "referenced_type" : "type-21793", ++ "self_type" : "type-21792", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -142049,8 +142091,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MessageSetFieldSkipper *", + "name" : "google::protobuf::internal::MessageSetFieldSkipper *", +- "referenced_type" : "type-16712", +- "self_type" : "type-16711", ++ "referenced_type" : "type-17482", ++ "self_type" : "type-17481", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -142058,8 +142100,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MessageSetFieldSkipper *", + "name" : "google::protobuf::internal::MessageSetFieldSkipper *", +- "referenced_type" : "type-21244", +- "self_type" : "type-21243", ++ "referenced_type" : "type-21252", ++ "self_type" : "type-21251", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -143039,8 +143081,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15382", +- "self_type" : "type-15381", ++ "referenced_type" : "type-15456", ++ "self_type" : "type-15455", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143048,8 +143090,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15395", +- "self_type" : "type-15394", ++ "referenced_type" : "type-1546", ++ "self_type" : "type-1545", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143057,8 +143099,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15407", +- "self_type" : "type-15406", ++ "referenced_type" : "type-15461", ++ "self_type" : "type-15460", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143066,8 +143108,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15435", +- "self_type" : "type-15434", ++ "referenced_type" : "type-15548", ++ "self_type" : "type-15547", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143075,8 +143117,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15443", +- "self_type" : "type-15442", ++ "referenced_type" : "type-15553", ++ "self_type" : "type-15552", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143084,8 +143126,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-1546", +- "self_type" : "type-1545", ++ "referenced_type" : "type-15593", ++ "self_type" : "type-15592", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143093,8 +143135,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15476", +- "self_type" : "type-15475", ++ "referenced_type" : "type-15670", ++ "self_type" : "type-15669", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143102,8 +143144,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15505", +- "self_type" : "type-15504", ++ "referenced_type" : "type-1580", ++ "self_type" : "type-1579", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143111,8 +143153,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15641", +- "self_type" : "type-15640", ++ "referenced_type" : "type-15847", ++ "self_type" : "type-15846", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143120,8 +143162,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-1580", +- "self_type" : "type-1579", ++ "referenced_type" : "type-15901", ++ "self_type" : "type-15900", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143129,8 +143171,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15806", +- "self_type" : "type-15805", ++ "referenced_type" : "type-16043", ++ "self_type" : "type-16042", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143138,8 +143180,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15810", +- "self_type" : "type-15809", ++ "referenced_type" : "type-16060", ++ "self_type" : "type-16059", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143147,8 +143189,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15853", +- "self_type" : "type-15852", ++ "referenced_type" : "type-16091", ++ "self_type" : "type-16090", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143156,8 +143198,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15926", +- "self_type" : "type-15925", ++ "referenced_type" : "type-16145", ++ "self_type" : "type-16144", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143165,8 +143207,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15970", +- "self_type" : "type-15969", ++ "referenced_type" : "type-16249", ++ "self_type" : "type-16248", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143174,8 +143216,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16000", +- "self_type" : "type-15999", ++ "referenced_type" : "type-16278", ++ "self_type" : "type-16277", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143183,8 +143225,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16110", +- "self_type" : "type-16109", ++ "referenced_type" : "type-16414", ++ "self_type" : "type-16413", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143192,8 +143234,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16112", +- "self_type" : "type-16111", ++ "referenced_type" : "type-16579", ++ "self_type" : "type-16578", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143201,8 +143243,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16231", +- "self_type" : "type-16230", ++ "referenced_type" : "type-16583", ++ "self_type" : "type-16582", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143210,8 +143252,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16241", +- "self_type" : "type-16240", ++ "referenced_type" : "type-166", ++ "self_type" : "type-165", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143219,8 +143261,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16322", +- "self_type" : "type-16321", ++ "referenced_type" : "type-16626", ++ "self_type" : "type-16625", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143228,8 +143270,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16328", +- "self_type" : "type-16327", ++ "referenced_type" : "type-16697", ++ "self_type" : "type-16696", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143237,8 +143279,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16354", +- "self_type" : "type-16353", ++ "referenced_type" : "type-16741", ++ "self_type" : "type-16740", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143246,8 +143288,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16435", +- "self_type" : "type-16434", ++ "referenced_type" : "type-16771", ++ "self_type" : "type-16770", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143255,8 +143297,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16561", +- "self_type" : "type-16560", ++ "referenced_type" : "type-16880", ++ "self_type" : "type-16879", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143264,8 +143306,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16569", +- "self_type" : "type-16568", ++ "referenced_type" : "type-16882", ++ "self_type" : "type-16881", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143273,8 +143315,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-166", +- "self_type" : "type-165", ++ "referenced_type" : "type-17001", ++ "self_type" : "type-17000", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143282,8 +143324,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16613", +- "self_type" : "type-16612", ++ "referenced_type" : "type-17011", ++ "self_type" : "type-17010", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143291,8 +143333,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16671", +- "self_type" : "type-16670", ++ "referenced_type" : "type-17092", ++ "self_type" : "type-17091", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143300,8 +143342,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16683", +- "self_type" : "type-16682", ++ "referenced_type" : "type-17098", ++ "self_type" : "type-17097", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143309,8 +143351,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16743", +- "self_type" : "type-16742", ++ "referenced_type" : "type-17124", ++ "self_type" : "type-17123", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143318,8 +143360,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16774", +- "self_type" : "type-16773", ++ "referenced_type" : "type-17205", ++ "self_type" : "type-17204", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143327,8 +143369,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16824", +- "self_type" : "type-16823", ++ "referenced_type" : "type-17331", ++ "self_type" : "type-17330", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143336,8 +143378,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16862", +- "self_type" : "type-16861", ++ "referenced_type" : "type-17339", ++ "self_type" : "type-17338", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143345,8 +143387,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16893", +- "self_type" : "type-16892", ++ "referenced_type" : "type-17383", ++ "self_type" : "type-17382", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143354,8 +143396,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16915", +- "self_type" : "type-16914", ++ "referenced_type" : "type-17441", ++ "self_type" : "type-17440", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143363,8 +143405,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17141", +- "self_type" : "type-17140", ++ "referenced_type" : "type-17453", ++ "self_type" : "type-17452", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143372,8 +143414,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17234", +- "self_type" : "type-17233", ++ "referenced_type" : "type-17513", ++ "self_type" : "type-17512", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143381,8 +143423,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17312", +- "self_type" : "type-17311", ++ "referenced_type" : "type-17544", ++ "self_type" : "type-17543", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143390,8 +143432,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17324", +- "self_type" : "type-17323", ++ "referenced_type" : "type-17594", ++ "self_type" : "type-17593", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143399,8 +143441,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17389", +- "self_type" : "type-17388", ++ "referenced_type" : "type-17632", ++ "self_type" : "type-17631", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143408,8 +143450,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17481", +- "self_type" : "type-17480", ++ "referenced_type" : "type-1764", ++ "self_type" : "type-1763", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143417,8 +143459,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17638", +- "self_type" : "type-17637", ++ "referenced_type" : "type-17663", ++ "self_type" : "type-17662", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143426,8 +143468,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-1764", +- "self_type" : "type-1763", ++ "referenced_type" : "type-17685", ++ "self_type" : "type-17684", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143435,8 +143477,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17691", +- "self_type" : "type-17690", ++ "referenced_type" : "type-177", ++ "self_type" : "type-176", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143444,8 +143486,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-177", +- "self_type" : "type-176", ++ "referenced_type" : "type-17911", ++ "self_type" : "type-17910", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143453,8 +143495,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17820", +- "self_type" : "type-17819", ++ "referenced_type" : "type-18004", ++ "self_type" : "type-18003", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143462,8 +143504,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17906", +- "self_type" : "type-17905", ++ "referenced_type" : "type-18082", ++ "self_type" : "type-18081", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143471,8 +143513,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18004", +- "self_type" : "type-18003", ++ "referenced_type" : "type-18094", ++ "self_type" : "type-18093", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143480,8 +143522,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18099", +- "self_type" : "type-18098", ++ "referenced_type" : "type-18167", ++ "self_type" : "type-18166", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143489,8 +143531,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18149", +- "self_type" : "type-18148", ++ "referenced_type" : "type-18259", ++ "self_type" : "type-18258", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143498,8 +143540,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18154", +- "self_type" : "type-18153", ++ "referenced_type" : "type-18416", ++ "self_type" : "type-18415", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143507,8 +143549,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18172", +- "self_type" : "type-18171", ++ "referenced_type" : "type-18469", ++ "self_type" : "type-18468", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143516,8 +143558,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18255", +- "self_type" : "type-18254", ++ "referenced_type" : "type-18598", ++ "self_type" : "type-18597", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143525,8 +143567,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18269", +- "self_type" : "type-18268", ++ "referenced_type" : "type-18684", ++ "self_type" : "type-18683", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143534,8 +143576,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18290", +- "self_type" : "type-18289", ++ "referenced_type" : "type-18782", ++ "self_type" : "type-18781", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143543,8 +143585,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18299", +- "self_type" : "type-18298", ++ "referenced_type" : "type-18877", ++ "self_type" : "type-18876", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143552,8 +143594,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18330", +- "self_type" : "type-18329", ++ "referenced_type" : "type-18927", ++ "self_type" : "type-18926", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143561,8 +143603,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18445", +- "self_type" : "type-18444", ++ "referenced_type" : "type-18932", ++ "self_type" : "type-18931", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143570,8 +143612,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18453", +- "self_type" : "type-18452", ++ "referenced_type" : "type-18950", ++ "self_type" : "type-18949", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143579,8 +143621,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18626", +- "self_type" : "type-18625", ++ "referenced_type" : "type-190", ++ "self_type" : "type-189", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143588,8 +143630,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18670", +- "self_type" : "type-18669", ++ "referenced_type" : "type-19033", ++ "self_type" : "type-19032", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143597,8 +143639,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18694", +- "self_type" : "type-18693", ++ "referenced_type" : "type-19047", ++ "self_type" : "type-19046", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143606,8 +143648,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18780", +- "self_type" : "type-18779", ++ "referenced_type" : "type-19068", ++ "self_type" : "type-19067", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143615,8 +143657,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18991", +- "self_type" : "type-18990", ++ "referenced_type" : "type-19077", ++ "self_type" : "type-19076", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143624,8 +143666,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-190", +- "self_type" : "type-189", ++ "referenced_type" : "type-19108", ++ "self_type" : "type-19107", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143633,8 +143675,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19101", +- "self_type" : "type-19100", ++ "referenced_type" : "type-19223", ++ "self_type" : "type-19222", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143642,8 +143684,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19114", +- "self_type" : "type-19113", ++ "referenced_type" : "type-19231", ++ "self_type" : "type-19230", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143651,8 +143693,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19123", +- "self_type" : "type-19122", ++ "referenced_type" : "type-19404", ++ "self_type" : "type-19403", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143660,8 +143702,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19211", +- "self_type" : "type-19210", ++ "referenced_type" : "type-19448", ++ "self_type" : "type-19447", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143669,8 +143711,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19216", +- "self_type" : "type-19215", ++ "referenced_type" : "type-19472", ++ "self_type" : "type-19471", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143678,8 +143720,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19303", +- "self_type" : "type-19302", ++ "referenced_type" : "type-19558", ++ "self_type" : "type-19557", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143687,8 +143729,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19308", +- "self_type" : "type-19307", ++ "referenced_type" : "type-19769", ++ "self_type" : "type-19768", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143696,8 +143738,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19349", +- "self_type" : "type-19348", ++ "referenced_type" : "type-19879", ++ "self_type" : "type-19878", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143705,8 +143747,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19426", +- "self_type" : "type-19425", ++ "referenced_type" : "type-1989", ++ "self_type" : "type-1988", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143714,8 +143756,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19603", +- "self_type" : "type-19602", ++ "referenced_type" : "type-19892", ++ "self_type" : "type-19891", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143723,8 +143765,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19657", +- "self_type" : "type-19656", ++ "referenced_type" : "type-19901", ++ "self_type" : "type-19900", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143732,8 +143774,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19799", +- "self_type" : "type-19798", ++ "referenced_type" : "type-19915", ++ "self_type" : "type-19914", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143741,8 +143783,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19816", +- "self_type" : "type-19815", ++ "referenced_type" : "type-19928", ++ "self_type" : "type-19927", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143750,8 +143792,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19847", +- "self_type" : "type-19846", ++ "referenced_type" : "type-19940", ++ "self_type" : "type-19939", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143759,8 +143801,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-1989", +- "self_type" : "type-1988", ++ "referenced_type" : "type-19968", ++ "self_type" : "type-19967", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143768,8 +143810,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19901", +- "self_type" : "type-19900", ++ "referenced_type" : "type-19976", ++ "self_type" : "type-19975", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143777,8 +143819,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20005", +- "self_type" : "type-20004", ++ "referenced_type" : "type-20009", ++ "self_type" : "type-20008", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143786,8 +143828,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20038", +- "self_type" : "type-20037", ++ "referenced_type" : "type-20042", ++ "self_type" : "type-20041", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143795,8 +143837,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20174", +- "self_type" : "type-20173", ++ "referenced_type" : "type-20178", ++ "self_type" : "type-20177", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143804,8 +143846,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20340", +- "self_type" : "type-20339", ++ "referenced_type" : "type-20344", ++ "self_type" : "type-20343", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143813,8 +143855,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20344", +- "self_type" : "type-20343", ++ "referenced_type" : "type-20348", ++ "self_type" : "type-20347", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143822,8 +143864,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20387", +- "self_type" : "type-20386", ++ "referenced_type" : "type-20391", ++ "self_type" : "type-20390", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143831,8 +143873,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20458", +- "self_type" : "type-20457", ++ "referenced_type" : "type-20465", ++ "self_type" : "type-20464", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143849,8 +143891,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20502", +- "self_type" : "type-20501", ++ "referenced_type" : "type-20509", ++ "self_type" : "type-20508", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143858,8 +143900,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20532", +- "self_type" : "type-20531", ++ "referenced_type" : "type-20539", ++ "self_type" : "type-20538", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143867,8 +143909,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20641", +- "self_type" : "type-20640", ++ "referenced_type" : "type-20649", ++ "self_type" : "type-20648", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143876,8 +143918,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20643", +- "self_type" : "type-20642", ++ "referenced_type" : "type-20651", ++ "self_type" : "type-20650", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143885,8 +143927,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20762", +- "self_type" : "type-20761", ++ "referenced_type" : "type-20770", ++ "self_type" : "type-20769", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143894,8 +143936,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20772", +- "self_type" : "type-20771", ++ "referenced_type" : "type-20780", ++ "self_type" : "type-20779", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143903,8 +143945,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20853", +- "self_type" : "type-20852", ++ "referenced_type" : "type-20861", ++ "self_type" : "type-20860", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143912,8 +143954,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20859", +- "self_type" : "type-20858", ++ "referenced_type" : "type-20867", ++ "self_type" : "type-20866", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143921,8 +143963,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20885", +- "self_type" : "type-20884", ++ "referenced_type" : "type-20893", ++ "self_type" : "type-20892", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143930,8 +143972,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20966", +- "self_type" : "type-20965", ++ "referenced_type" : "type-20974", ++ "self_type" : "type-20973", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143939,8 +143981,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21093", +- "self_type" : "type-21092", ++ "referenced_type" : "type-21101", ++ "self_type" : "type-21100", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143948,8 +143990,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21101", +- "self_type" : "type-21100", ++ "referenced_type" : "type-21109", ++ "self_type" : "type-21108", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143957,8 +143999,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21145", +- "self_type" : "type-21144", ++ "referenced_type" : "type-21153", ++ "self_type" : "type-21152", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143966,8 +144008,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21203", +- "self_type" : "type-21202", ++ "referenced_type" : "type-21211", ++ "self_type" : "type-21210", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143975,8 +144017,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21215", +- "self_type" : "type-21214", ++ "referenced_type" : "type-21223", ++ "self_type" : "type-21222", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143984,8 +144026,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21275", +- "self_type" : "type-21274", ++ "referenced_type" : "type-21283", ++ "self_type" : "type-21282", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143993,8 +144035,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21306", +- "self_type" : "type-21305", ++ "referenced_type" : "type-21314", ++ "self_type" : "type-21313", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144002,8 +144044,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21356", +- "self_type" : "type-21355", ++ "referenced_type" : "type-21364", ++ "self_type" : "type-21363", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144011,8 +144053,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21394", +- "self_type" : "type-21393", ++ "referenced_type" : "type-21402", ++ "self_type" : "type-21401", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144020,8 +144062,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21425", +- "self_type" : "type-21424", ++ "referenced_type" : "type-21433", ++ "self_type" : "type-21432", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144029,8 +144071,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21447", +- "self_type" : "type-21446", ++ "referenced_type" : "type-21455", ++ "self_type" : "type-21454", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144038,8 +144080,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21673", +- "self_type" : "type-21672", ++ "referenced_type" : "type-21681", ++ "self_type" : "type-21680", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144047,8 +144089,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21766", +- "self_type" : "type-21765", ++ "referenced_type" : "type-21774", ++ "self_type" : "type-21773", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144056,8 +144098,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21844", +- "self_type" : "type-21843", ++ "referenced_type" : "type-21852", ++ "self_type" : "type-21851", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144065,8 +144107,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21856", +- "self_type" : "type-21855", ++ "referenced_type" : "type-21864", ++ "self_type" : "type-21863", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -147350,8 +147392,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19875", +- "self_type" : "type-19883", ++ "referenced_type" : "type-16119", ++ "self_type" : "type-16127", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147368,8 +147410,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr > *", + "name" : "google::protobuf::internal::scoped_ptr > *", +- "referenced_type" : "type-19633", +- "self_type" : "type-19634", ++ "referenced_type" : "type-15877", ++ "self_type" : "type-15878", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147404,8 +147446,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19842", +- "self_type" : "type-19856", ++ "referenced_type" : "type-16086", ++ "self_type" : "type-16100", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147431,8 +147473,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19469", +- "self_type" : "type-19724", ++ "referenced_type" : "type-15713", ++ "self_type" : "type-15968", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147467,8 +147509,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19150", +- "self_type" : "type-19170", ++ "referenced_type" : "type-15395", ++ "self_type" : "type-15415", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147476,8 +147518,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19470", +- "self_type" : "type-19746", ++ "referenced_type" : "type-15714", ++ "self_type" : "type-15990", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147485,8 +147527,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19446", +- "self_type" : "type-19627", ++ "referenced_type" : "type-15690", ++ "self_type" : "type-15871", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147494,8 +147536,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19443", +- "self_type" : "type-19630", ++ "referenced_type" : "type-15687", ++ "self_type" : "type-15874", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147503,8 +147545,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19449", +- "self_type" : "type-19575", ++ "referenced_type" : "type-15693", ++ "self_type" : "type-15819", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147512,8 +147554,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19459", +- "self_type" : "type-19715", ++ "referenced_type" : "type-15703", ++ "self_type" : "type-15959", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147521,8 +147563,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19140", +- "self_type" : "type-19154", ++ "referenced_type" : "type-15385", ++ "self_type" : "type-15399", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -148034,8 +148076,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-15737", +- "self_type" : "type-15736", ++ "referenced_type" : "type-15378", ++ "self_type" : "type-15377", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148043,8 +148085,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-15802", +- "self_type" : "type-15801", ++ "referenced_type" : "type-16510", ++ "self_type" : "type-16509", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148052,8 +148094,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-16292", +- "self_type" : "type-16291", ++ "referenced_type" : "type-16575", ++ "self_type" : "type-16574", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148061,8 +148103,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-16428", +- "self_type" : "type-16427", ++ "referenced_type" : "type-17062", ++ "self_type" : "type-17061", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148070,8 +148112,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-16488", +- "self_type" : "type-16487", ++ "referenced_type" : "type-17198", ++ "self_type" : "type-17197", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148079,8 +148121,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-16601", +- "self_type" : "type-16600", ++ "referenced_type" : "type-17258", ++ "self_type" : "type-17257", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148088,8 +148130,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-16667", +- "self_type" : "type-16666", ++ "referenced_type" : "type-17371", ++ "self_type" : "type-17370", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148097,8 +148139,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-16805", +- "self_type" : "type-16804", ++ "referenced_type" : "type-17437", ++ "self_type" : "type-17436", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148106,8 +148148,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-16884", +- "self_type" : "type-16883", ++ "referenced_type" : "type-17575", ++ "self_type" : "type-17574", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148115,8 +148157,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-17053", +- "self_type" : "type-17052", ++ "referenced_type" : "type-17654", ++ "self_type" : "type-17653", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148124,8 +148166,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-17382", +- "self_type" : "type-17381", ++ "referenced_type" : "type-17823", ++ "self_type" : "type-17822", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148133,8 +148175,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-17428", +- "self_type" : "type-17427", ++ "referenced_type" : "type-18160", ++ "self_type" : "type-18159", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148142,8 +148184,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-17888", +- "self_type" : "type-17887", ++ "referenced_type" : "type-18206", ++ "self_type" : "type-18205", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148151,8 +148193,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-17902", +- "self_type" : "type-17901", ++ "referenced_type" : "type-18666", ++ "self_type" : "type-18665", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148160,8 +148202,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-17979", +- "self_type" : "type-17978", ++ "referenced_type" : "type-18680", ++ "self_type" : "type-18679", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148169,8 +148211,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-18248", +- "self_type" : "type-18247", ++ "referenced_type" : "type-18757", ++ "self_type" : "type-18756", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148178,26 +148220,26 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-18528", +- "self_type" : "type-18527", ++ "referenced_type" : "type-19026", ++ "self_type" : "type-19025", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-18892", +- "self_type" : "type-18891", ++ "referenced_type" : "type-19306", ++ "self_type" : "type-19305", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" + }, + { + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-19133", +- "self_type" : "type-19132", ++ "referenced_type" : "type-19670", ++ "self_type" : "type-19669", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148205,8 +148247,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-20271", +- "self_type" : "type-20270", ++ "referenced_type" : "type-20275", ++ "self_type" : "type-20274", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148214,8 +148256,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-20336", +- "self_type" : "type-20335", ++ "referenced_type" : "type-20340", ++ "self_type" : "type-20339", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148223,8 +148265,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-20823", +- "self_type" : "type-20822", ++ "referenced_type" : "type-20831", ++ "self_type" : "type-20830", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148232,8 +148274,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-20959", +- "self_type" : "type-20958", ++ "referenced_type" : "type-20967", ++ "self_type" : "type-20966", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148241,8 +148283,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-21020", +- "self_type" : "type-21019", ++ "referenced_type" : "type-21028", ++ "self_type" : "type-21027", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148250,8 +148292,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-21133", +- "self_type" : "type-21132", ++ "referenced_type" : "type-21141", ++ "self_type" : "type-21140", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148268,8 +148310,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-21199", +- "self_type" : "type-21198", ++ "referenced_type" : "type-21207", ++ "self_type" : "type-21206", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148277,8 +148319,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-21337", +- "self_type" : "type-21336", ++ "referenced_type" : "type-21345", ++ "self_type" : "type-21344", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148286,8 +148328,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-21416", +- "self_type" : "type-21415", ++ "referenced_type" : "type-21424", ++ "self_type" : "type-21423", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148295,8 +148337,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-21585", +- "self_type" : "type-21584", ++ "referenced_type" : "type-21593", ++ "self_type" : "type-21592", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149231,8 +149273,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-15739", +- "self_type" : "type-15738", ++ "referenced_type" : "type-15380", ++ "self_type" : "type-15379", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149240,8 +149282,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-15804", +- "self_type" : "type-15803", ++ "referenced_type" : "type-16512", ++ "self_type" : "type-16511", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149249,8 +149291,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-16294", +- "self_type" : "type-16293", ++ "referenced_type" : "type-16577", ++ "self_type" : "type-16576", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149258,8 +149300,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-16320", +- "self_type" : "type-16319", ++ "referenced_type" : "type-17064", ++ "self_type" : "type-17063", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149267,8 +149309,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-16490", +- "self_type" : "type-16489", ++ "referenced_type" : "type-17090", ++ "self_type" : "type-17089", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149276,8 +149318,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-16603", +- "self_type" : "type-16602", ++ "referenced_type" : "type-17260", ++ "self_type" : "type-17259", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149285,8 +149327,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-16669", +- "self_type" : "type-16668", ++ "referenced_type" : "type-17373", ++ "self_type" : "type-17372", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149294,8 +149336,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-16807", +- "self_type" : "type-16806", ++ "referenced_type" : "type-17439", ++ "self_type" : "type-17438", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149303,8 +149345,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-16886", +- "self_type" : "type-16885", ++ "referenced_type" : "type-17577", ++ "self_type" : "type-17576", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149312,8 +149354,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-17055", +- "self_type" : "type-17054", ++ "referenced_type" : "type-17656", ++ "self_type" : "type-17655", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149321,8 +149363,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-17384", +- "self_type" : "type-17383", ++ "referenced_type" : "type-17825", ++ "self_type" : "type-17824", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149330,8 +149372,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-17430", +- "self_type" : "type-17429", ++ "referenced_type" : "type-18162", ++ "self_type" : "type-18161", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149339,8 +149381,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-17890", +- "self_type" : "type-17889", ++ "referenced_type" : "type-18208", ++ "self_type" : "type-18207", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149348,8 +149390,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-17921", +- "self_type" : "type-17920", ++ "referenced_type" : "type-18668", ++ "self_type" : "type-18667", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149357,8 +149399,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-17981", +- "self_type" : "type-17980", ++ "referenced_type" : "type-18699", ++ "self_type" : "type-18698", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149366,8 +149408,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-18250", +- "self_type" : "type-18249", ++ "referenced_type" : "type-18759", ++ "self_type" : "type-18758", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149375,8 +149417,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-18543", +- "self_type" : "type-18542", ++ "referenced_type" : "type-19028", ++ "self_type" : "type-19027", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149384,8 +149426,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-18894", +- "self_type" : "type-18893", ++ "referenced_type" : "type-19321", ++ "self_type" : "type-19320", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149393,8 +149435,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-19135", +- "self_type" : "type-19134", ++ "referenced_type" : "type-19672", ++ "self_type" : "type-19671", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149402,8 +149444,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-20273", +- "self_type" : "type-20272", ++ "referenced_type" : "type-20277", ++ "self_type" : "type-20276", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149411,8 +149453,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-20338", +- "self_type" : "type-20337", ++ "referenced_type" : "type-20342", ++ "self_type" : "type-20341", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149420,8 +149462,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-20825", +- "self_type" : "type-20824", ++ "referenced_type" : "type-20833", ++ "self_type" : "type-20832", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149429,8 +149471,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-20851", +- "self_type" : "type-20850", ++ "referenced_type" : "type-20859", ++ "self_type" : "type-20858", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149438,8 +149480,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-21022", +- "self_type" : "type-21021", ++ "referenced_type" : "type-21030", ++ "self_type" : "type-21029", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149447,8 +149489,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-21135", +- "self_type" : "type-21134", ++ "referenced_type" : "type-21143", ++ "self_type" : "type-21142", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149456,8 +149498,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-21201", +- "self_type" : "type-21200", ++ "referenced_type" : "type-21209", ++ "self_type" : "type-21208", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149474,8 +149516,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-21339", +- "self_type" : "type-21338", ++ "referenced_type" : "type-21347", ++ "self_type" : "type-21346", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149483,8 +149525,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-21418", +- "self_type" : "type-21417", ++ "referenced_type" : "type-21426", ++ "self_type" : "type-21425", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149492,8 +149534,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-21587", +- "self_type" : "type-21586", ++ "referenced_type" : "type-21595", ++ "self_type" : "type-21594", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -150410,8 +150452,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::Status (*)(const google::protobuf::util::converter::ProtoStreamObjectSource *, const google::protobuf::Type &, google::protobuf::StringPiece, google::protobuf::util::converter::ObjectWriter *)", + "name" : "google::protobuf::util::Status (*)(const google::protobuf::util::converter::ProtoStreamObjectSource *, const google::protobuf::Type &, google::protobuf::StringPiece, google::protobuf::util::converter::ObjectWriter *)", +- "referenced_type" : "type-19321", +- "self_type" : "type-19320", ++ "referenced_type" : "type-15566", ++ "self_type" : "type-15565", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -150419,8 +150461,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::Status (*)(google::protobuf::util::converter::ProtoStreamObjectWriter *, const google::protobuf::util::converter::DataPiece &)", + "name" : "google::protobuf::util::Status (*)(google::protobuf::util::converter::ProtoStreamObjectWriter *, const google::protobuf::util::converter::DataPiece &)", +- "referenced_type" : "type-19454", +- "self_type" : "type-19453", ++ "referenced_type" : "type-15698", ++ "self_type" : "type-15697", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -150428,8 +150470,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::Status (*)(google::protobuf::util::converter::ProtoStreamObjectWriter *, google::protobuf::StringPiece)", + "name" : "google::protobuf::util::Status (*)(google::protobuf::util::converter::ProtoStreamObjectWriter *, google::protobuf::StringPiece)", +- "referenced_type" : "type-19440", +- "self_type" : "type-19439", ++ "referenced_type" : "type-15684", ++ "self_type" : "type-15683", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -150437,8 +150479,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::Status (**)(const google::protobuf::util::converter::ProtoStreamObjectSource *, const google::protobuf::Type &, google::protobuf::StringPiece, google::protobuf::util::converter::ObjectWriter *)", + "name" : "google::protobuf::util::Status (**)(const google::protobuf::util::converter::ProtoStreamObjectSource *, const google::protobuf::Type &, google::protobuf::StringPiece, google::protobuf::util::converter::ObjectWriter *)", +- "referenced_type" : "type-19320", +- "self_type" : "type-19431", ++ "referenced_type" : "type-15565", ++ "self_type" : "type-15675", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h" + }, +@@ -150446,8 +150488,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::Status (**)(google::protobuf::util::converter::ProtoStreamObjectWriter *, const google::protobuf::util::converter::DataPiece &)", + "name" : "google::protobuf::util::Status (**)(google::protobuf::util::converter::ProtoStreamObjectWriter *, const google::protobuf::util::converter::DataPiece &)", +- "referenced_type" : "type-19453", +- "self_type" : "type-19452", ++ "referenced_type" : "type-15697", ++ "self_type" : "type-15696", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, +@@ -150473,8 +150515,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::StatusOr *", + "name" : "google::protobuf::util::StatusOr *", +- "referenced_type" : "type-19955", +- "self_type" : "type-19956", ++ "referenced_type" : "type-16199", ++ "self_type" : "type-16200", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -150483,7 +150525,7 @@ + "linker_set_key" : "google::protobuf::util::StatusOr *", + "name" : "google::protobuf::util::StatusOr *", + "referenced_type" : "type-15277", +- "self_type" : "type-19952", ++ "self_type" : "type-16196", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -150608,8 +150650,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::JsonObjectWriter *", + "name" : "google::protobuf::util::converter::JsonObjectWriter *", +- "referenced_type" : "type-19149", +- "self_type" : "type-19152", ++ "referenced_type" : "type-15394", ++ "self_type" : "type-15397", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, +@@ -150617,8 +150659,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::JsonObjectWriter::ByteSinkWrapper *", + "name" : "google::protobuf::util::converter::JsonObjectWriter::ByteSinkWrapper *", +- "referenced_type" : "type-19151", +- "self_type" : "type-19153", ++ "referenced_type" : "type-15396", ++ "self_type" : "type-15398", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, +@@ -150626,8 +150668,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::JsonObjectWriter::Element *", + "name" : "google::protobuf::util::converter::JsonObjectWriter::Element *", +- "referenced_type" : "type-19138", +- "self_type" : "type-19137", ++ "referenced_type" : "type-15383", ++ "self_type" : "type-15382", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -150635,8 +150677,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::JsonStreamParser *", + "name" : "google::protobuf::util::converter::JsonStreamParser *", +- "referenced_type" : "type-19283", +- "self_type" : "type-19289", ++ "referenced_type" : "type-15528", ++ "self_type" : "type-15534", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h" + }, +@@ -150644,8 +150686,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::JsonStreamParser::NumberResult *", + "name" : "google::protobuf::util::converter::JsonStreamParser::NumberResult *", +- "referenced_type" : "type-19292", +- "self_type" : "type-19295", ++ "referenced_type" : "type-15537", ++ "self_type" : "type-15540", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h" + }, +@@ -150671,8 +150713,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ObjectLocationTracker *", + "name" : "google::protobuf::util::converter::ObjectLocationTracker *", +- "referenced_type" : "type-19644", +- "self_type" : "type-19645", ++ "referenced_type" : "type-15888", ++ "self_type" : "type-15889", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/object_location_tracker.h" + }, +@@ -150680,8 +150722,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ObjectSource *", + "name" : "google::protobuf::util::converter::ObjectSource *", +- "referenced_type" : "type-19326", +- "self_type" : "type-19427", ++ "referenced_type" : "type-15570", ++ "self_type" : "type-15671", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/object_source.h" + }, +@@ -150698,8 +150740,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectSource *", + "name" : "google::protobuf::util::converter::ProtoStreamObjectSource *", +- "referenced_type" : "type-19324", +- "self_type" : "type-19430", ++ "referenced_type" : "type-15569", ++ "self_type" : "type-15674", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h" + }, +@@ -150707,8 +150749,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectWriter *", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter *", +- "referenced_type" : "type-19442", +- "self_type" : "type-19441", ++ "referenced_type" : "type-15686", ++ "self_type" : "type-15685", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -150716,8 +150758,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectWriter::AnyWriter *", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter::AnyWriter *", +- "referenced_type" : "type-19448", +- "self_type" : "type-19447", ++ "referenced_type" : "type-15692", ++ "self_type" : "type-15691", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -150725,8 +150767,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Item *", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Item *", +- "referenced_type" : "type-19445", +- "self_type" : "type-19444", ++ "referenced_type" : "type-15689", ++ "self_type" : "type-15688", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -150734,8 +150776,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Options *", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Options *", +- "referenced_type" : "type-19457", +- "self_type" : "type-19639", ++ "referenced_type" : "type-15701", ++ "self_type" : "type-15883", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, +@@ -150743,8 +150785,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoWriter *", + "name" : "google::protobuf::util::converter::ProtoWriter *", +- "referenced_type" : "type-19458", +- "self_type" : "type-19462", ++ "referenced_type" : "type-15702", ++ "self_type" : "type-15706", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, +@@ -150752,8 +150794,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoWriter::ProtoElement *", + "name" : "google::protobuf::util::converter::ProtoWriter::ProtoElement *", +- "referenced_type" : "type-19461", +- "self_type" : "type-19460", ++ "referenced_type" : "type-15705", ++ "self_type" : "type-15704", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -150761,8 +150803,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::StructuredObjectWriter *", + "name" : "google::protobuf::util::converter::StructuredObjectWriter *", +- "referenced_type" : "type-19143", +- "self_type" : "type-19144", ++ "referenced_type" : "type-15388", ++ "self_type" : "type-15389", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/structured_objectwriter.h" + }, +@@ -150770,8 +150812,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::StructuredObjectWriter::BaseElement *", + "name" : "google::protobuf::util::converter::StructuredObjectWriter::BaseElement *", +- "referenced_type" : "type-19139", +- "self_type" : "type-19141", ++ "referenced_type" : "type-15384", ++ "self_type" : "type-15386", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -150851,8 +150893,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node *", + "name" : "std::__tree_node *", +- "referenced_type" : "type-16939", +- "self_type" : "type-16938", ++ "referenced_type" : "type-17709", ++ "self_type" : "type-17708", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -150860,8 +150902,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node *", + "name" : "std::__tree_node *", +- "referenced_type" : "type-21471", +- "self_type" : "type-21470", ++ "referenced_type" : "type-21479", ++ "self_type" : "type-21478", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -150914,8 +150956,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node *>, void *> *", + "name" : "std::__tree_node *>, void *> *", +- "referenced_type" : "type-16929", +- "self_type" : "type-16928", ++ "referenced_type" : "type-17699", ++ "self_type" : "type-17698", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -150923,8 +150965,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node *>, void *> *", + "name" : "std::__tree_node *>, void *> *", +- "referenced_type" : "type-21461", +- "self_type" : "type-21460", ++ "referenced_type" : "type-21469", ++ "self_type" : "type-21468", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -150995,8 +151037,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", + "name" : "std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", +- "referenced_type" : "type-17512", +- "self_type" : "type-17511", ++ "referenced_type" : "type-18290", ++ "self_type" : "type-18289", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -151004,8 +151046,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", + "name" : "std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", +- "referenced_type" : "type-18818", +- "self_type" : "type-18817", ++ "referenced_type" : "type-19596", ++ "self_type" : "type-19595", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -151085,8 +151127,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node, std::allocator > *, void *> *", + "name" : "std::__tree_node, std::allocator > *, void *> *", +- "referenced_type" : "type-17521", +- "self_type" : "type-17520", ++ "referenced_type" : "type-18299", ++ "self_type" : "type-18298", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -151094,8 +151136,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node, std::allocator > *, void *> *", + "name" : "std::__tree_node, std::allocator > *, void *> *", +- "referenced_type" : "type-18820", +- "self_type" : "type-18819", ++ "referenced_type" : "type-19598", ++ "self_type" : "type-19597", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -151256,8 +151298,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-15420", +- "self_type" : "type-15419", ++ "referenced_type" : "type-15677", ++ "self_type" : "type-15676", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151265,8 +151307,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-16004", +- "self_type" : "type-16003", ++ "referenced_type" : "type-15740", ++ "self_type" : "type-15739", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151274,17 +151316,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-17172", +- "self_type" : "type-17171", ++ "referenced_type" : "type-15911", ++ "self_type" : "type-15910", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-17733", +- "self_type" : "type-17732", ++ "referenced_type" : "type-16002", ++ "self_type" : "type-16001", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151292,8 +151334,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-18000", +- "self_type" : "type-17999", ++ "referenced_type" : "type-16775", ++ "self_type" : "type-16774", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151301,17 +151343,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-18141", +- "self_type" : "type-18140", ++ "referenced_type" : "type-17942", ++ "self_type" : "type-17941", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-18420", +- "self_type" : "type-18419", ++ "referenced_type" : "type-18511", ++ "self_type" : "type-18510", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151319,8 +151361,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-19433", +- "self_type" : "type-19432", ++ "referenced_type" : "type-18778", ++ "self_type" : "type-18777", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151328,8 +151370,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-19496", +- "self_type" : "type-19495", ++ "referenced_type" : "type-18919", ++ "self_type" : "type-18918", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151337,8 +151379,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-19667", +- "self_type" : "type-19666", ++ "referenced_type" : "type-19198", ++ "self_type" : "type-19197", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151346,8 +151388,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-19758", +- "self_type" : "type-19757", ++ "referenced_type" : "type-19953", ++ "self_type" : "type-19952", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151355,8 +151397,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-20536", +- "self_type" : "type-20535", ++ "referenced_type" : "type-20543", ++ "self_type" : "type-20542", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151364,8 +151406,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-21704", +- "self_type" : "type-21703", ++ "referenced_type" : "type-21712", ++ "self_type" : "type-21711", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -151814,8 +151856,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-15426", +- "self_type" : "type-15425", ++ "referenced_type" : "type-15679", ++ "self_type" : "type-15678", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151823,8 +151865,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-16006", +- "self_type" : "type-16005", ++ "referenced_type" : "type-15742", ++ "self_type" : "type-15741", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151832,17 +151874,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-17174", +- "self_type" : "type-17173", ++ "referenced_type" : "type-15913", ++ "self_type" : "type-15912", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-17735", +- "self_type" : "type-17734", ++ "referenced_type" : "type-16045", ++ "self_type" : "type-16044", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151850,8 +151892,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-18002", +- "self_type" : "type-18001", ++ "referenced_type" : "type-16777", ++ "self_type" : "type-16776", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151859,17 +151901,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-18143", +- "self_type" : "type-18142", ++ "referenced_type" : "type-17944", ++ "self_type" : "type-17943", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-18422", +- "self_type" : "type-18421", ++ "referenced_type" : "type-18513", ++ "self_type" : "type-18512", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151877,8 +151919,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-19435", +- "self_type" : "type-19434", ++ "referenced_type" : "type-18780", ++ "self_type" : "type-18779", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151886,8 +151928,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-19498", +- "self_type" : "type-19497", ++ "referenced_type" : "type-18921", ++ "self_type" : "type-18920", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151895,8 +151937,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-19669", +- "self_type" : "type-19668", ++ "referenced_type" : "type-19200", ++ "self_type" : "type-19199", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151904,8 +151946,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-19801", +- "self_type" : "type-19800", ++ "referenced_type" : "type-19959", ++ "self_type" : "type-19958", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151913,8 +151955,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-20538", +- "self_type" : "type-20537", ++ "referenced_type" : "type-20545", ++ "self_type" : "type-20544", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151922,8 +151964,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-21706", +- "self_type" : "type-21705", ++ "referenced_type" : "type-21714", ++ "self_type" : "type-21713", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -152912,17 +152954,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-15405", +- "self_type" : "type-15404", ++ "referenced_type" : "type-15373", ++ "self_type" : "type-15372", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-15448", +- "self_type" : "type-15447", ++ "referenced_type" : "type-1551", ++ "self_type" : "type-1550", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -152930,26 +152972,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-15468", +- "self_type" : "type-15467", ++ "referenced_type" : "type-15543", ++ "self_type" : "type-15542", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > *", +- "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-15481", +- "self_type" : "type-15480", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-15500", +- "self_type" : "type-15499", ++ "referenced_type" : "type-15577", ++ "self_type" : "type-15576", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152957,10 +152990,10 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-1551", +- "self_type" : "type-1550", ++ "referenced_type" : "type-15681", ++ "self_type" : "type-15680", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, +@@ -152975,10 +153008,10 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-15812", +- "self_type" : "type-15811", ++ "referenced_type" : "type-15777", ++ "self_type" : "type-15776", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "alignment" : 4, +@@ -152993,8 +153026,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-15995", +- "self_type" : "type-15994", ++ "referenced_type" : "type-15903", ++ "self_type" : "type-15902", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153002,8 +153035,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16043", +- "self_type" : "type-16042", ++ "referenced_type" : "type-16063", ++ "self_type" : "type-16062", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153011,8 +153044,35 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16227", +- "self_type" : "type-16226", ++ "referenced_type" : "type-16218", ++ "self_type" : "type-16217", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > *", ++ "name" : "std::basic_string, std::allocator > *", ++ "referenced_type" : "type-16241", ++ "self_type" : "type-16240", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > *", ++ "name" : "std::basic_string, std::allocator > *", ++ "referenced_type" : "type-16254", ++ "self_type" : "type-16253", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > *", ++ "name" : "std::basic_string, std::allocator > *", ++ "referenced_type" : "type-16273", ++ "self_type" : "type-16272", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153020,17 +153080,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16288", +- "self_type" : "type-16287", ++ "referenced_type" : "type-16585", ++ "self_type" : "type-16584", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16324", +- "self_type" : "type-16323", ++ "referenced_type" : "type-16766", ++ "self_type" : "type-16765", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153038,17 +153098,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16336", +- "self_type" : "type-16335", ++ "referenced_type" : "type-16814", ++ "self_type" : "type-16813", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16430", +- "self_type" : "type-16429", ++ "referenced_type" : "type-16997", ++ "self_type" : "type-16996", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153056,8 +153116,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16505", +- "self_type" : "type-16504", ++ "referenced_type" : "type-17058", ++ "self_type" : "type-17057", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > *", ++ "name" : "std::basic_string, std::allocator > *", ++ "referenced_type" : "type-17094", ++ "self_type" : "type-17093", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153065,17 +153134,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16597", +- "self_type" : "type-16596", ++ "referenced_type" : "type-17106", ++ "self_type" : "type-17105", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16609", +- "self_type" : "type-16608", ++ "referenced_type" : "type-17200", ++ "self_type" : "type-17199", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153083,8 +153152,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16676", +- "self_type" : "type-16675", ++ "referenced_type" : "type-17275", ++ "self_type" : "type-17274", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153092,8 +153161,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16705", +- "self_type" : "type-16704", ++ "referenced_type" : "type-17367", ++ "self_type" : "type-17366", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -153101,8 +153170,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16738", +- "self_type" : "type-16737", ++ "referenced_type" : "type-17379", ++ "self_type" : "type-17378", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153110,8 +153179,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16822", +- "self_type" : "type-16821", ++ "referenced_type" : "type-17446", ++ "self_type" : "type-17445", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153119,8 +153188,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16851", +- "self_type" : "type-16850", ++ "referenced_type" : "type-17475", ++ "self_type" : "type-17474", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > *", ++ "name" : "std::basic_string, std::allocator > *", ++ "referenced_type" : "type-17508", ++ "self_type" : "type-17507", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153128,8 +153206,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16895", +- "self_type" : "type-16894", ++ "referenced_type" : "type-1753", ++ "self_type" : "type-1752", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153137,8 +153215,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-17136", +- "self_type" : "type-17135", ++ "referenced_type" : "type-17592", ++ "self_type" : "type-17591", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153146,8 +153224,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-17227", +- "self_type" : "type-17226", ++ "referenced_type" : "type-17621", ++ "self_type" : "type-17620", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153155,8 +153233,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-17320", +- "self_type" : "type-17319", ++ "referenced_type" : "type-17665", ++ "self_type" : "type-17664", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153164,8 +153242,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-17437", +- "self_type" : "type-17436", ++ "referenced_type" : "type-17906", ++ "self_type" : "type-17905", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153173,8 +153251,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-1753", +- "self_type" : "type-1752", ++ "referenced_type" : "type-17997", ++ "self_type" : "type-17996", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153182,17 +153260,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-17644", +- "self_type" : "type-17643", ++ "referenced_type" : "type-18090", ++ "self_type" : "type-18089", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-17651", +- "self_type" : "type-17650", ++ "referenced_type" : "type-18215", ++ "self_type" : "type-18214", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153200,17 +153278,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-17788", +- "self_type" : "type-17787", ++ "referenced_type" : "type-18422", ++ "self_type" : "type-18421", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-17816", +- "self_type" : "type-17815", ++ "referenced_type" : "type-18429", ++ "self_type" : "type-18428", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153218,26 +153296,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-17904", +- "self_type" : "type-17903", ++ "referenced_type" : "type-185", ++ "self_type" : "type-184", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-17983", +- "self_type" : "type-17982", ++ "referenced_type" : "type-18566", ++ "self_type" : "type-18565", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18012", +- "self_type" : "type-18011", ++ "referenced_type" : "type-18594", ++ "self_type" : "type-18593", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153245,8 +153323,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18091", +- "self_type" : "type-18090", ++ "referenced_type" : "type-18682", ++ "self_type" : "type-18681", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153254,8 +153332,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18145", +- "self_type" : "type-18144", ++ "referenced_type" : "type-18761", ++ "self_type" : "type-18760", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153263,26 +153341,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18224", +- "self_type" : "type-18223", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message_lite.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > *", +- "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18304", +- "self_type" : "type-18303", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > *", +- "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18308", +- "self_type" : "type-18307", ++ "referenced_type" : "type-18790", ++ "self_type" : "type-18789", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153290,8 +153350,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18429", +- "self_type" : "type-18428", ++ "referenced_type" : "type-18869", ++ "self_type" : "type-18868", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153299,17 +153359,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-185", +- "self_type" : "type-184", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > *", +- "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18690", +- "self_type" : "type-18689", ++ "referenced_type" : "type-18923", ++ "self_type" : "type-18922", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153317,26 +153368,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18768", +- "self_type" : "type-18767", ++ "referenced_type" : "type-19002", ++ "self_type" : "type-19001", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/message_lite.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18770", +- "self_type" : "type-18769", ++ "referenced_type" : "type-19082", ++ "self_type" : "type-19081", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18783", +- "self_type" : "type-18782", ++ "referenced_type" : "type-19086", ++ "self_type" : "type-19085", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153344,8 +153395,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18911", +- "self_type" : "type-18910", ++ "referenced_type" : "type-19207", ++ "self_type" : "type-19206", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153353,26 +153404,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19109", +- "self_type" : "type-19108", ++ "referenced_type" : "type-19468", ++ "self_type" : "type-19467", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19120", +- "self_type" : "type-19119", ++ "referenced_type" : "type-19546", ++ "self_type" : "type-19545", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19128", +- "self_type" : "type-19127", ++ "referenced_type" : "type-19548", ++ "self_type" : "type-19547", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153380,17 +153431,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19298", +- "self_type" : "type-19297", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > *", +- "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19333", +- "self_type" : "type-19332", ++ "referenced_type" : "type-19561", ++ "self_type" : "type-19560", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153398,8 +153440,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19437", +- "self_type" : "type-19436", ++ "referenced_type" : "type-19689", ++ "self_type" : "type-19688", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153407,44 +153449,44 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19533", +- "self_type" : "type-19532", ++ "referenced_type" : "type-197", ++ "self_type" : "type-196", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19659", +- "self_type" : "type-19658", ++ "referenced_type" : "type-19887", ++ "self_type" : "type-19886", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-197", +- "self_type" : "type-196", ++ "referenced_type" : "type-19898", ++ "self_type" : "type-19897", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19819", +- "self_type" : "type-19818", ++ "referenced_type" : "type-19938", ++ "self_type" : "type-19937", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19974", +- "self_type" : "type-19973", ++ "referenced_type" : "type-19981", ++ "self_type" : "type-19980", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -153452,8 +153494,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19997", +- "self_type" : "type-19996", ++ "referenced_type" : "type-20001", ++ "self_type" : "type-20000", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -153461,8 +153503,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20010", +- "self_type" : "type-20009", ++ "referenced_type" : "type-20014", ++ "self_type" : "type-20013", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -153470,8 +153512,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20033", +- "self_type" : "type-20032", ++ "referenced_type" : "type-20037", ++ "self_type" : "type-20036", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153479,8 +153521,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20346", +- "self_type" : "type-20345", ++ "referenced_type" : "type-20350", ++ "self_type" : "type-20349", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153488,8 +153530,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20527", +- "self_type" : "type-20526", ++ "referenced_type" : "type-20534", ++ "self_type" : "type-20533", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153497,8 +153539,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20575", +- "self_type" : "type-20574", ++ "referenced_type" : "type-20582", ++ "self_type" : "type-20581", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153506,8 +153548,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20758", +- "self_type" : "type-20757", ++ "referenced_type" : "type-20766", ++ "self_type" : "type-20765", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153515,8 +153557,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20819", +- "self_type" : "type-20818", ++ "referenced_type" : "type-20827", ++ "self_type" : "type-20826", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" + }, +@@ -153524,8 +153566,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20855", +- "self_type" : "type-20854", ++ "referenced_type" : "type-20863", ++ "self_type" : "type-20862", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153533,8 +153575,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20867", +- "self_type" : "type-20866", ++ "referenced_type" : "type-20875", ++ "self_type" : "type-20874", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, +@@ -153542,8 +153584,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20961", +- "self_type" : "type-20960", ++ "referenced_type" : "type-20969", ++ "self_type" : "type-20968", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153551,8 +153593,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21037", +- "self_type" : "type-21036", ++ "referenced_type" : "type-21045", ++ "self_type" : "type-21044", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153560,8 +153602,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21129", +- "self_type" : "type-21128", ++ "referenced_type" : "type-21137", ++ "self_type" : "type-21136", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -153569,8 +153611,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21141", +- "self_type" : "type-21140", ++ "referenced_type" : "type-21149", ++ "self_type" : "type-21148", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153578,8 +153620,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21208", +- "self_type" : "type-21207", ++ "referenced_type" : "type-21216", ++ "self_type" : "type-21215", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153587,8 +153629,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21237", +- "self_type" : "type-21236", ++ "referenced_type" : "type-21245", ++ "self_type" : "type-21244", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -153596,8 +153638,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21270", +- "self_type" : "type-21269", ++ "referenced_type" : "type-21278", ++ "self_type" : "type-21277", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153605,8 +153647,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21354", +- "self_type" : "type-21353", ++ "referenced_type" : "type-21362", ++ "self_type" : "type-21361", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153614,8 +153656,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21383", +- "self_type" : "type-21382", ++ "referenced_type" : "type-21391", ++ "self_type" : "type-21390", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153623,8 +153665,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21427", +- "self_type" : "type-21426", ++ "referenced_type" : "type-21435", ++ "self_type" : "type-21434", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153632,8 +153674,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21668", +- "self_type" : "type-21667", ++ "referenced_type" : "type-21676", ++ "self_type" : "type-21675", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153641,8 +153683,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21759", +- "self_type" : "type-21758", ++ "referenced_type" : "type-21767", ++ "self_type" : "type-21766", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153650,8 +153692,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21852", +- "self_type" : "type-21851", ++ "referenced_type" : "type-21860", ++ "self_type" : "type-21859", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -156117,7 +156159,7 @@ + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", + "referenced_type" : "type-14963", +- "self_type" : "type-15384", ++ "self_type" : "type-15524", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -156134,8 +156176,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-15499", +- "self_type" : "type-15566", ++ "referenced_type" : "type-15372", ++ "self_type" : "type-15407", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156143,8 +156185,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-15811", +- "self_type" : "type-15838", ++ "referenced_type" : "type-15576", ++ "self_type" : "type-15599", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156152,8 +156194,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-15994", +- "self_type" : "type-15993", ++ "referenced_type" : "type-15680", ++ "self_type" : "type-15794", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156161,8 +156203,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16042", +- "self_type" : "type-16106", ++ "referenced_type" : "type-15902", ++ "self_type" : "type-15964", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156170,8 +156212,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16226", +- "self_type" : "type-16256", ++ "referenced_type" : "type-16062", ++ "self_type" : "type-16074", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156179,8 +156221,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16323", +- "self_type" : "type-16344", ++ "referenced_type" : "type-16272", ++ "self_type" : "type-16339", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156188,8 +156230,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16429", +- "self_type" : "type-16443", ++ "referenced_type" : "type-16584", ++ "self_type" : "type-16611", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156197,8 +156239,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16504", +- "self_type" : "type-16585", ++ "referenced_type" : "type-16765", ++ "self_type" : "type-16764", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156206,8 +156248,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16608", +- "self_type" : "type-16623", ++ "referenced_type" : "type-16813", ++ "self_type" : "type-16876", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156215,8 +156257,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16675", +- "self_type" : "type-16729", ++ "referenced_type" : "type-16996", ++ "self_type" : "type-17026", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156224,8 +156266,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16737", +- "self_type" : "type-16758", ++ "referenced_type" : "type-17093", ++ "self_type" : "type-17114", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156233,8 +156275,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16821", +- "self_type" : "type-16838", ++ "referenced_type" : "type-17199", ++ "self_type" : "type-17213", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156242,8 +156284,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16850", +- "self_type" : "type-16855", ++ "referenced_type" : "type-17274", ++ "self_type" : "type-17355", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156251,26 +156293,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16894", +- "self_type" : "type-17056", ++ "referenced_type" : "type-17378", ++ "self_type" : "type-17393", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-17135", +- "self_type" : "type-17180", ++ "referenced_type" : "type-17445", ++ "self_type" : "type-17499", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-17226", +- "self_type" : "type-17261", ++ "referenced_type" : "type-17507", ++ "self_type" : "type-17528", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156278,8 +156320,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-17319", +- "self_type" : "type-17334", ++ "referenced_type" : "type-1752", ++ "self_type" : "type-1858", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156287,8 +156329,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-17436", +- "self_type" : "type-17585", ++ "referenced_type" : "type-17591", ++ "self_type" : "type-17608", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156296,8 +156338,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-1752", +- "self_type" : "type-1858", ++ "referenced_type" : "type-17620", ++ "self_type" : "type-17625", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156305,8 +156347,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-17650", +- "self_type" : "type-17725", ++ "referenced_type" : "type-17664", ++ "self_type" : "type-17826", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -156314,17 +156356,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-17815", +- "self_type" : "type-17833", ++ "referenced_type" : "type-17905", ++ "self_type" : "type-17950", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-17903", +- "self_type" : "type-17923", ++ "referenced_type" : "type-17996", ++ "self_type" : "type-18031", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156332,8 +156374,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-17982", +- "self_type" : "type-18014", ++ "referenced_type" : "type-18089", ++ "self_type" : "type-18104", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156341,26 +156383,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-18011", +- "self_type" : "type-18010", ++ "referenced_type" : "type-18214", ++ "self_type" : "type-18363", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-18090", +- "self_type" : "type-18104", ++ "referenced_type" : "type-18428", ++ "self_type" : "type-18503", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-18144", +- "self_type" : "type-18168", ++ "referenced_type" : "type-18593", ++ "self_type" : "type-18611", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156368,8 +156410,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-18307", +- "self_type" : "type-18336", ++ "referenced_type" : "type-18681", ++ "self_type" : "type-18701", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156377,8 +156419,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-18428", +- "self_type" : "type-18464", ++ "referenced_type" : "type-18760", ++ "self_type" : "type-18792", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156386,17 +156428,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-18689", +- "self_type" : "type-18688", ++ "referenced_type" : "type-18789", ++ "self_type" : "type-18788", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-18769", +- "self_type" : "type-18830", ++ "referenced_type" : "type-18868", ++ "self_type" : "type-18882", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156404,17 +156446,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-18782", +- "self_type" : "type-19279", ++ "referenced_type" : "type-18922", ++ "self_type" : "type-18946", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-18910", +- "self_type" : "type-18924", ++ "referenced_type" : "type-19085", ++ "self_type" : "type-19114", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156422,8 +156464,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-19127", +- "self_type" : "type-19162", ++ "referenced_type" : "type-19206", ++ "self_type" : "type-19242", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156431,8 +156473,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-19332", +- "self_type" : "type-19355", ++ "referenced_type" : "type-19467", ++ "self_type" : "type-19466", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156440,8 +156482,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-19436", +- "self_type" : "type-19550", ++ "referenced_type" : "type-19547", ++ "self_type" : "type-19608", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156449,17 +156491,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-19658", +- "self_type" : "type-19720", ++ "referenced_type" : "type-19560", ++ "self_type" : "type-19917", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-19818", +- "self_type" : "type-19830", ++ "referenced_type" : "type-19688", ++ "self_type" : "type-19702", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156467,8 +156509,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-20032", +- "self_type" : "type-20099", ++ "referenced_type" : "type-20036", ++ "self_type" : "type-20103", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156476,8 +156518,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-20345", +- "self_type" : "type-20372", ++ "referenced_type" : "type-20349", ++ "self_type" : "type-20376", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156485,8 +156527,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-20526", +- "self_type" : "type-20525", ++ "referenced_type" : "type-20533", ++ "self_type" : "type-20532", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156494,8 +156536,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-20574", +- "self_type" : "type-20637", ++ "referenced_type" : "type-20581", ++ "self_type" : "type-20645", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156503,8 +156545,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-20757", +- "self_type" : "type-20787", ++ "referenced_type" : "type-20765", ++ "self_type" : "type-20795", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156512,8 +156554,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-20854", +- "self_type" : "type-20875", ++ "referenced_type" : "type-20862", ++ "self_type" : "type-20883", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156521,8 +156563,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-20960", +- "self_type" : "type-20974", ++ "referenced_type" : "type-20968", ++ "self_type" : "type-20982", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156530,8 +156572,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21036", +- "self_type" : "type-21117", ++ "referenced_type" : "type-21044", ++ "self_type" : "type-21125", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156539,8 +156581,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21140", +- "self_type" : "type-21155", ++ "referenced_type" : "type-21148", ++ "self_type" : "type-21163", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156548,8 +156590,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21207", +- "self_type" : "type-21261", ++ "referenced_type" : "type-21215", ++ "self_type" : "type-21269", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156557,8 +156599,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21269", +- "self_type" : "type-21290", ++ "referenced_type" : "type-21277", ++ "self_type" : "type-21298", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156566,8 +156608,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21353", +- "self_type" : "type-21370", ++ "referenced_type" : "type-21361", ++ "self_type" : "type-21378", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156575,8 +156617,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21382", +- "self_type" : "type-21387", ++ "referenced_type" : "type-21390", ++ "self_type" : "type-21395", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156584,8 +156626,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21426", +- "self_type" : "type-21588", ++ "referenced_type" : "type-21434", ++ "self_type" : "type-21596", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -156593,8 +156635,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21667", +- "self_type" : "type-21712", ++ "referenced_type" : "type-21675", ++ "self_type" : "type-21720", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -156602,8 +156644,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21758", +- "self_type" : "type-21793", ++ "referenced_type" : "type-21766", ++ "self_type" : "type-21801", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156611,8 +156653,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21851", +- "self_type" : "type-21866", ++ "referenced_type" : "type-21859", ++ "self_type" : "type-21874", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157934,8 +157976,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > *", + "name" : "std::map, std::allocator > > *", +- "referenced_type" : "type-17730", +- "self_type" : "type-17729", ++ "referenced_type" : "type-18508", ++ "self_type" : "type-18507", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -157970,8 +158012,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > *", + "name" : "std::map, std::allocator > > *", +- "referenced_type" : "type-19971", +- "self_type" : "type-19970", ++ "referenced_type" : "type-16215", ++ "self_type" : "type-16214", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158024,8 +158066,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > *", + "name" : "std::map, std::allocator > > *", +- "referenced_type" : "type-17635", +- "self_type" : "type-17634", ++ "referenced_type" : "type-18413", ++ "self_type" : "type-18412", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -158096,8 +158138,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *", + "name" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *", +- "referenced_type" : "type-16204", +- "self_type" : "type-16203", ++ "referenced_type" : "type-16974", ++ "self_type" : "type-16973", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158105,8 +158147,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *", + "name" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *", +- "referenced_type" : "type-20735", +- "self_type" : "type-20734", ++ "referenced_type" : "type-20743", ++ "self_type" : "type-20742", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158168,8 +158210,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *", + "name" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *", +- "referenced_type" : "type-16215", +- "self_type" : "type-16214", ++ "referenced_type" : "type-16985", ++ "self_type" : "type-16984", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158177,8 +158219,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *", + "name" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *", +- "referenced_type" : "type-20746", +- "self_type" : "type-20745", ++ "referenced_type" : "type-20754", ++ "self_type" : "type-20753", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158240,8 +158282,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *", +- "referenced_type" : "type-16029", +- "self_type" : "type-16028", ++ "referenced_type" : "type-16800", ++ "self_type" : "type-16799", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158249,8 +158291,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *", +- "referenced_type" : "type-20561", +- "self_type" : "type-20560", ++ "referenced_type" : "type-20568", ++ "self_type" : "type-20567", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158312,8 +158354,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *", + "name" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *", +- "referenced_type" : "type-16209", +- "self_type" : "type-16208", ++ "referenced_type" : "type-16979", ++ "self_type" : "type-16978", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158321,8 +158363,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *", + "name" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *", +- "referenced_type" : "type-20740", +- "self_type" : "type-20739", ++ "referenced_type" : "type-20748", ++ "self_type" : "type-20747", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158384,8 +158426,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *", + "name" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *", +- "referenced_type" : "type-16221", +- "self_type" : "type-16220", ++ "referenced_type" : "type-16991", ++ "self_type" : "type-16990", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158393,8 +158435,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *", + "name" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *", +- "referenced_type" : "type-20752", +- "self_type" : "type-20751", ++ "referenced_type" : "type-20760", ++ "self_type" : "type-20759", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158456,8 +158498,8 @@ + "alignment" : 4, + "linker_set_key" : "std::pair *", + "name" : "std::pair *", +- "referenced_type" : "type-16049", +- "self_type" : "type-16048", ++ "referenced_type" : "type-16820", ++ "self_type" : "type-16819", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -158465,8 +158507,8 @@ + "alignment" : 4, + "linker_set_key" : "std::pair *", + "name" : "std::pair *", +- "referenced_type" : "type-20581", +- "self_type" : "type-20580", ++ "referenced_type" : "type-20588", ++ "self_type" : "type-20587", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -158537,8 +158579,8 @@ + "alignment" : 4, + "linker_set_key" : "std::pair *", + "name" : "std::pair *", +- "referenced_type" : "type-18288", +- "self_type" : "type-18287", ++ "referenced_type" : "type-19066", ++ "self_type" : "type-19065", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -158573,8 +158615,8 @@ + "alignment" : 4, + "linker_set_key" : "std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", + "name" : "std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", +- "referenced_type" : "type-16949", +- "self_type" : "type-16948", ++ "referenced_type" : "type-17719", ++ "self_type" : "type-17718", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -158582,8 +158624,8 @@ + "alignment" : 4, + "linker_set_key" : "std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", + "name" : "std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", +- "referenced_type" : "type-21481", +- "self_type" : "type-21480", ++ "referenced_type" : "type-21489", ++ "self_type" : "type-21488", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -158654,8 +158696,8 @@ + "alignment" : 4, + "linker_set_key" : "std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", + "name" : "std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", +- "referenced_type" : "type-17527", +- "self_type" : "type-17526", ++ "referenced_type" : "type-18305", ++ "self_type" : "type-18304", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -158663,8 +158705,8 @@ + "alignment" : 4, + "linker_set_key" : "std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", + "name" : "std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", +- "referenced_type" : "type-18823", +- "self_type" : "type-18822", ++ "referenced_type" : "type-19601", ++ "self_type" : "type-19600", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -158744,8 +158786,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16093", +- "self_type" : "type-16092", ++ "referenced_type" : "type-16863", ++ "self_type" : "type-16862", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -158753,8 +158795,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16709", +- "self_type" : "type-16708", ++ "referenced_type" : "type-17479", ++ "self_type" : "type-17478", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -158762,8 +158804,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16877", +- "self_type" : "type-16876", ++ "referenced_type" : "type-17647", ++ "self_type" : "type-17646", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -158771,8 +158813,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20624", +- "self_type" : "type-20623", ++ "referenced_type" : "type-20632", ++ "self_type" : "type-20631", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -158780,8 +158822,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21241", +- "self_type" : "type-21240", ++ "referenced_type" : "type-21249", ++ "self_type" : "type-21248", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -158789,8 +158831,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21409", +- "self_type" : "type-21408", ++ "referenced_type" : "type-21417", ++ "self_type" : "type-21416", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -158951,8 +158993,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16299", +- "self_type" : "type-16298", ++ "referenced_type" : "type-17069", ++ "self_type" : "type-17068", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -158960,8 +159002,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20830", +- "self_type" : "type-20829", ++ "referenced_type" : "type-20838", ++ "self_type" : "type-20837", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159023,8 +159065,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16201", +- "self_type" : "type-16200", ++ "referenced_type" : "type-16971", ++ "self_type" : "type-16970", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159032,8 +159074,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20732", +- "self_type" : "type-20731", ++ "referenced_type" : "type-20740", ++ "self_type" : "type-20739", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159095,8 +159137,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16197", +- "self_type" : "type-16196", ++ "referenced_type" : "type-16967", ++ "self_type" : "type-16966", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159104,8 +159146,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20728", +- "self_type" : "type-20727", ++ "referenced_type" : "type-20736", ++ "self_type" : "type-20735", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159176,8 +159218,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-17728", +- "self_type" : "type-17727", ++ "referenced_type" : "type-18506", ++ "self_type" : "type-18505", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159554,8 +159596,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-15495", +- "self_type" : "type-15494", ++ "referenced_type" : "type-15409", ++ "self_type" : "type-15408", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159563,8 +159605,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-15840", +- "self_type" : "type-15839", ++ "referenced_type" : "type-15601", ++ "self_type" : "type-15600", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159572,8 +159614,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16108", +- "self_type" : "type-16107", ++ "referenced_type" : "type-15796", ++ "self_type" : "type-15795", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159581,8 +159623,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16258", +- "self_type" : "type-16257", ++ "referenced_type" : "type-15966", ++ "self_type" : "type-15965", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159590,8 +159632,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16346", +- "self_type" : "type-16345", ++ "referenced_type" : "type-16076", ++ "self_type" : "type-16075", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159599,8 +159641,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16445", +- "self_type" : "type-16444", ++ "referenced_type" : "type-16268", ++ "self_type" : "type-16267", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159617,8 +159659,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16587", +- "self_type" : "type-16586", ++ "referenced_type" : "type-16613", ++ "self_type" : "type-16612", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159626,8 +159668,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16625", +- "self_type" : "type-16624", ++ "referenced_type" : "type-16878", ++ "self_type" : "type-16877", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159635,8 +159677,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16732", +- "self_type" : "type-16731", ++ "referenced_type" : "type-17028", ++ "self_type" : "type-17027", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159644,8 +159686,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16760", +- "self_type" : "type-16759", ++ "referenced_type" : "type-17116", ++ "self_type" : "type-17115", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159653,8 +159695,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16840", +- "self_type" : "type-16839", ++ "referenced_type" : "type-17215", ++ "self_type" : "type-17214", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159662,8 +159704,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-17041", +- "self_type" : "type-17040", ++ "referenced_type" : "type-17357", ++ "self_type" : "type-17356", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159671,8 +159713,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-17177", +- "self_type" : "type-17176", ++ "referenced_type" : "type-17395", ++ "self_type" : "type-17394", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159680,8 +159722,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-17263", +- "self_type" : "type-17262", ++ "referenced_type" : "type-17502", ++ "self_type" : "type-17501", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159689,8 +159731,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-17336", +- "self_type" : "type-17335", ++ "referenced_type" : "type-17530", ++ "self_type" : "type-17529", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159698,8 +159740,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-17587", +- "self_type" : "type-17586", ++ "referenced_type" : "type-17610", ++ "self_type" : "type-17609", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159707,8 +159749,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-17737", +- "self_type" : "type-17736", ++ "referenced_type" : "type-17811", ++ "self_type" : "type-17810", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159716,8 +159758,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-17836", +- "self_type" : "type-17835", ++ "referenced_type" : "type-17947", ++ "self_type" : "type-17946", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159725,8 +159767,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-17925", +- "self_type" : "type-17924", ++ "referenced_type" : "type-18033", ++ "self_type" : "type-18032", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159734,8 +159776,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-17991", +- "self_type" : "type-17990", ++ "referenced_type" : "type-18106", ++ "self_type" : "type-18105", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159743,8 +159785,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-18106", +- "self_type" : "type-18105", ++ "referenced_type" : "type-18365", ++ "self_type" : "type-18364", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159752,8 +159794,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-18170", +- "self_type" : "type-18169", ++ "referenced_type" : "type-18515", ++ "self_type" : "type-18514", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159761,8 +159803,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-18338", +- "self_type" : "type-18337", ++ "referenced_type" : "type-18614", ++ "self_type" : "type-18613", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159770,8 +159812,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-18466", +- "self_type" : "type-18465", ++ "referenced_type" : "type-18703", ++ "self_type" : "type-18702", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159779,8 +159821,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-18692", +- "self_type" : "type-18691", ++ "referenced_type" : "type-18769", ++ "self_type" : "type-18768", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159788,8 +159830,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-18832", +- "self_type" : "type-18831", ++ "referenced_type" : "type-18884", ++ "self_type" : "type-18883", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159797,8 +159839,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-18926", +- "self_type" : "type-18925", ++ "referenced_type" : "type-18948", ++ "self_type" : "type-18947", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159806,8 +159848,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-19164", +- "self_type" : "type-19163", ++ "referenced_type" : "type-19116", ++ "self_type" : "type-19115", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159815,8 +159857,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-19357", +- "self_type" : "type-19356", ++ "referenced_type" : "type-19244", ++ "self_type" : "type-19243", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159824,8 +159866,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-19552", +- "self_type" : "type-19551", ++ "referenced_type" : "type-19470", ++ "self_type" : "type-19469", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159833,8 +159875,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-19722", +- "self_type" : "type-19721", ++ "referenced_type" : "type-19610", ++ "self_type" : "type-19609", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159842,8 +159884,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-19832", +- "self_type" : "type-19831", ++ "referenced_type" : "type-19704", ++ "self_type" : "type-19703", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159851,8 +159893,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20024", +- "self_type" : "type-20023", ++ "referenced_type" : "type-20028", ++ "self_type" : "type-20027", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159860,8 +159902,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20374", +- "self_type" : "type-20373", ++ "referenced_type" : "type-20378", ++ "self_type" : "type-20377", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159869,8 +159911,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20639", +- "self_type" : "type-20638", ++ "referenced_type" : "type-20647", ++ "self_type" : "type-20646", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159878,8 +159920,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20789", +- "self_type" : "type-20788", ++ "referenced_type" : "type-20797", ++ "self_type" : "type-20796", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159887,8 +159929,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20877", +- "self_type" : "type-20876", ++ "referenced_type" : "type-20885", ++ "self_type" : "type-20884", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159896,8 +159938,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20976", +- "self_type" : "type-20975", ++ "referenced_type" : "type-20984", ++ "self_type" : "type-20983", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159905,8 +159947,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21119", +- "self_type" : "type-21118", ++ "referenced_type" : "type-21127", ++ "self_type" : "type-21126", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159914,8 +159956,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21157", +- "self_type" : "type-21156", ++ "referenced_type" : "type-21165", ++ "self_type" : "type-21164", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159923,8 +159965,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21264", +- "self_type" : "type-21263", ++ "referenced_type" : "type-21272", ++ "self_type" : "type-21271", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159932,8 +159974,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21292", +- "self_type" : "type-21291", ++ "referenced_type" : "type-21300", ++ "self_type" : "type-21299", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159941,8 +159983,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21372", +- "self_type" : "type-21371", ++ "referenced_type" : "type-21380", ++ "self_type" : "type-21379", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159950,8 +159992,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21573", +- "self_type" : "type-21572", ++ "referenced_type" : "type-21581", ++ "self_type" : "type-21580", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159959,8 +160001,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21709", +- "self_type" : "type-21708", ++ "referenced_type" : "type-21717", ++ "self_type" : "type-21716", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159968,8 +160010,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21795", +- "self_type" : "type-21794", ++ "referenced_type" : "type-21803", ++ "self_type" : "type-21802", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159977,8 +160019,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21868", +- "self_type" : "type-21867", ++ "referenced_type" : "type-21876", ++ "self_type" : "type-21875", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -161120,8 +161162,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16080", +- "self_type" : "type-16079", ++ "referenced_type" : "type-16850", ++ "self_type" : "type-16849", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -161129,8 +161171,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16243", +- "self_type" : "type-16242", ++ "referenced_type" : "type-17013", ++ "self_type" : "type-17012", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -161138,8 +161180,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-18328", +- "self_type" : "type-18327", ++ "referenced_type" : "type-19106", ++ "self_type" : "type-19105", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -161147,8 +161189,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20611", +- "self_type" : "type-20610", ++ "referenced_type" : "type-20619", ++ "self_type" : "type-20618", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -161156,8 +161198,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20774", +- "self_type" : "type-20773", ++ "referenced_type" : "type-20782", ++ "self_type" : "type-20781", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -161300,8 +161342,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator > *, std::allocator, std::allocator > *> > *", + "name" : "std::vector, std::allocator > *, std::allocator, std::allocator > *> > *", +- "referenced_type" : "type-16199", +- "self_type" : "type-16198", ++ "referenced_type" : "type-16969", ++ "self_type" : "type-16968", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -161309,8 +161351,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator > *, std::allocator, std::allocator > *> > *", + "name" : "std::vector, std::allocator > *, std::allocator, std::allocator > *> > *", +- "referenced_type" : "type-20730", +- "self_type" : "type-20729", ++ "referenced_type" : "type-20738", ++ "self_type" : "type-20737", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -161435,8 +161477,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-16599", +- "self_type" : "type-16598", ++ "referenced_type" : "type-17369", ++ "self_type" : "type-17368", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -161444,8 +161486,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-17170", +- "self_type" : "type-17169", ++ "referenced_type" : "type-17940", ++ "self_type" : "type-17939", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -161453,8 +161495,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-17260", +- "self_type" : "type-17259", ++ "referenced_type" : "type-18030", ++ "self_type" : "type-18029", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_ops.h" + }, +@@ -161462,8 +161504,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-18306", +- "self_type" : "type-18305", ++ "referenced_type" : "type-19084", ++ "self_type" : "type-19083", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" + }, +@@ -161471,8 +161513,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-18534", +- "self_type" : "type-18533", ++ "referenced_type" : "type-19312", ++ "self_type" : "type-19311", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/parser.h" + }, +@@ -161480,8 +161522,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-21131", +- "self_type" : "type-21130", ++ "referenced_type" : "type-21139", ++ "self_type" : "type-21138", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -161489,8 +161531,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-21702", +- "self_type" : "type-21701", ++ "referenced_type" : "type-21710", ++ "self_type" : "type-21709", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -161498,8 +161540,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-21792", +- "self_type" : "type-21791", ++ "referenced_type" : "type-21800", ++ "self_type" : "type-21799", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_ops.h" + }, +@@ -162048,80 +162090,80 @@ + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-16499", +- "self_type" : "type-16498", ++ "referenced_type" : "type-17269", ++ "self_type" : "type-17268", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-16815", +- "self_type" : "type-16814", ++ "referenced_type" : "type-17585", ++ "self_type" : "type-17584", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-17066", +- "self_type" : "type-17065", ++ "referenced_type" : "type-17836", ++ "self_type" : "type-17835", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-17185", +- "self_type" : "type-17184", ++ "referenced_type" : "type-17955", ++ "self_type" : "type-17954", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-17452", +- "self_type" : "type-17451", ++ "referenced_type" : "type-18230", ++ "self_type" : "type-18229", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-18902", +- "self_type" : "type-18901", ++ "referenced_type" : "type-19680", ++ "self_type" : "type-19679", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-21031", +- "self_type" : "type-21030", ++ "referenced_type" : "type-21039", ++ "self_type" : "type-21038", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-21347", +- "self_type" : "type-21346", ++ "referenced_type" : "type-21355", ++ "self_type" : "type-21354", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-21598", +- "self_type" : "type-21597", ++ "referenced_type" : "type-21606", ++ "self_type" : "type-21605", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-21717", +- "self_type" : "type-21716", ++ "referenced_type" : "type-21725", ++ "self_type" : "type-21724", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { +@@ -162360,80 +162402,80 @@ + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-16502", +- "self_type" : "type-16501", ++ "referenced_type" : "type-17272", ++ "self_type" : "type-17271", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-16817", +- "self_type" : "type-16816", ++ "referenced_type" : "type-17587", ++ "self_type" : "type-17586", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-17069", +- "self_type" : "type-17068", ++ "referenced_type" : "type-17839", ++ "self_type" : "type-17838", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-17188", +- "self_type" : "type-17187", ++ "referenced_type" : "type-17958", ++ "self_type" : "type-17957", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-17455", +- "self_type" : "type-17454", ++ "referenced_type" : "type-18233", ++ "self_type" : "type-18232", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-18905", +- "self_type" : "type-18904", ++ "referenced_type" : "type-19683", ++ "self_type" : "type-19682", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-21034", +- "self_type" : "type-21033", ++ "referenced_type" : "type-21042", ++ "self_type" : "type-21041", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-21349", +- "self_type" : "type-21348", ++ "referenced_type" : "type-21357", ++ "self_type" : "type-21356", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-21601", +- "self_type" : "type-21600", ++ "referenced_type" : "type-21609", ++ "self_type" : "type-21608", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-21720", +- "self_type" : "type-21719", ++ "referenced_type" : "type-21728", ++ "self_type" : "type-21727", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { +@@ -162876,32 +162918,24 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-15376", +- "self_type" : "type-15375", +- "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" +- }, +- { +- "is_const" : true, +- "linker_set_key" : "const google::protobuf::DescriptorPool", +- "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-15400", +- "self_type" : "type-15399", ++ "referenced_type" : "type-15411", ++ "self_type" : "type-15410", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-17909", +- "self_type" : "type-17908", ++ "referenced_type" : "type-15735", ++ "self_type" : "type-15734", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-18340", +- "self_type" : "type-18339", ++ "referenced_type" : "type-18687", ++ "self_type" : "type-18686", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { +@@ -162918,16 +162952,24 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-19166", +- "self_type" : "type-19165", ++ "referenced_type" : "type-19118", ++ "self_type" : "type-19117", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-19491", +- "self_type" : "type-19490", ++ "referenced_type" : "type-19909", ++ "self_type" : "type-19908", ++ "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" ++ }, ++ { ++ "is_const" : true, ++ "linker_set_key" : "const google::protobuf::DescriptorPool", ++ "name" : "const google::protobuf::DescriptorPool", ++ "referenced_type" : "type-19933", ++ "self_type" : "type-19932", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { +@@ -163237,8 +163279,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::DynamicMessage::TypeInfo", + "name" : "const google::protobuf::DynamicMessage::TypeInfo", +- "referenced_type" : "type-16544", +- "self_type" : "type-16543", ++ "referenced_type" : "type-17314", ++ "self_type" : "type-17313", + "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -163247,8 +163289,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::DynamicMessage::TypeInfo", + "name" : "const google::protobuf::DynamicMessage::TypeInfo", +- "referenced_type" : "type-21076", +- "self_type" : "type-21075", ++ "referenced_type" : "type-21084", ++ "self_type" : "type-21083", + "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -163424,106 +163466,106 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-15942", +- "self_type" : "type-15941", ++ "referenced_type" : "type-15428", ++ "self_type" : "type-15427", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +- "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-1608", +- "self_type" : "type-1903", +- "size" : 52, ++ "referenced_type" : "type-15758", ++ "self_type" : "type-15757", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-17011", +- "self_type" : "type-17010", ++ "referenced_type" : "type-15929", ++ "self_type" : "type-15928", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { ++ "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-18570", +- "self_type" : "type-18569", ++ "referenced_type" : "type-1608", ++ "self_type" : "type-1903", ++ "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-18654", +- "self_type" : "type-18653", ++ "referenced_type" : "type-16095", ++ "self_type" : "type-16094", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-18844", +- "self_type" : "type-18843", ++ "referenced_type" : "type-16713", ++ "self_type" : "type-16712", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-18941", +- "self_type" : "type-18940", ++ "referenced_type" : "type-17781", ++ "self_type" : "type-17780", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-19183", +- "self_type" : "type-19182", ++ "referenced_type" : "type-19348", ++ "self_type" : "type-19347", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-19514", +- "self_type" : "type-19513", ++ "referenced_type" : "type-19432", ++ "self_type" : "type-19431", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-19685", +- "self_type" : "type-19684", ++ "referenced_type" : "type-19622", ++ "self_type" : "type-19621", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-19851", +- "self_type" : "type-19850", ++ "referenced_type" : "type-19719", ++ "self_type" : "type-19718", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-20474", +- "self_type" : "type-20473", ++ "referenced_type" : "type-20481", ++ "self_type" : "type-20480", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-21543", +- "self_type" : "type-21542", ++ "referenced_type" : "type-21551", ++ "self_type" : "type-21550", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -163910,106 +163952,106 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-15946", +- "self_type" : "type-15945", ++ "referenced_type" : "type-15432", ++ "self_type" : "type-15431", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +- "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-1606", +- "self_type" : "type-1909", +- "size" : 52, ++ "referenced_type" : "type-15762", ++ "self_type" : "type-15761", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-17015", +- "self_type" : "type-17014", ++ "referenced_type" : "type-15933", ++ "self_type" : "type-15932", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { ++ "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-18574", +- "self_type" : "type-18573", ++ "referenced_type" : "type-1606", ++ "self_type" : "type-1909", ++ "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-18658", +- "self_type" : "type-18657", ++ "referenced_type" : "type-16099", ++ "self_type" : "type-16098", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-18848", +- "self_type" : "type-18847", ++ "referenced_type" : "type-16717", ++ "self_type" : "type-16716", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-18946", +- "self_type" : "type-18945", ++ "referenced_type" : "type-17785", ++ "self_type" : "type-17784", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-19187", +- "self_type" : "type-19186", ++ "referenced_type" : "type-19352", ++ "self_type" : "type-19351", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-19518", +- "self_type" : "type-19517", ++ "referenced_type" : "type-19436", ++ "self_type" : "type-19435", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-19689", +- "self_type" : "type-19688", ++ "referenced_type" : "type-19626", ++ "self_type" : "type-19625", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-19855", +- "self_type" : "type-19854", ++ "referenced_type" : "type-19724", ++ "self_type" : "type-19723", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-20478", +- "self_type" : "type-20477", ++ "referenced_type" : "type-20485", ++ "self_type" : "type-20484", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-21547", +- "self_type" : "type-21546", ++ "referenced_type" : "type-21555", ++ "self_type" : "type-21554", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -164342,8 +164384,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldDescriptor", + "name" : "const google::protobuf::FieldDescriptor", +- "referenced_type" : "type-17447", +- "self_type" : "type-17446", ++ "referenced_type" : "type-18225", ++ "self_type" : "type-18224", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -164556,106 +164598,106 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-15938", +- "self_type" : "type-15937", ++ "referenced_type" : "type-15424", ++ "self_type" : "type-15423", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +- "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-1595", +- "self_type" : "type-1932", +- "size" : 60, ++ "referenced_type" : "type-15754", ++ "self_type" : "type-15753", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-17007", +- "self_type" : "type-17006", ++ "referenced_type" : "type-15925", ++ "self_type" : "type-15924", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { ++ "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-18566", +- "self_type" : "type-18565", ++ "referenced_type" : "type-1595", ++ "self_type" : "type-1932", ++ "size" : 60, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-18650", +- "self_type" : "type-18649", ++ "referenced_type" : "type-16089", ++ "self_type" : "type-16088", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-18840", +- "self_type" : "type-18839", ++ "referenced_type" : "type-16709", ++ "self_type" : "type-16708", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-18936", +- "self_type" : "type-18935", ++ "referenced_type" : "type-17777", ++ "self_type" : "type-17776", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-19179", +- "self_type" : "type-19178", ++ "referenced_type" : "type-19344", ++ "self_type" : "type-19343", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-19510", +- "self_type" : "type-19509", ++ "referenced_type" : "type-19428", ++ "self_type" : "type-19427", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-19681", +- "self_type" : "type-19680", ++ "referenced_type" : "type-19618", ++ "self_type" : "type-19617", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-19845", +- "self_type" : "type-19844", ++ "referenced_type" : "type-19714", ++ "self_type" : "type-19713", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-20470", +- "self_type" : "type-20469", ++ "referenced_type" : "type-20477", ++ "self_type" : "type-20476", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-21539", +- "self_type" : "type-21538", ++ "referenced_type" : "type-21547", ++ "self_type" : "type-21546", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -165366,250 +165408,250 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-15611", +- "self_type" : "type-15610", ++ "referenced_type" : "type-15449", ++ "self_type" : "type-15448", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-15845", +- "self_type" : "type-15844", ++ "referenced_type" : "type-15605", ++ "self_type" : "type-15604", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-15961", +- "self_type" : "type-15960", ++ "referenced_type" : "type-15779", ++ "self_type" : "type-15778", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +- "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-16085", +- "self_type" : "type-16084", +- "size" : 92, ++ "referenced_type" : "type-15949", ++ "self_type" : "type-15948", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-16238", +- "self_type" : "type-16237", ++ "referenced_type" : "type-16117", ++ "self_type" : "type-16116", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-16349", +- "self_type" : "type-16348", ++ "referenced_type" : "type-16384", ++ "self_type" : "type-16383", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-16451", +- "self_type" : "type-16450", ++ "referenced_type" : "type-16618", ++ "self_type" : "type-16617", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-16574", +- "self_type" : "type-16573", ++ "referenced_type" : "type-16732", ++ "self_type" : "type-16731", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { ++ "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-16628", +- "self_type" : "type-16627", ++ "referenced_type" : "type-16855", ++ "self_type" : "type-16854", ++ "size" : 92, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-16693", +- "self_type" : "type-16692", ++ "referenced_type" : "type-17008", ++ "self_type" : "type-17007", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-16767", +- "self_type" : "type-16766", ++ "referenced_type" : "type-17119", ++ "self_type" : "type-17118", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-16843", +- "self_type" : "type-16842", ++ "referenced_type" : "type-17221", ++ "self_type" : "type-17220", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-17030", +- "self_type" : "type-17029", ++ "referenced_type" : "type-17344", ++ "self_type" : "type-17343", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-17165", +- "self_type" : "type-17164", ++ "referenced_type" : "type-17398", ++ "self_type" : "type-17397", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-17243", +- "self_type" : "type-17242", ++ "referenced_type" : "type-17463", ++ "self_type" : "type-17462", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-17350", +- "self_type" : "type-17349", ++ "referenced_type" : "type-17537", ++ "self_type" : "type-17536", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-17593", +- "self_type" : "type-17592", ++ "referenced_type" : "type-17613", ++ "self_type" : "type-17612", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-17671", +- "self_type" : "type-17670", ++ "referenced_type" : "type-17800", ++ "self_type" : "type-17799", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-17840", +- "self_type" : "type-17839", ++ "referenced_type" : "type-17935", ++ "self_type" : "type-17934", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-17931", +- "self_type" : "type-17930", ++ "referenced_type" : "type-18013", ++ "self_type" : "type-18012", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-18023", +- "self_type" : "type-18022", ++ "referenced_type" : "type-18128", ++ "self_type" : "type-18127", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-18110", +- "self_type" : "type-18109", ++ "referenced_type" : "type-18371", ++ "self_type" : "type-18370", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-18175", +- "self_type" : "type-18174", ++ "referenced_type" : "type-18449", ++ "self_type" : "type-18448", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-18325", +- "self_type" : "type-18324", ++ "referenced_type" : "type-18618", ++ "self_type" : "type-18617", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-18455", +- "self_type" : "type-18454", ++ "referenced_type" : "type-18709", ++ "self_type" : "type-18708", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-18590", +- "self_type" : "type-18589", ++ "referenced_type" : "type-18801", ++ "self_type" : "type-18800", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-18675", +- "self_type" : "type-18674", ++ "referenced_type" : "type-18888", ++ "self_type" : "type-18887", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-18866", +- "self_type" : "type-18865", ++ "referenced_type" : "type-18953", ++ "self_type" : "type-18952", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-18963", +- "self_type" : "type-18962", ++ "referenced_type" : "type-19103", ++ "self_type" : "type-19102", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-19204", +- "self_type" : "type-19203", ++ "referenced_type" : "type-19233", ++ "self_type" : "type-19232", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-19361", +- "self_type" : "type-19360", ++ "referenced_type" : "type-19368", ++ "self_type" : "type-19367", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -165624,48 +165666,48 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-19535", +- "self_type" : "type-19534", ++ "referenced_type" : "type-19453", ++ "self_type" : "type-19452", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-19705", +- "self_type" : "type-19704", ++ "referenced_type" : "type-19644", ++ "self_type" : "type-19643", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-19873", +- "self_type" : "type-19872", ++ "referenced_type" : "type-19741", ++ "self_type" : "type-19740", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-20144", +- "self_type" : "type-20143", ++ "referenced_type" : "type-20148", ++ "self_type" : "type-20147", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-20379", +- "self_type" : "type-20378", ++ "referenced_type" : "type-20383", ++ "self_type" : "type-20382", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-20493", +- "self_type" : "type-20492", ++ "referenced_type" : "type-20500", ++ "self_type" : "type-20499", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -165673,8 +165715,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-20616", +- "self_type" : "type-20615", ++ "referenced_type" : "type-20624", ++ "self_type" : "type-20623", + "size" : 92, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -165682,88 +165724,88 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-20769", +- "self_type" : "type-20768", ++ "referenced_type" : "type-20777", ++ "self_type" : "type-20776", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-20880", +- "self_type" : "type-20879", ++ "referenced_type" : "type-20888", ++ "self_type" : "type-20887", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-20983", +- "self_type" : "type-20982", ++ "referenced_type" : "type-20991", ++ "self_type" : "type-20990", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-21106", +- "self_type" : "type-21105", ++ "referenced_type" : "type-21114", ++ "self_type" : "type-21113", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-21160", +- "self_type" : "type-21159", ++ "referenced_type" : "type-21168", ++ "self_type" : "type-21167", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-21225", +- "self_type" : "type-21224", ++ "referenced_type" : "type-21233", ++ "self_type" : "type-21232", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-21299", +- "self_type" : "type-21298", ++ "referenced_type" : "type-21307", ++ "self_type" : "type-21306", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-21375", +- "self_type" : "type-21374", ++ "referenced_type" : "type-21383", ++ "self_type" : "type-21382", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-21562", +- "self_type" : "type-21561", ++ "referenced_type" : "type-21570", ++ "self_type" : "type-21569", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-21697", +- "self_type" : "type-21696", ++ "referenced_type" : "type-21705", ++ "self_type" : "type-21704", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-21775", +- "self_type" : "type-21774", ++ "referenced_type" : "type-21783", ++ "self_type" : "type-21782", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -166860,106 +166902,106 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-15958", +- "self_type" : "type-15957", ++ "referenced_type" : "type-15446", ++ "self_type" : "type-15445", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +- "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-1626", +- "self_type" : "type-1937", +- "size" : 80, ++ "referenced_type" : "type-15774", ++ "self_type" : "type-15773", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-17027", +- "self_type" : "type-17026", ++ "referenced_type" : "type-15946", ++ "self_type" : "type-15945", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-18587", +- "self_type" : "type-18586", ++ "referenced_type" : "type-16114", ++ "self_type" : "type-16113", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { ++ "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-18672", +- "self_type" : "type-18671", ++ "referenced_type" : "type-1626", ++ "self_type" : "type-1937", ++ "size" : 80, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-18863", +- "self_type" : "type-18862", ++ "referenced_type" : "type-16729", ++ "self_type" : "type-16728", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-18960", +- "self_type" : "type-18959", ++ "referenced_type" : "type-17797", ++ "self_type" : "type-17796", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-19201", +- "self_type" : "type-19200", ++ "referenced_type" : "type-19365", ++ "self_type" : "type-19364", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-19530", +- "self_type" : "type-19529", ++ "referenced_type" : "type-19450", ++ "self_type" : "type-19449", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-19702", +- "self_type" : "type-19701", ++ "referenced_type" : "type-19641", ++ "self_type" : "type-19640", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-19870", +- "self_type" : "type-19869", ++ "referenced_type" : "type-19738", ++ "self_type" : "type-19737", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-20490", +- "self_type" : "type-20489", ++ "referenced_type" : "type-20497", ++ "self_type" : "type-20496", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-21559", +- "self_type" : "type-21558", ++ "referenced_type" : "type-21567", ++ "self_type" : "type-21566", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -167932,256 +167974,256 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-15702", +- "self_type" : "type-15701", ++ "referenced_type" : "type-15463", ++ "self_type" : "type-15462", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-15872", +- "self_type" : "type-15871", ++ "referenced_type" : "type-15613", ++ "self_type" : "type-15612", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-15975", +- "self_type" : "type-15974", ++ "referenced_type" : "type-15800", ++ "self_type" : "type-15799", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-16114", +- "self_type" : "type-16113", ++ "referenced_type" : "type-15971", ++ "self_type" : "type-15970", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-16263", +- "self_type" : "type-16262", ++ "referenced_type" : "type-16130", ++ "self_type" : "type-16129", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-16356", +- "self_type" : "type-16355", ++ "referenced_type" : "type-16475", ++ "self_type" : "type-16474", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-16456", +- "self_type" : "type-16455", ++ "referenced_type" : "type-16645", ++ "self_type" : "type-16644", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-16638", +- "self_type" : "type-16637", ++ "referenced_type" : "type-16746", ++ "self_type" : "type-16745", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-16718", +- "self_type" : "type-16717", ++ "referenced_type" : "type-16884", ++ "self_type" : "type-16883", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-16776", +- "self_type" : "type-16775", ++ "referenced_type" : "type-17033", ++ "self_type" : "type-17032", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-17248", +- "self_type" : "type-17247", ++ "referenced_type" : "type-17126", ++ "self_type" : "type-17125", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-17355", +- "self_type" : "type-17354", ++ "referenced_type" : "type-17226", ++ "self_type" : "type-17225", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-17697", +- "self_type" : "type-17696", ++ "referenced_type" : "type-17408", ++ "self_type" : "type-17407", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-17855", +- "self_type" : "type-17854", ++ "referenced_type" : "type-17488", ++ "self_type" : "type-17487", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-17943", +- "self_type" : "type-17942", ++ "referenced_type" : "type-17546", ++ "self_type" : "type-17545", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-18032", +- "self_type" : "type-18031", ++ "referenced_type" : "type-18018", ++ "self_type" : "type-18017", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-18116", +- "self_type" : "type-18115", ++ "referenced_type" : "type-18133", ++ "self_type" : "type-18132", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-18183", +- "self_type" : "type-18182", ++ "referenced_type" : "type-18475", ++ "self_type" : "type-18474", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-18345", +- "self_type" : "type-18344", ++ "referenced_type" : "type-18633", ++ "self_type" : "type-18632", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-18470", +- "self_type" : "type-18469", ++ "referenced_type" : "type-18721", ++ "self_type" : "type-18720", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-18605", +- "self_type" : "type-18604", ++ "referenced_type" : "type-18810", ++ "self_type" : "type-18809", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-18696", +- "self_type" : "type-18695", ++ "referenced_type" : "type-18894", ++ "self_type" : "type-18893", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-18975", +- "self_type" : "type-18974", ++ "referenced_type" : "type-18961", ++ "self_type" : "type-18960", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-19218", +- "self_type" : "type-19217", ++ "referenced_type" : "type-19123", ++ "self_type" : "type-19122", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-19369", +- "self_type" : "type-19368", ++ "referenced_type" : "type-19248", ++ "self_type" : "type-19247", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-19556", +- "self_type" : "type-19555", ++ "referenced_type" : "type-19383", ++ "self_type" : "type-19382", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-19727", +- "self_type" : "type-19726", ++ "referenced_type" : "type-19474", ++ "self_type" : "type-19473", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-19886", +- "self_type" : "type-19885", ++ "referenced_type" : "type-19753", ++ "self_type" : "type-19752", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-20235", +- "self_type" : "type-20234", ++ "referenced_type" : "type-20239", ++ "self_type" : "type-20238", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-20406", +- "self_type" : "type-20405", ++ "referenced_type" : "type-20410", ++ "self_type" : "type-20409", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-20507", +- "self_type" : "type-20506", ++ "referenced_type" : "type-20514", ++ "self_type" : "type-20513", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-20645", +- "self_type" : "type-20644", ++ "referenced_type" : "type-20653", ++ "self_type" : "type-20652", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { +@@ -168196,56 +168238,56 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-20794", +- "self_type" : "type-20793", ++ "referenced_type" : "type-20802", ++ "self_type" : "type-20801", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-20887", +- "self_type" : "type-20886", ++ "referenced_type" : "type-20895", ++ "self_type" : "type-20894", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-20988", +- "self_type" : "type-20987", ++ "referenced_type" : "type-20996", ++ "self_type" : "type-20995", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-21170", +- "self_type" : "type-21169", ++ "referenced_type" : "type-21178", ++ "self_type" : "type-21177", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-21250", +- "self_type" : "type-21249", ++ "referenced_type" : "type-21258", ++ "self_type" : "type-21257", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-21308", +- "self_type" : "type-21307", ++ "referenced_type" : "type-21316", ++ "self_type" : "type-21315", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-21780", +- "self_type" : "type-21779", ++ "referenced_type" : "type-21788", ++ "self_type" : "type-21787", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { +@@ -169254,32 +169296,32 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-17548", +- "self_type" : "type-17547", ++ "referenced_type" : "type-18326", ++ "self_type" : "type-18325", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-18253", +- "self_type" : "type-18252", ++ "referenced_type" : "type-19031", ++ "self_type" : "type-19030", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-18773", +- "self_type" : "type-18772", ++ "referenced_type" : "type-19551", ++ "self_type" : "type-19550", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-18861", +- "self_type" : "type-18860", ++ "referenced_type" : "type-19639", ++ "self_type" : "type-19638", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -169546,106 +169588,106 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-15936", +- "self_type" : "type-15935", ++ "referenced_type" : "type-15413", ++ "self_type" : "type-15412", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +- "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-1614", +- "self_type" : "type-1944", +- "size" : 52, ++ "referenced_type" : "type-15749", ++ "self_type" : "type-15748", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-17001", +- "self_type" : "type-17000", ++ "referenced_type" : "type-15918", ++ "self_type" : "type-15917", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-18561", +- "self_type" : "type-18560", ++ "referenced_type" : "type-16080", ++ "self_type" : "type-16079", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { ++ "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-18643", +- "self_type" : "type-18642", ++ "referenced_type" : "type-1614", ++ "self_type" : "type-1944", ++ "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-18834", +- "self_type" : "type-18833", ++ "referenced_type" : "type-16707", ++ "self_type" : "type-16706", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-18928", +- "self_type" : "type-18927", ++ "referenced_type" : "type-17771", ++ "self_type" : "type-17770", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-19168", +- "self_type" : "type-19167", ++ "referenced_type" : "type-19339", ++ "self_type" : "type-19338", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-19505", +- "self_type" : "type-19504", ++ "referenced_type" : "type-19421", ++ "self_type" : "type-19420", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-19674", +- "self_type" : "type-19673", ++ "referenced_type" : "type-19612", ++ "self_type" : "type-19611", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-19836", +- "self_type" : "type-19835", ++ "referenced_type" : "type-19706", ++ "self_type" : "type-19705", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-20468", +- "self_type" : "type-20467", ++ "referenced_type" : "type-20475", ++ "self_type" : "type-20474", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-21533", +- "self_type" : "type-21532", ++ "referenced_type" : "type-21541", ++ "self_type" : "type-21540", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -170032,106 +170074,106 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-15954", +- "self_type" : "type-15953", ++ "referenced_type" : "type-15442", ++ "self_type" : "type-15441", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +- "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-1622", +- "self_type" : "type-1919", +- "size" : 52, ++ "referenced_type" : "type-15770", ++ "self_type" : "type-15769", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-17023", +- "self_type" : "type-17022", ++ "referenced_type" : "type-15942", ++ "self_type" : "type-15941", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-18583", +- "self_type" : "type-18582", ++ "referenced_type" : "type-16109", ++ "self_type" : "type-16108", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { ++ "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-18666", +- "self_type" : "type-18665", ++ "referenced_type" : "type-1622", ++ "self_type" : "type-1919", ++ "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-18856", +- "self_type" : "type-18855", ++ "referenced_type" : "type-16725", ++ "self_type" : "type-16724", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-18955", +- "self_type" : "type-18954", ++ "referenced_type" : "type-17793", ++ "self_type" : "type-17792", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-19197", +- "self_type" : "type-19196", ++ "referenced_type" : "type-19361", ++ "self_type" : "type-19360", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-19526", +- "self_type" : "type-19525", ++ "referenced_type" : "type-19444", ++ "self_type" : "type-19443", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-19698", +- "self_type" : "type-19697", ++ "referenced_type" : "type-19634", ++ "self_type" : "type-19633", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-19865", +- "self_type" : "type-19864", ++ "referenced_type" : "type-19733", ++ "self_type" : "type-19732", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-20486", +- "self_type" : "type-20485", ++ "referenced_type" : "type-20493", ++ "self_type" : "type-20492", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-21555", +- "self_type" : "type-21554", ++ "referenced_type" : "type-21563", ++ "self_type" : "type-21562", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -170774,264 +170816,264 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-15726", +- "self_type" : "type-15725", ++ "referenced_type" : "type-15519", ++ "self_type" : "type-15518", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-15899", +- "self_type" : "type-15898", ++ "referenced_type" : "type-15662", ++ "self_type" : "type-15661", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16179", +- "self_type" : "type-16178", ++ "referenced_type" : "type-15866", ++ "self_type" : "type-15865", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16282", +- "self_type" : "type-16281", ++ "referenced_type" : "type-16035", ++ "self_type" : "type-16034", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16422", +- "self_type" : "type-16421", ++ "referenced_type" : "type-16191", ++ "self_type" : "type-16190", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16479", +- "self_type" : "type-16478", ++ "referenced_type" : "type-16499", ++ "self_type" : "type-16498", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16659", +- "self_type" : "type-16658", ++ "referenced_type" : "type-16672", ++ "self_type" : "type-16671", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16797", +- "self_type" : "type-16796", ++ "referenced_type" : "type-16949", ++ "self_type" : "type-16948", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17302", +- "self_type" : "type-17301", ++ "referenced_type" : "type-17052", ++ "self_type" : "type-17051", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17376", +- "self_type" : "type-17375", ++ "referenced_type" : "type-17192", ++ "self_type" : "type-17191", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17422", +- "self_type" : "type-17421", ++ "referenced_type" : "type-17249", ++ "self_type" : "type-17248", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17779", +- "self_type" : "type-17778", ++ "referenced_type" : "type-17429", ++ "self_type" : "type-17428", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17880", +- "self_type" : "type-17879", ++ "referenced_type" : "type-17567", ++ "self_type" : "type-17566", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17972", +- "self_type" : "type-17971", ++ "referenced_type" : "type-18072", ++ "self_type" : "type-18071", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18083", +- "self_type" : "type-18082", ++ "referenced_type" : "type-18154", ++ "self_type" : "type-18153", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18135", +- "self_type" : "type-18134", ++ "referenced_type" : "type-18200", ++ "self_type" : "type-18199", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18222", +- "self_type" : "type-18221", ++ "referenced_type" : "type-18557", ++ "self_type" : "type-18556", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18395", +- "self_type" : "type-18394", ++ "referenced_type" : "type-18658", ++ "self_type" : "type-18657", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18522", +- "self_type" : "type-18521", ++ "referenced_type" : "type-18750", ++ "self_type" : "type-18749", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18754", +- "self_type" : "type-18753", ++ "referenced_type" : "type-18861", ++ "self_type" : "type-18860", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18885", +- "self_type" : "type-18884", ++ "referenced_type" : "type-18913", ++ "self_type" : "type-18912", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19034", +- "self_type" : "type-19033", ++ "referenced_type" : "type-19000", ++ "self_type" : "type-18999", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19274", +- "self_type" : "type-19273", ++ "referenced_type" : "type-19173", ++ "self_type" : "type-19172", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19418", +- "self_type" : "type-19417", ++ "referenced_type" : "type-19300", ++ "self_type" : "type-19299", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19622", +- "self_type" : "type-19621", ++ "referenced_type" : "type-19532", ++ "self_type" : "type-19531", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19791", +- "self_type" : "type-19790", ++ "referenced_type" : "type-19663", ++ "self_type" : "type-19662", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19947", +- "self_type" : "type-19946", ++ "referenced_type" : "type-19812", ++ "self_type" : "type-19811", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-20260", +- "self_type" : "type-20259", ++ "referenced_type" : "type-20264", ++ "self_type" : "type-20263", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-20433", +- "self_type" : "type-20432", ++ "referenced_type" : "type-20437", ++ "self_type" : "type-20436", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-20710", +- "self_type" : "type-20709", ++ "referenced_type" : "type-20718", ++ "self_type" : "type-20717", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-20813", +- "self_type" : "type-20812", ++ "referenced_type" : "type-20821", ++ "self_type" : "type-20820", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-20953", +- "self_type" : "type-20952", ++ "referenced_type" : "type-20961", ++ "self_type" : "type-20960", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-21011", +- "self_type" : "type-21010", ++ "referenced_type" : "type-21019", ++ "self_type" : "type-21018", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -171046,24 +171088,24 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-21191", +- "self_type" : "type-21190", ++ "referenced_type" : "type-21199", ++ "self_type" : "type-21198", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-21329", +- "self_type" : "type-21328", ++ "referenced_type" : "type-21337", ++ "self_type" : "type-21336", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-21834", +- "self_type" : "type-21833", ++ "referenced_type" : "type-21842", ++ "self_type" : "type-21841", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -171960,120 +172002,120 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16175", +- "self_type" : "type-16174", ++ "referenced_type" : "type-15515", ++ "self_type" : "type-15514", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17298", +- "self_type" : "type-17297", ++ "referenced_type" : "type-15658", ++ "self_type" : "type-15657", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17774", +- "self_type" : "type-17773", ++ "referenced_type" : "type-15862", ++ "self_type" : "type-15861", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18079", +- "self_type" : "type-18078", ++ "referenced_type" : "type-16030", ++ "self_type" : "type-16029", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18390", +- "self_type" : "type-18389", ++ "referenced_type" : "type-16187", ++ "self_type" : "type-16186", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18518", +- "self_type" : "type-18517", ++ "referenced_type" : "type-16945", ++ "self_type" : "type-16944", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18750", +- "self_type" : "type-18749", ++ "referenced_type" : "type-18068", ++ "self_type" : "type-18067", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19030", +- "self_type" : "type-19029", ++ "referenced_type" : "type-18552", ++ "self_type" : "type-18551", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19270", +- "self_type" : "type-19269", ++ "referenced_type" : "type-18857", ++ "self_type" : "type-18856", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19414", +- "self_type" : "type-19413", ++ "referenced_type" : "type-19168", ++ "self_type" : "type-19167", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19618", +- "self_type" : "type-19617", ++ "referenced_type" : "type-19296", ++ "self_type" : "type-19295", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19786", +- "self_type" : "type-19785", ++ "referenced_type" : "type-19528", ++ "self_type" : "type-19527", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19943", +- "self_type" : "type-19942", ++ "referenced_type" : "type-19808", ++ "self_type" : "type-19807", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-20706", +- "self_type" : "type-20705", ++ "referenced_type" : "type-20714", ++ "self_type" : "type-20713", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-21830", +- "self_type" : "type-21829", ++ "referenced_type" : "type-21838", ++ "self_type" : "type-21837", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -172530,120 +172572,120 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16171", +- "self_type" : "type-16170", ++ "referenced_type" : "type-15510", ++ "self_type" : "type-15509", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17294", +- "self_type" : "type-17293", ++ "referenced_type" : "type-15654", ++ "self_type" : "type-15653", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17770", +- "self_type" : "type-17769", ++ "referenced_type" : "type-15858", ++ "self_type" : "type-15857", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18074", +- "self_type" : "type-18073", ++ "referenced_type" : "type-16026", ++ "self_type" : "type-16025", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18386", +- "self_type" : "type-18385", ++ "referenced_type" : "type-16183", ++ "self_type" : "type-16182", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18514", +- "self_type" : "type-18513", ++ "referenced_type" : "type-16941", ++ "self_type" : "type-16940", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18746", +- "self_type" : "type-18745", ++ "referenced_type" : "type-18064", ++ "self_type" : "type-18063", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19026", +- "self_type" : "type-19025", ++ "referenced_type" : "type-18548", ++ "self_type" : "type-18547", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19265", +- "self_type" : "type-19264", ++ "referenced_type" : "type-18852", ++ "self_type" : "type-18851", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19410", +- "self_type" : "type-19409", ++ "referenced_type" : "type-19164", ++ "self_type" : "type-19163", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19614", +- "self_type" : "type-19613", ++ "referenced_type" : "type-19292", ++ "self_type" : "type-19291", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19782", +- "self_type" : "type-19781", ++ "referenced_type" : "type-19524", ++ "self_type" : "type-19523", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19939", +- "self_type" : "type-19938", ++ "referenced_type" : "type-19804", ++ "self_type" : "type-19803", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-20702", +- "self_type" : "type-20701", ++ "referenced_type" : "type-20710", ++ "self_type" : "type-20709", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-21826", +- "self_type" : "type-21825", ++ "referenced_type" : "type-21834", ++ "self_type" : "type-21833", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -173012,48 +173054,48 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18730", +- "self_type" : "type-18729", ++ "referenced_type" : "type-15494", ++ "self_type" : "type-15493", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19010", +- "self_type" : "type-19009", ++ "referenced_type" : "type-15840", ++ "self_type" : "type-15839", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19249", +- "self_type" : "type-19248", ++ "referenced_type" : "type-16009", ++ "self_type" : "type-16008", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19596", +- "self_type" : "type-19595", ++ "referenced_type" : "type-16166", ++ "self_type" : "type-16165", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19765", +- "self_type" : "type-19764", ++ "referenced_type" : "type-19508", ++ "self_type" : "type-19507", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19922", +- "self_type" : "type-19921", ++ "referenced_type" : "type-19788", ++ "self_type" : "type-19787", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -173318,120 +173360,120 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16159", +- "self_type" : "type-16158", ++ "referenced_type" : "type-15498", ++ "self_type" : "type-15497", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17282", +- "self_type" : "type-17281", ++ "referenced_type" : "type-15642", ++ "self_type" : "type-15641", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17757", +- "self_type" : "type-17756", ++ "referenced_type" : "type-15844", ++ "self_type" : "type-15843", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18062", +- "self_type" : "type-18061", ++ "referenced_type" : "type-16013", ++ "self_type" : "type-16012", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18374", +- "self_type" : "type-18373", ++ "referenced_type" : "type-16170", ++ "self_type" : "type-16169", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18502", +- "self_type" : "type-18501", ++ "referenced_type" : "type-16929", ++ "self_type" : "type-16928", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18734", +- "self_type" : "type-18733", ++ "referenced_type" : "type-18052", ++ "self_type" : "type-18051", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19014", +- "self_type" : "type-19013", ++ "referenced_type" : "type-18535", ++ "self_type" : "type-18534", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19253", +- "self_type" : "type-19252", ++ "referenced_type" : "type-18840", ++ "self_type" : "type-18839", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19398", +- "self_type" : "type-19397", ++ "referenced_type" : "type-19152", ++ "self_type" : "type-19151", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19600", +- "self_type" : "type-19599", ++ "referenced_type" : "type-19280", ++ "self_type" : "type-19279", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19769", +- "self_type" : "type-19768", ++ "referenced_type" : "type-19512", ++ "self_type" : "type-19511", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19926", +- "self_type" : "type-19925", ++ "referenced_type" : "type-19792", ++ "self_type" : "type-19791", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-20690", +- "self_type" : "type-20689", ++ "referenced_type" : "type-20698", ++ "self_type" : "type-20697", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-21814", +- "self_type" : "type-21813", ++ "referenced_type" : "type-21822", ++ "self_type" : "type-21821", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -173888,120 +173930,120 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16163", +- "self_type" : "type-16162", ++ "referenced_type" : "type-15502", ++ "self_type" : "type-15501", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17286", +- "self_type" : "type-17285", ++ "referenced_type" : "type-15646", ++ "self_type" : "type-15645", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17761", +- "self_type" : "type-17760", ++ "referenced_type" : "type-15850", ++ "self_type" : "type-15849", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18066", +- "self_type" : "type-18065", ++ "referenced_type" : "type-16017", ++ "self_type" : "type-16016", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18378", +- "self_type" : "type-18377", ++ "referenced_type" : "type-16174", ++ "self_type" : "type-16173", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18506", +- "self_type" : "type-18505", ++ "referenced_type" : "type-16933", ++ "self_type" : "type-16932", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18738", +- "self_type" : "type-18737", ++ "referenced_type" : "type-18056", ++ "self_type" : "type-18055", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19018", +- "self_type" : "type-19017", ++ "referenced_type" : "type-18539", ++ "self_type" : "type-18538", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19257", +- "self_type" : "type-19256", ++ "referenced_type" : "type-18844", ++ "self_type" : "type-18843", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19402", +- "self_type" : "type-19401", ++ "referenced_type" : "type-19156", ++ "self_type" : "type-19155", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19606", +- "self_type" : "type-19605", ++ "referenced_type" : "type-19284", ++ "self_type" : "type-19283", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19773", +- "self_type" : "type-19772", ++ "referenced_type" : "type-19516", ++ "self_type" : "type-19515", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19930", +- "self_type" : "type-19929", ++ "referenced_type" : "type-19796", ++ "self_type" : "type-19795", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-20694", +- "self_type" : "type-20693", ++ "referenced_type" : "type-20702", ++ "self_type" : "type-20701", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-21818", +- "self_type" : "type-21817", ++ "referenced_type" : "type-21826", ++ "self_type" : "type-21825", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -174458,120 +174500,120 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16167", +- "self_type" : "type-16166", ++ "referenced_type" : "type-15506", ++ "self_type" : "type-15505", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17290", +- "self_type" : "type-17289", ++ "referenced_type" : "type-15650", ++ "self_type" : "type-15649", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17766", +- "self_type" : "type-17765", ++ "referenced_type" : "type-15854", ++ "self_type" : "type-15853", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18070", +- "self_type" : "type-18069", ++ "referenced_type" : "type-16022", ++ "self_type" : "type-16021", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18382", +- "self_type" : "type-18381", ++ "referenced_type" : "type-16178", ++ "self_type" : "type-16177", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18510", +- "self_type" : "type-18509", ++ "referenced_type" : "type-16937", ++ "self_type" : "type-16936", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18742", +- "self_type" : "type-18741", ++ "referenced_type" : "type-18060", ++ "self_type" : "type-18059", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19022", +- "self_type" : "type-19021", ++ "referenced_type" : "type-18544", ++ "self_type" : "type-18543", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19261", +- "self_type" : "type-19260", ++ "referenced_type" : "type-18848", ++ "self_type" : "type-18847", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19406", +- "self_type" : "type-19405", ++ "referenced_type" : "type-19160", ++ "self_type" : "type-19159", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19610", +- "self_type" : "type-19609", ++ "referenced_type" : "type-19288", ++ "self_type" : "type-19287", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19778", +- "self_type" : "type-19777", ++ "referenced_type" : "type-19520", ++ "self_type" : "type-19519", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19934", +- "self_type" : "type-19933", ++ "referenced_type" : "type-19800", ++ "self_type" : "type-19799", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-20698", +- "self_type" : "type-20697", ++ "referenced_type" : "type-20706", ++ "self_type" : "type-20705", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-21822", +- "self_type" : "type-21821", ++ "referenced_type" : "type-21830", ++ "self_type" : "type-21829", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -175280,264 +175322,264 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-15711", +- "self_type" : "type-15710", ++ "referenced_type" : "type-15471", ++ "self_type" : "type-15470", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-15880", +- "self_type" : "type-15879", ++ "referenced_type" : "type-15621", ++ "self_type" : "type-15620", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-15988", +- "self_type" : "type-15987", ++ "referenced_type" : "type-15809", ++ "self_type" : "type-15808", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16122", +- "self_type" : "type-16121", ++ "referenced_type" : "type-15979", ++ "self_type" : "type-15978", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16271", +- "self_type" : "type-16270", ++ "referenced_type" : "type-16139", ++ "self_type" : "type-16138", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16364", +- "self_type" : "type-16363", ++ "referenced_type" : "type-16484", ++ "self_type" : "type-16483", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16464", +- "self_type" : "type-16463", ++ "referenced_type" : "type-16653", ++ "self_type" : "type-16652", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16646", +- "self_type" : "type-16645", ++ "referenced_type" : "type-16759", ++ "self_type" : "type-16758", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16726", +- "self_type" : "type-16725", ++ "referenced_type" : "type-16892", ++ "self_type" : "type-16891", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16784", +- "self_type" : "type-16783", ++ "referenced_type" : "type-17041", ++ "self_type" : "type-17040", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16858", +- "self_type" : "type-16857", ++ "referenced_type" : "type-17134", ++ "self_type" : "type-17133", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17256", +- "self_type" : "type-17255", ++ "referenced_type" : "type-17234", ++ "self_type" : "type-17233", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17363", +- "self_type" : "type-17362", ++ "referenced_type" : "type-17416", ++ "self_type" : "type-17415", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17863", +- "self_type" : "type-17862", ++ "referenced_type" : "type-17496", ++ "self_type" : "type-17495", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17951", +- "self_type" : "type-17950", ++ "referenced_type" : "type-17554", ++ "self_type" : "type-17553", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18041", +- "self_type" : "type-18040", ++ "referenced_type" : "type-17628", ++ "self_type" : "type-17627", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18124", +- "self_type" : "type-18123", ++ "referenced_type" : "type-18026", ++ "self_type" : "type-18025", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18191", +- "self_type" : "type-18190", ++ "referenced_type" : "type-18141", ++ "self_type" : "type-18140", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18353", +- "self_type" : "type-18352", ++ "referenced_type" : "type-18641", ++ "self_type" : "type-18640", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18478", +- "self_type" : "type-18477", ++ "referenced_type" : "type-18729", ++ "self_type" : "type-18728", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18620", +- "self_type" : "type-18619", ++ "referenced_type" : "type-18819", ++ "self_type" : "type-18818", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18704", +- "self_type" : "type-18703", ++ "referenced_type" : "type-18902", ++ "self_type" : "type-18901", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18984", +- "self_type" : "type-18983", ++ "referenced_type" : "type-18969", ++ "self_type" : "type-18968", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19226", +- "self_type" : "type-19225", ++ "referenced_type" : "type-19131", ++ "self_type" : "type-19130", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19377", +- "self_type" : "type-19376", ++ "referenced_type" : "type-19256", ++ "self_type" : "type-19255", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19565", +- "self_type" : "type-19564", ++ "referenced_type" : "type-19398", ++ "self_type" : "type-19397", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19735", +- "self_type" : "type-19734", ++ "referenced_type" : "type-19482", ++ "self_type" : "type-19481", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19895", +- "self_type" : "type-19894", ++ "referenced_type" : "type-19762", ++ "self_type" : "type-19761", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20244", +- "self_type" : "type-20243", ++ "referenced_type" : "type-20248", ++ "self_type" : "type-20247", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20414", +- "self_type" : "type-20413", ++ "referenced_type" : "type-20418", ++ "self_type" : "type-20417", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20520", +- "self_type" : "type-20519", ++ "referenced_type" : "type-20527", ++ "self_type" : "type-20526", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20653", +- "self_type" : "type-20652", ++ "referenced_type" : "type-20661", ++ "self_type" : "type-20660", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20802", +- "self_type" : "type-20801", ++ "referenced_type" : "type-20810", ++ "self_type" : "type-20809", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { +@@ -175552,56 +175594,56 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20895", +- "self_type" : "type-20894", ++ "referenced_type" : "type-20903", ++ "self_type" : "type-20902", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20996", +- "self_type" : "type-20995", ++ "referenced_type" : "type-21004", ++ "self_type" : "type-21003", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21178", +- "self_type" : "type-21177", ++ "referenced_type" : "type-21186", ++ "self_type" : "type-21185", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21258", +- "self_type" : "type-21257", ++ "referenced_type" : "type-21266", ++ "self_type" : "type-21265", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21316", +- "self_type" : "type-21315", ++ "referenced_type" : "type-21324", ++ "self_type" : "type-21323", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21390", +- "self_type" : "type-21389", ++ "referenced_type" : "type-21398", ++ "self_type" : "type-21397", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21788", +- "self_type" : "type-21787", ++ "referenced_type" : "type-21796", ++ "self_type" : "type-21795", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { +@@ -176778,296 +176820,296 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-15729", +- "self_type" : "type-15728", ++ "referenced_type" : "type-15522", ++ "self_type" : "type-15521", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-15902", +- "self_type" : "type-15901", ++ "referenced_type" : "type-15665", ++ "self_type" : "type-15664", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16184", +- "self_type" : "type-16183", ++ "referenced_type" : "type-15869", ++ "self_type" : "type-15868", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16285", +- "self_type" : "type-16284", ++ "referenced_type" : "type-16038", ++ "self_type" : "type-16037", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16425", +- "self_type" : "type-16424", ++ "referenced_type" : "type-16194", ++ "self_type" : "type-16193", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16482", +- "self_type" : "type-16481", ++ "referenced_type" : "type-16502", ++ "self_type" : "type-16501", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16594", +- "self_type" : "type-16593", ++ "referenced_type" : "type-16675", ++ "self_type" : "type-16674", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16662", +- "self_type" : "type-16661", ++ "referenced_type" : "type-16954", ++ "self_type" : "type-16953", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16715", +- "self_type" : "type-16714", ++ "referenced_type" : "type-17055", ++ "self_type" : "type-17054", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16800", +- "self_type" : "type-16799", ++ "referenced_type" : "type-17195", ++ "self_type" : "type-17194", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16868", +- "self_type" : "type-16867", ++ "referenced_type" : "type-17252", ++ "self_type" : "type-17251", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17107", +- "self_type" : "type-17106", ++ "referenced_type" : "type-17364", ++ "self_type" : "type-17363", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17305", +- "self_type" : "type-17304", ++ "referenced_type" : "type-17432", ++ "self_type" : "type-17431", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17379", +- "self_type" : "type-17378", ++ "referenced_type" : "type-17485", ++ "self_type" : "type-17484", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17425", +- "self_type" : "type-17424", ++ "referenced_type" : "type-17570", ++ "self_type" : "type-17569", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17782", +- "self_type" : "type-17781", ++ "referenced_type" : "type-17638", ++ "self_type" : "type-17637", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17883", +- "self_type" : "type-17882", ++ "referenced_type" : "type-17877", ++ "self_type" : "type-17876", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17975", +- "self_type" : "type-17974", ++ "referenced_type" : "type-18075", ++ "self_type" : "type-18074", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18086", +- "self_type" : "type-18085", ++ "referenced_type" : "type-18157", ++ "self_type" : "type-18156", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18138", +- "self_type" : "type-18137", ++ "referenced_type" : "type-18203", ++ "self_type" : "type-18202", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18227", +- "self_type" : "type-18226", ++ "referenced_type" : "type-18560", ++ "self_type" : "type-18559", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18398", +- "self_type" : "type-18397", ++ "referenced_type" : "type-18661", ++ "self_type" : "type-18660", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18525", +- "self_type" : "type-18524", ++ "referenced_type" : "type-18753", ++ "self_type" : "type-18752", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18757", +- "self_type" : "type-18756", ++ "referenced_type" : "type-18864", ++ "self_type" : "type-18863", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18889", +- "self_type" : "type-18888", ++ "referenced_type" : "type-18916", ++ "self_type" : "type-18915", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19037", +- "self_type" : "type-19036", ++ "referenced_type" : "type-19005", ++ "self_type" : "type-19004", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19277", +- "self_type" : "type-19276", ++ "referenced_type" : "type-19176", ++ "self_type" : "type-19175", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19421", +- "self_type" : "type-19420", ++ "referenced_type" : "type-19303", ++ "self_type" : "type-19302", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19625", +- "self_type" : "type-19624", ++ "referenced_type" : "type-19535", ++ "self_type" : "type-19534", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19794", +- "self_type" : "type-19793", ++ "referenced_type" : "type-19667", ++ "self_type" : "type-19666", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19950", +- "self_type" : "type-19949", ++ "referenced_type" : "type-19815", ++ "self_type" : "type-19814", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20263", +- "self_type" : "type-20262", ++ "referenced_type" : "type-20267", ++ "self_type" : "type-20266", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20436", +- "self_type" : "type-20435", ++ "referenced_type" : "type-20440", ++ "self_type" : "type-20439", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20715", +- "self_type" : "type-20714", ++ "referenced_type" : "type-20723", ++ "self_type" : "type-20722", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20816", +- "self_type" : "type-20815", ++ "referenced_type" : "type-20824", ++ "self_type" : "type-20823", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20956", +- "self_type" : "type-20955", ++ "referenced_type" : "type-20964", ++ "self_type" : "type-20963", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21014", +- "self_type" : "type-21013", ++ "referenced_type" : "type-21022", ++ "self_type" : "type-21021", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -177082,56 +177124,56 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21126", +- "self_type" : "type-21125", ++ "referenced_type" : "type-21134", ++ "self_type" : "type-21133", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21194", +- "self_type" : "type-21193", ++ "referenced_type" : "type-21202", ++ "self_type" : "type-21201", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21247", +- "self_type" : "type-21246", ++ "referenced_type" : "type-21255", ++ "self_type" : "type-21254", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21332", +- "self_type" : "type-21331", ++ "referenced_type" : "type-21340", ++ "self_type" : "type-21339", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21400", +- "self_type" : "type-21399", ++ "referenced_type" : "type-21408", ++ "self_type" : "type-21407", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21639", +- "self_type" : "type-21638", ++ "referenced_type" : "type-21647", ++ "self_type" : "type-21646", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21837", +- "self_type" : "type-21836", ++ "referenced_type" : "type-21845", ++ "self_type" : "type-21844", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -178204,24 +178246,24 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > >", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > >", +- "referenced_type" : "type-15983", +- "self_type" : "type-15982", ++ "referenced_type" : "type-16754", ++ "self_type" : "type-16753", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > >", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > >", +- "referenced_type" : "type-18615", +- "self_type" : "type-18614", ++ "referenced_type" : "type-19393", ++ "self_type" : "type-19392", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > >", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > >", +- "referenced_type" : "type-20515", +- "self_type" : "type-20514", ++ "referenced_type" : "type-20522", ++ "self_type" : "type-20521", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { +@@ -178396,106 +178438,106 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-15950", +- "self_type" : "type-15949", ++ "referenced_type" : "type-15438", ++ "self_type" : "type-15437", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +- "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-1624", +- "self_type" : "type-1913", +- "size" : 52, ++ "referenced_type" : "type-15766", ++ "self_type" : "type-15765", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-17019", +- "self_type" : "type-17018", ++ "referenced_type" : "type-15937", ++ "self_type" : "type-15936", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-18578", +- "self_type" : "type-18577", ++ "referenced_type" : "type-16104", ++ "self_type" : "type-16103", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { ++ "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-18662", +- "self_type" : "type-18661", ++ "referenced_type" : "type-1624", ++ "self_type" : "type-1913", ++ "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-18852", +- "self_type" : "type-18851", ++ "referenced_type" : "type-16721", ++ "self_type" : "type-16720", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-18950", +- "self_type" : "type-18949", ++ "referenced_type" : "type-17789", ++ "self_type" : "type-17788", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-19193", +- "self_type" : "type-19192", ++ "referenced_type" : "type-19356", ++ "self_type" : "type-19355", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-19522", +- "self_type" : "type-19521", ++ "referenced_type" : "type-19440", ++ "self_type" : "type-19439", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-19693", +- "self_type" : "type-19692", ++ "referenced_type" : "type-19630", ++ "self_type" : "type-19629", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-19860", +- "self_type" : "type-19859", ++ "referenced_type" : "type-19728", ++ "self_type" : "type-19727", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-20482", +- "self_type" : "type-20481", ++ "referenced_type" : "type-20489", ++ "self_type" : "type-20488", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-21551", +- "self_type" : "type-21550", ++ "referenced_type" : "type-21559", ++ "self_type" : "type-21558", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -178832,106 +178874,106 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-15964", +- "self_type" : "type-15963", ++ "referenced_type" : "type-15453", ++ "self_type" : "type-15452", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +- "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-1628", +- "self_type" : "type-1942", +- "size" : 32, ++ "referenced_type" : "type-15782", ++ "self_type" : "type-15781", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-17034", +- "self_type" : "type-17033", ++ "referenced_type" : "type-15952", ++ "self_type" : "type-15951", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-18593", +- "self_type" : "type-18592", ++ "referenced_type" : "type-16122", ++ "self_type" : "type-16121", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { ++ "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-18678", +- "self_type" : "type-18677", ++ "referenced_type" : "type-1628", ++ "self_type" : "type-1942", ++ "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-18869", +- "self_type" : "type-18868", ++ "referenced_type" : "type-16735", ++ "self_type" : "type-16734", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-18967", +- "self_type" : "type-18966", ++ "referenced_type" : "type-17804", ++ "self_type" : "type-17803", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-19208", +- "self_type" : "type-19207", ++ "referenced_type" : "type-19371", ++ "self_type" : "type-19370", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-19538", +- "self_type" : "type-19537", ++ "referenced_type" : "type-19456", ++ "self_type" : "type-19455", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-19708", +- "self_type" : "type-19707", ++ "referenced_type" : "type-19647", ++ "self_type" : "type-19646", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-19878", +- "self_type" : "type-19877", ++ "referenced_type" : "type-19745", ++ "self_type" : "type-19744", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-20496", +- "self_type" : "type-20495", ++ "referenced_type" : "type-20503", ++ "self_type" : "type-20502", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-21566", +- "self_type" : "type-21565", ++ "referenced_type" : "type-21574", ++ "self_type" : "type-21573", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -179612,7 +179654,7 @@ + "linker_set_key" : "const google::protobuf::hash", + "name" : "const google::protobuf::hash", + "referenced_type" : "type-4258", +- "self_type" : "type-19663", ++ "self_type" : "type-15907", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -179651,8 +179693,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::hash_set, std::equal_to >", + "name" : "const google::protobuf::hash_set, std::equal_to >", +- "referenced_type" : "type-19464", +- "self_type" : "type-19812", ++ "referenced_type" : "type-15708", ++ "self_type" : "type-16056", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -179758,8 +179800,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0>", + "name" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0>", +- "referenced_type" : "type-18896", +- "self_type" : "type-18895", ++ "referenced_type" : "type-19674", ++ "self_type" : "type-19673", + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, + { +@@ -180273,8 +180315,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19875", +- "self_type" : "type-19884", ++ "referenced_type" : "type-16119", ++ "self_type" : "type-16128", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180293,8 +180335,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr >", + "name" : "const google::protobuf::internal::scoped_ptr >", +- "referenced_type" : "type-19633", +- "self_type" : "type-19638", ++ "referenced_type" : "type-15877", ++ "self_type" : "type-15882", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180333,8 +180375,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19842", +- "self_type" : "type-19862", ++ "referenced_type" : "type-16086", ++ "self_type" : "type-16106", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180363,8 +180405,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19469", +- "self_type" : "type-19549", ++ "referenced_type" : "type-15713", ++ "self_type" : "type-15793", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180403,8 +180445,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19150", +- "self_type" : "type-19172", ++ "referenced_type" : "type-15395", ++ "self_type" : "type-15417", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180413,8 +180455,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19470", +- "self_type" : "type-19560", ++ "referenced_type" : "type-15714", ++ "self_type" : "type-15804", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180423,8 +180465,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19446", +- "self_type" : "type-19628", ++ "referenced_type" : "type-15690", ++ "self_type" : "type-15872", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180433,8 +180475,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19443", +- "self_type" : "type-19631", ++ "referenced_type" : "type-15687", ++ "self_type" : "type-15875", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180443,8 +180485,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19449", +- "self_type" : "type-19586", ++ "referenced_type" : "type-15693", ++ "self_type" : "type-15830", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180453,8 +180495,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19459", +- "self_type" : "type-19544", ++ "referenced_type" : "type-15703", ++ "self_type" : "type-15788", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180463,8 +180505,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19140", +- "self_type" : "type-19159", ++ "referenced_type" : "type-15385", ++ "self_type" : "type-15404", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180790,8 +180832,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::FieldContext", + "name" : "const google::protobuf::util::FieldContext", +- "referenced_type" : "type-18632", +- "self_type" : "type-18631", ++ "referenced_type" : "type-19410", ++ "self_type" : "type-19409", + "source_file" : "/external/protobuf/src/google/protobuf/util/field_comparator.h" + }, + { +@@ -180895,8 +180937,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::StatusOr", + "name" : "const google::protobuf::util::StatusOr", +- "referenced_type" : "type-19955", +- "self_type" : "type-19958", ++ "referenced_type" : "type-16199", ++ "self_type" : "type-16202", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -181015,8 +181057,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::converter::ObjectLocationTracker", + "name" : "const google::protobuf::util::converter::ObjectLocationTracker", +- "referenced_type" : "type-19644", +- "self_type" : "type-19648", ++ "referenced_type" : "type-15888", ++ "self_type" : "type-15892", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/object_location_tracker.h" + }, +@@ -181025,8 +181067,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::converter::ObjectSource", + "name" : "const google::protobuf::util::converter::ObjectSource", +- "referenced_type" : "type-19326", +- "self_type" : "type-19428", ++ "referenced_type" : "type-15570", ++ "self_type" : "type-15672", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/object_source.h" + }, +@@ -181045,8 +181087,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::converter::ProtoStreamObjectSource", + "name" : "const google::protobuf::util::converter::ProtoStreamObjectSource", +- "referenced_type" : "type-19324", +- "self_type" : "type-19323", ++ "referenced_type" : "type-15569", ++ "self_type" : "type-15568", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -181055,8 +181097,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::converter::ProtoStreamObjectWriter::Item", + "name" : "const google::protobuf::util::converter::ProtoStreamObjectWriter::Item", +- "referenced_type" : "type-19445", +- "self_type" : "type-19641", ++ "referenced_type" : "type-15689", ++ "self_type" : "type-15885", + "size" : 40, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, +@@ -181065,8 +181107,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::converter::ProtoStreamObjectWriter::Options", + "name" : "const google::protobuf::util::converter::ProtoStreamObjectWriter::Options", +- "referenced_type" : "type-19457", +- "self_type" : "type-19456", ++ "referenced_type" : "type-15701", ++ "self_type" : "type-15700", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, +@@ -181075,8 +181117,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::converter::ProtoWriter::ProtoElement", + "name" : "const google::protobuf::util::converter::ProtoWriter::ProtoElement", +- "referenced_type" : "type-19461", +- "self_type" : "type-19635", ++ "referenced_type" : "type-15705", ++ "self_type" : "type-15879", + "size" : 64, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, +@@ -181085,8 +181127,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::converter::StructuredObjectWriter::BaseElement", + "name" : "const google::protobuf::util::converter::StructuredObjectWriter::BaseElement", +- "referenced_type" : "type-19139", +- "self_type" : "type-19145", ++ "referenced_type" : "type-15384", ++ "self_type" : "type-15390", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/structured_objectwriter.h" + }, +@@ -181170,80 +181212,80 @@ + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-16496", +- "self_type" : "type-16495", ++ "referenced_type" : "type-17266", ++ "self_type" : "type-17265", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-16888", +- "self_type" : "type-16887", ++ "referenced_type" : "type-17658", ++ "self_type" : "type-17657", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-17063", +- "self_type" : "type-17062", ++ "referenced_type" : "type-17833", ++ "self_type" : "type-17832", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-17182", +- "self_type" : "type-17181", ++ "referenced_type" : "type-17952", ++ "self_type" : "type-17951", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-17449", +- "self_type" : "type-17448", ++ "referenced_type" : "type-18227", ++ "self_type" : "type-18226", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-18899", +- "self_type" : "type-18898", ++ "referenced_type" : "type-19677", ++ "self_type" : "type-19676", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-21028", +- "self_type" : "type-21027", ++ "referenced_type" : "type-21036", ++ "self_type" : "type-21035", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-21420", +- "self_type" : "type-21419", ++ "referenced_type" : "type-21428", ++ "self_type" : "type-21427", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-21595", +- "self_type" : "type-21594", ++ "referenced_type" : "type-21603", ++ "self_type" : "type-21602", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-21714", +- "self_type" : "type-21713", ++ "referenced_type" : "type-21722", ++ "self_type" : "type-21721", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { +@@ -181487,8 +181529,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> >", + "name" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> >", +- "referenced_type" : "type-16979", +- "self_type" : "type-16978", ++ "referenced_type" : "type-17749", ++ "self_type" : "type-17748", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181497,8 +181539,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> >", + "name" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> >", +- "referenced_type" : "type-21511", +- "self_type" : "type-21510", ++ "referenced_type" : "type-21519", ++ "self_type" : "type-21518", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181567,8 +181609,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", + "name" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", +- "referenced_type" : "type-17565", +- "self_type" : "type-17564", ++ "referenced_type" : "type-18343", ++ "self_type" : "type-18342", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181617,8 +181659,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> >", + "name" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> >", +- "referenced_type" : "type-16989", +- "self_type" : "type-16988", ++ "referenced_type" : "type-17759", ++ "self_type" : "type-17758", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181627,8 +181669,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> >", + "name" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> >", +- "referenced_type" : "type-21521", +- "self_type" : "type-21520", ++ "referenced_type" : "type-21529", ++ "self_type" : "type-21528", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181707,8 +181749,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", + "name" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", +- "referenced_type" : "type-17575", +- "self_type" : "type-17574", ++ "referenced_type" : "type-18353", ++ "self_type" : "type-18352", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181717,8 +181759,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", + "name" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", +- "referenced_type" : "type-18828", +- "self_type" : "type-18827", ++ "referenced_type" : "type-19606", ++ "self_type" : "type-19605", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181787,8 +181829,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node", + "name" : "const std::__tree_node", +- "referenced_type" : "type-16941", +- "self_type" : "type-16940", ++ "referenced_type" : "type-17711", ++ "self_type" : "type-17710", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181797,8 +181839,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node", + "name" : "const std::__tree_node", +- "referenced_type" : "type-21473", +- "self_type" : "type-21472", ++ "referenced_type" : "type-21481", ++ "self_type" : "type-21480", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181857,8 +181899,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node *>, void *>", + "name" : "const std::__tree_node *>, void *>", +- "referenced_type" : "type-16931", +- "self_type" : "type-16930", ++ "referenced_type" : "type-17701", ++ "self_type" : "type-17700", + "size" : 40, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181867,8 +181909,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node *>, void *>", + "name" : "const std::__tree_node *>, void *>", +- "referenced_type" : "type-21463", +- "self_type" : "type-21462", ++ "referenced_type" : "type-21471", ++ "self_type" : "type-21470", + "size" : 40, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181937,8 +181979,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *>", + "name" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *>", +- "referenced_type" : "type-17515", +- "self_type" : "type-17514", ++ "referenced_type" : "type-18293", ++ "self_type" : "type-18292", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181997,8 +182039,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node, std::allocator > *, void *>", + "name" : "const std::__tree_node, std::allocator > *, void *>", +- "referenced_type" : "type-17523", +- "self_type" : "type-17522", ++ "referenced_type" : "type-18301", ++ "self_type" : "type-18300", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -182047,8 +182089,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-16063", +- "self_type" : "type-16062", ++ "referenced_type" : "type-16834", ++ "self_type" : "type-16833", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182057,8 +182099,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-20595", +- "self_type" : "type-20594", ++ "referenced_type" : "type-20602", ++ "self_type" : "type-20601", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182127,8 +182169,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator &)> >", + "name" : "const std::allocator &)> >", +- "referenced_type" : "type-17143", +- "self_type" : "type-17142", ++ "referenced_type" : "type-17913", ++ "self_type" : "type-17912", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182137,8 +182179,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator &)> >", + "name" : "const std::allocator &)> >", +- "referenced_type" : "type-21675", +- "self_type" : "type-21674", ++ "referenced_type" : "type-21683", ++ "self_type" : "type-21682", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182197,8 +182239,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-16552", +- "self_type" : "type-16551", ++ "referenced_type" : "type-17322", ++ "self_type" : "type-17321", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182207,8 +182249,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-21084", +- "self_type" : "type-21083", ++ "referenced_type" : "type-21092", ++ "self_type" : "type-21091", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182277,8 +182319,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-17149", +- "self_type" : "type-17148", ++ "referenced_type" : "type-17919", ++ "self_type" : "type-17918", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182287,8 +182329,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-21681", +- "self_type" : "type-21680", ++ "referenced_type" : "type-21689", ++ "self_type" : "type-21688", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182337,8 +182379,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> >", + "name" : "const std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> >", +- "referenced_type" : "type-19488", +- "self_type" : "type-19487", ++ "referenced_type" : "type-15732", ++ "self_type" : "type-15731", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182367,8 +182409,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> >", + "name" : "const std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> >", +- "referenced_type" : "type-19346", +- "self_type" : "type-19345", ++ "referenced_type" : "type-15590", ++ "self_type" : "type-15589", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182407,8 +182449,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> >", + "name" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> >", +- "referenced_type" : "type-16071", +- "self_type" : "type-16070", ++ "referenced_type" : "type-16842", ++ "self_type" : "type-16841", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182417,8 +182459,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> >", + "name" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> >", +- "referenced_type" : "type-20603", +- "self_type" : "type-20602", ++ "referenced_type" : "type-20610", ++ "self_type" : "type-20609", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182497,8 +182539,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> >", + "name" : "const std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> >", +- "referenced_type" : "type-18441", +- "self_type" : "type-18440", ++ "referenced_type" : "type-19219", ++ "self_type" : "type-19218", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182537,8 +182579,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, int> >", + "name" : "const std::allocator, std::allocator >, int> >", +- "referenced_type" : "type-19044", +- "self_type" : "type-19043", ++ "referenced_type" : "type-19822", ++ "self_type" : "type-19821", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182597,8 +182639,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, google::protobuf::internal::ExtensionInfo> >", + "name" : "const std::allocator, google::protobuf::internal::ExtensionInfo> >", +- "referenced_type" : "type-17471", +- "self_type" : "type-17470", ++ "referenced_type" : "type-18249", ++ "self_type" : "type-18248", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -183687,8 +183729,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15397", +- "self_type" : "type-15396", ++ "referenced_type" : "type-15375", ++ "self_type" : "type-15374", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183697,8 +183739,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15409", +- "self_type" : "type-15408", ++ "referenced_type" : "type-1548", ++ "self_type" : "type-1547", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183707,8 +183749,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15445", +- "self_type" : "type-15444", ++ "referenced_type" : "type-15550", ++ "self_type" : "type-15549", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183717,8 +183759,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15478", +- "self_type" : "type-15477", ++ "referenced_type" : "type-15555", ++ "self_type" : "type-15554", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183727,8 +183769,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1548", +- "self_type" : "type-1547", ++ "referenced_type" : "type-15583", ++ "self_type" : "type-15582", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183737,8 +183779,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15511", +- "self_type" : "type-15510", ++ "referenced_type" : "type-156", ++ "self_type" : "type-155", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183747,18 +183789,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15569", +- "self_type" : "type-15568", ++ "referenced_type" : "type-15716", ++ "self_type" : "type-15715", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-156", +- "self_type" : "type-155", ++ "referenced_type" : "type-15719", ++ "self_type" : "type-15718", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183767,8 +183809,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15819", +- "self_type" : "type-15818", ++ "referenced_type" : "type-1582", ++ "self_type" : "type-1581", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183777,8 +183819,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1582", +- "self_type" : "type-1581", ++ "referenced_type" : "type-15891", ++ "self_type" : "type-15890", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183787,8 +183829,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15832", +- "self_type" : "type-15831", ++ "referenced_type" : "type-15905", ++ "self_type" : "type-15904", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183797,8 +183839,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15896", +- "self_type" : "type-15895", ++ "referenced_type" : "type-16065", ++ "self_type" : "type-16064", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183807,8 +183849,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15928", +- "self_type" : "type-15927", ++ "referenced_type" : "type-16161", ++ "self_type" : "type-16160", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183817,8 +183859,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15933", +- "self_type" : "type-15932", ++ "referenced_type" : "type-16251", ++ "self_type" : "type-16250", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183827,8 +183869,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16021", +- "self_type" : "type-16020", ++ "referenced_type" : "type-16284", ++ "self_type" : "type-16283", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183837,18 +183879,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16040", +- "self_type" : "type-16039", ++ "referenced_type" : "type-16342", ++ "self_type" : "type-16341", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16182", +- "self_type" : "type-16181", ++ "referenced_type" : "type-16592", ++ "self_type" : "type-16591", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183857,8 +183899,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16233", +- "self_type" : "type-16232", ++ "referenced_type" : "type-16605", ++ "self_type" : "type-16604", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183867,8 +183909,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16260", +- "self_type" : "type-16259", ++ "referenced_type" : "type-16669", ++ "self_type" : "type-16668", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183877,8 +183919,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16330", +- "self_type" : "type-16329", ++ "referenced_type" : "type-16699", ++ "self_type" : "type-16698", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183887,8 +183929,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16333", +- "self_type" : "type-16332", ++ "referenced_type" : "type-16704", ++ "self_type" : "type-16703", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183897,8 +183939,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16408", +- "self_type" : "type-16407", ++ "referenced_type" : "type-16792", ++ "self_type" : "type-16791", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183907,18 +183949,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16437", +- "self_type" : "type-16436", ++ "referenced_type" : "type-16811", ++ "self_type" : "type-16810", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16535", +- "self_type" : "type-16534", ++ "referenced_type" : "type-16952", ++ "self_type" : "type-16951", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183927,8 +183969,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16579", +- "self_type" : "type-16578", ++ "referenced_type" : "type-17003", ++ "self_type" : "type-17002", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183937,8 +183979,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16615", +- "self_type" : "type-16614", ++ "referenced_type" : "type-17030", ++ "self_type" : "type-17029", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183947,8 +183989,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16636", +- "self_type" : "type-16635", ++ "referenced_type" : "type-17100", ++ "self_type" : "type-17099", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183957,8 +183999,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16680", +- "self_type" : "type-16679", ++ "referenced_type" : "type-17103", ++ "self_type" : "type-17102", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183967,8 +184009,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16687", +- "self_type" : "type-16686", ++ "referenced_type" : "type-17178", ++ "self_type" : "type-17177", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183977,8 +184019,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16746", +- "self_type" : "type-16745", ++ "referenced_type" : "type-171", ++ "self_type" : "type-170", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183987,8 +184029,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16811", +- "self_type" : "type-16810", ++ "referenced_type" : "type-17207", ++ "self_type" : "type-17206", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183997,8 +184039,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16826", +- "self_type" : "type-16825", ++ "referenced_type" : "type-17305", ++ "self_type" : "type-17304", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184007,8 +184049,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16849", +- "self_type" : "type-16848", ++ "referenced_type" : "type-17349", ++ "self_type" : "type-17348", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184017,8 +184059,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16897", +- "self_type" : "type-16896", ++ "referenced_type" : "type-17385", ++ "self_type" : "type-17384", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184027,8 +184069,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17121", +- "self_type" : "type-17120", ++ "referenced_type" : "type-17406", ++ "self_type" : "type-17405", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184037,8 +184079,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-171", +- "self_type" : "type-170", ++ "referenced_type" : "type-17450", ++ "self_type" : "type-17449", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184047,8 +184089,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17231", +- "self_type" : "type-17230", ++ "referenced_type" : "type-17457", ++ "self_type" : "type-17456", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184057,8 +184099,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17241", +- "self_type" : "type-17240", ++ "referenced_type" : "type-17516", ++ "self_type" : "type-17515", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184067,8 +184109,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17314", +- "self_type" : "type-17313", ++ "referenced_type" : "type-17581", ++ "self_type" : "type-17580", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184077,8 +184119,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17326", +- "self_type" : "type-17325", ++ "referenced_type" : "type-17596", ++ "self_type" : "type-17595", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184087,8 +184129,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17386", +- "self_type" : "type-17385", ++ "referenced_type" : "type-17619", ++ "self_type" : "type-17618", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184097,8 +184139,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17399", +- "self_type" : "type-17398", ++ "referenced_type" : "type-17667", ++ "self_type" : "type-17666", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184107,8 +184149,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17641", +- "self_type" : "type-17640", ++ "referenced_type" : "type-1786", ++ "self_type" : "type-1785", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184117,8 +184159,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17655", +- "self_type" : "type-17654", ++ "referenced_type" : "type-17891", ++ "self_type" : "type-17890", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184127,8 +184169,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17823", +- "self_type" : "type-17822", ++ "referenced_type" : "type-18001", ++ "self_type" : "type-18000", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184137,8 +184179,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1786", +- "self_type" : "type-1785", ++ "referenced_type" : "type-18011", ++ "self_type" : "type-18010", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184147,8 +184189,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17911", +- "self_type" : "type-17910", ++ "referenced_type" : "type-18084", ++ "self_type" : "type-18083", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184157,8 +184199,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17987", +- "self_type" : "type-17986", ++ "referenced_type" : "type-18096", ++ "self_type" : "type-18095", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184167,8 +184209,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18096", +- "self_type" : "type-18095", ++ "referenced_type" : "type-18164", ++ "self_type" : "type-18163", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184177,8 +184219,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18151", +- "self_type" : "type-18150", ++ "referenced_type" : "type-18177", ++ "self_type" : "type-18176", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184187,8 +184229,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18180", +- "self_type" : "type-18179", ++ "referenced_type" : "type-181", ++ "self_type" : "type-180", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184197,8 +184239,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-181", +- "self_type" : "type-180", ++ "referenced_type" : "type-18419", ++ "self_type" : "type-18418", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184207,8 +184249,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18257", +- "self_type" : "type-18256", ++ "referenced_type" : "type-18433", ++ "self_type" : "type-18432", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184217,8 +184259,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18271", +- "self_type" : "type-18270", ++ "referenced_type" : "type-18601", ++ "self_type" : "type-18600", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184227,18 +184269,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18293", +- "self_type" : "type-18292", ++ "referenced_type" : "type-1861", ++ "self_type" : "type-1860", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18301", +- "self_type" : "type-18300", ++ "referenced_type" : "type-18689", ++ "self_type" : "type-18688", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184247,8 +184289,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18312", +- "self_type" : "type-18311", ++ "referenced_type" : "type-18765", ++ "self_type" : "type-18764", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184257,8 +184299,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18319", +- "self_type" : "type-18318", ++ "referenced_type" : "type-18874", ++ "self_type" : "type-18873", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184267,8 +184309,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18433", +- "self_type" : "type-18432", ++ "referenced_type" : "type-18929", ++ "self_type" : "type-18928", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184277,8 +184319,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18448", +- "self_type" : "type-18447", ++ "referenced_type" : "type-18958", ++ "self_type" : "type-18957", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184287,8 +184329,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18559", +- "self_type" : "type-18558", ++ "referenced_type" : "type-19035", ++ "self_type" : "type-19034", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184297,8 +184339,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18600", +- "self_type" : "type-18599", ++ "referenced_type" : "type-19049", ++ "self_type" : "type-19048", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184307,28 +184349,28 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1861", +- "self_type" : "type-1860", ++ "referenced_type" : "type-19071", ++ "self_type" : "type-19070", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18640", +- "self_type" : "type-18639", ++ "referenced_type" : "type-19079", ++ "self_type" : "type-19078", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18775", +- "self_type" : "type-18774", ++ "referenced_type" : "type-19090", ++ "self_type" : "type-19089", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184337,8 +184379,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18812", +- "self_type" : "type-18811", ++ "referenced_type" : "type-19097", ++ "self_type" : "type-19096", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184347,8 +184389,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18918", +- "self_type" : "type-18917", ++ "referenced_type" : "type-19211", ++ "self_type" : "type-19210", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184357,8 +184399,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19103", +- "self_type" : "type-19102", ++ "referenced_type" : "type-19226", ++ "self_type" : "type-19225", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184367,8 +184409,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19117", +- "self_type" : "type-19116", ++ "referenced_type" : "type-19337", ++ "self_type" : "type-19336", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184377,8 +184419,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19125", +- "self_type" : "type-19124", ++ "referenced_type" : "type-19378", ++ "self_type" : "type-19377", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184387,18 +184429,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19130", +- "self_type" : "type-19129", ++ "referenced_type" : "type-19418", ++ "self_type" : "type-19417", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19305", +- "self_type" : "type-19304", ++ "referenced_type" : "type-194", ++ "self_type" : "type-193", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184407,8 +184449,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19310", +- "self_type" : "type-19309", ++ "referenced_type" : "type-19553", ++ "self_type" : "type-19552", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184417,8 +184459,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19339", +- "self_type" : "type-19338", ++ "referenced_type" : "type-19590", ++ "self_type" : "type-19589", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184427,8 +184469,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19472", +- "self_type" : "type-19471", ++ "referenced_type" : "type-19696", ++ "self_type" : "type-19695", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184437,8 +184479,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19475", +- "self_type" : "type-19474", ++ "referenced_type" : "type-19881", ++ "self_type" : "type-19880", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184447,8 +184489,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-194", +- "self_type" : "type-193", ++ "referenced_type" : "type-19895", ++ "self_type" : "type-19894", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184457,8 +184499,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19647", +- "self_type" : "type-19646", ++ "referenced_type" : "type-19903", ++ "self_type" : "type-19902", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184467,8 +184509,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19661", +- "self_type" : "type-19660", ++ "referenced_type" : "type-19930", ++ "self_type" : "type-19929", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184477,8 +184519,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19821", +- "self_type" : "type-19820", ++ "referenced_type" : "type-19942", ++ "self_type" : "type-19941", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184487,8 +184529,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19917", +- "self_type" : "type-19916", ++ "referenced_type" : "type-19978", ++ "self_type" : "type-19977", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184497,8 +184539,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20007", +- "self_type" : "type-20006", ++ "referenced_type" : "type-20011", ++ "self_type" : "type-20010", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184507,8 +184549,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20044", +- "self_type" : "type-20043", ++ "referenced_type" : "type-20048", ++ "self_type" : "type-20047", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184517,8 +184559,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20102", +- "self_type" : "type-20101", ++ "referenced_type" : "type-20106", ++ "self_type" : "type-20105", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, +@@ -184527,8 +184569,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20353", +- "self_type" : "type-20352", ++ "referenced_type" : "type-20357", ++ "self_type" : "type-20356", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184537,8 +184579,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20366", +- "self_type" : "type-20365", ++ "referenced_type" : "type-20370", ++ "self_type" : "type-20369", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184547,8 +184589,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20430", +- "self_type" : "type-20429", ++ "referenced_type" : "type-20434", ++ "self_type" : "type-20433", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184557,8 +184599,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20460", +- "self_type" : "type-20459", ++ "referenced_type" : "type-20467", ++ "self_type" : "type-20466", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184567,8 +184609,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20465", +- "self_type" : "type-20464", ++ "referenced_type" : "type-20472", ++ "self_type" : "type-20471", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184577,8 +184619,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20553", +- "self_type" : "type-20552", ++ "referenced_type" : "type-20560", ++ "self_type" : "type-20559", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184587,8 +184629,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20572", +- "self_type" : "type-20571", ++ "referenced_type" : "type-20579", ++ "self_type" : "type-20578", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -184597,8 +184639,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20713", +- "self_type" : "type-20712", ++ "referenced_type" : "type-20721", ++ "self_type" : "type-20720", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184607,8 +184649,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20764", +- "self_type" : "type-20763", ++ "referenced_type" : "type-20772", ++ "self_type" : "type-20771", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184617,8 +184659,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20791", +- "self_type" : "type-20790", ++ "referenced_type" : "type-20799", ++ "self_type" : "type-20798", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184627,8 +184669,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20861", +- "self_type" : "type-20860", ++ "referenced_type" : "type-20869", ++ "self_type" : "type-20868", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184637,8 +184679,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20864", +- "self_type" : "type-20863", ++ "referenced_type" : "type-20872", ++ "self_type" : "type-20871", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184657,8 +184699,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20939", +- "self_type" : "type-20938", ++ "referenced_type" : "type-20947", ++ "self_type" : "type-20946", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184667,8 +184709,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20968", +- "self_type" : "type-20967", ++ "referenced_type" : "type-20976", ++ "self_type" : "type-20975", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184677,8 +184719,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21067", +- "self_type" : "type-21066", ++ "referenced_type" : "type-21075", ++ "self_type" : "type-21074", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184687,8 +184729,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21111", +- "self_type" : "type-21110", ++ "referenced_type" : "type-21119", ++ "self_type" : "type-21118", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184697,8 +184739,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21147", +- "self_type" : "type-21146", ++ "referenced_type" : "type-21155", ++ "self_type" : "type-21154", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184707,8 +184749,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21168", +- "self_type" : "type-21167", ++ "referenced_type" : "type-21176", ++ "self_type" : "type-21175", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184717,8 +184759,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21212", +- "self_type" : "type-21211", ++ "referenced_type" : "type-21220", ++ "self_type" : "type-21219", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184727,8 +184769,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21219", +- "self_type" : "type-21218", ++ "referenced_type" : "type-21227", ++ "self_type" : "type-21226", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184737,8 +184779,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21278", +- "self_type" : "type-21277", ++ "referenced_type" : "type-21286", ++ "self_type" : "type-21285", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184747,8 +184789,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21343", +- "self_type" : "type-21342", ++ "referenced_type" : "type-21351", ++ "self_type" : "type-21350", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184757,8 +184799,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21358", +- "self_type" : "type-21357", ++ "referenced_type" : "type-21366", ++ "self_type" : "type-21365", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184767,8 +184809,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21381", +- "self_type" : "type-21380", ++ "referenced_type" : "type-21389", ++ "self_type" : "type-21388", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184777,8 +184819,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21429", +- "self_type" : "type-21428", ++ "referenced_type" : "type-21437", ++ "self_type" : "type-21436", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184787,8 +184829,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21653", +- "self_type" : "type-21652", ++ "referenced_type" : "type-21661", ++ "self_type" : "type-21660", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184797,8 +184839,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21763", +- "self_type" : "type-21762", ++ "referenced_type" : "type-21771", ++ "self_type" : "type-21770", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184807,8 +184849,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21773", +- "self_type" : "type-21772", ++ "referenced_type" : "type-21781", ++ "self_type" : "type-21780", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184817,8 +184859,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21846", +- "self_type" : "type-21845", ++ "referenced_type" : "type-21854", ++ "self_type" : "type-21853", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184827,8 +184869,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21858", +- "self_type" : "type-21857", ++ "referenced_type" : "type-21866", ++ "self_type" : "type-21865", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -188057,8 +188099,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-16549", +- "self_type" : "type-16548", ++ "referenced_type" : "type-17319", ++ "self_type" : "type-17318", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188067,8 +188109,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-17146", +- "self_type" : "type-17145", ++ "referenced_type" : "type-17916", ++ "self_type" : "type-17915", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188077,8 +188119,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-21081", +- "self_type" : "type-21080", ++ "referenced_type" : "type-21089", ++ "self_type" : "type-21088", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188087,8 +188129,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-21678", +- "self_type" : "type-21677", ++ "referenced_type" : "type-21686", ++ "self_type" : "type-21685", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188197,8 +188239,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-16910", +- "self_type" : "type-16909", ++ "referenced_type" : "type-17680", ++ "self_type" : "type-17679", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -188207,8 +188249,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-21442", +- "self_type" : "type-21441", ++ "referenced_type" : "type-21450", ++ "self_type" : "type-21449", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -188317,8 +188359,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-16068", +- "self_type" : "type-16067", ++ "referenced_type" : "type-15587", ++ "self_type" : "type-15586", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188327,18 +188369,18 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-17492", +- "self_type" : "type-17491", ++ "referenced_type" : "type-15729", ++ "self_type" : "type-15728", + "size" : 1, +- "source_file" : "/external/protobuf/src/google/protobuf/arena.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, + { + "alignment" : 1, + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-18438", +- "self_type" : "type-18437", ++ "referenced_type" : "type-16839", ++ "self_type" : "type-16838", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188347,18 +188389,18 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-19041", +- "self_type" : "type-19040", ++ "referenced_type" : "type-18270", ++ "self_type" : "type-18269", + "size" : 1, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, + { + "alignment" : 1, + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-19343", +- "self_type" : "type-19342", ++ "referenced_type" : "type-19216", ++ "self_type" : "type-19215", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188367,8 +188409,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-19485", +- "self_type" : "type-19484", ++ "referenced_type" : "type-19819", ++ "self_type" : "type-19818", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188377,8 +188419,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-20600", +- "self_type" : "type-20599", ++ "referenced_type" : "type-20607", ++ "self_type" : "type-20606", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188577,8 +188619,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to >", + "name" : "const std::equal_to >", +- "referenced_type" : "type-17468", +- "self_type" : "type-17467", ++ "referenced_type" : "type-18246", ++ "self_type" : "type-18245", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188667,8 +188709,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator > >", + "name" : "const std::map, std::allocator > >", +- "referenced_type" : "type-17799", +- "self_type" : "type-17798", ++ "referenced_type" : "type-18577", ++ "self_type" : "type-18576", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188727,8 +188769,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > >", + "name" : "const std::map >, std::less, std::allocator > > > >", +- "referenced_type" : "type-17811", +- "self_type" : "type-17810", ++ "referenced_type" : "type-18589", ++ "self_type" : "type-18588", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188787,8 +188829,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > >", + "name" : "const std::map >, std::less, std::allocator > > > >", +- "referenced_type" : "type-17805", +- "self_type" : "type-17804", ++ "referenced_type" : "type-18583", ++ "self_type" : "type-18582", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188827,8 +188869,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator > >", + "name" : "const std::map, std::allocator > >", +- "referenced_type" : "type-19967", +- "self_type" : "type-19966", ++ "referenced_type" : "type-16211", ++ "self_type" : "type-16210", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188867,8 +188909,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > >", + "name" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > >", +- "referenced_type" : "type-16302", +- "self_type" : "type-16301", ++ "referenced_type" : "type-17072", ++ "self_type" : "type-17071", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188877,8 +188919,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > >", + "name" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > >", +- "referenced_type" : "type-20833", +- "self_type" : "type-20832", ++ "referenced_type" : "type-20841", ++ "self_type" : "type-20840", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188957,8 +188999,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > >", + "name" : "const std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > >", +- "referenced_type" : "type-18278", +- "self_type" : "type-18277", ++ "referenced_type" : "type-19056", ++ "self_type" : "type-19055", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -188997,8 +189039,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > >", + "name" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > >", +- "referenced_type" : "type-16314", +- "self_type" : "type-16313", ++ "referenced_type" : "type-17084", ++ "self_type" : "type-17083", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189007,8 +189049,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > >", + "name" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > >", +- "referenced_type" : "type-20845", +- "self_type" : "type-20844", ++ "referenced_type" : "type-20853", ++ "self_type" : "type-20852", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189087,8 +189129,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::pair, std::less >, std::allocator, std::pair > > >", + "name" : "const std::map, std::pair, std::less >, std::allocator, std::pair > > >", +- "referenced_type" : "type-18552", +- "self_type" : "type-18551", ++ "referenced_type" : "type-19330", ++ "self_type" : "type-19329", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189127,8 +189169,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > >", + "name" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > >", +- "referenced_type" : "type-16305", +- "self_type" : "type-16304", ++ "referenced_type" : "type-17075", ++ "self_type" : "type-17074", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189137,8 +189179,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > >", + "name" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > >", +- "referenced_type" : "type-20836", +- "self_type" : "type-20835", ++ "referenced_type" : "type-20844", ++ "self_type" : "type-20843", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189207,8 +189249,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > >", + "name" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > >", +- "referenced_type" : "type-16317", +- "self_type" : "type-16316", ++ "referenced_type" : "type-17087", ++ "self_type" : "type-17086", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189217,8 +189259,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > >", + "name" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > >", +- "referenced_type" : "type-20848", +- "self_type" : "type-20847", ++ "referenced_type" : "type-20856", ++ "self_type" : "type-20855", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189287,8 +189329,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-16026", +- "self_type" : "type-16025", ++ "referenced_type" : "type-16797", ++ "self_type" : "type-16796", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189297,8 +189339,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-20558", +- "self_type" : "type-20557", ++ "referenced_type" : "type-20565", ++ "self_type" : "type-20564", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189367,8 +189409,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair &)>", + "name" : "const std::pair &)>", +- "referenced_type" : "type-17124", +- "self_type" : "type-17123", ++ "referenced_type" : "type-17894", ++ "self_type" : "type-17893", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189377,8 +189419,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair &)>", + "name" : "const std::pair &)>", +- "referenced_type" : "type-21656", +- "self_type" : "type-21655", ++ "referenced_type" : "type-21664", ++ "self_type" : "type-21663", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189437,8 +189479,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-16019", +- "self_type" : "type-16018", ++ "referenced_type" : "type-16790", ++ "self_type" : "type-16789", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189447,8 +189489,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-20551", +- "self_type" : "type-20550", ++ "referenced_type" : "type-20558", ++ "self_type" : "type-20557", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189517,8 +189559,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-17128", +- "self_type" : "type-17127", ++ "referenced_type" : "type-17898", ++ "self_type" : "type-17897", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189527,8 +189569,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-21660", +- "self_type" : "type-21659", ++ "referenced_type" : "type-21668", ++ "self_type" : "type-21667", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189597,8 +189639,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-18555", +- "self_type" : "type-18554", ++ "referenced_type" : "type-19333", ++ "self_type" : "type-19332", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189657,8 +189699,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-17396", +- "self_type" : "type-17395", ++ "referenced_type" : "type-18174", ++ "self_type" : "type-18173", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -189727,8 +189769,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-19976", +- "self_type" : "type-19975", ++ "referenced_type" : "type-16220", ++ "self_type" : "type-16219", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189767,8 +189809,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *>", + "name" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *>", +- "referenced_type" : "type-16206", +- "self_type" : "type-16205", ++ "referenced_type" : "type-16976", ++ "self_type" : "type-16975", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189777,8 +189819,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *>", + "name" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *>", +- "referenced_type" : "type-20737", +- "self_type" : "type-20736", ++ "referenced_type" : "type-20745", ++ "self_type" : "type-20744", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189847,8 +189889,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>", + "name" : "const std::pair, std::allocator >, int>", +- "referenced_type" : "type-19092", +- "self_type" : "type-19091", ++ "referenced_type" : "type-19870", ++ "self_type" : "type-19869", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189887,8 +189929,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, std::pair >", + "name" : "const std::pair, std::allocator >, std::pair >", +- "referenced_type" : "type-16218", +- "self_type" : "type-16217", ++ "referenced_type" : "type-16988", ++ "self_type" : "type-16987", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189897,8 +189939,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, std::pair >", + "name" : "const std::pair, std::allocator >, std::pair >", +- "referenced_type" : "type-20749", +- "self_type" : "type-20748", ++ "referenced_type" : "type-20757", ++ "self_type" : "type-20756", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189967,8 +190009,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, const google::protobuf::FieldDescriptor *>", + "name" : "const std::pair, const google::protobuf::FieldDescriptor *>", +- "referenced_type" : "type-16032", +- "self_type" : "type-16031", ++ "referenced_type" : "type-16803", ++ "self_type" : "type-16802", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189977,8 +190019,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, const google::protobuf::FieldDescriptor *>", + "name" : "const std::pair, const google::protobuf::FieldDescriptor *>", +- "referenced_type" : "type-20564", +- "self_type" : "type-20563", ++ "referenced_type" : "type-20571", ++ "self_type" : "type-20570", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190067,8 +190109,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, google::protobuf::internal::ExtensionInfo>", + "name" : "const std::pair, google::protobuf::internal::ExtensionInfo>", +- "referenced_type" : "type-18030", +- "self_type" : "type-18029", ++ "referenced_type" : "type-18808", ++ "self_type" : "type-18807", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190147,8 +190189,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *>", + "name" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *>", +- "referenced_type" : "type-16212", +- "self_type" : "type-16211", ++ "referenced_type" : "type-16982", ++ "self_type" : "type-16981", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190157,8 +190199,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *>", + "name" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *>", +- "referenced_type" : "type-20743", +- "self_type" : "type-20742", ++ "referenced_type" : "type-20751", ++ "self_type" : "type-20750", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190227,8 +190269,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>, std::pair >", + "name" : "const std::pair, std::allocator >, int>, std::pair >", +- "referenced_type" : "type-16224", +- "self_type" : "type-16223", ++ "referenced_type" : "type-16994", ++ "self_type" : "type-16993", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190237,8 +190279,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>, std::pair >", + "name" : "const std::pair, std::allocator >, int>, std::pair >", +- "referenced_type" : "type-20755", +- "self_type" : "type-20754", ++ "referenced_type" : "type-20763", ++ "self_type" : "type-20762", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190307,8 +190349,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-16312", +- "self_type" : "type-16311", ++ "referenced_type" : "type-17082", ++ "self_type" : "type-17081", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190317,8 +190359,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-20843", +- "self_type" : "type-20842", ++ "referenced_type" : "type-20851", ++ "self_type" : "type-20850", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190397,8 +190439,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-18550", +- "self_type" : "type-18549", ++ "referenced_type" : "type-19328", ++ "self_type" : "type-19327", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190437,8 +190479,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>", + "name" : "const std::pair, std::allocator >, int>", +- "referenced_type" : "type-16308", +- "self_type" : "type-16307", ++ "referenced_type" : "type-17078", ++ "self_type" : "type-17077", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190447,8 +190489,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>", + "name" : "const std::pair, std::allocator >, int>", +- "referenced_type" : "type-20839", +- "self_type" : "type-20838", ++ "referenced_type" : "type-20847", ++ "self_type" : "type-20846", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190517,8 +190559,8 @@ + "is_const" : true, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator >", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator >", +- "referenced_type" : "type-16952", +- "self_type" : "type-16951", ++ "referenced_type" : "type-17722", ++ "self_type" : "type-17721", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -190527,8 +190569,8 @@ + "is_const" : true, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator >", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator >", +- "referenced_type" : "type-21484", +- "self_type" : "type-21483", ++ "referenced_type" : "type-21492", ++ "self_type" : "type-21491", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -190597,8 +190639,8 @@ + "is_const" : true, + "linker_set_key" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> >", + "name" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> >", +- "referenced_type" : "type-17529", +- "self_type" : "type-17528", ++ "referenced_type" : "type-18307", ++ "self_type" : "type-18306", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -191237,8 +191279,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-15390", +- "self_type" : "type-15389", ++ "referenced_type" : "type-15401", ++ "self_type" : "type-15400", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191247,8 +191289,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-15561", +- "self_type" : "type-15560", ++ "referenced_type" : "type-15596", ++ "self_type" : "type-15595", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191257,8 +191299,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-15835", +- "self_type" : "type-15834", ++ "referenced_type" : "type-15610", ++ "self_type" : "type-15609", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191267,8 +191309,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-15972", +- "self_type" : "type-15971", ++ "referenced_type" : "type-15791", ++ "self_type" : "type-15790", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191277,8 +191319,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16104", +- "self_type" : "type-16103", ++ "referenced_type" : "type-15961", ++ "self_type" : "type-15960", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191287,8 +191329,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16254", +- "self_type" : "type-16253", ++ "referenced_type" : "type-16070", ++ "self_type" : "type-16069", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191297,8 +191339,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16338", +- "self_type" : "type-16337", ++ "referenced_type" : "type-16334", ++ "self_type" : "type-16333", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191307,8 +191349,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16440", +- "self_type" : "type-16439", ++ "referenced_type" : "type-16608", ++ "self_type" : "type-16607", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191317,8 +191359,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16566", +- "self_type" : "type-16565", ++ "referenced_type" : "type-16743", ++ "self_type" : "type-16742", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191327,8 +191369,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16618", +- "self_type" : "type-16617", ++ "referenced_type" : "type-16874", ++ "self_type" : "type-16873", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191337,8 +191379,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16701", +- "self_type" : "type-16700", ++ "referenced_type" : "type-17024", ++ "self_type" : "type-17023", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191347,8 +191389,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16750", +- "self_type" : "type-16749", ++ "referenced_type" : "type-17108", ++ "self_type" : "type-17107", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191357,8 +191399,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16754", +- "self_type" : "type-16753", ++ "referenced_type" : "type-17210", ++ "self_type" : "type-17209", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191367,8 +191409,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16832", +- "self_type" : "type-16831", ++ "referenced_type" : "type-17336", ++ "self_type" : "type-17335", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191377,8 +191419,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16900", +- "self_type" : "type-16899", ++ "referenced_type" : "type-17388", ++ "self_type" : "type-17387", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191387,8 +191429,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16937", +- "self_type" : "type-16936", ++ "referenced_type" : "type-17471", ++ "self_type" : "type-17470", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191397,8 +191439,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-17154", +- "self_type" : "type-17153", ++ "referenced_type" : "type-17520", ++ "self_type" : "type-17519", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191407,8 +191449,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-17236", +- "self_type" : "type-17235", ++ "referenced_type" : "type-17524", ++ "self_type" : "type-17523", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191417,8 +191459,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-17329", +- "self_type" : "type-17328", ++ "referenced_type" : "type-17602", ++ "self_type" : "type-17601", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191427,8 +191469,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-17486", +- "self_type" : "type-17485", ++ "referenced_type" : "type-17670", ++ "self_type" : "type-17669", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191437,8 +191479,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-17591", +- "self_type" : "type-17590", ++ "referenced_type" : "type-17707", ++ "self_type" : "type-17706", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191447,8 +191489,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-17686", +- "self_type" : "type-17685", ++ "referenced_type" : "type-17924", ++ "self_type" : "type-17923", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191457,8 +191499,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-17828", +- "self_type" : "type-17827", ++ "referenced_type" : "type-18006", ++ "self_type" : "type-18005", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191467,8 +191509,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-17918", +- "self_type" : "type-17917", ++ "referenced_type" : "type-18099", ++ "self_type" : "type-18098", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191477,8 +191519,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18008", +- "self_type" : "type-18007", ++ "referenced_type" : "type-18264", ++ "self_type" : "type-18263", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191487,8 +191529,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18101", +- "self_type" : "type-18100", ++ "referenced_type" : "type-18369", ++ "self_type" : "type-18368", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191497,8 +191539,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18156", +- "self_type" : "type-18155", ++ "referenced_type" : "type-18464", ++ "self_type" : "type-18463", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191507,8 +191549,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18282", +- "self_type" : "type-18281", ++ "referenced_type" : "type-1852", ++ "self_type" : "type-1851", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191517,8 +191559,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18334", +- "self_type" : "type-18333", ++ "referenced_type" : "type-18606", ++ "self_type" : "type-18605", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191527,8 +191569,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18460", +- "self_type" : "type-18459", ++ "referenced_type" : "type-18696", ++ "self_type" : "type-18695", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191537,8 +191579,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-1852", +- "self_type" : "type-1851", ++ "referenced_type" : "type-18786", ++ "self_type" : "type-18785", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191547,8 +191589,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18538", +- "self_type" : "type-18537", ++ "referenced_type" : "type-18879", ++ "self_type" : "type-18878", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191557,8 +191599,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18602", +- "self_type" : "type-18601", ++ "referenced_type" : "type-18934", ++ "self_type" : "type-18933", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191567,8 +191609,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18684", +- "self_type" : "type-18683", ++ "referenced_type" : "type-19060", ++ "self_type" : "type-19059", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191577,8 +191619,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18809", +- "self_type" : "type-18808", ++ "referenced_type" : "type-19112", ++ "self_type" : "type-19111", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191587,8 +191629,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18878", +- "self_type" : "type-18877", ++ "referenced_type" : "type-19238", ++ "self_type" : "type-19237", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191597,8 +191639,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18921", +- "self_type" : "type-18920", ++ "referenced_type" : "type-19316", ++ "self_type" : "type-19315", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191607,8 +191649,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-19156", +- "self_type" : "type-19155", ++ "referenced_type" : "type-19380", ++ "self_type" : "type-19379", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191617,8 +191659,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-19352", +- "self_type" : "type-19351", ++ "referenced_type" : "type-19462", ++ "self_type" : "type-19461", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191627,8 +191669,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-19366", +- "self_type" : "type-19365", ++ "referenced_type" : "type-19587", ++ "self_type" : "type-19586", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191637,8 +191679,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-19547", +- "self_type" : "type-19546", ++ "referenced_type" : "type-19656", ++ "self_type" : "type-19655", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191647,8 +191689,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-19717", +- "self_type" : "type-19716", ++ "referenced_type" : "type-19699", ++ "self_type" : "type-19698", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191657,8 +191699,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-19826", +- "self_type" : "type-19825", ++ "referenced_type" : "type-19923", ++ "self_type" : "type-19922", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191667,8 +191709,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-20094", +- "self_type" : "type-20093", ++ "referenced_type" : "type-20098", ++ "self_type" : "type-20097", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191677,8 +191719,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-20369", +- "self_type" : "type-20368", ++ "referenced_type" : "type-20373", ++ "self_type" : "type-20372", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191687,8 +191729,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-20504", +- "self_type" : "type-20503", ++ "referenced_type" : "type-20511", ++ "self_type" : "type-20510", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191697,8 +191739,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-20635", +- "self_type" : "type-20634", ++ "referenced_type" : "type-20643", ++ "self_type" : "type-20642", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191707,8 +191749,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-20785", +- "self_type" : "type-20784", ++ "referenced_type" : "type-20793", ++ "self_type" : "type-20792", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191717,8 +191759,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-20869", +- "self_type" : "type-20868", ++ "referenced_type" : "type-20877", ++ "self_type" : "type-20876", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191727,8 +191769,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-20971", +- "self_type" : "type-20970", ++ "referenced_type" : "type-20979", ++ "self_type" : "type-20978", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191737,8 +191779,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21098", +- "self_type" : "type-21097", ++ "referenced_type" : "type-21106", ++ "self_type" : "type-21105", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191747,8 +191789,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21150", +- "self_type" : "type-21149", ++ "referenced_type" : "type-21158", ++ "self_type" : "type-21157", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191757,8 +191799,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21233", +- "self_type" : "type-21232", ++ "referenced_type" : "type-21241", ++ "self_type" : "type-21240", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191767,8 +191809,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21282", +- "self_type" : "type-21281", ++ "referenced_type" : "type-21290", ++ "self_type" : "type-21289", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191777,8 +191819,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21286", +- "self_type" : "type-21285", ++ "referenced_type" : "type-21294", ++ "self_type" : "type-21293", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191787,8 +191829,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21364", +- "self_type" : "type-21363", ++ "referenced_type" : "type-21372", ++ "self_type" : "type-21371", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191797,8 +191839,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21432", +- "self_type" : "type-21431", ++ "referenced_type" : "type-21440", ++ "self_type" : "type-21439", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191807,8 +191849,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21469", +- "self_type" : "type-21468", ++ "referenced_type" : "type-21477", ++ "self_type" : "type-21476", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191817,8 +191859,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21686", +- "self_type" : "type-21685", ++ "referenced_type" : "type-21694", ++ "self_type" : "type-21693", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191827,8 +191869,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21768", +- "self_type" : "type-21767", ++ "referenced_type" : "type-21776", ++ "self_type" : "type-21775", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191837,8 +191879,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21861", +- "self_type" : "type-21860", ++ "referenced_type" : "type-21869", ++ "self_type" : "type-21868", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193587,8 +193629,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-16874", +- "self_type" : "type-16873", ++ "referenced_type" : "type-17644", ++ "self_type" : "type-17643", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -193597,8 +193639,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-21406", +- "self_type" : "type-21405", ++ "referenced_type" : "type-21414", ++ "self_type" : "type-21413", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -193677,8 +193719,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-16251", +- "self_type" : "type-16250", ++ "referenced_type" : "type-17021", ++ "self_type" : "type-17020", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -193687,8 +193729,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-20782", +- "self_type" : "type-20781", ++ "referenced_type" : "type-20790", ++ "self_type" : "type-20789", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -193767,8 +193809,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-17809", +- "self_type" : "type-17808", ++ "referenced_type" : "type-18587", ++ "self_type" : "type-18586", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -193827,8 +193869,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-17803", +- "self_type" : "type-17802", ++ "referenced_type" : "type-18581", ++ "self_type" : "type-18580", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -193917,8 +193959,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-16088", +- "self_type" : "type-16087", ++ "referenced_type" : "type-16858", ++ "self_type" : "type-16857", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -193927,8 +193969,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-18285", +- "self_type" : "type-18284", ++ "referenced_type" : "type-19063", ++ "self_type" : "type-19062", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -193937,8 +193979,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-20619", +- "self_type" : "type-20618", ++ "referenced_type" : "type-20627", ++ "self_type" : "type-20626", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -194247,8 +194289,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-15483", +- "self_type" : "type-15482", ++ "referenced_type" : "type-15526", ++ "self_type" : "type-15525", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194257,8 +194299,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-16008", +- "self_type" : "type-16007", ++ "referenced_type" : "type-15545", ++ "self_type" : "type-15544", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194267,8 +194309,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-16296", +- "self_type" : "type-16295", ++ "referenced_type" : "type-15559", ++ "self_type" : "type-15558", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194277,8 +194319,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-1632", +- "self_type" : "type-1631", ++ "referenced_type" : "type-15896", ++ "self_type" : "type-15895", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194287,18 +194329,18 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-16342", +- "self_type" : "type-16341", ++ "referenced_type" : "type-16053", ++ "self_type" : "type-16052", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-16447", +- "self_type" : "type-16446", ++ "referenced_type" : "type-16208", ++ "self_type" : "type-16207", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194307,8 +194349,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-16634", +- "self_type" : "type-16633", ++ "referenced_type" : "type-16256", ++ "self_type" : "type-16255", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194317,8 +194359,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-17113", +- "self_type" : "type-17112", ++ "referenced_type" : "type-1632", ++ "self_type" : "type-1631", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194327,8 +194369,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-17309", +- "self_type" : "type-17308", ++ "referenced_type" : "type-16779", ++ "self_type" : "type-16778", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194337,8 +194379,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-17646", +- "self_type" : "type-17645", ++ "referenced_type" : "type-17066", ++ "self_type" : "type-17065", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194347,18 +194389,18 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-17793", +- "self_type" : "type-17792", ++ "referenced_type" : "type-17112", ++ "self_type" : "type-17111", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-18296", +- "self_type" : "type-18295", ++ "referenced_type" : "type-17217", ++ "self_type" : "type-17216", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194367,8 +194409,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-18426", +- "self_type" : "type-18425", ++ "referenced_type" : "type-17404", ++ "self_type" : "type-17403", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194377,8 +194419,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-18546", +- "self_type" : "type-18545", ++ "referenced_type" : "type-17883", ++ "self_type" : "type-17882", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194387,8 +194429,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-18764", +- "self_type" : "type-18763", ++ "referenced_type" : "type-18079", ++ "self_type" : "type-18078", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194397,8 +194439,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-18908", +- "self_type" : "type-18907", ++ "referenced_type" : "type-18424", ++ "self_type" : "type-18423", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194407,18 +194449,18 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-18916", +- "self_type" : "type-18915", ++ "referenced_type" : "type-18571", ++ "self_type" : "type-18570", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-19111", +- "self_type" : "type-19110", ++ "referenced_type" : "type-19074", ++ "self_type" : "type-19073", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194427,8 +194469,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-19281", +- "self_type" : "type-19280", ++ "referenced_type" : "type-19204", ++ "self_type" : "type-19203", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194437,8 +194479,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-19300", +- "self_type" : "type-19299", ++ "referenced_type" : "type-19324", ++ "self_type" : "type-19323", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194447,8 +194489,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-19314", +- "self_type" : "type-19313", ++ "referenced_type" : "type-19542", ++ "self_type" : "type-19541", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194457,8 +194499,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-19652", +- "self_type" : "type-19651", ++ "referenced_type" : "type-19686", ++ "self_type" : "type-19685", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194467,18 +194509,18 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-19809", +- "self_type" : "type-19808", ++ "referenced_type" : "type-19694", ++ "self_type" : "type-19693", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-19964", +- "self_type" : "type-19963", ++ "referenced_type" : "type-19889", ++ "self_type" : "type-19888", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194497,8 +194539,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-20012", +- "self_type" : "type-20011", ++ "referenced_type" : "type-20016", ++ "self_type" : "type-20015", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194507,8 +194549,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-20540", +- "self_type" : "type-20539", ++ "referenced_type" : "type-20547", ++ "self_type" : "type-20546", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194517,8 +194559,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-20827", +- "self_type" : "type-20826", ++ "referenced_type" : "type-20835", ++ "self_type" : "type-20834", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194527,8 +194569,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-20873", +- "self_type" : "type-20872", ++ "referenced_type" : "type-20881", ++ "self_type" : "type-20880", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, +@@ -194537,8 +194579,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-20978", +- "self_type" : "type-20977", ++ "referenced_type" : "type-20986", ++ "self_type" : "type-20985", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194547,8 +194589,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-21166", +- "self_type" : "type-21165", ++ "referenced_type" : "type-21174", ++ "self_type" : "type-21173", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194567,8 +194609,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-21645", +- "self_type" : "type-21644", ++ "referenced_type" : "type-21653", ++ "self_type" : "type-21652", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194577,8 +194619,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-21841", +- "self_type" : "type-21840", ++ "referenced_type" : "type-21849", ++ "self_type" : "type-21848", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195928,336 +195970,336 @@ + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-15373", +- "self_type" : "type-15372", ++ "referenced_type" : "type-15393", ++ "self_type" : "type-15392", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-15719", +- "self_type" : "type-15718", ++ "referenced_type" : "type-15475", ++ "self_type" : "type-15474", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-15890", +- "self_type" : "type-15889", ++ "referenced_type" : "type-15625", ++ "self_type" : "type-15624", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-16142", +- "self_type" : "type-16141", ++ "referenced_type" : "type-15818", ++ "self_type" : "type-15817", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-16275", +- "self_type" : "type-16274", ++ "referenced_type" : "type-15987", ++ "self_type" : "type-15986", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-16414", +- "self_type" : "type-16413", ++ "referenced_type" : "type-16143", ++ "self_type" : "type-16142", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-16471", +- "self_type" : "type-16470", ++ "referenced_type" : "type-16492", ++ "self_type" : "type-16491", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-16589", +- "self_type" : "type-16588", ++ "referenced_type" : "type-16663", ++ "self_type" : "type-16662", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-16652", +- "self_type" : "type-16651", ++ "referenced_type" : "type-16912", ++ "self_type" : "type-16911", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-16707", +- "self_type" : "type-16706", ++ "referenced_type" : "type-17045", ++ "self_type" : "type-17044", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-16790", +- "self_type" : "type-16789", ++ "referenced_type" : "type-17184", ++ "self_type" : "type-17183", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-16864", +- "self_type" : "type-16863", ++ "referenced_type" : "type-17241", ++ "self_type" : "type-17240", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-17050", +- "self_type" : "type-17049", ++ "referenced_type" : "type-17359", ++ "self_type" : "type-17358", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-17179", +- "self_type" : "type-17178", ++ "referenced_type" : "type-17422", ++ "self_type" : "type-17421", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-17265", +- "self_type" : "type-17264", ++ "referenced_type" : "type-17477", ++ "self_type" : "type-17476", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-17369", +- "self_type" : "type-17368", ++ "referenced_type" : "type-17560", ++ "self_type" : "type-17559", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-17415", +- "self_type" : "type-17414", ++ "referenced_type" : "type-17634", ++ "self_type" : "type-17633", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-17723", +- "self_type" : "type-17722", ++ "referenced_type" : "type-17820", ++ "self_type" : "type-17819", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-17870", +- "self_type" : "type-17869", ++ "referenced_type" : "type-17949", ++ "self_type" : "type-17948", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-17872", +- "self_type" : "type-17871", ++ "referenced_type" : "type-18035", ++ "self_type" : "type-18034", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-17965", +- "self_type" : "type-17964", ++ "referenced_type" : "type-18147", ++ "self_type" : "type-18146", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18045", +- "self_type" : "type-18044", ++ "referenced_type" : "type-18193", ++ "self_type" : "type-18192", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18128", +- "self_type" : "type-18127", ++ "referenced_type" : "type-18501", ++ "self_type" : "type-18500", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18214", +- "self_type" : "type-18213", ++ "referenced_type" : "type-18648", ++ "self_type" : "type-18647", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18332", +- "self_type" : "type-18331", ++ "referenced_type" : "type-18650", ++ "self_type" : "type-18649", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18357", +- "self_type" : "type-18356", ++ "referenced_type" : "type-18743", ++ "self_type" : "type-18742", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18485", +- "self_type" : "type-18484", ++ "referenced_type" : "type-18823", ++ "self_type" : "type-18822", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18646", +- "self_type" : "type-18645", ++ "referenced_type" : "type-18906", ++ "self_type" : "type-18905", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18710", +- "self_type" : "type-18709", ++ "referenced_type" : "type-18992", ++ "self_type" : "type-18991", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18876", +- "self_type" : "type-18875", ++ "referenced_type" : "type-19110", ++ "self_type" : "type-19109", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18989", +- "self_type" : "type-18988", ++ "referenced_type" : "type-19135", ++ "self_type" : "type-19134", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-19148", +- "self_type" : "type-19147", ++ "referenced_type" : "type-19263", ++ "self_type" : "type-19262", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-19230", +- "self_type" : "type-19229", ++ "referenced_type" : "type-19424", ++ "self_type" : "type-19423", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-19381", +- "self_type" : "type-19380", ++ "referenced_type" : "type-19488", ++ "self_type" : "type-19487", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-19574", +- "self_type" : "type-19573", ++ "referenced_type" : "type-19654", ++ "self_type" : "type-19653", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-19743", +- "self_type" : "type-19742", ++ "referenced_type" : "type-19767", ++ "self_type" : "type-19766", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-19899", +- "self_type" : "type-19898", ++ "referenced_type" : "type-19906", ++ "self_type" : "type-19905", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-20252", +- "self_type" : "type-20251", ++ "referenced_type" : "type-20256", ++ "self_type" : "type-20255", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-20424", +- "self_type" : "type-20423", ++ "referenced_type" : "type-20428", ++ "self_type" : "type-20427", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-20673", +- "self_type" : "type-20672", ++ "referenced_type" : "type-20681", ++ "self_type" : "type-20680", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-20806", +- "self_type" : "type-20805", ++ "referenced_type" : "type-20814", ++ "self_type" : "type-20813", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-20945", +- "self_type" : "type-20944", ++ "referenced_type" : "type-20953", ++ "self_type" : "type-20952", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -196272,72 +196314,72 @@ + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-21003", +- "self_type" : "type-21002", ++ "referenced_type" : "type-21011", ++ "self_type" : "type-21010", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-21121", +- "self_type" : "type-21120", ++ "referenced_type" : "type-21129", ++ "self_type" : "type-21128", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-21184", +- "self_type" : "type-21183", ++ "referenced_type" : "type-21192", ++ "self_type" : "type-21191", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-21239", +- "self_type" : "type-21238", ++ "referenced_type" : "type-21247", ++ "self_type" : "type-21246", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-21322", +- "self_type" : "type-21321", ++ "referenced_type" : "type-21330", ++ "self_type" : "type-21329", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-21396", +- "self_type" : "type-21395", ++ "referenced_type" : "type-21404", ++ "self_type" : "type-21403", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-21582", +- "self_type" : "type-21581", ++ "referenced_type" : "type-21590", ++ "self_type" : "type-21589", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-21711", +- "self_type" : "type-21710", ++ "referenced_type" : "type-21719", ++ "self_type" : "type-21718", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-21797", +- "self_type" : "type-21796", ++ "referenced_type" : "type-21805", ++ "self_type" : "type-21804", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -197619,7 +197661,7 @@ + "linker_set_key" : "google::protobuf::StringPiece *const", + "name" : "google::protobuf::StringPiece *const", + "referenced_type" : "type-55", +- "self_type" : "type-19969", ++ "self_type" : "type-16213", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -197688,8 +197730,8 @@ + "is_const" : true, + "linker_set_key" : "google::protobuf::hash_set, std::equal_to > *const", + "name" : "google::protobuf::hash_set, std::equal_to > *const", +- "referenced_type" : "type-19665", +- "self_type" : "type-19814", ++ "referenced_type" : "type-15909", ++ "self_type" : "type-16058", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -197699,7 +197741,7 @@ + "linker_set_key" : "google::protobuf::hash_set, std::allocator >, google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > > > *const", + "name" : "google::protobuf::hash_set, std::allocator >, google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > > > *const", + "referenced_type" : "type-3670", +- "self_type" : "type-19655", ++ "self_type" : "type-15899", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -197784,8 +197826,8 @@ + "is_const" : true, + "linker_set_key" : "google::protobuf::util::converter::JsonObjectWriter::Element *const", + "name" : "google::protobuf::util::converter::JsonObjectWriter::Element *const", +- "referenced_type" : "type-19137", +- "self_type" : "type-19136", ++ "referenced_type" : "type-15382", ++ "self_type" : "type-15381", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197794,8 +197836,8 @@ + "is_const" : true, + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Item *const", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Item *const", +- "referenced_type" : "type-19444", +- "self_type" : "type-19570", ++ "referenced_type" : "type-15688", ++ "self_type" : "type-15814", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197804,8 +197846,8 @@ + "is_const" : true, + "linker_set_key" : "google::protobuf::util::converter::ProtoWriter::ProtoElement *const", + "name" : "google::protobuf::util::converter::ProtoWriter::ProtoElement *const", +- "referenced_type" : "type-19460", +- "self_type" : "type-19739", ++ "referenced_type" : "type-15704", ++ "self_type" : "type-15983", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197814,8 +197856,8 @@ + "is_const" : true, + "linker_set_key" : "google::protobuf::util::converter::StructuredObjectWriter::BaseElement *const", + "name" : "google::protobuf::util::converter::StructuredObjectWriter::BaseElement *const", +- "referenced_type" : "type-19141", +- "self_type" : "type-19568", ++ "referenced_type" : "type-15386", ++ "self_type" : "type-15812", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197844,8 +197886,8 @@ + "is_const" : true, + "linker_set_key" : "std::basic_string, std::allocator > *const", + "name" : "std::basic_string, std::allocator > *const", +- "referenced_type" : "type-16042", +- "self_type" : "type-16129", ++ "referenced_type" : "type-16813", ++ "self_type" : "type-16899", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197854,8 +197896,8 @@ + "is_const" : true, + "linker_set_key" : "std::basic_string, std::allocator > *const", + "name" : "std::basic_string, std::allocator > *const", +- "referenced_type" : "type-18689", +- "self_type" : "type-18707", ++ "referenced_type" : "type-19467", ++ "self_type" : "type-19485", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197864,8 +197906,8 @@ + "is_const" : true, + "linker_set_key" : "std::basic_string, std::allocator > *const", + "name" : "std::basic_string, std::allocator > *const", +- "referenced_type" : "type-20574", +- "self_type" : "type-20660", ++ "referenced_type" : "type-20581", ++ "self_type" : "type-20668", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197944,8 +197986,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator > > *const", + "name" : "std::map, std::allocator > > *const", +- "referenced_type" : "type-19970", +- "self_type" : "type-19972", ++ "referenced_type" : "type-16214", ++ "self_type" : "type-16216", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -197984,8 +198026,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *const", + "name" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *const", +- "referenced_type" : "type-16203", +- "self_type" : "type-16202", ++ "referenced_type" : "type-16973", ++ "self_type" : "type-16972", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -197994,8 +198036,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *const", + "name" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *const", +- "referenced_type" : "type-20734", +- "self_type" : "type-20733", ++ "referenced_type" : "type-20742", ++ "self_type" : "type-20741", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198064,8 +198106,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *const", + "name" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *const", +- "referenced_type" : "type-16214", +- "self_type" : "type-16216", ++ "referenced_type" : "type-16984", ++ "self_type" : "type-16986", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198074,8 +198116,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *const", + "name" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *const", +- "referenced_type" : "type-20745", +- "self_type" : "type-20747", ++ "referenced_type" : "type-20753", ++ "self_type" : "type-20755", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198144,8 +198186,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *const", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *const", +- "referenced_type" : "type-16028", +- "self_type" : "type-16030", ++ "referenced_type" : "type-16799", ++ "self_type" : "type-16801", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198154,8 +198196,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *const", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *const", +- "referenced_type" : "type-20560", +- "self_type" : "type-20562", ++ "referenced_type" : "type-20567", ++ "self_type" : "type-20569", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198224,8 +198266,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *const", + "name" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *const", +- "referenced_type" : "type-16208", +- "self_type" : "type-16210", ++ "referenced_type" : "type-16978", ++ "self_type" : "type-16980", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198234,8 +198276,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *const", + "name" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *const", +- "referenced_type" : "type-20739", +- "self_type" : "type-20741", ++ "referenced_type" : "type-20747", ++ "self_type" : "type-20749", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198304,8 +198346,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *const", + "name" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *const", +- "referenced_type" : "type-16220", +- "self_type" : "type-16222", ++ "referenced_type" : "type-16990", ++ "self_type" : "type-16992", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198314,8 +198356,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *const", + "name" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *const", +- "referenced_type" : "type-20751", +- "self_type" : "type-20753", ++ "referenced_type" : "type-20759", ++ "self_type" : "type-20761", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -212181,17 +212223,17 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-19478" ++ "referenced_type" : "type-15722" + } + ], + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > >", + "name" : "google::protobuf::hash_map, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > >", + "record_kind" : "class", +- "referenced_type" : "type-19477", +- "self_type" : "type-19477", ++ "referenced_type" : "type-15721", ++ "self_type" : "type-15721", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h", +- "template_args" : [ "type-19479", "type-19453", "type-47", "type-19480", "type-19481" ], ++ "template_args" : [ "type-15723", "type-15697", "type-47", "type-15724", "type-15725" ], + "unique_id" : "_ZTSN6google8protobuf8hash_mapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEPFNS0_4util6StatusEPNS9_9converter23ProtoStreamObjectWriterERKNSB_9DataPieceEENS0_4hashIS8_EENS2_8equal_toIS8_EENS6_INS2_4pairIKS8_SI_EEEEEE" + }, + { +@@ -212199,17 +212241,17 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-19318" ++ "referenced_type" : "type-15563" + } + ], + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > >", + "name" : "google::protobuf::hash_map, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > >", + "record_kind" : "class", +- "referenced_type" : "type-19317", +- "self_type" : "type-19317", ++ "referenced_type" : "type-15562", ++ "self_type" : "type-15562", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h", +- "template_args" : [ "type-19319", "type-19320", "type-47", "type-19327", "type-19328" ], ++ "template_args" : [ "type-15564", "type-15565", "type-47", "type-15571", "type-15572" ], + "unique_id" : "_ZTSN6google8protobuf8hash_mapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEPFNS0_4util6StatusEPKNS9_9converter23ProtoStreamObjectSourceERKNS0_4TypeENS0_11StringPieceEPNSB_12ObjectWriterEENS0_4hashIS8_EENS2_8equal_toIS8_EENS6_INS2_4pairIKS8_SM_EEEEEE" + }, + { +@@ -212325,17 +212367,17 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-19465" ++ "referenced_type" : "type-15709" + } + ], + "linker_set_key" : "google::protobuf::hash_set, std::equal_to >", + "name" : "google::protobuf::hash_set, std::equal_to >", + "record_kind" : "class", +- "referenced_type" : "type-19464", +- "self_type" : "type-19464", ++ "referenced_type" : "type-15708", ++ "self_type" : "type-15708", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h", +- "template_args" : [ "type-1", "type-4258", "type-19466" ], ++ "template_args" : [ "type-1", "type-4258", "type-15710" ], + "unique_id" : "_ZTSN6google8protobuf8hash_setIiNS0_4hashIiEENSt3__18equal_toIiEEEE" + }, + { +@@ -213217,7 +213259,7 @@ + "access" : "private", + "field_name" : "function_", + "field_offset" : 32, +- "referenced_type" : "type-19439" ++ "referenced_type" : "type-15683" + }, + { + "access" : "private", +@@ -213229,17 +213271,17 @@ + "access" : "private", + "field_name" : "p1_", + "field_offset" : 96, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + } + ], + "linker_set_key" : "google::protobuf::internal::FunctionResultCallback_1_1", + "name" : "google::protobuf::internal::FunctionResultCallback_1_1", + "record_kind" : "class", +- "referenced_type" : "type-19438", +- "self_type" : "type-19438", ++ "referenced_type" : "type-15682", ++ "self_type" : "type-15682", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h", +- "template_args" : [ "type-76", "type-19441", "type-27" ], ++ "template_args" : [ "type-76", "type-15685", "type-27" ], + "unique_id" : "_ZTSN6google8protobuf8internal26FunctionResultCallback_1_1INS0_4util6StatusEPNS3_9converter23ProtoStreamObjectWriterENS0_11StringPieceEEE", + "vtable_components" : + [ +@@ -226280,8 +226322,8 @@ + "linker_set_key" : "google::protobuf::internal::scoped_ptr", + "name" : "google::protobuf::internal::scoped_ptr", + "record_kind" : "class", +- "referenced_type" : "type-19875", +- "self_type" : "type-19875", ++ "referenced_type" : "type-16119", ++ "self_type" : "type-16119", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h", + "template_args" : [ "type-2425" ], +@@ -226320,8 +226362,8 @@ + "linker_set_key" : "google::protobuf::internal::scoped_ptr >", + "name" : "google::protobuf::internal::scoped_ptr >", + "record_kind" : "class", +- "referenced_type" : "type-19633", +- "self_type" : "type-19633", ++ "referenced_type" : "type-15877", ++ "self_type" : "type-15877", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h", + "template_args" : [ "type-15351" ], +@@ -226400,8 +226442,8 @@ + "linker_set_key" : "google::protobuf::internal::scoped_ptr", + "name" : "google::protobuf::internal::scoped_ptr", + "record_kind" : "class", +- "referenced_type" : "type-19842", +- "self_type" : "type-19842", ++ "referenced_type" : "type-16086", ++ "self_type" : "type-16086", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h", + "template_args" : [ "type-2417" ], +@@ -226460,8 +226502,8 @@ + "linker_set_key" : "google::protobuf::internal::scoped_ptr", + "name" : "google::protobuf::internal::scoped_ptr", + "record_kind" : "class", +- "referenced_type" : "type-19469", +- "self_type" : "type-19469", ++ "referenced_type" : "type-15713", ++ "self_type" : "type-15713", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h", + "template_args" : [ "type-615" ], +@@ -226534,17 +226576,17 @@ + { + "access" : "private", + "field_name" : "ptr_", +- "referenced_type" : "type-19137" ++ "referenced_type" : "type-15382" + } + ], + "linker_set_key" : "google::protobuf::internal::scoped_ptr", + "name" : "google::protobuf::internal::scoped_ptr", + "record_kind" : "class", +- "referenced_type" : "type-19150", +- "self_type" : "type-19150", ++ "referenced_type" : "type-15395", ++ "self_type" : "type-15395", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h", +- "template_args" : [ "type-19138" ], ++ "template_args" : [ "type-15383" ], + "unique_id" : "_ZTSN6google8protobuf8internal10scoped_ptrINS0_4util9converter16JsonObjectWriter7ElementEEE" + }, + { +@@ -226560,8 +226602,8 @@ + "linker_set_key" : "google::protobuf::internal::scoped_ptr", + "name" : "google::protobuf::internal::scoped_ptr", + "record_kind" : "class", +- "referenced_type" : "type-19470", +- "self_type" : "type-19470", ++ "referenced_type" : "type-15714", ++ "self_type" : "type-15714", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h", + "template_args" : [ "type-15337" ], +@@ -226574,17 +226616,17 @@ + { + "access" : "private", + "field_name" : "ptr_", +- "referenced_type" : "type-19447" ++ "referenced_type" : "type-15691" + } + ], + "linker_set_key" : "google::protobuf::internal::scoped_ptr", + "name" : "google::protobuf::internal::scoped_ptr", + "record_kind" : "class", +- "referenced_type" : "type-19446", +- "self_type" : "type-19446", ++ "referenced_type" : "type-15690", ++ "self_type" : "type-15690", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h", +- "template_args" : [ "type-19448" ], ++ "template_args" : [ "type-15692" ], + "unique_id" : "_ZTSN6google8protobuf8internal10scoped_ptrINS0_4util9converter23ProtoStreamObjectWriter9AnyWriterEEE" + }, + { +@@ -226594,17 +226636,17 @@ + { + "access" : "private", + "field_name" : "ptr_", +- "referenced_type" : "type-19444" ++ "referenced_type" : "type-15688" + } + ], + "linker_set_key" : "google::protobuf::internal::scoped_ptr", + "name" : "google::protobuf::internal::scoped_ptr", + "record_kind" : "class", +- "referenced_type" : "type-19443", +- "self_type" : "type-19443", ++ "referenced_type" : "type-15687", ++ "self_type" : "type-15687", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h", +- "template_args" : [ "type-19445" ], ++ "template_args" : [ "type-15689" ], + "unique_id" : "_ZTSN6google8protobuf8internal10scoped_ptrINS0_4util9converter23ProtoStreamObjectWriter4ItemEEE" + }, + { +@@ -226614,17 +226656,17 @@ + { + "access" : "private", + "field_name" : "ptr_", +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + } + ], + "linker_set_key" : "google::protobuf::internal::scoped_ptr", + "name" : "google::protobuf::internal::scoped_ptr", + "record_kind" : "class", +- "referenced_type" : "type-19449", +- "self_type" : "type-19449", ++ "referenced_type" : "type-15693", ++ "self_type" : "type-15693", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h", +- "template_args" : [ "type-19442" ], ++ "template_args" : [ "type-15686" ], + "unique_id" : "_ZTSN6google8protobuf8internal10scoped_ptrINS0_4util9converter23ProtoStreamObjectWriterEEE" + }, + { +@@ -226634,17 +226676,17 @@ + { + "access" : "private", + "field_name" : "ptr_", +- "referenced_type" : "type-19460" ++ "referenced_type" : "type-15704" + } + ], + "linker_set_key" : "google::protobuf::internal::scoped_ptr", + "name" : "google::protobuf::internal::scoped_ptr", + "record_kind" : "class", +- "referenced_type" : "type-19459", +- "self_type" : "type-19459", ++ "referenced_type" : "type-15703", ++ "self_type" : "type-15703", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h", +- "template_args" : [ "type-19461" ], ++ "template_args" : [ "type-15705" ], + "unique_id" : "_ZTSN6google8protobuf8internal10scoped_ptrINS0_4util9converter11ProtoWriter12ProtoElementEEE" + }, + { +@@ -226654,17 +226696,17 @@ + { + "access" : "private", + "field_name" : "ptr_", +- "referenced_type" : "type-19141" ++ "referenced_type" : "type-15386" + } + ], + "linker_set_key" : "google::protobuf::internal::scoped_ptr", + "name" : "google::protobuf::internal::scoped_ptr", + "record_kind" : "class", +- "referenced_type" : "type-19140", +- "self_type" : "type-19140", ++ "referenced_type" : "type-15385", ++ "self_type" : "type-15385", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h", +- "template_args" : [ "type-19139" ], ++ "template_args" : [ "type-15384" ], + "unique_id" : "_ZTSN6google8protobuf8internal10scoped_ptrINS0_4util9converter22StructuredObjectWriter11BaseElementEEE" + }, + { +@@ -231887,8 +231929,8 @@ + "linker_set_key" : "google::protobuf::util::StatusOr", + "name" : "google::protobuf::util::StatusOr", + "record_kind" : "class", +- "referenced_type" : "type-19955", +- "self_type" : "type-19955", ++ "referenced_type" : "type-16199", ++ "self_type" : "type-16199", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h", + "template_args" : [ "type-2430" ], +@@ -232546,7 +232588,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-19143" ++ "referenced_type" : "type-15388" + } + ], + "fields" : +@@ -232555,7 +232597,7 @@ + "access" : "private", + "field_name" : "element_", + "field_offset" : 64, +- "referenced_type" : "type-19150" ++ "referenced_type" : "type-15395" + }, + { + "access" : "private", +@@ -232567,13 +232609,13 @@ + "access" : "private", + "field_name" : "sink_", + "field_offset" : 128, +- "referenced_type" : "type-19151" ++ "referenced_type" : "type-15396" + }, + { + "access" : "private", + "field_name" : "indent_string_", + "field_offset" : 192, +- "referenced_type" : "type-19129" ++ "referenced_type" : "type-15374" + }, + { + "access" : "private", +@@ -232585,8 +232627,8 @@ + "linker_set_key" : "google::protobuf::util::converter::JsonObjectWriter", + "name" : "google::protobuf::util::converter::JsonObjectWriter", + "record_kind" : "class", +- "referenced_type" : "type-19149", +- "self_type" : "type-19149", ++ "referenced_type" : "type-15394", ++ "self_type" : "type-15394", + "size" : 40, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter16JsonObjectWriterE", +@@ -232678,8 +232720,8 @@ + "linker_set_key" : "google::protobuf::util::converter::JsonObjectWriter::ByteSinkWrapper", + "name" : "google::protobuf::util::converter::JsonObjectWriter::ByteSinkWrapper", + "record_kind" : "class", +- "referenced_type" : "type-19151", +- "self_type" : "type-19151", ++ "referenced_type" : "type-15396", ++ "self_type" : "type-15396", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter16JsonObjectWriter15ByteSinkWrapperE", +@@ -232714,7 +232756,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-19139" ++ "referenced_type" : "type-15384" + } + ], + "fields" : +@@ -232729,8 +232771,8 @@ + "linker_set_key" : "google::protobuf::util::converter::JsonObjectWriter::Element", + "name" : "google::protobuf::util::converter::JsonObjectWriter::Element", + "record_kind" : "class", +- "referenced_type" : "type-19138", +- "self_type" : "type-19138", ++ "referenced_type" : "type-15383", ++ "self_type" : "type-15383", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter16JsonObjectWriter7ElementE", +@@ -232770,13 +232812,13 @@ + "access" : "private", + "field_name" : "stack_", + "field_offset" : 64, +- "referenced_type" : "type-19284" ++ "referenced_type" : "type-15529" + }, + { + "access" : "private", + "field_name" : "leftover_", + "field_offset" : 256, +- "referenced_type" : "type-19285" ++ "referenced_type" : "type-15530" + }, + { + "access" : "private", +@@ -232800,7 +232842,7 @@ + "access" : "private", + "field_name" : "key_storage_", + "field_offset" : 544, +- "referenced_type" : "type-19286" ++ "referenced_type" : "type-15531" + }, + { + "access" : "private", +@@ -232818,7 +232860,7 @@ + "access" : "private", + "field_name" : "parsed_storage_", + "field_offset" : 736, +- "referenced_type" : "type-19287" ++ "referenced_type" : "type-15532" + }, + { + "access" : "private", +@@ -232830,7 +232872,7 @@ + "access" : "private", + "field_name" : "chunk_storage_", + "field_offset" : 864, +- "referenced_type" : "type-19288" ++ "referenced_type" : "type-15533" + }, + { + "access" : "private", +@@ -232842,8 +232884,8 @@ + "linker_set_key" : "google::protobuf::util::converter::JsonStreamParser", + "name" : "google::protobuf::util::converter::JsonStreamParser", + "record_kind" : "class", +- "referenced_type" : "type-19283", +- "self_type" : "type-19283", ++ "referenced_type" : "type-15528", ++ "self_type" : "type-15528", + "size" : 124, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter16JsonStreamParserE", +@@ -232873,17 +232915,17 @@ + [ + { + "field_name" : "type", +- "referenced_type" : "type-19293" ++ "referenced_type" : "type-15538" + }, + { + "field_offset" : 64, +- "referenced_type" : "type-19294" ++ "referenced_type" : "type-15539" + } + ], + "linker_set_key" : "google::protobuf::util::converter::JsonStreamParser::NumberResult", + "name" : "google::protobuf::util::converter::JsonStreamParser::NumberResult", +- "referenced_type" : "type-19292", +- "self_type" : "type-19292", ++ "referenced_type" : "type-15537", ++ "self_type" : "type-15537", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter16JsonStreamParser12NumberResultE" +@@ -232909,8 +232951,8 @@ + "linker_set_key" : "google::protobuf::util::converter::JsonStreamParser::NumberResult::(anonymous union at external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h:116:5) at external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h:116:5", + "name" : "google::protobuf::util::converter::JsonStreamParser::NumberResult::(anonymous union at external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h:116:5) at external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h:116:5", + "record_kind" : "union", +- "referenced_type" : "type-19294", +- "self_type" : "type-19294", ++ "referenced_type" : "type-15539", ++ "self_type" : "type-15539", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter16JsonStreamParser12NumberResultUt_E" +@@ -233003,8 +233045,8 @@ + "linker_set_key" : "google::protobuf::util::converter::ObjectLocationTracker", + "name" : "google::protobuf::util::converter::ObjectLocationTracker", + "record_kind" : "class", +- "referenced_type" : "type-19644", +- "self_type" : "type-19644", ++ "referenced_type" : "type-15888", ++ "self_type" : "type-15888", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/object_location_tracker.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter21ObjectLocationTrackerE", +@@ -233035,8 +233077,8 @@ + "linker_set_key" : "google::protobuf::util::converter::ObjectSource", + "name" : "google::protobuf::util::converter::ObjectSource", + "record_kind" : "class", +- "referenced_type" : "type-19326", +- "self_type" : "type-19326", ++ "referenced_type" : "type-15570", ++ "self_type" : "type-15570", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/object_source.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter12ObjectSourceE", +@@ -233168,7 +233210,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-19326" ++ "referenced_type" : "type-15570" + } + ], + "fields" : +@@ -233219,8 +233261,8 @@ + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectSource", + "name" : "google::protobuf::util::converter::ProtoStreamObjectSource", + "record_kind" : "class", +- "referenced_type" : "type-19324", +- "self_type" : "type-19324", ++ "referenced_type" : "type-15569", ++ "self_type" : "type-15569", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter23ProtoStreamObjectSourceE", +@@ -233257,7 +233299,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-19458" ++ "referenced_type" : "type-15702" + } + ], + "fields" : +@@ -233272,20 +233314,20 @@ + "access" : "private", + "field_name" : "current_", + "field_offset" : 736, +- "referenced_type" : "type-19443" ++ "referenced_type" : "type-15687" + }, + { + "access" : "private", + "field_name" : "options_", + "field_offset" : 768, +- "referenced_type" : "type-19456" ++ "referenced_type" : "type-15700" + } + ], + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectWriter", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter", + "record_kind" : "class", +- "referenced_type" : "type-19442", +- "self_type" : "type-19442", ++ "referenced_type" : "type-15686", ++ "self_type" : "type-15686", + "size" : 100, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter23ProtoStreamObjectWriterE", +@@ -233367,19 +233409,19 @@ + { + "access" : "private", + "field_name" : "parent_", +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "access" : "private", + "field_name" : "ow_", + "field_offset" : 32, +- "referenced_type" : "type-19449" ++ "referenced_type" : "type-15693" + }, + { + "access" : "private", + "field_name" : "type_url_", + "field_offset" : 64, +- "referenced_type" : "type-19450" ++ "referenced_type" : "type-15694" + }, + { + "access" : "private", +@@ -233391,7 +233433,7 @@ + "access" : "private", + "field_name" : "data_", + "field_offset" : 192, +- "referenced_type" : "type-19451" ++ "referenced_type" : "type-15695" + }, + { + "access" : "private", +@@ -233415,14 +233457,14 @@ + "access" : "private", + "field_name" : "well_known_type_render_", + "field_offset" : 416, +- "referenced_type" : "type-19452" ++ "referenced_type" : "type-15696" + } + ], + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectWriter::AnyWriter", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter::AnyWriter", + "record_kind" : "class", +- "referenced_type" : "type-19448", +- "self_type" : "type-19448", ++ "referenced_type" : "type-15692", ++ "self_type" : "type-15692", + "size" : 56, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter23ProtoStreamObjectWriter9AnyWriterE" +@@ -233433,7 +233475,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-19139" ++ "referenced_type" : "type-15384" + } + ], + "fields" : +@@ -233442,19 +233484,19 @@ + "access" : "private", + "field_name" : "ow_", + "field_offset" : 96, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "access" : "private", + "field_name" : "any_", + "field_offset" : 128, +- "referenced_type" : "type-19446" ++ "referenced_type" : "type-15690" + }, + { + "access" : "private", + "field_name" : "item_type_", + "field_offset" : 160, +- "referenced_type" : "type-19455" ++ "referenced_type" : "type-15699" + }, + { + "access" : "private", +@@ -233478,8 +233520,8 @@ + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Item", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Item", + "record_kind" : "class", +- "referenced_type" : "type-19445", +- "self_type" : "type-19445", ++ "referenced_type" : "type-15689", ++ "self_type" : "type-15689", + "size" : 40, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter23ProtoStreamObjectWriter4ItemE", +@@ -233516,8 +233558,8 @@ + ], + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Options", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Options", +- "referenced_type" : "type-19457", +- "self_type" : "type-19457", ++ "referenced_type" : "type-15701", ++ "self_type" : "type-15701", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter23ProtoStreamObjectWriter7OptionsE" +@@ -233527,7 +233569,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-19143" ++ "referenced_type" : "type-15388" + } + ], + "fields" : +@@ -233560,13 +233602,13 @@ + "access" : "private", + "field_name" : "element_", + "field_offset" : 160, +- "referenced_type" : "type-19459" ++ "referenced_type" : "type-15703" + }, + { + "access" : "private", + "field_name" : "size_insert_", + "field_offset" : 192, +- "referenced_type" : "type-19467" ++ "referenced_type" : "type-15711" + }, + { + "access" : "private", +@@ -233578,7 +233620,7 @@ + "access" : "private", + "field_name" : "buffer_", + "field_offset" : 416, +- "referenced_type" : "type-19468" ++ "referenced_type" : "type-15712" + }, + { + "access" : "private", +@@ -233590,7 +233632,7 @@ + "access" : "private", + "field_name" : "stream_", + "field_offset" : 576, +- "referenced_type" : "type-19469" ++ "referenced_type" : "type-15713" + }, + { + "access" : "private", +@@ -233608,14 +233650,14 @@ + "access" : "private", + "field_name" : "tracker_", + "field_offset" : 672, +- "referenced_type" : "type-19470" ++ "referenced_type" : "type-15714" + } + ], + "linker_set_key" : "google::protobuf::util::converter::ProtoWriter", + "name" : "google::protobuf::util::converter::ProtoWriter", + "record_kind" : "class", +- "referenced_type" : "type-19458", +- "self_type" : "type-19458", ++ "referenced_type" : "type-15702", ++ "self_type" : "type-15702", + "size" : 88, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter11ProtoWriterE", +@@ -233695,7 +233737,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-19139" ++ "referenced_type" : "type-15384" + }, + { + "referenced_type" : "type-15337" +@@ -233707,7 +233749,7 @@ + "access" : "private", + "field_name" : "ow_", + "field_offset" : 128, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "access" : "private", +@@ -233731,7 +233773,7 @@ + "access" : "private", + "field_name" : "required_fields_", + "field_offset" : 256, +- "referenced_type" : "type-19463" ++ "referenced_type" : "type-15707" + }, + { + "access" : "private", +@@ -233749,14 +233791,14 @@ + "access" : "private", + "field_name" : "oneof_indices_", + "field_offset" : 416, +- "referenced_type" : "type-19464" ++ "referenced_type" : "type-15708" + } + ], + "linker_set_key" : "google::protobuf::util::converter::ProtoWriter::ProtoElement", + "name" : "google::protobuf::util::converter::ProtoWriter::ProtoElement", + "record_kind" : "class", +- "referenced_type" : "type-19461", +- "self_type" : "type-19461", ++ "referenced_type" : "type-15705", ++ "self_type" : "type-15705", + "size" : 64, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter11ProtoWriter12ProtoElementE", +@@ -233821,8 +233863,8 @@ + ], + "linker_set_key" : "google::protobuf::util::converter::ProtoWriter::SizeInfo", + "name" : "google::protobuf::util::converter::ProtoWriter::SizeInfo", +- "referenced_type" : "type-19637", +- "self_type" : "type-19637", ++ "referenced_type" : "type-15881", ++ "self_type" : "type-15881", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter11ProtoWriter8SizeInfoE" +@@ -233838,8 +233880,8 @@ + "linker_set_key" : "google::protobuf::util::converter::StructuredObjectWriter", + "name" : "google::protobuf::util::converter::StructuredObjectWriter", + "record_kind" : "class", +- "referenced_type" : "type-19143", +- "self_type" : "type-19143", ++ "referenced_type" : "type-15388", ++ "self_type" : "type-15388", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/structured_objectwriter.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter22StructuredObjectWriterE", +@@ -233934,7 +233976,7 @@ + "access" : "private", + "field_name" : "parent_", + "field_offset" : 32, +- "referenced_type" : "type-19140" ++ "referenced_type" : "type-15385" + }, + { + "access" : "private", +@@ -233946,8 +233988,8 @@ + "linker_set_key" : "google::protobuf::util::converter::StructuredObjectWriter::BaseElement", + "name" : "google::protobuf::util::converter::StructuredObjectWriter::BaseElement", + "record_kind" : "class", +- "referenced_type" : "type-19139", +- "self_type" : "type-19139", ++ "referenced_type" : "type-15384", ++ "self_type" : "type-15384", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/structured_objectwriter.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter22StructuredObjectWriter11BaseElementE", +@@ -234075,8 +234117,8 @@ + "alignment" : 1, + "linker_set_key" : "google::protobuf::util::internal::StatusOrHelper::Specialize", + "name" : "google::protobuf::util::internal::StatusOrHelper::Specialize", +- "referenced_type" : "type-19962", +- "self_type" : "type-19962", ++ "referenced_type" : "type-16206", ++ "self_type" : "type-16206", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h", + "template_args" : [ "type-2430" ], +@@ -234086,8 +234128,8 @@ + "alignment" : 1, + "linker_set_key" : "google::protobuf::util::internal::StatusOrHelper::Specialize", + "name" : "google::protobuf::util::internal::StatusOrHelper::Specialize", +- "referenced_type" : "type-19961", +- "self_type" : "type-19961", ++ "referenced_type" : "type-16205", ++ "self_type" : "type-16205", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h", + "template_args" : [ "type-2422" ], +diff --git a/29/32/arm_armv7-a-neon/source-based/libstagefright_foundation.so.lsdump b/29/32/arm_armv7-a-neon/source-based/libstagefright_foundation.so.lsdump +index c455a2f..08265c2 100644 +--- a/29/32/arm_armv7-a-neon/source-based/libstagefright_foundation.so.lsdump ++++ b/29/32/arm_armv7-a-neon/source-based/libstagefright_foundation.so.lsdump +@@ -74,7 +74,7 @@ + "linker_set_key" : "unsigned char [8]", + "name" : "unsigned char [8]", + "referenced_type" : "type-21", +- "self_type" : "type-1783", ++ "self_type" : "type-1734", + "size" : 8, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/OpusHeader.h" + }, +@@ -158,8 +158,8 @@ + "alignment" : 8, + "linker_set_key" : "long double", + "name" : "long double", +- "referenced_type" : "type-1803", +- "self_type" : "type-1803", ++ "referenced_type" : "type-2348", ++ "self_type" : "type-2348", + "size" : 8 + }, + { +@@ -1896,8 +1896,8 @@ + ], + "linker_set_key" : "android::ActionCode", + "name" : "android::ActionCode", +- "referenced_type" : "type-1792", +- "self_type" : "type-1792", ++ "referenced_type" : "type-2336", ++ "self_type" : "type-2336", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaErrors.h", + "underlying_type" : "type-4", +@@ -1922,8 +1922,8 @@ + ], + "linker_set_key" : "android::AudioEncoding", + "name" : "android::AudioEncoding", +- "referenced_type" : "type-1691", +- "self_type" : "type-1691", ++ "referenced_type" : "type-1642", ++ "self_type" : "type-1642", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/MediaDefs.h", + "underlying_type" : "type-4", +@@ -4555,7 +4555,7 @@ + "referenced_type" : "type-807" + }, + { +- "referenced_type" : "type-1760" ++ "referenced_type" : "type-1710" + } + ], + "return_type" : "type-22", +@@ -4727,7 +4727,7 @@ + "referenced_type" : "type-807" + }, + { +- "referenced_type" : "type-1708" ++ "referenced_type" : "type-1655" + } + ], + "return_type" : "type-33", +@@ -4756,7 +4756,7 @@ + "referenced_type" : "type-807" + }, + { +- "referenced_type" : "type-1708" ++ "referenced_type" : "type-1655" + } + ], + "return_type" : "type-33", +@@ -4824,7 +4824,7 @@ + "referenced_type" : "type-807" + }, + { +- "referenced_type" : "type-1708" ++ "referenced_type" : "type-1655" + } + ], + "return_type" : "type-815", +@@ -5056,13 +5056,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1791" ++ "referenced_type" : "type-2335" + }, + { + "referenced_type" : "type-889" + }, + { +- "referenced_type" : "type-1791" ++ "referenced_type" : "type-2335" + }, + { + "referenced_type" : "type-889" +@@ -5099,7 +5099,7 @@ + "referenced_type" : "type-4" + }, + { +- "referenced_type" : "type-1784" ++ "referenced_type" : "type-1735" + } + ], + "return_type" : "type-109", +@@ -5111,7 +5111,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1786" ++ "referenced_type" : "type-1737" + }, + { + "referenced_type" : "type-22" +@@ -5166,7 +5166,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1682" ++ "referenced_type" : "type-1633" + }, + { + "referenced_type" : "type-802" +@@ -5182,7 +5182,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1682" ++ "referenced_type" : "type-1633" + } + ], + "return_type" : "type-109", +@@ -5195,10 +5195,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1682" ++ "referenced_type" : "type-1633" + }, + { +- "referenced_type" : "type-1683" ++ "referenced_type" : "type-1634" + }, + { + "default_arg" : true, +@@ -5219,7 +5219,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1682" ++ "referenced_type" : "type-1633" + }, + { + "referenced_type" : "type-802" +@@ -5236,7 +5236,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1682" ++ "referenced_type" : "type-1633" + }, + { + "referenced_type" : "type-4" +@@ -5258,7 +5258,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1682" ++ "referenced_type" : "type-1633" + }, + { + "default_arg" : true, +@@ -5275,7 +5275,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1682" ++ "referenced_type" : "type-1633" + }, + { + "referenced_type" : "type-4" +@@ -5298,7 +5298,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1682" ++ "referenced_type" : "type-1633" + }, + { + "default_arg" : true, +@@ -5315,7 +5315,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1682" ++ "referenced_type" : "type-1633" + }, + { + "referenced_type" : "type-4" +@@ -5338,7 +5338,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1682" ++ "referenced_type" : "type-1633" + } + ], + "return_type" : "type-33", +@@ -5351,7 +5351,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1682" ++ "referenced_type" : "type-1633" + } + ], + "return_type" : "type-33", +@@ -5364,7 +5364,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1682" ++ "referenced_type" : "type-1633" + } + ], + "return_type" : "type-33", +@@ -5376,7 +5376,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1786" ++ "referenced_type" : "type-1737" + }, + { + "referenced_type" : "type-22" +@@ -7744,7 +7744,7 @@ + "referenced_type" : "type-462" + } + ], +- "return_type" : "type-1709", ++ "return_type" : "type-1656", + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MetaData.h" + }, + { +@@ -7754,10 +7754,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1710" ++ "referenced_type" : "type-1657" + }, + { +- "referenced_type" : "type-1708" ++ "referenced_type" : "type-1655" + } + ], + "return_type" : "type-33", +@@ -7770,10 +7770,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1710" ++ "referenced_type" : "type-1657" + }, + { +- "referenced_type" : "type-1706" ++ "referenced_type" : "type-1653" + } + ], + "return_type" : "type-33", +@@ -7786,7 +7786,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1710" ++ "referenced_type" : "type-1657" + } + ], + "return_type" : "type-33", +@@ -7799,10 +7799,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1710" ++ "referenced_type" : "type-1657" + }, + { +- "referenced_type" : "type-1708" ++ "referenced_type" : "type-1655" + } + ], + "return_type" : "type-33", +@@ -7815,10 +7815,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1710" ++ "referenced_type" : "type-1657" + }, + { +- "referenced_type" : "type-1706" ++ "referenced_type" : "type-1653" + } + ], + "return_type" : "type-33", +@@ -7831,7 +7831,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1710" ++ "referenced_type" : "type-1657" + } + ], + "return_type" : "type-33", +@@ -7845,7 +7845,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1710" ++ "referenced_type" : "type-1657" + } + ], + "return_type" : "type-33", +@@ -7859,7 +7859,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1710" ++ "referenced_type" : "type-1657" + } + ], + "return_type" : "type-33", +@@ -7873,7 +7873,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1710" ++ "referenced_type" : "type-1657" + } + ], + "return_type" : "type-33", +@@ -8070,13 +8070,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1755" ++ "referenced_type" : "type-1706" + }, + { + "referenced_type" : "type-4" + }, + { +- "referenced_type" : "type-1756" ++ "referenced_type" : "type-1707" + } + ], + "return_type" : "type-109", +@@ -8089,7 +8089,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1755" ++ "referenced_type" : "type-1706" + }, + { + "referenced_type" : "type-4" +@@ -8108,7 +8108,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1755" ++ "referenced_type" : "type-1706" + }, + { + "referenced_type" : "type-4" +@@ -8124,7 +8124,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1755" ++ "referenced_type" : "type-1706" + }, + { + "referenced_type" : "type-4" +@@ -8133,7 +8133,7 @@ + "referenced_type" : "type-889" + }, + { +- "referenced_type" : "type-1759" ++ "referenced_type" : "type-1709" + }, + { + "referenced_type" : "type-889" +@@ -8149,7 +8149,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1755" ++ "referenced_type" : "type-1706" + }, + { + "referenced_type" : "type-4" +@@ -8177,7 +8177,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1755" ++ "referenced_type" : "type-1706" + } + ], + "return_type" : "type-696", +@@ -8190,7 +8190,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1755" ++ "referenced_type" : "type-1706" + } + ], + "return_type" : "type-33", +@@ -8203,7 +8203,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1755" ++ "referenced_type" : "type-1706" + }, + { + "referenced_type" : "type-4" +@@ -8222,7 +8222,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1755" ++ "referenced_type" : "type-1706" + }, + { + "referenced_type" : "type-4" +@@ -8241,7 +8241,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1755" ++ "referenced_type" : "type-1706" + }, + { + "referenced_type" : "type-4" +@@ -8581,7 +8581,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1743" ++ "referenced_type" : "type-1692" + }, + { + "referenced_type" : "type-490" +@@ -8601,7 +8601,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1743" ++ "referenced_type" : "type-1692" + }, + { + "referenced_type" : "type-32" +@@ -8621,7 +8621,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1743" ++ "referenced_type" : "type-1692" + }, + { + "referenced_type" : "type-32" +@@ -8641,7 +8641,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1743" ++ "referenced_type" : "type-1692" + }, + { + "referenced_type" : "type-32" +@@ -8664,7 +8664,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1743" ++ "referenced_type" : "type-1692" + }, + { + "referenced_type" : "type-32" +@@ -8687,7 +8687,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1743" ++ "referenced_type" : "type-1692" + }, + { + "referenced_type" : "type-32" +@@ -8710,7 +8710,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1743" ++ "referenced_type" : "type-1692" + }, + { + "referenced_type" : "type-32" +@@ -8732,7 +8732,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1685" ++ "referenced_type" : "type-1636" + } + ], + "return_type" : "type-4", +@@ -10200,8 +10200,8 @@ + "alignment" : 4, + "linker_set_key" : "android::MetaDataBase::typed_data &", + "name" : "android::MetaDataBase::typed_data &", +- "referenced_type" : "type-1752", +- "self_type" : "type-1751", ++ "referenced_type" : "type-1703", ++ "self_type" : "type-1702", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -10209,8 +10209,8 @@ + "alignment" : 4, + "linker_set_key" : "android::MetaDataBase::typed_data &", + "name" : "android::MetaDataBase::typed_data &", +- "referenced_type" : "type-2364", +- "self_type" : "type-2363", ++ "referenced_type" : "type-2314", ++ "self_type" : "type-2313", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -10218,8 +10218,8 @@ + "alignment" : 4, + "linker_set_key" : "android::MetaDataBase::typed_data &", + "name" : "android::MetaDataBase::typed_data &", +- "referenced_type" : "type-2954", +- "self_type" : "type-2953", ++ "referenced_type" : "type-2969", ++ "self_type" : "type-2968", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -10237,7 +10237,7 @@ + "linker_set_key" : "android::Parcel &", + "name" : "android::Parcel &", + "referenced_type" : "type-452", +- "self_type" : "type-1760", ++ "self_type" : "type-1710", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MetaDataBase.h" + }, +@@ -10254,8 +10254,8 @@ + "alignment" : 4, + "linker_set_key" : "android::SortedVector > &", + "name" : "android::SortedVector > &", +- "referenced_type" : "type-1738", +- "self_type" : "type-1740", ++ "referenced_type" : "type-1686", ++ "self_type" : "type-1689", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -10281,8 +10281,8 @@ + "alignment" : 4, + "linker_set_key" : "android::TextOutput &", + "name" : "android::TextOutput &", +- "referenced_type" : "type-1455", +- "self_type" : "type-1454", ++ "referenced_type" : "type-1393", ++ "self_type" : "type-1392", + "size" : 4, + "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h" + }, +@@ -10290,8 +10290,8 @@ + "alignment" : 4, + "linker_set_key" : "android::TextOutput &", + "name" : "android::TextOutput &", +- "referenced_type" : "type-1467", +- "self_type" : "type-1466", ++ "referenced_type" : "type-1410", ++ "self_type" : "type-1409", + "size" : 4, + "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h" + }, +@@ -10299,8 +10299,8 @@ + "alignment" : 4, + "linker_set_key" : "android::TextOutput &", + "name" : "android::TextOutput &", +- "referenced_type" : "type-1701", +- "self_type" : "type-1700", ++ "referenced_type" : "type-1649", ++ "self_type" : "type-1648", + "size" : 4, + "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h" + }, +@@ -10308,8 +10308,8 @@ + "alignment" : 4, + "linker_set_key" : "android::TextOutput &", + "name" : "android::TextOutput &", +- "referenced_type" : "type-1745", +- "self_type" : "type-1744", ++ "referenced_type" : "type-1696", ++ "self_type" : "type-1695", + "size" : 4, + "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h" + }, +@@ -10317,8 +10317,8 @@ + "alignment" : 4, + "linker_set_key" : "android::TextOutput &", + "name" : "android::TextOutput &", +- "referenced_type" : "type-2065", +- "self_type" : "type-2064", ++ "referenced_type" : "type-2015", ++ "self_type" : "type-2014", + "size" : 4, + "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h" + }, +@@ -10326,8 +10326,8 @@ + "alignment" : 4, + "linker_set_key" : "android::TextOutput &", + "name" : "android::TextOutput &", +- "referenced_type" : "type-2082", +- "self_type" : "type-2081", ++ "referenced_type" : "type-2032", ++ "self_type" : "type-2031", + "size" : 4, + "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h" + }, +@@ -10335,8 +10335,8 @@ + "alignment" : 4, + "linker_set_key" : "android::TextOutput &", + "name" : "android::TextOutput &", +- "referenced_type" : "type-2319", +- "self_type" : "type-2318", ++ "referenced_type" : "type-2269", ++ "self_type" : "type-2268", + "size" : 4, + "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h" + }, +@@ -10344,8 +10344,8 @@ + "alignment" : 4, + "linker_set_key" : "android::TextOutput &", + "name" : "android::TextOutput &", +- "referenced_type" : "type-2359", +- "self_type" : "type-2358", ++ "referenced_type" : "type-2309", ++ "self_type" : "type-2308", + "size" : 4, + "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h" + }, +@@ -10353,8 +10353,8 @@ + "alignment" : 4, + "linker_set_key" : "android::TextOutput &", + "name" : "android::TextOutput &", +- "referenced_type" : "type-2655", +- "self_type" : "type-2654", ++ "referenced_type" : "type-2683", ++ "self_type" : "type-2682", + "size" : 4, + "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h" + }, +@@ -10362,8 +10362,8 @@ + "alignment" : 4, + "linker_set_key" : "android::TextOutput &", + "name" : "android::TextOutput &", +- "referenced_type" : "type-2672", +- "self_type" : "type-2671", ++ "referenced_type" : "type-2695", ++ "self_type" : "type-2694", + "size" : 4, + "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h" + }, +@@ -10371,8 +10371,8 @@ + "alignment" : 4, + "linker_set_key" : "android::TextOutput &", + "name" : "android::TextOutput &", +- "referenced_type" : "type-2909", +- "self_type" : "type-2908", ++ "referenced_type" : "type-2927", ++ "self_type" : "type-2926", + "size" : 4, + "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h" + }, +@@ -10380,8 +10380,8 @@ + "alignment" : 4, + "linker_set_key" : "android::TextOutput &", + "name" : "android::TextOutput &", +- "referenced_type" : "type-2949", +- "self_type" : "type-2948", ++ "referenced_type" : "type-2964", ++ "self_type" : "type-2963", + "size" : 4, + "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h" + }, +@@ -10425,8 +10425,8 @@ + "alignment" : 4, + "linker_set_key" : "android::key_value_pair_t &", + "name" : "android::key_value_pair_t &", +- "referenced_type" : "type-1718", +- "self_type" : "type-1726", ++ "referenced_type" : "type-1665", ++ "self_type" : "type-1673", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -10704,8 +10704,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::MetaData &", + "name" : "const android::MetaData &", +- "referenced_type" : "type-1705", +- "self_type" : "type-1706", ++ "referenced_type" : "type-1652", ++ "self_type" : "type-1653", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MetaData.h" + }, +@@ -10713,8 +10713,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::MetaDataBase &", + "name" : "const android::MetaDataBase &", +- "referenced_type" : "type-1707", +- "self_type" : "type-1708", ++ "referenced_type" : "type-1654", ++ "self_type" : "type-1655", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MetaData.h" + }, +@@ -10722,8 +10722,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::MetaDataBase::typed_data &", + "name" : "const android::MetaDataBase::typed_data &", +- "referenced_type" : "type-1727", +- "self_type" : "type-1729", ++ "referenced_type" : "type-1674", ++ "self_type" : "type-1676", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -10731,8 +10731,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::MetaDataBase::typed_data &", + "name" : "const android::MetaDataBase::typed_data &", +- "referenced_type" : "type-2338", +- "self_type" : "type-2340", ++ "referenced_type" : "type-2288", ++ "self_type" : "type-2290", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -10740,8 +10740,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::MetaDataBase::typed_data &", + "name" : "const android::MetaDataBase::typed_data &", +- "referenced_type" : "type-2928", +- "self_type" : "type-2930", ++ "referenced_type" : "type-2947", ++ "self_type" : "type-2949", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -10749,8 +10749,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::OpusHeader &", + "name" : "const android::OpusHeader &", +- "referenced_type" : "type-1785", +- "self_type" : "type-1786", ++ "referenced_type" : "type-1736", ++ "self_type" : "type-1737", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/OpusHeader.h" + }, +@@ -10776,8 +10776,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::SortedVector > &", + "name" : "const android::SortedVector > &", +- "referenced_type" : "type-1741", +- "self_type" : "type-1742", ++ "referenced_type" : "type-1690", ++ "self_type" : "type-1691", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -10830,8 +10830,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::key_value_pair_t &", + "name" : "const android::key_value_pair_t &", +- "referenced_type" : "type-1717", +- "self_type" : "type-1721", ++ "referenced_type" : "type-1664", ++ "self_type" : "type-1668", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -11046,8 +11046,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-1506", +- "self_type" : "type-1508", ++ "referenced_type" : "type-1458", ++ "self_type" : "type-1460", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" + }, +@@ -11055,8 +11055,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-2130", +- "self_type" : "type-2132", ++ "referenced_type" : "type-2080", ++ "self_type" : "type-2082", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" + }, +@@ -11064,8 +11064,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-2720", +- "self_type" : "type-2722", ++ "referenced_type" : "type-2734", ++ "self_type" : "type-2736", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" + }, +@@ -11082,8 +11082,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-1473", +- "self_type" : "type-1475", ++ "referenced_type" : "type-1419", ++ "self_type" : "type-1421", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AudioPresentationInfo.h" + }, +@@ -11091,8 +11091,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-2091", +- "self_type" : "type-2093", ++ "referenced_type" : "type-2041", ++ "self_type" : "type-2043", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AudioPresentationInfo.h" + }, +@@ -11100,8 +11100,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-2681", +- "self_type" : "type-2683", ++ "referenced_type" : "type-2701", ++ "self_type" : "type-2703", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AudioPresentationInfo.h" + }, +@@ -11229,8 +11229,8 @@ + "alignment" : 4, + "linker_set_key" : "AMediaFormat *", + "name" : "AMediaFormat *", +- "referenced_type" : "type-1570", +- "self_type" : "type-1569", ++ "referenced_type" : "type-1525", ++ "self_type" : "type-1524", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h" + }, +@@ -11238,8 +11238,8 @@ + "alignment" : 4, + "linker_set_key" : "AMediaFormat *", + "name" : "AMediaFormat *", +- "referenced_type" : "type-1605", +- "self_type" : "type-1604", ++ "referenced_type" : "type-1557", ++ "self_type" : "type-1556", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBufferBase.h" + }, +@@ -11247,8 +11247,8 @@ + "alignment" : 4, + "linker_set_key" : "AMediaFormat *", + "name" : "AMediaFormat *", +- "referenced_type" : "type-1652", +- "self_type" : "type-1651", ++ "referenced_type" : "type-1598", ++ "self_type" : "type-1597", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBufferBase.h" + }, +@@ -11256,8 +11256,8 @@ + "alignment" : 4, + "linker_set_key" : "AMediaFormat *", + "name" : "AMediaFormat *", +- "referenced_type" : "type-1672", +- "self_type" : "type-1671", ++ "referenced_type" : "type-1621", ++ "self_type" : "type-1620", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBufferBase.h" + }, +@@ -11265,8 +11265,8 @@ + "alignment" : 4, + "linker_set_key" : "AMediaFormat *", + "name" : "AMediaFormat *", +- "referenced_type" : "type-2197", +- "self_type" : "type-2196", ++ "referenced_type" : "type-2147", ++ "self_type" : "type-2146", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h" + }, +@@ -11274,8 +11274,8 @@ + "alignment" : 4, + "linker_set_key" : "AMediaFormat *", + "name" : "AMediaFormat *", +- "referenced_type" : "type-2229", +- "self_type" : "type-2228", ++ "referenced_type" : "type-2179", ++ "self_type" : "type-2178", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBufferBase.h" + }, +@@ -11283,8 +11283,8 @@ + "alignment" : 4, + "linker_set_key" : "AMediaFormat *", + "name" : "AMediaFormat *", +- "referenced_type" : "type-2270", +- "self_type" : "type-2269", ++ "referenced_type" : "type-2220", ++ "self_type" : "type-2219", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBufferBase.h" + }, +@@ -11292,8 +11292,8 @@ + "alignment" : 4, + "linker_set_key" : "AMediaFormat *", + "name" : "AMediaFormat *", +- "referenced_type" : "type-2293", +- "self_type" : "type-2292", ++ "referenced_type" : "type-2243", ++ "self_type" : "type-2242", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBufferBase.h" + }, +@@ -11301,8 +11301,8 @@ + "alignment" : 4, + "linker_set_key" : "AMediaFormat *", + "name" : "AMediaFormat *", +- "referenced_type" : "type-2787", +- "self_type" : "type-2786", ++ "referenced_type" : "type-2798", ++ "self_type" : "type-2797", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h" + }, +@@ -11310,8 +11310,8 @@ + "alignment" : 4, + "linker_set_key" : "AMediaFormat *", + "name" : "AMediaFormat *", +- "referenced_type" : "type-2819", +- "self_type" : "type-2818", ++ "referenced_type" : "type-2833", ++ "self_type" : "type-2832", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBufferBase.h" + }, +@@ -11319,8 +11319,8 @@ + "alignment" : 4, + "linker_set_key" : "AMediaFormat *", + "name" : "AMediaFormat *", +- "referenced_type" : "type-2860", +- "self_type" : "type-2859", ++ "referenced_type" : "type-2880", ++ "self_type" : "type-2879", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBufferBase.h" + }, +@@ -11328,8 +11328,8 @@ + "alignment" : 4, + "linker_set_key" : "AMediaFormat *", + "name" : "AMediaFormat *", +- "referenced_type" : "type-2883", +- "self_type" : "type-2882", ++ "referenced_type" : "type-2900", ++ "self_type" : "type-2899", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBufferBase.h" + }, +@@ -11355,8 +11355,8 @@ + "alignment" : 4, + "linker_set_key" : "DIR *", + "name" : "DIR *", +- "referenced_type" : "type-1433", +- "self_type" : "type-1432", ++ "referenced_type" : "type-1370", ++ "self_type" : "type-1369", + "size" : 4, + "source_file" : "/system/core/base/include/android-base/unique_fd.h" + }, +@@ -11364,8 +11364,8 @@ + "alignment" : 4, + "linker_set_key" : "DIR *", + "name" : "DIR *", +- "referenced_type" : "type-1471", +- "self_type" : "type-1470", ++ "referenced_type" : "type-1416", ++ "self_type" : "type-1415", + "size" : 4, + "source_file" : "/system/core/base/include/android-base/unique_fd.h" + }, +@@ -11373,8 +11373,8 @@ + "alignment" : 4, + "linker_set_key" : "DIR *", + "name" : "DIR *", +- "referenced_type" : "type-1696", +- "self_type" : "type-1695", ++ "referenced_type" : "type-1647", ++ "self_type" : "type-1646", + "size" : 4, + "source_file" : "/system/core/base/include/android-base/unique_fd.h" + }, +@@ -11382,8 +11382,8 @@ + "alignment" : 4, + "linker_set_key" : "DIR *", + "name" : "DIR *", +- "referenced_type" : "type-1731", +- "self_type" : "type-1730", ++ "referenced_type" : "type-1679", ++ "self_type" : "type-1678", + "size" : 4, + "source_file" : "/system/core/base/include/android-base/unique_fd.h" + }, +@@ -11391,8 +11391,8 @@ + "alignment" : 4, + "linker_set_key" : "DIR *", + "name" : "DIR *", +- "referenced_type" : "type-2042", +- "self_type" : "type-2041", ++ "referenced_type" : "type-1992", ++ "self_type" : "type-1991", + "size" : 4, + "source_file" : "/system/core/base/include/android-base/unique_fd.h" + }, +@@ -11400,8 +11400,8 @@ + "alignment" : 4, + "linker_set_key" : "DIR *", + "name" : "DIR *", +- "referenced_type" : "type-2088", +- "self_type" : "type-2087", ++ "referenced_type" : "type-2038", ++ "self_type" : "type-2037", + "size" : 4, + "source_file" : "/system/core/base/include/android-base/unique_fd.h" + }, +@@ -11409,8 +11409,8 @@ + "alignment" : 4, + "linker_set_key" : "DIR *", + "name" : "DIR *", +- "referenced_type" : "type-2317", +- "self_type" : "type-2316", ++ "referenced_type" : "type-2267", ++ "self_type" : "type-2266", + "size" : 4, + "source_file" : "/system/core/base/include/android-base/unique_fd.h" + }, +@@ -11418,8 +11418,8 @@ + "alignment" : 4, + "linker_set_key" : "DIR *", + "name" : "DIR *", +- "referenced_type" : "type-2343", +- "self_type" : "type-2342", ++ "referenced_type" : "type-2293", ++ "self_type" : "type-2292", + "size" : 4, + "source_file" : "/system/core/base/include/android-base/unique_fd.h" + }, +@@ -11427,8 +11427,8 @@ + "alignment" : 4, + "linker_set_key" : "DIR *", + "name" : "DIR *", +- "referenced_type" : "type-2632", +- "self_type" : "type-2631", ++ "referenced_type" : "type-2661", ++ "self_type" : "type-2660", + "size" : 4, + "source_file" : "/system/core/base/include/android-base/unique_fd.h" + }, +@@ -11436,8 +11436,8 @@ + "alignment" : 4, + "linker_set_key" : "DIR *", + "name" : "DIR *", +- "referenced_type" : "type-2678", +- "self_type" : "type-2677", ++ "referenced_type" : "type-2699", ++ "self_type" : "type-2698", + "size" : 4, + "source_file" : "/system/core/base/include/android-base/unique_fd.h" + }, +@@ -11445,8 +11445,8 @@ + "alignment" : 4, + "linker_set_key" : "DIR *", + "name" : "DIR *", +- "referenced_type" : "type-2907", +- "self_type" : "type-2906", ++ "referenced_type" : "type-2922", ++ "self_type" : "type-2921", + "size" : 4, + "source_file" : "/system/core/base/include/android-base/unique_fd.h" + }, +@@ -11454,8 +11454,8 @@ + "alignment" : 4, + "linker_set_key" : "DIR *", + "name" : "DIR *", +- "referenced_type" : "type-2933", +- "self_type" : "type-2932", ++ "referenced_type" : "type-2951", ++ "self_type" : "type-2950", + "size" : 4, + "source_file" : "/system/core/base/include/android-base/unique_fd.h" + }, +@@ -11481,8 +11481,8 @@ + "alignment" : 4, + "linker_set_key" : "__sFILE *", + "name" : "__sFILE *", +- "referenced_type" : "type-1430", +- "self_type" : "type-1429", ++ "referenced_type" : "type-1364", ++ "self_type" : "type-1363", + "size" : 4, + "source_file" : "/system/core/base/include/android-base/unique_fd.h" + }, +@@ -11490,8 +11490,8 @@ + "alignment" : 4, + "linker_set_key" : "__sFILE *", + "name" : "__sFILE *", +- "referenced_type" : "type-1469", +- "self_type" : "type-1468", ++ "referenced_type" : "type-1413", ++ "self_type" : "type-1412", + "size" : 4, + "source_file" : "/system/core/base/include/android-base/unique_fd.h" + }, +@@ -11499,8 +11499,8 @@ + "alignment" : 4, + "linker_set_key" : "__sFILE *", + "name" : "__sFILE *", +- "referenced_type" : "type-1716", +- "self_type" : "type-1715", ++ "referenced_type" : "type-1663", ++ "self_type" : "type-1662", + "size" : 4, + "source_file" : "/system/core/base/include/android-base/unique_fd.h" + }, +@@ -11508,8 +11508,8 @@ + "alignment" : 4, + "linker_set_key" : "__sFILE *", + "name" : "__sFILE *", +- "referenced_type" : "type-1781", +- "self_type" : "type-1780", ++ "referenced_type" : "type-1732", ++ "self_type" : "type-1731", + "size" : 4, + "source_file" : "/system/core/base/include/android-base/unique_fd.h" + }, +@@ -11517,8 +11517,8 @@ + "alignment" : 4, + "linker_set_key" : "__sFILE *", + "name" : "__sFILE *", +- "referenced_type" : "type-2036", +- "self_type" : "type-2035", ++ "referenced_type" : "type-1986", ++ "self_type" : "type-1985", + "size" : 4, + "source_file" : "/system/core/base/include/android-base/unique_fd.h" + }, +@@ -11526,8 +11526,8 @@ + "alignment" : 4, + "linker_set_key" : "__sFILE *", + "name" : "__sFILE *", +- "referenced_type" : "type-2085", +- "self_type" : "type-2084", ++ "referenced_type" : "type-2035", ++ "self_type" : "type-2034", + "size" : 4, + "source_file" : "/system/core/base/include/android-base/unique_fd.h" + }, +@@ -11535,8 +11535,8 @@ + "alignment" : 4, + "linker_set_key" : "__sFILE *", + "name" : "__sFILE *", +- "referenced_type" : "type-2332", +- "self_type" : "type-2331", ++ "referenced_type" : "type-2282", ++ "self_type" : "type-2281", + "size" : 4, + "source_file" : "/system/core/base/include/android-base/unique_fd.h" + }, +@@ -11544,8 +11544,8 @@ + "alignment" : 4, + "linker_set_key" : "__sFILE *", + "name" : "__sFILE *", +- "referenced_type" : "type-2373", +- "self_type" : "type-2372", ++ "referenced_type" : "type-2323", ++ "self_type" : "type-2322", + "size" : 4, + "source_file" : "/system/core/base/include/android-base/unique_fd.h" + }, +@@ -11553,8 +11553,8 @@ + "alignment" : 4, + "linker_set_key" : "__sFILE *", + "name" : "__sFILE *", +- "referenced_type" : "type-2626", +- "self_type" : "type-2625", ++ "referenced_type" : "type-2658", ++ "self_type" : "type-2657", + "size" : 4, + "source_file" : "/system/core/base/include/android-base/unique_fd.h" + }, +@@ -11562,8 +11562,8 @@ + "alignment" : 4, + "linker_set_key" : "__sFILE *", + "name" : "__sFILE *", +- "referenced_type" : "type-2675", +- "self_type" : "type-2674", ++ "referenced_type" : "type-2697", ++ "self_type" : "type-2696", + "size" : 4, + "source_file" : "/system/core/base/include/android-base/unique_fd.h" + }, +@@ -11571,8 +11571,8 @@ + "alignment" : 4, + "linker_set_key" : "__sFILE *", + "name" : "__sFILE *", +- "referenced_type" : "type-2922", +- "self_type" : "type-2921", ++ "referenced_type" : "type-2941", ++ "self_type" : "type-2940", + "size" : 4, + "source_file" : "/system/core/base/include/android-base/unique_fd.h" + }, +@@ -11580,8 +11580,8 @@ + "alignment" : 4, + "linker_set_key" : "__sFILE *", + "name" : "__sFILE *", +- "referenced_type" : "type-2963", +- "self_type" : "type-2962", ++ "referenced_type" : "type-2978", ++ "self_type" : "type-2977", + "size" : 4, + "source_file" : "/system/core/base/include/android-base/unique_fd.h" + }, +@@ -11634,8 +11634,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ABuffer *", + "name" : "android::ABuffer *", +- "referenced_type" : "type-1660", +- "self_type" : "type-1659", ++ "referenced_type" : "type-1607", ++ "self_type" : "type-1606", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -11643,8 +11643,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ABuffer *", + "name" : "android::ABuffer *", +- "referenced_type" : "type-1690", +- "self_type" : "type-1689", ++ "referenced_type" : "type-1641", ++ "self_type" : "type-1640", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -11652,8 +11652,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ABuffer *", + "name" : "android::ABuffer *", +- "referenced_type" : "type-2279", +- "self_type" : "type-2278", ++ "referenced_type" : "type-2229", ++ "self_type" : "type-2228", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -11661,8 +11661,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ABuffer *", + "name" : "android::ABuffer *", +- "referenced_type" : "type-2312", +- "self_type" : "type-2311", ++ "referenced_type" : "type-2262", ++ "self_type" : "type-2261", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -11670,8 +11670,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ABuffer *", + "name" : "android::ABuffer *", +- "referenced_type" : "type-2869", +- "self_type" : "type-2868", ++ "referenced_type" : "type-2888", ++ "self_type" : "type-2887", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -11679,8 +11679,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ABuffer *", + "name" : "android::ABuffer *", +- "referenced_type" : "type-2902", +- "self_type" : "type-2901", ++ "referenced_type" : "type-2917", ++ "self_type" : "type-2916", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -11697,8 +11697,8 @@ + "alignment" : 4, + "linker_set_key" : "android::AHandler *", + "name" : "android::AHandler *", +- "referenced_type" : "type-1297", +- "self_type" : "type-1296", ++ "referenced_type" : "type-1449", ++ "self_type" : "type-1448", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -11706,8 +11706,8 @@ + "alignment" : 4, + "linker_set_key" : "android::AHandler *", + "name" : "android::AHandler *", +- "referenced_type" : "type-1498", +- "self_type" : "type-1497", ++ "referenced_type" : "type-1552", ++ "self_type" : "type-1551", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -11715,8 +11715,8 @@ + "alignment" : 4, + "linker_set_key" : "android::AHandler *", + "name" : "android::AHandler *", +- "referenced_type" : "type-1600", +- "self_type" : "type-1599", ++ "referenced_type" : "type-1603", ++ "self_type" : "type-1602", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -11724,8 +11724,8 @@ + "alignment" : 4, + "linker_set_key" : "android::AHandler *", + "name" : "android::AHandler *", +- "referenced_type" : "type-1621", +- "self_type" : "type-1620", ++ "referenced_type" : "type-1623", ++ "self_type" : "type-1622", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -11733,8 +11733,8 @@ + "alignment" : 4, + "linker_set_key" : "android::AHandler *", + "name" : "android::AHandler *", +- "referenced_type" : "type-1656", +- "self_type" : "type-1655", ++ "referenced_type" : "type-1739", ++ "self_type" : "type-1738", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -11742,8 +11742,8 @@ + "alignment" : 4, + "linker_set_key" : "android::AHandler *", + "name" : "android::AHandler *", +- "referenced_type" : "type-1674", +- "self_type" : "type-1673", ++ "referenced_type" : "type-2071", ++ "self_type" : "type-2070", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -11751,8 +11751,8 @@ + "alignment" : 4, + "linker_set_key" : "android::AHandler *", + "name" : "android::AHandler *", +- "referenced_type" : "type-2121", +- "self_type" : "type-2120", ++ "referenced_type" : "type-2174", ++ "self_type" : "type-2173", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -11760,8 +11760,8 @@ + "alignment" : 4, + "linker_set_key" : "android::AHandler *", + "name" : "android::AHandler *", +- "referenced_type" : "type-2224", +- "self_type" : "type-2223", ++ "referenced_type" : "type-2225", ++ "self_type" : "type-2224", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -11769,8 +11769,8 @@ + "alignment" : 4, + "linker_set_key" : "android::AHandler *", + "name" : "android::AHandler *", +- "referenced_type" : "type-2275", +- "self_type" : "type-2274", ++ "referenced_type" : "type-2245", ++ "self_type" : "type-2244", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -11778,8 +11778,8 @@ + "alignment" : 4, + "linker_set_key" : "android::AHandler *", + "name" : "android::AHandler *", +- "referenced_type" : "type-2295", +- "self_type" : "type-2294", ++ "referenced_type" : "type-2329", ++ "self_type" : "type-2328", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -11787,8 +11787,8 @@ + "alignment" : 4, + "linker_set_key" : "android::AHandler *", + "name" : "android::AHandler *", +- "referenced_type" : "type-2379", +- "self_type" : "type-2378", ++ "referenced_type" : "type-2525", ++ "self_type" : "type-2524", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -11796,8 +11796,8 @@ + "alignment" : 4, + "linker_set_key" : "android::AHandler *", + "name" : "android::AHandler *", +- "referenced_type" : "type-2711", +- "self_type" : "type-2710", ++ "referenced_type" : "type-2726", ++ "self_type" : "type-2725", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -11805,8 +11805,8 @@ + "alignment" : 4, + "linker_set_key" : "android::AHandler *", + "name" : "android::AHandler *", +- "referenced_type" : "type-2814", +- "self_type" : "type-2813", ++ "referenced_type" : "type-2828", ++ "self_type" : "type-2827", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -11814,8 +11814,8 @@ + "alignment" : 4, + "linker_set_key" : "android::AHandler *", + "name" : "android::AHandler *", +- "referenced_type" : "type-2865", +- "self_type" : "type-2864", ++ "referenced_type" : "type-2849", ++ "self_type" : "type-2848", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -11823,8 +11823,8 @@ + "alignment" : 4, + "linker_set_key" : "android::AHandler *", + "name" : "android::AHandler *", +- "referenced_type" : "type-2885", +- "self_type" : "type-2884", ++ "referenced_type" : "type-2884", ++ "self_type" : "type-2883", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -11832,8 +11832,8 @@ + "alignment" : 4, + "linker_set_key" : "android::AHandler *", + "name" : "android::AHandler *", +- "referenced_type" : "type-2969", +- "self_type" : "type-2968", ++ "referenced_type" : "type-2902", ++ "self_type" : "type-2901", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -12021,8 +12021,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ALooper::LooperThread *", + "name" : "android::ALooper::LooperThread *", +- "referenced_type" : "type-1302", +- "self_type" : "type-1301", ++ "referenced_type" : "type-1330", ++ "self_type" : "type-1329", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12030,8 +12030,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ALooper::LooperThread *", + "name" : "android::ALooper::LooperThread *", +- "referenced_type" : "type-1309", +- "self_type" : "type-1308", ++ "referenced_type" : "type-1510", ++ "self_type" : "type-1509", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12039,8 +12039,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ALooper::LooperThread *", + "name" : "android::ALooper::LooperThread *", +- "referenced_type" : "type-1319", +- "self_type" : "type-1318", ++ "referenced_type" : "type-1583", ++ "self_type" : "type-1582", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12048,8 +12048,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ALooper::LooperThread *", + "name" : "android::ALooper::LooperThread *", +- "referenced_type" : "type-1339", +- "self_type" : "type-1338", ++ "referenced_type" : "type-1605", ++ "self_type" : "type-1604", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12057,8 +12057,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ALooper::LooperThread *", + "name" : "android::ALooper::LooperThread *", +- "referenced_type" : "type-1399", +- "self_type" : "type-1398", ++ "referenced_type" : "type-1639", ++ "self_type" : "type-1638", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12066,8 +12066,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ALooper::LooperThread *", + "name" : "android::ALooper::LooperThread *", +- "referenced_type" : "type-1558", +- "self_type" : "type-1557", ++ "referenced_type" : "type-1742", ++ "self_type" : "type-1741", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12075,8 +12075,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ALooper::LooperThread *", + "name" : "android::ALooper::LooperThread *", +- "referenced_type" : "type-1634", +- "self_type" : "type-1633", ++ "referenced_type" : "type-1800", ++ "self_type" : "type-1799", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12084,8 +12084,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ALooper::LooperThread *", + "name" : "android::ALooper::LooperThread *", +- "referenced_type" : "type-1648", +- "self_type" : "type-1647", ++ "referenced_type" : "type-1844", ++ "self_type" : "type-1843", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12093,8 +12093,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ALooper::LooperThread *", + "name" : "android::ALooper::LooperThread *", +- "referenced_type" : "type-1658", +- "self_type" : "type-1657", ++ "referenced_type" : "type-1898", ++ "self_type" : "type-1897", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12102,8 +12102,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ALooper::LooperThread *", + "name" : "android::ALooper::LooperThread *", +- "referenced_type" : "type-1688", +- "self_type" : "type-1687", ++ "referenced_type" : "type-1952", ++ "self_type" : "type-1951", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12111,8 +12111,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ALooper::LooperThread *", + "name" : "android::ALooper::LooperThread *", +- "referenced_type" : "type-1850", +- "self_type" : "type-1849", ++ "referenced_type" : "type-2132", ++ "self_type" : "type-2131", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12120,8 +12120,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ALooper::LooperThread *", + "name" : "android::ALooper::LooperThread *", +- "referenced_type" : "type-1894", +- "self_type" : "type-1893", ++ "referenced_type" : "type-2205", ++ "self_type" : "type-2204", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12129,8 +12129,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ALooper::LooperThread *", + "name" : "android::ALooper::LooperThread *", +- "referenced_type" : "type-1948", +- "self_type" : "type-1947", ++ "referenced_type" : "type-2227", ++ "self_type" : "type-2226", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12138,8 +12138,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ALooper::LooperThread *", + "name" : "android::ALooper::LooperThread *", +- "referenced_type" : "type-2002", +- "self_type" : "type-2001", ++ "referenced_type" : "type-2260", ++ "self_type" : "type-2259", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12147,8 +12147,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ALooper::LooperThread *", + "name" : "android::ALooper::LooperThread *", +- "referenced_type" : "type-2182", +- "self_type" : "type-2181", ++ "referenced_type" : "type-2347", ++ "self_type" : "type-2346", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12156,8 +12156,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ALooper::LooperThread *", + "name" : "android::ALooper::LooperThread *", +- "referenced_type" : "type-2255", +- "self_type" : "type-2254", ++ "referenced_type" : "type-2406", ++ "self_type" : "type-2405", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12165,8 +12165,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ALooper::LooperThread *", + "name" : "android::ALooper::LooperThread *", +- "referenced_type" : "type-2277", +- "self_type" : "type-2276", ++ "referenced_type" : "type-2450", ++ "self_type" : "type-2449", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12174,8 +12174,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ALooper::LooperThread *", + "name" : "android::ALooper::LooperThread *", +- "referenced_type" : "type-2310", +- "self_type" : "type-2309", ++ "referenced_type" : "type-2504", ++ "self_type" : "type-2503", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12183,8 +12183,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ALooper::LooperThread *", + "name" : "android::ALooper::LooperThread *", +- "referenced_type" : "type-2382", +- "self_type" : "type-2381", ++ "referenced_type" : "type-2530", ++ "self_type" : "type-2529", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12192,8 +12192,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ALooper::LooperThread *", + "name" : "android::ALooper::LooperThread *", +- "referenced_type" : "type-2440", +- "self_type" : "type-2439", ++ "referenced_type" : "type-2537", ++ "self_type" : "type-2536", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12201,8 +12201,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ALooper::LooperThread *", + "name" : "android::ALooper::LooperThread *", +- "referenced_type" : "type-2484", +- "self_type" : "type-2483", ++ "referenced_type" : "type-2547", ++ "self_type" : "type-2546", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12210,8 +12210,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ALooper::LooperThread *", + "name" : "android::ALooper::LooperThread *", +- "referenced_type" : "type-2538", +- "self_type" : "type-2537", ++ "referenced_type" : "type-2567", ++ "self_type" : "type-2566", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12219,8 +12219,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ALooper::LooperThread *", + "name" : "android::ALooper::LooperThread *", +- "referenced_type" : "type-2592", +- "self_type" : "type-2591", ++ "referenced_type" : "type-2627", ++ "self_type" : "type-2626", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12228,8 +12228,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ALooper::LooperThread *", + "name" : "android::ALooper::LooperThread *", +- "referenced_type" : "type-2772", +- "self_type" : "type-2771", ++ "referenced_type" : "type-2786", ++ "self_type" : "type-2785", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12237,8 +12237,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ALooper::LooperThread *", + "name" : "android::ALooper::LooperThread *", +- "referenced_type" : "type-2845", +- "self_type" : "type-2844", ++ "referenced_type" : "type-2862", ++ "self_type" : "type-2861", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12246,8 +12246,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ALooper::LooperThread *", + "name" : "android::ALooper::LooperThread *", +- "referenced_type" : "type-2867", +- "self_type" : "type-2866", ++ "referenced_type" : "type-2876", ++ "self_type" : "type-2875", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12255,8 +12255,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ALooper::LooperThread *", + "name" : "android::ALooper::LooperThread *", +- "referenced_type" : "type-2900", +- "self_type" : "type-2899", ++ "referenced_type" : "type-2886", ++ "self_type" : "type-2885", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12264,8 +12264,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ALooper::LooperThread *", + "name" : "android::ALooper::LooperThread *", +- "referenced_type" : "type-2985", +- "self_type" : "type-2984", ++ "referenced_type" : "type-2915", ++ "self_type" : "type-2914", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12336,8 +12336,8 @@ + "alignment" : 4, + "linker_set_key" : "android::AMessage *", + "name" : "android::AMessage *", +- "referenced_type" : "type-1797", +- "self_type" : "type-1796", ++ "referenced_type" : "type-2340", ++ "self_type" : "type-2339", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12345,8 +12345,8 @@ + "alignment" : 4, + "linker_set_key" : "android::AMessage *", + "name" : "android::AMessage *", +- "referenced_type" : "type-1802", +- "self_type" : "type-1801", ++ "referenced_type" : "type-2345", ++ "self_type" : "type-2344", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12354,8 +12354,8 @@ + "alignment" : 4, + "linker_set_key" : "android::AMessage *", + "name" : "android::AMessage *", +- "referenced_type" : "type-2978", +- "self_type" : "type-2977", ++ "referenced_type" : "type-2991", ++ "self_type" : "type-2990", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12363,8 +12363,8 @@ + "alignment" : 4, + "linker_set_key" : "android::AMessage *", + "name" : "android::AMessage *", +- "referenced_type" : "type-2983", +- "self_type" : "type-2982", ++ "referenced_type" : "type-2996", ++ "self_type" : "type-2995", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -12453,8 +12453,8 @@ + "alignment" : 4, + "linker_set_key" : "android::CMediaBuffer *", + "name" : "android::CMediaBuffer *", +- "referenced_type" : "type-1603", +- "self_type" : "type-1602", ++ "referenced_type" : "type-1555", ++ "self_type" : "type-1554", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBufferBase.h" + }, +@@ -12462,8 +12462,8 @@ + "alignment" : 4, + "linker_set_key" : "android::CMediaBuffer *", + "name" : "android::CMediaBuffer *", +- "referenced_type" : "type-1650", +- "self_type" : "type-1649", ++ "referenced_type" : "type-1596", ++ "self_type" : "type-1595", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBufferBase.h" + }, +@@ -12471,8 +12471,8 @@ + "alignment" : 4, + "linker_set_key" : "android::CMediaBuffer *", + "name" : "android::CMediaBuffer *", +- "referenced_type" : "type-1670", +- "self_type" : "type-1669", ++ "referenced_type" : "type-1619", ++ "self_type" : "type-1618", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBufferBase.h" + }, +@@ -12480,8 +12480,8 @@ + "alignment" : 4, + "linker_set_key" : "android::CMediaBuffer *", + "name" : "android::CMediaBuffer *", +- "referenced_type" : "type-2227", +- "self_type" : "type-2226", ++ "referenced_type" : "type-2177", ++ "self_type" : "type-2176", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBufferBase.h" + }, +@@ -12489,8 +12489,8 @@ + "alignment" : 4, + "linker_set_key" : "android::CMediaBuffer *", + "name" : "android::CMediaBuffer *", +- "referenced_type" : "type-2268", +- "self_type" : "type-2267", ++ "referenced_type" : "type-2218", ++ "self_type" : "type-2217", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBufferBase.h" + }, +@@ -12498,8 +12498,8 @@ + "alignment" : 4, + "linker_set_key" : "android::CMediaBuffer *", + "name" : "android::CMediaBuffer *", +- "referenced_type" : "type-2291", +- "self_type" : "type-2290", ++ "referenced_type" : "type-2241", ++ "self_type" : "type-2240", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBufferBase.h" + }, +@@ -12507,8 +12507,8 @@ + "alignment" : 4, + "linker_set_key" : "android::CMediaBuffer *", + "name" : "android::CMediaBuffer *", +- "referenced_type" : "type-2817", +- "self_type" : "type-2816", ++ "referenced_type" : "type-2831", ++ "self_type" : "type-2830", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBufferBase.h" + }, +@@ -12516,8 +12516,8 @@ + "alignment" : 4, + "linker_set_key" : "android::CMediaBuffer *", + "name" : "android::CMediaBuffer *", +- "referenced_type" : "type-2858", +- "self_type" : "type-2857", ++ "referenced_type" : "type-2878", ++ "self_type" : "type-2877", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBufferBase.h" + }, +@@ -12525,8 +12525,8 @@ + "alignment" : 4, + "linker_set_key" : "android::CMediaBuffer *", + "name" : "android::CMediaBuffer *", +- "referenced_type" : "type-2881", +- "self_type" : "type-2880", ++ "referenced_type" : "type-2898", ++ "self_type" : "type-2897", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBufferBase.h" + }, +@@ -12543,8 +12543,8 @@ + "alignment" : 4, + "linker_set_key" : "android::CMediaBufferGroup *", + "name" : "android::CMediaBufferGroup *", +- "referenced_type" : "type-1679", +- "self_type" : "type-1678", ++ "referenced_type" : "type-1630", ++ "self_type" : "type-1629", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBufferGroup.h" + }, +@@ -12552,8 +12552,8 @@ + "alignment" : 4, + "linker_set_key" : "android::CMediaBufferGroup *", + "name" : "android::CMediaBufferGroup *", +- "referenced_type" : "type-2301", +- "self_type" : "type-2300", ++ "referenced_type" : "type-2251", ++ "self_type" : "type-2250", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBufferGroup.h" + }, +@@ -12561,8 +12561,8 @@ + "alignment" : 4, + "linker_set_key" : "android::CMediaBufferGroup *", + "name" : "android::CMediaBufferGroup *", +- "referenced_type" : "type-2891", +- "self_type" : "type-2890", ++ "referenced_type" : "type-2906", ++ "self_type" : "type-2905", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBufferGroup.h" + }, +@@ -12705,8 +12705,8 @@ + "alignment" : 4, + "linker_set_key" : "android::KeyedVector *", + "name" : "android::KeyedVector *", +- "referenced_type" : "type-1746", +- "self_type" : "type-1748", ++ "referenced_type" : "type-1697", ++ "self_type" : "type-1699", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -12795,8 +12795,8 @@ + "alignment" : 4, + "linker_set_key" : "android::List::_Node *", + "name" : "android::List::_Node *", +- "referenced_type" : "type-1295", +- "self_type" : "type-1294", ++ "referenced_type" : "type-1340", ++ "self_type" : "type-1339", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/List.h" + }, +@@ -12804,8 +12804,8 @@ + "alignment" : 4, + "linker_set_key" : "android::List::_Node *", + "name" : "android::List::_Node *", +- "referenced_type" : "type-1307", +- "self_type" : "type-1306", ++ "referenced_type" : "type-1508", ++ "self_type" : "type-1507", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/List.h" + }, +@@ -12813,8 +12813,8 @@ + "alignment" : 4, + "linker_set_key" : "android::List::_Node *", + "name" : "android::List::_Node *", +- "referenced_type" : "type-1334", +- "self_type" : "type-1333", ++ "referenced_type" : "type-1550", ++ "self_type" : "type-1549", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/List.h" + }, +@@ -12822,8 +12822,8 @@ + "alignment" : 4, + "linker_set_key" : "android::List::_Node *", + "name" : "android::List::_Node *", +- "referenced_type" : "type-1408", +- "self_type" : "type-1407", ++ "referenced_type" : "type-1594", ++ "self_type" : "type-1593", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/List.h" + }, +@@ -12831,8 +12831,8 @@ + "alignment" : 4, + "linker_set_key" : "android::List::_Node *", + "name" : "android::List::_Node *", +- "referenced_type" : "type-1556", +- "self_type" : "type-1555", ++ "referenced_type" : "type-1615", ++ "self_type" : "type-1614", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/List.h" + }, +@@ -12840,8 +12840,8 @@ + "alignment" : 4, + "linker_set_key" : "android::List::_Node *", + "name" : "android::List::_Node *", +- "referenced_type" : "type-1595", +- "self_type" : "type-1594", ++ "referenced_type" : "type-1694", ++ "self_type" : "type-1693", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/List.h" + }, +@@ -12849,8 +12849,8 @@ + "alignment" : 4, + "linker_set_key" : "android::List::_Node *", + "name" : "android::List::_Node *", +- "referenced_type" : "type-1598", +- "self_type" : "type-1597", ++ "referenced_type" : "type-1792", ++ "self_type" : "type-1791", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/List.h" + }, +@@ -12858,8 +12858,8 @@ + "alignment" : 4, + "linker_set_key" : "android::List::_Node *", + "name" : "android::List::_Node *", +- "referenced_type" : "type-1646", +- "self_type" : "type-1645", ++ "referenced_type" : "type-1891", ++ "self_type" : "type-1890", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/List.h" + }, +@@ -12867,8 +12867,8 @@ + "alignment" : 4, + "linker_set_key" : "android::List::_Node *", + "name" : "android::List::_Node *", +- "referenced_type" : "type-1668", +- "self_type" : "type-1667", ++ "referenced_type" : "type-1962", ++ "self_type" : "type-1961", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/List.h" + }, +@@ -12876,8 +12876,8 @@ + "alignment" : 4, + "linker_set_key" : "android::List::_Node *", + "name" : "android::List::_Node *", +- "referenced_type" : "type-1842", +- "self_type" : "type-1841", ++ "referenced_type" : "type-2130", ++ "self_type" : "type-2129", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/List.h" + }, +@@ -12885,8 +12885,8 @@ + "alignment" : 4, + "linker_set_key" : "android::List::_Node *", + "name" : "android::List::_Node *", +- "referenced_type" : "type-1941", +- "self_type" : "type-1940", ++ "referenced_type" : "type-2172", ++ "self_type" : "type-2171", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/List.h" + }, +@@ -12894,8 +12894,8 @@ + "alignment" : 4, + "linker_set_key" : "android::List::_Node *", + "name" : "android::List::_Node *", +- "referenced_type" : "type-2012", +- "self_type" : "type-2011", ++ "referenced_type" : "type-2216", ++ "self_type" : "type-2215", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/List.h" + }, +@@ -12903,8 +12903,8 @@ + "alignment" : 4, + "linker_set_key" : "android::List::_Node *", + "name" : "android::List::_Node *", +- "referenced_type" : "type-2180", +- "self_type" : "type-2179", ++ "referenced_type" : "type-2237", ++ "self_type" : "type-2236", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/List.h" + }, +@@ -12912,8 +12912,8 @@ + "alignment" : 4, + "linker_set_key" : "android::List::_Node *", + "name" : "android::List::_Node *", +- "referenced_type" : "type-2222", +- "self_type" : "type-2221", ++ "referenced_type" : "type-2307", ++ "self_type" : "type-2306", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/List.h" + }, +@@ -12921,8 +12921,8 @@ + "alignment" : 4, + "linker_set_key" : "android::List::_Node *", + "name" : "android::List::_Node *", +- "referenced_type" : "type-2266", +- "self_type" : "type-2265", ++ "referenced_type" : "type-2398", ++ "self_type" : "type-2397", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/List.h" + }, +@@ -12930,8 +12930,8 @@ + "alignment" : 4, + "linker_set_key" : "android::List::_Node *", + "name" : "android::List::_Node *", +- "referenced_type" : "type-2287", +- "self_type" : "type-2286", ++ "referenced_type" : "type-2497", ++ "self_type" : "type-2496", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/List.h" + }, +@@ -12939,8 +12939,8 @@ + "alignment" : 4, + "linker_set_key" : "android::List::_Node *", + "name" : "android::List::_Node *", +- "referenced_type" : "type-2357", +- "self_type" : "type-2356", ++ "referenced_type" : "type-2523", ++ "self_type" : "type-2522", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/List.h" + }, +@@ -12948,8 +12948,8 @@ + "alignment" : 4, + "linker_set_key" : "android::List::_Node *", + "name" : "android::List::_Node *", +- "referenced_type" : "type-2432", +- "self_type" : "type-2431", ++ "referenced_type" : "type-2535", ++ "self_type" : "type-2534", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/List.h" + }, +@@ -12957,8 +12957,8 @@ + "alignment" : 4, + "linker_set_key" : "android::List::_Node *", + "name" : "android::List::_Node *", +- "referenced_type" : "type-2531", +- "self_type" : "type-2530", ++ "referenced_type" : "type-2562", ++ "self_type" : "type-2561", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/List.h" + }, +@@ -12966,8 +12966,8 @@ + "alignment" : 4, + "linker_set_key" : "android::List::_Node *", + "name" : "android::List::_Node *", +- "referenced_type" : "type-2602", +- "self_type" : "type-2601", ++ "referenced_type" : "type-2636", ++ "self_type" : "type-2635", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/List.h" + }, +@@ -12975,8 +12975,8 @@ + "alignment" : 4, + "linker_set_key" : "android::List::_Node *", + "name" : "android::List::_Node *", +- "referenced_type" : "type-2770", +- "self_type" : "type-2769", ++ "referenced_type" : "type-2784", ++ "self_type" : "type-2783", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/List.h" + }, +@@ -12984,8 +12984,8 @@ + "alignment" : 4, + "linker_set_key" : "android::List::_Node *", + "name" : "android::List::_Node *", +- "referenced_type" : "type-2812", +- "self_type" : "type-2811", ++ "referenced_type" : "type-2823", ++ "self_type" : "type-2822", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/List.h" + }, +@@ -12993,8 +12993,8 @@ + "alignment" : 4, + "linker_set_key" : "android::List::_Node *", + "name" : "android::List::_Node *", +- "referenced_type" : "type-2856", +- "self_type" : "type-2855", ++ "referenced_type" : "type-2826", ++ "self_type" : "type-2825", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/List.h" + }, +@@ -13002,8 +13002,8 @@ + "alignment" : 4, + "linker_set_key" : "android::List::_Node *", + "name" : "android::List::_Node *", +- "referenced_type" : "type-2877", +- "self_type" : "type-2876", ++ "referenced_type" : "type-2874", ++ "self_type" : "type-2873", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/List.h" + }, +@@ -13011,8 +13011,8 @@ + "alignment" : 4, + "linker_set_key" : "android::List::_Node *", + "name" : "android::List::_Node *", +- "referenced_type" : "type-2947", +- "self_type" : "type-2946", ++ "referenced_type" : "type-2896", ++ "self_type" : "type-2895", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/List.h" + }, +@@ -13111,7 +13111,7 @@ + "linker_set_key" : "android::MediaBufferBase **", + "name" : "android::MediaBufferBase **", + "referenced_type" : "type-802", +- "self_type" : "type-1683", ++ "self_type" : "type-1634", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBufferGroup.h" + }, +@@ -13119,8 +13119,8 @@ + "alignment" : 4, + "linker_set_key" : "android::MediaBufferGroup *", + "name" : "android::MediaBufferGroup *", +- "referenced_type" : "type-1677", +- "self_type" : "type-1682", ++ "referenced_type" : "type-1628", ++ "self_type" : "type-1633", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBufferGroup.h" + }, +@@ -13128,8 +13128,8 @@ + "alignment" : 4, + "linker_set_key" : "android::MediaBufferGroup::InternalData *", + "name" : "android::MediaBufferGroup::InternalData *", +- "referenced_type" : "type-1681", +- "self_type" : "type-1680", ++ "referenced_type" : "type-1632", ++ "self_type" : "type-1631", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBufferGroup.h" + }, +@@ -13137,8 +13137,8 @@ + "alignment" : 4, + "linker_set_key" : "android::MediaBufferGroup::InternalData *", + "name" : "android::MediaBufferGroup::InternalData *", +- "referenced_type" : "type-2303", +- "self_type" : "type-2302", ++ "referenced_type" : "type-2253", ++ "self_type" : "type-2252", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBufferGroup.h" + }, +@@ -13146,8 +13146,8 @@ + "alignment" : 4, + "linker_set_key" : "android::MediaBufferGroup::InternalData *", + "name" : "android::MediaBufferGroup::InternalData *", +- "referenced_type" : "type-2893", +- "self_type" : "type-2892", ++ "referenced_type" : "type-2908", ++ "self_type" : "type-2907", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBufferGroup.h" + }, +@@ -13183,7 +13183,7 @@ + "linker_set_key" : "android::MetaData *", + "name" : "android::MetaData *", + "referenced_type" : "type-825", +- "self_type" : "type-1710", ++ "self_type" : "type-1657", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -13191,8 +13191,8 @@ + "alignment" : 4, + "linker_set_key" : "android::MetaDataBase *", + "name" : "android::MetaDataBase *", +- "referenced_type" : "type-1654", +- "self_type" : "type-1653", ++ "referenced_type" : "type-1601", ++ "self_type" : "type-1600", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBuffer.h" + }, +@@ -13200,8 +13200,8 @@ + "alignment" : 4, + "linker_set_key" : "android::MetaDataBase *", + "name" : "android::MetaDataBase *", +- "referenced_type" : "type-1676", +- "self_type" : "type-1675", ++ "referenced_type" : "type-1626", ++ "self_type" : "type-1625", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBuffer.h" + }, +@@ -13209,8 +13209,8 @@ + "alignment" : 4, + "linker_set_key" : "android::MetaDataBase *", + "name" : "android::MetaDataBase *", +- "referenced_type" : "type-2273", +- "self_type" : "type-2272", ++ "referenced_type" : "type-2223", ++ "self_type" : "type-2222", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBuffer.h" + }, +@@ -13218,8 +13218,8 @@ + "alignment" : 4, + "linker_set_key" : "android::MetaDataBase *", + "name" : "android::MetaDataBase *", +- "referenced_type" : "type-2298", +- "self_type" : "type-2297", ++ "referenced_type" : "type-2248", ++ "self_type" : "type-2247", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBuffer.h" + }, +@@ -13227,8 +13227,8 @@ + "alignment" : 4, + "linker_set_key" : "android::MetaDataBase *", + "name" : "android::MetaDataBase *", +- "referenced_type" : "type-2863", +- "self_type" : "type-2862", ++ "referenced_type" : "type-2882", ++ "self_type" : "type-2881", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBuffer.h" + }, +@@ -13236,8 +13236,8 @@ + "alignment" : 4, + "linker_set_key" : "android::MetaDataBase *", + "name" : "android::MetaDataBase *", +- "referenced_type" : "type-2888", +- "self_type" : "type-2887", ++ "referenced_type" : "type-2904", ++ "self_type" : "type-2903", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBuffer.h" + }, +@@ -13254,8 +13254,8 @@ + "alignment" : 4, + "linker_set_key" : "android::MetaDataBase::MetaDataInternal *", + "name" : "android::MetaDataBase::MetaDataInternal *", +- "referenced_type" : "type-1611", +- "self_type" : "type-1610", ++ "referenced_type" : "type-1562", ++ "self_type" : "type-1561", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MetaDataBase.h" + }, +@@ -13263,8 +13263,8 @@ + "alignment" : 4, + "linker_set_key" : "android::MetaDataBase::MetaDataInternal *", + "name" : "android::MetaDataBase::MetaDataInternal *", +- "referenced_type" : "type-1703", +- "self_type" : "type-1702", ++ "referenced_type" : "type-1651", ++ "self_type" : "type-1650", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MetaDataBase.h" + }, +@@ -13272,8 +13272,8 @@ + "alignment" : 4, + "linker_set_key" : "android::MetaDataBase::MetaDataInternal *", + "name" : "android::MetaDataBase::MetaDataInternal *", +- "referenced_type" : "type-1754", +- "self_type" : "type-1753", ++ "referenced_type" : "type-1705", ++ "self_type" : "type-1704", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MetaDataBase.h" + }, +@@ -13281,8 +13281,8 @@ + "alignment" : 4, + "linker_set_key" : "android::MetaDataBase::MetaDataInternal *", + "name" : "android::MetaDataBase::MetaDataInternal *", +- "referenced_type" : "type-1794", +- "self_type" : "type-1793", ++ "referenced_type" : "type-2184", ++ "self_type" : "type-2183", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MetaDataBase.h" + }, +@@ -13290,8 +13290,8 @@ + "alignment" : 4, + "linker_set_key" : "android::MetaDataBase::MetaDataInternal *", + "name" : "android::MetaDataBase::MetaDataInternal *", +- "referenced_type" : "type-2234", +- "self_type" : "type-2233", ++ "referenced_type" : "type-2271", ++ "self_type" : "type-2270", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MetaDataBase.h" + }, +@@ -13299,8 +13299,8 @@ + "alignment" : 4, + "linker_set_key" : "android::MetaDataBase::MetaDataInternal *", + "name" : "android::MetaDataBase::MetaDataInternal *", +- "referenced_type" : "type-2321", +- "self_type" : "type-2320", ++ "referenced_type" : "type-2316", ++ "self_type" : "type-2315", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MetaDataBase.h" + }, +@@ -13308,8 +13308,8 @@ + "alignment" : 4, + "linker_set_key" : "android::MetaDataBase::MetaDataInternal *", + "name" : "android::MetaDataBase::MetaDataInternal *", +- "referenced_type" : "type-2366", +- "self_type" : "type-2365", ++ "referenced_type" : "type-2338", ++ "self_type" : "type-2337", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MetaDataBase.h" + }, +@@ -13317,8 +13317,8 @@ + "alignment" : 4, + "linker_set_key" : "android::MetaDataBase::MetaDataInternal *", + "name" : "android::MetaDataBase::MetaDataInternal *", +- "referenced_type" : "type-2824", +- "self_type" : "type-2823", ++ "referenced_type" : "type-2839", ++ "self_type" : "type-2838", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MetaDataBase.h" + }, +@@ -13326,8 +13326,8 @@ + "alignment" : 4, + "linker_set_key" : "android::MetaDataBase::MetaDataInternal *", + "name" : "android::MetaDataBase::MetaDataInternal *", +- "referenced_type" : "type-2911", +- "self_type" : "type-2910", ++ "referenced_type" : "type-2929", ++ "self_type" : "type-2928", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MetaDataBase.h" + }, +@@ -13335,8 +13335,8 @@ + "alignment" : 4, + "linker_set_key" : "android::MetaDataBase::MetaDataInternal *", + "name" : "android::MetaDataBase::MetaDataInternal *", +- "referenced_type" : "type-2956", +- "self_type" : "type-2955", ++ "referenced_type" : "type-2971", ++ "self_type" : "type-2970", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MetaDataBase.h" + }, +@@ -13344,8 +13344,8 @@ + "alignment" : 4, + "linker_set_key" : "android::MetaDataBase::MetaDataInternal *", + "name" : "android::MetaDataBase::MetaDataInternal *", +- "referenced_type" : "type-2976", +- "self_type" : "type-2975", ++ "referenced_type" : "type-2988", ++ "self_type" : "type-2987", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MetaDataBase.h" + }, +@@ -13389,8 +13389,8 @@ + "alignment" : 4, + "linker_set_key" : "android::OpusHeader *", + "name" : "android::OpusHeader *", +- "referenced_type" : "type-1782", +- "self_type" : "type-1784", ++ "referenced_type" : "type-1733", ++ "self_type" : "type-1735", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/OpusHeader.h" + }, +@@ -13506,8 +13506,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1285", +- "self_type" : "type-1284", ++ "referenced_type" : "type-1342", ++ "self_type" : "type-1341", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13515,8 +13515,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1292", +- "self_type" : "type-1291", ++ "referenced_type" : "type-1368", ++ "self_type" : "type-1367", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13524,8 +13524,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1311", +- "self_type" : "type-1310", ++ "referenced_type" : "type-1404", ++ "self_type" : "type-1403", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13533,8 +13533,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1324", +- "self_type" : "type-1323", ++ "referenced_type" : "type-1433", ++ "self_type" : "type-1432", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13542,8 +13542,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1331", +- "self_type" : "type-1330", ++ "referenced_type" : "type-1535", ++ "self_type" : "type-1534", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13551,8 +13551,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1341", +- "self_type" : "type-1340", ++ "referenced_type" : "type-1589", ++ "self_type" : "type-1588", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13560,8 +13560,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1410", +- "self_type" : "type-1409", ++ "referenced_type" : "type-1609", ++ "self_type" : "type-1608", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13569,8 +13569,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1463", +- "self_type" : "type-1462", ++ "referenced_type" : "type-1644", ++ "self_type" : "type-1643", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13578,8 +13578,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1483", +- "self_type" : "type-1482", ++ "referenced_type" : "type-1683", ++ "self_type" : "type-1682", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13587,8 +13587,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1580", +- "self_type" : "type-1579", ++ "referenced_type" : "type-1747", ++ "self_type" : "type-1746", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13596,8 +13596,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1641", +- "self_type" : "type-1640", ++ "referenced_type" : "type-1802", ++ "self_type" : "type-1801", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13605,8 +13605,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1663", +- "self_type" : "type-1662", ++ "referenced_type" : "type-1857", ++ "self_type" : "type-1856", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13614,8 +13614,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1693", +- "self_type" : "type-1692", ++ "referenced_type" : "type-1901", ++ "self_type" : "type-1900", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13623,8 +13623,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1699", +- "self_type" : "type-1698", ++ "referenced_type" : "type-1964", ++ "self_type" : "type-1963", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13632,8 +13632,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1734", +- "self_type" : "type-1733", ++ "referenced_type" : "type-1990", ++ "self_type" : "type-1989", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13641,8 +13641,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1788", +- "self_type" : "type-1787", ++ "referenced_type" : "type-2026", ++ "self_type" : "type-2025", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13650,8 +13650,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1799", +- "self_type" : "type-1798", ++ "referenced_type" : "type-2055", ++ "self_type" : "type-2054", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13659,8 +13659,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1852", +- "self_type" : "type-1851", ++ "referenced_type" : "type-2157", ++ "self_type" : "type-2156", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13668,8 +13668,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1907", +- "self_type" : "type-1906", ++ "referenced_type" : "type-2211", ++ "self_type" : "type-2210", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13677,8 +13677,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1951", +- "self_type" : "type-1950", ++ "referenced_type" : "type-2231", ++ "self_type" : "type-2230", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13686,8 +13686,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2014", +- "self_type" : "type-2013", ++ "referenced_type" : "type-2264", ++ "self_type" : "type-2263", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13695,8 +13695,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2040", +- "self_type" : "type-2039", ++ "referenced_type" : "type-2297", ++ "self_type" : "type-2296", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13704,8 +13704,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2076", +- "self_type" : "type-2075", ++ "referenced_type" : "type-2331", ++ "self_type" : "type-2330", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13713,8 +13713,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2105", +- "self_type" : "type-2104", ++ "referenced_type" : "type-2342", ++ "self_type" : "type-2341", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13722,8 +13722,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2207", +- "self_type" : "type-2206", ++ "referenced_type" : "type-2353", ++ "self_type" : "type-2352", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13731,8 +13731,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2261", +- "self_type" : "type-2260", ++ "referenced_type" : "type-2408", ++ "self_type" : "type-2407", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13740,8 +13740,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2281", +- "self_type" : "type-2280", ++ "referenced_type" : "type-2463", ++ "self_type" : "type-2462", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13749,8 +13749,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2314", +- "self_type" : "type-2313", ++ "referenced_type" : "type-2507", ++ "self_type" : "type-2506", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13758,8 +13758,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2347", +- "self_type" : "type-2346", ++ "referenced_type" : "type-2513", ++ "self_type" : "type-2512", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13767,8 +13767,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2387", +- "self_type" : "type-2386", ++ "referenced_type" : "type-2520", ++ "self_type" : "type-2519", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13776,8 +13776,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2442", +- "self_type" : "type-2441", ++ "referenced_type" : "type-2539", ++ "self_type" : "type-2538", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13785,8 +13785,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2497", +- "self_type" : "type-2496", ++ "referenced_type" : "type-2552", ++ "self_type" : "type-2551", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13794,8 +13794,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2541", +- "self_type" : "type-2540", ++ "referenced_type" : "type-2559", ++ "self_type" : "type-2558", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13803,8 +13803,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2604", +- "self_type" : "type-2603", ++ "referenced_type" : "type-2569", ++ "self_type" : "type-2568", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13812,8 +13812,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2630", +- "self_type" : "type-2629", ++ "referenced_type" : "type-2638", ++ "self_type" : "type-2637", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13821,8 +13821,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2666", +- "self_type" : "type-2665", ++ "referenced_type" : "type-2691", ++ "self_type" : "type-2690", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13830,8 +13830,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2695", +- "self_type" : "type-2694", ++ "referenced_type" : "type-2711", ++ "self_type" : "type-2710", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13839,8 +13839,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2797", +- "self_type" : "type-2796", ++ "referenced_type" : "type-2808", ++ "self_type" : "type-2807", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13848,8 +13848,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2851", +- "self_type" : "type-2850", ++ "referenced_type" : "type-2869", ++ "self_type" : "type-2868", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13857,8 +13857,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2871", +- "self_type" : "type-2870", ++ "referenced_type" : "type-2891", ++ "self_type" : "type-2890", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13866,8 +13866,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2904", +- "self_type" : "type-2903", ++ "referenced_type" : "type-2919", ++ "self_type" : "type-2918", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13875,8 +13875,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2937", +- "self_type" : "type-2936", ++ "referenced_type" : "type-2925", ++ "self_type" : "type-2924", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13884,8 +13884,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2971", +- "self_type" : "type-2970", ++ "referenced_type" : "type-2954", ++ "self_type" : "type-2953", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13893,8 +13893,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2980", +- "self_type" : "type-2979", ++ "referenced_type" : "type-2984", ++ "self_type" : "type-2983", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -13902,8 +13902,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2990", +- "self_type" : "type-2989", ++ "referenced_type" : "type-2993", ++ "self_type" : "type-2992", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -14010,8 +14010,8 @@ + "alignment" : 4, + "linker_set_key" : "android::SimpleBestFitAllocator *", + "name" : "android::SimpleBestFitAllocator *", +- "referenced_type" : "type-1591", +- "self_type" : "type-1590", ++ "referenced_type" : "type-1544", ++ "self_type" : "type-1543", + "size" : 4, + "source_file" : "/frameworks/native/libs/binder/include/binder/MemoryDealer.h" + }, +@@ -14019,8 +14019,8 @@ + "alignment" : 4, + "linker_set_key" : "android::SimpleBestFitAllocator *", + "name" : "android::SimpleBestFitAllocator *", +- "referenced_type" : "type-1644", +- "self_type" : "type-1643", ++ "referenced_type" : "type-1592", ++ "self_type" : "type-1591", + "size" : 4, + "source_file" : "/frameworks/native/libs/binder/include/binder/MemoryDealer.h" + }, +@@ -14028,8 +14028,8 @@ + "alignment" : 4, + "linker_set_key" : "android::SimpleBestFitAllocator *", + "name" : "android::SimpleBestFitAllocator *", +- "referenced_type" : "type-1666", +- "self_type" : "type-1665", ++ "referenced_type" : "type-1612", ++ "self_type" : "type-1611", + "size" : 4, + "source_file" : "/frameworks/native/libs/binder/include/binder/MemoryDealer.h" + }, +@@ -14037,8 +14037,8 @@ + "alignment" : 4, + "linker_set_key" : "android::SimpleBestFitAllocator *", + "name" : "android::SimpleBestFitAllocator *", +- "referenced_type" : "type-2216", +- "self_type" : "type-2215", ++ "referenced_type" : "type-2166", ++ "self_type" : "type-2165", + "size" : 4, + "source_file" : "/frameworks/native/libs/binder/include/binder/MemoryDealer.h" + }, +@@ -14046,8 +14046,8 @@ + "alignment" : 4, + "linker_set_key" : "android::SimpleBestFitAllocator *", + "name" : "android::SimpleBestFitAllocator *", +- "referenced_type" : "type-2264", +- "self_type" : "type-2263", ++ "referenced_type" : "type-2214", ++ "self_type" : "type-2213", + "size" : 4, + "source_file" : "/frameworks/native/libs/binder/include/binder/MemoryDealer.h" + }, +@@ -14055,8 +14055,8 @@ + "alignment" : 4, + "linker_set_key" : "android::SimpleBestFitAllocator *", + "name" : "android::SimpleBestFitAllocator *", +- "referenced_type" : "type-2284", +- "self_type" : "type-2283", ++ "referenced_type" : "type-2234", ++ "self_type" : "type-2233", + "size" : 4, + "source_file" : "/frameworks/native/libs/binder/include/binder/MemoryDealer.h" + }, +@@ -14064,8 +14064,8 @@ + "alignment" : 4, + "linker_set_key" : "android::SimpleBestFitAllocator *", + "name" : "android::SimpleBestFitAllocator *", +- "referenced_type" : "type-2806", +- "self_type" : "type-2805", ++ "referenced_type" : "type-2819", ++ "self_type" : "type-2818", + "size" : 4, + "source_file" : "/frameworks/native/libs/binder/include/binder/MemoryDealer.h" + }, +@@ -14073,8 +14073,8 @@ + "alignment" : 4, + "linker_set_key" : "android::SimpleBestFitAllocator *", + "name" : "android::SimpleBestFitAllocator *", +- "referenced_type" : "type-2854", +- "self_type" : "type-2853", ++ "referenced_type" : "type-2872", ++ "self_type" : "type-2871", + "size" : 4, + "source_file" : "/frameworks/native/libs/binder/include/binder/MemoryDealer.h" + }, +@@ -14082,8 +14082,8 @@ + "alignment" : 4, + "linker_set_key" : "android::SimpleBestFitAllocator *", + "name" : "android::SimpleBestFitAllocator *", +- "referenced_type" : "type-2874", +- "self_type" : "type-2873", ++ "referenced_type" : "type-2894", ++ "self_type" : "type-2893", + "size" : 4, + "source_file" : "/frameworks/native/libs/binder/include/binder/MemoryDealer.h" + }, +@@ -14118,8 +14118,8 @@ + "alignment" : 4, + "linker_set_key" : "android::SortedVector > *", + "name" : "android::SortedVector > *", +- "referenced_type" : "type-1738", +- "self_type" : "type-1739", ++ "referenced_type" : "type-1686", ++ "self_type" : "type-1688", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -14217,8 +14217,8 @@ + "alignment" : 4, + "linker_set_key" : "android::key_value_pair_t *", + "name" : "android::key_value_pair_t *", +- "referenced_type" : "type-1718", +- "self_type" : "type-1722", ++ "referenced_type" : "type-1665", ++ "self_type" : "type-1669", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -14316,8 +14316,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-1709", +- "self_type" : "type-1711", ++ "referenced_type" : "type-1656", ++ "self_type" : "type-1658", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -14559,8 +14559,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::ALooper::LooperThread *", + "name" : "const android::ALooper::LooperThread *", +- "referenced_type" : "type-1320", +- "self_type" : "type-1322", ++ "referenced_type" : "type-1850", ++ "self_type" : "type-1852", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -14568,8 +14568,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::ALooper::LooperThread *", + "name" : "const android::ALooper::LooperThread *", +- "referenced_type" : "type-1900", +- "self_type" : "type-1902", ++ "referenced_type" : "type-2456", ++ "self_type" : "type-2458", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -14577,8 +14577,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::ALooper::LooperThread *", + "name" : "const android::ALooper::LooperThread *", +- "referenced_type" : "type-2490", +- "self_type" : "type-2492", ++ "referenced_type" : "type-2548", ++ "self_type" : "type-2550", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -14685,8 +14685,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::KeyedVector *", + "name" : "const android::KeyedVector *", +- "referenced_type" : "type-1749", +- "self_type" : "type-1750", ++ "referenced_type" : "type-1700", ++ "self_type" : "type-1701", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -14784,8 +14784,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::MediaBufferGroup *", + "name" : "const android::MediaBufferGroup *", +- "referenced_type" : "type-1684", +- "self_type" : "type-1685", ++ "referenced_type" : "type-1635", ++ "self_type" : "type-1636", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBufferGroup.h" + }, +@@ -14802,8 +14802,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::MetaDataBase *", + "name" : "const android::MetaDataBase *", +- "referenced_type" : "type-1707", +- "self_type" : "type-1755", ++ "referenced_type" : "type-1654", ++ "self_type" : "type-1706", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MetaDataBase.h" + }, +@@ -14865,8 +14865,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::SortedVector > *", + "name" : "const android::SortedVector > *", +- "referenced_type" : "type-1741", +- "self_type" : "type-1743", ++ "referenced_type" : "type-1690", ++ "self_type" : "type-1692", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -14955,8 +14955,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::key_value_pair_t *", + "name" : "const android::key_value_pair_t *", +- "referenced_type" : "type-1717", +- "self_type" : "type-1723", ++ "referenced_type" : "type-1664", ++ "self_type" : "type-1670", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -15045,8 +15045,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-1713", +- "self_type" : "type-1714", ++ "referenced_type" : "type-1660", ++ "self_type" : "type-1661", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -15109,7 +15109,7 @@ + "linker_set_key" : "const char **", + "name" : "const char **", + "referenced_type" : "type-114", +- "self_type" : "type-1756", ++ "self_type" : "type-1707", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MetaDataBase.h" + }, +@@ -15145,7 +15145,7 @@ + "linker_set_key" : "const unsigned char **", + "name" : "const unsigned char **", + "referenced_type" : "type-458", +- "self_type" : "type-1791", ++ "self_type" : "type-2335", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/avc_utils.h" + }, +@@ -15172,7 +15172,7 @@ + "linker_set_key" : "const void **", + "name" : "const void **", + "referenced_type" : "type-490", +- "self_type" : "type-1759", ++ "self_type" : "type-1709", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MetaDataBase.h" + }, +@@ -15234,8 +15234,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-1479", +- "self_type" : "type-1478", ++ "referenced_type" : "type-1425", ++ "self_type" : "type-1424", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AudioPresentationInfo.h" + }, +@@ -15243,8 +15243,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-2097", +- "self_type" : "type-2096", ++ "referenced_type" : "type-2047", ++ "self_type" : "type-2046", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AudioPresentationInfo.h" + }, +@@ -15252,8 +15252,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-2687", +- "self_type" : "type-2686", ++ "referenced_type" : "type-2707", ++ "self_type" : "type-2706", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AudioPresentationInfo.h" + }, +@@ -15270,8 +15270,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-1477", +- "self_type" : "type-1476", ++ "referenced_type" : "type-1423", ++ "self_type" : "type-1422", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AudioPresentationInfo.h" + }, +@@ -15279,8 +15279,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-2095", +- "self_type" : "type-2094", ++ "referenced_type" : "type-2045", ++ "self_type" : "type-2044", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AudioPresentationInfo.h" + }, +@@ -15288,8 +15288,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-2685", +- "self_type" : "type-2684", ++ "referenced_type" : "type-2705", ++ "self_type" : "type-2704", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AudioPresentationInfo.h" + }, +@@ -15306,8 +15306,8 @@ + "alignment" : 4, + "linker_set_key" : "std::pair *", + "name" : "std::pair *", +- "referenced_type" : "type-1505", +- "self_type" : "type-1504", ++ "referenced_type" : "type-1457", ++ "self_type" : "type-1456", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" + }, +@@ -15315,8 +15315,8 @@ + "alignment" : 4, + "linker_set_key" : "std::pair *", + "name" : "std::pair *", +- "referenced_type" : "type-2129", +- "self_type" : "type-2128", ++ "referenced_type" : "type-2079", ++ "self_type" : "type-2078", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" + }, +@@ -15324,8 +15324,8 @@ + "alignment" : 4, + "linker_set_key" : "std::pair *", + "name" : "std::pair *", +- "referenced_type" : "type-2719", +- "self_type" : "type-2718", ++ "referenced_type" : "type-2733", ++ "self_type" : "type-2732", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" + }, +@@ -15342,8 +15342,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-1481", +- "self_type" : "type-1480", ++ "referenced_type" : "type-1427", ++ "self_type" : "type-1426", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AudioPresentationInfo.h" + }, +@@ -15351,8 +15351,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-2099", +- "self_type" : "type-2098", ++ "referenced_type" : "type-2049", ++ "self_type" : "type-2048", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AudioPresentationInfo.h" + }, +@@ -15360,8 +15360,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-2689", +- "self_type" : "type-2688", ++ "referenced_type" : "type-2709", ++ "self_type" : "type-2708", + "size" : 4, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AudioPresentationInfo.h" + }, +@@ -15476,8 +15476,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1284", +- "self_type" : "type-1286", ++ "referenced_type" : "type-1341", ++ "self_type" : "type-1343", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15486,8 +15486,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1291", +- "self_type" : "type-1293", ++ "referenced_type" : "type-1367", ++ "self_type" : "type-1366", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15496,8 +15496,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1310", +- "self_type" : "type-1312", ++ "referenced_type" : "type-1403", ++ "self_type" : "type-1405", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15506,8 +15506,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1323", +- "self_type" : "type-1326", ++ "referenced_type" : "type-1432", ++ "self_type" : "type-1434", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15516,8 +15516,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1330", +- "self_type" : "type-1329", ++ "referenced_type" : "type-1534", ++ "self_type" : "type-1536", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15526,8 +15526,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1340", +- "self_type" : "type-1342", ++ "referenced_type" : "type-1588", ++ "self_type" : "type-1590", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15536,8 +15536,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1409", +- "self_type" : "type-1411", ++ "referenced_type" : "type-1608", ++ "self_type" : "type-1610", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15546,8 +15546,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1462", +- "self_type" : "type-1464", ++ "referenced_type" : "type-1643", ++ "self_type" : "type-1645", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15556,8 +15556,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1482", +- "self_type" : "type-1484", ++ "referenced_type" : "type-1682", ++ "self_type" : "type-1684", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15566,8 +15566,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1579", +- "self_type" : "type-1581", ++ "referenced_type" : "type-1746", ++ "self_type" : "type-1748", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15576,8 +15576,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1640", +- "self_type" : "type-1642", ++ "referenced_type" : "type-1801", ++ "self_type" : "type-1803", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15586,8 +15586,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1662", +- "self_type" : "type-1664", ++ "referenced_type" : "type-1856", ++ "self_type" : "type-1858", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15596,8 +15596,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1692", +- "self_type" : "type-1694", ++ "referenced_type" : "type-1900", ++ "self_type" : "type-1902", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15606,8 +15606,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1698", +- "self_type" : "type-1704", ++ "referenced_type" : "type-1963", ++ "self_type" : "type-1965", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15616,8 +15616,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1733", +- "self_type" : "type-1735", ++ "referenced_type" : "type-1989", ++ "self_type" : "type-1988", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15626,8 +15626,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1787", +- "self_type" : "type-1789", ++ "referenced_type" : "type-2025", ++ "self_type" : "type-2027", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15636,8 +15636,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1798", +- "self_type" : "type-1800", ++ "referenced_type" : "type-2054", ++ "self_type" : "type-2056", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15646,8 +15646,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1851", +- "self_type" : "type-1853", ++ "referenced_type" : "type-2156", ++ "self_type" : "type-2158", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15656,8 +15656,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1906", +- "self_type" : "type-1908", ++ "referenced_type" : "type-2210", ++ "self_type" : "type-2212", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15666,8 +15666,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1950", +- "self_type" : "type-1952", ++ "referenced_type" : "type-2230", ++ "self_type" : "type-2232", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15676,8 +15676,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2013", +- "self_type" : "type-2015", ++ "referenced_type" : "type-2263", ++ "self_type" : "type-2265", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15686,8 +15686,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2039", +- "self_type" : "type-2038", ++ "referenced_type" : "type-2296", ++ "self_type" : "type-2298", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15696,8 +15696,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2075", +- "self_type" : "type-2077", ++ "referenced_type" : "type-2330", ++ "self_type" : "type-2332", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15706,8 +15706,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2104", +- "self_type" : "type-2106", ++ "referenced_type" : "type-2341", ++ "self_type" : "type-2343", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15716,8 +15716,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2206", +- "self_type" : "type-2208", ++ "referenced_type" : "type-2352", ++ "self_type" : "type-2354", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15726,8 +15726,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2260", +- "self_type" : "type-2262", ++ "referenced_type" : "type-2407", ++ "self_type" : "type-2409", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15736,8 +15736,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2280", +- "self_type" : "type-2282", ++ "referenced_type" : "type-2462", ++ "self_type" : "type-2464", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15746,8 +15746,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2313", +- "self_type" : "type-2315", ++ "referenced_type" : "type-2506", ++ "self_type" : "type-2508", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15756,8 +15756,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2346", +- "self_type" : "type-2348", ++ "referenced_type" : "type-2512", ++ "self_type" : "type-2514", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15766,8 +15766,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2386", +- "self_type" : "type-2388", ++ "referenced_type" : "type-2519", ++ "self_type" : "type-2521", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15776,8 +15776,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2441", +- "self_type" : "type-2443", ++ "referenced_type" : "type-2538", ++ "self_type" : "type-2540", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15786,8 +15786,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2496", +- "self_type" : "type-2498", ++ "referenced_type" : "type-2551", ++ "self_type" : "type-2554", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15796,8 +15796,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2540", +- "self_type" : "type-2542", ++ "referenced_type" : "type-2558", ++ "self_type" : "type-2557", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15806,8 +15806,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2603", +- "self_type" : "type-2605", ++ "referenced_type" : "type-2568", ++ "self_type" : "type-2570", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15816,8 +15816,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2629", +- "self_type" : "type-2628", ++ "referenced_type" : "type-2637", ++ "self_type" : "type-2639", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15826,8 +15826,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2665", +- "self_type" : "type-2667", ++ "referenced_type" : "type-2690", ++ "self_type" : "type-2692", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15836,8 +15836,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2694", +- "self_type" : "type-2696", ++ "referenced_type" : "type-2710", ++ "self_type" : "type-2712", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15846,8 +15846,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2796", +- "self_type" : "type-2798", ++ "referenced_type" : "type-2807", ++ "self_type" : "type-2809", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15856,8 +15856,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2850", +- "self_type" : "type-2852", ++ "referenced_type" : "type-2868", ++ "self_type" : "type-2870", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15866,8 +15866,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2870", +- "self_type" : "type-2872", ++ "referenced_type" : "type-2890", ++ "self_type" : "type-2892", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15876,8 +15876,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2903", +- "self_type" : "type-2905", ++ "referenced_type" : "type-2918", ++ "self_type" : "type-2920", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15886,8 +15886,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2936", +- "self_type" : "type-2938", ++ "referenced_type" : "type-2924", ++ "self_type" : "type-2930", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15896,8 +15896,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2970", +- "self_type" : "type-2972", ++ "referenced_type" : "type-2953", ++ "self_type" : "type-2955", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15906,8 +15906,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2979", +- "self_type" : "type-2981", ++ "referenced_type" : "type-2983", ++ "self_type" : "type-2985", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -15916,8 +15916,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2989", +- "self_type" : "type-2991", ++ "referenced_type" : "type-2992", ++ "self_type" : "type-2994", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -16196,8 +16196,8 @@ + "is_const" : true, + "linker_set_key" : "const android::ALooper::LooperThread", + "name" : "const android::ALooper::LooperThread", +- "referenced_type" : "type-1321", +- "self_type" : "type-1320", ++ "referenced_type" : "type-1851", ++ "self_type" : "type-1850", + "size" : 52, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -16206,8 +16206,8 @@ + "is_const" : true, + "linker_set_key" : "const android::ALooper::LooperThread", + "name" : "const android::ALooper::LooperThread", +- "referenced_type" : "type-1901", +- "self_type" : "type-1900", ++ "referenced_type" : "type-2457", ++ "self_type" : "type-2456", + "size" : 52, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -16216,8 +16216,8 @@ + "is_const" : true, + "linker_set_key" : "const android::ALooper::LooperThread", + "name" : "const android::ALooper::LooperThread", +- "referenced_type" : "type-2491", +- "self_type" : "type-2490", ++ "referenced_type" : "type-2549", ++ "self_type" : "type-2548", + "size" : 52, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -16446,8 +16446,8 @@ + "is_const" : true, + "linker_set_key" : "const android::KeyedVector", + "name" : "const android::KeyedVector", +- "referenced_type" : "type-1746", +- "self_type" : "type-1749", ++ "referenced_type" : "type-1697", ++ "self_type" : "type-1700", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -16556,8 +16556,8 @@ + "is_const" : true, + "linker_set_key" : "const android::MediaBufferGroup", + "name" : "const android::MediaBufferGroup", +- "referenced_type" : "type-1677", +- "self_type" : "type-1684", ++ "referenced_type" : "type-1628", ++ "self_type" : "type-1635", + "size" : 12, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBufferGroup.h" + }, +@@ -16577,7 +16577,7 @@ + "linker_set_key" : "const android::MetaData", + "name" : "const android::MetaData", + "referenced_type" : "type-825", +- "self_type" : "type-1705", ++ "self_type" : "type-1652", + "size" : 16, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MetaData.h" + }, +@@ -16587,7 +16587,7 @@ + "linker_set_key" : "const android::MetaDataBase", + "name" : "const android::MetaDataBase", + "referenced_type" : "type-808", +- "self_type" : "type-1707", ++ "self_type" : "type-1654", + "size" : 8, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MetaData.h" + }, +@@ -16596,8 +16596,8 @@ + "is_const" : true, + "linker_set_key" : "const android::MetaDataBase::typed_data", + "name" : "const android::MetaDataBase::typed_data", +- "referenced_type" : "type-1728", +- "self_type" : "type-1727", ++ "referenced_type" : "type-1675", ++ "self_type" : "type-1674", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -16606,8 +16606,8 @@ + "is_const" : true, + "linker_set_key" : "const android::MetaDataBase::typed_data", + "name" : "const android::MetaDataBase::typed_data", +- "referenced_type" : "type-2339", +- "self_type" : "type-2338", ++ "referenced_type" : "type-2289", ++ "self_type" : "type-2288", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -16616,8 +16616,8 @@ + "is_const" : true, + "linker_set_key" : "const android::MetaDataBase::typed_data", + "name" : "const android::MetaDataBase::typed_data", +- "referenced_type" : "type-2929", +- "self_type" : "type-2928", ++ "referenced_type" : "type-2948", ++ "self_type" : "type-2947", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -16636,8 +16636,8 @@ + "is_const" : true, + "linker_set_key" : "const android::OpusHeader", + "name" : "const android::OpusHeader", +- "referenced_type" : "type-1782", +- "self_type" : "type-1785", ++ "referenced_type" : "type-1733", ++ "self_type" : "type-1736", + "size" : 32, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/OpusHeader.h" + }, +@@ -16716,8 +16716,8 @@ + "is_const" : true, + "linker_set_key" : "const android::SortedVector >", + "name" : "const android::SortedVector >", +- "referenced_type" : "type-1738", +- "self_type" : "type-1741", ++ "referenced_type" : "type-1686", ++ "self_type" : "type-1690", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -16816,8 +16816,8 @@ + "is_const" : true, + "linker_set_key" : "const android::key_value_pair_t", + "name" : "const android::key_value_pair_t", +- "referenced_type" : "type-1718", +- "self_type" : "type-1717", ++ "referenced_type" : "type-1665", ++ "self_type" : "type-1664", + "size" : 16, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -16926,8 +16926,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-1709", +- "self_type" : "type-1713", ++ "referenced_type" : "type-1656", ++ "self_type" : "type-1660", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -17106,8 +17106,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-1507", +- "self_type" : "type-1506", ++ "referenced_type" : "type-1459", ++ "self_type" : "type-1458", + "size" : 8, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" + }, +@@ -17116,8 +17116,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-2131", +- "self_type" : "type-2130", ++ "referenced_type" : "type-2081", ++ "self_type" : "type-2080", + "size" : 8, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" + }, +@@ -17126,8 +17126,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-2721", +- "self_type" : "type-2720", ++ "referenced_type" : "type-2735", ++ "self_type" : "type-2734", + "size" : 8, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" + }, +@@ -17146,8 +17146,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-1474", +- "self_type" : "type-1473", ++ "referenced_type" : "type-1420", ++ "self_type" : "type-1419", + "size" : 12, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AudioPresentationInfo.h" + }, +@@ -17156,8 +17156,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-2092", +- "self_type" : "type-2091", ++ "referenced_type" : "type-2042", ++ "self_type" : "type-2041", + "size" : 12, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AudioPresentationInfo.h" + }, +@@ -17166,8 +17166,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-2682", +- "self_type" : "type-2681", ++ "referenced_type" : "type-2702", ++ "self_type" : "type-2701", + "size" : 12, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AudioPresentationInfo.h" + }, +@@ -20311,17 +20311,17 @@ + { + "access" : "private", + "field_name" : "mVector", +- "referenced_type" : "type-1738" ++ "referenced_type" : "type-1686" + } + ], + "linker_set_key" : "android::KeyedVector", + "name" : "android::KeyedVector", + "record_kind" : "class", +- "referenced_type" : "type-1746", +- "self_type" : "type-1746", ++ "referenced_type" : "type-1697", ++ "self_type" : "type-1697", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h", +- "template_args" : [ "type-4", "type-1747" ], ++ "template_args" : [ "type-4", "type-1698" ], + "unique_id" : "_ZTSN7android11KeyedVectorIjNS_12MetaDataBase10typed_dataEEE" + }, + { +@@ -20874,20 +20874,20 @@ + "access" : "private", + "field_name" : "mWrapper", + "field_offset" : 32, +- "referenced_type" : "type-1678" ++ "referenced_type" : "type-1629" + }, + { + "access" : "private", + "field_name" : "mInternal", + "field_offset" : 64, +- "referenced_type" : "type-1680" ++ "referenced_type" : "type-1631" + } + ], + "linker_set_key" : "android::MediaBufferGroup", + "name" : "android::MediaBufferGroup", + "record_kind" : "class", +- "referenced_type" : "type-1677", +- "self_type" : "type-1677", ++ "referenced_type" : "type-1628", ++ "self_type" : "type-1628", + "size" : 12, + "source_file" : "/frameworks/av/media/libstagefright/include/media/stagefright/MediaBufferGroup.h", + "unique_id" : "_ZTSN7android16MediaBufferGroupE", +@@ -21729,8 +21729,8 @@ + ], + "linker_set_key" : "android::NALPosition", + "name" : "android::NALPosition", +- "referenced_type" : "type-1790", +- "self_type" : "type-1790", ++ "referenced_type" : "type-2334", ++ "self_type" : "type-2334", + "size" : 8, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/avc_utils.h", + "unique_id" : "_ZTSN7android11NALPositionE" +@@ -21771,13 +21771,13 @@ + { + "field_name" : "stream_map", + "field_offset" : 192, +- "referenced_type" : "type-1783" ++ "referenced_type" : "type-1734" + } + ], + "linker_set_key" : "android::OpusHeader", + "name" : "android::OpusHeader", +- "referenced_type" : "type-1782", +- "self_type" : "type-1782", ++ "referenced_type" : "type-1733", ++ "self_type" : "type-1733", + "size" : 32, + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/OpusHeader.h", + "unique_id" : "_ZTSN7android10OpusHeaderE" +@@ -22332,11 +22332,11 @@ + "linker_set_key" : "android::SortedVector >", + "name" : "android::SortedVector >", + "record_kind" : "class", +- "referenced_type" : "type-1738", +- "self_type" : "type-1738", ++ "referenced_type" : "type-1686", ++ "self_type" : "type-1686", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h", +- "template_args" : [ "type-1718" ], ++ "template_args" : [ "type-1665" ], + "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIjNS_12MetaDataBase10typed_dataEEEEE", + "vtable_components" : + [ +@@ -24568,11 +24568,11 @@ + "alignment" : 1, + "linker_set_key" : "android::aggregate_traits", + "name" : "android::aggregate_traits", +- "referenced_type" : "type-1778", +- "self_type" : "type-1778", ++ "referenced_type" : "type-1729", ++ "self_type" : "type-1729", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-4", "type-1779" ], ++ "template_args" : [ "type-4", "type-1730" ], + "unique_id" : "_ZTSN7android16aggregate_traitsIjNS_12MetaDataBase10typed_dataEEE" + }, + { +@@ -27672,16 +27672,16 @@ + { + "field_name" : "value", + "field_offset" : 32, +- "referenced_type" : "type-1719" ++ "referenced_type" : "type-1666" + } + ], + "linker_set_key" : "android::key_value_pair_t", + "name" : "android::key_value_pair_t", +- "referenced_type" : "type-1718", +- "self_type" : "type-1718", ++ "referenced_type" : "type-1665", ++ "self_type" : "type-1665", + "size" : 16, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-4", "type-1720" ], ++ "template_args" : [ "type-4", "type-1667" ], + "unique_id" : "_ZTSN7android16key_value_pair_tIjNS_12MetaDataBase10typed_dataEEE" + }, + { +@@ -27934,14 +27934,14 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-1710" ++ "referenced_type" : "type-1657" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-1709", +- "self_type" : "type-1709", ++ "referenced_type" : "type-1656", ++ "self_type" : "type-1656", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", + "template_args" : [ "type-825" ], +@@ -28053,11 +28053,11 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-1773", +- "self_type" : "type-1773", ++ "referenced_type" : "type-1724", ++ "self_type" : "type-1724", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-1774" ], ++ "template_args" : [ "type-1725" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_12MetaDataBase10typed_dataEEE" + }, + { +@@ -28097,11 +28097,11 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_pointer >", + "name" : "android::trait_pointer >", +- "referenced_type" : "type-1772", +- "self_type" : "type-1772", ++ "referenced_type" : "type-1723", ++ "self_type" : "type-1723", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-1718" ], ++ "template_args" : [ "type-1665" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIjNS_12MetaDataBase10typed_dataEEEEE" + }, + { +@@ -28174,11 +28174,11 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-1766", +- "self_type" : "type-1766", ++ "referenced_type" : "type-1716", ++ "self_type" : "type-1716", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-1767" ], ++ "template_args" : [ "type-1717" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_12MetaDataBase10typed_dataEEE" + }, + { +@@ -28218,11 +28218,11 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy >", + "name" : "android::trait_trivial_copy >", +- "referenced_type" : "type-1768", +- "self_type" : "type-1768", ++ "referenced_type" : "type-1719", ++ "self_type" : "type-1719", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-1718" ], ++ "template_args" : [ "type-1665" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIjNS_12MetaDataBase10typed_dataEEEEE" + }, + { +@@ -28427,11 +28427,11 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-1761", +- "self_type" : "type-1761", ++ "referenced_type" : "type-1711", ++ "self_type" : "type-1711", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-1762" ], ++ "template_args" : [ "type-1712" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_12MetaDataBase10typed_dataEEE" + }, + { +@@ -28471,11 +28471,11 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor >", + "name" : "android::trait_trivial_ctor >", +- "referenced_type" : "type-1758", +- "self_type" : "type-1758", ++ "referenced_type" : "type-1708", ++ "self_type" : "type-1708", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-1718" ], ++ "template_args" : [ "type-1665" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIjNS_12MetaDataBase10typed_dataEEEEE" + }, + { +@@ -28680,11 +28680,11 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-1763", +- "self_type" : "type-1763", ++ "referenced_type" : "type-1713", ++ "self_type" : "type-1713", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-1764" ], ++ "template_args" : [ "type-1714" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_12MetaDataBase10typed_dataEEE" + }, + { +@@ -28724,11 +28724,11 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor >", + "name" : "android::trait_trivial_dtor >", +- "referenced_type" : "type-1765", +- "self_type" : "type-1765", ++ "referenced_type" : "type-1715", ++ "self_type" : "type-1715", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-1718" ], ++ "template_args" : [ "type-1665" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIjNS_12MetaDataBase10typed_dataEEEEE" + }, + { +@@ -28933,11 +28933,11 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-1769", +- "self_type" : "type-1769", ++ "referenced_type" : "type-1720", ++ "self_type" : "type-1720", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-1770" ], ++ "template_args" : [ "type-1721" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_12MetaDataBase10typed_dataEEE" + }, + { +@@ -28988,11 +28988,11 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move >", + "name" : "android::trait_trivial_move >", +- "referenced_type" : "type-1771", +- "self_type" : "type-1771", ++ "referenced_type" : "type-1722", ++ "self_type" : "type-1722", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-1718" ], ++ "template_args" : [ "type-1665" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIjNS_12MetaDataBase10typed_dataEEEEE" + }, + { +@@ -29197,11 +29197,11 @@ + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-1776", +- "self_type" : "type-1776", ++ "referenced_type" : "type-1727", ++ "self_type" : "type-1727", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-1777" ], ++ "template_args" : [ "type-1728" ], + "unique_id" : "_ZTSN7android6traitsINS_12MetaDataBase10typed_dataEEE" + }, + { +@@ -29241,11 +29241,11 @@ + "alignment" : 1, + "linker_set_key" : "android::traits >", + "name" : "android::traits >", +- "referenced_type" : "type-1775", +- "self_type" : "type-1775", ++ "referenced_type" : "type-1726", ++ "self_type" : "type-1726", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-1718" ], ++ "template_args" : [ "type-1665" ], + "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIjNS_12MetaDataBase10typed_dataEEEEE" + }, + { +@@ -29381,16 +29381,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1725" ++ "referenced_type" : "type-1672" + } + ], + "linker_set_key" : "android::use_trivial_move >", + "name" : "android::use_trivial_move >", +- "referenced_type" : "type-1724", +- "self_type" : "type-1724", ++ "referenced_type" : "type-1671", ++ "self_type" : "type-1671", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-1718" ], ++ "template_args" : [ "type-1665" ], + "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIjNS_12MetaDataBase10typed_dataEEEEE" + }, + { +@@ -30123,8 +30123,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-1709", +- "self_type" : "type-1712", ++ "referenced_type" : "type-1656", ++ "self_type" : "type-1659", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +diff --git a/29/32/x86/source-based/libhidlbase.so.lsdump b/29/32/x86/source-based/libhidlbase.so.lsdump +index 9c4e70a..f464f1f 100644 +--- a/29/32/x86/source-based/libhidlbase.so.lsdump ++++ b/29/32/x86/source-based/libhidlbase.so.lsdump +@@ -14,7 +14,7 @@ + "linker_set_key" : "char [10]", + "name" : "char [10]", + "referenced_type" : "type-43", +- "self_type" : "type-3464", ++ "self_type" : "type-3458", + "size" : 10, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -23,7 +23,7 @@ + "linker_set_key" : "char [11]", + "name" : "char [11]", + "referenced_type" : "type-43", +- "self_type" : "type-3490", ++ "self_type" : "type-3482", + "size" : 11, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -32,7 +32,7 @@ + "linker_set_key" : "char [12]", + "name" : "char [12]", + "referenced_type" : "type-43", +- "self_type" : "type-3461", ++ "self_type" : "type-3455", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -41,7 +41,7 @@ + "linker_set_key" : "char [13]", + "name" : "char [13]", + "referenced_type" : "type-43", +- "self_type" : "type-3457", ++ "self_type" : "type-3451", + "size" : 13, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -50,7 +50,7 @@ + "linker_set_key" : "char [14]", + "name" : "char [14]", + "referenced_type" : "type-43", +- "self_type" : "type-3508", ++ "self_type" : "type-3502", + "size" : 14, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -59,7 +59,7 @@ + "linker_set_key" : "char [15]", + "name" : "char [15]", + "referenced_type" : "type-43", +- "self_type" : "type-3606", ++ "self_type" : "type-3600", + "size" : 15, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -68,7 +68,7 @@ + "linker_set_key" : "char [16]", + "name" : "char [16]", + "referenced_type" : "type-43", +- "self_type" : "type-362", ++ "self_type" : "type-361", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -77,7 +77,7 @@ + "linker_set_key" : "char [17]", + "name" : "char [17]", + "referenced_type" : "type-43", +- "self_type" : "type-3511", ++ "self_type" : "type-3505", + "size" : 17, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -86,7 +86,7 @@ + "linker_set_key" : "char [18]", + "name" : "char [18]", + "referenced_type" : "type-43", +- "self_type" : "type-3496", ++ "self_type" : "type-3490", + "size" : 18, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -95,7 +95,7 @@ + "linker_set_key" : "char [19]", + "name" : "char [19]", + "referenced_type" : "type-43", +- "self_type" : "type-3527", ++ "self_type" : "type-3521", + "size" : 19, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -104,7 +104,7 @@ + "linker_set_key" : "char [20]", + "name" : "char [20]", + "referenced_type" : "type-43", +- "self_type" : "type-3505", ++ "self_type" : "type-3499", + "size" : 20, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -113,7 +113,7 @@ + "linker_set_key" : "char [22]", + "name" : "char [22]", + "referenced_type" : "type-43", +- "self_type" : "type-3530", ++ "self_type" : "type-3524", + "size" : 22, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -122,7 +122,7 @@ + "linker_set_key" : "char [25]", + "name" : "char [25]", + "referenced_type" : "type-43", +- "self_type" : "type-3520", ++ "self_type" : "type-3514", + "size" : 25, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -131,7 +131,7 @@ + "linker_set_key" : "char [28]", + "name" : "char [28]", + "referenced_type" : "type-43", +- "self_type" : "type-3541", ++ "self_type" : "type-3535", + "size" : 28, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -140,7 +140,7 @@ + "linker_set_key" : "char [29]", + "name" : "char [29]", + "referenced_type" : "type-43", +- "self_type" : "type-3517", ++ "self_type" : "type-3511", + "size" : 29, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -149,7 +149,7 @@ + "linker_set_key" : "char [2]", + "name" : "char [2]", + "referenced_type" : "type-43", +- "self_type" : "type-3468", ++ "self_type" : "type-3462", + "size" : 2, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -158,7 +158,7 @@ + "linker_set_key" : "char [31]", + "name" : "char [31]", + "referenced_type" : "type-43", +- "self_type" : "type-3502", ++ "self_type" : "type-3496", + "size" : 31, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -167,7 +167,7 @@ + "linker_set_key" : "char [32]", + "name" : "char [32]", + "referenced_type" : "type-43", +- "self_type" : "type-3533", ++ "self_type" : "type-3527", + "size" : 32, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -176,7 +176,7 @@ + "linker_set_key" : "char [35]", + "name" : "char [35]", + "referenced_type" : "type-43", +- "self_type" : "type-3523", ++ "self_type" : "type-3517", + "size" : 35, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -185,7 +185,7 @@ + "linker_set_key" : "char [37]", + "name" : "char [37]", + "referenced_type" : "type-43", +- "self_type" : "type-3514", ++ "self_type" : "type-3508", + "size" : 37, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -194,7 +194,7 @@ + "linker_set_key" : "char [3]", + "name" : "char [3]", + "referenced_type" : "type-43", +- "self_type" : "type-3481", ++ "self_type" : "type-3475", + "size" : 3, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -203,7 +203,7 @@ + "linker_set_key" : "char [4]", + "name" : "char [4]", + "referenced_type" : "type-43", +- "self_type" : "type-3603", ++ "self_type" : "type-3597", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -212,7 +212,7 @@ + "linker_set_key" : "char [5]", + "name" : "char [5]", + "referenced_type" : "type-43", +- "self_type" : "type-3609", ++ "self_type" : "type-3603", + "size" : 5, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -221,7 +221,7 @@ + "linker_set_key" : "char [6]", + "name" : "char [6]", + "referenced_type" : "type-43", +- "self_type" : "type-3472", ++ "self_type" : "type-3466", + "size" : 6, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -230,7 +230,7 @@ + "linker_set_key" : "char [7]", + "name" : "char [7]", + "referenced_type" : "type-43", +- "self_type" : "type-3499", ++ "self_type" : "type-3493", + "size" : 7, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -239,7 +239,7 @@ + "linker_set_key" : "char [8]", + "name" : "char [8]", + "referenced_type" : "type-43", +- "self_type" : "type-3485", ++ "self_type" : "type-3479", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -248,7 +248,7 @@ + "linker_set_key" : "char [9]", + "name" : "char [9]", + "referenced_type" : "type-43", +- "self_type" : "type-3475", ++ "self_type" : "type-3469", + "size" : 9, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -272,7 +272,7 @@ + "linker_set_key" : "unsigned char [32]", + "name" : "unsigned char [32]", + "referenced_type" : "type-146", +- "self_type" : "type-973", ++ "self_type" : "type-971", + "size" : 32, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -383,8 +383,8 @@ + "is_integral" : true, + "linker_set_key" : "signed char", + "name" : "signed char", +- "referenced_type" : "type-483", +- "self_type" : "type-483", ++ "referenced_type" : "type-484", ++ "self_type" : "type-484", + "size" : 1 + }, + { +@@ -458,14 +458,6 @@ + "binding" : "weak", + "name" : "_ZN7android2spINS_8hardware25PassthroughServiceManagerEED2Ev" + }, +- { +- "binding" : "weak", +- "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_" +- }, + { + "binding" : "weak", + "name" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_" +@@ -2554,6 +2546,230 @@ + { + "name" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_6StatusE" + }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_compareEPKvSA_" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE8do_splatEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_compareES3_S3_" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE15do_move_forwardEPvS3_j" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE16do_move_backwardEPvS3_j" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE7do_copyEPvS3_j" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE8do_splatEPvS3_j" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE8do_splatEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE8do_splatEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE8do_splatEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE8do_splatEPvPKvj" ++ }, + { + "name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv" + }, +@@ -3452,7 +3668,7 @@ + }, + { + "binding" : "weak", +- "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware7details9SchedPrioEEENS_19__map_value_compareIS8_SC_NS_4lessIS8_EELb1EEENS_9allocatorISC_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJOS8_EEENSO_IJEEEEEENS_4pairINS_15__tree_iteratorISC_PNS_11__tree_nodeISC_PvEEiEEbEERKT_DpOT0_" ++ "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware7details9SchedPrioEEENS_19__map_value_compareIS8_SC_NS_4lessIS8_EELb1EEENS_9allocatorISC_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSO_IJEEEEEENS_4pairINS_15__tree_iteratorISC_PNS_11__tree_nodeISC_PvEEiEEbEERKT_DpOT0_" + }, + { + "binding" : "weak", +@@ -3460,7 +3676,7 @@ + }, + { + "binding" : "weak", +- "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJOS8_EEENSL_IJEEEEEENS_4pairINS_15__tree_iteratorIS9_PNS_11__tree_nodeIS9_PvEEiEEbEERKT_DpOT0_" ++ "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSL_IJEEEEEENS_4pairINS_15__tree_iteratorIS9_PNS_11__tree_nodeIS9_PvEEiEEbEERKT_DpOT0_" + }, + { + "binding" : "weak", +@@ -4558,8 +4774,8 @@ + ], + "linker_set_key" : "android::Condition::WakeUpType", + "name" : "android::Condition::WakeUpType", +- "referenced_type" : "type-397", +- "self_type" : "type-397", ++ "referenced_type" : "type-396", ++ "self_type" : "type-396", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Condition.h", + "underlying_type" : "type-44", +@@ -4650,8 +4866,8 @@ + ], + "linker_set_key" : "android::hardware::MQDescriptor::GrantorType", + "name" : "android::hardware::MQDescriptor::GrantorType", +- "referenced_type" : "type-993", +- "self_type" : "type-993", ++ "referenced_type" : "type-991", ++ "self_type" : "type-991", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h", + "underlying_type" : "type-14", +@@ -4698,8 +4914,8 @@ + ], + "linker_set_key" : "android::hardware::ProcessState::CallRestriction", + "name" : "android::hardware::ProcessState::CallRestriction", +- "referenced_type" : "type-2243", +- "self_type" : "type-2243", ++ "referenced_type" : "type-2239", ++ "self_type" : "type-2239", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h", + "underlying_type" : "type-14", +@@ -4806,8 +5022,8 @@ + ], + "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent", + "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent", +- "referenced_type" : "type-467", +- "self_type" : "type-467", ++ "referenced_type" : "type-466", ++ "self_type" : "type-466", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "underlying_type" : "type-44", +@@ -4850,8 +5066,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::PidConstant", + "name" : "android::hidl::manager::V1_0::IServiceManager::PidConstant", +- "referenced_type" : "type-501", +- "self_type" : "type-501", ++ "referenced_type" : "type-500", ++ "self_type" : "type-500", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h", + "underlying_type" : "type-14", +@@ -4876,8 +5092,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::Transport", + "name" : "android::hidl::manager::V1_0::IServiceManager::Transport", +- "referenced_type" : "type-500", +- "self_type" : "type-500", ++ "referenced_type" : "type-499", ++ "self_type" : "type-499", + "size" : 1, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h", + "underlying_type" : "type-146", +@@ -5793,12 +6009,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2285" ++ "referenced_type" : "type-2281" + } + ], +- "referenced_type" : "type-2289", +- "return_type" : "type-2285", +- "self_type" : "type-2289", ++ "referenced_type" : "type-2285", ++ "return_type" : "type-2281", ++ "self_type" : "type-2285", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -5811,15 +6027,15 @@ + "referenced_type" : "type-295" + }, + { +- "referenced_type" : "type-694" ++ "referenced_type" : "type-692" + }, + { + "referenced_type" : "type-188" + } + ], +- "referenced_type" : "type-2240", ++ "referenced_type" : "type-2236", + "return_type" : "type-29", +- "self_type" : "type-2240", ++ "self_type" : "type-2236", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -5844,12 +6060,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2301" ++ "referenced_type" : "type-2297" + } + ], +- "referenced_type" : "type-2300", +- "return_type" : "type-2301", +- "self_type" : "type-2300", ++ "referenced_type" : "type-2296", ++ "return_type" : "type-2297", ++ "self_type" : "type-2296", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -5859,16 +6075,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { +- "referenced_type" : "type-990" ++ "referenced_type" : "type-987" + }, + { + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-2164" ++ "referenced_type" : "type-2160" + }, + { + "referenced_type" : "type-44" +@@ -5877,9 +6093,9 @@ + "referenced_type" : "type-188" + } + ], +- "referenced_type" : "type-2163", ++ "referenced_type" : "type-2159", + "return_type" : "type-77", +- "self_type" : "type-2163", ++ "self_type" : "type-2159", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -5898,9 +6114,9 @@ + "referenced_type" : "type-188" + } + ], +- "referenced_type" : "type-2158", ++ "referenced_type" : "type-2154", + "return_type" : "type-77", +- "self_type" : "type-2158", ++ "self_type" : "type-2154", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -5916,9 +6132,9 @@ + "referenced_type" : "type-41" + } + ], +- "referenced_type" : "type-3395", ++ "referenced_type" : "type-3389", + "return_type" : "type-77", +- "self_type" : "type-3395", ++ "self_type" : "type-3389", + "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h" + } + ], +@@ -5931,7 +6147,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-539" ++ "referenced_type" : "type-538" + } + ], + "return_type" : "type-77", +@@ -5944,13 +6160,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-448" ++ "referenced_type" : "type-447" + }, + { +- "referenced_type" : "type-2252" ++ "referenced_type" : "type-2248" + } + ], +- "return_type" : "type-3651", ++ "return_type" : "type-3643", + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, + { +@@ -5960,44 +6176,12 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-743" ++ "referenced_type" : "type-741" + } + ], + "return_type" : "type-77", + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +- { +- "function_name" : "android::sp::operator=", +- "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-435" +- }, +- { +- "referenced_type" : "type-436" +- } +- ], +- "return_type" : "type-438", +- "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" +- }, +- { +- "function_name" : "android::sp::operator=", +- "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-435" +- }, +- { +- "referenced_type" : "type-2141" +- } +- ], +- "return_type" : "type-438", +- "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" +- }, + { + "function_name" : "android::wp::operator=", + "linker_set_key" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_", +@@ -6005,13 +6189,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2192" ++ "referenced_type" : "type-2188" + }, + { +- "referenced_type" : "type-2141" ++ "referenced_type" : "type-2137" + } + ], +- "return_type" : "type-3564", ++ "return_type" : "type-3558", + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, + { +@@ -6043,7 +6227,7 @@ + "referenced_type" : "type-301" + }, + { +- "referenced_type" : "type-2559" ++ "referenced_type" : "type-2554" + } + ], + "return_type" : "type-120", +@@ -6059,7 +6243,7 @@ + "referenced_type" : "type-301" + }, + { +- "referenced_type" : "type-2560" ++ "referenced_type" : "type-2555" + } + ], + "return_type" : "type-120", +@@ -6091,7 +6275,7 @@ + "referenced_type" : "type-301" + }, + { +- "referenced_type" : "type-2561" ++ "referenced_type" : "type-2556" + } + ], + "return_type" : "type-120", +@@ -6107,7 +6291,7 @@ + "referenced_type" : "type-301" + }, + { +- "referenced_type" : "type-2562" ++ "referenced_type" : "type-2557" + } + ], + "return_type" : "type-120", +@@ -6165,7 +6349,7 @@ + "referenced_type" : "type-32" + }, + { +- "referenced_type" : "type-1003" ++ "referenced_type" : "type-1001" + } + ], + "return_type" : "type-120", +@@ -6177,14 +6361,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-758", ++ "return_type" : "type-756", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6195,10 +6379,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2064" ++ "referenced_type" : "type-2060" + }, + { +- "referenced_type" : "type-2565" ++ "referenced_type" : "type-2560" + } + ], + "return_type" : "type-120", +@@ -6211,10 +6395,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2064" ++ "referenced_type" : "type-2060" + }, + { +- "referenced_type" : "type-410" ++ "referenced_type" : "type-409" + } + ], + "return_type" : "type-77", +@@ -6227,10 +6411,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2064" ++ "referenced_type" : "type-2060" + }, + { +- "referenced_type" : "type-410" ++ "referenced_type" : "type-409" + } + ], + "return_type" : "type-77", +@@ -6245,13 +6429,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-2094" ++ "referenced_type" : "type-2090" + }, + { +- "referenced_type" : "type-2095" ++ "referenced_type" : "type-2091" + }, + { +- "referenced_type" : "type-2568" ++ "referenced_type" : "type-2563" + } + ], + "return_type" : "type-14", +@@ -6270,10 +6454,10 @@ + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-2094" ++ "referenced_type" : "type-2090" + }, + { +- "referenced_type" : "type-2095" ++ "referenced_type" : "type-2091" + }, + { + "default_arg" : true, +@@ -6281,7 +6465,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-2569" ++ "referenced_type" : "type-2564" + } + ], + "return_type" : "type-14", +@@ -6296,13 +6480,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-2094" ++ "referenced_type" : "type-2090" + }, + { +- "referenced_type" : "type-2095" ++ "referenced_type" : "type-2091" + }, + { +- "referenced_type" : "type-2570" ++ "referenced_type" : "type-2565" + } + ], + "return_type" : "type-14", +@@ -6319,7 +6503,7 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-2571" ++ "referenced_type" : "type-2566" + } + ], + "return_type" : "type-120", +@@ -6334,13 +6518,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-2094" ++ "referenced_type" : "type-2090" + }, + { +- "referenced_type" : "type-2095" ++ "referenced_type" : "type-2091" + }, + { +- "referenced_type" : "type-2572" ++ "referenced_type" : "type-2567" + } + ], + "return_type" : "type-14", +@@ -6355,13 +6539,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-2094" ++ "referenced_type" : "type-2090" + }, + { +- "referenced_type" : "type-2095" ++ "referenced_type" : "type-2091" + }, + { +- "referenced_type" : "type-2573" ++ "referenced_type" : "type-2568" + } + ], + "return_type" : "type-14", +@@ -6376,13 +6560,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-2094" ++ "referenced_type" : "type-2090" + }, + { +- "referenced_type" : "type-2095" ++ "referenced_type" : "type-2091" + }, + { +- "referenced_type" : "type-2574" ++ "referenced_type" : "type-2569" + } + ], + "return_type" : "type-14", +@@ -6397,13 +6581,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-2094" ++ "referenced_type" : "type-2090" + }, + { +- "referenced_type" : "type-2095" ++ "referenced_type" : "type-2091" + }, + { +- "referenced_type" : "type-2575" ++ "referenced_type" : "type-2570" + } + ], + "return_type" : "type-14", +@@ -6418,13 +6602,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-2094" ++ "referenced_type" : "type-2090" + }, + { +- "referenced_type" : "type-2095" ++ "referenced_type" : "type-2091" + }, + { +- "referenced_type" : "type-2576" ++ "referenced_type" : "type-2571" + } + ], + "return_type" : "type-14", +@@ -6454,7 +6638,7 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + } + ], + "return_type" : "type-77", +@@ -6470,13 +6654,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + }, + { +- "referenced_type" : "type-2091" ++ "referenced_type" : "type-2087" + }, + { +- "referenced_type" : "type-2091" ++ "referenced_type" : "type-2087" + } + ], + "return_type" : "type-77", +@@ -6492,7 +6676,7 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + } + ], + "return_type" : "type-77", +@@ -6508,13 +6692,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + }, + { +- "referenced_type" : "type-2091" ++ "referenced_type" : "type-2087" + }, + { +- "referenced_type" : "type-2091" ++ "referenced_type" : "type-2087" + } + ], + "return_type" : "type-77", +@@ -6565,10 +6749,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2067" ++ "referenced_type" : "type-2063" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + } + ], + "return_type" : "type-120", +@@ -6580,16 +6764,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2067" ++ "referenced_type" : "type-2063" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + }, + { + "referenced_type" : "type-32" + }, + { +- "referenced_type" : "type-1003" ++ "referenced_type" : "type-1001" + } + ], + "return_type" : "type-120", +@@ -6602,7 +6786,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-920" ++ "referenced_type" : "type-918" + }, + { + "referenced_type" : "type-79" +@@ -6621,10 +6805,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-920" ++ "referenced_type" : "type-918" + }, + { +- "referenced_type" : "type-2577" ++ "referenced_type" : "type-2572" + } + ], + "return_type" : "type-120", +@@ -6637,10 +6821,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-920" ++ "referenced_type" : "type-918" + }, + { +- "referenced_type" : "type-2578" ++ "referenced_type" : "type-2573" + } + ], + "return_type" : "type-120", +@@ -6653,7 +6837,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-920" ++ "referenced_type" : "type-918" + }, + { + "referenced_type" : "type-79" +@@ -6669,10 +6853,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-920" ++ "referenced_type" : "type-918" + }, + { +- "referenced_type" : "type-2579" ++ "referenced_type" : "type-2574" + } + ], + "return_type" : "type-120", +@@ -6684,13 +6868,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2067" ++ "referenced_type" : "type-2063" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + }, + { +- "referenced_type" : "type-2580" ++ "referenced_type" : "type-2575" + } + ], + "return_type" : "type-120", +@@ -6702,13 +6886,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2067" ++ "referenced_type" : "type-2063" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + }, + { +- "referenced_type" : "type-2581" ++ "referenced_type" : "type-2576" + } + ], + "return_type" : "type-120", +@@ -6721,10 +6905,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-920" ++ "referenced_type" : "type-918" + }, + { +- "referenced_type" : "type-2582" ++ "referenced_type" : "type-2577" + } + ], + "return_type" : "type-120", +@@ -6736,13 +6920,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2067" ++ "referenced_type" : "type-2063" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + }, + { +- "referenced_type" : "type-2583" ++ "referenced_type" : "type-2578" + } + ], + "return_type" : "type-120", +@@ -6755,7 +6939,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-920" ++ "referenced_type" : "type-918" + } + ], + "return_type" : "type-120", +@@ -6768,7 +6952,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-920" ++ "referenced_type" : "type-918" + } + ], + "return_type" : "type-120", +@@ -6780,13 +6964,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2067" ++ "referenced_type" : "type-2063" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + }, + { +- "referenced_type" : "type-2584" ++ "referenced_type" : "type-2579" + } + ], + "return_type" : "type-120", +@@ -6798,10 +6982,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2067" ++ "referenced_type" : "type-2063" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + } + ], + "return_type" : "type-120", +@@ -6813,10 +6997,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2067" ++ "referenced_type" : "type-2063" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + } + ], + "return_type" : "type-120", +@@ -6829,7 +7013,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-920" ++ "referenced_type" : "type-918" + } + ], + "return_type" : "type-120", +@@ -6842,13 +7026,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-920" ++ "referenced_type" : "type-918" + }, + { + "referenced_type" : "type-32" + }, + { +- "referenced_type" : "type-1003" ++ "referenced_type" : "type-1001" + } + ], + "return_type" : "type-120", +@@ -6861,10 +7045,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-920" ++ "referenced_type" : "type-918" + }, + { +- "referenced_type" : "type-694" ++ "referenced_type" : "type-692" + } + ], + "return_type" : "type-77", +@@ -6877,10 +7061,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-920" ++ "referenced_type" : "type-918" + }, + { +- "referenced_type" : "type-694" ++ "referenced_type" : "type-692" + } + ], + "return_type" : "type-77", +@@ -6893,14 +7077,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1009" ++ "referenced_type" : "type-1007" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-526", ++ "return_type" : "type-525", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -6910,7 +7094,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-527" ++ "referenced_type" : "type-526" + }, + { + "referenced_type" : "type-79" +@@ -6929,10 +7113,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-527" ++ "referenced_type" : "type-526" + }, + { +- "referenced_type" : "type-1415" ++ "referenced_type" : "type-1412" + } + ], + "return_type" : "type-120", +@@ -6945,10 +7129,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-527" ++ "referenced_type" : "type-526" + }, + { +- "referenced_type" : "type-1416" ++ "referenced_type" : "type-1413" + } + ], + "return_type" : "type-120", +@@ -6961,14 +7145,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1009" ++ "referenced_type" : "type-1007" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-526", ++ "return_type" : "type-525", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -6978,7 +7162,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-527" ++ "referenced_type" : "type-526" + }, + { + "referenced_type" : "type-79" +@@ -6994,10 +7178,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-527" ++ "referenced_type" : "type-526" + }, + { +- "referenced_type" : "type-1417" ++ "referenced_type" : "type-1414" + } + ], + "return_type" : "type-120", +@@ -7010,11 +7194,11 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-527" ++ "referenced_type" : "type-526" + }, + { + "default_arg" : true, +- "referenced_type" : "type-1009" ++ "referenced_type" : "type-1007" + } + ], + "return_type" : "type-14", +@@ -7027,10 +7211,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-527" ++ "referenced_type" : "type-526" + }, + { +- "referenced_type" : "type-1418" ++ "referenced_type" : "type-1415" + } + ], + "return_type" : "type-120", +@@ -7043,7 +7227,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-527" ++ "referenced_type" : "type-526" + } + ], + "return_type" : "type-120", +@@ -7056,7 +7240,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-527" ++ "referenced_type" : "type-526" + } + ], + "return_type" : "type-120", +@@ -7068,10 +7252,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1009" ++ "referenced_type" : "type-1007" + }, + { +- "referenced_type" : "type-738" ++ "referenced_type" : "type-736" + } + ], + "return_type" : "type-29", +@@ -7084,7 +7268,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-527" ++ "referenced_type" : "type-526" + } + ], + "return_type" : "type-120", +@@ -7097,13 +7281,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-527" ++ "referenced_type" : "type-526" + }, + { + "referenced_type" : "type-32" + }, + { +- "referenced_type" : "type-1003" ++ "referenced_type" : "type-1001" + } + ], + "return_type" : "type-120", +@@ -7115,14 +7299,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-945", ++ "return_type" : "type-943", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7131,14 +7315,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-867" ++ "referenced_type" : "type-865" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-945", ++ "return_type" : "type-943", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7149,10 +7333,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-918" ++ "referenced_type" : "type-916" + }, + { +- "referenced_type" : "type-1421" ++ "referenced_type" : "type-1418" + } + ], + "return_type" : "type-120", +@@ -7165,10 +7349,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-918" ++ "referenced_type" : "type-916" + }, + { +- "referenced_type" : "type-529" ++ "referenced_type" : "type-528" + } + ], + "return_type" : "type-77", +@@ -7181,10 +7365,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-918" ++ "referenced_type" : "type-916" + }, + { +- "referenced_type" : "type-529" ++ "referenced_type" : "type-528" + } + ], + "return_type" : "type-77", +@@ -7199,13 +7383,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-999" + }, + { +- "referenced_type" : "type-1005" ++ "referenced_type" : "type-1003" + }, + { +- "referenced_type" : "type-1427" ++ "referenced_type" : "type-1424" + } + ], + "return_type" : "type-14", +@@ -7218,16 +7402,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-829" ++ "referenced_type" : "type-827" + }, + { + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-999" + }, + { +- "referenced_type" : "type-1005" ++ "referenced_type" : "type-1003" + }, + { + "default_arg" : true, +@@ -7235,7 +7419,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-1428" ++ "referenced_type" : "type-1425" + } + ], + "return_type" : "type-14", +@@ -7249,10 +7433,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-829" ++ "referenced_type" : "type-827" + }, + { +- "referenced_type" : "type-1429" ++ "referenced_type" : "type-1426" + } + ], + "return_type" : "type-120", +@@ -7267,13 +7451,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-999" + }, + { +- "referenced_type" : "type-1005" ++ "referenced_type" : "type-1003" + }, + { +- "referenced_type" : "type-1430" ++ "referenced_type" : "type-1427" + } + ], + "return_type" : "type-14", +@@ -7288,13 +7472,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-999" + }, + { +- "referenced_type" : "type-1005" ++ "referenced_type" : "type-1003" + }, + { +- "referenced_type" : "type-1431" ++ "referenced_type" : "type-1428" + } + ], + "return_type" : "type-14", +@@ -7309,13 +7493,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-999" + }, + { +- "referenced_type" : "type-1005" ++ "referenced_type" : "type-1003" + }, + { +- "referenced_type" : "type-1432" ++ "referenced_type" : "type-1429" + } + ], + "return_type" : "type-14", +@@ -7330,13 +7514,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-999" + }, + { +- "referenced_type" : "type-1005" ++ "referenced_type" : "type-1003" + }, + { +- "referenced_type" : "type-1433" ++ "referenced_type" : "type-1430" + } + ], + "return_type" : "type-14", +@@ -7351,13 +7535,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-999" + }, + { +- "referenced_type" : "type-1005" ++ "referenced_type" : "type-1003" + }, + { +- "referenced_type" : "type-1434" ++ "referenced_type" : "type-1431" + } + ], + "return_type" : "type-14", +@@ -7371,7 +7555,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-829" ++ "referenced_type" : "type-827" + } + ], + "return_type" : "type-120", +@@ -7386,13 +7570,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-999" + }, + { +- "referenced_type" : "type-1005" ++ "referenced_type" : "type-1003" + }, + { +- "referenced_type" : "type-1435" ++ "referenced_type" : "type-1432" + } + ], + "return_type" : "type-14", +@@ -7407,13 +7591,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-999" + }, + { +- "referenced_type" : "type-1005" ++ "referenced_type" : "type-1003" + }, + { +- "referenced_type" : "type-1436" ++ "referenced_type" : "type-1433" + } + ], + "return_type" : "type-14", +@@ -7426,10 +7610,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-829" ++ "referenced_type" : "type-827" + }, + { +- "referenced_type" : "type-867" ++ "referenced_type" : "type-865" + } + ], + "return_type" : "type-77", +@@ -7442,10 +7626,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-829" ++ "referenced_type" : "type-827" + }, + { +- "referenced_type" : "type-867" ++ "referenced_type" : "type-865" + } + ], + "return_type" : "type-77", +@@ -7458,7 +7642,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-829" ++ "referenced_type" : "type-827" + } + ], + "return_type" : "type-77", +@@ -7471,7 +7655,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-829" ++ "referenced_type" : "type-827" + } + ], + "return_type" : "type-77", +@@ -7484,7 +7668,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-829" ++ "referenced_type" : "type-827" + } + ], + "return_type" : "type-77", +@@ -7496,13 +7680,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-929" ++ "referenced_type" : "type-927" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + }, + { +- "referenced_type" : "type-1437" ++ "referenced_type" : "type-1434" + } + ], + "return_type" : "type-120", +@@ -7515,7 +7699,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + }, + { + "referenced_type" : "type-79" +@@ -7534,10 +7718,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + }, + { +- "referenced_type" : "type-1438" ++ "referenced_type" : "type-1435" + } + ], + "return_type" : "type-120", +@@ -7550,10 +7734,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + }, + { +- "referenced_type" : "type-1439" ++ "referenced_type" : "type-1436" + } + ], + "return_type" : "type-120", +@@ -7566,7 +7750,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + }, + { + "referenced_type" : "type-48" +@@ -7575,7 +7759,7 @@ + "referenced_type" : "type-48" + } + ], +- "return_type" : "type-765", ++ "return_type" : "type-763", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7585,7 +7769,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + }, + { + "referenced_type" : "type-79" +@@ -7601,10 +7785,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + }, + { +- "referenced_type" : "type-1440" ++ "referenced_type" : "type-1437" + } + ], + "return_type" : "type-120", +@@ -7616,13 +7800,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-929" ++ "referenced_type" : "type-927" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + }, + { +- "referenced_type" : "type-1441" ++ "referenced_type" : "type-1438" + } + ], + "return_type" : "type-120", +@@ -7635,13 +7819,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + }, + { + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-1442" ++ "referenced_type" : "type-1439" + } + ], + "return_type" : "type-120", +@@ -7653,10 +7837,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-929" ++ "referenced_type" : "type-927" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + }, + { + "referenced_type" : "type-48" +@@ -7665,7 +7849,7 @@ + "referenced_type" : "type-48" + } + ], +- "return_type" : "type-765", ++ "return_type" : "type-763", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7675,10 +7859,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + }, + { +- "referenced_type" : "type-1443" ++ "referenced_type" : "type-1440" + } + ], + "return_type" : "type-120", +@@ -7690,16 +7874,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-929" ++ "referenced_type" : "type-927" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + }, + { + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-1444" ++ "referenced_type" : "type-1441" + } + ], + "return_type" : "type-120", +@@ -7712,7 +7896,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + } + ], + "return_type" : "type-120", +@@ -7725,7 +7909,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + } + ], + "return_type" : "type-120", +@@ -7738,7 +7922,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + }, + { + "referenced_type" : "type-48" +@@ -7747,7 +7931,7 @@ + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-738" ++ "referenced_type" : "type-736" + } + ], + "return_type" : "type-249", +@@ -7760,7 +7944,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + }, + { + "referenced_type" : "type-48" +@@ -7778,10 +7962,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-929" ++ "referenced_type" : "type-927" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + }, + { + "referenced_type" : "type-48" +@@ -7790,7 +7974,7 @@ + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-738" ++ "referenced_type" : "type-736" + } + ], + "return_type" : "type-249", +@@ -7802,10 +7986,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-929" ++ "referenced_type" : "type-927" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + }, + { + "referenced_type" : "type-48" +@@ -7824,13 +8008,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + }, + { + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + } + ], + "return_type" : "type-249", +@@ -7843,7 +8027,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + }, + { + "referenced_type" : "type-48" +@@ -7852,7 +8036,7 @@ + "referenced_type" : "type-48" + } + ], +- "return_type" : "type-758", ++ "return_type" : "type-756", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7862,10 +8046,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + }, + { +- "referenced_type" : "type-1445" ++ "referenced_type" : "type-1442" + } + ], + "return_type" : "type-120", +@@ -7878,7 +8062,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + } + ], + "return_type" : "type-120", +@@ -7891,13 +8075,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + }, + { + "referenced_type" : "type-32" + }, + { +- "referenced_type" : "type-1003" ++ "referenced_type" : "type-1001" + } + ], + "return_type" : "type-120", +@@ -7909,16 +8093,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-929" ++ "referenced_type" : "type-927" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + }, + { + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + } + ], + "return_type" : "type-249", +@@ -7930,10 +8114,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-929" ++ "referenced_type" : "type-927" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + }, + { + "referenced_type" : "type-48" +@@ -7942,7 +8126,7 @@ + "referenced_type" : "type-48" + } + ], +- "return_type" : "type-758", ++ "return_type" : "type-756", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7952,10 +8136,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + }, + { +- "referenced_type" : "type-1446" ++ "referenced_type" : "type-1443" + } + ], + "return_type" : "type-120", +@@ -7968,10 +8152,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + }, + { +- "referenced_type" : "type-694" ++ "referenced_type" : "type-692" + } + ], + "return_type" : "type-77", +@@ -7984,10 +8168,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + }, + { +- "referenced_type" : "type-694" ++ "referenced_type" : "type-692" + } + ], + "return_type" : "type-77", +@@ -8000,14 +8184,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1074" ++ "referenced_type" : "type-1072" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-542", ++ "return_type" : "type-541", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8017,7 +8201,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-543" ++ "referenced_type" : "type-542" + }, + { + "referenced_type" : "type-79" +@@ -8036,10 +8220,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-543" ++ "referenced_type" : "type-542" + }, + { +- "referenced_type" : "type-1447" ++ "referenced_type" : "type-1444" + } + ], + "return_type" : "type-120", +@@ -8052,10 +8236,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-543" ++ "referenced_type" : "type-542" + }, + { +- "referenced_type" : "type-1448" ++ "referenced_type" : "type-1445" + } + ], + "return_type" : "type-120", +@@ -8068,14 +8252,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1074" ++ "referenced_type" : "type-1072" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-542", ++ "return_type" : "type-541", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8085,7 +8269,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-543" ++ "referenced_type" : "type-542" + }, + { + "referenced_type" : "type-79" +@@ -8101,10 +8285,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-543" ++ "referenced_type" : "type-542" + }, + { +- "referenced_type" : "type-1449" ++ "referenced_type" : "type-1446" + } + ], + "return_type" : "type-120", +@@ -8117,11 +8301,11 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-543" ++ "referenced_type" : "type-542" + }, + { + "default_arg" : true, +- "referenced_type" : "type-1074" ++ "referenced_type" : "type-1072" + } + ], + "return_type" : "type-14", +@@ -8134,10 +8318,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-543" ++ "referenced_type" : "type-542" + }, + { +- "referenced_type" : "type-1450" ++ "referenced_type" : "type-1447" + } + ], + "return_type" : "type-120", +@@ -8150,7 +8334,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-543" ++ "referenced_type" : "type-542" + } + ], + "return_type" : "type-120", +@@ -8163,7 +8347,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-543" ++ "referenced_type" : "type-542" + } + ], + "return_type" : "type-120", +@@ -8175,10 +8359,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1074" ++ "referenced_type" : "type-1072" + }, + { +- "referenced_type" : "type-738" ++ "referenced_type" : "type-736" + } + ], + "return_type" : "type-29", +@@ -8191,7 +8375,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-543" ++ "referenced_type" : "type-542" + } + ], + "return_type" : "type-120", +@@ -8204,13 +8388,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-543" ++ "referenced_type" : "type-542" + }, + { + "referenced_type" : "type-32" + }, + { +- "referenced_type" : "type-1003" ++ "referenced_type" : "type-1001" + } + ], + "return_type" : "type-120", +@@ -8222,14 +8406,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-1054", ++ "return_type" : "type-1052", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8238,14 +8422,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-738" ++ "referenced_type" : "type-736" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-1054", ++ "return_type" : "type-1052", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8256,10 +8440,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1046" ++ "referenced_type" : "type-1044" + }, + { +- "referenced_type" : "type-1453" ++ "referenced_type" : "type-1450" + } + ], + "return_type" : "type-120", +@@ -8272,10 +8456,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1046" ++ "referenced_type" : "type-1044" + }, + { +- "referenced_type" : "type-545" ++ "referenced_type" : "type-544" + } + ], + "return_type" : "type-77", +@@ -8288,10 +8472,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1046" ++ "referenced_type" : "type-1044" + }, + { +- "referenced_type" : "type-545" ++ "referenced_type" : "type-544" + } + ], + "return_type" : "type-77", +@@ -8303,10 +8487,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1034" ++ "referenced_type" : "type-1032" + }, + { +- "referenced_type" : "type-1005" ++ "referenced_type" : "type-1003" + }, + { + "referenced_type" : "type-44" +@@ -8324,10 +8508,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1034" ++ "referenced_type" : "type-1032" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-999" + }, + { + "referenced_type" : "type-44" +@@ -8346,16 +8530,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-821" ++ "referenced_type" : "type-819" + }, + { + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-1087" ++ "referenced_type" : "type-1085" + }, + { +- "referenced_type" : "type-1088" ++ "referenced_type" : "type-1086" + }, + { + "default_arg" : true, +@@ -8363,7 +8547,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-1456" ++ "referenced_type" : "type-1453" + } + ], + "return_type" : "type-14", +@@ -8377,10 +8561,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-821" ++ "referenced_type" : "type-819" + }, + { +- "referenced_type" : "type-1457" ++ "referenced_type" : "type-1454" + } + ], + "return_type" : "type-120", +@@ -8395,13 +8579,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-1087" ++ "referenced_type" : "type-1085" + }, + { +- "referenced_type" : "type-1088" ++ "referenced_type" : "type-1086" + }, + { +- "referenced_type" : "type-1458" ++ "referenced_type" : "type-1455" + } + ], + "return_type" : "type-14", +@@ -8415,7 +8599,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-821" ++ "referenced_type" : "type-819" + } + ], + "return_type" : "type-120", +@@ -8428,10 +8612,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-821" ++ "referenced_type" : "type-819" + }, + { +- "referenced_type" : "type-738" ++ "referenced_type" : "type-736" + } + ], + "return_type" : "type-77", +@@ -8444,10 +8628,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-821" ++ "referenced_type" : "type-819" + }, + { +- "referenced_type" : "type-738" ++ "referenced_type" : "type-736" + } + ], + "return_type" : "type-77", +@@ -8460,7 +8644,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-821" ++ "referenced_type" : "type-819" + } + ], + "return_type" : "type-77", +@@ -8473,7 +8657,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-821" ++ "referenced_type" : "type-819" + } + ], + "return_type" : "type-77", +@@ -8486,7 +8670,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-821" ++ "referenced_type" : "type-819" + } + ], + "return_type" : "type-77", +@@ -8499,7 +8683,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-938" ++ "referenced_type" : "type-935" + }, + { + "referenced_type" : "type-79" +@@ -8518,10 +8702,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-938" ++ "referenced_type" : "type-935" + }, + { +- "referenced_type" : "type-1459" ++ "referenced_type" : "type-1456" + } + ], + "return_type" : "type-120", +@@ -8534,10 +8718,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-938" ++ "referenced_type" : "type-935" + }, + { +- "referenced_type" : "type-1460" ++ "referenced_type" : "type-1457" + } + ], + "return_type" : "type-120", +@@ -8550,7 +8734,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-938" ++ "referenced_type" : "type-935" + }, + { + "referenced_type" : "type-79" +@@ -8566,10 +8750,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-938" ++ "referenced_type" : "type-935" + }, + { +- "referenced_type" : "type-1461" ++ "referenced_type" : "type-1458" + } + ], + "return_type" : "type-120", +@@ -8582,7 +8766,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-938" ++ "referenced_type" : "type-935" + }, + { + "referenced_type" : "type-48" +@@ -8604,10 +8788,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-938" ++ "referenced_type" : "type-935" + }, + { +- "referenced_type" : "type-1462" ++ "referenced_type" : "type-1459" + } + ], + "return_type" : "type-120", +@@ -8619,10 +8803,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1049" ++ "referenced_type" : "type-1047" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + }, + { + "referenced_type" : "type-48" +@@ -8644,7 +8828,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-938" ++ "referenced_type" : "type-935" + } + ], + "return_type" : "type-120", +@@ -8657,7 +8841,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-938" ++ "referenced_type" : "type-935" + } + ], + "return_type" : "type-120", +@@ -8670,7 +8854,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-938" ++ "referenced_type" : "type-935" + } + ], + "return_type" : "type-120", +@@ -8683,13 +8867,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-938" ++ "referenced_type" : "type-935" + }, + { + "referenced_type" : "type-32" + }, + { +- "referenced_type" : "type-1003" ++ "referenced_type" : "type-1001" + } + ], + "return_type" : "type-120", +@@ -8702,10 +8886,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-938" ++ "referenced_type" : "type-935" + }, + { +- "referenced_type" : "type-694" ++ "referenced_type" : "type-692" + } + ], + "return_type" : "type-77", +@@ -8718,10 +8902,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-938" ++ "referenced_type" : "type-935" + }, + { +- "referenced_type" : "type-694" ++ "referenced_type" : "type-692" + } + ], + "return_type" : "type-77", +@@ -8734,14 +8918,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1132" ++ "referenced_type" : "type-1130" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-531", ++ "return_type" : "type-530", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8751,7 +8935,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-532" ++ "referenced_type" : "type-531" + }, + { + "referenced_type" : "type-79" +@@ -8770,10 +8954,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-532" ++ "referenced_type" : "type-531" + }, + { +- "referenced_type" : "type-1463" ++ "referenced_type" : "type-1460" + } + ], + "return_type" : "type-120", +@@ -8786,10 +8970,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-532" ++ "referenced_type" : "type-531" + }, + { +- "referenced_type" : "type-1464" ++ "referenced_type" : "type-1461" + } + ], + "return_type" : "type-120", +@@ -8802,14 +8986,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1132" ++ "referenced_type" : "type-1130" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-531", ++ "return_type" : "type-530", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8819,7 +9003,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-532" ++ "referenced_type" : "type-531" + }, + { + "referenced_type" : "type-79" +@@ -8835,10 +9019,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-532" ++ "referenced_type" : "type-531" + }, + { +- "referenced_type" : "type-1465" ++ "referenced_type" : "type-1462" + } + ], + "return_type" : "type-120", +@@ -8851,11 +9035,11 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-532" ++ "referenced_type" : "type-531" + }, + { + "default_arg" : true, +- "referenced_type" : "type-1132" ++ "referenced_type" : "type-1130" + } + ], + "return_type" : "type-14", +@@ -8868,10 +9052,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-532" ++ "referenced_type" : "type-531" + }, + { +- "referenced_type" : "type-1466" ++ "referenced_type" : "type-1463" + } + ], + "return_type" : "type-120", +@@ -8884,7 +9068,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-532" ++ "referenced_type" : "type-531" + } + ], + "return_type" : "type-120", +@@ -8897,7 +9081,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-532" ++ "referenced_type" : "type-531" + } + ], + "return_type" : "type-120", +@@ -8909,10 +9093,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1132" ++ "referenced_type" : "type-1130" + }, + { +- "referenced_type" : "type-738" ++ "referenced_type" : "type-736" + } + ], + "return_type" : "type-29", +@@ -8925,7 +9109,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-532" ++ "referenced_type" : "type-531" + } + ], + "return_type" : "type-120", +@@ -8938,13 +9122,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-532" ++ "referenced_type" : "type-531" + }, + { + "referenced_type" : "type-32" + }, + { +- "referenced_type" : "type-1003" ++ "referenced_type" : "type-1001" + } + ], + "return_type" : "type-120", +@@ -8956,14 +9140,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-1111", ++ "return_type" : "type-1109", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8972,14 +9156,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-867" ++ "referenced_type" : "type-865" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-1111", ++ "return_type" : "type-1109", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8988,14 +9172,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-718" ++ "referenced_type" : "type-716" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-1111", ++ "return_type" : "type-1109", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -9006,10 +9190,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1100" ++ "referenced_type" : "type-1098" + }, + { +- "referenced_type" : "type-1469" ++ "referenced_type" : "type-1466" + } + ], + "return_type" : "type-120", +@@ -9022,10 +9206,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1100" ++ "referenced_type" : "type-1098" + }, + { +- "referenced_type" : "type-534" ++ "referenced_type" : "type-533" + } + ], + "return_type" : "type-77", +@@ -9038,10 +9222,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1100" ++ "referenced_type" : "type-1098" + }, + { +- "referenced_type" : "type-534" ++ "referenced_type" : "type-533" + } + ], + "return_type" : "type-77", +@@ -9054,16 +9238,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-838" ++ "referenced_type" : "type-836" + }, + { + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-1145" ++ "referenced_type" : "type-1143" + }, + { +- "referenced_type" : "type-1146" ++ "referenced_type" : "type-1144" + }, + { + "default_arg" : true, +@@ -9071,7 +9255,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-1475" ++ "referenced_type" : "type-1472" + } + ], + "return_type" : "type-14", +@@ -9085,10 +9269,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-838" ++ "referenced_type" : "type-836" + }, + { +- "referenced_type" : "type-1476" ++ "referenced_type" : "type-1473" + } + ], + "return_type" : "type-120", +@@ -9103,13 +9287,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-1145" ++ "referenced_type" : "type-1143" + }, + { +- "referenced_type" : "type-1146" ++ "referenced_type" : "type-1144" + }, + { +- "referenced_type" : "type-1477" ++ "referenced_type" : "type-1474" + } + ], + "return_type" : "type-14", +@@ -9123,7 +9307,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-838" ++ "referenced_type" : "type-836" + } + ], + "return_type" : "type-120", +@@ -9136,10 +9320,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-838" ++ "referenced_type" : "type-836" + }, + { +- "referenced_type" : "type-718" ++ "referenced_type" : "type-716" + } + ], + "return_type" : "type-77", +@@ -9152,10 +9336,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-838" ++ "referenced_type" : "type-836" + }, + { +- "referenced_type" : "type-718" ++ "referenced_type" : "type-716" + } + ], + "return_type" : "type-77", +@@ -9168,7 +9352,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-838" ++ "referenced_type" : "type-836" + } + ], + "return_type" : "type-77", +@@ -9181,7 +9365,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-838" ++ "referenced_type" : "type-836" + } + ], + "return_type" : "type-77", +@@ -9194,7 +9378,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-838" ++ "referenced_type" : "type-836" + } + ], + "return_type" : "type-77", +@@ -9207,7 +9391,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1101" ++ "referenced_type" : "type-1099" + }, + { + "referenced_type" : "type-79" +@@ -9226,10 +9410,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1101" ++ "referenced_type" : "type-1099" + }, + { +- "referenced_type" : "type-1478" ++ "referenced_type" : "type-1475" + } + ], + "return_type" : "type-120", +@@ -9242,10 +9426,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1101" ++ "referenced_type" : "type-1099" + }, + { +- "referenced_type" : "type-1479" ++ "referenced_type" : "type-1476" + } + ], + "return_type" : "type-120", +@@ -9258,7 +9442,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1101" ++ "referenced_type" : "type-1099" + }, + { + "referenced_type" : "type-48" +@@ -9267,7 +9451,7 @@ + "referenced_type" : "type-48" + } + ], +- "return_type" : "type-765", ++ "return_type" : "type-763", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9277,7 +9461,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1101" ++ "referenced_type" : "type-1099" + }, + { + "referenced_type" : "type-79" +@@ -9293,10 +9477,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1101" ++ "referenced_type" : "type-1099" + }, + { +- "referenced_type" : "type-1480" ++ "referenced_type" : "type-1477" + } + ], + "return_type" : "type-120", +@@ -9309,13 +9493,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1101" ++ "referenced_type" : "type-1099" + }, + { + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-1481" ++ "referenced_type" : "type-1478" + } + ], + "return_type" : "type-120", +@@ -9328,10 +9512,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1101" ++ "referenced_type" : "type-1099" + }, + { +- "referenced_type" : "type-1482" ++ "referenced_type" : "type-1479" + } + ], + "return_type" : "type-120", +@@ -9344,7 +9528,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1101" ++ "referenced_type" : "type-1099" + } + ], + "return_type" : "type-120", +@@ -9357,7 +9541,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1101" ++ "referenced_type" : "type-1099" + } + ], + "return_type" : "type-120", +@@ -9370,7 +9554,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1101" ++ "referenced_type" : "type-1099" + }, + { + "referenced_type" : "type-48" +@@ -9379,7 +9563,7 @@ + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-738" ++ "referenced_type" : "type-736" + } + ], + "return_type" : "type-249", +@@ -9392,7 +9576,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1101" ++ "referenced_type" : "type-1099" + }, + { + "referenced_type" : "type-48" +@@ -9411,7 +9595,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1101" ++ "referenced_type" : "type-1099" + }, + { + "referenced_type" : "type-48" +@@ -9420,7 +9604,7 @@ + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-738" ++ "referenced_type" : "type-736" + } + ], + "return_type" : "type-249", +@@ -9432,10 +9616,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1104" ++ "referenced_type" : "type-1102" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + }, + { + "referenced_type" : "type-48" +@@ -9444,7 +9628,7 @@ + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-738" ++ "referenced_type" : "type-736" + } + ], + "return_type" : "type-249", +@@ -9457,13 +9641,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1101" ++ "referenced_type" : "type-1099" + }, + { + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + } + ], + "return_type" : "type-249", +@@ -9476,7 +9660,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1101" ++ "referenced_type" : "type-1099" + }, + { + "referenced_type" : "type-48" +@@ -9485,7 +9669,7 @@ + "referenced_type" : "type-48" + } + ], +- "return_type" : "type-758", ++ "return_type" : "type-756", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9495,10 +9679,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1101" ++ "referenced_type" : "type-1099" + }, + { +- "referenced_type" : "type-1483" ++ "referenced_type" : "type-1480" + } + ], + "return_type" : "type-120", +@@ -9511,7 +9695,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1101" ++ "referenced_type" : "type-1099" + } + ], + "return_type" : "type-120", +@@ -9524,13 +9708,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1101" ++ "referenced_type" : "type-1099" + }, + { + "referenced_type" : "type-32" + }, + { +- "referenced_type" : "type-1003" ++ "referenced_type" : "type-1001" + } + ], + "return_type" : "type-120", +@@ -9543,10 +9727,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1101" ++ "referenced_type" : "type-1099" + }, + { +- "referenced_type" : "type-1484" ++ "referenced_type" : "type-1481" + } + ], + "return_type" : "type-120", +@@ -9559,10 +9743,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1101" ++ "referenced_type" : "type-1099" + }, + { +- "referenced_type" : "type-694" ++ "referenced_type" : "type-692" + } + ], + "return_type" : "type-77", +@@ -9575,10 +9759,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1101" ++ "referenced_type" : "type-1099" + }, + { +- "referenced_type" : "type-694" ++ "referenced_type" : "type-692" + } + ], + "return_type" : "type-77", +@@ -9591,14 +9775,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1969" ++ "referenced_type" : "type-1965" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-548", ++ "return_type" : "type-546", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9608,7 +9792,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-549" ++ "referenced_type" : "type-547" + }, + { + "referenced_type" : "type-79" +@@ -9627,10 +9811,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-549" ++ "referenced_type" : "type-547" + }, + { +- "referenced_type" : "type-2585" ++ "referenced_type" : "type-2580" + } + ], + "return_type" : "type-120", +@@ -9643,10 +9827,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-549" ++ "referenced_type" : "type-547" + }, + { +- "referenced_type" : "type-2586" ++ "referenced_type" : "type-2581" + } + ], + "return_type" : "type-120", +@@ -9659,14 +9843,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1969" ++ "referenced_type" : "type-1965" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-548", ++ "return_type" : "type-546", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9676,7 +9860,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-549" ++ "referenced_type" : "type-547" + }, + { + "referenced_type" : "type-79" +@@ -9692,10 +9876,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-549" ++ "referenced_type" : "type-547" + }, + { +- "referenced_type" : "type-2587" ++ "referenced_type" : "type-2582" + } + ], + "return_type" : "type-120", +@@ -9708,11 +9892,11 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-549" ++ "referenced_type" : "type-547" + }, + { + "default_arg" : true, +- "referenced_type" : "type-1969" ++ "referenced_type" : "type-1965" + } + ], + "return_type" : "type-14", +@@ -9725,10 +9909,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-549" ++ "referenced_type" : "type-547" + }, + { +- "referenced_type" : "type-2588" ++ "referenced_type" : "type-2583" + } + ], + "return_type" : "type-120", +@@ -9741,7 +9925,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-549" ++ "referenced_type" : "type-547" + } + ], + "return_type" : "type-120", +@@ -9754,7 +9938,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-549" ++ "referenced_type" : "type-547" + } + ], + "return_type" : "type-120", +@@ -9766,10 +9950,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1969" ++ "referenced_type" : "type-1965" + }, + { +- "referenced_type" : "type-738" ++ "referenced_type" : "type-736" + } + ], + "return_type" : "type-29", +@@ -9782,7 +9966,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-549" ++ "referenced_type" : "type-547" + } + ], + "return_type" : "type-120", +@@ -9795,13 +9979,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-549" ++ "referenced_type" : "type-547" + }, + { + "referenced_type" : "type-32" + }, + { +- "referenced_type" : "type-1003" ++ "referenced_type" : "type-1001" + } + ], + "return_type" : "type-120", +@@ -9813,14 +9997,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-1946", ++ "return_type" : "type-1942", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9829,14 +10013,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-742" ++ "referenced_type" : "type-740" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-1946", ++ "return_type" : "type-1942", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9846,14 +10030,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-2045" ++ "referenced_type" : "type-2041" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-537", ++ "return_type" : "type-535", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -9863,7 +10047,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-538" ++ "referenced_type" : "type-536" + }, + { + "referenced_type" : "type-79" +@@ -9882,10 +10066,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-538" ++ "referenced_type" : "type-536" + }, + { +- "referenced_type" : "type-2589" ++ "referenced_type" : "type-2584" + } + ], + "return_type" : "type-120", +@@ -9898,10 +10082,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-538" ++ "referenced_type" : "type-536" + }, + { +- "referenced_type" : "type-2590" ++ "referenced_type" : "type-2585" + } + ], + "return_type" : "type-120", +@@ -9914,14 +10098,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-2045" ++ "referenced_type" : "type-2041" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-537", ++ "return_type" : "type-535", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -9931,7 +10115,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-538" ++ "referenced_type" : "type-536" + }, + { + "referenced_type" : "type-79" +@@ -9947,10 +10131,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-538" ++ "referenced_type" : "type-536" + }, + { +- "referenced_type" : "type-2591" ++ "referenced_type" : "type-2586" + } + ], + "return_type" : "type-120", +@@ -9963,11 +10147,11 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-538" ++ "referenced_type" : "type-536" + }, + { + "default_arg" : true, +- "referenced_type" : "type-2045" ++ "referenced_type" : "type-2041" + } + ], + "return_type" : "type-14", +@@ -9980,10 +10164,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-538" ++ "referenced_type" : "type-536" + }, + { +- "referenced_type" : "type-2592" ++ "referenced_type" : "type-2587" + } + ], + "return_type" : "type-120", +@@ -9996,7 +10180,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-538" ++ "referenced_type" : "type-536" + } + ], + "return_type" : "type-120", +@@ -10009,7 +10193,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-538" ++ "referenced_type" : "type-536" + } + ], + "return_type" : "type-120", +@@ -10021,10 +10205,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2045" ++ "referenced_type" : "type-2041" + }, + { +- "referenced_type" : "type-738" ++ "referenced_type" : "type-736" + } + ], + "return_type" : "type-29", +@@ -10037,7 +10221,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-538" ++ "referenced_type" : "type-536" + } + ], + "return_type" : "type-120", +@@ -10050,13 +10234,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-538" ++ "referenced_type" : "type-536" + }, + { + "referenced_type" : "type-32" + }, + { +- "referenced_type" : "type-1003" ++ "referenced_type" : "type-1001" + } + ], + "return_type" : "type-120", +@@ -10068,14 +10252,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-2016", ++ "return_type" : "type-2012", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10084,14 +10268,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-867" ++ "referenced_type" : "type-865" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-2016", ++ "return_type" : "type-2012", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10100,14 +10284,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-718" ++ "referenced_type" : "type-716" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-2016", ++ "return_type" : "type-2012", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10116,14 +10300,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-727" ++ "referenced_type" : "type-725" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-2016", ++ "return_type" : "type-2012", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10134,10 +10318,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1930" ++ "referenced_type" : "type-1926" + }, + { +- "referenced_type" : "type-2595" ++ "referenced_type" : "type-2590" + } + ], + "return_type" : "type-120", +@@ -10150,10 +10334,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1930" ++ "referenced_type" : "type-1926" + }, + { +- "referenced_type" : "type-553" ++ "referenced_type" : "type-552" + } + ], + "return_type" : "type-77", +@@ -10166,10 +10350,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1930" ++ "referenced_type" : "type-1926" + }, + { +- "referenced_type" : "type-553" ++ "referenced_type" : "type-552" + } + ], + "return_type" : "type-77", +@@ -10183,10 +10367,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2005" ++ "referenced_type" : "type-2001" + }, + { +- "referenced_type" : "type-2600" ++ "referenced_type" : "type-2595" + } + ], + "return_type" : "type-120", +@@ -10199,10 +10383,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2005" ++ "referenced_type" : "type-2001" + }, + { +- "referenced_type" : "type-540" ++ "referenced_type" : "type-539" + } + ], + "return_type" : "type-77", +@@ -10215,10 +10399,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2005" ++ "referenced_type" : "type-2001" + }, + { +- "referenced_type" : "type-540" ++ "referenced_type" : "type-539" + } + ], + "return_type" : "type-77", +@@ -10231,16 +10415,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-847" ++ "referenced_type" : "type-844" + }, + { + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-1987" ++ "referenced_type" : "type-1983" + }, + { +- "referenced_type" : "type-1988" ++ "referenced_type" : "type-1984" + }, + { + "default_arg" : true, +@@ -10248,7 +10432,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-2607" ++ "referenced_type" : "type-2602" + } + ], + "return_type" : "type-14", +@@ -10262,10 +10446,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-847" ++ "referenced_type" : "type-844" + }, + { +- "referenced_type" : "type-2608" ++ "referenced_type" : "type-2603" + } + ], + "return_type" : "type-120", +@@ -10280,13 +10464,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-1987" ++ "referenced_type" : "type-1983" + }, + { +- "referenced_type" : "type-1988" ++ "referenced_type" : "type-1984" + }, + { +- "referenced_type" : "type-2609" ++ "referenced_type" : "type-2604" + } + ], + "return_type" : "type-14", +@@ -10300,7 +10484,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-847" ++ "referenced_type" : "type-844" + } + ], + "return_type" : "type-120", +@@ -10313,10 +10497,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-847" ++ "referenced_type" : "type-844" + }, + { +- "referenced_type" : "type-742" ++ "referenced_type" : "type-740" + } + ], + "return_type" : "type-77", +@@ -10329,10 +10513,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-847" ++ "referenced_type" : "type-844" + }, + { +- "referenced_type" : "type-742" ++ "referenced_type" : "type-740" + } + ], + "return_type" : "type-77", +@@ -10345,7 +10529,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-847" ++ "referenced_type" : "type-844" + } + ], + "return_type" : "type-77", +@@ -10358,7 +10542,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-847" ++ "referenced_type" : "type-844" + } + ], + "return_type" : "type-77", +@@ -10371,7 +10555,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-847" ++ "referenced_type" : "type-844" + } + ], + "return_type" : "type-77", +@@ -10384,16 +10568,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-854" ++ "referenced_type" : "type-852" + }, + { + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-2040" ++ "referenced_type" : "type-2036" + }, + { +- "referenced_type" : "type-2041" ++ "referenced_type" : "type-2037" + }, + { + "default_arg" : true, +@@ -10401,7 +10585,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-2610" ++ "referenced_type" : "type-2605" + } + ], + "return_type" : "type-14", +@@ -10415,10 +10599,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-854" ++ "referenced_type" : "type-852" + }, + { +- "referenced_type" : "type-2611" ++ "referenced_type" : "type-2606" + } + ], + "return_type" : "type-120", +@@ -10433,13 +10617,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-2040" ++ "referenced_type" : "type-2036" + }, + { +- "referenced_type" : "type-2041" ++ "referenced_type" : "type-2037" + }, + { +- "referenced_type" : "type-2612" ++ "referenced_type" : "type-2607" + } + ], + "return_type" : "type-14", +@@ -10454,13 +10638,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-2040" ++ "referenced_type" : "type-2036" + }, + { +- "referenced_type" : "type-2041" ++ "referenced_type" : "type-2037" + }, + { +- "referenced_type" : "type-2613" ++ "referenced_type" : "type-2608" + } + ], + "return_type" : "type-14", +@@ -10475,13 +10659,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-2040" ++ "referenced_type" : "type-2036" + }, + { +- "referenced_type" : "type-2041" ++ "referenced_type" : "type-2037" + }, + { +- "referenced_type" : "type-2614" ++ "referenced_type" : "type-2609" + } + ], + "return_type" : "type-14", +@@ -10496,13 +10680,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-2040" ++ "referenced_type" : "type-2036" + }, + { +- "referenced_type" : "type-2041" ++ "referenced_type" : "type-2037" + }, + { +- "referenced_type" : "type-2615" ++ "referenced_type" : "type-2610" + } + ], + "return_type" : "type-14", +@@ -10517,13 +10701,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-2040" ++ "referenced_type" : "type-2036" + }, + { +- "referenced_type" : "type-2041" ++ "referenced_type" : "type-2037" + }, + { +- "referenced_type" : "type-2616" ++ "referenced_type" : "type-2611" + } + ], + "return_type" : "type-14", +@@ -10537,7 +10721,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-854" ++ "referenced_type" : "type-852" + } + ], + "return_type" : "type-120", +@@ -10550,10 +10734,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-854" ++ "referenced_type" : "type-852" + }, + { +- "referenced_type" : "type-727" ++ "referenced_type" : "type-725" + } + ], + "return_type" : "type-77", +@@ -10566,10 +10750,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-854" ++ "referenced_type" : "type-852" + }, + { +- "referenced_type" : "type-727" ++ "referenced_type" : "type-725" + } + ], + "return_type" : "type-77", +@@ -10582,7 +10766,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-854" ++ "referenced_type" : "type-852" + } + ], + "return_type" : "type-77", +@@ -10595,7 +10779,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-854" ++ "referenced_type" : "type-852" + } + ], + "return_type" : "type-77", +@@ -10608,7 +10792,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-854" ++ "referenced_type" : "type-852" + } + ], + "return_type" : "type-77", +@@ -10621,7 +10805,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1931" ++ "referenced_type" : "type-1927" + }, + { + "referenced_type" : "type-79" +@@ -10640,10 +10824,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1931" ++ "referenced_type" : "type-1927" + }, + { +- "referenced_type" : "type-2617" ++ "referenced_type" : "type-2612" + } + ], + "return_type" : "type-120", +@@ -10656,10 +10840,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1931" ++ "referenced_type" : "type-1927" + }, + { +- "referenced_type" : "type-2618" ++ "referenced_type" : "type-2613" + } + ], + "return_type" : "type-120", +@@ -10672,7 +10856,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1931" ++ "referenced_type" : "type-1927" + }, + { + "referenced_type" : "type-79" +@@ -10688,10 +10872,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1931" ++ "referenced_type" : "type-1927" + }, + { +- "referenced_type" : "type-2619" ++ "referenced_type" : "type-2614" + } + ], + "return_type" : "type-120", +@@ -10703,13 +10887,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1936" ++ "referenced_type" : "type-1932" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + }, + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + }, + { + "referenced_type" : "type-29" +@@ -10725,10 +10909,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1931" ++ "referenced_type" : "type-1927" + }, + { +- "referenced_type" : "type-2620" ++ "referenced_type" : "type-2615" + } + ], + "return_type" : "type-120", +@@ -10741,7 +10925,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1931" ++ "referenced_type" : "type-1927" + } + ], + "return_type" : "type-120", +@@ -10754,7 +10938,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1931" ++ "referenced_type" : "type-1927" + } + ], + "return_type" : "type-120", +@@ -10767,7 +10951,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1931" ++ "referenced_type" : "type-1927" + } + ], + "return_type" : "type-120", +@@ -10780,13 +10964,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1931" ++ "referenced_type" : "type-1927" + }, + { + "referenced_type" : "type-32" + }, + { +- "referenced_type" : "type-1003" ++ "referenced_type" : "type-1001" + } + ], + "return_type" : "type-120", +@@ -10799,10 +10983,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1931" ++ "referenced_type" : "type-1927" + }, + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + }, + { + "referenced_type" : "type-29" +@@ -10818,10 +11002,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1931" ++ "referenced_type" : "type-1927" + }, + { +- "referenced_type" : "type-694" ++ "referenced_type" : "type-692" + } + ], + "return_type" : "type-77", +@@ -10834,10 +11018,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1931" ++ "referenced_type" : "type-1927" + }, + { +- "referenced_type" : "type-694" ++ "referenced_type" : "type-692" + } + ], + "return_type" : "type-77", +@@ -10850,7 +11034,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-733" ++ "referenced_type" : "type-731" + }, + { + "referenced_type" : "type-79" +@@ -10869,16 +11053,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-733" ++ "referenced_type" : "type-731" + }, + { + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + }, + { +- "referenced_type" : "type-1003" ++ "referenced_type" : "type-1001" + } + ], + "return_type" : "type-249", +@@ -10891,10 +11075,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-733" ++ "referenced_type" : "type-731" + }, + { +- "referenced_type" : "type-2621" ++ "referenced_type" : "type-2616" + } + ], + "return_type" : "type-120", +@@ -10907,10 +11091,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-733" ++ "referenced_type" : "type-731" + }, + { +- "referenced_type" : "type-2622" ++ "referenced_type" : "type-2617" + } + ], + "return_type" : "type-120", +@@ -10923,7 +11107,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-733" ++ "referenced_type" : "type-731" + }, + { + "referenced_type" : "type-48" +@@ -10932,7 +11116,7 @@ + "referenced_type" : "type-48" + } + ], +- "return_type" : "type-765", ++ "return_type" : "type-763", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -10942,7 +11126,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-733" ++ "referenced_type" : "type-731" + }, + { + "referenced_type" : "type-48" +@@ -10951,7 +11135,7 @@ + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + } + ], + "return_type" : "type-249", +@@ -10964,7 +11148,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-733" ++ "referenced_type" : "type-731" + }, + { + "referenced_type" : "type-79" +@@ -10980,10 +11164,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-733" ++ "referenced_type" : "type-731" + }, + { +- "referenced_type" : "type-2623" ++ "referenced_type" : "type-2618" + } + ], + "return_type" : "type-120", +@@ -10996,13 +11180,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-733" ++ "referenced_type" : "type-731" + }, + { + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-2624" ++ "referenced_type" : "type-2619" + } + ], + "return_type" : "type-120", +@@ -11014,19 +11198,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2010" ++ "referenced_type" : "type-2005" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + }, + { + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + }, + { +- "referenced_type" : "type-1003" ++ "referenced_type" : "type-1001" + } + ], + "return_type" : "type-249", +@@ -11038,10 +11222,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2010" ++ "referenced_type" : "type-2005" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + }, + { + "referenced_type" : "type-48" +@@ -11050,7 +11234,7 @@ + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + } + ], + "return_type" : "type-249", +@@ -11063,10 +11247,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-733" ++ "referenced_type" : "type-731" + }, + { +- "referenced_type" : "type-2625" ++ "referenced_type" : "type-2620" + } + ], + "return_type" : "type-120", +@@ -11079,7 +11263,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-733" ++ "referenced_type" : "type-731" + } + ], + "return_type" : "type-120", +@@ -11092,7 +11276,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-733" ++ "referenced_type" : "type-731" + } + ], + "return_type" : "type-120", +@@ -11105,7 +11289,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-733" ++ "referenced_type" : "type-731" + }, + { + "referenced_type" : "type-48" +@@ -11114,10 +11298,10 @@ + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + }, + { +- "referenced_type" : "type-742" ++ "referenced_type" : "type-740" + } + ], + "return_type" : "type-249", +@@ -11130,13 +11314,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-733" ++ "referenced_type" : "type-731" + }, + { + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-2626" ++ "referenced_type" : "type-2621" + } + ], + "return_type" : "type-120", +@@ -11149,7 +11333,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-733" ++ "referenced_type" : "type-731" + }, + { + "referenced_type" : "type-48" +@@ -11158,7 +11342,7 @@ + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-738" ++ "referenced_type" : "type-736" + } + ], + "return_type" : "type-249", +@@ -11171,13 +11355,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-733" ++ "referenced_type" : "type-731" + }, + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + }, + { +- "referenced_type" : "type-742" ++ "referenced_type" : "type-740" + } + ], + "return_type" : "type-249", +@@ -11190,7 +11374,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-733" ++ "referenced_type" : "type-731" + }, + { + "referenced_type" : "type-48" +@@ -11209,7 +11393,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-733" ++ "referenced_type" : "type-731" + }, + { + "referenced_type" : "type-48" +@@ -11218,7 +11402,7 @@ + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-738" ++ "referenced_type" : "type-736" + } + ], + "return_type" : "type-249", +@@ -11230,10 +11414,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2010" ++ "referenced_type" : "type-2005" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + }, + { + "referenced_type" : "type-48" +@@ -11242,10 +11426,10 @@ + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + }, + { +- "referenced_type" : "type-742" ++ "referenced_type" : "type-740" + } + ], + "return_type" : "type-249", +@@ -11257,16 +11441,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2010" ++ "referenced_type" : "type-2005" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + }, + { + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-2627" ++ "referenced_type" : "type-2622" + } + ], + "return_type" : "type-120", +@@ -11278,16 +11462,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2010" ++ "referenced_type" : "type-2005" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + }, + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + }, + { +- "referenced_type" : "type-742" ++ "referenced_type" : "type-740" + } + ], + "return_type" : "type-249", +@@ -11300,13 +11484,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-733" ++ "referenced_type" : "type-731" + }, + { + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + } + ], + "return_type" : "type-249", +@@ -11319,7 +11503,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-733" ++ "referenced_type" : "type-731" + }, + { + "referenced_type" : "type-48" +@@ -11328,7 +11512,7 @@ + "referenced_type" : "type-48" + } + ], +- "return_type" : "type-758", ++ "return_type" : "type-756", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11338,10 +11522,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-733" ++ "referenced_type" : "type-731" + }, + { +- "referenced_type" : "type-2628" ++ "referenced_type" : "type-2623" + } + ], + "return_type" : "type-120", +@@ -11354,7 +11538,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-733" ++ "referenced_type" : "type-731" + } + ], + "return_type" : "type-120", +@@ -11367,13 +11551,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-733" ++ "referenced_type" : "type-731" + }, + { + "referenced_type" : "type-32" + }, + { +- "referenced_type" : "type-1003" ++ "referenced_type" : "type-1001" + } + ], + "return_type" : "type-120", +@@ -11386,10 +11570,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-733" ++ "referenced_type" : "type-731" + }, + { +- "referenced_type" : "type-2629" ++ "referenced_type" : "type-2624" + } + ], + "return_type" : "type-120", +@@ -11402,10 +11586,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-733" ++ "referenced_type" : "type-731" + }, + { +- "referenced_type" : "type-694" ++ "referenced_type" : "type-692" + } + ], + "return_type" : "type-77", +@@ -11418,10 +11602,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-733" ++ "referenced_type" : "type-731" + }, + { +- "referenced_type" : "type-694" ++ "referenced_type" : "type-692" + } + ], + "return_type" : "type-77", +@@ -11435,7 +11619,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2147" ++ "referenced_type" : "type-2143" + } + ], + "return_type" : "type-77", +@@ -11448,10 +11632,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2147" ++ "referenced_type" : "type-2143" + }, + { +- "referenced_type" : "type-2217" ++ "referenced_type" : "type-2213" + }, + { + "default_arg" : true, +@@ -11472,7 +11656,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2147" ++ "referenced_type" : "type-2143" + }, + { + "referenced_type" : "type-78" +@@ -11484,7 +11668,7 @@ + "referenced_type" : "type-188" + }, + { +- "referenced_type" : "type-2157" ++ "referenced_type" : "type-2153" + } + ], + "return_type" : "type-77", +@@ -11497,7 +11681,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2147" ++ "referenced_type" : "type-2143" + }, + { + "referenced_type" : "type-78" +@@ -11513,10 +11697,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2147" ++ "referenced_type" : "type-2143" + } + ], +- "return_type" : "type-2147", ++ "return_type" : "type-2143", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11526,7 +11710,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2147" ++ "referenced_type" : "type-2143" + } + ], + "return_type" : "type-77", +@@ -11539,7 +11723,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2235" ++ "referenced_type" : "type-2231" + } + ], + "return_type" : "type-77", +@@ -11552,7 +11736,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2235" ++ "referenced_type" : "type-2231" + }, + { + "referenced_type" : "type-78" +@@ -11564,7 +11748,7 @@ + "referenced_type" : "type-188" + }, + { +- "referenced_type" : "type-2157" ++ "referenced_type" : "type-2153" + } + ], + "return_type" : "type-77", +@@ -11577,7 +11761,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2235" ++ "referenced_type" : "type-2231" + }, + { + "referenced_type" : "type-78" +@@ -11593,7 +11777,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2235" ++ "referenced_type" : "type-2231" + } + ], + "return_type" : "type-77", +@@ -11606,7 +11790,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2235" ++ "referenced_type" : "type-2231" + } + ], + "return_type" : "type-77", +@@ -11619,7 +11803,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2235" ++ "referenced_type" : "type-2231" + } + ], + "return_type" : "type-77", +@@ -11632,7 +11816,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2235" ++ "referenced_type" : "type-2231" + } + ], + "return_type" : "type-77", +@@ -11645,10 +11829,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2147" ++ "referenced_type" : "type-2143" + }, + { +- "referenced_type" : "type-2171" ++ "referenced_type" : "type-2167" + }, + { + "default_arg" : true, +@@ -11660,7 +11844,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-906" ++ "referenced_type" : "type-904" + } + ], + "return_type" : "type-14", +@@ -11674,10 +11858,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2147" ++ "referenced_type" : "type-2143" + }, + { +- "referenced_type" : "type-2226" ++ "referenced_type" : "type-2222" + } + ], + "return_type" : "type-77", +@@ -11691,7 +11875,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2147" ++ "referenced_type" : "type-2143" + }, + { + "referenced_type" : "type-78" +@@ -11708,7 +11892,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2147" ++ "referenced_type" : "type-2143" + }, + { + "referenced_type" : "type-44" +@@ -11727,7 +11911,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2147" ++ "referenced_type" : "type-2143" + } + ], + "return_type" : "type-14", +@@ -11740,16 +11924,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2147" ++ "referenced_type" : "type-2143" + }, + { + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-2166" ++ "referenced_type" : "type-2162" + }, + { +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "default_arg" : true, +@@ -11757,7 +11941,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-2630" ++ "referenced_type" : "type-2625" + } + ], + "return_type" : "type-14", +@@ -11770,7 +11954,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2147" ++ "referenced_type" : "type-2143" + }, + { + "referenced_type" : "type-14" +@@ -11786,7 +11970,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2147" ++ "referenced_type" : "type-2143" + }, + { + "referenced_type" : "type-14" +@@ -11803,7 +11987,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2147" ++ "referenced_type" : "type-2143" + } + ], + "return_type" : "type-77", +@@ -11817,7 +12001,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2147" ++ "referenced_type" : "type-2143" + } + ], + "return_type" : "type-77", +@@ -11831,7 +12015,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2147" ++ "referenced_type" : "type-2143" + } + ], + "return_type" : "type-77", +@@ -11998,10 +12182,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-3408" ++ "referenced_type" : "type-3402" + } + ], +- "return_type" : "type-383", ++ "return_type" : "type-382", + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h" + }, + { +@@ -12010,10 +12194,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-3403" ++ "referenced_type" : "type-3397" + } + ], +- "return_type" : "type-383", ++ "return_type" : "type-382", + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h" + }, + { +@@ -12023,7 +12207,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3405" ++ "referenced_type" : "type-3399" + } + ], + "return_type" : "type-77", +@@ -12037,7 +12221,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3405" ++ "referenced_type" : "type-3399" + } + ], + "return_type" : "type-77", +@@ -12051,7 +12235,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3405" ++ "referenced_type" : "type-3399" + } + ], + "return_type" : "type-77", +@@ -12065,7 +12249,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3405" ++ "referenced_type" : "type-3399" + } + ], + "return_type" : "type-77", +@@ -12078,7 +12262,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3706" ++ "referenced_type" : "type-3700" + } + ], + "return_type" : "type-77", +@@ -12091,7 +12275,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3706" ++ "referenced_type" : "type-3700" + } + ], + "return_type" : "type-77", +@@ -12104,7 +12288,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3706" ++ "referenced_type" : "type-3700" + } + ], + "return_type" : "type-77", +@@ -12117,7 +12301,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3706" ++ "referenced_type" : "type-3700" + } + ], + "return_type" : "type-77", +@@ -12129,12 +12313,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-694" ++ "referenced_type" : "type-692" + } + ], + "return_type" : "type-300", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h", +- "template_args" : [ "type-302", "type-368", "type-299" ] ++ "template_args" : [ "type-302", "type-367", "type-299" ] + }, + { + "function_name" : "android::hardware::fromBinder", +@@ -12142,12 +12326,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-694" ++ "referenced_type" : "type-692" + } + ], +- "return_type" : "type-542", ++ "return_type" : "type-541", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h", +- "template_args" : [ "type-495", "type-822", "type-820" ] ++ "template_args" : [ "type-493", "type-820", "type-818" ] + }, + { + "function_name" : "android::hardware::fromBinder", +@@ -12155,12 +12339,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-694" ++ "referenced_type" : "type-692" + } + ], +- "return_type" : "type-548", ++ "return_type" : "type-546", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h", +- "template_args" : [ "type-498", "type-848", "type-846" ] ++ "template_args" : [ "type-497", "type-846", "type-843" ] + }, + { + "function_name" : "android::hardware::fromBinder", +@@ -12168,12 +12352,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-694" ++ "referenced_type" : "type-692" + } + ], +- "return_type" : "type-537", ++ "return_type" : "type-535", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h", +- "template_args" : [ "type-517", "type-729", "type-803" ] ++ "template_args" : [ "type-516", "type-726", "type-801" ] + }, + { + "access" : "protected", +@@ -12183,7 +12367,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2180" ++ "referenced_type" : "type-2176" + } + ], + "return_type" : "type-77", +@@ -12197,7 +12381,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2180" ++ "referenced_type" : "type-2176" + }, + { + "referenced_type" : "type-78" +@@ -12214,7 +12398,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2180" ++ "referenced_type" : "type-2176" + }, + { + "referenced_type" : "type-44" +@@ -12234,10 +12418,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2180" ++ "referenced_type" : "type-2176" + }, + { +- "referenced_type" : "type-694" ++ "referenced_type" : "type-692" + } + ], + "return_type" : "type-77", +@@ -12251,10 +12435,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2180" ++ "referenced_type" : "type-2176" + }, + { +- "referenced_type" : "type-694" ++ "referenced_type" : "type-692" + } + ], + "return_type" : "type-77", +@@ -12268,7 +12452,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2180" ++ "referenced_type" : "type-2176" + } + ], + "return_type" : "type-77", +@@ -12282,7 +12466,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2180" ++ "referenced_type" : "type-2176" + } + ], + "return_type" : "type-77", +@@ -12296,7 +12480,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2180" ++ "referenced_type" : "type-2176" + } + ], + "return_type" : "type-77", +@@ -12886,7 +13070,7 @@ + { + "function_name" : "android::hardware::ProcessState::selfOrNull", + "linker_set_key" : "_ZN7android8hardware12ProcessState10selfOrNullEv", +- "return_type" : "type-444", ++ "return_type" : "type-443", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -12896,7 +13080,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2252" ++ "referenced_type" : "type-2248" + } + ], + "return_type" : "type-44", +@@ -12909,13 +13093,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2252" ++ "referenced_type" : "type-2248" + }, + { + "referenced_type" : "type-14" + }, + { +- "referenced_type" : "type-2141" ++ "referenced_type" : "type-2137" + } + ], + "return_type" : "type-77", +@@ -12928,7 +13112,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2252" ++ "referenced_type" : "type-2248" + } + ], + "return_type" : "type-44", +@@ -12941,7 +13125,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2252" ++ "referenced_type" : "type-2248" + } + ], + "return_type" : "type-77", +@@ -12954,13 +13138,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2252" ++ "referenced_type" : "type-2248" + }, + { +- "referenced_type" : "type-694" ++ "referenced_type" : "type-692" + } + ], +- "return_type" : "type-383", ++ "return_type" : "type-382", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -12970,16 +13154,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2252" ++ "referenced_type" : "type-2248" + }, + { + "referenced_type" : "type-295" + }, + { +- "referenced_type" : "type-694" ++ "referenced_type" : "type-692" + } + ], +- "return_type" : "type-383", ++ "return_type" : "type-382", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -12991,7 +13175,7 @@ + "referenced_type" : "type-44" + } + ], +- "return_type" : "type-444", ++ "return_type" : "type-443", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13001,10 +13185,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2252" ++ "referenced_type" : "type-2248" + }, + { +- "referenced_type" : "type-694" ++ "referenced_type" : "type-692" + } + ], + "return_type" : "type-77", +@@ -13017,10 +13201,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2252" ++ "referenced_type" : "type-2248" + }, + { +- "referenced_type" : "type-694" ++ "referenced_type" : "type-692" + }, + { + "referenced_type" : "type-295" +@@ -13036,7 +13220,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2252" ++ "referenced_type" : "type-2248" + }, + { + "referenced_type" : "type-29" +@@ -13052,7 +13236,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2252" ++ "referenced_type" : "type-2248" + } + ], + "return_type" : "type-77", +@@ -13066,13 +13250,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2252" ++ "referenced_type" : "type-2248" + }, + { + "referenced_type" : "type-14" + } + ], +- "return_type" : "type-3617", ++ "return_type" : "type-3611", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13082,10 +13266,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2252" ++ "referenced_type" : "type-2248" + }, + { +- "referenced_type" : "type-2243" ++ "referenced_type" : "type-2239" + } + ], + "return_type" : "type-77", +@@ -13098,13 +13282,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2252" ++ "referenced_type" : "type-2248" + }, + { + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + } + ], + "return_type" : "type-14", +@@ -13117,10 +13301,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2252" ++ "referenced_type" : "type-2248" + }, + { +- "referenced_type" : "type-2242" ++ "referenced_type" : "type-2238" + }, + { + "referenced_type" : "type-188" +@@ -13137,7 +13321,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2252" ++ "referenced_type" : "type-2248" + } + ], + "return_type" : "type-165", +@@ -13150,13 +13334,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2252" ++ "referenced_type" : "type-2248" + }, + { + "referenced_type" : "type-14" + } + ], +- "return_type" : "type-2193", ++ "return_type" : "type-2189", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13166,13 +13350,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2252" ++ "referenced_type" : "type-2248" + }, + { + "referenced_type" : "type-14" + } + ], +- "return_type" : "type-383", ++ "return_type" : "type-382", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13182,7 +13366,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2252" ++ "referenced_type" : "type-2248" + }, + { + "referenced_type" : "type-44" +@@ -13201,7 +13385,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2252" ++ "referenced_type" : "type-2248" + }, + { + "referenced_type" : "type-14" +@@ -13213,7 +13397,7 @@ + { + "function_name" : "android::hardware::ProcessState::self", + "linker_set_key" : "_ZN7android8hardware12ProcessState4selfEv", +- "return_type" : "type-444", ++ "return_type" : "type-443", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13224,7 +13408,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2252" ++ "referenced_type" : "type-2248" + }, + { + "referenced_type" : "type-44" +@@ -13241,7 +13425,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2252" ++ "referenced_type" : "type-2248" + }, + { + "referenced_type" : "type-44" +@@ -13258,7 +13442,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2252" ++ "referenced_type" : "type-2248" + } + ], + "return_type" : "type-77", +@@ -13272,7 +13456,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2252" ++ "referenced_type" : "type-2248" + } + ], + "return_type" : "type-77", +@@ -13286,7 +13470,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2252" ++ "referenced_type" : "type-2248" + } + ], + "return_type" : "type-77", +@@ -13329,16 +13513,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { +- "referenced_type" : "type-990" ++ "referenced_type" : "type-987" + }, + { + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-2164" ++ "referenced_type" : "type-2160" + }, + { + "referenced_type" : "type-44" +@@ -13353,7 +13537,7 @@ + { + "function_name" : "android::hardware::IPCThreadState::selfOrNull", + "linker_set_key" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv", +- "return_type" : "type-3446", ++ "return_type" : "type-3440", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13364,7 +13548,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + } + ], + "return_type" : "type-77", +@@ -13377,7 +13561,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + }, + { + "default_arg" : true, +@@ -13394,10 +13578,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + }, + { +- "referenced_type" : "type-475" ++ "referenced_type" : "type-474" + } + ], + "return_type" : "type-14", +@@ -13410,7 +13594,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + }, + { + "referenced_type" : "type-14" +@@ -13428,7 +13612,7 @@ + "referenced_type" : "type-14" + }, + { +- "referenced_type" : "type-2141" ++ "referenced_type" : "type-2137" + } + ], + "return_type" : "type-77", +@@ -13441,7 +13625,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + } + ], + "return_type" : "type-77", +@@ -13454,13 +13638,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + }, + { + "referenced_type" : "type-14" + }, + { +- "referenced_type" : "type-2147" ++ "referenced_type" : "type-2143" + } + ], + "return_type" : "type-77", +@@ -13473,7 +13657,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + } + ], + "return_type" : "type-14", +@@ -13487,7 +13671,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + }, + { + "referenced_type" : "type-14" +@@ -13503,7 +13687,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + } + ], + "return_type" : "type-29", +@@ -13516,7 +13700,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + }, + { + "default_arg" : true, +@@ -13534,7 +13718,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + }, + { + "default_arg" : true, +@@ -13551,7 +13735,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + }, + { + "referenced_type" : "type-14" +@@ -13567,13 +13751,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + }, + { + "referenced_type" : "type-14" + }, + { +- "referenced_type" : "type-2147" ++ "referenced_type" : "type-2143" + } + ], + "return_type" : "type-77", +@@ -13587,14 +13771,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + }, + { +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "default_arg" : true, +- "referenced_type" : "type-475" ++ "referenced_type" : "type-474" + } + ], + "return_type" : "type-14", +@@ -13620,10 +13804,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + }, + { +- "referenced_type" : "type-3452" ++ "referenced_type" : "type-3446" + } + ], + "return_type" : "type-77", +@@ -13636,7 +13820,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + } + ], + "return_type" : "type-29", +@@ -13649,7 +13833,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + }, + { + "referenced_type" : "type-14" +@@ -13665,10 +13849,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + }, + { +- "referenced_type" : "type-425" ++ "referenced_type" : "type-424" + } + ], + "return_type" : "type-77", +@@ -13681,7 +13865,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + } + ], + "return_type" : "type-336", +@@ -13695,7 +13879,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + } + ], + "return_type" : "type-14", +@@ -13708,7 +13892,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + } + ], + "return_type" : "type-14", +@@ -13722,7 +13906,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + } + ], + "return_type" : "type-77", +@@ -13736,7 +13920,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + }, + { + "referenced_type" : "type-14" +@@ -13751,10 +13935,10 @@ + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-2166" ++ "referenced_type" : "type-2162" + }, + { +- "referenced_type" : "type-475" ++ "referenced_type" : "type-474" + } + ], + "return_type" : "type-14", +@@ -13767,7 +13951,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + }, + { + "referenced_type" : "type-14" +@@ -13783,13 +13967,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + }, + { + "referenced_type" : "type-14" + }, + { +- "referenced_type" : "type-2147" ++ "referenced_type" : "type-2143" + } + ], + "return_type" : "type-14", +@@ -13803,7 +13987,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + } + ], + "return_type" : "type-77", +@@ -13816,7 +14000,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + }, + { + "referenced_type" : "type-336" +@@ -13832,13 +14016,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + }, + { + "referenced_type" : "type-14" + }, + { +- "referenced_type" : "type-2147" ++ "referenced_type" : "type-2143" + } + ], + "return_type" : "type-14", +@@ -13851,7 +14035,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + } + ], + "return_type" : "type-77", +@@ -13877,7 +14061,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + }, + { + "referenced_type" : "type-14" +@@ -13889,7 +14073,7 @@ + { + "function_name" : "android::hardware::IPCThreadState::self", + "linker_set_key" : "_ZN7android8hardware14IPCThreadState4selfEv", +- "return_type" : "type-3446", ++ "return_type" : "type-3440", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13899,10 +14083,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + } + ], +- "return_type" : "type-444", ++ "return_type" : "type-443", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13918,7 +14102,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + }, + { + "referenced_type" : "type-14" +@@ -13927,10 +14111,10 @@ + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-2166" ++ "referenced_type" : "type-2162" + }, + { +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-44" +@@ -13947,10 +14131,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + }, + { +- "referenced_type" : "type-2166" ++ "referenced_type" : "type-2162" + }, + { + "referenced_type" : "type-44" +@@ -13967,7 +14151,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + } + ], + "return_type" : "type-77", +@@ -13981,7 +14165,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + } + ], + "return_type" : "type-77", +@@ -13995,7 +14179,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + } + ], + "return_type" : "type-77", +@@ -14009,7 +14193,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3446" ++ "referenced_type" : "type-3440" + } + ], + "return_type" : "type-77", +@@ -14048,10 +14232,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-3428" ++ "referenced_type" : "type-3422" + }, + { +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { + "referenced_type" : "type-78" +@@ -14066,10 +14250,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + }, + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + } + ], + "return_type" : "type-29", +@@ -14087,7 +14271,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + }, + { + "referenced_type" : "type-29" +@@ -14109,7 +14293,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2315" ++ "referenced_type" : "type-2311" + }, + { + "referenced_type" : "type-14" +@@ -14125,7 +14309,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2315" ++ "referenced_type" : "type-2311" + } + ], + "return_type" : "type-77", +@@ -14135,7 +14319,7 @@ + "access" : "private", + "function_name" : "android::hardware::BufferedTextOutput::getThreadState", + "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv", +- "return_type" : "type-2316", ++ "return_type" : "type-2312", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { +@@ -14158,7 +14342,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2315" ++ "referenced_type" : "type-2311" + }, + { + "referenced_type" : "type-41" +@@ -14177,7 +14361,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2315" ++ "referenced_type" : "type-2311" + } + ], + "return_type" : "type-77", +@@ -14190,7 +14374,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2315" ++ "referenced_type" : "type-2311" + }, + { + "default_arg" : true, +@@ -14207,7 +14391,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2315" ++ "referenced_type" : "type-2311" + } + ], + "return_type" : "type-77", +@@ -14220,7 +14404,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2315" ++ "referenced_type" : "type-2311" + } + ], + "return_type" : "type-77", +@@ -14233,7 +14417,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2315" ++ "referenced_type" : "type-2311" + } + ], + "return_type" : "type-77", +@@ -14276,14 +14460,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-486" ++ "referenced_type" : "type-485" + }, + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + }, + { + "default_arg" : true, +- "referenced_type" : "type-489" ++ "referenced_type" : "type-488" + } + ], + "return_type" : "type-14", +@@ -14296,7 +14480,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-486" ++ "referenced_type" : "type-485" + } + ], + "return_type" : "type-77", +@@ -14309,7 +14493,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-486" ++ "referenced_type" : "type-485" + } + ], + "return_type" : "type-77", +@@ -14318,7 +14502,7 @@ + { + "function_name" : "android::hardware::defaultServiceManager", + "linker_set_key" : "_ZN7android8hardware21defaultServiceManagerEv", +- "return_type" : "type-526", ++ "return_type" : "type-525", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { +@@ -14327,7 +14511,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + }, + { + "referenced_type" : "type-14" +@@ -14495,7 +14679,7 @@ + "referenced_type" : "type-301" + } + ], +- "return_type" : "type-383", ++ "return_type" : "type-382", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -14507,13 +14691,13 @@ + { + "function_name" : "android::hardware::defaultServiceManager1_1", + "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_1Ev", +- "return_type" : "type-531", ++ "return_type" : "type-530", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { + "function_name" : "android::hardware::defaultServiceManager1_2", + "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_2Ev", +- "return_type" : "type-537", ++ "return_type" : "type-535", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { +@@ -14561,7 +14745,7 @@ + "referenced_type" : "type-16" + }, + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + } + ], + "return_type" : "type-77", +@@ -14583,7 +14767,7 @@ + "referenced_type" : "type-16" + }, + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + } + ], + "return_type" : "type-77", +@@ -14607,13 +14791,13 @@ + { + "function_name" : "android::hardware::getPassthroughServiceManager", + "linker_set_key" : "_ZN7android8hardware28getPassthroughServiceManagerEv", +- "return_type" : "type-526", ++ "return_type" : "type-525", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { + "function_name" : "android::hardware::getPassthroughServiceManager1_1", + "linker_set_key" : "_ZN7android8hardware31getPassthroughServiceManager1_1Ev", +- "return_type" : "type-531", ++ "return_type" : "type-530", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { +@@ -14635,7 +14819,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-237" +@@ -14651,7 +14835,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-151" +@@ -14667,7 +14851,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-14" +@@ -14683,7 +14867,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-336" +@@ -14699,7 +14883,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-146" +@@ -14716,7 +14900,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-44" +@@ -14732,7 +14916,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-44" +@@ -14748,7 +14932,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-78" +@@ -14757,7 +14941,7 @@ + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + } + ], + "return_type" : "type-14", +@@ -14770,7 +14954,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-6" +@@ -14786,15 +14970,15 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + } + ], + "return_type" : "type-14", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-3896" ] ++ "template_args" : [ "type-3889" ] + }, + { + "function_name" : "android::hardware::Parcel::writeUint16", +@@ -14803,7 +14987,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-71" +@@ -14819,7 +15003,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-44" +@@ -14835,7 +15019,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-16" +@@ -14852,7 +15036,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-44" +@@ -14868,7 +15052,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-41" +@@ -14884,7 +15068,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-44" +@@ -14901,7 +15085,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-44" +@@ -14918,7 +15102,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-44" +@@ -14934,7 +15118,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-287" +@@ -14953,7 +15137,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-295" +@@ -14969,10 +15153,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { +- "referenced_type" : "type-3576" ++ "referenced_type" : "type-3570" + } + ], + "return_type" : "type-14", +@@ -14985,7 +15169,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-78" +@@ -15005,7 +15189,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + } + ], + "return_type" : "type-77", +@@ -15019,7 +15203,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + } + ], + "return_type" : "type-77", +@@ -15033,7 +15217,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + } + ], + "return_type" : "type-77", +@@ -15046,10 +15230,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + }, + { + "referenced_type" : "type-44" +@@ -15068,7 +15252,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-44" +@@ -15084,10 +15268,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { +- "referenced_type" : "type-3560" ++ "referenced_type" : "type-3554" + } + ], + "return_type" : "type-14", +@@ -15100,10 +15284,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { +- "referenced_type" : "type-694" ++ "referenced_type" : "type-692" + } + ], + "return_type" : "type-14", +@@ -15122,10 +15306,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + } + ], + "return_type" : "type-14", +@@ -15145,22 +15329,22 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { +- "referenced_type" : "type-990" ++ "referenced_type" : "type-987" + }, + { + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-2164" ++ "referenced_type" : "type-2160" + }, + { + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-2162" ++ "referenced_type" : "type-2158" + }, + { + "referenced_type" : "type-188" +@@ -15176,7 +15360,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-78" +@@ -15185,7 +15369,7 @@ + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + }, + { + "referenced_type" : "type-44" +@@ -15204,7 +15388,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-41" +@@ -15220,7 +15404,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + } + ], + "return_type" : "type-77", +@@ -15234,7 +15418,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + } + ], + "return_type" : "type-14", +@@ -15247,10 +15431,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + }, + { + "referenced_type" : "type-44" +@@ -15275,7 +15459,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-11" +@@ -15291,7 +15475,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-11" +@@ -15318,7 +15502,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-11" +@@ -15340,10 +15524,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + }, + { + "referenced_type" : "type-44" +@@ -15362,7 +15546,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-78" +@@ -15381,7 +15565,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-44" +@@ -15400,10 +15584,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { +- "referenced_type" : "type-990" ++ "referenced_type" : "type-987" + }, + { + "referenced_type" : "type-44" +@@ -15419,7 +15603,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + } + ], + "return_type" : "type-77", +@@ -15433,7 +15617,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-44" +@@ -15449,7 +15633,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-14" +@@ -15466,7 +15650,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + } + ], + "return_type" : "type-77", +@@ -15479,7 +15663,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "referenced_type" : "type-29" +@@ -15495,10 +15679,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { +- "referenced_type" : "type-483" ++ "referenced_type" : "type-484" + } + ], + "return_type" : "type-14", +@@ -15511,7 +15695,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + } + ], + "return_type" : "type-77", +@@ -15524,7 +15708,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + } + ], + "return_type" : "type-77", +@@ -15537,7 +15721,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + } + ], + "return_type" : "type-77", +@@ -15550,7 +15734,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + } + ], + "return_type" : "type-77", +@@ -15729,7 +15913,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2296" ++ "referenced_type" : "type-2292" + }, + { + "referenced_type" : "type-78" +@@ -15752,7 +15936,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2296" ++ "referenced_type" : "type-2292" + }, + { + "referenced_type" : "type-78" +@@ -15775,10 +15959,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2141" ++ "referenced_type" : "type-2137" + } + ], +- "return_type" : "type-2144", ++ "return_type" : "type-2140", + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, + { +@@ -15788,10 +15972,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2141" ++ "referenced_type" : "type-2137" + } + ], +- "return_type" : "type-2147", ++ "return_type" : "type-2143", + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, + { +@@ -15801,7 +15985,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2141" ++ "referenced_type" : "type-2137" + } + ], + "return_type" : "type-77", +@@ -15815,7 +15999,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2141" ++ "referenced_type" : "type-2137" + } + ], + "return_type" : "type-77", +@@ -15829,7 +16013,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2141" ++ "referenced_type" : "type-2137" + } + ], + "return_type" : "type-77", +@@ -15843,7 +16027,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2141" ++ "referenced_type" : "type-2137" + } + ], + "return_type" : "type-77", +@@ -15954,9 +16138,9 @@ + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-945", ++ "return_type" : "type-943", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-504", "type-302", "type-830" ] ++ "template_args" : [ "type-503", "type-302", "type-828" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -15973,9 +16157,9 @@ + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-1054", ++ "return_type" : "type-1052", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-495", "type-302", "type-822" ] ++ "template_args" : [ "type-493", "type-302", "type-820" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -15992,9 +16176,9 @@ + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-1111", ++ "return_type" : "type-1109", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-514", "type-302", "type-839" ] ++ "template_args" : [ "type-513", "type-302", "type-837" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16002,7 +16186,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-526" ++ "referenced_type" : "type-525" + }, + { + "referenced_type" : "type-41" +@@ -16011,9 +16195,9 @@ + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-1111", ++ "return_type" : "type-1109", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-514", "type-504", "type-839" ] ++ "template_args" : [ "type-513", "type-503", "type-837" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16030,9 +16214,9 @@ + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-1946", ++ "return_type" : "type-1942", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-498", "type-302", "type-848" ] ++ "template_args" : [ "type-497", "type-302", "type-846" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16049,9 +16233,9 @@ + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-2016", ++ "return_type" : "type-2012", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-517", "type-302", "type-729" ] ++ "template_args" : [ "type-516", "type-302", "type-726" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16059,7 +16243,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-526" ++ "referenced_type" : "type-525" + }, + { + "referenced_type" : "type-41" +@@ -16068,9 +16252,9 @@ + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-2016", ++ "return_type" : "type-2012", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-517", "type-504", "type-729" ] ++ "template_args" : [ "type-516", "type-503", "type-726" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16078,7 +16262,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-531" ++ "referenced_type" : "type-530" + }, + { + "referenced_type" : "type-41" +@@ -16087,9 +16271,9 @@ + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-2016", ++ "return_type" : "type-2012", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-517", "type-514", "type-729" ] ++ "template_args" : [ "type-516", "type-513", "type-726" ] + }, + { + "function_name" : "android::hardware::details::getDescriptor", +@@ -16100,7 +16284,7 @@ + "referenced_type" : "type-301" + } + ], +- "return_type" : "type-1491", ++ "return_type" : "type-1488", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h" + }, + { +@@ -16176,12 +16360,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-542" ++ "referenced_type" : "type-541" + } + ], +- "return_type" : "type-542", ++ "return_type" : "type-541", + "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h", +- "template_args" : [ "type-495", "type-77" ] ++ "template_args" : [ "type-493", "type-77" ] + }, + { + "function_name" : "android::hardware::details::wrapPassthrough", +@@ -16189,12 +16373,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-548" ++ "referenced_type" : "type-546" + } + ], +- "return_type" : "type-548", ++ "return_type" : "type-546", + "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h", +- "template_args" : [ "type-498", "type-77" ] ++ "template_args" : [ "type-497", "type-77" ] + }, + { + "access" : "protected", +@@ -16204,7 +16388,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + }, + { + "referenced_type" : "type-142" +@@ -16221,7 +16405,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + }, + { + "default_arg" : true, +@@ -16239,7 +16423,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + }, + { + "referenced_type" : "type-96" +@@ -16255,7 +16439,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + }, + { + "referenced_type" : "type-35" +@@ -16274,7 +16458,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + }, + { + "referenced_type" : "type-35" +@@ -16293,7 +16477,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + } + ], + "return_type" : "type-77", +@@ -16306,7 +16490,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + } + ], + "return_type" : "type-77", +@@ -16319,7 +16503,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-583" ++ "referenced_type" : "type-582" + } + ], + "return_type" : "type-77", +@@ -16356,10 +16540,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-806" ++ "referenced_type" : "type-804" + }, + { +- "referenced_type" : "type-806" ++ "referenced_type" : "type-804" + } + ], + "return_type" : "type-77", +@@ -16368,7 +16552,7 @@ + { + "function_name" : "android::hardware::details::getVndkVersionStr", + "linker_set_key" : "_ZN7android8hardware7details17getVndkVersionStrEv", +- "return_type" : "type-630", ++ "return_type" : "type-629", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16377,7 +16561,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1009" ++ "referenced_type" : "type-1007" + }, + { + "referenced_type" : "type-29" +@@ -16386,9 +16570,9 @@ + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-526", ++ "return_type" : "type-525", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-830", "type-504", "type-77", "type-77" ] ++ "template_args" : [ "type-828", "type-503", "type-77", "type-77" ] + }, + { + "function_name" : "android::hardware::details::getServiceInternal", +@@ -16396,7 +16580,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1074" ++ "referenced_type" : "type-1072" + }, + { + "referenced_type" : "type-29" +@@ -16405,9 +16589,9 @@ + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-542", ++ "return_type" : "type-541", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-822", "type-495", "type-77", "type-77" ] ++ "template_args" : [ "type-820", "type-493", "type-77", "type-77" ] + }, + { + "function_name" : "android::hardware::details::getServiceInternal", +@@ -16415,7 +16599,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1132" ++ "referenced_type" : "type-1130" + }, + { + "referenced_type" : "type-29" +@@ -16424,9 +16608,9 @@ + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-531", ++ "return_type" : "type-530", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-839", "type-514", "type-77", "type-77" ] ++ "template_args" : [ "type-837", "type-513", "type-77", "type-77" ] + }, + { + "function_name" : "android::hardware::details::getServiceInternal", +@@ -16434,7 +16618,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1969" ++ "referenced_type" : "type-1965" + }, + { + "referenced_type" : "type-29" +@@ -16443,9 +16627,9 @@ + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-548", ++ "return_type" : "type-546", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-848", "type-498", "type-77", "type-77" ] ++ "template_args" : [ "type-846", "type-497", "type-77", "type-77" ] + }, + { + "function_name" : "android::hardware::details::getServiceInternal", +@@ -16453,7 +16637,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2045" ++ "referenced_type" : "type-2041" + }, + { + "referenced_type" : "type-29" +@@ -16462,20 +16646,20 @@ + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-537", ++ "return_type" : "type-535", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-729", "type-517", "type-77", "type-77" ] ++ "template_args" : [ "type-726", "type-516", "type-77", "type-77" ] + }, + { + "function_name" : "android::hardware::details::getBnConstructorMap", + "linker_set_key" : "_ZN7android8hardware7details19getBnConstructorMapEv", +- "return_type" : "type-884", ++ "return_type" : "type-881", + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, + { + "function_name" : "android::hardware::details::getBsConstructorMap", + "linker_set_key" : "_ZN7android8hardware7details19getBsConstructorMapEv", +- "return_type" : "type-885", ++ "return_type" : "type-883", + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, + { +@@ -16484,10 +16668,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-806" ++ "referenced_type" : "type-804" + }, + { +- "referenced_type" : "type-806" ++ "referenced_type" : "type-804" + }, + { + "referenced_type" : "type-29" +@@ -16517,7 +16701,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-806" ++ "referenced_type" : "type-804" + } + ], + "return_type" : "type-77", +@@ -16529,10 +16713,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-412" ++ "referenced_type" : "type-410" + }, + { +- "referenced_type" : "type-806" ++ "referenced_type" : "type-804" + } + ], + "return_type" : "type-14", +@@ -16546,16 +16730,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2144" ++ "referenced_type" : "type-2140" + }, + { + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-2166" ++ "referenced_type" : "type-2162" + }, + { +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "default_arg" : true, +@@ -16563,7 +16747,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-2631" ++ "referenced_type" : "type-2626" + } + ], + "return_type" : "type-14", +@@ -16576,10 +16760,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2144" ++ "referenced_type" : "type-2140" + }, + { +- "referenced_type" : "type-2169" ++ "referenced_type" : "type-2165" + }, + { + "default_arg" : true, +@@ -16600,10 +16784,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2144" ++ "referenced_type" : "type-2140" + } + ], +- "return_type" : "type-2144", ++ "return_type" : "type-2140", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16613,7 +16797,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2144" ++ "referenced_type" : "type-2140" + }, + { + "referenced_type" : "type-78" +@@ -16625,7 +16809,7 @@ + "referenced_type" : "type-188" + }, + { +- "referenced_type" : "type-2157" ++ "referenced_type" : "type-2153" + } + ], + "return_type" : "type-77", +@@ -16638,7 +16822,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2144" ++ "referenced_type" : "type-2140" + }, + { + "referenced_type" : "type-78" +@@ -16654,10 +16838,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2144" ++ "referenced_type" : "type-2140" + }, + { +- "referenced_type" : "type-2171" ++ "referenced_type" : "type-2167" + }, + { + "default_arg" : true, +@@ -16669,7 +16853,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-906" ++ "referenced_type" : "type-904" + } + ], + "return_type" : "type-14", +@@ -16682,226 +16866,1454 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2144" ++ "referenced_type" : "type-2140" ++ } ++ ], ++ "return_type" : "type-29", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::hardware::BHwBinder::setRequestingSid", ++ "linker_set_key" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2140" ++ }, ++ { ++ "referenced_type" : "type-29" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" ++ }, ++ { ++ "access" : "private", ++ "function_name" : "android::hardware::BHwBinder::getOrCreateExtras", ++ "linker_set_key" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2140" ++ } ++ ], ++ "return_type" : "type-2170", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" ++ }, ++ { ++ "function_name" : "android::hardware::BHwBinder::getMinSchedulingPolicy", ++ "linker_set_key" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2140" ++ } ++ ], ++ "return_type" : "type-14", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" ++ }, ++ { ++ "function_name" : "android::hardware::BHwBinder::getMinSchedulingPriority", ++ "linker_set_key" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2140" ++ } ++ ], ++ "return_type" : "type-14", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" ++ }, ++ { ++ "function_name" : "android::hardware::BHwBinder::transact", ++ "linker_set_key" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2140" ++ }, ++ { ++ "referenced_type" : "type-44" ++ }, ++ { ++ "referenced_type" : "type-2162" ++ }, ++ { ++ "referenced_type" : "type-2155" ++ }, ++ { ++ "default_arg" : true, ++ "referenced_type" : "type-44" ++ }, ++ { ++ "default_arg" : true, ++ "referenced_type" : "type-2627" ++ } ++ ], ++ "return_type" : "type-14", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" ++ }, ++ { ++ "function_name" : "android::hardware::BHwBinder::BHwBinder", ++ "linker_set_key" : "_ZN7android8hardware9BHwBinderC1Ev", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2140" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" ++ }, ++ { ++ "function_name" : "android::hardware::BHwBinder::BHwBinder", ++ "linker_set_key" : "_ZN7android8hardware9BHwBinderC2Ev", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2140" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::hardware::BHwBinder::~BHwBinder", ++ "linker_set_key" : "_ZN7android8hardware9BHwBinderD0Ev", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2140" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::hardware::BHwBinder::~BHwBinder", ++ "linker_set_key" : "_ZN7android8hardware9BHwBinderD1Ev", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2140" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::hardware::BHwBinder::~BHwBinder", ++ "linker_set_key" : "_ZN7android8hardware9BHwBinderD2Ev", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2140" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" ++ }, ++ { ++ "function_name" : "android::hardware::operator<<", ++ "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE", ++ "parameters" : ++ [ ++ { ++ "referenced_type" : "type-2281" ++ }, ++ { ++ "referenced_type" : "type-3702" ++ } ++ ], ++ "return_type" : "type-2281", ++ "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" ++ }, ++ { ++ "function_name" : "android::hardware::operator<<", ++ "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE", ++ "parameters" : ++ [ ++ { ++ "referenced_type" : "type-2281" ++ }, ++ { ++ "referenced_type" : "type-3701" ++ } ++ ], ++ "return_type" : "type-2281", ++ "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" ++ }, ++ { ++ "function_name" : "android::hardware::operator<<", ++ "linker_set_key" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_11hidl_stringE", ++ "parameters" : ++ [ ++ { ++ "referenced_type" : "type-58" ++ }, ++ { ++ "referenced_type" : "type-48" ++ } ++ ], ++ "return_type" : "type-58", ++ "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ }, ++ { ++ "function_name" : "android::hardware::operator<<", ++ "linker_set_key" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_6StatusE", ++ "parameters" : ++ [ ++ { ++ "referenced_type" : "type-203" ++ }, ++ { ++ "referenced_type" : "type-108" ++ } ++ ], ++ "return_type" : "type-203", ++ "source_file" : "/system/libhidl/base/include/hidl/Status.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_compare", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_compareEPKvSA_", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3629" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-78" ++ } ++ ], ++ "return_type" : "type-14", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_destroy", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_destroyEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3629" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_construct", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE12do_constructEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3629" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_move_forward", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE15do_move_forwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3629" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_move_backward", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE16do_move_backwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3629" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_copy", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE7do_copyEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3629" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_splat", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE8do_splatEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3629" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_compare", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_compareES3_S3_", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2216" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-78" ++ } ++ ], ++ "return_type" : "type-14", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_destroy", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_destroyEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2216" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_construct", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE12do_constructEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2216" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_move_forward", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE15do_move_forwardEPvS3_j", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2216" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_move_backward", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE16do_move_backwardEPvS3_j", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2216" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_copy", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE7do_copyEPvS3_j", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2216" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_splat", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE8do_splatEPvS3_j", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2216" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE10do_destroyEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2327" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE12do_constructEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2327" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2327" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2327" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2327" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2327" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE10do_destroyEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2221" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE12do_constructEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2221" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE15do_move_forwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2221" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE16do_move_backwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2221" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE7do_copyEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2221" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE8do_splatEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2221" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE10do_destroyEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3633" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE12do_constructEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3633" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE15do_move_forwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3633" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE16do_move_backwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3633" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE7do_copyEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3633" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE8do_splatEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3633" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" + } + ], +- "return_type" : "type-29", +- "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { + "access" : "protected", +- "function_name" : "android::hardware::BHwBinder::setRequestingSid", +- "linker_set_key" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2144" ++ "referenced_type" : "type-3429" + }, + { +- "referenced_type" : "type-29" ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-44" + } + ], + "return_type" : "type-77", +- "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "access" : "private", +- "function_name" : "android::hardware::BHwBinder::getOrCreateExtras", +- "linker_set_key" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2144" ++ "referenced_type" : "type-3429" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-44" + } + ], +- "return_type" : "type-2174", +- "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::BHwBinder::getMinSchedulingPolicy", +- "linker_set_key" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2144" ++ "referenced_type" : "type-3429" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" + } + ], +- "return_type" : "type-14", +- "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::BHwBinder::getMinSchedulingPriority", +- "linker_set_key" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2144" ++ "referenced_type" : "type-3429" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" + } + ], +- "return_type" : "type-14", +- "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::BHwBinder::transact", +- "linker_set_key" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2144" ++ "referenced_type" : "type-3429" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" + }, + { + "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3429" + }, + { +- "referenced_type" : "type-2166" ++ "referenced_type" : "type-188" + }, + { +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-78" + }, + { +- "default_arg" : true, + "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3433" + }, + { +- "default_arg" : true, +- "referenced_type" : "type-2632" ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-44" + } + ], +- "return_type" : "type-14", +- "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::BHwBinder::BHwBinder", +- "linker_set_key" : "_ZN7android8hardware9BHwBinderC1Ev", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2144" ++ "referenced_type" : "type-3433" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-44" + } + ], + "return_type" : "type-77", +- "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::BHwBinder::BHwBinder", +- "linker_set_key" : "_ZN7android8hardware9BHwBinderC2Ev", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3433" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2144" ++ "referenced_type" : "type-3433" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" + } + ], + "return_type" : "type-77", +- "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { + "access" : "protected", +- "function_name" : "android::hardware::BHwBinder::~BHwBinder", +- "linker_set_key" : "_ZN7android8hardware9BHwBinderD0Ev", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2144" ++ "referenced_type" : "type-3433" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" + } + ], + "return_type" : "type-77", +- "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { + "access" : "protected", +- "function_name" : "android::hardware::BHwBinder::~BHwBinder", +- "linker_set_key" : "_ZN7android8hardware9BHwBinderD1Ev", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2144" ++ "referenced_type" : "type-3433" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" + } + ], + "return_type" : "type-77", +- "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { + "access" : "protected", +- "function_name" : "android::hardware::BHwBinder::~BHwBinder", +- "linker_set_key" : "_ZN7android8hardware9BHwBinderD2Ev", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE10do_destroyEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2144" ++ "referenced_type" : "type-3425" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-44" + } + ], + "return_type" : "type-77", +- "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::operator<<", +- "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE12do_constructEPvj", + "parameters" : + [ + { +- "referenced_type" : "type-2285" ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3425" ++ }, ++ { ++ "referenced_type" : "type-188" + }, + { +- "referenced_type" : "type-3710" ++ "referenced_type" : "type-44" + } + ], +- "return_type" : "type-2285", +- "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::operator<<", +- "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE15do_move_forwardEPvPKvj", + "parameters" : + [ + { +- "referenced_type" : "type-2285" ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3425" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" + }, + { +- "referenced_type" : "type-3707" ++ "referenced_type" : "type-44" + } + ], +- "return_type" : "type-2285", +- "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::operator<<", +- "linker_set_key" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_11hidl_stringE", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE16do_move_backwardEPvPKvj", + "parameters" : + [ + { +- "referenced_type" : "type-58" ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3425" + }, + { +- "referenced_type" : "type-48" ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" + } + ], +- "return_type" : "type-58", +- "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::operator<<", +- "linker_set_key" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_6StatusE", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE7do_copyEPvPKvj", + "parameters" : + [ + { +- "referenced_type" : "type-203" ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3425" + }, + { +- "referenced_type" : "type-108" ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" + } + ], +- "return_type" : "type-203", +- "source_file" : "/system/libhidl/base/include/hidl/Status.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE8do_splatEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3425" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorIiE10do_destroyEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2320" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorIiE12do_constructEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2320" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2320" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2320" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorIiE7do_copyEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2320" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorIiE8do_splatEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2320" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-44" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { + "function_name" : "android::hardware::BpHwBinder::findObject", +@@ -16910,7 +18322,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2184" ++ "referenced_type" : "type-2180" + }, + { + "referenced_type" : "type-78" +@@ -16926,7 +18338,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2237" ++ "referenced_type" : "type-2233" + }, + { + "referenced_type" : "type-78" +@@ -17023,7 +18435,7 @@ + "referenced_type" : "type-56" + } + ], +- "return_type" : "type-643", ++ "return_type" : "type-642", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -17033,7 +18445,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3657" ++ "referenced_type" : "type-3651" + } + ], + "return_type" : "type-29", +@@ -17046,7 +18458,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + } + ], + "return_type" : "type-14", +@@ -17059,7 +18471,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + } + ], + "return_type" : "type-41", +@@ -17072,7 +18484,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + } + ], + "return_type" : "type-44", +@@ -17085,7 +18497,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + } + ], + "return_type" : "type-29", +@@ -17098,7 +18510,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + } + ], + "return_type" : "type-14", +@@ -17111,7 +18523,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + } + ], + "return_type" : "type-14", +@@ -17125,10 +18537,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2319" ++ "referenced_type" : "type-2315" + } + ], +- "return_type" : "type-2280", ++ "return_type" : "type-2276", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { +@@ -17139,7 +18551,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + } + ], + "return_type" : "type-77", +@@ -17152,7 +18564,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + } + ], + "return_type" : "type-14", +@@ -17165,7 +18577,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { + "referenced_type" : "type-78" +@@ -17174,13 +18586,13 @@ + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-3588" ++ "referenced_type" : "type-3582" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + } + ], + "return_type" : "type-14", +@@ -17194,7 +18606,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + } + ], + "return_type" : "type-44", +@@ -17207,16 +18619,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + }, + { +- "referenced_type" : "type-3592" ++ "referenced_type" : "type-3586" + } + ], + "return_type" : "type-14", +@@ -17230,13 +18642,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + }, + { + "referenced_type" : "type-44" +@@ -17248,7 +18660,7 @@ + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-3592" ++ "referenced_type" : "type-3586" + } + ], + "return_type" : "type-14", +@@ -17261,10 +18673,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { +- "referenced_type" : "type-3587" ++ "referenced_type" : "type-3580" + } + ], + "return_type" : "type-14", +@@ -17277,7 +18689,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + } + ], + "return_type" : "type-6", +@@ -17290,16 +18702,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { + "default_arg" : true, +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + } + ], +- "return_type" : "type-3591", ++ "return_type" : "type-3585", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-3897" ] ++ "template_args" : [ "type-3890" ] + }, + { + "function_name" : "android::hardware::Parcel::readUint16", +@@ -17308,10 +18720,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { +- "referenced_type" : "type-3582" ++ "referenced_type" : "type-3576" + } + ], + "return_type" : "type-14", +@@ -17324,10 +18736,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + } + ], + "return_type" : "type-14", +@@ -17340,7 +18752,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + } + ], + "return_type" : "type-44", +@@ -17353,10 +18765,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { +- "referenced_type" : "type-3584" ++ "referenced_type" : "type-3578" + } + ], + "return_type" : "type-14", +@@ -17369,7 +18781,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + } + ], + "return_type" : "type-16", +@@ -17383,7 +18795,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + } + ], + "return_type" : "type-77", +@@ -17397,7 +18809,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + } + ], + "return_type" : "type-44", +@@ -17410,7 +18822,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + } + ], + "return_type" : "type-41", +@@ -17423,7 +18835,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { + "referenced_type" : "type-44" +@@ -17440,10 +18852,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + } + ], + "return_type" : "type-14", +@@ -17457,7 +18869,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + } + ], + "return_type" : "type-44", +@@ -17471,7 +18883,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + } + ], + "return_type" : "type-77", +@@ -17484,7 +18896,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + } + ], + "return_type" : "type-44", +@@ -17497,7 +18909,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + } + ], + "return_type" : "type-44", +@@ -17510,7 +18922,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + } + ], + "return_type" : "type-44", +@@ -17523,7 +18935,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { + "referenced_type" : "type-297" +@@ -17539,10 +18951,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { +- "referenced_type" : "type-3589" ++ "referenced_type" : "type-3583" + } + ], + "return_type" : "type-14", +@@ -17555,7 +18967,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + } + ], + "return_type" : "type-286", +@@ -17569,7 +18981,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + } + ], + "return_type" : "type-44", +@@ -17582,16 +18994,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { +- "referenced_type" : "type-3592" ++ "referenced_type" : "type-3586" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + }, + { +- "referenced_type" : "type-3588" ++ "referenced_type" : "type-3582" + } + ], + "return_type" : "type-14", +@@ -17604,10 +19016,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + } + ], +- "return_type" : "type-2193", ++ "return_type" : "type-2189", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17618,7 +19030,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + } + ], + "return_type" : "type-44", +@@ -17631,13 +19043,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { + "referenced_type" : "type-78" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + } + ], + "return_type" : "type-14", +@@ -17650,7 +19062,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { + "referenced_type" : "type-44" +@@ -17666,7 +19078,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { + "referenced_type" : "type-41" +@@ -17682,10 +19094,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { +- "referenced_type" : "type-435" ++ "referenced_type" : "type-434" + } + ], + "return_type" : "type-14", +@@ -17698,10 +19110,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + } + ], +- "return_type" : "type-383", ++ "return_type" : "type-382", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17711,13 +19123,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + }, + { + "referenced_type" : "type-44" +@@ -17726,7 +19138,7 @@ + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-3592" ++ "referenced_type" : "type-3586" + } + ], + "return_type" : "type-14", +@@ -17739,16 +19151,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + }, + { +- "referenced_type" : "type-3592" ++ "referenced_type" : "type-3586" + } + ], + "return_type" : "type-14", +@@ -17762,10 +19174,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { +- "referenced_type" : "type-3596" ++ "referenced_type" : "type-3590" + }, + { + "referenced_type" : "type-44" +@@ -17790,10 +19202,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + } + ], + "return_type" : "type-287", +@@ -17807,7 +19219,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { + "referenced_type" : "type-44" +@@ -17827,7 +19239,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { + "referenced_type" : "type-44" +@@ -17846,13 +19258,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { +- "referenced_type" : "type-3592" ++ "referenced_type" : "type-3586" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + }, + { + "referenced_type" : "type-44" +@@ -17861,7 +19273,7 @@ + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-3588" ++ "referenced_type" : "type-3582" + } + ], + "return_type" : "type-14", +@@ -17874,10 +19286,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { +- "referenced_type" : "type-3593" ++ "referenced_type" : "type-3587" + } + ], + "return_type" : "type-14", +@@ -17890,7 +19302,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { + "referenced_type" : "type-44" +@@ -17899,7 +19311,7 @@ + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-3593" ++ "referenced_type" : "type-3587" + } + ], + "return_type" : "type-14", +@@ -17912,10 +19324,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { +- "referenced_type" : "type-435" ++ "referenced_type" : "type-434" + } + ], + "return_type" : "type-14", +@@ -17928,13 +19340,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + }, + { + "referenced_type" : "type-44" +@@ -17943,7 +19355,7 @@ + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-3592" ++ "referenced_type" : "type-3586" + } + ], + "return_type" : "type-14", +@@ -17956,10 +19368,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { +- "referenced_type" : "type-3593" ++ "referenced_type" : "type-3587" + } + ], + "return_type" : "type-14", +@@ -17973,10 +19385,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { +- "referenced_type" : "type-3593" ++ "referenced_type" : "type-3587" + }, + { + "referenced_type" : "type-29" +@@ -18000,7 +19412,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { + "referenced_type" : "type-44" +@@ -18009,7 +19421,7 @@ + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-3593" ++ "referenced_type" : "type-3587" + } + ], + "return_type" : "type-14", +@@ -18022,10 +19434,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + } + ], +- "return_type" : "type-990", ++ "return_type" : "type-987", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -18035,7 +19447,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { + "referenced_type" : "type-188" +@@ -18054,10 +19466,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { +- "referenced_type" : "type-2285" ++ "referenced_type" : "type-2281" + }, + { + "default_arg" : true, +@@ -18075,7 +19487,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + } + ], + "return_type" : "type-44", +@@ -18089,10 +19501,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + } + ], +- "return_type" : "type-2164", ++ "return_type" : "type-2160", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -18102,7 +19514,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + } + ], + "return_type" : "type-44", +@@ -18115,10 +19527,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { +- "referenced_type" : "type-3588" ++ "referenced_type" : "type-3582" + } + ], + "return_type" : "type-14", +@@ -18131,7 +19543,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + } + ], + "return_type" : "type-29", +@@ -18144,10 +19556,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { +- "referenced_type" : "type-3580" ++ "referenced_type" : "type-3574" + } + ], + "return_type" : "type-14", +@@ -18160,7 +19572,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + } + ], + "return_type" : "type-44", +@@ -18173,10 +19585,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { +- "referenced_type" : "type-3586" ++ "referenced_type" : "type-3579" + } + ], + "return_type" : "type-14", +@@ -18189,7 +19601,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + } + ], + "return_type" : "type-237", +@@ -18202,10 +19614,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { +- "referenced_type" : "type-3581" ++ "referenced_type" : "type-3575" + } + ], + "return_type" : "type-14", +@@ -18218,10 +19630,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { +- "referenced_type" : "type-475" ++ "referenced_type" : "type-474" + } + ], + "return_type" : "type-14", +@@ -18234,7 +19646,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + } + ], + "return_type" : "type-14", +@@ -18247,10 +19659,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { +- "referenced_type" : "type-3583" ++ "referenced_type" : "type-3577" + } + ], + "return_type" : "type-14", +@@ -18263,7 +19675,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + } + ], + "return_type" : "type-336", +@@ -18276,7 +19688,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3573" ++ "referenced_type" : "type-3567" + }, + { + "referenced_type" : "type-230" +@@ -18295,7 +19707,7 @@ + "referenced_type" : "type-111" + } + ], +- "return_type" : "type-644", ++ "return_type" : "type-643", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -18305,7 +19717,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2143" ++ "referenced_type" : "type-2139" + }, + { + "referenced_type" : "type-78" +@@ -18334,7 +19746,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2173" ++ "referenced_type" : "type-2169" + }, + { + "referenced_type" : "type-78" +@@ -18351,7 +19763,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2147" ++ "referenced_type" : "type-2143" + } + ], + "return_type" : "type-77", +@@ -18365,7 +19777,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2180" ++ "referenced_type" : "type-2176" + } + ], + "return_type" : "type-77", +@@ -18379,7 +19791,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2147" ++ "referenced_type" : "type-2143" + }, + { + "referenced_type" : "type-78" +@@ -18396,7 +19808,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2180" ++ "referenced_type" : "type-2176" + }, + { + "referenced_type" : "type-78" +@@ -18413,7 +19825,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2147" ++ "referenced_type" : "type-2143" + }, + { + "referenced_type" : "type-44" +@@ -18433,7 +19845,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2180" ++ "referenced_type" : "type-2176" + }, + { + "referenced_type" : "type-44" +@@ -18454,7 +19866,7 @@ + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + } + ], + "return_type" : "type-14", +@@ -18492,7 +19904,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-3396" ++ "referenced_type" : "type-3390" + }, + { + "default_arg" : true, +@@ -18512,7 +19924,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-3396" ++ "referenced_type" : "type-3390" + }, + { + "default_arg" : true, +@@ -18600,55 +20012,55 @@ + { + "linker_set_key" : "_ZN7android8hardware12gTextBuffersE", + "name" : "android::hardware::gTextBuffers", +- "referenced_type" : "type-2322", ++ "referenced_type" : "type-2318", + "source_file" : "/system/libhwbinder/include/hwbinder/Static.h" + }, + { + "linker_set_key" : "_ZN7android8hardware13gProcessMutexE", + "name" : "android::hardware::gProcessMutex", +- "referenced_type" : "type-393", ++ "referenced_type" : "type-392", + "source_file" : "/system/libhwbinder/include/hwbinder/Static.h" + }, + { + "linker_set_key" : "_ZN7android8hardware4aerrE", + "name" : "android::hardware::aerr", +- "referenced_type" : "type-2285", ++ "referenced_type" : "type-2281", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { + "linker_set_key" : "_ZN7android8hardware4alogE", + "name" : "android::hardware::alog", +- "referenced_type" : "type-2285", ++ "referenced_type" : "type-2281", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { + "linker_set_key" : "_ZN7android8hardware4aoutE", + "name" : "android::hardware::aout", +- "referenced_type" : "type-2285", ++ "referenced_type" : "type-2281", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { + "linker_set_key" : "_ZN7android8hardware7details14gServiceSidMapE", + "name" : "android::hardware::details::gServiceSidMap", +- "referenced_type" : "type-646", ++ "referenced_type" : "type-645", + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, + { + "linker_set_key" : "_ZN7android8hardware7details15gServicePrioMapE", + "name" : "android::hardware::details::gServicePrioMap", +- "referenced_type" : "type-647", ++ "referenced_type" : "type-646", + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, + { + "linker_set_key" : "_ZN7android8hardware7details6gBnMapE", + "name" : "android::hardware::details::gBnMap", +- "referenced_type" : "type-361", ++ "referenced_type" : "type-360", + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, + { + "linker_set_key" : "_ZN7android8hardware8gProcessE", + "name" : "android::hardware::gProcess", +- "referenced_type" : "type-2633", ++ "referenced_type" : "type-2628", + "source_file" : "/system/libhwbinder/include/hwbinder/Static.h" + } + ], +@@ -18658,8 +20070,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Mutex &", + "name" : "android::Mutex &", +- "referenced_type" : "type-388", +- "self_type" : "type-393", ++ "referenced_type" : "type-387", ++ "self_type" : "type-392", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Mutex.h" + }, +@@ -18667,8 +20079,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RWLock &", + "name" : "android::RWLock &", +- "referenced_type" : "type-399", +- "self_type" : "type-404", ++ "referenced_type" : "type-398", ++ "self_type" : "type-403", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RWLock.h" + }, +@@ -18676,8 +20088,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase *const &", + "name" : "android::RefBase *const &", +- "referenced_type" : "type-3417", +- "self_type" : "type-3440", ++ "referenced_type" : "type-3411", ++ "self_type" : "type-3434", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -18685,8 +20097,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_type *const &", + "name" : "android::RefBase::weakref_type *const &", +- "referenced_type" : "type-3415", +- "self_type" : "type-3436", ++ "referenced_type" : "type-3409", ++ "self_type" : "type-3430", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -18712,8 +20124,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *const &", + "name" : "android::hardware::BHwBinder *const &", +- "referenced_type" : "type-3413", +- "self_type" : "type-3432", ++ "referenced_type" : "type-3407", ++ "self_type" : "type-3426", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -18721,8 +20133,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ConcurrentMap, android::hardware::details::SchedPrio> &", + "name" : "android::hardware::ConcurrentMap, android::hardware::details::SchedPrio> &", +- "referenced_type" : "type-664", +- "self_type" : "type-676", ++ "referenced_type" : "type-663", ++ "self_type" : "type-674", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -18730,8 +20142,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ConcurrentMap, bool> &", + "name" : "android::hardware::ConcurrentMap, bool> &", +- "referenced_type" : "type-670", +- "self_type" : "type-679", ++ "referenced_type" : "type-668", ++ "self_type" : "type-677", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -18739,8 +20151,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > &", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > &", +- "referenced_type" : "type-587", +- "self_type" : "type-885", ++ "referenced_type" : "type-586", ++ "self_type" : "type-883", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, +@@ -18748,8 +20160,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > &", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > &", +- "referenced_type" : "type-347", +- "self_type" : "type-884", ++ "referenced_type" : "type-346", ++ "self_type" : "type-881", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, +@@ -18757,8 +20169,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::HexDump &", + "name" : "android::hardware::HexDump &", +- "referenced_type" : "type-2295", +- "self_type" : "type-2297", ++ "referenced_type" : "type-2291", ++ "self_type" : "type-2293", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -18766,8 +20178,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel &", + "name" : "android::hardware::Parcel &", +- "referenced_type" : "type-1222", +- "self_type" : "type-1221", ++ "referenced_type" : "type-1220", ++ "self_type" : "type-1219", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -18775,8 +20187,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel &", + "name" : "android::hardware::Parcel &", +- "referenced_type" : "type-2369", +- "self_type" : "type-2368", ++ "referenced_type" : "type-2365", ++ "self_type" : "type-2364", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -18793,8 +20205,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel &", + "name" : "android::hardware::Parcel &", +- "referenced_type" : "type-3694", +- "self_type" : "type-3693", ++ "referenced_type" : "type-3688", ++ "self_type" : "type-3687", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -18802,8 +20214,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState::handle_entry &", + "name" : "android::hardware::ProcessState::handle_entry &", +- "referenced_type" : "type-2227", +- "self_type" : "type-3640", ++ "referenced_type" : "type-2223", ++ "self_type" : "type-3634", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -18811,8 +20223,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return &", + "name" : "android::hardware::Return &", +- "referenced_type" : "type-765", +- "self_type" : "type-768", ++ "referenced_type" : "type-763", ++ "self_type" : "type-766", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18820,8 +20232,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-758", +- "self_type" : "type-762", ++ "referenced_type" : "type-756", ++ "self_type" : "type-759", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18829,8 +20241,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-945", +- "self_type" : "type-948", ++ "referenced_type" : "type-943", ++ "self_type" : "type-946", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18838,8 +20250,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-1054", +- "self_type" : "type-1057", ++ "referenced_type" : "type-1052", ++ "self_type" : "type-1055", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18847,8 +20259,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-1111", +- "self_type" : "type-1114", ++ "referenced_type" : "type-1109", ++ "self_type" : "type-1112", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18856,8 +20268,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-1946", +- "self_type" : "type-1949", ++ "referenced_type" : "type-1942", ++ "self_type" : "type-1945", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18865,8 +20277,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-2016", +- "self_type" : "type-2019", ++ "referenced_type" : "type-2012", ++ "self_type" : "type-2015", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18901,8 +20313,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-2189", +- "self_type" : "type-2188", ++ "referenced_type" : "type-2185", ++ "self_type" : "type-2184", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -18910,8 +20322,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-2239", +- "self_type" : "type-2238", ++ "referenced_type" : "type-2235", ++ "self_type" : "type-2234", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -18919,8 +20331,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-2283", +- "self_type" : "type-2285", ++ "referenced_type" : "type-2279", ++ "self_type" : "type-2281", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -18928,8 +20340,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-3301", +- "self_type" : "type-3300", ++ "referenced_type" : "type-3295", ++ "self_type" : "type-3294", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -18937,8 +20349,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-3342", +- "self_type" : "type-3341", ++ "referenced_type" : "type-3336", ++ "self_type" : "type-3335", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -18946,8 +20358,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-3653", +- "self_type" : "type-3652", ++ "referenced_type" : "type-3647", ++ "self_type" : "type-3646", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -18955,8 +20367,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer > &", + "name" : "android::hardware::details::hidl_pointer > &", +- "referenced_type" : "type-969", +- "self_type" : "type-1036", ++ "referenced_type" : "type-967", ++ "self_type" : "type-1034", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -18964,8 +20376,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer &", + "name" : "android::hardware::details::hidl_pointer &", +- "referenced_type" : "type-571", +- "self_type" : "type-1032", ++ "referenced_type" : "type-570", ++ "self_type" : "type-1030", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -18973,8 +20385,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer &", + "name" : "android::hardware::details::hidl_pointer &", +- "referenced_type" : "type-793", +- "self_type" : "type-809", ++ "referenced_type" : "type-791", ++ "self_type" : "type-807", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -18992,7 +20404,7 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer &", + "name" : "android::hardware::details::hidl_pointer &", + "referenced_type" : "type-9", +- "self_type" : "type-584", ++ "self_type" : "type-585", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19000,8 +20412,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer &", + "name" : "android::hardware::details::hidl_pointer &", +- "referenced_type" : "type-473", +- "self_type" : "type-780", ++ "referenced_type" : "type-472", ++ "self_type" : "type-778", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19018,8 +20430,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_array &", + "name" : "android::hardware::hidl_array &", +- "referenced_type" : "type-972", +- "self_type" : "type-1039", ++ "referenced_type" : "type-970", ++ "self_type" : "type-1037", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19054,8 +20466,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec > &", + "name" : "android::hardware::hidl_vec > &", +- "referenced_type" : "type-968", +- "self_type" : "type-977", ++ "referenced_type" : "type-966", ++ "self_type" : "type-975", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19063,8 +20475,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec &", + "name" : "android::hardware::hidl_vec &", +- "referenced_type" : "type-570", +- "self_type" : "type-967", ++ "referenced_type" : "type-569", ++ "self_type" : "type-965", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19072,8 +20484,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec::iter &", + "name" : "android::hardware::hidl_vec::iter &", +- "referenced_type" : "type-575", +- "self_type" : "type-579", ++ "referenced_type" : "type-574", ++ "self_type" : "type-578", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19081,8 +20493,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec &", + "name" : "android::hardware::hidl_vec &", +- "referenced_type" : "type-472", +- "self_type" : "type-786", ++ "referenced_type" : "type-471", ++ "self_type" : "type-784", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19090,8 +20502,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &", + "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &", +- "referenced_type" : "type-502", +- "self_type" : "type-819", ++ "referenced_type" : "type-501", ++ "self_type" : "type-816", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19099,8 +20511,8 @@ + "alignment" : 4, + "linker_set_key" : "android::key_value_pair_t > &", + "name" : "android::key_value_pair_t > &", +- "referenced_type" : "type-3615", +- "self_type" : "type-3626", ++ "referenced_type" : "type-3609", ++ "self_type" : "type-3620", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -19108,8 +20520,8 @@ + "alignment" : 4, + "linker_set_key" : "android::key_value_pair_t &", + "name" : "android::key_value_pair_t &", +- "referenced_type" : "type-2195", +- "self_type" : "type-2208", ++ "referenced_type" : "type-2191", ++ "self_type" : "type-2204", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -19117,8 +20529,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-425", +- "self_type" : "type-3442", ++ "referenced_type" : "type-424", ++ "self_type" : "type-3436", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19126,8 +20538,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-2279", +- "self_type" : "type-2307", ++ "referenced_type" : "type-2275", ++ "self_type" : "type-2303", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19135,8 +20547,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-383", +- "self_type" : "type-438", ++ "referenced_type" : "type-382", ++ "self_type" : "type-437", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19144,8 +20556,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-444", +- "self_type" : "type-3651", ++ "referenced_type" : "type-443", ++ "self_type" : "type-3643", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19153,8 +20565,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-744", +- "self_type" : "type-747", ++ "referenced_type" : "type-742", ++ "self_type" : "type-745", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19162,8 +20574,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-908", +- "self_type" : "type-943", ++ "referenced_type" : "type-906", ++ "self_type" : "type-941", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19172,7 +20584,7 @@ + "linker_set_key" : "android::sp &", + "name" : "android::sp &", + "referenced_type" : "type-300", +- "self_type" : "type-612", ++ "self_type" : "type-611", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19180,8 +20592,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-526", +- "self_type" : "type-936", ++ "referenced_type" : "type-525", ++ "self_type" : "type-934", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19189,8 +20601,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-542", +- "self_type" : "type-939", ++ "referenced_type" : "type-541", ++ "self_type" : "type-937", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19198,8 +20610,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-531", +- "self_type" : "type-726", ++ "referenced_type" : "type-530", ++ "self_type" : "type-724", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19207,8 +20619,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-548", +- "self_type" : "type-1944", ++ "referenced_type" : "type-546", ++ "self_type" : "type-1940", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19216,8 +20628,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-537", +- "self_type" : "type-734", ++ "referenced_type" : "type-535", ++ "self_type" : "type-732", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19226,7 +20638,7 @@ + "linker_set_key" : "android::wp &", + "name" : "android::wp &", + "referenced_type" : "type-331", +- "self_type" : "type-424", ++ "self_type" : "type-423", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -19234,8 +20646,8 @@ + "alignment" : 4, + "linker_set_key" : "android::wp &", + "name" : "android::wp &", +- "referenced_type" : "type-901", +- "self_type" : "type-2215", ++ "referenced_type" : "type-899", ++ "self_type" : "type-2211", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -19243,8 +20655,8 @@ + "alignment" : 4, + "linker_set_key" : "android::wp &", + "name" : "android::wp &", +- "referenced_type" : "type-2193", +- "self_type" : "type-3564", ++ "referenced_type" : "type-2189", ++ "self_type" : "type-3558", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -19253,7 +20665,7 @@ + "linker_set_key" : "android::wp &", + "name" : "android::wp &", + "referenced_type" : "type-309", +- "self_type" : "type-413", ++ "self_type" : "type-412", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -19261,8 +20673,8 @@ + "alignment" : 4, + "linker_set_key" : "char *const &", + "name" : "char *const &", +- "referenced_type" : "type-3599", +- "self_type" : "type-3600", ++ "referenced_type" : "type-3593", ++ "self_type" : "type-3594", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19270,8 +20682,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[10]", + "name" : "char const (&)[10]", +- "referenced_type" : "type-3463", +- "self_type" : "type-3466", ++ "referenced_type" : "type-3457", ++ "self_type" : "type-3459", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19279,8 +20691,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[11]", + "name" : "char const (&)[11]", +- "referenced_type" : "type-3489", +- "self_type" : "type-3491", ++ "referenced_type" : "type-3481", ++ "self_type" : "type-3485", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19288,8 +20700,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[12]", + "name" : "char const (&)[12]", +- "referenced_type" : "type-3460", +- "self_type" : "type-3462", ++ "referenced_type" : "type-3454", ++ "self_type" : "type-3456", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19297,8 +20709,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[13]", + "name" : "char const (&)[13]", +- "referenced_type" : "type-3456", +- "self_type" : "type-3459", ++ "referenced_type" : "type-3450", ++ "self_type" : "type-3453", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19306,8 +20718,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[14]", + "name" : "char const (&)[14]", +- "referenced_type" : "type-3507", +- "self_type" : "type-3509", ++ "referenced_type" : "type-3501", ++ "self_type" : "type-3503", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19315,8 +20727,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[15]", + "name" : "char const (&)[15]", +- "referenced_type" : "type-3605", +- "self_type" : "type-3607", ++ "referenced_type" : "type-3599", ++ "self_type" : "type-3601", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19324,8 +20736,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[16]", + "name" : "char const (&)[16]", +- "referenced_type" : "type-3492", +- "self_type" : "type-3493", ++ "referenced_type" : "type-3486", ++ "self_type" : "type-3487", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19333,8 +20745,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[17]", + "name" : "char const (&)[17]", +- "referenced_type" : "type-3510", +- "self_type" : "type-3512", ++ "referenced_type" : "type-3504", ++ "self_type" : "type-3506", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19342,8 +20754,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[18]", + "name" : "char const (&)[18]", +- "referenced_type" : "type-3495", +- "self_type" : "type-3497", ++ "referenced_type" : "type-3489", ++ "self_type" : "type-3491", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19351,8 +20763,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[19]", + "name" : "char const (&)[19]", +- "referenced_type" : "type-3526", +- "self_type" : "type-3528", ++ "referenced_type" : "type-3520", ++ "self_type" : "type-3522", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19360,8 +20772,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[20]", + "name" : "char const (&)[20]", +- "referenced_type" : "type-3504", +- "self_type" : "type-3506", ++ "referenced_type" : "type-3498", ++ "self_type" : "type-3500", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19369,8 +20781,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[22]", + "name" : "char const (&)[22]", +- "referenced_type" : "type-3529", +- "self_type" : "type-3531", ++ "referenced_type" : "type-3523", ++ "self_type" : "type-3525", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19378,8 +20790,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[25]", + "name" : "char const (&)[25]", +- "referenced_type" : "type-3519", +- "self_type" : "type-3521", ++ "referenced_type" : "type-3513", ++ "self_type" : "type-3515", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19387,8 +20799,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[28]", + "name" : "char const (&)[28]", +- "referenced_type" : "type-3540", +- "self_type" : "type-3542", ++ "referenced_type" : "type-3534", ++ "self_type" : "type-3536", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19396,8 +20808,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[29]", + "name" : "char const (&)[29]", +- "referenced_type" : "type-3516", +- "self_type" : "type-3518", ++ "referenced_type" : "type-3510", ++ "self_type" : "type-3512", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19405,8 +20817,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[2]", + "name" : "char const (&)[2]", +- "referenced_type" : "type-3467", +- "self_type" : "type-3469", ++ "referenced_type" : "type-3461", ++ "self_type" : "type-3463", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19414,8 +20826,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[31]", + "name" : "char const (&)[31]", +- "referenced_type" : "type-3501", +- "self_type" : "type-3503", ++ "referenced_type" : "type-3495", ++ "self_type" : "type-3497", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19423,8 +20835,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[32]", + "name" : "char const (&)[32]", +- "referenced_type" : "type-3532", +- "self_type" : "type-3534", ++ "referenced_type" : "type-3526", ++ "self_type" : "type-3528", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19432,8 +20844,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[35]", + "name" : "char const (&)[35]", +- "referenced_type" : "type-3522", +- "self_type" : "type-3524", ++ "referenced_type" : "type-3516", ++ "self_type" : "type-3518", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19441,8 +20853,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[37]", + "name" : "char const (&)[37]", +- "referenced_type" : "type-3513", +- "self_type" : "type-3515", ++ "referenced_type" : "type-3507", ++ "self_type" : "type-3509", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19450,8 +20862,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[3]", + "name" : "char const (&)[3]", +- "referenced_type" : "type-3480", +- "self_type" : "type-3483", ++ "referenced_type" : "type-3474", ++ "self_type" : "type-3477", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19459,8 +20871,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[4]", + "name" : "char const (&)[4]", +- "referenced_type" : "type-3602", +- "self_type" : "type-3604", ++ "referenced_type" : "type-3596", ++ "self_type" : "type-3598", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19468,8 +20880,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[5]", + "name" : "char const (&)[5]", +- "referenced_type" : "type-3608", +- "self_type" : "type-3610", ++ "referenced_type" : "type-3602", ++ "self_type" : "type-3604", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19477,8 +20889,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[6]", + "name" : "char const (&)[6]", +- "referenced_type" : "type-3471", +- "self_type" : "type-3473", ++ "referenced_type" : "type-3465", ++ "self_type" : "type-3467", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19486,8 +20898,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[7]", + "name" : "char const (&)[7]", +- "referenced_type" : "type-3498", +- "self_type" : "type-3500", ++ "referenced_type" : "type-3492", ++ "self_type" : "type-3494", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19495,8 +20907,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[8]", + "name" : "char const (&)[8]", +- "referenced_type" : "type-3484", +- "self_type" : "type-3488", ++ "referenced_type" : "type-3478", ++ "self_type" : "type-3480", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19504,8 +20916,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[9]", + "name" : "char const (&)[9]", +- "referenced_type" : "type-3474", +- "self_type" : "type-3477", ++ "referenced_type" : "type-3468", ++ "self_type" : "type-3470", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19531,8 +20943,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BpHwBinder::Obituary &", + "name" : "const android::hardware::BpHwBinder::Obituary &", +- "referenced_type" : "type-2202", +- "self_type" : "type-2226", ++ "referenced_type" : "type-2198", ++ "self_type" : "type-2222", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -19540,8 +20952,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &", + "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &", +- "referenced_type" : "type-2209", +- "self_type" : "type-2210", ++ "referenced_type" : "type-2205", ++ "self_type" : "type-2206", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -19549,8 +20961,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::HexDump &", + "name" : "const android::hardware::HexDump &", +- "referenced_type" : "type-2298", +- "self_type" : "type-3710", ++ "referenced_type" : "type-2294", ++ "self_type" : "type-3702", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19558,8 +20970,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1085", +- "self_type" : "type-1087", ++ "referenced_type" : "type-1083", ++ "self_type" : "type-1085", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -19567,8 +20979,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1143", +- "self_type" : "type-1145", ++ "referenced_type" : "type-1141", ++ "self_type" : "type-1143", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -19576,8 +20988,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1216", +- "self_type" : "type-1218", ++ "referenced_type" : "type-1214", ++ "self_type" : "type-1216", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19585,8 +20997,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1781", +- "self_type" : "type-1783", ++ "referenced_type" : "type-1777", ++ "self_type" : "type-1779", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19594,8 +21006,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1863", +- "self_type" : "type-1865", ++ "referenced_type" : "type-1859", ++ "self_type" : "type-1861", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -19603,8 +21015,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1919", +- "self_type" : "type-1921", ++ "referenced_type" : "type-1915", ++ "self_type" : "type-1917", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -19612,8 +21024,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1985", +- "self_type" : "type-1987", ++ "referenced_type" : "type-1981", ++ "self_type" : "type-1983", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -19621,8 +21033,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2038", +- "self_type" : "type-2040", ++ "referenced_type" : "type-2034", ++ "self_type" : "type-2036", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19630,8 +21042,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2092", +- "self_type" : "type-2094", ++ "referenced_type" : "type-2088", ++ "self_type" : "type-2090", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -19639,8 +21051,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2165", +- "self_type" : "type-2166", ++ "referenced_type" : "type-2161", ++ "self_type" : "type-2162", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -19648,8 +21060,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2363", +- "self_type" : "type-2365", ++ "referenced_type" : "type-2359", ++ "self_type" : "type-2361", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19657,8 +21069,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2919", +- "self_type" : "type-2921", ++ "referenced_type" : "type-2913", ++ "self_type" : "type-2915", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19666,8 +21078,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3001", +- "self_type" : "type-3003", ++ "referenced_type" : "type-2995", ++ "self_type" : "type-2997", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -19675,8 +21087,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3057", +- "self_type" : "type-3059", ++ "referenced_type" : "type-3051", ++ "self_type" : "type-3053", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -19684,8 +21096,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3121", +- "self_type" : "type-3123", ++ "referenced_type" : "type-3115", ++ "self_type" : "type-3117", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -19702,8 +21114,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3172", +- "self_type" : "type-3174", ++ "referenced_type" : "type-3166", ++ "self_type" : "type-3168", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19711,8 +21123,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3223", +- "self_type" : "type-3225", ++ "referenced_type" : "type-3217", ++ "self_type" : "type-3219", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -19720,8 +21132,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3672", +- "self_type" : "type-3687", ++ "referenced_type" : "type-3668", ++ "self_type" : "type-3681", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19729,8 +21141,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-999", +- "self_type" : "type-1001", ++ "referenced_type" : "type-997", ++ "self_type" : "type-999", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19738,8 +21150,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::ProcessState::handle_entry &", + "name" : "const android::hardware::ProcessState::handle_entry &", +- "referenced_type" : "type-3619", +- "self_type" : "type-3641", ++ "referenced_type" : "type-3613", ++ "self_type" : "type-3635", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -19747,8 +21159,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return &", + "name" : "const android::hardware::Return &", +- "referenced_type" : "type-459", +- "self_type" : "type-952", ++ "referenced_type" : "type-458", ++ "self_type" : "type-949", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -19756,8 +21168,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return &", + "name" : "const android::hardware::Return &", +- "referenced_type" : "type-715", +- "self_type" : "type-716", ++ "referenced_type" : "type-713", ++ "self_type" : "type-714", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -19774,8 +21186,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::TypeCode &", + "name" : "const android::hardware::TypeCode &", +- "referenced_type" : "type-2293", +- "self_type" : "type-3707", ++ "referenced_type" : "type-2289", ++ "self_type" : "type-3701", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19783,8 +21195,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::SchedPrio &", + "name" : "const android::hardware::details::SchedPrio &", +- "referenced_type" : "type-1011", +- "self_type" : "type-1010", ++ "referenced_type" : "type-1009", ++ "self_type" : "type-1008", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -19801,8 +21213,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::hidl_pointer &", + "name" : "const android::hardware::details::hidl_pointer &", +- "referenced_type" : "type-491", +- "self_type" : "type-787", ++ "referenced_type" : "type-490", ++ "self_type" : "type-785", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19837,8 +21249,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec > &", + "name" : "const android::hardware::hidl_vec > &", +- "referenced_type" : "type-2084", +- "self_type" : "type-2097", ++ "referenced_type" : "type-2080", ++ "self_type" : "type-2093", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19846,8 +21258,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec &", + "name" : "const android::hardware::hidl_vec &", +- "referenced_type" : "type-573", +- "self_type" : "type-1003", ++ "referenced_type" : "type-572", ++ "self_type" : "type-1001", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19855,8 +21267,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec &", + "name" : "const android::hardware::hidl_vec &", +- "referenced_type" : "type-982", +- "self_type" : "type-1004", ++ "referenced_type" : "type-980", ++ "self_type" : "type-1002", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19864,8 +21276,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec::iter &", + "name" : "const android::hardware::hidl_vec::iter &", +- "referenced_type" : "type-580", +- "self_type" : "type-582", ++ "referenced_type" : "type-579", ++ "self_type" : "type-581", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19873,8 +21285,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec &", + "name" : "const android::hardware::hidl_vec &", +- "referenced_type" : "type-476", +- "self_type" : "type-478", ++ "referenced_type" : "type-475", ++ "self_type" : "type-477", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19891,8 +21303,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::base::V1_0::IBase *const &", + "name" : "const android::hidl::base::V1_0::IBase *const &", +- "referenced_type" : "type-345", +- "self_type" : "type-346", ++ "referenced_type" : "type-341", ++ "self_type" : "type-342", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -19900,8 +21312,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &", + "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &", +- "referenced_type" : "type-981", +- "self_type" : "type-1034", ++ "referenced_type" : "type-979", ++ "self_type" : "type-1032", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19909,8 +21321,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::key_value_pair_t > &", + "name" : "const android::key_value_pair_t > &", +- "referenced_type" : "type-3614", +- "self_type" : "type-3616", ++ "referenced_type" : "type-3608", ++ "self_type" : "type-3610", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -19918,8 +21330,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::key_value_pair_t &", + "name" : "const android::key_value_pair_t &", +- "referenced_type" : "type-2194", +- "self_type" : "type-2196", ++ "referenced_type" : "type-2190", ++ "self_type" : "type-2192", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -19927,8 +21339,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-3448", +- "self_type" : "type-3455", ++ "referenced_type" : "type-3442", ++ "self_type" : "type-3449", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19936,8 +21348,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-2306", +- "self_type" : "type-2305", ++ "referenced_type" : "type-2302", ++ "self_type" : "type-2301", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19945,8 +21357,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-2167", +- "self_type" : "type-2169", ++ "referenced_type" : "type-2163", ++ "self_type" : "type-2165", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -19954,8 +21366,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-2216", +- "self_type" : "type-2217", ++ "referenced_type" : "type-2212", ++ "self_type" : "type-2213", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -19963,8 +21375,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-3285", +- "self_type" : "type-3287", ++ "referenced_type" : "type-3279", ++ "self_type" : "type-3281", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -19972,8 +21384,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-2332", +- "self_type" : "type-2334", ++ "referenced_type" : "type-2328", ++ "self_type" : "type-2330", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, +@@ -19981,8 +21393,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-3385", +- "self_type" : "type-3387", ++ "referenced_type" : "type-3379", ++ "self_type" : "type-3381", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, +@@ -19990,8 +21402,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-3392", +- "self_type" : "type-3394", ++ "referenced_type" : "type-3386", ++ "self_type" : "type-3388", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, +@@ -19999,8 +21411,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-439", +- "self_type" : "type-694", ++ "referenced_type" : "type-438", ++ "self_type" : "type-692", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20008,8 +21420,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-3404", +- "self_type" : "type-3403", ++ "referenced_type" : "type-3398", ++ "self_type" : "type-3397", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h" + }, +@@ -20017,8 +21429,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-719", +- "self_type" : "type-725", ++ "referenced_type" : "type-717", ++ "self_type" : "type-722", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20026,8 +21438,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-449", +- "self_type" : "type-3428", ++ "referenced_type" : "type-448", ++ "self_type" : "type-3422", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20035,8 +21447,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-907", +- "self_type" : "type-913", ++ "referenced_type" : "type-905", ++ "self_type" : "type-908", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20053,8 +21465,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-410", +- "self_type" : "type-412", ++ "referenced_type" : "type-409", ++ "self_type" : "type-410", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20062,8 +21474,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-529", +- "self_type" : "type-867", ++ "referenced_type" : "type-528", ++ "self_type" : "type-865", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20071,8 +21483,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-545", +- "self_type" : "type-738", ++ "referenced_type" : "type-544", ++ "self_type" : "type-736", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20080,8 +21492,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-534", +- "self_type" : "type-718", ++ "referenced_type" : "type-533", ++ "self_type" : "type-716", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20089,8 +21501,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-553", +- "self_type" : "type-742", ++ "referenced_type" : "type-552", ++ "self_type" : "type-740", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20098,8 +21510,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-540", +- "self_type" : "type-727", ++ "referenced_type" : "type-539", ++ "self_type" : "type-725", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20107,8 +21519,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-422", +- "self_type" : "type-423", ++ "referenced_type" : "type-421", ++ "self_type" : "type-422", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20116,8 +21528,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-2170", +- "self_type" : "type-2171", ++ "referenced_type" : "type-2166", ++ "self_type" : "type-2167", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -20125,8 +21537,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-1213", +- "self_type" : "type-1215", ++ "referenced_type" : "type-1211", ++ "self_type" : "type-1213", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -20134,8 +21546,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-2360", +- "self_type" : "type-2362", ++ "referenced_type" : "type-2356", ++ "self_type" : "type-2358", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -20152,8 +21564,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-3559", +- "self_type" : "type-3560", ++ "referenced_type" : "type-3553", ++ "self_type" : "type-3554", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20161,8 +21573,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-3649", +- "self_type" : "type-3658", ++ "referenced_type" : "type-3644", ++ "self_type" : "type-3652", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -20170,8 +21582,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-417", +- "self_type" : "type-418", ++ "referenced_type" : "type-416", ++ "self_type" : "type-417", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20179,8 +21591,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-414", +- "self_type" : "type-690", ++ "referenced_type" : "type-413", ++ "self_type" : "type-688", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20188,8 +21600,8 @@ + "alignment" : 4, + "linker_set_key" : "const bool &", + "name" : "const bool &", +- "referenced_type" : "type-455", +- "self_type" : "type-479", ++ "referenced_type" : "type-453", ++ "self_type" : "type-478", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20198,7 +21610,7 @@ + "linker_set_key" : "const char &", + "name" : "const char &", + "referenced_type" : "type-42", +- "self_type" : "type-2304", ++ "self_type" : "type-2300", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -20206,8 +21618,8 @@ + "alignment" : 4, + "linker_set_key" : "const char *const &", + "name" : "const char *const &", +- "referenced_type" : "type-2287", +- "self_type" : "type-2288", ++ "referenced_type" : "type-2283", ++ "self_type" : "type-2284", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -20224,8 +21636,8 @@ + "alignment" : 4, + "linker_set_key" : "const flat_binder_object &", + "name" : "const flat_binder_object &", +- "referenced_type" : "type-3577", +- "self_type" : "type-3579", ++ "referenced_type" : "type-3571", ++ "self_type" : "type-3573", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -20233,8 +21645,8 @@ + "alignment" : 4, + "linker_set_key" : "const float &", + "name" : "const float &", +- "referenced_type" : "type-616", +- "self_type" : "type-617", ++ "referenced_type" : "type-615", ++ "self_type" : "type-616", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20242,163 +21654,163 @@ + "alignment" : 4, + "linker_set_key" : "const int &", + "name" : "const int &", +- "referenced_type" : "type-568", +- "self_type" : "type-577", ++ "referenced_type" : "type-567", ++ "self_type" : "type-576", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1063", +- "self_type" : "type-1065", ++ "referenced_type" : "type-1061", ++ "self_type" : "type-1063", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1120", +- "self_type" : "type-1122", ++ "referenced_type" : "type-1118", ++ "self_type" : "type-1120", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1196", +- "self_type" : "type-1198", ++ "referenced_type" : "type-1194", ++ "self_type" : "type-1196", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1301", +- "self_type" : "type-1303", ++ "referenced_type" : "type-1298", ++ "self_type" : "type-1300", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1371", +- "self_type" : "type-1373", ++ "referenced_type" : "type-1368", ++ "self_type" : "type-1370", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1503", +- "self_type" : "type-1505", ++ "referenced_type" : "type-1500", ++ "self_type" : "type-1502", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1542", +- "self_type" : "type-1545", ++ "referenced_type" : "type-1538", ++ "self_type" : "type-1540", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1610", +- "self_type" : "type-1612", ++ "referenced_type" : "type-1606", ++ "self_type" : "type-1608", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1635", +- "self_type" : "type-1643", ++ "referenced_type" : "type-1631", ++ "self_type" : "type-1640", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1680", +- "self_type" : "type-1682", ++ "referenced_type" : "type-1676", ++ "self_type" : "type-1678", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1754", +- "self_type" : "type-1757", ++ "referenced_type" : "type-1750", ++ "self_type" : "type-1752", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1841", +- "self_type" : "type-1843", ++ "referenced_type" : "type-1837", ++ "self_type" : "type-1839", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1896", +- "self_type" : "type-1898", ++ "referenced_type" : "type-1892", ++ "self_type" : "type-1894", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1956", +- "self_type" : "type-1958", ++ "referenced_type" : "type-1952", ++ "self_type" : "type-1954", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2028", +- "self_type" : "type-2030", ++ "referenced_type" : "type-2024", ++ "self_type" : "type-2026", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2074", +- "self_type" : "type-2076", ++ "referenced_type" : "type-2070", ++ "self_type" : "type-2072", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2124", +- "self_type" : "type-2126", ++ "referenced_type" : "type-2120", ++ "self_type" : "type-2122", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2344", +- "self_type" : "type-2346", ++ "referenced_type" : "type-2340", ++ "self_type" : "type-2342", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2447", +- "self_type" : "type-2449", ++ "referenced_type" : "type-2442", ++ "self_type" : "type-2444", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2517", +- "self_type" : "type-2519", ++ "referenced_type" : "type-2512", ++ "self_type" : "type-2514", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2641", +- "self_type" : "type-2643", ++ "referenced_type" : "type-2636", ++ "self_type" : "type-2638", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2680", +- "self_type" : "type-2683", ++ "referenced_type" : "type-2674", ++ "self_type" : "type-2676", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -20411,113 +21823,113 @@ + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2748", +- "self_type" : "type-2750", ++ "referenced_type" : "type-2742", ++ "self_type" : "type-2744", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2773", +- "self_type" : "type-2781", ++ "referenced_type" : "type-2767", ++ "self_type" : "type-2776", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2818", +- "self_type" : "type-2820", ++ "referenced_type" : "type-2812", ++ "self_type" : "type-2814", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2892", +- "self_type" : "type-2895", ++ "referenced_type" : "type-2886", ++ "self_type" : "type-2888", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2979", +- "self_type" : "type-2981", ++ "referenced_type" : "type-2973", ++ "self_type" : "type-2975", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3034", +- "self_type" : "type-3036", ++ "referenced_type" : "type-3028", ++ "self_type" : "type-3030", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3092", +- "self_type" : "type-3094", ++ "referenced_type" : "type-3086", ++ "self_type" : "type-3088", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3162", +- "self_type" : "type-3164", ++ "referenced_type" : "type-3156", ++ "self_type" : "type-3158", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3206", +- "self_type" : "type-3208", ++ "referenced_type" : "type-3200", ++ "self_type" : "type-3202", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3255", +- "self_type" : "type-3257", ++ "referenced_type" : "type-3249", ++ "self_type" : "type-3251", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3401", +- "self_type" : "type-3410", ++ "referenced_type" : "type-3395", ++ "self_type" : "type-3406", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3785", +- "self_type" : "type-3787", ++ "referenced_type" : "type-3778", ++ "self_type" : "type-3780", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3855", +- "self_type" : "type-3857", ++ "referenced_type" : "type-3848", ++ "self_type" : "type-3850", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-469", +- "self_type" : "type-471", ++ "referenced_type" : "type-468", ++ "self_type" : "type-470", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-566", +- "self_type" : "type-569", ++ "referenced_type" : "type-565", ++ "self_type" : "type-568", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-655", +- "self_type" : "type-657", ++ "referenced_type" : "type-654", ++ "self_type" : "type-656", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -20530,36 +21942,36 @@ + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-703", +- "self_type" : "type-706", ++ "referenced_type" : "type-701", ++ "self_type" : "type-703", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-781", +- "self_type" : "type-783", ++ "referenced_type" : "type-779", ++ "self_type" : "type-781", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-810", +- "self_type" : "type-818", ++ "referenced_type" : "type-808", ++ "self_type" : "type-817", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-875", +- "self_type" : "type-877", ++ "referenced_type" : "type-873", ++ "self_type" : "type-875", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-960", +- "self_type" : "type-963", ++ "referenced_type" : "type-958", ++ "self_type" : "type-960", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -20575,8 +21987,8 @@ + "alignment" : 4, + "linker_set_key" : "const long long &", + "name" : "const long long &", +- "referenced_type" : "type-604", +- "self_type" : "type-605", ++ "referenced_type" : "type-603", ++ "self_type" : "type-604", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20584,8 +21996,8 @@ + "alignment" : 4, + "linker_set_key" : "const short &", + "name" : "const short &", +- "referenced_type" : "type-547", +- "self_type" : "type-560", ++ "referenced_type" : "type-548", ++ "self_type" : "type-559", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20593,8 +22005,8 @@ + "alignment" : 4, + "linker_set_key" : "const signed char &", + "name" : "const signed char &", +- "referenced_type" : "type-482", +- "self_type" : "type-490", ++ "referenced_type" : "type-483", ++ "self_type" : "type-489", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20602,8 +22014,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1007", +- "self_type" : "type-1009", ++ "referenced_type" : "type-1005", ++ "self_type" : "type-1007", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20611,8 +22023,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1072", +- "self_type" : "type-1074", ++ "referenced_type" : "type-1070", ++ "self_type" : "type-1072", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20620,8 +22032,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1130", +- "self_type" : "type-1132", ++ "referenced_type" : "type-1128", ++ "self_type" : "type-1130", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20629,8 +22041,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1243", +- "self_type" : "type-1245", ++ "referenced_type" : "type-1240", ++ "self_type" : "type-1242", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20638,8 +22050,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1314", +- "self_type" : "type-1316", ++ "referenced_type" : "type-1311", ++ "self_type" : "type-1313", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -20647,8 +22059,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1392", +- "self_type" : "type-1394", ++ "referenced_type" : "type-1389", ++ "self_type" : "type-1391", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20656,8 +22068,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1496", +- "self_type" : "type-1546", ++ "referenced_type" : "type-1493", ++ "self_type" : "type-1542", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -20665,8 +22077,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1582", +- "self_type" : "type-1591", ++ "referenced_type" : "type-1580", ++ "self_type" : "type-1589", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -20674,8 +22086,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1629", +- "self_type" : "type-1631", ++ "referenced_type" : "type-1625", ++ "self_type" : "type-1627", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -20683,8 +22095,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1789", +- "self_type" : "type-1791", ++ "referenced_type" : "type-1785", ++ "self_type" : "type-1787", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20692,8 +22104,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1850", +- "self_type" : "type-1852", ++ "referenced_type" : "type-1846", ++ "self_type" : "type-1848", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20701,8 +22113,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1906", +- "self_type" : "type-1908", ++ "referenced_type" : "type-1902", ++ "self_type" : "type-1904", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20710,8 +22122,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1967", +- "self_type" : "type-1969", ++ "referenced_type" : "type-1963", ++ "self_type" : "type-1965", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20728,8 +22140,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2043", +- "self_type" : "type-2045", ++ "referenced_type" : "type-2039", ++ "self_type" : "type-2041", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20737,8 +22149,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2089", +- "self_type" : "type-2091", ++ "referenced_type" : "type-2085", ++ "self_type" : "type-2087", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -20746,8 +22158,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2390", +- "self_type" : "type-2392", ++ "referenced_type" : "type-2385", ++ "self_type" : "type-2387", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20755,8 +22167,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2460", +- "self_type" : "type-2462", ++ "referenced_type" : "type-2455", ++ "self_type" : "type-2457", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -20764,8 +22176,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2537", +- "self_type" : "type-2539", ++ "referenced_type" : "type-2532", ++ "self_type" : "type-2534", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20773,8 +22185,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2634", +- "self_type" : "type-2684", ++ "referenced_type" : "type-2629", ++ "self_type" : "type-2678", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -20782,8 +22194,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2720", +- "self_type" : "type-2729", ++ "referenced_type" : "type-2716", ++ "self_type" : "type-2725", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -20791,8 +22203,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2767", +- "self_type" : "type-2769", ++ "referenced_type" : "type-2761", ++ "self_type" : "type-2763", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -20800,8 +22212,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2927", +- "self_type" : "type-2929", ++ "referenced_type" : "type-2921", ++ "self_type" : "type-2923", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20809,8 +22221,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2988", +- "self_type" : "type-2990", ++ "referenced_type" : "type-2982", ++ "self_type" : "type-2984", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20818,8 +22230,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3044", +- "self_type" : "type-3046", ++ "referenced_type" : "type-3038", ++ "self_type" : "type-3040", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20827,8 +22239,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3103", +- "self_type" : "type-3105", ++ "referenced_type" : "type-3097", ++ "self_type" : "type-3099", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20836,8 +22248,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3177", +- "self_type" : "type-3179", ++ "referenced_type" : "type-3171", ++ "self_type" : "type-3173", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20845,8 +22257,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3220", +- "self_type" : "type-3222", ++ "referenced_type" : "type-3214", ++ "self_type" : "type-3216", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -20854,8 +22266,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-358", +- "self_type" : "type-360", ++ "referenced_type" : "type-357", ++ "self_type" : "type-359", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20863,8 +22275,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3728", +- "self_type" : "type-3730", ++ "referenced_type" : "type-3721", ++ "self_type" : "type-3723", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20872,8 +22284,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3798", +- "self_type" : "type-3800", ++ "referenced_type" : "type-3791", ++ "self_type" : "type-3793", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -20881,8 +22293,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3875", +- "self_type" : "type-3877", ++ "referenced_type" : "type-3868", ++ "self_type" : "type-3870", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20890,8 +22302,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-487", +- "self_type" : "type-489", ++ "referenced_type" : "type-486", ++ "self_type" : "type-488", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -20908,8 +22320,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-598", +- "self_type" : "type-600", ++ "referenced_type" : "type-597", ++ "self_type" : "type-599", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20917,8 +22329,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-648", +- "self_type" : "type-707", ++ "referenced_type" : "type-647", ++ "self_type" : "type-705", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -20935,8 +22347,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-804", +- "self_type" : "type-806", ++ "referenced_type" : "type-802", ++ "self_type" : "type-804", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -20944,8 +22356,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-1387", +- "self_type" : "type-1386", ++ "referenced_type" : "type-1384", ++ "self_type" : "type-1383", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20953,8 +22365,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-2532", +- "self_type" : "type-2531", ++ "referenced_type" : "type-2527", ++ "self_type" : "type-2526", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20962,8 +22374,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-3870", +- "self_type" : "type-3869", ++ "referenced_type" : "type-3863", ++ "self_type" : "type-3862", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20971,8 +22383,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-593", +- "self_type" : "type-592", ++ "referenced_type" : "type-592", ++ "self_type" : "type-591", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20980,8 +22392,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-1239", +- "self_type" : "type-1238", ++ "referenced_type" : "type-1236", ++ "self_type" : "type-1235", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20989,8 +22401,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-2386", +- "self_type" : "type-2385", ++ "referenced_type" : "type-2381", ++ "self_type" : "type-2380", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20998,8 +22410,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-353", +- "self_type" : "type-352", ++ "referenced_type" : "type-352", ++ "self_type" : "type-351", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21007,8 +22419,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-3724", +- "self_type" : "type-3723", ++ "referenced_type" : "type-3717", ++ "self_type" : "type-3716", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21016,8 +22428,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function &", + "name" : "const std::function &", +- "referenced_type" : "type-1185", +- "self_type" : "type-1187", ++ "referenced_type" : "type-1183", ++ "self_type" : "type-1185", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -21025,8 +22437,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function &", + "name" : "const std::function &", +- "referenced_type" : "type-2118", +- "self_type" : "type-2120", ++ "referenced_type" : "type-2114", ++ "self_type" : "type-2116", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -21043,8 +22455,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function &", + "name" : "const std::function &", +- "referenced_type" : "type-3249", +- "self_type" : "type-3251", ++ "referenced_type" : "type-3243", ++ "self_type" : "type-3245", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -21052,8 +22464,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function &", + "name" : "const std::function &", +- "referenced_type" : "type-3450", +- "self_type" : "type-3452", ++ "referenced_type" : "type-3444", ++ "self_type" : "type-3446", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -21061,8 +22473,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::unique_ptr > &", + "name" : "const std::unique_ptr > &", +- "referenced_type" : "type-3574", +- "self_type" : "type-3576", ++ "referenced_type" : "type-3568", ++ "self_type" : "type-3570", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -21070,8 +22482,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-1617", +- "self_type" : "type-1620", ++ "referenced_type" : "type-1613", ++ "self_type" : "type-1615", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21079,8 +22491,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-2755", +- "self_type" : "type-2758", ++ "referenced_type" : "type-2749", ++ "self_type" : "type-2751", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21088,8 +22500,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-788", +- "self_type" : "type-791", ++ "referenced_type" : "type-786", ++ "self_type" : "type-788", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21097,8 +22509,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1041", +- "self_type" : "type-1040", ++ "referenced_type" : "type-1039", ++ "self_type" : "type-1038", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21106,8 +22518,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1091", +- "self_type" : "type-1090", ++ "referenced_type" : "type-1089", ++ "self_type" : "type-1088", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21115,8 +22527,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1109", +- "self_type" : "type-1108", ++ "referenced_type" : "type-1107", ++ "self_type" : "type-1106", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21124,8 +22536,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1149", +- "self_type" : "type-1148", ++ "referenced_type" : "type-1147", ++ "self_type" : "type-1146", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21133,8 +22545,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1229", +- "self_type" : "type-1228", ++ "referenced_type" : "type-1227", ++ "self_type" : "type-1226", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21142,8 +22554,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1338", +- "self_type" : "type-1337", ++ "referenced_type" : "type-1335", ++ "self_type" : "type-1334", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21151,8 +22563,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1402", +- "self_type" : "type-1401", ++ "referenced_type" : "type-1399", ++ "self_type" : "type-1398", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21160,8 +22572,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1526", +- "self_type" : "type-1525", ++ "referenced_type" : "type-1522", ++ "self_type" : "type-1521", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21169,8 +22581,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1552", +- "self_type" : "type-1551", ++ "referenced_type" : "type-1548", ++ "self_type" : "type-1547", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21178,8 +22590,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1580", +- "self_type" : "type-1579", ++ "referenced_type" : "type-1578", ++ "self_type" : "type-1577", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21196,8 +22608,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1664", +- "self_type" : "type-1663", ++ "referenced_type" : "type-1660", ++ "self_type" : "type-1659", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21205,8 +22617,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1697", +- "self_type" : "type-1696", ++ "referenced_type" : "type-1693", ++ "self_type" : "type-1692", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21214,8 +22626,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1700", +- "self_type" : "type-1699", ++ "referenced_type" : "type-1696", ++ "self_type" : "type-1695", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21223,8 +22635,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1821", +- "self_type" : "type-1820", ++ "referenced_type" : "type-1817", ++ "self_type" : "type-1816", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21232,8 +22644,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1869", +- "self_type" : "type-1868", ++ "referenced_type" : "type-1865", ++ "self_type" : "type-1864", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21241,8 +22653,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1886", +- "self_type" : "type-1885", ++ "referenced_type" : "type-1882", ++ "self_type" : "type-1881", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21250,8 +22662,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1925", +- "self_type" : "type-1924", ++ "referenced_type" : "type-1921", ++ "self_type" : "type-1920", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21259,8 +22671,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1993", +- "self_type" : "type-1992", ++ "referenced_type" : "type-1988", ++ "self_type" : "type-1987", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21268,8 +22680,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2058", +- "self_type" : "type-2057", ++ "referenced_type" : "type-2054", ++ "self_type" : "type-2053", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21277,8 +22689,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2112", +- "self_type" : "type-2111", ++ "referenced_type" : "type-2108", ++ "self_type" : "type-2107", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21286,8 +22698,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2131", +- "self_type" : "type-2130", ++ "referenced_type" : "type-2127", ++ "self_type" : "type-2126", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21295,8 +22707,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2376", +- "self_type" : "type-2375", ++ "referenced_type" : "type-2372", ++ "self_type" : "type-2371", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21304,8 +22716,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2484", +- "self_type" : "type-2483", ++ "referenced_type" : "type-2479", ++ "self_type" : "type-2478", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21313,8 +22725,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2547", +- "self_type" : "type-2546", ++ "referenced_type" : "type-2542", ++ "self_type" : "type-2541", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21322,8 +22734,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2664", +- "self_type" : "type-2663", ++ "referenced_type" : "type-2658", ++ "self_type" : "type-2657", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21331,8 +22743,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2690", +- "self_type" : "type-2689", ++ "referenced_type" : "type-2684", ++ "self_type" : "type-2683", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21340,8 +22752,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2718", +- "self_type" : "type-2717", ++ "referenced_type" : "type-2714", ++ "self_type" : "type-2713", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21349,8 +22761,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2802", +- "self_type" : "type-2801", ++ "referenced_type" : "type-2796", ++ "self_type" : "type-2795", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21358,8 +22770,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2835", +- "self_type" : "type-2834", ++ "referenced_type" : "type-2829", ++ "self_type" : "type-2828", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21367,8 +22779,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2838", +- "self_type" : "type-2837", ++ "referenced_type" : "type-2832", ++ "self_type" : "type-2831", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21376,8 +22788,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2959", +- "self_type" : "type-2958", ++ "referenced_type" : "type-2953", ++ "self_type" : "type-2952", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21385,8 +22797,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3007", +- "self_type" : "type-3006", ++ "referenced_type" : "type-3001", ++ "self_type" : "type-3000", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21394,8 +22806,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3024", +- "self_type" : "type-3023", ++ "referenced_type" : "type-3018", ++ "self_type" : "type-3017", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21403,8 +22815,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3063", +- "self_type" : "type-3062", ++ "referenced_type" : "type-3057", ++ "self_type" : "type-3056", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21412,8 +22824,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3129", +- "self_type" : "type-3128", ++ "referenced_type" : "type-3122", ++ "self_type" : "type-3121", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21421,8 +22833,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3192", +- "self_type" : "type-3191", ++ "referenced_type" : "type-3186", ++ "self_type" : "type-3185", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21430,8 +22842,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3243", +- "self_type" : "type-3242", ++ "referenced_type" : "type-3237", ++ "self_type" : "type-3236", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21439,8 +22851,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3262", +- "self_type" : "type-3261", ++ "referenced_type" : "type-3256", ++ "self_type" : "type-3255", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21457,8 +22869,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3714", +- "self_type" : "type-3713", ++ "referenced_type" : "type-3708", ++ "self_type" : "type-3707", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21466,8 +22878,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3822", +- "self_type" : "type-3821", ++ "referenced_type" : "type-3815", ++ "self_type" : "type-3814", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21475,8 +22887,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3885", +- "self_type" : "type-3884", ++ "referenced_type" : "type-3878", ++ "self_type" : "type-3877", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21493,8 +22905,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-520", +- "self_type" : "type-519", ++ "referenced_type" : "type-519", ++ "self_type" : "type-518", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21502,8 +22914,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-609", +- "self_type" : "type-608", ++ "referenced_type" : "type-608", ++ "self_type" : "type-607", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21511,8 +22923,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-687", +- "self_type" : "type-686", ++ "referenced_type" : "type-685", ++ "self_type" : "type-684", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21520,8 +22932,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-713", +- "self_type" : "type-712", ++ "referenced_type" : "type-711", ++ "self_type" : "type-710", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21538,8 +22950,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-859", +- "self_type" : "type-858", ++ "referenced_type" : "type-857", ++ "self_type" : "type-856", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21547,8 +22959,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-892", +- "self_type" : "type-891", ++ "referenced_type" : "type-890", ++ "self_type" : "type-889", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21556,8 +22968,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-895", +- "self_type" : "type-894", ++ "referenced_type" : "type-893", ++ "self_type" : "type-892", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21574,8 +22986,8 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned char &", + "name" : "const unsigned char &", +- "referenced_type" : "type-522", +- "self_type" : "type-536", ++ "referenced_type" : "type-521", ++ "self_type" : "type-537", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -21583,8 +22995,8 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned char *const &", + "name" : "const unsigned char *const &", +- "referenced_type" : "type-3536", +- "self_type" : "type-3537", ++ "referenced_type" : "type-3530", ++ "self_type" : "type-3531", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21601,8 +23013,8 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned int *const &", + "name" : "const unsigned int *const &", +- "referenced_type" : "type-3538", +- "self_type" : "type-3539", ++ "referenced_type" : "type-3532", ++ "self_type" : "type-3533", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21610,8 +23022,8 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned long long &", + "name" : "const unsigned long long &", +- "referenced_type" : "type-611", +- "self_type" : "type-613", ++ "referenced_type" : "type-610", ++ "self_type" : "type-614", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -21619,8 +23031,8 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned short &", + "name" : "const unsigned short &", +- "referenced_type" : "type-561", +- "self_type" : "type-565", ++ "referenced_type" : "type-560", ++ "self_type" : "type-564", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -21628,8 +23040,8 @@ + "alignment" : 4, + "linker_set_key" : "const void *const &", + "name" : "const void *const &", +- "referenced_type" : "type-2197", +- "self_type" : "type-2198", ++ "referenced_type" : "type-2193", ++ "self_type" : "type-2194", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -21646,8 +23058,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-1175", +- "self_type" : "type-1174", ++ "referenced_type" : "type-1173", ++ "self_type" : "type-1172", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -21655,8 +23067,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-1604", +- "self_type" : "type-1603", ++ "referenced_type" : "type-1601", ++ "self_type" : "type-1600", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21664,8 +23076,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-2024", +- "self_type" : "type-2023", ++ "referenced_type" : "type-2020", ++ "self_type" : "type-2019", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -21682,8 +23094,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-2302", +- "self_type" : "type-2301", ++ "referenced_type" : "type-2298", ++ "self_type" : "type-2297", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21691,8 +23103,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-2742", +- "self_type" : "type-2741", ++ "referenced_type" : "type-2737", ++ "self_type" : "type-2736", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21700,8 +23112,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3158", +- "self_type" : "type-3157", ++ "referenced_type" : "type-3152", ++ "self_type" : "type-3151", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -21709,8 +23121,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3362", +- "self_type" : "type-3361", ++ "referenced_type" : "type-3356", ++ "self_type" : "type-3355", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21718,8 +23130,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3546", +- "self_type" : "type-3545", ++ "referenced_type" : "type-3540", ++ "self_type" : "type-3539", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21727,8 +23139,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3612", +- "self_type" : "type-3611", ++ "referenced_type" : "type-3606", ++ "self_type" : "type-3605", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21736,8 +23148,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3698", +- "self_type" : "type-3697", ++ "referenced_type" : "type-3692", ++ "self_type" : "type-3691", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21745,8 +23157,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3712", +- "self_type" : "type-3711", ++ "referenced_type" : "type-3706", ++ "self_type" : "type-3705", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21763,8 +23175,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-775", +- "self_type" : "type-774", ++ "referenced_type" : "type-774", ++ "self_type" : "type-773", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21773,7 +23185,7 @@ + "linker_set_key" : "unsigned char &", + "name" : "unsigned char &", + "referenced_type" : "type-146", +- "self_type" : "type-507", ++ "self_type" : "type-506", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -21781,8 +23193,8 @@ + "alignment" : 4, + "linker_set_key" : "void *const &", + "name" : "void *const &", +- "referenced_type" : "type-3478", +- "self_type" : "type-3479", ++ "referenced_type" : "type-3472", ++ "self_type" : "type-3473", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + } +@@ -21811,8 +23223,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Condition *", + "name" : "android::Condition *", +- "referenced_type" : "type-395", +- "self_type" : "type-398", ++ "referenced_type" : "type-394", ++ "self_type" : "type-397", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Condition.h" + }, +@@ -21820,8 +23232,8 @@ + "alignment" : 4, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-2248", +- "self_type" : "type-2247", ++ "referenced_type" : "type-2244", ++ "self_type" : "type-2243", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -21829,8 +23241,8 @@ + "alignment" : 4, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-3345", +- "self_type" : "type-3344", ++ "referenced_type" : "type-3339", ++ "self_type" : "type-3338", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -21838,8 +23250,8 @@ + "alignment" : 4, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-3445", +- "self_type" : "type-3444", ++ "referenced_type" : "type-3439", ++ "self_type" : "type-3438", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -21847,8 +23259,8 @@ + "alignment" : 4, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-3598", +- "self_type" : "type-3597", ++ "referenced_type" : "type-3592", ++ "self_type" : "type-3591", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -21856,8 +23268,8 @@ + "alignment" : 4, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-3655", +- "self_type" : "type-3654", ++ "referenced_type" : "type-3649", ++ "self_type" : "type-3648", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -21865,8 +23277,8 @@ + "alignment" : 4, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-3702", +- "self_type" : "type-3701", ++ "referenced_type" : "type-3696", ++ "self_type" : "type-3695", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -21874,8 +23286,8 @@ + "alignment" : 4, + "linker_set_key" : "android::KeyedVector > *", + "name" : "android::KeyedVector > *", +- "referenced_type" : "type-382", +- "self_type" : "type-3642", ++ "referenced_type" : "type-381", ++ "self_type" : "type-3636", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -21883,8 +23295,8 @@ + "alignment" : 4, + "linker_set_key" : "android::KeyedVector *", + "name" : "android::KeyedVector *", +- "referenced_type" : "type-2153", +- "self_type" : "type-2228", ++ "referenced_type" : "type-2149", ++ "self_type" : "type-2224", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -21892,8 +23304,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Mutex *", + "name" : "android::Mutex *", +- "referenced_type" : "type-388", +- "self_type" : "type-391", ++ "referenced_type" : "type-387", ++ "self_type" : "type-390", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Mutex.h" + }, +@@ -21901,8 +23313,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Mutex::Autolock *", + "name" : "android::Mutex::Autolock *", +- "referenced_type" : "type-392", +- "self_type" : "type-394", ++ "referenced_type" : "type-391", ++ "self_type" : "type-393", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Mutex.h" + }, +@@ -21910,8 +23322,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RWLock *", + "name" : "android::RWLock *", +- "referenced_type" : "type-399", +- "self_type" : "type-402", ++ "referenced_type" : "type-398", ++ "self_type" : "type-401", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RWLock.h" + }, +@@ -21919,8 +23331,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RWLock::AutoRLock *", + "name" : "android::RWLock::AutoRLock *", +- "referenced_type" : "type-403", +- "self_type" : "type-405", ++ "referenced_type" : "type-402", ++ "self_type" : "type-404", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RWLock.h" + }, +@@ -21928,8 +23340,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RWLock::AutoWLock *", + "name" : "android::RWLock::AutoWLock *", +- "referenced_type" : "type-407", +- "self_type" : "type-408", ++ "referenced_type" : "type-405", ++ "self_type" : "type-407", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RWLock.h" + }, +@@ -21947,7 +23359,7 @@ + "linker_set_key" : "android::RefBase **", + "name" : "android::RefBase **", + "referenced_type" : "type-25", +- "self_type" : "type-3412", ++ "self_type" : "type-3405", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -21955,8 +23367,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase *const *", + "name" : "android::RefBase *const *", +- "referenced_type" : "type-3417", +- "self_type" : "type-3418", ++ "referenced_type" : "type-3411", ++ "self_type" : "type-3412", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -21964,8 +23376,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1061", +- "self_type" : "type-1060", ++ "referenced_type" : "type-1059", ++ "self_type" : "type-1058", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -21973,8 +23385,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1118", +- "self_type" : "type-1117", ++ "referenced_type" : "type-1116", ++ "self_type" : "type-1115", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -21982,8 +23394,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1193", +- "self_type" : "type-1192", ++ "referenced_type" : "type-1191", ++ "self_type" : "type-1190", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -21991,8 +23403,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1299", +- "self_type" : "type-1298", ++ "referenced_type" : "type-1296", ++ "self_type" : "type-1295", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22000,8 +23412,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1368", +- "self_type" : "type-1367", ++ "referenced_type" : "type-1365", ++ "self_type" : "type-1364", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22009,8 +23421,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1500", +- "self_type" : "type-1499", ++ "referenced_type" : "type-1497", ++ "self_type" : "type-1496", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22018,8 +23430,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1511", +- "self_type" : "type-1510", ++ "referenced_type" : "type-1508", ++ "self_type" : "type-1507", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22027,8 +23439,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1539", +- "self_type" : "type-1538", ++ "referenced_type" : "type-1535", ++ "self_type" : "type-1534", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22036,8 +23448,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1607", +- "self_type" : "type-1606", ++ "referenced_type" : "type-1603", ++ "self_type" : "type-1602", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22045,8 +23457,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1677", +- "self_type" : "type-1676", ++ "referenced_type" : "type-1673", ++ "self_type" : "type-1672", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22054,8 +23466,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1751", +- "self_type" : "type-1750", ++ "referenced_type" : "type-1747", ++ "self_type" : "type-1746", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22063,8 +23475,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1839", +- "self_type" : "type-1838", ++ "referenced_type" : "type-1835", ++ "self_type" : "type-1834", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22072,8 +23484,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1894", +- "self_type" : "type-1893", ++ "referenced_type" : "type-1890", ++ "self_type" : "type-1889", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22081,8 +23493,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1954", +- "self_type" : "type-1953", ++ "referenced_type" : "type-1950", ++ "self_type" : "type-1949", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22090,8 +23502,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2026", +- "self_type" : "type-2025", ++ "referenced_type" : "type-2022", ++ "self_type" : "type-2021", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22099,8 +23511,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2072", +- "self_type" : "type-2071", ++ "referenced_type" : "type-2068", ++ "self_type" : "type-2067", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22117,8 +23529,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2122", +- "self_type" : "type-2121", ++ "referenced_type" : "type-2118", ++ "self_type" : "type-2117", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22126,8 +23538,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2138", +- "self_type" : "type-2137", ++ "referenced_type" : "type-2134", ++ "self_type" : "type-2133", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22135,8 +23547,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2213", +- "self_type" : "type-2212", ++ "referenced_type" : "type-2209", ++ "self_type" : "type-2208", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22144,8 +23556,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2309", +- "self_type" : "type-2308", ++ "referenced_type" : "type-2305", ++ "self_type" : "type-2304", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22153,8 +23565,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2327", +- "self_type" : "type-2326", ++ "referenced_type" : "type-2325", ++ "self_type" : "type-2324", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22162,8 +23574,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2445", +- "self_type" : "type-2444", ++ "referenced_type" : "type-2440", ++ "self_type" : "type-2439", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22171,8 +23583,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2514", +- "self_type" : "type-2513", ++ "referenced_type" : "type-2509", ++ "self_type" : "type-2508", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22180,8 +23592,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2638", +- "self_type" : "type-2637", ++ "referenced_type" : "type-2633", ++ "self_type" : "type-2632", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22189,8 +23601,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2649", +- "self_type" : "type-2648", ++ "referenced_type" : "type-2644", ++ "self_type" : "type-2643", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22207,8 +23619,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2677", +- "self_type" : "type-2676", ++ "referenced_type" : "type-2671", ++ "self_type" : "type-2670", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22216,8 +23628,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2745", +- "self_type" : "type-2744", ++ "referenced_type" : "type-2739", ++ "self_type" : "type-2738", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22225,8 +23637,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2815", +- "self_type" : "type-2814", ++ "referenced_type" : "type-2809", ++ "self_type" : "type-2808", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22234,8 +23646,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2889", +- "self_type" : "type-2888", ++ "referenced_type" : "type-2883", ++ "self_type" : "type-2882", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22243,8 +23655,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2977", +- "self_type" : "type-2976", ++ "referenced_type" : "type-2971", ++ "self_type" : "type-2970", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22252,8 +23664,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3032", +- "self_type" : "type-3031", ++ "referenced_type" : "type-3026", ++ "self_type" : "type-3025", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22261,8 +23673,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3090", +- "self_type" : "type-3089", ++ "referenced_type" : "type-3084", ++ "self_type" : "type-3083", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22270,8 +23682,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3160", +- "self_type" : "type-3159", ++ "referenced_type" : "type-3154", ++ "self_type" : "type-3153", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22279,8 +23691,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3204", +- "self_type" : "type-3203", ++ "referenced_type" : "type-3198", ++ "self_type" : "type-3197", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22288,8 +23700,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3253", +- "self_type" : "type-3252", ++ "referenced_type" : "type-3247", ++ "self_type" : "type-3246", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22297,8 +23709,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3269", +- "self_type" : "type-3268", ++ "referenced_type" : "type-3263", ++ "self_type" : "type-3262", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22306,8 +23718,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3318", +- "self_type" : "type-3317", ++ "referenced_type" : "type-3312", ++ "self_type" : "type-3311", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22315,8 +23727,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3368", +- "self_type" : "type-3367", ++ "referenced_type" : "type-3362", ++ "self_type" : "type-3361", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22324,8 +23736,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3381", +- "self_type" : "type-3380", ++ "referenced_type" : "type-3376", ++ "self_type" : "type-3375", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22333,8 +23745,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3390", +- "self_type" : "type-3389", ++ "referenced_type" : "type-3384", ++ "self_type" : "type-3383", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22342,8 +23754,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3398", +- "self_type" : "type-3397", ++ "referenced_type" : "type-3392", ++ "self_type" : "type-3391", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22351,8 +23763,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3426", +- "self_type" : "type-3425", ++ "referenced_type" : "type-3420", ++ "self_type" : "type-3419", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22360,8 +23772,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3562", +- "self_type" : "type-3561", ++ "referenced_type" : "type-3556", ++ "self_type" : "type-3555", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22369,8 +23781,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3628", +- "self_type" : "type-3627", ++ "referenced_type" : "type-3622", ++ "self_type" : "type-3621", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22378,8 +23790,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3691", +- "self_type" : "type-3690", ++ "referenced_type" : "type-3685", ++ "self_type" : "type-3684", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22387,8 +23799,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3783", +- "self_type" : "type-3782", ++ "referenced_type" : "type-3776", ++ "self_type" : "type-3775", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22396,8 +23808,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3852", +- "self_type" : "type-3851", ++ "referenced_type" : "type-3845", ++ "self_type" : "type-3844", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22405,8 +23817,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-464", +- "self_type" : "type-463", ++ "referenced_type" : "type-463", ++ "self_type" : "type-462", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22414,8 +23826,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-563", +- "self_type" : "type-562", ++ "referenced_type" : "type-562", ++ "self_type" : "type-561", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22423,8 +23835,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-652", +- "self_type" : "type-651", ++ "referenced_type" : "type-651", ++ "self_type" : "type-650", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22432,8 +23844,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-663", +- "self_type" : "type-662", ++ "referenced_type" : "type-662", ++ "self_type" : "type-661", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22441,8 +23853,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-700", +- "self_type" : "type-699", ++ "referenced_type" : "type-698", ++ "self_type" : "type-697", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22450,8 +23862,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-778", +- "self_type" : "type-777", ++ "referenced_type" : "type-776", ++ "self_type" : "type-775", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22459,8 +23871,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-872", +- "self_type" : "type-871", ++ "referenced_type" : "type-870", ++ "self_type" : "type-869", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22468,8 +23880,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-957", +- "self_type" : "type-956", ++ "referenced_type" : "type-955", ++ "self_type" : "type-954", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22487,7 +23899,7 @@ + "linker_set_key" : "android::RefBase::weakref_type **", + "name" : "android::RefBase::weakref_type **", + "referenced_type" : "type-308", +- "self_type" : "type-3411", ++ "self_type" : "type-3404", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -22495,8 +23907,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_type *const *", + "name" : "android::RefBase::weakref_type *const *", +- "referenced_type" : "type-3415", +- "self_type" : "type-3416", ++ "referenced_type" : "type-3409", ++ "self_type" : "type-3410", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -22513,8 +23925,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ScopedTrace *", + "name" : "android::ScopedTrace *", +- "referenced_type" : "type-1025", +- "self_type" : "type-1026", ++ "referenced_type" : "type-1023", ++ "self_type" : "type-1024", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Trace.h" + }, +@@ -22522,8 +23934,8 @@ + "alignment" : 4, + "linker_set_key" : "android::SortedVector > > *", + "name" : "android::SortedVector > > *", +- "referenced_type" : "type-375", +- "self_type" : "type-3633", ++ "referenced_type" : "type-374", ++ "self_type" : "type-3627", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -22531,8 +23943,8 @@ + "alignment" : 4, + "linker_set_key" : "android::SortedVector > *", + "name" : "android::SortedVector > *", +- "referenced_type" : "type-2154", +- "self_type" : "type-2218", ++ "referenced_type" : "type-2150", ++ "self_type" : "type-2214", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -22558,8 +23970,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Thread *", + "name" : "android::Thread *", +- "referenced_type" : "type-454", +- "self_type" : "type-453", ++ "referenced_type" : "type-452", ++ "self_type" : "type-451", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -22567,8 +23979,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-381", +- "self_type" : "type-3437", ++ "referenced_type" : "type-380", ++ "self_type" : "type-3431", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22576,8 +23988,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-380", +- "self_type" : "type-3433", ++ "referenced_type" : "type-379", ++ "self_type" : "type-3427", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22594,8 +24006,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-379", +- "self_type" : "type-3429", ++ "referenced_type" : "type-378", ++ "self_type" : "type-3423", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22603,8 +24015,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-2151", +- "self_type" : "type-2150", ++ "referenced_type" : "type-2147", ++ "self_type" : "type-2146", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -22612,8 +24024,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-2221", +- "self_type" : "type-2223", ++ "referenced_type" : "type-2217", ++ "self_type" : "type-2219", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22621,8 +24033,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-3278", +- "self_type" : "type-3277", ++ "referenced_type" : "type-3272", ++ "self_type" : "type-3271", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -22630,8 +24042,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-3454", +- "self_type" : "type-3453", ++ "referenced_type" : "type-3448", ++ "self_type" : "type-3447", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -22639,8 +24051,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-3572", +- "self_type" : "type-3571", ++ "referenced_type" : "type-3566", ++ "self_type" : "type-3565", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -22648,8 +24060,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-3648", +- "self_type" : "type-3647", ++ "referenced_type" : "type-3642", ++ "self_type" : "type-3641", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -22657,8 +24069,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-377", +- "self_type" : "type-3636", ++ "referenced_type" : "type-376", ++ "self_type" : "type-3630", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22666,8 +24078,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector > *", + "name" : "android::Vector > *", +- "referenced_type" : "type-2328", +- "self_type" : "type-2329", ++ "referenced_type" : "type-2322", ++ "self_type" : "type-2323", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22675,8 +24087,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-2322", +- "self_type" : "type-2325", ++ "referenced_type" : "type-2318", ++ "self_type" : "type-2321", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22693,8 +24105,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1044", +- "self_type" : "type-1043", ++ "referenced_type" : "type-1042", ++ "self_type" : "type-1041", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22702,8 +24114,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1098", +- "self_type" : "type-1097", ++ "referenced_type" : "type-1096", ++ "self_type" : "type-1095", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22711,8 +24123,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1227", +- "self_type" : "type-1226", ++ "referenced_type" : "type-1225", ++ "self_type" : "type-1224", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22720,8 +24132,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1570", +- "self_type" : "type-1569", ++ "referenced_type" : "type-1565", ++ "self_type" : "type-1564", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -22729,8 +24141,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1703", +- "self_type" : "type-1702", ++ "referenced_type" : "type-1699", ++ "self_type" : "type-1698", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22738,8 +24150,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1715", +- "self_type" : "type-1714", ++ "referenced_type" : "type-1711", ++ "self_type" : "type-1710", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22747,8 +24159,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1824", +- "self_type" : "type-1823", ++ "referenced_type" : "type-1820", ++ "self_type" : "type-1819", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22756,8 +24168,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1876", +- "self_type" : "type-1875", ++ "referenced_type" : "type-1872", ++ "self_type" : "type-1871", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22765,8 +24177,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1928", +- "self_type" : "type-1927", ++ "referenced_type" : "type-1924", ++ "self_type" : "type-1923", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22774,8 +24186,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2002", +- "self_type" : "type-2001", ++ "referenced_type" : "type-1998", ++ "self_type" : "type-1997", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22783,8 +24195,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2061", +- "self_type" : "type-2060", ++ "referenced_type" : "type-2057", ++ "self_type" : "type-2056", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22792,8 +24204,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2145", +- "self_type" : "type-2144", ++ "referenced_type" : "type-2141", ++ "self_type" : "type-2140", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, +@@ -22801,8 +24213,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2374", +- "self_type" : "type-2373", ++ "referenced_type" : "type-2370", ++ "self_type" : "type-2369", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22810,8 +24222,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2708", +- "self_type" : "type-2707", ++ "referenced_type" : "type-2701", ++ "self_type" : "type-2700", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -22819,8 +24231,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2841", +- "self_type" : "type-2840", ++ "referenced_type" : "type-2835", ++ "self_type" : "type-2834", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22828,8 +24240,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2853", +- "self_type" : "type-2852", ++ "referenced_type" : "type-2847", ++ "self_type" : "type-2846", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22837,8 +24249,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2962", +- "self_type" : "type-2961", ++ "referenced_type" : "type-2956", ++ "self_type" : "type-2955", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22846,8 +24258,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3014", +- "self_type" : "type-3013", ++ "referenced_type" : "type-3008", ++ "self_type" : "type-3007", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22855,8 +24267,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3066", +- "self_type" : "type-3065", ++ "referenced_type" : "type-3060", ++ "self_type" : "type-3059", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22864,8 +24276,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3138", +- "self_type" : "type-3137", ++ "referenced_type" : "type-3132", ++ "self_type" : "type-3131", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22873,8 +24285,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3195", +- "self_type" : "type-3194", ++ "referenced_type" : "type-3189", ++ "self_type" : "type-3188", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22891,8 +24303,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3709", +- "self_type" : "type-3708", ++ "referenced_type" : "type-3704", ++ "self_type" : "type-3703", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22900,8 +24312,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-737", +- "self_type" : "type-736", ++ "referenced_type" : "type-734", ++ "self_type" : "type-733", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -22909,8 +24321,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-898", +- "self_type" : "type-897", ++ "referenced_type" : "type-896", ++ "self_type" : "type-895", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22918,8 +24330,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-915", +- "self_type" : "type-914", ++ "referenced_type" : "type-913", ++ "self_type" : "type-912", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22927,8 +24339,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder **", + "name" : "android::hardware::BHwBinder **", +- "referenced_type" : "type-2144", +- "self_type" : "type-3409", ++ "referenced_type" : "type-2140", ++ "self_type" : "type-3403", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -22936,8 +24348,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *const *", + "name" : "android::hardware::BHwBinder *const *", +- "referenced_type" : "type-3413", +- "self_type" : "type-3414", ++ "referenced_type" : "type-3407", ++ "self_type" : "type-3408", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -22945,8 +24357,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder::Extras *", + "name" : "android::hardware::BHwBinder::Extras *", +- "referenced_type" : "type-2175", +- "self_type" : "type-2174", ++ "referenced_type" : "type-2171", ++ "self_type" : "type-2170", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -22954,8 +24366,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder::Extras *", + "name" : "android::hardware::BHwBinder::Extras *", +- "referenced_type" : "type-3293", +- "self_type" : "type-3292", ++ "referenced_type" : "type-3287", ++ "self_type" : "type-3286", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -22963,8 +24375,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BpHwBinder *", + "name" : "android::hardware::BpHwBinder *", +- "referenced_type" : "type-2148", +- "self_type" : "type-2147", ++ "referenced_type" : "type-2144", ++ "self_type" : "type-2143", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, +@@ -22972,8 +24384,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BpHwBinder::Obituary *", + "name" : "android::hardware::BpHwBinder::Obituary *", +- "referenced_type" : "type-2185", +- "self_type" : "type-2200", ++ "referenced_type" : "type-2181", ++ "self_type" : "type-2196", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -22981,8 +24393,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager *", + "name" : "android::hardware::BpHwBinder::ObjectManager *", +- "referenced_type" : "type-2152", +- "self_type" : "type-2235", ++ "referenced_type" : "type-2148", ++ "self_type" : "type-2231", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -22990,8 +24402,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BpHwRefBase *", + "name" : "android::hardware::BpHwRefBase *", +- "referenced_type" : "type-2176", +- "self_type" : "type-2180", ++ "referenced_type" : "type-2172", ++ "self_type" : "type-2176", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -22999,8 +24411,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BufferedTextOutput *", + "name" : "android::hardware::BufferedTextOutput *", +- "referenced_type" : "type-2314", +- "self_type" : "type-2315", ++ "referenced_type" : "type-2310", ++ "self_type" : "type-2311", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -23008,8 +24420,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *", + "name" : "android::hardware::BufferedTextOutput::BufferState *", +- "referenced_type" : "type-2281", +- "self_type" : "type-2280", ++ "referenced_type" : "type-2277", ++ "self_type" : "type-2276", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23017,8 +24429,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *", + "name" : "android::hardware::BufferedTextOutput::BufferState *", +- "referenced_type" : "type-3348", +- "self_type" : "type-3347", ++ "referenced_type" : "type-3342", ++ "self_type" : "type-3341", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23026,8 +24438,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *", + "name" : "android::hardware::BufferedTextOutput::BufferState *", +- "referenced_type" : "type-3700", +- "self_type" : "type-3699", ++ "referenced_type" : "type-3694", ++ "self_type" : "type-3693", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -23035,8 +24447,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *", + "name" : "android::hardware::BufferedTextOutput::ThreadState *", +- "referenced_type" : "type-2317", +- "self_type" : "type-2316", ++ "referenced_type" : "type-2313", ++ "self_type" : "type-2312", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -23044,8 +24456,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *", + "name" : "android::hardware::BufferedTextOutput::ThreadState *", +- "referenced_type" : "type-3374", +- "self_type" : "type-3373", ++ "referenced_type" : "type-3368", ++ "self_type" : "type-3367", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -23053,8 +24465,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ConcurrentMap, android::hardware::details::SchedPrio> *", + "name" : "android::hardware::ConcurrentMap, android::hardware::details::SchedPrio> *", +- "referenced_type" : "type-664", +- "self_type" : "type-667", ++ "referenced_type" : "type-663", ++ "self_type" : "type-666", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -23062,8 +24474,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ConcurrentMap, bool> *", + "name" : "android::hardware::ConcurrentMap, bool> *", +- "referenced_type" : "type-670", +- "self_type" : "type-673", ++ "referenced_type" : "type-668", ++ "self_type" : "type-671", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -23080,8 +24492,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", +- "referenced_type" : "type-587", +- "self_type" : "type-602", ++ "referenced_type" : "type-586", ++ "self_type" : "type-601", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -23089,8 +24501,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", +- "referenced_type" : "type-347", +- "self_type" : "type-365", ++ "referenced_type" : "type-346", ++ "self_type" : "type-364", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -23107,8 +24519,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::HexDump *", + "name" : "android::hardware::HexDump *", +- "referenced_type" : "type-2295", +- "self_type" : "type-2296", ++ "referenced_type" : "type-2291", ++ "self_type" : "type-2292", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -23125,8 +24537,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1048", +- "self_type" : "type-1047", ++ "referenced_type" : "type-1046", ++ "self_type" : "type-1045", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23134,8 +24546,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1103", +- "self_type" : "type-1102", ++ "referenced_type" : "type-1101", ++ "self_type" : "type-1100", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23143,8 +24555,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1252", +- "self_type" : "type-1251", ++ "referenced_type" : "type-1249", ++ "self_type" : "type-1248", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23152,8 +24564,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1342", +- "self_type" : "type-1341", ++ "referenced_type" : "type-1339", ++ "self_type" : "type-1338", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23161,8 +24573,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1408", +- "self_type" : "type-1407", ++ "referenced_type" : "type-1404", ++ "self_type" : "type-1403", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23170,8 +24582,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1532", +- "self_type" : "type-1531", ++ "referenced_type" : "type-1528", ++ "self_type" : "type-1527", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23179,8 +24591,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1668", +- "self_type" : "type-1667", ++ "referenced_type" : "type-1664", ++ "self_type" : "type-1663", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23188,8 +24600,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1705", +- "self_type" : "type-1704", ++ "referenced_type" : "type-1701", ++ "self_type" : "type-1700", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23197,8 +24609,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1723", +- "self_type" : "type-1722", ++ "referenced_type" : "type-1719", ++ "self_type" : "type-1718", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23206,8 +24618,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1827", +- "self_type" : "type-1826", ++ "referenced_type" : "type-1823", ++ "self_type" : "type-1822", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23215,8 +24627,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1880", +- "self_type" : "type-1879", ++ "referenced_type" : "type-1876", ++ "self_type" : "type-1875", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23224,8 +24636,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1934", +- "self_type" : "type-1933", ++ "referenced_type" : "type-1930", ++ "self_type" : "type-1929", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23233,8 +24645,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2008", +- "self_type" : "type-2007", ++ "referenced_type" : "type-2004", ++ "self_type" : "type-2003", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23242,8 +24654,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2066", +- "self_type" : "type-2065", ++ "referenced_type" : "type-2062", ++ "self_type" : "type-2061", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23251,8 +24663,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2136", +- "self_type" : "type-2135", ++ "referenced_type" : "type-2131", ++ "self_type" : "type-2130", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23260,8 +24672,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2140", +- "self_type" : "type-2141", ++ "referenced_type" : "type-2136", ++ "self_type" : "type-2137", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23269,8 +24681,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2400", +- "self_type" : "type-2399", ++ "referenced_type" : "type-2395", ++ "self_type" : "type-2394", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23278,8 +24690,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2488", +- "self_type" : "type-2487", ++ "referenced_type" : "type-2483", ++ "self_type" : "type-2482", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23287,8 +24699,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2553", +- "self_type" : "type-2552", ++ "referenced_type" : "type-2547", ++ "self_type" : "type-2546", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23296,8 +24708,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2670", +- "self_type" : "type-2669", ++ "referenced_type" : "type-2664", ++ "self_type" : "type-2663", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23305,8 +24717,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2806", +- "self_type" : "type-2805", ++ "referenced_type" : "type-2800", ++ "self_type" : "type-2799", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23314,8 +24726,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2843", +- "self_type" : "type-2842", ++ "referenced_type" : "type-2837", ++ "self_type" : "type-2836", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23323,8 +24735,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2861", +- "self_type" : "type-2860", ++ "referenced_type" : "type-2855", ++ "self_type" : "type-2854", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23332,8 +24744,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2965", +- "self_type" : "type-2964", ++ "referenced_type" : "type-2959", ++ "self_type" : "type-2958", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23341,8 +24753,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3018", +- "self_type" : "type-3017", ++ "referenced_type" : "type-3012", ++ "self_type" : "type-3011", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23350,8 +24762,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3071", +- "self_type" : "type-3070", ++ "referenced_type" : "type-3065", ++ "self_type" : "type-3064", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23359,8 +24771,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3143", +- "self_type" : "type-3142", ++ "referenced_type" : "type-3137", ++ "self_type" : "type-3136", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23368,8 +24780,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3198", +- "self_type" : "type-3197", ++ "referenced_type" : "type-3192", ++ "self_type" : "type-3191", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23377,8 +24789,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3267", +- "self_type" : "type-3266", ++ "referenced_type" : "type-3260", ++ "self_type" : "type-3259", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23386,8 +24798,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3737", +- "self_type" : "type-3736", ++ "referenced_type" : "type-3730", ++ "self_type" : "type-3729", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23395,8 +24807,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3826", +- "self_type" : "type-3825", ++ "referenced_type" : "type-3819", ++ "self_type" : "type-3818", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23404,8 +24816,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-385", +- "self_type" : "type-384", ++ "referenced_type" : "type-384", ++ "self_type" : "type-383", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23413,8 +24825,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3891", +- "self_type" : "type-3890", ++ "referenced_type" : "type-3883", ++ "self_type" : "type-3882", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23422,8 +24834,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-525", +- "self_type" : "type-524", ++ "referenced_type" : "type-524", ++ "self_type" : "type-523", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23431,8 +24843,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-615", +- "self_type" : "type-614", ++ "referenced_type" : "type-613", ++ "self_type" : "type-612", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23440,8 +24852,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-693", +- "self_type" : "type-692", ++ "referenced_type" : "type-691", ++ "self_type" : "type-690", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23449,8 +24861,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-863", +- "self_type" : "type-862", ++ "referenced_type" : "type-861", ++ "self_type" : "type-860", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23458,8 +24870,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-900", +- "self_type" : "type-899", ++ "referenced_type" : "type-898", ++ "self_type" : "type-897", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23467,8 +24879,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-926", +- "self_type" : "type-925", ++ "referenced_type" : "type-924", ++ "self_type" : "type-923", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23476,8 +24888,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-1094", +- "self_type" : "type-1093", ++ "referenced_type" : "type-1092", ++ "self_type" : "type-1091", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23485,8 +24897,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-1096", +- "self_type" : "type-1095", ++ "referenced_type" : "type-1094", ++ "self_type" : "type-1093", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23494,8 +24906,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-1707", +- "self_type" : "type-1706", ++ "referenced_type" : "type-1703", ++ "self_type" : "type-1702", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23503,8 +24915,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-1872", +- "self_type" : "type-1871", ++ "referenced_type" : "type-1868", ++ "self_type" : "type-1867", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23512,8 +24924,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-1874", +- "self_type" : "type-1873", ++ "referenced_type" : "type-1870", ++ "self_type" : "type-1869", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23521,8 +24933,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-1996", +- "self_type" : "type-1995", ++ "referenced_type" : "type-1992", ++ "self_type" : "type-1991", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23530,8 +24942,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-1999", +- "self_type" : "type-1998", ++ "referenced_type" : "type-1995", ++ "self_type" : "type-1994", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23539,8 +24951,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-2116", +- "self_type" : "type-2115", ++ "referenced_type" : "type-2112", ++ "self_type" : "type-2111", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23548,8 +24960,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-2190", +- "self_type" : "type-2191", ++ "referenced_type" : "type-2186", ++ "self_type" : "type-2187", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23557,8 +24969,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-2845", +- "self_type" : "type-2844", ++ "referenced_type" : "type-2839", ++ "self_type" : "type-2838", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23566,8 +24978,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-3010", +- "self_type" : "type-3009", ++ "referenced_type" : "type-3004", ++ "self_type" : "type-3003", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23575,8 +24987,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-3012", +- "self_type" : "type-3011", ++ "referenced_type" : "type-3006", ++ "self_type" : "type-3005", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23584,8 +24996,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-3132", +- "self_type" : "type-3131", ++ "referenced_type" : "type-3126", ++ "self_type" : "type-3125", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23593,8 +25005,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-3135", +- "self_type" : "type-3134", ++ "referenced_type" : "type-3129", ++ "self_type" : "type-3128", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23602,8 +25014,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-3247", +- "self_type" : "type-3246", ++ "referenced_type" : "type-3241", ++ "self_type" : "type-3240", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23611,8 +25023,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-903", +- "self_type" : "type-902", ++ "referenced_type" : "type-901", ++ "self_type" : "type-900", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23620,8 +25032,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-1050", +- "self_type" : "type-1049", ++ "referenced_type" : "type-1048", ++ "self_type" : "type-1047", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23629,8 +25041,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-1105", +- "self_type" : "type-1104", ++ "referenced_type" : "type-1103", ++ "self_type" : "type-1102", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23638,8 +25050,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-1726", +- "self_type" : "type-1725", ++ "referenced_type" : "type-1722", ++ "self_type" : "type-1721", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23647,8 +25059,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-1829", +- "self_type" : "type-1828", ++ "referenced_type" : "type-1825", ++ "self_type" : "type-1824", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23656,8 +25068,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-1882", +- "self_type" : "type-1881", ++ "referenced_type" : "type-1878", ++ "self_type" : "type-1877", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23665,8 +25077,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-1937", +- "self_type" : "type-1936", ++ "referenced_type" : "type-1933", ++ "self_type" : "type-1932", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23674,8 +25086,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-2011", +- "self_type" : "type-2010", ++ "referenced_type" : "type-2006", ++ "self_type" : "type-2005", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23683,8 +25095,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-2068", +- "self_type" : "type-2067", ++ "referenced_type" : "type-2064", ++ "self_type" : "type-2063", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23692,8 +25104,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-2186", +- "self_type" : "type-3405", ++ "referenced_type" : "type-2182", ++ "self_type" : "type-3399", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23701,8 +25113,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-2864", +- "self_type" : "type-2863", ++ "referenced_type" : "type-2858", ++ "self_type" : "type-2857", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23710,8 +25122,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-2967", +- "self_type" : "type-2966", ++ "referenced_type" : "type-2961", ++ "self_type" : "type-2960", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23719,8 +25131,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-3020", +- "self_type" : "type-3019", ++ "referenced_type" : "type-3014", ++ "self_type" : "type-3013", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23728,8 +25140,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-3074", +- "self_type" : "type-3073", ++ "referenced_type" : "type-3068", ++ "self_type" : "type-3067", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23737,8 +25149,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-3146", +- "self_type" : "type-3145", ++ "referenced_type" : "type-3139", ++ "self_type" : "type-3138", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23746,8 +25158,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-3200", +- "self_type" : "type-3199", ++ "referenced_type" : "type-3194", ++ "self_type" : "type-3193", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23755,8 +25167,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-930", +- "self_type" : "type-929", ++ "referenced_type" : "type-928", ++ "self_type" : "type-927", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23764,8 +25176,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IPCThreadState *", + "name" : "android::hardware::IPCThreadState *", +- "referenced_type" : "type-2244", +- "self_type" : "type-3446", ++ "referenced_type" : "type-2240", ++ "self_type" : "type-3440", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -23773,8 +25185,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::LazyServiceRegistrar *", + "name" : "android::hardware::LazyServiceRegistrar *", +- "referenced_type" : "type-484", +- "self_type" : "type-486", ++ "referenced_type" : "type-481", ++ "self_type" : "type-485", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -23782,8 +25194,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1006", +- "self_type" : "type-1005", ++ "referenced_type" : "type-1004", ++ "self_type" : "type-1003", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -23791,8 +25203,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1089", +- "self_type" : "type-1088", ++ "referenced_type" : "type-1087", ++ "self_type" : "type-1086", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -23800,8 +25212,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1147", +- "self_type" : "type-1146", ++ "referenced_type" : "type-1145", ++ "self_type" : "type-1144", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -23809,8 +25221,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1220", +- "self_type" : "type-1219", ++ "referenced_type" : "type-1218", ++ "self_type" : "type-1217", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -23818,8 +25230,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1788", +- "self_type" : "type-1787", ++ "referenced_type" : "type-1784", ++ "self_type" : "type-1783", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -23827,8 +25239,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1867", +- "self_type" : "type-1866", ++ "referenced_type" : "type-1863", ++ "self_type" : "type-1862", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -23836,8 +25248,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1923", +- "self_type" : "type-1922", ++ "referenced_type" : "type-1919", ++ "self_type" : "type-1918", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -23845,8 +25257,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1989", +- "self_type" : "type-1988", ++ "referenced_type" : "type-1985", ++ "self_type" : "type-1984", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -23854,8 +25266,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2042", +- "self_type" : "type-2041", ++ "referenced_type" : "type-2038", ++ "self_type" : "type-2037", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -23863,8 +25275,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2096", +- "self_type" : "type-2095", ++ "referenced_type" : "type-2092", ++ "self_type" : "type-2091", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -23872,8 +25284,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2160", +- "self_type" : "type-2159", ++ "referenced_type" : "type-2156", ++ "self_type" : "type-2155", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -23881,8 +25293,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2367", +- "self_type" : "type-2366", ++ "referenced_type" : "type-2363", ++ "self_type" : "type-2362", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -23890,8 +25302,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2926", +- "self_type" : "type-2925", ++ "referenced_type" : "type-2920", ++ "self_type" : "type-2919", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -23899,8 +25311,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3005", +- "self_type" : "type-3004", ++ "referenced_type" : "type-2999", ++ "self_type" : "type-2998", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -23908,8 +25320,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3061", +- "self_type" : "type-3060", ++ "referenced_type" : "type-3055", ++ "self_type" : "type-3054", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -23917,8 +25329,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3125", +- "self_type" : "type-3124", ++ "referenced_type" : "type-3119", ++ "self_type" : "type-3118", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -23926,8 +25338,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3176", +- "self_type" : "type-3175", ++ "referenced_type" : "type-3170", ++ "self_type" : "type-3169", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -23944,8 +25356,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3227", +- "self_type" : "type-3226", ++ "referenced_type" : "type-3221", ++ "self_type" : "type-3220", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -23953,8 +25365,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3689", +- "self_type" : "type-3688", ++ "referenced_type" : "type-3683", ++ "self_type" : "type-3682", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -23962,8 +25374,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::PassthroughServiceManager *", + "name" : "android::hardware::PassthroughServiceManager *", +- "referenced_type" : "type-1560", +- "self_type" : "type-1559", ++ "referenced_type" : "type-1556", ++ "self_type" : "type-1555", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23971,8 +25383,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::PassthroughServiceManager *", + "name" : "android::hardware::PassthroughServiceManager *", +- "referenced_type" : "type-2698", +- "self_type" : "type-2697", ++ "referenced_type" : "type-2692", ++ "self_type" : "type-2691", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23980,8 +25392,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::PassthroughServiceManager *", + "name" : "android::hardware::PassthroughServiceManager *", +- "referenced_type" : "type-722", +- "self_type" : "type-721", ++ "referenced_type" : "type-720", ++ "self_type" : "type-719", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23989,8 +25401,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::PoolThread *", + "name" : "android::hardware::PoolThread *", +- "referenced_type" : "type-3632", +- "self_type" : "type-3631", ++ "referenced_type" : "type-3626", ++ "self_type" : "type-3625", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23998,8 +25410,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1052", +- "self_type" : "type-1051", ++ "referenced_type" : "type-1050", ++ "self_type" : "type-1049", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24007,8 +25419,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1107", +- "self_type" : "type-1106", ++ "referenced_type" : "type-1105", ++ "self_type" : "type-1104", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24016,8 +25428,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1291", +- "self_type" : "type-1290", ++ "referenced_type" : "type-1288", ++ "self_type" : "type-1287", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24025,8 +25437,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1671", +- "self_type" : "type-1670", ++ "referenced_type" : "type-1667", ++ "self_type" : "type-1666", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24034,8 +25446,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1728", +- "self_type" : "type-1727", ++ "referenced_type" : "type-1724", ++ "self_type" : "type-1723", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24043,8 +25455,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1831", +- "self_type" : "type-1830", ++ "referenced_type" : "type-1827", ++ "self_type" : "type-1826", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24052,8 +25464,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1884", +- "self_type" : "type-1883", ++ "referenced_type" : "type-1880", ++ "self_type" : "type-1879", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24061,8 +25473,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1939", +- "self_type" : "type-1938", ++ "referenced_type" : "type-1935", ++ "self_type" : "type-1934", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24070,8 +25482,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2013", +- "self_type" : "type-2012", ++ "referenced_type" : "type-2009", ++ "self_type" : "type-2008", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24079,8 +25491,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2070", +- "self_type" : "type-2069", ++ "referenced_type" : "type-2066", ++ "self_type" : "type-2065", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24088,8 +25500,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2249", +- "self_type" : "type-2252", ++ "referenced_type" : "type-2245", ++ "self_type" : "type-2248", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24097,8 +25509,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2438", +- "self_type" : "type-2437", ++ "referenced_type" : "type-2433", ++ "self_type" : "type-2432", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24106,8 +25518,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2809", +- "self_type" : "type-2808", ++ "referenced_type" : "type-2803", ++ "self_type" : "type-2802", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24115,8 +25527,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2866", +- "self_type" : "type-2865", ++ "referenced_type" : "type-2860", ++ "self_type" : "type-2859", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24124,8 +25536,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2969", +- "self_type" : "type-2968", ++ "referenced_type" : "type-2963", ++ "self_type" : "type-2962", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24133,8 +25545,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3022", +- "self_type" : "type-3021", ++ "referenced_type" : "type-3016", ++ "self_type" : "type-3015", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24142,8 +25554,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3076", +- "self_type" : "type-3075", ++ "referenced_type" : "type-3070", ++ "self_type" : "type-3069", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24151,8 +25563,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3148", +- "self_type" : "type-3147", ++ "referenced_type" : "type-3142", ++ "self_type" : "type-3141", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24160,8 +25572,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3202", +- "self_type" : "type-3201", ++ "referenced_type" : "type-3196", ++ "self_type" : "type-3195", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24169,8 +25581,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3776", +- "self_type" : "type-3775", ++ "referenced_type" : "type-3769", ++ "self_type" : "type-3768", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24178,8 +25590,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-446", +- "self_type" : "type-445", ++ "referenced_type" : "type-445", ++ "self_type" : "type-444", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24187,8 +25599,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-866", +- "self_type" : "type-865", ++ "referenced_type" : "type-864", ++ "self_type" : "type-863", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24196,8 +25608,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-933", +- "self_type" : "type-932", ++ "referenced_type" : "type-931", ++ "self_type" : "type-930", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24205,8 +25617,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState::handle_entry *", + "name" : "android::hardware::ProcessState::handle_entry *", +- "referenced_type" : "type-2227", +- "self_type" : "type-3617", ++ "referenced_type" : "type-2223", ++ "self_type" : "type-3611", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -24214,8 +25626,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return *", + "name" : "android::hardware::Return *", +- "referenced_type" : "type-765", +- "self_type" : "type-766", ++ "referenced_type" : "type-763", ++ "self_type" : "type-764", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24223,8 +25635,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-758", +- "self_type" : "type-759", ++ "referenced_type" : "type-756", ++ "self_type" : "type-757", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24232,8 +25644,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-945", +- "self_type" : "type-946", ++ "referenced_type" : "type-943", ++ "self_type" : "type-944", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24241,8 +25653,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-1054", +- "self_type" : "type-1055", ++ "referenced_type" : "type-1052", ++ "self_type" : "type-1053", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24250,8 +25662,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-1111", +- "self_type" : "type-1112", ++ "referenced_type" : "type-1109", ++ "self_type" : "type-1110", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24259,8 +25671,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-1946", +- "self_type" : "type-1947", ++ "referenced_type" : "type-1942", ++ "self_type" : "type-1943", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24268,8 +25680,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-2016", +- "self_type" : "type-2017", ++ "referenced_type" : "type-2012", ++ "self_type" : "type-2013", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24304,8 +25716,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)", + "name" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)", +- "referenced_type" : "type-2289", +- "self_type" : "type-2290", ++ "referenced_type" : "type-2285", ++ "self_type" : "type-2286", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -24313,8 +25725,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput *", + "name" : "android::hardware::TextOutput *", +- "referenced_type" : "type-2283", +- "self_type" : "type-3706", ++ "referenced_type" : "type-2279", ++ "self_type" : "type-3700", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -24322,8 +25734,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput::Bundle *", + "name" : "android::hardware::TextOutput::Bundle *", +- "referenced_type" : "type-2284", +- "self_type" : "type-2286", ++ "referenced_type" : "type-2280", ++ "self_type" : "type-2282", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -24331,8 +25743,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TypeCode *", + "name" : "android::hardware::TypeCode *", +- "referenced_type" : "type-2291", +- "self_type" : "type-2292", ++ "referenced_type" : "type-2287", ++ "self_type" : "type-2288", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -24340,8 +25752,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::ClientCounterCallback *", + "name" : "android::hardware::details::ClientCounterCallback *", +- "referenced_type" : "type-1360", +- "self_type" : "type-1359", ++ "referenced_type" : "type-1357", ++ "self_type" : "type-1356", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24349,8 +25761,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::ClientCounterCallback *", + "name" : "android::hardware::details::ClientCounterCallback *", +- "referenced_type" : "type-2506", +- "self_type" : "type-2505", ++ "referenced_type" : "type-2501", ++ "self_type" : "type-2500", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24358,8 +25770,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::ClientCounterCallback *", + "name" : "android::hardware::details::ClientCounterCallback *", +- "referenced_type" : "type-3844", +- "self_type" : "type-3843", ++ "referenced_type" : "type-3837", ++ "self_type" : "type-3836", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24367,8 +25779,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::ClientCounterCallback *", + "name" : "android::hardware::details::ClientCounterCallback *", +- "referenced_type" : "type-552", +- "self_type" : "type-551", ++ "referenced_type" : "type-551", ++ "self_type" : "type-550", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24376,8 +25788,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::DoNotDestruct, android::hardware::details::SchedPrio> > *", + "name" : "android::hardware::details::DoNotDestruct, android::hardware::details::SchedPrio> > *", +- "referenced_type" : "type-674", +- "self_type" : "type-677", ++ "referenced_type" : "type-672", ++ "self_type" : "type-675", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -24385,8 +25797,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::DoNotDestruct, bool> > *", + "name" : "android::hardware::details::DoNotDestruct, bool> > *", +- "referenced_type" : "type-678", +- "self_type" : "type-680", ++ "referenced_type" : "type-676", ++ "self_type" : "type-678", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -24394,8 +25806,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::DoNotDestruct > > *", + "name" : "android::hardware::details::DoNotDestruct > > *", +- "referenced_type" : "type-361", +- "self_type" : "type-363", ++ "referenced_type" : "type-360", ++ "self_type" : "type-362", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -24403,8 +25815,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > > *", + "name" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > > *", +- "referenced_type" : "type-601", +- "self_type" : "type-603", ++ "referenced_type" : "type-600", ++ "self_type" : "type-602", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -24412,8 +25824,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > > *", + "name" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > > *", +- "referenced_type" : "type-364", +- "self_type" : "type-366", ++ "referenced_type" : "type-363", ++ "self_type" : "type-365", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -24422,7 +25834,7 @@ + "linker_set_key" : "android::hardware::details::HidlInstrumentor *", + "name" : "android::hardware::details::HidlInstrumentor *", + "referenced_type" : "type-128", +- "self_type" : "type-583", ++ "self_type" : "type-582", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24439,8 +25851,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::Waiter *", + "name" : "android::hardware::details::Waiter *", +- "referenced_type" : "type-1573", +- "self_type" : "type-1572", ++ "referenced_type" : "type-1569", ++ "self_type" : "type-1568", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24448,8 +25860,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::Waiter *", + "name" : "android::hardware::details::Waiter *", +- "referenced_type" : "type-2711", +- "self_type" : "type-2710", ++ "referenced_type" : "type-2705", ++ "self_type" : "type-2704", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24457,8 +25869,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::Waiter *", + "name" : "android::hardware::details::Waiter *", +- "referenced_type" : "type-740", +- "self_type" : "type-739", ++ "referenced_type" : "type-738", ++ "self_type" : "type-737", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24466,8 +25878,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer > *", + "name" : "android::hardware::details::hidl_pointer > *", +- "referenced_type" : "type-969", +- "self_type" : "type-1035", ++ "referenced_type" : "type-967", ++ "self_type" : "type-1033", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24475,8 +25887,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer *", + "name" : "android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-571", +- "self_type" : "type-1031", ++ "referenced_type" : "type-570", ++ "self_type" : "type-1029", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24484,8 +25896,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer *", + "name" : "android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-793", +- "self_type" : "type-808", ++ "referenced_type" : "type-791", ++ "self_type" : "type-806", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24503,7 +25915,7 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer *", + "name" : "android::hardware::details::hidl_pointer *", + "referenced_type" : "type-9", +- "self_type" : "type-493", ++ "self_type" : "type-494", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24511,8 +25923,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer *", + "name" : "android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-473", +- "self_type" : "type-776", ++ "referenced_type" : "type-472", ++ "self_type" : "type-772", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24529,8 +25941,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_array *", + "name" : "android::hardware::hidl_array *", +- "referenced_type" : "type-972", +- "self_type" : "type-971", ++ "referenced_type" : "type-970", ++ "self_type" : "type-969", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24583,8 +25995,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec > *", + "name" : "android::hardware::hidl_vec > *", +- "referenced_type" : "type-968", +- "self_type" : "type-974", ++ "referenced_type" : "type-966", ++ "self_type" : "type-972", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -24592,8 +26004,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec *", + "name" : "android::hardware::hidl_vec *", +- "referenced_type" : "type-570", +- "self_type" : "type-964", ++ "referenced_type" : "type-569", ++ "self_type" : "type-961", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -24601,8 +26013,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec *", + "name" : "android::hardware::hidl_vec *", +- "referenced_type" : "type-792", +- "self_type" : "type-796", ++ "referenced_type" : "type-790", ++ "self_type" : "type-794", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -24610,8 +26022,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec::iter *", + "name" : "android::hardware::hidl_vec::iter *", +- "referenced_type" : "type-575", +- "self_type" : "type-578", ++ "referenced_type" : "type-574", ++ "self_type" : "type-577", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -24619,8 +26031,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec *", + "name" : "android::hardware::hidl_vec *", +- "referenced_type" : "type-472", +- "self_type" : "type-784", ++ "referenced_type" : "type-471", ++ "self_type" : "type-782", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -24646,8 +26058,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::base::V1_0::BpHwBase *", + "name" : "android::hidl::base::V1_0::BpHwBase *", +- "referenced_type" : "type-368", +- "self_type" : "type-920", ++ "referenced_type" : "type-367", ++ "self_type" : "type-918", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24655,8 +26067,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::base::V1_0::BsBase *", + "name" : "android::hidl::base::V1_0::BsBase *", +- "referenced_type" : "type-2062", +- "self_type" : "type-2064", ++ "referenced_type" : "type-2058", ++ "self_type" : "type-2060", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24673,8 +26085,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager *", + "name" : "android::hidl::manager::V1_0::BnHwServiceManager *", +- "referenced_type" : "type-828", +- "self_type" : "type-829", ++ "referenced_type" : "type-826", ++ "self_type" : "type-827", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h" + }, +@@ -24682,8 +26094,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification *", + "name" : "android::hidl::manager::V1_0::BnHwServiceNotification *", +- "referenced_type" : "type-820", +- "self_type" : "type-821", ++ "referenced_type" : "type-818", ++ "self_type" : "type-819", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -24691,8 +26103,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager *", + "name" : "android::hidl::manager::V1_0::BpHwServiceManager *", +- "referenced_type" : "type-830", +- "self_type" : "type-919", ++ "referenced_type" : "type-828", ++ "self_type" : "type-917", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24700,8 +26112,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification *", + "name" : "android::hidl::manager::V1_0::BpHwServiceNotification *", +- "referenced_type" : "type-822", +- "self_type" : "type-938", ++ "referenced_type" : "type-820", ++ "self_type" : "type-935", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24709,8 +26121,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager *", + "name" : "android::hidl::manager::V1_0::BsServiceManager *", +- "referenced_type" : "type-917", +- "self_type" : "type-918", ++ "referenced_type" : "type-914", ++ "self_type" : "type-916", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24718,8 +26130,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification *", + "name" : "android::hidl::manager::V1_0::BsServiceNotification *", +- "referenced_type" : "type-1045", +- "self_type" : "type-1046", ++ "referenced_type" : "type-1043", ++ "self_type" : "type-1044", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24727,8 +26139,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager *", + "name" : "android::hidl::manager::V1_0::IServiceManager *", +- "referenced_type" : "type-504", +- "self_type" : "type-527", ++ "referenced_type" : "type-503", ++ "self_type" : "type-526", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24736,8 +26148,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *", + "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *", +- "referenced_type" : "type-502", +- "self_type" : "type-795", ++ "referenced_type" : "type-501", ++ "self_type" : "type-793", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24745,8 +26157,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *", + "name" : "android::hidl::manager::V1_0::IServiceNotification *", +- "referenced_type" : "type-495", +- "self_type" : "type-543", ++ "referenced_type" : "type-493", ++ "self_type" : "type-542", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24754,8 +26166,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager *", + "name" : "android::hidl::manager::V1_1::BnHwServiceManager *", +- "referenced_type" : "type-837", +- "self_type" : "type-838", ++ "referenced_type" : "type-835", ++ "self_type" : "type-836", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -24763,8 +26175,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager *", + "name" : "android::hidl::manager::V1_1::BpHwServiceManager *", +- "referenced_type" : "type-839", +- "self_type" : "type-1101", ++ "referenced_type" : "type-837", ++ "self_type" : "type-1099", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24772,8 +26184,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager *", + "name" : "android::hidl::manager::V1_1::BsServiceManager *", +- "referenced_type" : "type-1099", +- "self_type" : "type-1100", ++ "referenced_type" : "type-1097", ++ "self_type" : "type-1098", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24781,8 +26193,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager *", + "name" : "android::hidl::manager::V1_1::IServiceManager *", +- "referenced_type" : "type-514", +- "self_type" : "type-532", ++ "referenced_type" : "type-513", ++ "self_type" : "type-531", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24790,8 +26202,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback *", + "name" : "android::hidl::manager::V1_2::BnHwClientCallback *", +- "referenced_type" : "type-846", +- "self_type" : "type-847", ++ "referenced_type" : "type-843", ++ "self_type" : "type-844", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -24799,8 +26211,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager *", + "name" : "android::hidl::manager::V1_2::BnHwServiceManager *", +- "referenced_type" : "type-803", +- "self_type" : "type-854", ++ "referenced_type" : "type-801", ++ "self_type" : "type-852", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h" + }, +@@ -24808,8 +26220,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback *", + "name" : "android::hidl::manager::V1_2::BpHwClientCallback *", +- "referenced_type" : "type-848", +- "self_type" : "type-1931", ++ "referenced_type" : "type-846", ++ "self_type" : "type-1927", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24817,8 +26229,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager *", + "name" : "android::hidl::manager::V1_2::BpHwServiceManager *", +- "referenced_type" : "type-729", +- "self_type" : "type-733", ++ "referenced_type" : "type-726", ++ "self_type" : "type-731", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24826,8 +26238,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback *", + "name" : "android::hidl::manager::V1_2::BsClientCallback *", +- "referenced_type" : "type-1929", +- "self_type" : "type-1930", ++ "referenced_type" : "type-1925", ++ "self_type" : "type-1926", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24835,8 +26247,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager *", + "name" : "android::hidl::manager::V1_2::BsServiceManager *", +- "referenced_type" : "type-2004", +- "self_type" : "type-2005", ++ "referenced_type" : "type-2000", ++ "self_type" : "type-2001", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24844,8 +26256,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback *", + "name" : "android::hidl::manager::V1_2::IClientCallback *", +- "referenced_type" : "type-498", +- "self_type" : "type-549", ++ "referenced_type" : "type-497", ++ "self_type" : "type-547", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24853,8 +26265,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager *", + "name" : "android::hidl::manager::V1_2::IServiceManager *", +- "referenced_type" : "type-517", +- "self_type" : "type-538", ++ "referenced_type" : "type-516", ++ "self_type" : "type-536", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24862,8 +26274,8 @@ + "alignment" : 4, + "linker_set_key" : "android::key_value_pair_t > *", + "name" : "android::key_value_pair_t > *", +- "referenced_type" : "type-3615", +- "self_type" : "type-3618", ++ "referenced_type" : "type-3609", ++ "self_type" : "type-3612", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -24871,8 +26283,8 @@ + "alignment" : 4, + "linker_set_key" : "android::key_value_pair_t *", + "name" : "android::key_value_pair_t *", +- "referenced_type" : "type-2195", +- "self_type" : "type-2199", ++ "referenced_type" : "type-2191", ++ "self_type" : "type-2195", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -24880,8 +26292,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-452", +- "self_type" : "type-3630", ++ "referenced_type" : "type-450", ++ "self_type" : "type-3624", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24889,8 +26301,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-425", +- "self_type" : "type-456", ++ "referenced_type" : "type-424", ++ "self_type" : "type-455", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24898,8 +26310,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-2279", +- "self_type" : "type-2312", ++ "referenced_type" : "type-2275", ++ "self_type" : "type-2308", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -24916,8 +26328,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-922", +- "self_type" : "type-924", ++ "referenced_type" : "type-920", ++ "self_type" : "type-922", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24925,8 +26337,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-383", +- "self_type" : "type-435", ++ "referenced_type" : "type-382", ++ "self_type" : "type-434", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24934,8 +26346,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-720", +- "self_type" : "type-743", ++ "referenced_type" : "type-718", ++ "self_type" : "type-741", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24943,8 +26355,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-444", +- "self_type" : "type-448", ++ "referenced_type" : "type-443", ++ "self_type" : "type-447", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24952,8 +26364,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-555", +- "self_type" : "type-557", ++ "referenced_type" : "type-554", ++ "self_type" : "type-556", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24961,8 +26373,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-744", +- "self_type" : "type-746", ++ "referenced_type" : "type-742", ++ "self_type" : "type-744", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24970,8 +26382,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-908", +- "self_type" : "type-941", ++ "referenced_type" : "type-906", ++ "self_type" : "type-939", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24980,7 +26392,7 @@ + "linker_set_key" : "android::sp *", + "name" : "android::sp *", + "referenced_type" : "type-81", +- "self_type" : "type-428", ++ "self_type" : "type-427", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24989,7 +26401,7 @@ + "linker_set_key" : "android::sp *", + "name" : "android::sp *", + "referenced_type" : "type-300", +- "self_type" : "type-433", ++ "self_type" : "type-432", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24997,8 +26409,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-526", +- "self_type" : "type-528", ++ "referenced_type" : "type-525", ++ "self_type" : "type-527", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25006,8 +26418,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-542", +- "self_type" : "type-544", ++ "referenced_type" : "type-541", ++ "self_type" : "type-543", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25015,8 +26427,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-531", +- "self_type" : "type-533", ++ "referenced_type" : "type-530", ++ "self_type" : "type-532", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25024,8 +26436,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-548", +- "self_type" : "type-550", ++ "referenced_type" : "type-546", ++ "self_type" : "type-549", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25033,8 +26445,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-537", +- "self_type" : "type-539", ++ "referenced_type" : "type-535", ++ "self_type" : "type-538", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25043,7 +26455,7 @@ + "linker_set_key" : "android::wp *", + "name" : "android::wp *", + "referenced_type" : "type-331", +- "self_type" : "type-421", ++ "self_type" : "type-419", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25051,8 +26463,8 @@ + "alignment" : 4, + "linker_set_key" : "android::wp *", + "name" : "android::wp *", +- "referenced_type" : "type-901", +- "self_type" : "type-906", ++ "referenced_type" : "type-899", ++ "self_type" : "type-904", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25060,8 +26472,8 @@ + "alignment" : 4, + "linker_set_key" : "android::wp *", + "name" : "android::wp *", +- "referenced_type" : "type-2193", +- "self_type" : "type-2192", ++ "referenced_type" : "type-2189", ++ "self_type" : "type-2188", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25070,7 +26482,7 @@ + "linker_set_key" : "android::wp *", + "name" : "android::wp *", + "referenced_type" : "type-307", +- "self_type" : "type-416", ++ "self_type" : "type-415", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25096,8 +26508,8 @@ + "alignment" : 4, + "linker_set_key" : "bool (*)(const android::String16 &, const android::sp &, void *)", + "name" : "bool (*)(const android::String16 &, const android::sp &, void *)", +- "referenced_type" : "type-2240", +- "self_type" : "type-2242", ++ "referenced_type" : "type-2236", ++ "self_type" : "type-2238", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, +@@ -25106,7 +26518,7 @@ + "linker_set_key" : "bool *", + "name" : "bool *", + "referenced_type" : "type-29", +- "self_type" : "type-3588", ++ "self_type" : "type-3582", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -25132,8 +26544,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::KeyedVector > *", + "name" : "const android::KeyedVector > *", +- "referenced_type" : "type-3643", +- "self_type" : "type-3645", ++ "referenced_type" : "type-3637", ++ "self_type" : "type-3639", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -25141,8 +26553,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::KeyedVector *", + "name" : "const android::KeyedVector *", +- "referenced_type" : "type-2229", +- "self_type" : "type-2230", ++ "referenced_type" : "type-2225", ++ "self_type" : "type-2226", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -25168,8 +26580,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::SortedVector > > *", + "name" : "const android::SortedVector > > *", +- "referenced_type" : "type-3634", +- "self_type" : "type-3635", ++ "referenced_type" : "type-3628", ++ "self_type" : "type-3629", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -25177,8 +26589,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::SortedVector > *", + "name" : "const android::SortedVector > *", +- "referenced_type" : "type-2219", +- "self_type" : "type-2220", ++ "referenced_type" : "type-2215", ++ "self_type" : "type-2216", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -25204,8 +26616,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-3438", +- "self_type" : "type-3439", ++ "referenced_type" : "type-3432", ++ "self_type" : "type-3433", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25213,8 +26625,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-3434", +- "self_type" : "type-3435", ++ "referenced_type" : "type-3428", ++ "self_type" : "type-3429", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25231,8 +26643,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-3430", +- "self_type" : "type-3431", ++ "referenced_type" : "type-3424", ++ "self_type" : "type-3425", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25240,8 +26652,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-2224", +- "self_type" : "type-2225", ++ "referenced_type" : "type-2220", ++ "self_type" : "type-2221", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25249,8 +26661,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-3638", +- "self_type" : "type-3639", ++ "referenced_type" : "type-3632", ++ "self_type" : "type-3633", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25258,8 +26670,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector > *", + "name" : "const android::Vector > *", +- "referenced_type" : "type-2330", +- "self_type" : "type-2331", ++ "referenced_type" : "type-2326", ++ "self_type" : "type-2327", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25267,8 +26679,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-2323", +- "self_type" : "type-2324", ++ "referenced_type" : "type-2319", ++ "self_type" : "type-2320", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25285,8 +26697,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BHwBinder *", + "name" : "const android::hardware::BHwBinder *", +- "referenced_type" : "type-2172", +- "self_type" : "type-2173", ++ "referenced_type" : "type-2168", ++ "self_type" : "type-2169", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -25294,8 +26706,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BpHwBinder *", + "name" : "const android::hardware::BpHwBinder *", +- "referenced_type" : "type-2183", +- "self_type" : "type-2184", ++ "referenced_type" : "type-2179", ++ "self_type" : "type-2180", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -25303,8 +26715,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BpHwBinder::Obituary *", + "name" : "const android::hardware::BpHwBinder::Obituary *", +- "referenced_type" : "type-2202", +- "self_type" : "type-2203", ++ "referenced_type" : "type-2198", ++ "self_type" : "type-2199", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -25312,8 +26724,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager *", + "name" : "const android::hardware::BpHwBinder::ObjectManager *", +- "referenced_type" : "type-2236", +- "self_type" : "type-2237", ++ "referenced_type" : "type-2232", ++ "self_type" : "type-2233", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -25321,8 +26733,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BpHwRefBase *", + "name" : "const android::hardware::BpHwRefBase *", +- "referenced_type" : "type-2181", +- "self_type" : "type-2182", ++ "referenced_type" : "type-2177", ++ "self_type" : "type-2178", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -25330,8 +26742,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BufferedTextOutput *", + "name" : "const android::hardware::BufferedTextOutput *", +- "referenced_type" : "type-2318", +- "self_type" : "type-2319", ++ "referenced_type" : "type-2314", ++ "self_type" : "type-2315", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -25339,8 +26751,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::ConcurrentMap, android::hardware::details::SchedPrio> *", + "name" : "const android::hardware::ConcurrentMap, android::hardware::details::SchedPrio> *", +- "referenced_type" : "type-1012", +- "self_type" : "type-1013", ++ "referenced_type" : "type-1010", ++ "self_type" : "type-1011", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -25348,8 +26760,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::ConcurrentMap, bool> *", + "name" : "const android::hardware::ConcurrentMap, bool> *", +- "referenced_type" : "type-1014", +- "self_type" : "type-1016", ++ "referenced_type" : "type-1012", ++ "self_type" : "type-1013", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -25357,8 +26769,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::ConcurrentMap > *", + "name" : "const android::hardware::ConcurrentMap > *", +- "referenced_type" : "type-343", +- "self_type" : "type-344", ++ "referenced_type" : "type-344", ++ "self_type" : "type-345", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -25366,8 +26778,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", + "name" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", +- "referenced_type" : "type-596", +- "self_type" : "type-597", ++ "referenced_type" : "type-594", ++ "self_type" : "type-596", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -25375,8 +26787,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", + "name" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", +- "referenced_type" : "type-355", +- "self_type" : "type-357", ++ "referenced_type" : "type-354", ++ "self_type" : "type-355", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -25384,8 +26796,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::HexDump *", + "name" : "const android::hardware::HexDump *", +- "referenced_type" : "type-2298", +- "self_type" : "type-2299", ++ "referenced_type" : "type-2294", ++ "self_type" : "type-2295", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -25393,8 +26805,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IBinder *", + "name" : "const android::hardware::IBinder *", +- "referenced_type" : "type-1287", +- "self_type" : "type-1289", ++ "referenced_type" : "type-1284", ++ "self_type" : "type-1286", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25402,8 +26814,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IBinder *", + "name" : "const android::hardware::IBinder *", +- "referenced_type" : "type-2142", +- "self_type" : "type-2143", ++ "referenced_type" : "type-2138", ++ "self_type" : "type-2139", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, +@@ -25411,8 +26823,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IBinder *", + "name" : "const android::hardware::IBinder *", +- "referenced_type" : "type-2434", +- "self_type" : "type-2436", ++ "referenced_type" : "type-2429", ++ "self_type" : "type-2431", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25420,8 +26832,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IBinder *", + "name" : "const android::hardware::IBinder *", +- "referenced_type" : "type-3772", +- "self_type" : "type-3774", ++ "referenced_type" : "type-3765", ++ "self_type" : "type-3767", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25429,8 +26841,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IBinder *", + "name" : "const android::hardware::IBinder *", +- "referenced_type" : "type-441", +- "self_type" : "type-443", ++ "referenced_type" : "type-440", ++ "self_type" : "type-442", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25438,8 +26850,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IBinder::DeathRecipient *", + "name" : "const android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-2231", +- "self_type" : "type-2232", ++ "referenced_type" : "type-2227", ++ "self_type" : "type-2228", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25447,8 +26859,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IInterface *", + "name" : "const android::hardware::IInterface *", +- "referenced_type" : "type-3407", +- "self_type" : "type-3408", ++ "referenced_type" : "type-3401", ++ "self_type" : "type-3402", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25456,8 +26868,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IPCThreadState *", + "name" : "const android::hardware::IPCThreadState *", +- "referenced_type" : "type-3447", +- "self_type" : "type-3449", ++ "referenced_type" : "type-3441", ++ "self_type" : "type-3443", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -25465,8 +26877,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel *", + "name" : "const android::hardware::Parcel *", +- "referenced_type" : "type-2165", +- "self_type" : "type-3573", ++ "referenced_type" : "type-2161", ++ "self_type" : "type-3567", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -25474,8 +26886,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::ProcessState *", + "name" : "const android::hardware::ProcessState *", +- "referenced_type" : "type-3656", +- "self_type" : "type-3657", ++ "referenced_type" : "type-3650", ++ "self_type" : "type-3651", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25483,8 +26895,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::ProcessState::handle_entry *", + "name" : "const android::hardware::ProcessState::handle_entry *", +- "referenced_type" : "type-3619", +- "self_type" : "type-3620", ++ "referenced_type" : "type-3613", ++ "self_type" : "type-3614", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -25492,8 +26904,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return *", + "name" : "const android::hardware::Return *", +- "referenced_type" : "type-769", +- "self_type" : "type-770", ++ "referenced_type" : "type-767", ++ "self_type" : "type-768", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25501,8 +26913,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-763", +- "self_type" : "type-764", ++ "referenced_type" : "type-760", ++ "self_type" : "type-762", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25510,8 +26922,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-949", +- "self_type" : "type-951", ++ "referenced_type" : "type-947", ++ "self_type" : "type-948", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25519,8 +26931,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-1058", +- "self_type" : "type-1059", ++ "referenced_type" : "type-1056", ++ "self_type" : "type-1057", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25528,8 +26940,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-1115", +- "self_type" : "type-1116", ++ "referenced_type" : "type-1113", ++ "self_type" : "type-1114", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25537,8 +26949,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-1950", +- "self_type" : "type-1951", ++ "referenced_type" : "type-1946", ++ "self_type" : "type-1947", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25546,8 +26958,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-2020", +- "self_type" : "type-2021", ++ "referenced_type" : "type-2016", ++ "self_type" : "type-2017", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25555,8 +26967,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return *", + "name" : "const android::hardware::Return *", +- "referenced_type" : "type-459", +- "self_type" : "type-460", ++ "referenced_type" : "type-458", ++ "self_type" : "type-459", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25573,8 +26985,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::TypeCode *", + "name" : "const android::hardware::TypeCode *", +- "referenced_type" : "type-2293", +- "self_type" : "type-2294", ++ "referenced_type" : "type-2289", ++ "self_type" : "type-2290", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -25582,8 +26994,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::Waiter *", + "name" : "const android::hardware::details::Waiter *", +- "referenced_type" : "type-1586", +- "self_type" : "type-1588", ++ "referenced_type" : "type-1582", ++ "self_type" : "type-1584", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25591,8 +27003,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::Waiter *", + "name" : "const android::hardware::details::Waiter *", +- "referenced_type" : "type-2724", +- "self_type" : "type-2726", ++ "referenced_type" : "type-2718", ++ "self_type" : "type-2720", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25600,8 +27012,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::Waiter *", + "name" : "const android::hardware::details::Waiter *", +- "referenced_type" : "type-755", +- "self_type" : "type-757", ++ "referenced_type" : "type-753", ++ "self_type" : "type-755", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25609,8 +27021,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::hidl_pointer > *", + "name" : "const android::hardware::details::hidl_pointer > *", +- "referenced_type" : "type-1037", +- "self_type" : "type-1038", ++ "referenced_type" : "type-1035", ++ "self_type" : "type-1036", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -25618,8 +27030,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::hidl_pointer *", + "name" : "const android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-606", +- "self_type" : "type-607", ++ "referenced_type" : "type-605", ++ "self_type" : "type-606", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -25627,8 +27039,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::hidl_pointer *", + "name" : "const android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-812", +- "self_type" : "type-813", ++ "referenced_type" : "type-810", ++ "self_type" : "type-811", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -25654,8 +27066,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::hidl_pointer *", + "name" : "const android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-491", +- "self_type" : "type-492", ++ "referenced_type" : "type-490", ++ "self_type" : "type-491", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -25672,8 +27084,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_array *", + "name" : "const android::hardware::hidl_array *", +- "referenced_type" : "type-2083", +- "self_type" : "type-2082", ++ "referenced_type" : "type-2079", ++ "self_type" : "type-2078", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -25681,8 +27093,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_death_recipient *", + "name" : "const android::hardware::hidl_death_recipient *", +- "referenced_type" : "type-431", +- "self_type" : "type-432", ++ "referenced_type" : "type-429", ++ "self_type" : "type-431", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25717,8 +27129,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec > *", + "name" : "const android::hardware::hidl_vec > *", +- "referenced_type" : "type-2084", +- "self_type" : "type-2085", ++ "referenced_type" : "type-2080", ++ "self_type" : "type-2081", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -25726,8 +27138,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec *", + "name" : "const android::hardware::hidl_vec *", +- "referenced_type" : "type-573", +- "self_type" : "type-574", ++ "referenced_type" : "type-572", ++ "self_type" : "type-573", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -25735,8 +27147,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec *", + "name" : "const android::hardware::hidl_vec *", +- "referenced_type" : "type-982", +- "self_type" : "type-983", ++ "referenced_type" : "type-980", ++ "self_type" : "type-981", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -25744,8 +27156,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec::iter *", + "name" : "const android::hardware::hidl_vec::iter *", +- "referenced_type" : "type-580", +- "self_type" : "type-581", ++ "referenced_type" : "type-579", ++ "self_type" : "type-580", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -25753,8 +27165,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec *", + "name" : "const android::hardware::hidl_vec *", +- "referenced_type" : "type-476", +- "self_type" : "type-477", ++ "referenced_type" : "type-475", ++ "self_type" : "type-476", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -25771,8 +27183,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase *", + "name" : "const android::hidl::base::V1_0::BpHwBase *", +- "referenced_type" : "type-372", +- "self_type" : "type-373", ++ "referenced_type" : "type-371", ++ "self_type" : "type-372", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, +@@ -25789,8 +27201,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceManager *", + "name" : "const android::hidl::manager::V1_0::BpHwServiceManager *", +- "referenced_type" : "type-835", +- "self_type" : "type-836", ++ "referenced_type" : "type-832", ++ "self_type" : "type-833", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, +@@ -25798,8 +27210,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceNotification *", + "name" : "const android::hidl::manager::V1_0::BpHwServiceNotification *", +- "referenced_type" : "type-826", +- "self_type" : "type-827", ++ "referenced_type" : "type-824", ++ "self_type" : "type-825", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, +@@ -25807,8 +27219,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager *", + "name" : "const android::hidl::manager::V1_0::IServiceManager *", +- "referenced_type" : "type-503", +- "self_type" : "type-505", ++ "referenced_type" : "type-502", ++ "self_type" : "type-504", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -25816,8 +27228,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *", + "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *", +- "referenced_type" : "type-981", +- "self_type" : "type-980", ++ "referenced_type" : "type-979", ++ "self_type" : "type-978", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -25825,8 +27237,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *", + "name" : "const android::hidl::manager::V1_0::IServiceNotification *", +- "referenced_type" : "type-494", +- "self_type" : "type-496", ++ "referenced_type" : "type-492", ++ "self_type" : "type-495", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, +@@ -25834,8 +27246,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_1::BpHwServiceManager *", + "name" : "const android::hidl::manager::V1_1::BpHwServiceManager *", +- "referenced_type" : "type-843", +- "self_type" : "type-844", ++ "referenced_type" : "type-841", ++ "self_type" : "type-842", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, +@@ -25843,8 +27255,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_1::IServiceManager *", + "name" : "const android::hidl::manager::V1_1::IServiceManager *", +- "referenced_type" : "type-513", +- "self_type" : "type-515", ++ "referenced_type" : "type-512", ++ "self_type" : "type-514", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, +@@ -25852,8 +27264,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_2::BpHwClientCallback *", + "name" : "const android::hidl::manager::V1_2::BpHwClientCallback *", +- "referenced_type" : "type-852", +- "self_type" : "type-853", ++ "referenced_type" : "type-850", ++ "self_type" : "type-851", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, +@@ -25861,8 +27273,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_2::BpHwServiceManager *", + "name" : "const android::hidl::manager::V1_2::BpHwServiceManager *", +- "referenced_type" : "type-855", +- "self_type" : "type-857", ++ "referenced_type" : "type-853", ++ "self_type" : "type-854", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, +@@ -25870,8 +27282,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_2::IClientCallback *", + "name" : "const android::hidl::manager::V1_2::IClientCallback *", +- "referenced_type" : "type-497", +- "self_type" : "type-499", ++ "referenced_type" : "type-496", ++ "self_type" : "type-498", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, +@@ -25879,8 +27291,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager *", + "name" : "const android::hidl::manager::V1_2::IServiceManager *", +- "referenced_type" : "type-516", +- "self_type" : "type-518", ++ "referenced_type" : "type-515", ++ "self_type" : "type-517", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, +@@ -25888,8 +27300,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::key_value_pair_t > *", + "name" : "const android::key_value_pair_t > *", +- "referenced_type" : "type-3614", +- "self_type" : "type-3621", ++ "referenced_type" : "type-3608", ++ "self_type" : "type-3615", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -25897,8 +27309,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::key_value_pair_t *", + "name" : "const android::key_value_pair_t *", +- "referenced_type" : "type-2194", +- "self_type" : "type-2201", ++ "referenced_type" : "type-2190", ++ "self_type" : "type-2197", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -25906,8 +27318,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-3637", +- "self_type" : "type-3644", ++ "referenced_type" : "type-3631", ++ "self_type" : "type-3638", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25915,8 +27327,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-3448", +- "self_type" : "type-3458", ++ "referenced_type" : "type-3442", ++ "self_type" : "type-3452", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25924,8 +27336,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-2306", +- "self_type" : "type-2313", ++ "referenced_type" : "type-2302", ++ "self_type" : "type-2309", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -25942,8 +27354,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-2216", +- "self_type" : "type-2234", ++ "referenced_type" : "type-2212", ++ "self_type" : "type-2230", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25951,8 +27363,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-439", +- "self_type" : "type-440", ++ "referenced_type" : "type-438", ++ "self_type" : "type-439", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25960,8 +27372,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-3404", +- "self_type" : "type-3406", ++ "referenced_type" : "type-3398", ++ "self_type" : "type-3400", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25969,8 +27381,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-449", +- "self_type" : "type-450", ++ "referenced_type" : "type-448", ++ "self_type" : "type-449", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25978,8 +27390,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-558", +- "self_type" : "type-559", ++ "referenced_type" : "type-557", ++ "self_type" : "type-558", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25987,8 +27399,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-753", +- "self_type" : "type-754", ++ "referenced_type" : "type-746", ++ "self_type" : "type-747", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25996,8 +27408,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-907", +- "self_type" : "type-944", ++ "referenced_type" : "type-905", ++ "self_type" : "type-942", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26014,8 +27426,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-410", +- "self_type" : "type-434", ++ "referenced_type" : "type-409", ++ "self_type" : "type-433", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26023,8 +27435,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-529", +- "self_type" : "type-530", ++ "referenced_type" : "type-528", ++ "self_type" : "type-529", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26032,8 +27444,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-545", +- "self_type" : "type-546", ++ "referenced_type" : "type-544", ++ "self_type" : "type-545", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26041,8 +27453,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-534", +- "self_type" : "type-535", ++ "referenced_type" : "type-533", ++ "self_type" : "type-534", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26050,8 +27462,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-553", +- "self_type" : "type-554", ++ "referenced_type" : "type-552", ++ "self_type" : "type-553", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26059,8 +27471,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-540", +- "self_type" : "type-541", ++ "referenced_type" : "type-539", ++ "self_type" : "type-540", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26068,8 +27480,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp *", + "name" : "const android::wp *", +- "referenced_type" : "type-422", +- "self_type" : "type-427", ++ "referenced_type" : "type-421", ++ "self_type" : "type-426", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26077,8 +27489,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp *", + "name" : "const android::wp *", +- "referenced_type" : "type-2170", +- "self_type" : "type-2222", ++ "referenced_type" : "type-2166", ++ "self_type" : "type-2218", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26086,8 +27498,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp *", + "name" : "const android::wp *", +- "referenced_type" : "type-3559", +- "self_type" : "type-3567", ++ "referenced_type" : "type-3553", ++ "self_type" : "type-3560", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26095,8 +27507,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp *", + "name" : "const android::wp *", +- "referenced_type" : "type-417", +- "self_type" : "type-419", ++ "referenced_type" : "type-416", ++ "self_type" : "type-418", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26104,8 +27516,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp *", + "name" : "const android::wp *", +- "referenced_type" : "type-414", +- "self_type" : "type-415", ++ "referenced_type" : "type-413", ++ "self_type" : "type-414", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26113,8 +27525,8 @@ + "alignment" : 4, + "linker_set_key" : "const binder_buffer_object *", + "name" : "const binder_buffer_object *", +- "referenced_type" : "type-3594", +- "self_type" : "type-3596", ++ "referenced_type" : "type-3588", ++ "self_type" : "type-3590", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26149,8 +27561,8 @@ + "alignment" : 4, + "linker_set_key" : "const dirent *", + "name" : "const dirent *", +- "referenced_type" : "type-1778", +- "self_type" : "type-1832", ++ "referenced_type" : "type-1774", ++ "self_type" : "type-1828", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26158,8 +27570,8 @@ + "alignment" : 4, + "linker_set_key" : "const dirent *", + "name" : "const dirent *", +- "referenced_type" : "type-2916", +- "self_type" : "type-2970", ++ "referenced_type" : "type-2910", ++ "self_type" : "type-2964", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26167,8 +27579,8 @@ + "alignment" : 4, + "linker_set_key" : "const dirent *", + "name" : "const dirent *", +- "referenced_type" : "type-996", +- "self_type" : "type-1053", ++ "referenced_type" : "type-994", ++ "self_type" : "type-1051", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26176,8 +27588,8 @@ + "alignment" : 4, + "linker_set_key" : "const flat_binder_object *", + "name" : "const flat_binder_object *", +- "referenced_type" : "type-3577", +- "self_type" : "type-3591", ++ "referenced_type" : "type-3571", ++ "self_type" : "type-3585", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26185,8 +27597,8 @@ + "alignment" : 4, + "linker_set_key" : "const int *", + "name" : "const int *", +- "referenced_type" : "type-568", +- "self_type" : "type-978", ++ "referenced_type" : "type-567", ++ "self_type" : "type-976", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26213,7 +27625,7 @@ + "linker_set_key" : "const native_handle **", + "name" : "const native_handle **", + "referenced_type" : "type-11", +- "self_type" : "type-3593", ++ "self_type" : "type-3587", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26221,8 +27633,8 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned char *", + "name" : "const unsigned char *", +- "referenced_type" : "type-522", +- "self_type" : "type-990", ++ "referenced_type" : "type-521", ++ "self_type" : "type-987", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26231,7 +27643,7 @@ + "linker_set_key" : "const unsigned int *", + "name" : "const unsigned int *", + "referenced_type" : "type-189", +- "self_type" : "type-2164", ++ "self_type" : "type-2160", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26249,7 +27661,7 @@ + "linker_set_key" : "const void **", + "name" : "const void **", + "referenced_type" : "type-78", +- "self_type" : "type-3592", ++ "self_type" : "type-3586", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26258,7 +27670,7 @@ + "linker_set_key" : "double *", + "name" : "double *", + "referenced_type" : "type-6", +- "self_type" : "type-3587", ++ "self_type" : "type-3580", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26267,7 +27679,7 @@ + "linker_set_key" : "float *", + "name" : "float *", + "referenced_type" : "type-237", +- "self_type" : "type-3586", ++ "self_type" : "type-3579", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26285,7 +27697,7 @@ + "linker_set_key" : "int *", + "name" : "int *", + "referenced_type" : "type-14", +- "self_type" : "type-475", ++ "self_type" : "type-474", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26303,7 +27715,7 @@ + "linker_set_key" : "long long *", + "name" : "long long *", + "referenced_type" : "type-336", +- "self_type" : "type-3583", ++ "self_type" : "type-3577", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26321,7 +27733,7 @@ + "linker_set_key" : "short *", + "name" : "short *", + "referenced_type" : "type-151", +- "self_type" : "type-3581", ++ "self_type" : "type-3575", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26329,8 +27741,8 @@ + "alignment" : 4, + "linker_set_key" : "signed char *", + "name" : "signed char *", +- "referenced_type" : "type-483", +- "self_type" : "type-3580", ++ "referenced_type" : "type-484", ++ "self_type" : "type-3574", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26338,8 +27750,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__1::basic_ostream &(*)(std::__1::basic_ostream &)", + "name" : "std::__1::basic_ostream &(*)(std::__1::basic_ostream &)", +- "referenced_type" : "type-2300", +- "self_type" : "type-2303", ++ "referenced_type" : "type-2296", ++ "self_type" : "type-2299", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -26347,8 +27759,8 @@ + "alignment" : 4, + "linker_set_key" : "std::unique_ptr > *", + "name" : "std::unique_ptr > *", +- "referenced_type" : "type-3590", +- "self_type" : "type-3589", ++ "referenced_type" : "type-3584", ++ "self_type" : "type-3583", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26356,8 +27768,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *)>, std::allocator > *)> > > *", + "name" : "std::vector > *)>, std::allocator > *)> > > *", +- "referenced_type" : "type-1711", +- "self_type" : "type-1710", ++ "referenced_type" : "type-1708", ++ "self_type" : "type-1707", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26365,8 +27777,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *)>, std::allocator > *)> > > *", + "name" : "std::vector > *)>, std::allocator > *)> > > *", +- "referenced_type" : "type-2849", +- "self_type" : "type-2848", ++ "referenced_type" : "type-2844", ++ "self_type" : "type-2843", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26374,8 +27786,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *)>, std::allocator > *)> > > *", + "name" : "std::vector > *)>, std::allocator > *)> > > *", +- "referenced_type" : "type-911", +- "self_type" : "type-910", ++ "referenced_type" : "type-910", ++ "self_type" : "type-909", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26402,7 +27814,7 @@ + "linker_set_key" : "unsigned int *", + "name" : "unsigned int *", + "referenced_type" : "type-44", +- "self_type" : "type-1002", ++ "self_type" : "type-1000", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -26411,7 +27823,7 @@ + "linker_set_key" : "unsigned long long *", + "name" : "unsigned long long *", + "referenced_type" : "type-16", +- "self_type" : "type-3584", ++ "self_type" : "type-3578", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26420,7 +27832,7 @@ + "linker_set_key" : "unsigned short *", + "name" : "unsigned short *", + "referenced_type" : "type-71", +- "self_type" : "type-3582", ++ "self_type" : "type-3576", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26428,8 +27840,8 @@ + "alignment" : 4, + "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned int *, unsigned int, void *)", + "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned int *, unsigned int, void *)", +- "referenced_type" : "type-2163", +- "self_type" : "type-2162", ++ "referenced_type" : "type-2159", ++ "self_type" : "type-2158", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26437,8 +27849,8 @@ + "alignment" : 4, + "linker_set_key" : "void (*)(const void *, void *, void *)", + "name" : "void (*)(const void *, void *, void *)", +- "referenced_type" : "type-2158", +- "self_type" : "type-2157", ++ "referenced_type" : "type-2154", ++ "self_type" : "type-2153", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -26446,8 +27858,8 @@ + "alignment" : 4, + "linker_set_key" : "void (*)(void *, const char *)", + "name" : "void (*)(void *, const char *)", +- "referenced_type" : "type-3395", +- "self_type" : "type-3396", ++ "referenced_type" : "type-3389", ++ "self_type" : "type-3390", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h" + }, +@@ -26478,7 +27890,7 @@ + "linker_set_key" : "android::RefBase *const", + "name" : "android::RefBase *const", + "referenced_type" : "type-25", +- "self_type" : "type-3417", ++ "self_type" : "type-3411", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -26487,8 +27899,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1060", +- "self_type" : "type-1062", ++ "referenced_type" : "type-1058", ++ "self_type" : "type-1060", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26497,8 +27909,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1117", +- "self_type" : "type-1119", ++ "referenced_type" : "type-1115", ++ "self_type" : "type-1117", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26507,8 +27919,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1192", +- "self_type" : "type-1194", ++ "referenced_type" : "type-1190", ++ "self_type" : "type-1192", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26517,8 +27929,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1298", +- "self_type" : "type-1300", ++ "referenced_type" : "type-1295", ++ "self_type" : "type-1297", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26527,8 +27939,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1367", +- "self_type" : "type-1369", ++ "referenced_type" : "type-1364", ++ "self_type" : "type-1366", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26537,8 +27949,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1499", +- "self_type" : "type-1501", ++ "referenced_type" : "type-1496", ++ "self_type" : "type-1498", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26547,8 +27959,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1510", +- "self_type" : "type-1509", ++ "referenced_type" : "type-1507", ++ "self_type" : "type-1506", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26557,8 +27969,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1538", +- "self_type" : "type-1540", ++ "referenced_type" : "type-1534", ++ "self_type" : "type-1536", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26567,8 +27979,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1606", +- "self_type" : "type-1608", ++ "referenced_type" : "type-1602", ++ "self_type" : "type-1604", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26577,8 +27989,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1676", +- "self_type" : "type-1678", ++ "referenced_type" : "type-1672", ++ "self_type" : "type-1674", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26587,8 +27999,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1750", +- "self_type" : "type-1752", ++ "referenced_type" : "type-1746", ++ "self_type" : "type-1748", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26597,8 +28009,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1838", +- "self_type" : "type-1840", ++ "referenced_type" : "type-1834", ++ "self_type" : "type-1836", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26607,8 +28019,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1893", +- "self_type" : "type-1895", ++ "referenced_type" : "type-1889", ++ "self_type" : "type-1891", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26617,8 +28029,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1953", +- "self_type" : "type-1955", ++ "referenced_type" : "type-1949", ++ "self_type" : "type-1951", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26627,8 +28039,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2025", +- "self_type" : "type-2027", ++ "referenced_type" : "type-2021", ++ "self_type" : "type-2023", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26637,8 +28049,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2071", +- "self_type" : "type-2073", ++ "referenced_type" : "type-2067", ++ "self_type" : "type-2069", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26657,8 +28069,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2121", +- "self_type" : "type-2123", ++ "referenced_type" : "type-2117", ++ "self_type" : "type-2119", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26667,8 +28079,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2137", +- "self_type" : "type-2139", ++ "referenced_type" : "type-2133", ++ "self_type" : "type-2135", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26677,8 +28089,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2212", +- "self_type" : "type-2214", ++ "referenced_type" : "type-2208", ++ "self_type" : "type-2210", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26687,8 +28099,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2308", +- "self_type" : "type-2310", ++ "referenced_type" : "type-2304", ++ "self_type" : "type-2306", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26697,8 +28109,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2326", +- "self_type" : "type-2339", ++ "referenced_type" : "type-2324", ++ "self_type" : "type-2338", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26707,8 +28119,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2444", +- "self_type" : "type-2446", ++ "referenced_type" : "type-2439", ++ "self_type" : "type-2441", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26717,8 +28129,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2513", +- "self_type" : "type-2515", ++ "referenced_type" : "type-2508", ++ "self_type" : "type-2510", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26727,8 +28139,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2637", +- "self_type" : "type-2639", ++ "referenced_type" : "type-2632", ++ "self_type" : "type-2634", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26737,8 +28149,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2648", +- "self_type" : "type-2647", ++ "referenced_type" : "type-2643", ++ "self_type" : "type-2642", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26757,8 +28169,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2676", +- "self_type" : "type-2678", ++ "referenced_type" : "type-2670", ++ "self_type" : "type-2672", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26767,8 +28179,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2744", +- "self_type" : "type-2746", ++ "referenced_type" : "type-2738", ++ "self_type" : "type-2740", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26777,8 +28189,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2814", +- "self_type" : "type-2816", ++ "referenced_type" : "type-2808", ++ "self_type" : "type-2810", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26787,8 +28199,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2888", +- "self_type" : "type-2890", ++ "referenced_type" : "type-2882", ++ "self_type" : "type-2884", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26797,8 +28209,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2976", +- "self_type" : "type-2978", ++ "referenced_type" : "type-2970", ++ "self_type" : "type-2972", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26807,8 +28219,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3031", +- "self_type" : "type-3033", ++ "referenced_type" : "type-3025", ++ "self_type" : "type-3027", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26817,8 +28229,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3089", +- "self_type" : "type-3091", ++ "referenced_type" : "type-3083", ++ "self_type" : "type-3085", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26827,8 +28239,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3159", +- "self_type" : "type-3161", ++ "referenced_type" : "type-3153", ++ "self_type" : "type-3155", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26837,8 +28249,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3203", +- "self_type" : "type-3205", ++ "referenced_type" : "type-3197", ++ "self_type" : "type-3199", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26847,8 +28259,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3252", +- "self_type" : "type-3254", ++ "referenced_type" : "type-3246", ++ "self_type" : "type-3248", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26857,8 +28269,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3268", +- "self_type" : "type-3270", ++ "referenced_type" : "type-3262", ++ "self_type" : "type-3264", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26867,8 +28279,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3317", +- "self_type" : "type-3319", ++ "referenced_type" : "type-3311", ++ "self_type" : "type-3313", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26877,8 +28289,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3367", +- "self_type" : "type-3369", ++ "referenced_type" : "type-3361", ++ "self_type" : "type-3363", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26887,8 +28299,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3380", +- "self_type" : "type-3388", ++ "referenced_type" : "type-3375", ++ "self_type" : "type-3382", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26897,8 +28309,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3389", +- "self_type" : "type-3391", ++ "referenced_type" : "type-3383", ++ "self_type" : "type-3385", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26907,8 +28319,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3397", +- "self_type" : "type-3400", ++ "referenced_type" : "type-3391", ++ "self_type" : "type-3393", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26917,8 +28329,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3425", +- "self_type" : "type-3427", ++ "referenced_type" : "type-3419", ++ "self_type" : "type-3421", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26927,8 +28339,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3561", +- "self_type" : "type-3563", ++ "referenced_type" : "type-3555", ++ "self_type" : "type-3557", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26937,8 +28349,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3627", +- "self_type" : "type-3629", ++ "referenced_type" : "type-3621", ++ "self_type" : "type-3623", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26947,8 +28359,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3690", +- "self_type" : "type-3692", ++ "referenced_type" : "type-3684", ++ "self_type" : "type-3686", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26957,8 +28369,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3782", +- "self_type" : "type-3784", ++ "referenced_type" : "type-3775", ++ "self_type" : "type-3777", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26967,8 +28379,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3851", +- "self_type" : "type-3853", ++ "referenced_type" : "type-3844", ++ "self_type" : "type-3846", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26977,8 +28389,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-463", +- "self_type" : "type-465", ++ "referenced_type" : "type-462", ++ "self_type" : "type-464", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26987,8 +28399,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-562", +- "self_type" : "type-564", ++ "referenced_type" : "type-561", ++ "self_type" : "type-563", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26997,8 +28409,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-651", +- "self_type" : "type-653", ++ "referenced_type" : "type-650", ++ "self_type" : "type-652", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27007,8 +28419,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-662", +- "self_type" : "type-661", ++ "referenced_type" : "type-661", ++ "self_type" : "type-660", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27017,8 +28429,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-699", +- "self_type" : "type-701", ++ "referenced_type" : "type-697", ++ "self_type" : "type-699", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27027,8 +28439,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-777", +- "self_type" : "type-779", ++ "referenced_type" : "type-775", ++ "self_type" : "type-777", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27037,8 +28449,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-871", +- "self_type" : "type-873", ++ "referenced_type" : "type-869", ++ "self_type" : "type-871", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27047,8 +28459,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-956", +- "self_type" : "type-958", ++ "referenced_type" : "type-954", ++ "self_type" : "type-956", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27058,7 +28470,7 @@ + "linker_set_key" : "android::RefBase::weakref_type *const", + "name" : "android::RefBase::weakref_type *const", + "referenced_type" : "type-308", +- "self_type" : "type-3415", ++ "self_type" : "type-3409", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -27067,8 +28479,8 @@ + "is_const" : true, + "linker_set_key" : "android::hardware::BHwBinder *const", + "name" : "android::hardware::BHwBinder *const", +- "referenced_type" : "type-2144", +- "self_type" : "type-3413", ++ "referenced_type" : "type-2140", ++ "self_type" : "type-3407", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -27077,8 +28489,8 @@ + "is_const" : true, + "linker_set_key" : "android::hardware::IBinder *const", + "name" : "android::hardware::IBinder *const", +- "referenced_type" : "type-2141", +- "self_type" : "type-2177", ++ "referenced_type" : "type-2137", ++ "self_type" : "type-2173", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -27088,7 +28500,7 @@ + "linker_set_key" : "char *const", + "name" : "char *const", + "referenced_type" : "type-186", +- "self_type" : "type-3599", ++ "self_type" : "type-3593", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27097,8 +28509,8 @@ + "is_const" : true, + "linker_set_key" : "char const[10]", + "name" : "char const[10]", +- "referenced_type" : "type-3464", +- "self_type" : "type-3463", ++ "referenced_type" : "type-3458", ++ "self_type" : "type-3457", + "size" : 10, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27107,8 +28519,8 @@ + "is_const" : true, + "linker_set_key" : "char const[11]", + "name" : "char const[11]", +- "referenced_type" : "type-3490", +- "self_type" : "type-3489", ++ "referenced_type" : "type-3482", ++ "self_type" : "type-3481", + "size" : 11, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27117,8 +28529,8 @@ + "is_const" : true, + "linker_set_key" : "char const[12]", + "name" : "char const[12]", +- "referenced_type" : "type-3461", +- "self_type" : "type-3460", ++ "referenced_type" : "type-3455", ++ "self_type" : "type-3454", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27127,8 +28539,8 @@ + "is_const" : true, + "linker_set_key" : "char const[13]", + "name" : "char const[13]", +- "referenced_type" : "type-3457", +- "self_type" : "type-3456", ++ "referenced_type" : "type-3451", ++ "self_type" : "type-3450", + "size" : 13, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27137,8 +28549,8 @@ + "is_const" : true, + "linker_set_key" : "char const[14]", + "name" : "char const[14]", +- "referenced_type" : "type-3508", +- "self_type" : "type-3507", ++ "referenced_type" : "type-3502", ++ "self_type" : "type-3501", + "size" : 14, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27147,8 +28559,8 @@ + "is_const" : true, + "linker_set_key" : "char const[15]", + "name" : "char const[15]", +- "referenced_type" : "type-3606", +- "self_type" : "type-3605", ++ "referenced_type" : "type-3600", ++ "self_type" : "type-3599", + "size" : 15, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27157,8 +28569,8 @@ + "is_const" : true, + "linker_set_key" : "char const[16]", + "name" : "char const[16]", +- "referenced_type" : "type-362", +- "self_type" : "type-3492", ++ "referenced_type" : "type-361", ++ "self_type" : "type-3486", + "size" : 16, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27167,8 +28579,8 @@ + "is_const" : true, + "linker_set_key" : "char const[17]", + "name" : "char const[17]", +- "referenced_type" : "type-3511", +- "self_type" : "type-3510", ++ "referenced_type" : "type-3505", ++ "self_type" : "type-3504", + "size" : 17, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27177,8 +28589,8 @@ + "is_const" : true, + "linker_set_key" : "char const[18]", + "name" : "char const[18]", +- "referenced_type" : "type-3496", +- "self_type" : "type-3495", ++ "referenced_type" : "type-3490", ++ "self_type" : "type-3489", + "size" : 18, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27187,8 +28599,8 @@ + "is_const" : true, + "linker_set_key" : "char const[19]", + "name" : "char const[19]", +- "referenced_type" : "type-3527", +- "self_type" : "type-3526", ++ "referenced_type" : "type-3521", ++ "self_type" : "type-3520", + "size" : 19, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27197,8 +28609,8 @@ + "is_const" : true, + "linker_set_key" : "char const[20]", + "name" : "char const[20]", +- "referenced_type" : "type-3505", +- "self_type" : "type-3504", ++ "referenced_type" : "type-3499", ++ "self_type" : "type-3498", + "size" : 20, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27207,8 +28619,8 @@ + "is_const" : true, + "linker_set_key" : "char const[22]", + "name" : "char const[22]", +- "referenced_type" : "type-3530", +- "self_type" : "type-3529", ++ "referenced_type" : "type-3524", ++ "self_type" : "type-3523", + "size" : 22, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27217,8 +28629,8 @@ + "is_const" : true, + "linker_set_key" : "char const[25]", + "name" : "char const[25]", +- "referenced_type" : "type-3520", +- "self_type" : "type-3519", ++ "referenced_type" : "type-3514", ++ "self_type" : "type-3513", + "size" : 25, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27227,8 +28639,8 @@ + "is_const" : true, + "linker_set_key" : "char const[28]", + "name" : "char const[28]", +- "referenced_type" : "type-3541", +- "self_type" : "type-3540", ++ "referenced_type" : "type-3535", ++ "self_type" : "type-3534", + "size" : 28, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27237,8 +28649,8 @@ + "is_const" : true, + "linker_set_key" : "char const[29]", + "name" : "char const[29]", +- "referenced_type" : "type-3517", +- "self_type" : "type-3516", ++ "referenced_type" : "type-3511", ++ "self_type" : "type-3510", + "size" : 29, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27247,8 +28659,8 @@ + "is_const" : true, + "linker_set_key" : "char const[2]", + "name" : "char const[2]", +- "referenced_type" : "type-3468", +- "self_type" : "type-3467", ++ "referenced_type" : "type-3462", ++ "self_type" : "type-3461", + "size" : 2, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27257,8 +28669,8 @@ + "is_const" : true, + "linker_set_key" : "char const[31]", + "name" : "char const[31]", +- "referenced_type" : "type-3502", +- "self_type" : "type-3501", ++ "referenced_type" : "type-3496", ++ "self_type" : "type-3495", + "size" : 31, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27267,8 +28679,8 @@ + "is_const" : true, + "linker_set_key" : "char const[32]", + "name" : "char const[32]", +- "referenced_type" : "type-3533", +- "self_type" : "type-3532", ++ "referenced_type" : "type-3527", ++ "self_type" : "type-3526", + "size" : 32, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27277,8 +28689,8 @@ + "is_const" : true, + "linker_set_key" : "char const[35]", + "name" : "char const[35]", +- "referenced_type" : "type-3523", +- "self_type" : "type-3522", ++ "referenced_type" : "type-3517", ++ "self_type" : "type-3516", + "size" : 35, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27287,8 +28699,8 @@ + "is_const" : true, + "linker_set_key" : "char const[37]", + "name" : "char const[37]", +- "referenced_type" : "type-3514", +- "self_type" : "type-3513", ++ "referenced_type" : "type-3508", ++ "self_type" : "type-3507", + "size" : 37, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27297,8 +28709,8 @@ + "is_const" : true, + "linker_set_key" : "char const[3]", + "name" : "char const[3]", +- "referenced_type" : "type-3481", +- "self_type" : "type-3480", ++ "referenced_type" : "type-3475", ++ "self_type" : "type-3474", + "size" : 3, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27307,8 +28719,8 @@ + "is_const" : true, + "linker_set_key" : "char const[4]", + "name" : "char const[4]", +- "referenced_type" : "type-3603", +- "self_type" : "type-3602", ++ "referenced_type" : "type-3597", ++ "self_type" : "type-3596", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27317,8 +28729,8 @@ + "is_const" : true, + "linker_set_key" : "char const[5]", + "name" : "char const[5]", +- "referenced_type" : "type-3609", +- "self_type" : "type-3608", ++ "referenced_type" : "type-3603", ++ "self_type" : "type-3602", + "size" : 5, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27327,8 +28739,8 @@ + "is_const" : true, + "linker_set_key" : "char const[6]", + "name" : "char const[6]", +- "referenced_type" : "type-3472", +- "self_type" : "type-3471", ++ "referenced_type" : "type-3466", ++ "self_type" : "type-3465", + "size" : 6, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27337,8 +28749,8 @@ + "is_const" : true, + "linker_set_key" : "char const[7]", + "name" : "char const[7]", +- "referenced_type" : "type-3499", +- "self_type" : "type-3498", ++ "referenced_type" : "type-3493", ++ "self_type" : "type-3492", + "size" : 7, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27347,8 +28759,8 @@ + "is_const" : true, + "linker_set_key" : "char const[8]", + "name" : "char const[8]", +- "referenced_type" : "type-3485", +- "self_type" : "type-3484", ++ "referenced_type" : "type-3479", ++ "self_type" : "type-3478", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27357,8 +28769,8 @@ + "is_const" : true, + "linker_set_key" : "char const[9]", + "name" : "char const[9]", +- "referenced_type" : "type-3475", +- "self_type" : "type-3474", ++ "referenced_type" : "type-3469", ++ "self_type" : "type-3468", + "size" : 9, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27377,8 +28789,8 @@ + "is_const" : true, + "linker_set_key" : "const android::KeyedVector >", + "name" : "const android::KeyedVector >", +- "referenced_type" : "type-382", +- "self_type" : "type-3643", ++ "referenced_type" : "type-381", ++ "self_type" : "type-3637", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -27387,8 +28799,8 @@ + "is_const" : true, + "linker_set_key" : "const android::KeyedVector", + "name" : "const android::KeyedVector", +- "referenced_type" : "type-2153", +- "self_type" : "type-2229", ++ "referenced_type" : "type-2149", ++ "self_type" : "type-2225", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -27417,8 +28829,8 @@ + "is_const" : true, + "linker_set_key" : "const android::SortedVector > >", + "name" : "const android::SortedVector > >", +- "referenced_type" : "type-375", +- "self_type" : "type-3634", ++ "referenced_type" : "type-374", ++ "self_type" : "type-3628", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -27427,8 +28839,8 @@ + "is_const" : true, + "linker_set_key" : "const android::SortedVector >", + "name" : "const android::SortedVector >", +- "referenced_type" : "type-2154", +- "self_type" : "type-2219", ++ "referenced_type" : "type-2150", ++ "self_type" : "type-2215", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -27457,8 +28869,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-381", +- "self_type" : "type-3438", ++ "referenced_type" : "type-380", ++ "self_type" : "type-3432", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -27467,8 +28879,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-380", +- "self_type" : "type-3434", ++ "referenced_type" : "type-379", ++ "self_type" : "type-3428", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -27487,8 +28899,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-379", +- "self_type" : "type-3430", ++ "referenced_type" : "type-378", ++ "self_type" : "type-3424", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -27497,8 +28909,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-2221", +- "self_type" : "type-2224", ++ "referenced_type" : "type-2217", ++ "self_type" : "type-2220", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -27507,8 +28919,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-377", +- "self_type" : "type-3638", ++ "referenced_type" : "type-376", ++ "self_type" : "type-3632", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -27517,8 +28929,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector >", + "name" : "const android::Vector >", +- "referenced_type" : "type-2328", +- "self_type" : "type-2330", ++ "referenced_type" : "type-2322", ++ "self_type" : "type-2326", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -27527,8 +28939,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-2322", +- "self_type" : "type-2323", ++ "referenced_type" : "type-2318", ++ "self_type" : "type-2319", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -27547,8 +28959,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BHwBinder", + "name" : "const android::hardware::BHwBinder", +- "referenced_type" : "type-2145", +- "self_type" : "type-2172", ++ "referenced_type" : "type-2141", ++ "self_type" : "type-2168", + "size" : 28, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -27557,8 +28969,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BpHwBinder", + "name" : "const android::hardware::BpHwBinder", +- "referenced_type" : "type-2148", +- "self_type" : "type-2183", ++ "referenced_type" : "type-2144", ++ "self_type" : "type-2179", + "size" : 60, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -27567,8 +28979,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BpHwBinder::Obituary", + "name" : "const android::hardware::BpHwBinder::Obituary", +- "referenced_type" : "type-2185", +- "self_type" : "type-2202", ++ "referenced_type" : "type-2181", ++ "self_type" : "type-2198", + "size" : 16, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -27577,8 +28989,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager", + "name" : "const android::hardware::BpHwBinder::ObjectManager", +- "referenced_type" : "type-2152", +- "self_type" : "type-2236", ++ "referenced_type" : "type-2148", ++ "self_type" : "type-2232", + "size" : 20, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -27587,8 +28999,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t", + "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t", +- "referenced_type" : "type-2156", +- "self_type" : "type-2209", ++ "referenced_type" : "type-2152", ++ "self_type" : "type-2205", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -27597,8 +29009,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BpHwRefBase", + "name" : "const android::hardware::BpHwRefBase", +- "referenced_type" : "type-2176", +- "self_type" : "type-2181", ++ "referenced_type" : "type-2172", ++ "self_type" : "type-2177", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -27607,8 +29019,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BufferedTextOutput", + "name" : "const android::hardware::BufferedTextOutput", +- "referenced_type" : "type-2314", +- "self_type" : "type-2318", ++ "referenced_type" : "type-2310", ++ "self_type" : "type-2314", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -27617,8 +29029,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ConcurrentMap, android::hardware::details::SchedPrio>", + "name" : "const android::hardware::ConcurrentMap, android::hardware::details::SchedPrio>", +- "referenced_type" : "type-664", +- "self_type" : "type-1012", ++ "referenced_type" : "type-663", ++ "self_type" : "type-1010", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -27627,8 +29039,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ConcurrentMap, bool>", + "name" : "const android::hardware::ConcurrentMap, bool>", +- "referenced_type" : "type-670", +- "self_type" : "type-1014", ++ "referenced_type" : "type-668", ++ "self_type" : "type-1012", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -27638,7 +29050,7 @@ + "linker_set_key" : "const android::hardware::ConcurrentMap >", + "name" : "const android::hardware::ConcurrentMap >", + "referenced_type" : "type-326", +- "self_type" : "type-343", ++ "self_type" : "type-344", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -27647,8 +29059,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "name" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", +- "referenced_type" : "type-587", +- "self_type" : "type-596", ++ "referenced_type" : "type-586", ++ "self_type" : "type-594", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -27657,8 +29069,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "name" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", +- "referenced_type" : "type-347", +- "self_type" : "type-355", ++ "referenced_type" : "type-346", ++ "self_type" : "type-354", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -27667,8 +29079,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::HexDump", + "name" : "const android::hardware::HexDump", +- "referenced_type" : "type-2295", +- "self_type" : "type-2298", ++ "referenced_type" : "type-2291", ++ "self_type" : "type-2294", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27677,8 +29089,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder", + "name" : "const android::hardware::IBinder", +- "referenced_type" : "type-1288", +- "self_type" : "type-1287", ++ "referenced_type" : "type-1285", ++ "self_type" : "type-1284", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -27687,8 +29099,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder", + "name" : "const android::hardware::IBinder", +- "referenced_type" : "type-2140", +- "self_type" : "type-2142", ++ "referenced_type" : "type-2136", ++ "self_type" : "type-2138", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, +@@ -27697,8 +29109,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder", + "name" : "const android::hardware::IBinder", +- "referenced_type" : "type-2435", +- "self_type" : "type-2434", ++ "referenced_type" : "type-2430", ++ "self_type" : "type-2429", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -27707,8 +29119,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder", + "name" : "const android::hardware::IBinder", +- "referenced_type" : "type-3773", +- "self_type" : "type-3772", ++ "referenced_type" : "type-3766", ++ "self_type" : "type-3765", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -27717,8 +29129,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder", + "name" : "const android::hardware::IBinder", +- "referenced_type" : "type-442", +- "self_type" : "type-441", ++ "referenced_type" : "type-441", ++ "self_type" : "type-440", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -27727,8 +29139,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder::DeathRecipient", + "name" : "const android::hardware::IBinder::DeathRecipient", +- "referenced_type" : "type-2190", +- "self_type" : "type-2231", ++ "referenced_type" : "type-2186", ++ "self_type" : "type-2227", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27737,8 +29149,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IInterface", + "name" : "const android::hardware::IInterface", +- "referenced_type" : "type-2186", +- "self_type" : "type-3407", ++ "referenced_type" : "type-2182", ++ "self_type" : "type-3401", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -27747,8 +29159,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IPCThreadState", + "name" : "const android::hardware::IPCThreadState", +- "referenced_type" : "type-2244", +- "self_type" : "type-3447", ++ "referenced_type" : "type-2240", ++ "self_type" : "type-3441", + "size" : 272, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -27757,18 +29169,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1000", +- "self_type" : "type-999", +- "size" : 68, +- "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" +- }, +- { +- "alignment" : 4, +- "is_const" : true, +- "linker_set_key" : "const android::hardware::Parcel", +- "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1086", +- "self_type" : "type-1085", ++ "referenced_type" : "type-1084", ++ "self_type" : "type-1083", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -27777,8 +29179,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1144", +- "self_type" : "type-1143", ++ "referenced_type" : "type-1142", ++ "self_type" : "type-1141", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -27787,8 +29189,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1217", +- "self_type" : "type-1216", ++ "referenced_type" : "type-1215", ++ "self_type" : "type-1214", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -27797,8 +29199,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1782", +- "self_type" : "type-1781", ++ "referenced_type" : "type-1778", ++ "self_type" : "type-1777", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -27807,8 +29209,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1864", +- "self_type" : "type-1863", ++ "referenced_type" : "type-1860", ++ "self_type" : "type-1859", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -27817,8 +29219,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1920", +- "self_type" : "type-1919", ++ "referenced_type" : "type-1916", ++ "self_type" : "type-1915", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -27827,8 +29229,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1986", +- "self_type" : "type-1985", ++ "referenced_type" : "type-1982", ++ "self_type" : "type-1981", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -27837,8 +29239,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2039", +- "self_type" : "type-2038", ++ "referenced_type" : "type-2035", ++ "self_type" : "type-2034", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -27847,8 +29249,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2093", +- "self_type" : "type-2092", ++ "referenced_type" : "type-2089", ++ "self_type" : "type-2088", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -27857,8 +29259,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2160", +- "self_type" : "type-2165", ++ "referenced_type" : "type-2156", ++ "self_type" : "type-2161", + "size" : 68, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -27867,8 +29269,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2364", +- "self_type" : "type-2363", ++ "referenced_type" : "type-2360", ++ "self_type" : "type-2359", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -27877,8 +29279,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2920", +- "self_type" : "type-2919", ++ "referenced_type" : "type-2914", ++ "self_type" : "type-2913", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -27887,8 +29289,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3002", +- "self_type" : "type-3001", ++ "referenced_type" : "type-2996", ++ "self_type" : "type-2995", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -27897,8 +29299,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3058", +- "self_type" : "type-3057", ++ "referenced_type" : "type-3052", ++ "self_type" : "type-3051", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -27907,8 +29309,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3122", +- "self_type" : "type-3121", ++ "referenced_type" : "type-3116", ++ "self_type" : "type-3115", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -27917,8 +29319,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3173", +- "self_type" : "type-3172", ++ "referenced_type" : "type-3167", ++ "self_type" : "type-3166", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -27937,8 +29339,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3224", +- "self_type" : "type-3223", ++ "referenced_type" : "type-3218", ++ "self_type" : "type-3217", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -27947,8 +29349,18 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3673", +- "self_type" : "type-3672", ++ "referenced_type" : "type-3669", ++ "self_type" : "type-3668", ++ "size" : 68, ++ "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" ++ }, ++ { ++ "alignment" : 4, ++ "is_const" : true, ++ "linker_set_key" : "const android::hardware::Parcel", ++ "name" : "const android::hardware::Parcel", ++ "referenced_type" : "type-998", ++ "self_type" : "type-997", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -27957,8 +29369,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ProcessState", + "name" : "const android::hardware::ProcessState", +- "referenced_type" : "type-2249", +- "self_type" : "type-3656", ++ "referenced_type" : "type-2245", ++ "self_type" : "type-3650", + "size" : 120, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -27967,8 +29379,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ProcessState::handle_entry", + "name" : "const android::hardware::ProcessState::handle_entry", +- "referenced_type" : "type-2227", +- "self_type" : "type-3619", ++ "referenced_type" : "type-2223", ++ "self_type" : "type-3613", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -27977,8 +29389,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return", + "name" : "const android::hardware::Return", +- "referenced_type" : "type-765", +- "self_type" : "type-769", ++ "referenced_type" : "type-763", ++ "self_type" : "type-767", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -27987,8 +29399,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-758", +- "self_type" : "type-763", ++ "referenced_type" : "type-756", ++ "self_type" : "type-760", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -27997,8 +29409,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-945", +- "self_type" : "type-949", ++ "referenced_type" : "type-943", ++ "self_type" : "type-947", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28007,8 +29419,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-1054", +- "self_type" : "type-1058", ++ "referenced_type" : "type-1052", ++ "self_type" : "type-1056", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28017,8 +29429,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-1111", +- "self_type" : "type-1115", ++ "referenced_type" : "type-1109", ++ "self_type" : "type-1113", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28027,8 +29439,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-1946", +- "self_type" : "type-1950", ++ "referenced_type" : "type-1942", ++ "self_type" : "type-1946", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28037,8 +29449,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-2016", +- "self_type" : "type-2020", ++ "referenced_type" : "type-2012", ++ "self_type" : "type-2016", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28048,7 +29460,7 @@ + "linker_set_key" : "const android::hardware::Return", + "name" : "const android::hardware::Return", + "referenced_type" : "type-249", +- "self_type" : "type-459", ++ "self_type" : "type-458", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28058,7 +29470,7 @@ + "linker_set_key" : "const android::hardware::Return", + "name" : "const android::hardware::Return", + "referenced_type" : "type-120", +- "self_type" : "type-715", ++ "self_type" : "type-713", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28077,8 +29489,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::TypeCode", + "name" : "const android::hardware::TypeCode", +- "referenced_type" : "type-2291", +- "self_type" : "type-2293", ++ "referenced_type" : "type-2287", ++ "self_type" : "type-2289", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -28087,8 +29499,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::SchedPrio", + "name" : "const android::hardware::details::SchedPrio", +- "referenced_type" : "type-367", +- "self_type" : "type-1011", ++ "referenced_type" : "type-366", ++ "self_type" : "type-1009", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -28097,8 +29509,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::Waiter", + "name" : "const android::hardware::details::Waiter", +- "referenced_type" : "type-1587", +- "self_type" : "type-1586", ++ "referenced_type" : "type-1583", ++ "self_type" : "type-1582", + "size" : 52, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28107,8 +29519,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::Waiter", + "name" : "const android::hardware::details::Waiter", +- "referenced_type" : "type-2725", +- "self_type" : "type-2724", ++ "referenced_type" : "type-2719", ++ "self_type" : "type-2718", + "size" : 52, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28117,8 +29529,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::Waiter", + "name" : "const android::hardware::details::Waiter", +- "referenced_type" : "type-756", +- "self_type" : "type-755", ++ "referenced_type" : "type-754", ++ "self_type" : "type-753", + "size" : 52, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28127,8 +29539,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::hidl_pointer >", + "name" : "const android::hardware::details::hidl_pointer >", +- "referenced_type" : "type-969", +- "self_type" : "type-1037", ++ "referenced_type" : "type-967", ++ "self_type" : "type-1035", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28137,8 +29549,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::hidl_pointer", + "name" : "const android::hardware::details::hidl_pointer", +- "referenced_type" : "type-571", +- "self_type" : "type-606", ++ "referenced_type" : "type-570", ++ "self_type" : "type-605", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28147,8 +29559,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::hidl_pointer", + "name" : "const android::hardware::details::hidl_pointer", +- "referenced_type" : "type-793", +- "self_type" : "type-812", ++ "referenced_type" : "type-791", ++ "self_type" : "type-810", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28177,8 +29589,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::hidl_pointer", + "name" : "const android::hardware::details::hidl_pointer", +- "referenced_type" : "type-473", +- "self_type" : "type-491", ++ "referenced_type" : "type-472", ++ "self_type" : "type-490", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28197,8 +29609,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_array", + "name" : "const android::hardware::hidl_array", +- "referenced_type" : "type-972", +- "self_type" : "type-2083", ++ "referenced_type" : "type-970", ++ "self_type" : "type-2079", + "size" : 32, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28208,7 +29620,7 @@ + "linker_set_key" : "const android::hardware::hidl_death_recipient", + "name" : "const android::hardware::hidl_death_recipient", + "referenced_type" : "type-83", +- "self_type" : "type-431", ++ "self_type" : "type-429", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28247,8 +29659,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_vec >", + "name" : "const android::hardware::hidl_vec >", +- "referenced_type" : "type-968", +- "self_type" : "type-2084", ++ "referenced_type" : "type-966", ++ "self_type" : "type-2080", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28257,8 +29669,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_vec", + "name" : "const android::hardware::hidl_vec", +- "referenced_type" : "type-570", +- "self_type" : "type-573", ++ "referenced_type" : "type-569", ++ "self_type" : "type-572", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28267,8 +29679,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_vec", + "name" : "const android::hardware::hidl_vec", +- "referenced_type" : "type-792", +- "self_type" : "type-982", ++ "referenced_type" : "type-790", ++ "self_type" : "type-980", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28277,8 +29689,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_vec::iter", + "name" : "const android::hardware::hidl_vec::iter", +- "referenced_type" : "type-575", +- "self_type" : "type-580", ++ "referenced_type" : "type-574", ++ "self_type" : "type-579", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28287,8 +29699,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_vec", + "name" : "const android::hardware::hidl_vec", +- "referenced_type" : "type-472", +- "self_type" : "type-476", ++ "referenced_type" : "type-471", ++ "self_type" : "type-475", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28307,8 +29719,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase", + "name" : "const android::hidl::base::V1_0::BpHwBase", +- "referenced_type" : "type-368", +- "self_type" : "type-372", ++ "referenced_type" : "type-367", ++ "self_type" : "type-371", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, +@@ -28338,7 +29750,7 @@ + "linker_set_key" : "const android::hidl::base::V1_0::IBase *const", + "name" : "const android::hidl::base::V1_0::IBase *const", + "referenced_type" : "type-329", +- "self_type" : "type-345", ++ "self_type" : "type-341", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -28347,8 +29759,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceManager", + "name" : "const android::hidl::manager::V1_0::BpHwServiceManager", +- "referenced_type" : "type-830", +- "self_type" : "type-835", ++ "referenced_type" : "type-828", ++ "self_type" : "type-832", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, +@@ -28357,8 +29769,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceNotification", + "name" : "const android::hidl::manager::V1_0::BpHwServiceNotification", +- "referenced_type" : "type-822", +- "self_type" : "type-826", ++ "referenced_type" : "type-820", ++ "self_type" : "type-824", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, +@@ -28367,8 +29779,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager", + "name" : "const android::hidl::manager::V1_0::IServiceManager", +- "referenced_type" : "type-504", +- "self_type" : "type-503", ++ "referenced_type" : "type-503", ++ "self_type" : "type-502", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -28377,8 +29789,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo", + "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo", +- "referenced_type" : "type-502", +- "self_type" : "type-981", ++ "referenced_type" : "type-501", ++ "self_type" : "type-979", + "size" : 64, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28387,8 +29799,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::PidConstant", + "name" : "const android::hidl::manager::V1_0::IServiceManager::PidConstant", +- "referenced_type" : "type-501", +- "self_type" : "type-508", ++ "referenced_type" : "type-500", ++ "self_type" : "type-507", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -28397,8 +29809,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::Transport", + "name" : "const android::hidl::manager::V1_0::IServiceManager::Transport", +- "referenced_type" : "type-500", +- "self_type" : "type-506", ++ "referenced_type" : "type-499", ++ "self_type" : "type-505", + "size" : 1, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -28407,8 +29819,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification", + "name" : "const android::hidl::manager::V1_0::IServiceNotification", +- "referenced_type" : "type-495", +- "self_type" : "type-494", ++ "referenced_type" : "type-493", ++ "self_type" : "type-492", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, +@@ -28417,8 +29829,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_1::BpHwServiceManager", + "name" : "const android::hidl::manager::V1_1::BpHwServiceManager", +- "referenced_type" : "type-839", +- "self_type" : "type-843", ++ "referenced_type" : "type-837", ++ "self_type" : "type-841", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, +@@ -28427,8 +29839,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_1::IServiceManager", + "name" : "const android::hidl::manager::V1_1::IServiceManager", +- "referenced_type" : "type-514", +- "self_type" : "type-513", ++ "referenced_type" : "type-513", ++ "self_type" : "type-512", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, +@@ -28437,8 +29849,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_2::BpHwClientCallback", + "name" : "const android::hidl::manager::V1_2::BpHwClientCallback", +- "referenced_type" : "type-848", +- "self_type" : "type-852", ++ "referenced_type" : "type-846", ++ "self_type" : "type-850", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, +@@ -28447,8 +29859,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_2::BpHwServiceManager", + "name" : "const android::hidl::manager::V1_2::BpHwServiceManager", +- "referenced_type" : "type-729", +- "self_type" : "type-855", ++ "referenced_type" : "type-726", ++ "self_type" : "type-853", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, +@@ -28457,8 +29869,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_2::IClientCallback", + "name" : "const android::hidl::manager::V1_2::IClientCallback", +- "referenced_type" : "type-498", +- "self_type" : "type-497", ++ "referenced_type" : "type-497", ++ "self_type" : "type-496", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, +@@ -28467,8 +29879,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager", + "name" : "const android::hidl::manager::V1_2::IServiceManager", +- "referenced_type" : "type-517", +- "self_type" : "type-516", ++ "referenced_type" : "type-516", ++ "self_type" : "type-515", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, +@@ -28477,8 +29889,8 @@ + "is_const" : true, + "linker_set_key" : "const android::key_value_pair_t >", + "name" : "const android::key_value_pair_t >", +- "referenced_type" : "type-3615", +- "self_type" : "type-3614", ++ "referenced_type" : "type-3609", ++ "self_type" : "type-3608", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -28487,8 +29899,8 @@ + "is_const" : true, + "linker_set_key" : "const android::key_value_pair_t", + "name" : "const android::key_value_pair_t", +- "referenced_type" : "type-2195", +- "self_type" : "type-2194", ++ "referenced_type" : "type-2191", ++ "self_type" : "type-2190", + "size" : 16, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -28497,8 +29909,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-452", +- "self_type" : "type-3637", ++ "referenced_type" : "type-450", ++ "self_type" : "type-3631", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28507,8 +29919,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-425", +- "self_type" : "type-3448", ++ "referenced_type" : "type-424", ++ "self_type" : "type-3442", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28517,8 +29929,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-2279", +- "self_type" : "type-2306", ++ "referenced_type" : "type-2275", ++ "self_type" : "type-2302", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -28536,16 +29948,16 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-2168", +- "self_type" : "type-2167", ++ "referenced_type" : "type-2164", ++ "self_type" : "type-2163", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-3286", +- "self_type" : "type-3285", ++ "referenced_type" : "type-3280", ++ "self_type" : "type-3279", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -28553,8 +29965,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-922", +- "self_type" : "type-2216", ++ "referenced_type" : "type-920", ++ "self_type" : "type-2212", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -28562,24 +29974,24 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-2333", +- "self_type" : "type-2332", ++ "referenced_type" : "type-2329", ++ "self_type" : "type-2328", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-3386", +- "self_type" : "type-3385", ++ "referenced_type" : "type-3380", ++ "self_type" : "type-3379", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-3393", +- "self_type" : "type-3392", ++ "referenced_type" : "type-3387", ++ "self_type" : "type-3386", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -28587,8 +29999,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-383", +- "self_type" : "type-439", ++ "referenced_type" : "type-382", ++ "self_type" : "type-438", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28597,8 +30009,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-928", +- "self_type" : "type-3404", ++ "referenced_type" : "type-926", ++ "self_type" : "type-3398", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28607,8 +30019,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-720", +- "self_type" : "type-719", ++ "referenced_type" : "type-718", ++ "self_type" : "type-717", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28617,8 +30029,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-444", +- "self_type" : "type-449", ++ "referenced_type" : "type-443", ++ "self_type" : "type-448", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28627,8 +30039,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-555", +- "self_type" : "type-558", ++ "referenced_type" : "type-554", ++ "self_type" : "type-557", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28637,8 +30049,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-744", +- "self_type" : "type-753", ++ "referenced_type" : "type-742", ++ "self_type" : "type-746", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28647,8 +30059,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-908", +- "self_type" : "type-907", ++ "referenced_type" : "type-906", ++ "self_type" : "type-905", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -28668,7 +30080,7 @@ + "linker_set_key" : "const android::sp", + "name" : "const android::sp", + "referenced_type" : "type-300", +- "self_type" : "type-410", ++ "self_type" : "type-409", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -28677,8 +30089,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-526", +- "self_type" : "type-529", ++ "referenced_type" : "type-525", ++ "self_type" : "type-528", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28687,8 +30099,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-542", +- "self_type" : "type-545", ++ "referenced_type" : "type-541", ++ "self_type" : "type-544", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28697,8 +30109,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-531", +- "self_type" : "type-534", ++ "referenced_type" : "type-530", ++ "self_type" : "type-533", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28707,8 +30119,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-548", +- "self_type" : "type-553", ++ "referenced_type" : "type-546", ++ "self_type" : "type-552", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28717,8 +30129,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-537", +- "self_type" : "type-540", ++ "referenced_type" : "type-535", ++ "self_type" : "type-539", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28728,7 +30140,7 @@ + "linker_set_key" : "const android::wp", + "name" : "const android::wp", + "referenced_type" : "type-331", +- "self_type" : "type-422", ++ "self_type" : "type-421", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -28737,8 +30149,8 @@ + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-901", +- "self_type" : "type-2170", ++ "referenced_type" : "type-899", ++ "self_type" : "type-2166", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -28746,8 +30158,8 @@ + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-1214", +- "self_type" : "type-1213", ++ "referenced_type" : "type-1212", ++ "self_type" : "type-1211", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -28755,8 +30167,8 @@ + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-2193", +- "self_type" : "type-3559", ++ "referenced_type" : "type-2189", ++ "self_type" : "type-3553", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -28764,8 +30176,8 @@ + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-2361", +- "self_type" : "type-2360", ++ "referenced_type" : "type-2357", ++ "self_type" : "type-2356", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -28780,8 +30192,8 @@ + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-3650", +- "self_type" : "type-3649", ++ "referenced_type" : "type-3645", ++ "self_type" : "type-3644", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -28790,7 +30202,7 @@ + "linker_set_key" : "const android::wp", + "name" : "const android::wp", + "referenced_type" : "type-307", +- "self_type" : "type-417", ++ "self_type" : "type-416", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -28800,7 +30212,7 @@ + "linker_set_key" : "const android::wp", + "name" : "const android::wp", + "referenced_type" : "type-309", +- "self_type" : "type-414", ++ "self_type" : "type-413", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -28809,8 +30221,8 @@ + "is_const" : true, + "linker_set_key" : "const binder_buffer_object", + "name" : "const binder_buffer_object", +- "referenced_type" : "type-3595", +- "self_type" : "type-3594", ++ "referenced_type" : "type-3589", ++ "self_type" : "type-3588", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -28820,7 +30232,7 @@ + "linker_set_key" : "const bool", + "name" : "const bool", + "referenced_type" : "type-29", +- "self_type" : "type-455", ++ "self_type" : "type-453", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -28840,7 +30252,7 @@ + "linker_set_key" : "const char *const", + "name" : "const char *const", + "referenced_type" : "type-41", +- "self_type" : "type-2287", ++ "self_type" : "type-2283", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -28869,8 +30281,8 @@ + "is_const" : true, + "linker_set_key" : "const dirent", + "name" : "const dirent", +- "referenced_type" : "type-1779", +- "self_type" : "type-1778", ++ "referenced_type" : "type-1775", ++ "self_type" : "type-1774", + "size" : 276, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28879,8 +30291,8 @@ + "is_const" : true, + "linker_set_key" : "const dirent", + "name" : "const dirent", +- "referenced_type" : "type-2917", +- "self_type" : "type-2916", ++ "referenced_type" : "type-2911", ++ "self_type" : "type-2910", + "size" : 276, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28889,8 +30301,8 @@ + "is_const" : true, + "linker_set_key" : "const dirent", + "name" : "const dirent", +- "referenced_type" : "type-997", +- "self_type" : "type-996", ++ "referenced_type" : "type-995", ++ "self_type" : "type-994", + "size" : 276, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28909,8 +30321,8 @@ + "is_const" : true, + "linker_set_key" : "const flat_binder_object", + "name" : "const flat_binder_object", +- "referenced_type" : "type-3578", +- "self_type" : "type-3577", ++ "referenced_type" : "type-3572", ++ "self_type" : "type-3571", + "size" : 16, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -28920,7 +30332,7 @@ + "linker_set_key" : "const float", + "name" : "const float", + "referenced_type" : "type-237", +- "self_type" : "type-616", ++ "self_type" : "type-615", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -28930,7 +30342,7 @@ + "linker_set_key" : "const int", + "name" : "const int", + "referenced_type" : "type-14", +- "self_type" : "type-568", ++ "self_type" : "type-567", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -28938,176 +30350,176 @@ + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1064", +- "self_type" : "type-1063", ++ "referenced_type" : "type-1062", ++ "self_type" : "type-1061", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1121", +- "self_type" : "type-1120", ++ "referenced_type" : "type-1119", ++ "self_type" : "type-1118", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1197", +- "self_type" : "type-1196", ++ "referenced_type" : "type-1195", ++ "self_type" : "type-1194", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1302", +- "self_type" : "type-1301", ++ "referenced_type" : "type-1299", ++ "self_type" : "type-1298", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1372", +- "self_type" : "type-1371", ++ "referenced_type" : "type-1369", ++ "self_type" : "type-1368", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1504", +- "self_type" : "type-1503", ++ "referenced_type" : "type-1501", ++ "self_type" : "type-1500", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1543", +- "self_type" : "type-1542", ++ "referenced_type" : "type-1539", ++ "self_type" : "type-1538", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1611", +- "self_type" : "type-1610", ++ "referenced_type" : "type-1607", ++ "self_type" : "type-1606", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1636", +- "self_type" : "type-1635", ++ "referenced_type" : "type-1632", ++ "self_type" : "type-1631", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1681", +- "self_type" : "type-1680", ++ "referenced_type" : "type-1677", ++ "self_type" : "type-1676", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1755", +- "self_type" : "type-1754", ++ "referenced_type" : "type-1751", ++ "self_type" : "type-1750", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1842", +- "self_type" : "type-1841", ++ "referenced_type" : "type-1838", ++ "self_type" : "type-1837", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1897", +- "self_type" : "type-1896", ++ "referenced_type" : "type-1893", ++ "self_type" : "type-1892", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1957", +- "self_type" : "type-1956", ++ "referenced_type" : "type-1953", ++ "self_type" : "type-1952", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2029", +- "self_type" : "type-2028", ++ "referenced_type" : "type-2025", ++ "self_type" : "type-2024", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2075", +- "self_type" : "type-2074", ++ "referenced_type" : "type-2071", ++ "self_type" : "type-2070", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2125", +- "self_type" : "type-2124", ++ "referenced_type" : "type-2121", ++ "self_type" : "type-2120", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2345", +- "self_type" : "type-2344", ++ "referenced_type" : "type-2341", ++ "self_type" : "type-2340", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2448", +- "self_type" : "type-2447", ++ "referenced_type" : "type-2443", ++ "self_type" : "type-2442", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2518", +- "self_type" : "type-2517", ++ "referenced_type" : "type-2513", ++ "self_type" : "type-2512", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2642", +- "self_type" : "type-2641", ++ "referenced_type" : "type-2637", ++ "self_type" : "type-2636", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2681", +- "self_type" : "type-2680", ++ "referenced_type" : "type-2675", ++ "self_type" : "type-2674", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -29122,128 +30534,128 @@ + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2749", +- "self_type" : "type-2748", ++ "referenced_type" : "type-2743", ++ "self_type" : "type-2742", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2774", +- "self_type" : "type-2773", ++ "referenced_type" : "type-2768", ++ "self_type" : "type-2767", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2819", +- "self_type" : "type-2818", ++ "referenced_type" : "type-2813", ++ "self_type" : "type-2812", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2893", +- "self_type" : "type-2892", ++ "referenced_type" : "type-2887", ++ "self_type" : "type-2886", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2980", +- "self_type" : "type-2979", ++ "referenced_type" : "type-2974", ++ "self_type" : "type-2973", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3035", +- "self_type" : "type-3034", ++ "referenced_type" : "type-3029", ++ "self_type" : "type-3028", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3093", +- "self_type" : "type-3092", ++ "referenced_type" : "type-3087", ++ "self_type" : "type-3086", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3163", +- "self_type" : "type-3162", ++ "referenced_type" : "type-3157", ++ "self_type" : "type-3156", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3207", +- "self_type" : "type-3206", ++ "referenced_type" : "type-3201", ++ "self_type" : "type-3200", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3256", +- "self_type" : "type-3255", ++ "referenced_type" : "type-3250", ++ "self_type" : "type-3249", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3402", +- "self_type" : "type-3401", ++ "referenced_type" : "type-3396", ++ "self_type" : "type-3395", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3786", +- "self_type" : "type-3785", ++ "referenced_type" : "type-3779", ++ "self_type" : "type-3778", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3856", +- "self_type" : "type-3855", ++ "referenced_type" : "type-3849", ++ "self_type" : "type-3848", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-470", +- "self_type" : "type-469", ++ "referenced_type" : "type-469", ++ "self_type" : "type-468", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-567", +- "self_type" : "type-566", ++ "referenced_type" : "type-566", ++ "self_type" : "type-565", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-656", +- "self_type" : "type-655", ++ "referenced_type" : "type-655", ++ "self_type" : "type-654", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -29258,40 +30670,40 @@ + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-704", +- "self_type" : "type-703", ++ "referenced_type" : "type-702", ++ "self_type" : "type-701", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-782", +- "self_type" : "type-781", ++ "referenced_type" : "type-780", ++ "self_type" : "type-779", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-811", +- "self_type" : "type-810", ++ "referenced_type" : "type-809", ++ "self_type" : "type-808", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-876", +- "self_type" : "type-875", ++ "referenced_type" : "type-874", ++ "self_type" : "type-873", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-961", +- "self_type" : "type-960", ++ "referenced_type" : "type-959", ++ "self_type" : "type-958", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -29310,7 +30722,7 @@ + "linker_set_key" : "const long long", + "name" : "const long long", + "referenced_type" : "type-336", +- "self_type" : "type-604", ++ "self_type" : "type-603", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -29330,7 +30742,7 @@ + "linker_set_key" : "const short", + "name" : "const short", + "referenced_type" : "type-151", +- "self_type" : "type-547", ++ "self_type" : "type-548", + "size" : 2, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -29339,8 +30751,8 @@ + "is_const" : true, + "linker_set_key" : "const signed char", + "name" : "const signed char", +- "referenced_type" : "type-483", +- "self_type" : "type-482", ++ "referenced_type" : "type-484", ++ "self_type" : "type-483", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -29349,8 +30761,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1071", +- "self_type" : "type-1070", ++ "referenced_type" : "type-1069", ++ "self_type" : "type-1068", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29359,8 +30771,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1129", +- "self_type" : "type-1128", ++ "referenced_type" : "type-1127", ++ "self_type" : "type-1126", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29369,8 +30781,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1204", +- "self_type" : "type-1203", ++ "referenced_type" : "type-1202", ++ "self_type" : "type-1201", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29379,8 +30791,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1311", +- "self_type" : "type-1310", ++ "referenced_type" : "type-1308", ++ "self_type" : "type-1307", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29389,8 +30801,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1385", +- "self_type" : "type-1384", ++ "referenced_type" : "type-1381", ++ "self_type" : "type-1380", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29399,8 +30811,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1508", +- "self_type" : "type-1507", ++ "referenced_type" : "type-1505", ++ "self_type" : "type-1504", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29409,8 +30821,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1549", +- "self_type" : "type-1548", ++ "referenced_type" : "type-1545", ++ "self_type" : "type-1544", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29419,8 +30831,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1626", +- "self_type" : "type-1625", ++ "referenced_type" : "type-1622", ++ "self_type" : "type-1621", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29429,8 +30841,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1685", +- "self_type" : "type-1684", ++ "referenced_type" : "type-1681", ++ "self_type" : "type-1680", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29439,8 +30851,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1777", +- "self_type" : "type-1776", ++ "referenced_type" : "type-1773", ++ "self_type" : "type-1772", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29449,8 +30861,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1849", +- "self_type" : "type-1848", ++ "referenced_type" : "type-1845", ++ "self_type" : "type-1844", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29459,8 +30871,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1905", +- "self_type" : "type-1904", ++ "referenced_type" : "type-1901", ++ "self_type" : "type-1900", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29469,8 +30881,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1964", +- "self_type" : "type-1963", ++ "referenced_type" : "type-1960", ++ "self_type" : "type-1959", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29479,8 +30891,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2036", +- "self_type" : "type-2035", ++ "referenced_type" : "type-2032", ++ "self_type" : "type-2031", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29489,8 +30901,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2088", +- "self_type" : "type-2087", ++ "referenced_type" : "type-2083", ++ "self_type" : "type-2082", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29499,8 +30911,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2128", +- "self_type" : "type-2127", ++ "referenced_type" : "type-2124", ++ "self_type" : "type-2123", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29509,8 +30921,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2352", +- "self_type" : "type-2351", ++ "referenced_type" : "type-2348", ++ "self_type" : "type-2347", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29519,8 +30931,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2457", +- "self_type" : "type-2456", ++ "referenced_type" : "type-2452", ++ "self_type" : "type-2451", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29529,8 +30941,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2530", +- "self_type" : "type-2529", ++ "referenced_type" : "type-2524", ++ "self_type" : "type-2523", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29539,8 +30951,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2646", +- "self_type" : "type-2645", ++ "referenced_type" : "type-2641", ++ "self_type" : "type-2640", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29549,8 +30961,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2687", +- "self_type" : "type-2686", ++ "referenced_type" : "type-2681", ++ "self_type" : "type-2680", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29559,8 +30971,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2764", +- "self_type" : "type-2763", ++ "referenced_type" : "type-2758", ++ "self_type" : "type-2757", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29569,8 +30981,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2823", +- "self_type" : "type-2822", ++ "referenced_type" : "type-2817", ++ "self_type" : "type-2816", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29589,8 +31001,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2915", +- "self_type" : "type-2914", ++ "referenced_type" : "type-2909", ++ "self_type" : "type-2908", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29599,8 +31011,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2987", +- "self_type" : "type-2986", ++ "referenced_type" : "type-2981", ++ "self_type" : "type-2980", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29609,8 +31021,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3043", +- "self_type" : "type-3042", ++ "referenced_type" : "type-3037", ++ "self_type" : "type-3036", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29619,8 +31031,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3100", +- "self_type" : "type-3099", ++ "referenced_type" : "type-3094", ++ "self_type" : "type-3093", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29629,8 +31041,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3170", +- "self_type" : "type-3169", ++ "referenced_type" : "type-3164", ++ "self_type" : "type-3163", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29639,8 +31051,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3219", +- "self_type" : "type-3218", ++ "referenced_type" : "type-3212", ++ "self_type" : "type-3211", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29649,8 +31061,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3259", +- "self_type" : "type-3258", ++ "referenced_type" : "type-3253", ++ "self_type" : "type-3252", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29659,8 +31071,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3487", +- "self_type" : "type-3486", ++ "referenced_type" : "type-3484", ++ "self_type" : "type-3483", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29669,8 +31081,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3795", +- "self_type" : "type-3794", ++ "referenced_type" : "type-3788", ++ "self_type" : "type-3787", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29679,8 +31091,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3868", +- "self_type" : "type-3867", ++ "referenced_type" : "type-3860", ++ "self_type" : "type-3859", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29689,8 +31101,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-481", +- "self_type" : "type-480", ++ "referenced_type" : "type-480", ++ "self_type" : "type-479", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29699,8 +31111,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-586", +- "self_type" : "type-585", ++ "referenced_type" : "type-584", ++ "self_type" : "type-583", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29709,8 +31121,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-660", +- "self_type" : "type-659", ++ "referenced_type" : "type-659", ++ "self_type" : "type-658", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29719,8 +31131,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-710", +- "self_type" : "type-709", ++ "referenced_type" : "type-708", ++ "self_type" : "type-707", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29729,8 +31141,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-800", +- "self_type" : "type-799", ++ "referenced_type" : "type-798", ++ "self_type" : "type-797", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29739,8 +31151,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-880", +- "self_type" : "type-879", ++ "referenced_type" : "type-878", ++ "self_type" : "type-877", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29749,8 +31161,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-995", +- "self_type" : "type-994", ++ "referenced_type" : "type-993", ++ "self_type" : "type-992", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29759,8 +31171,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1030", +- "self_type" : "type-1029", ++ "referenced_type" : "type-1028", ++ "self_type" : "type-1027", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29769,8 +31181,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1084", +- "self_type" : "type-1083", ++ "referenced_type" : "type-1082", ++ "self_type" : "type-1081", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29779,8 +31191,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1142", +- "self_type" : "type-1141", ++ "referenced_type" : "type-1140", ++ "self_type" : "type-1139", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29789,8 +31201,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1332", +- "self_type" : "type-1331", ++ "referenced_type" : "type-1329", ++ "self_type" : "type-1328", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29799,8 +31211,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1524", +- "self_type" : "type-1523", ++ "referenced_type" : "type-1520", ++ "self_type" : "type-1519", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29809,8 +31221,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1642", +- "self_type" : "type-1641", ++ "referenced_type" : "type-1638", ++ "self_type" : "type-1637", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29819,8 +31231,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1695", +- "self_type" : "type-1694", ++ "referenced_type" : "type-1691", ++ "self_type" : "type-1690", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29829,8 +31241,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1810", +- "self_type" : "type-1809", ++ "referenced_type" : "type-1806", ++ "self_type" : "type-1805", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29839,8 +31251,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1862", +- "self_type" : "type-1861", ++ "referenced_type" : "type-1858", ++ "self_type" : "type-1857", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29849,8 +31261,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1918", +- "self_type" : "type-1917", ++ "referenced_type" : "type-1914", ++ "self_type" : "type-1913", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29859,8 +31271,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1984", +- "self_type" : "type-1983", ++ "referenced_type" : "type-1979", ++ "self_type" : "type-1978", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29869,8 +31281,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2056", +- "self_type" : "type-2055", ++ "referenced_type" : "type-2052", ++ "self_type" : "type-2051", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29879,8 +31291,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2110", +- "self_type" : "type-2109", ++ "referenced_type" : "type-2106", ++ "self_type" : "type-2105", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29889,8 +31301,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2478", +- "self_type" : "type-2477", ++ "referenced_type" : "type-2473", ++ "self_type" : "type-2472", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29899,8 +31311,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2662", +- "self_type" : "type-2661", ++ "referenced_type" : "type-2656", ++ "self_type" : "type-2655", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29909,8 +31321,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2780", +- "self_type" : "type-2779", ++ "referenced_type" : "type-2774", ++ "self_type" : "type-2773", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29919,8 +31331,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2833", +- "self_type" : "type-2832", ++ "referenced_type" : "type-2827", ++ "self_type" : "type-2826", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29929,8 +31341,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2948", +- "self_type" : "type-2947", ++ "referenced_type" : "type-2942", ++ "self_type" : "type-2941", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29939,8 +31351,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3000", +- "self_type" : "type-2999", ++ "referenced_type" : "type-2994", ++ "self_type" : "type-2993", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29949,8 +31361,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3056", +- "self_type" : "type-3055", ++ "referenced_type" : "type-3050", ++ "self_type" : "type-3049", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29959,8 +31371,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3120", +- "self_type" : "type-3119", ++ "referenced_type" : "type-3113", ++ "self_type" : "type-3112", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29969,8 +31381,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3190", +- "self_type" : "type-3189", ++ "referenced_type" : "type-3184", ++ "self_type" : "type-3183", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29979,8 +31391,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3241", +- "self_type" : "type-3240", ++ "referenced_type" : "type-3235", ++ "self_type" : "type-3234", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29989,8 +31401,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3816", +- "self_type" : "type-3815", ++ "referenced_type" : "type-3809", ++ "self_type" : "type-3808", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29999,8 +31411,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-512", +- "self_type" : "type-511", ++ "referenced_type" : "type-511", ++ "self_type" : "type-510", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30009,8 +31421,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-685", +- "self_type" : "type-684", ++ "referenced_type" : "type-683", ++ "self_type" : "type-682", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30019,8 +31431,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-817", +- "self_type" : "type-816", ++ "referenced_type" : "type-815", ++ "self_type" : "type-814", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30029,8 +31441,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-890", +- "self_type" : "type-889", ++ "referenced_type" : "type-888", ++ "self_type" : "type-887", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30039,8 +31451,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1028", +- "self_type" : "type-1027", ++ "referenced_type" : "type-1026", ++ "self_type" : "type-1025", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30049,8 +31461,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1082", +- "self_type" : "type-1081", ++ "referenced_type" : "type-1080", ++ "self_type" : "type-1079", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30059,8 +31471,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1140", +- "self_type" : "type-1139", ++ "referenced_type" : "type-1138", ++ "self_type" : "type-1137", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30069,8 +31481,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1330", +- "self_type" : "type-1329", ++ "referenced_type" : "type-1327", ++ "self_type" : "type-1326", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30079,8 +31491,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1522", +- "self_type" : "type-1521", ++ "referenced_type" : "type-1518", ++ "self_type" : "type-1517", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30089,8 +31501,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1640", +- "self_type" : "type-1639", ++ "referenced_type" : "type-1636", ++ "self_type" : "type-1635", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30099,8 +31511,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1693", +- "self_type" : "type-1692", ++ "referenced_type" : "type-1688", ++ "self_type" : "type-1687", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30109,8 +31521,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1808", +- "self_type" : "type-1807", ++ "referenced_type" : "type-1804", ++ "self_type" : "type-1803", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30119,8 +31531,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1860", +- "self_type" : "type-1859", ++ "referenced_type" : "type-1856", ++ "self_type" : "type-1855", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30129,8 +31541,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1916", +- "self_type" : "type-1915", ++ "referenced_type" : "type-1912", ++ "self_type" : "type-1911", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30139,8 +31551,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1981", +- "self_type" : "type-1980", ++ "referenced_type" : "type-1977", ++ "self_type" : "type-1976", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30149,8 +31561,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2054", +- "self_type" : "type-2053", ++ "referenced_type" : "type-2050", ++ "self_type" : "type-2049", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30159,8 +31571,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2108", +- "self_type" : "type-2107", ++ "referenced_type" : "type-2104", ++ "self_type" : "type-2103", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30169,8 +31581,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2476", +- "self_type" : "type-2475", ++ "referenced_type" : "type-2471", ++ "self_type" : "type-2470", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30179,8 +31591,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2660", +- "self_type" : "type-2659", ++ "referenced_type" : "type-2654", ++ "self_type" : "type-2653", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30189,8 +31601,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2778", +- "self_type" : "type-2777", ++ "referenced_type" : "type-2772", ++ "self_type" : "type-2771", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30199,8 +31611,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2831", +- "self_type" : "type-2830", ++ "referenced_type" : "type-2824", ++ "self_type" : "type-2823", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30209,8 +31621,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2946", +- "self_type" : "type-2945", ++ "referenced_type" : "type-2940", ++ "self_type" : "type-2939", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30219,8 +31631,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2998", +- "self_type" : "type-2997", ++ "referenced_type" : "type-2992", ++ "self_type" : "type-2991", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30229,8 +31641,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3054", +- "self_type" : "type-3053", ++ "referenced_type" : "type-3048", ++ "self_type" : "type-3047", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30239,8 +31651,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3117", +- "self_type" : "type-3116", ++ "referenced_type" : "type-3111", ++ "self_type" : "type-3110", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30249,8 +31661,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3188", +- "self_type" : "type-3187", ++ "referenced_type" : "type-3182", ++ "self_type" : "type-3181", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30259,8 +31671,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3239", +- "self_type" : "type-3238", ++ "referenced_type" : "type-3233", ++ "self_type" : "type-3232", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30269,8 +31681,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3814", +- "self_type" : "type-3813", ++ "referenced_type" : "type-3807", ++ "self_type" : "type-3806", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30279,8 +31691,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-510", +- "self_type" : "type-509", ++ "referenced_type" : "type-509", ++ "self_type" : "type-508", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30289,8 +31701,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-683", +- "self_type" : "type-682", ++ "referenced_type" : "type-681", ++ "self_type" : "type-680", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30299,8 +31711,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-815", +- "self_type" : "type-814", ++ "referenced_type" : "type-813", ++ "self_type" : "type-812", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30309,8 +31721,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-888", +- "self_type" : "type-887", ++ "referenced_type" : "type-885", ++ "self_type" : "type-884", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30319,8 +31731,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1008", +- "self_type" : "type-1007", ++ "referenced_type" : "type-1006", ++ "self_type" : "type-1005", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -30329,8 +31741,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1073", +- "self_type" : "type-1072", ++ "referenced_type" : "type-1071", ++ "self_type" : "type-1070", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -30339,8 +31751,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1131", +- "self_type" : "type-1130", ++ "referenced_type" : "type-1129", ++ "self_type" : "type-1128", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -30349,8 +31761,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1244", +- "self_type" : "type-1243", ++ "referenced_type" : "type-1241", ++ "self_type" : "type-1240", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30359,8 +31771,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1315", +- "self_type" : "type-1314", ++ "referenced_type" : "type-1312", ++ "self_type" : "type-1311", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -30369,8 +31781,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1393", +- "self_type" : "type-1392", ++ "referenced_type" : "type-1390", ++ "self_type" : "type-1389", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30379,8 +31791,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1497", +- "self_type" : "type-1496", ++ "referenced_type" : "type-1494", ++ "self_type" : "type-1493", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -30389,8 +31801,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1583", +- "self_type" : "type-1582", ++ "referenced_type" : "type-1581", ++ "self_type" : "type-1580", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -30399,8 +31811,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1630", +- "self_type" : "type-1629", ++ "referenced_type" : "type-1626", ++ "self_type" : "type-1625", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -30409,8 +31821,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1790", +- "self_type" : "type-1789", ++ "referenced_type" : "type-1786", ++ "self_type" : "type-1785", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -30419,8 +31831,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1851", +- "self_type" : "type-1850", ++ "referenced_type" : "type-1847", ++ "self_type" : "type-1846", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -30429,8 +31841,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1907", +- "self_type" : "type-1906", ++ "referenced_type" : "type-1903", ++ "self_type" : "type-1902", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -30439,8 +31851,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1968", +- "self_type" : "type-1967", ++ "referenced_type" : "type-1964", ++ "self_type" : "type-1963", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -30449,8 +31861,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2044", +- "self_type" : "type-2043", ++ "referenced_type" : "type-2040", ++ "self_type" : "type-2039", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -30459,8 +31871,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2090", +- "self_type" : "type-2089", ++ "referenced_type" : "type-2086", ++ "self_type" : "type-2085", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -30469,8 +31881,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2391", +- "self_type" : "type-2390", ++ "referenced_type" : "type-2386", ++ "self_type" : "type-2385", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30479,8 +31891,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2461", +- "self_type" : "type-2460", ++ "referenced_type" : "type-2456", ++ "self_type" : "type-2455", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -30489,8 +31901,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2538", +- "self_type" : "type-2537", ++ "referenced_type" : "type-2533", ++ "self_type" : "type-2532", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30499,8 +31911,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2635", +- "self_type" : "type-2634", ++ "referenced_type" : "type-2630", ++ "self_type" : "type-2629", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -30509,8 +31921,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2721", +- "self_type" : "type-2720", ++ "referenced_type" : "type-2717", ++ "self_type" : "type-2716", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -30519,8 +31931,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2768", +- "self_type" : "type-2767", ++ "referenced_type" : "type-2762", ++ "self_type" : "type-2761", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -30529,8 +31941,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2928", +- "self_type" : "type-2927", ++ "referenced_type" : "type-2922", ++ "self_type" : "type-2921", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -30539,8 +31951,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2989", +- "self_type" : "type-2988", ++ "referenced_type" : "type-2983", ++ "self_type" : "type-2982", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -30549,8 +31961,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3045", +- "self_type" : "type-3044", ++ "referenced_type" : "type-3039", ++ "self_type" : "type-3038", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -30559,8 +31971,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3104", +- "self_type" : "type-3103", ++ "referenced_type" : "type-3098", ++ "self_type" : "type-3097", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -30569,8 +31981,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3178", +- "self_type" : "type-3177", ++ "referenced_type" : "type-3172", ++ "self_type" : "type-3171", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -30579,8 +31991,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3221", +- "self_type" : "type-3220", ++ "referenced_type" : "type-3215", ++ "self_type" : "type-3214", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -30589,8 +32001,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-359", +- "self_type" : "type-358", ++ "referenced_type" : "type-358", ++ "self_type" : "type-357", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30599,8 +32011,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3729", +- "self_type" : "type-3728", ++ "referenced_type" : "type-3722", ++ "self_type" : "type-3721", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30609,8 +32021,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3799", +- "self_type" : "type-3798", ++ "referenced_type" : "type-3792", ++ "self_type" : "type-3791", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -30619,8 +32031,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3876", +- "self_type" : "type-3875", ++ "referenced_type" : "type-3869", ++ "self_type" : "type-3868", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30639,8 +32051,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-488", +- "self_type" : "type-487", ++ "referenced_type" : "type-487", ++ "self_type" : "type-486", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -30659,8 +32071,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-599", +- "self_type" : "type-598", ++ "referenced_type" : "type-598", ++ "self_type" : "type-597", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30669,8 +32081,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-649", +- "self_type" : "type-648", ++ "referenced_type" : "type-648", ++ "self_type" : "type-647", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -30689,8 +32101,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-805", +- "self_type" : "type-804", ++ "referenced_type" : "type-803", ++ "self_type" : "type-802", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -30699,8 +32111,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-1388", +- "self_type" : "type-1387", ++ "referenced_type" : "type-1385", ++ "self_type" : "type-1384", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30709,8 +32121,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-2533", +- "self_type" : "type-2532", ++ "referenced_type" : "type-2528", ++ "self_type" : "type-2527", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30719,8 +32131,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-3871", +- "self_type" : "type-3870", ++ "referenced_type" : "type-3864", ++ "self_type" : "type-3863", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30729,8 +32141,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-594", +- "self_type" : "type-593", ++ "referenced_type" : "type-593", ++ "self_type" : "type-592", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30739,8 +32151,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-1240", +- "self_type" : "type-1239", ++ "referenced_type" : "type-1237", ++ "self_type" : "type-1236", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30749,8 +32161,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-2387", +- "self_type" : "type-2386", ++ "referenced_type" : "type-2382", ++ "self_type" : "type-2381", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30759,8 +32171,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-354", +- "self_type" : "type-353", ++ "referenced_type" : "type-353", ++ "self_type" : "type-352", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30769,8 +32181,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-3725", +- "self_type" : "type-3724", ++ "referenced_type" : "type-3718", ++ "self_type" : "type-3717", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30779,8 +32191,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-1186", +- "self_type" : "type-1185", ++ "referenced_type" : "type-1184", ++ "self_type" : "type-1183", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -30789,8 +32201,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-1224", +- "self_type" : "type-1223", ++ "referenced_type" : "type-1222", ++ "self_type" : "type-1221", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -30799,8 +32211,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-2119", +- "self_type" : "type-2118", ++ "referenced_type" : "type-2115", ++ "self_type" : "type-2114", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -30809,8 +32221,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-2371", +- "self_type" : "type-2370", ++ "referenced_type" : "type-2367", ++ "self_type" : "type-2366", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -30829,8 +32241,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-3250", +- "self_type" : "type-3249", ++ "referenced_type" : "type-3244", ++ "self_type" : "type-3243", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -30849,8 +32261,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-3451", +- "self_type" : "type-3450", ++ "referenced_type" : "type-3445", ++ "self_type" : "type-3444", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -30859,8 +32271,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-3696", +- "self_type" : "type-3695", ++ "referenced_type" : "type-3690", ++ "self_type" : "type-3689", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -30869,8 +32281,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1069", +- "self_type" : "type-1068", ++ "referenced_type" : "type-1067", ++ "self_type" : "type-1066", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -30879,8 +32291,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1126", +- "self_type" : "type-1125", ++ "referenced_type" : "type-1124", ++ "self_type" : "type-1123", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -30889,8 +32301,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1766", +- "self_type" : "type-1765", ++ "referenced_type" : "type-1762", ++ "self_type" : "type-1761", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -30899,8 +32311,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1847", +- "self_type" : "type-1846", ++ "referenced_type" : "type-1843", ++ "self_type" : "type-1842", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -30909,8 +32321,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1902", +- "self_type" : "type-1901", ++ "referenced_type" : "type-1898", ++ "self_type" : "type-1897", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -30919,8 +32331,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1962", +- "self_type" : "type-1961", ++ "referenced_type" : "type-1958", ++ "self_type" : "type-1957", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -30929,8 +32341,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-2034", +- "self_type" : "type-2033", ++ "referenced_type" : "type-2030", ++ "self_type" : "type-2029", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -30939,8 +32351,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-2081", +- "self_type" : "type-2080", ++ "referenced_type" : "type-2077", ++ "self_type" : "type-2076", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -30949,8 +32361,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-2904", +- "self_type" : "type-2903", ++ "referenced_type" : "type-2898", ++ "self_type" : "type-2897", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -30959,8 +32371,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-2985", +- "self_type" : "type-2984", ++ "referenced_type" : "type-2979", ++ "self_type" : "type-2978", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -30969,8 +32381,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-3040", +- "self_type" : "type-3039", ++ "referenced_type" : "type-3034", ++ "self_type" : "type-3033", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -30979,8 +32391,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-3098", +- "self_type" : "type-3097", ++ "referenced_type" : "type-3092", ++ "self_type" : "type-3091", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -30989,8 +32401,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-3168", +- "self_type" : "type-3167", ++ "referenced_type" : "type-3162", ++ "self_type" : "type-3161", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -30999,8 +32411,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-3213", +- "self_type" : "type-3212", ++ "referenced_type" : "type-3207", ++ "self_type" : "type-3206", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31009,8 +32421,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-976", +- "self_type" : "type-975", ++ "referenced_type" : "type-974", ++ "self_type" : "type-973", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31019,8 +32431,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1067", +- "self_type" : "type-1066", ++ "referenced_type" : "type-1065", ++ "self_type" : "type-1064", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31029,8 +32441,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1124", +- "self_type" : "type-1123", ++ "referenced_type" : "type-1122", ++ "self_type" : "type-1121", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31039,8 +32451,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1760", +- "self_type" : "type-1759", ++ "referenced_type" : "type-1756", ++ "self_type" : "type-1755", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31049,8 +32461,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1845", +- "self_type" : "type-1844", ++ "referenced_type" : "type-1841", ++ "self_type" : "type-1840", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31059,8 +32471,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1900", +- "self_type" : "type-1899", ++ "referenced_type" : "type-1896", ++ "self_type" : "type-1895", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31069,8 +32481,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1960", +- "self_type" : "type-1959", ++ "referenced_type" : "type-1956", ++ "self_type" : "type-1955", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31079,8 +32491,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-2032", +- "self_type" : "type-2031", ++ "referenced_type" : "type-2028", ++ "self_type" : "type-2027", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31089,8 +32501,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-2078", +- "self_type" : "type-2077", ++ "referenced_type" : "type-2074", ++ "self_type" : "type-2073", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31099,8 +32511,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-2898", +- "self_type" : "type-2897", ++ "referenced_type" : "type-2892", ++ "self_type" : "type-2891", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31109,8 +32521,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-2983", +- "self_type" : "type-2982", ++ "referenced_type" : "type-2977", ++ "self_type" : "type-2976", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31119,8 +32531,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-3038", +- "self_type" : "type-3037", ++ "referenced_type" : "type-3032", ++ "self_type" : "type-3031", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31129,8 +32541,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-3096", +- "self_type" : "type-3095", ++ "referenced_type" : "type-3090", ++ "self_type" : "type-3089", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31139,8 +32551,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-3166", +- "self_type" : "type-3165", ++ "referenced_type" : "type-3160", ++ "self_type" : "type-3159", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31149,8 +32561,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-3210", +- "self_type" : "type-3209", ++ "referenced_type" : "type-3204", ++ "self_type" : "type-3203", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31159,8 +32571,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-966", +- "self_type" : "type-965", ++ "referenced_type" : "type-964", ++ "self_type" : "type-963", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31169,8 +32581,8 @@ + "is_const" : true, + "linker_set_key" : "const std::unique_ptr >", + "name" : "const std::unique_ptr >", +- "referenced_type" : "type-3575", +- "self_type" : "type-3574", ++ "referenced_type" : "type-3569", ++ "self_type" : "type-3568", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -31179,8 +32591,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-1618", +- "self_type" : "type-1617", ++ "referenced_type" : "type-1614", ++ "self_type" : "type-1613", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31189,8 +32601,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-2756", +- "self_type" : "type-2755", ++ "referenced_type" : "type-2750", ++ "self_type" : "type-2749", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31199,8 +32611,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-789", +- "self_type" : "type-788", ++ "referenced_type" : "type-787", ++ "self_type" : "type-786", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31209,8 +32621,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1042", +- "self_type" : "type-1041", ++ "referenced_type" : "type-1040", ++ "self_type" : "type-1039", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31219,8 +32631,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1092", +- "self_type" : "type-1091", ++ "referenced_type" : "type-1090", ++ "self_type" : "type-1089", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31229,8 +32641,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1110", +- "self_type" : "type-1109", ++ "referenced_type" : "type-1108", ++ "self_type" : "type-1107", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31239,8 +32651,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1150", +- "self_type" : "type-1149", ++ "referenced_type" : "type-1148", ++ "self_type" : "type-1147", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31249,8 +32661,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1230", +- "self_type" : "type-1229", ++ "referenced_type" : "type-1228", ++ "self_type" : "type-1227", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31259,8 +32671,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1339", +- "self_type" : "type-1338", ++ "referenced_type" : "type-1336", ++ "self_type" : "type-1335", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31269,8 +32681,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1403", +- "self_type" : "type-1402", ++ "referenced_type" : "type-1400", ++ "self_type" : "type-1399", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31279,8 +32691,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1527", +- "self_type" : "type-1526", ++ "referenced_type" : "type-1523", ++ "self_type" : "type-1522", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31289,8 +32701,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1553", +- "self_type" : "type-1552", ++ "referenced_type" : "type-1549", ++ "self_type" : "type-1548", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31299,8 +32711,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1581", +- "self_type" : "type-1580", ++ "referenced_type" : "type-1579", ++ "self_type" : "type-1578", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31319,8 +32731,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1665", +- "self_type" : "type-1664", ++ "referenced_type" : "type-1661", ++ "self_type" : "type-1660", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31329,8 +32741,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1698", +- "self_type" : "type-1697", ++ "referenced_type" : "type-1694", ++ "self_type" : "type-1693", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31339,8 +32751,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1701", +- "self_type" : "type-1700", ++ "referenced_type" : "type-1697", ++ "self_type" : "type-1696", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31349,8 +32761,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1822", +- "self_type" : "type-1821", ++ "referenced_type" : "type-1818", ++ "self_type" : "type-1817", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31359,8 +32771,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1870", +- "self_type" : "type-1869", ++ "referenced_type" : "type-1866", ++ "self_type" : "type-1865", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31369,8 +32781,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1887", +- "self_type" : "type-1886", ++ "referenced_type" : "type-1883", ++ "self_type" : "type-1882", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31379,8 +32791,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1926", +- "self_type" : "type-1925", ++ "referenced_type" : "type-1922", ++ "self_type" : "type-1921", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31389,8 +32801,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1994", +- "self_type" : "type-1993", ++ "referenced_type" : "type-1989", ++ "self_type" : "type-1988", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31399,8 +32811,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2059", +- "self_type" : "type-2058", ++ "referenced_type" : "type-2055", ++ "self_type" : "type-2054", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31409,8 +32821,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2113", +- "self_type" : "type-2112", ++ "referenced_type" : "type-2109", ++ "self_type" : "type-2108", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31419,8 +32831,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2132", +- "self_type" : "type-2131", ++ "referenced_type" : "type-2128", ++ "self_type" : "type-2127", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31429,8 +32841,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2377", +- "self_type" : "type-2376", ++ "referenced_type" : "type-2373", ++ "self_type" : "type-2372", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31439,8 +32851,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2485", +- "self_type" : "type-2484", ++ "referenced_type" : "type-2480", ++ "self_type" : "type-2479", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31449,8 +32861,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2548", +- "self_type" : "type-2547", ++ "referenced_type" : "type-2543", ++ "self_type" : "type-2542", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31459,8 +32871,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2665", +- "self_type" : "type-2664", ++ "referenced_type" : "type-2659", ++ "self_type" : "type-2658", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31469,8 +32881,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2691", +- "self_type" : "type-2690", ++ "referenced_type" : "type-2685", ++ "self_type" : "type-2684", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31479,8 +32891,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2719", +- "self_type" : "type-2718", ++ "referenced_type" : "type-2715", ++ "self_type" : "type-2714", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31489,8 +32901,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2803", +- "self_type" : "type-2802", ++ "referenced_type" : "type-2797", ++ "self_type" : "type-2796", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31499,8 +32911,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2836", +- "self_type" : "type-2835", ++ "referenced_type" : "type-2830", ++ "self_type" : "type-2829", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31509,8 +32921,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2839", +- "self_type" : "type-2838", ++ "referenced_type" : "type-2833", ++ "self_type" : "type-2832", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31519,8 +32931,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2960", +- "self_type" : "type-2959", ++ "referenced_type" : "type-2954", ++ "self_type" : "type-2953", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31529,8 +32941,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3008", +- "self_type" : "type-3007", ++ "referenced_type" : "type-3002", ++ "self_type" : "type-3001", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31539,8 +32951,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3025", +- "self_type" : "type-3024", ++ "referenced_type" : "type-3019", ++ "self_type" : "type-3018", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31549,8 +32961,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3064", +- "self_type" : "type-3063", ++ "referenced_type" : "type-3058", ++ "self_type" : "type-3057", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31559,8 +32971,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3130", +- "self_type" : "type-3129", ++ "referenced_type" : "type-3123", ++ "self_type" : "type-3122", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31569,8 +32981,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3193", +- "self_type" : "type-3192", ++ "referenced_type" : "type-3187", ++ "self_type" : "type-3186", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31579,8 +32991,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3244", +- "self_type" : "type-3243", ++ "referenced_type" : "type-3238", ++ "self_type" : "type-3237", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31589,8 +33001,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3263", +- "self_type" : "type-3262", ++ "referenced_type" : "type-3257", ++ "self_type" : "type-3256", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31609,8 +33021,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3715", +- "self_type" : "type-3714", ++ "referenced_type" : "type-3709", ++ "self_type" : "type-3708", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31619,8 +33031,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3823", +- "self_type" : "type-3822", ++ "referenced_type" : "type-3816", ++ "self_type" : "type-3815", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31629,8 +33041,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3886", +- "self_type" : "type-3885", ++ "referenced_type" : "type-3879", ++ "self_type" : "type-3878", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31649,8 +33061,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-521", +- "self_type" : "type-520", ++ "referenced_type" : "type-520", ++ "self_type" : "type-519", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31659,8 +33071,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-610", +- "self_type" : "type-609", ++ "referenced_type" : "type-609", ++ "self_type" : "type-608", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31669,8 +33081,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-688", +- "self_type" : "type-687", ++ "referenced_type" : "type-686", ++ "self_type" : "type-685", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31679,8 +33091,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-714", +- "self_type" : "type-713", ++ "referenced_type" : "type-712", ++ "self_type" : "type-711", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31699,8 +33111,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-860", +- "self_type" : "type-859", ++ "referenced_type" : "type-858", ++ "self_type" : "type-857", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31709,8 +33121,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-893", +- "self_type" : "type-892", ++ "referenced_type" : "type-891", ++ "self_type" : "type-890", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31719,8 +33131,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-896", +- "self_type" : "type-895", ++ "referenced_type" : "type-894", ++ "self_type" : "type-893", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31740,7 +33152,7 @@ + "linker_set_key" : "const unsigned char", + "name" : "const unsigned char", + "referenced_type" : "type-146", +- "self_type" : "type-522", ++ "self_type" : "type-521", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -31749,8 +33161,8 @@ + "is_const" : true, + "linker_set_key" : "const unsigned char *const", + "name" : "const unsigned char *const", +- "referenced_type" : "type-990", +- "self_type" : "type-3536", ++ "referenced_type" : "type-987", ++ "self_type" : "type-3530", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -31769,8 +33181,8 @@ + "is_const" : true, + "linker_set_key" : "const unsigned int *const", + "name" : "const unsigned int *const", +- "referenced_type" : "type-2164", +- "self_type" : "type-3538", ++ "referenced_type" : "type-2160", ++ "self_type" : "type-3532", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -31780,7 +33192,7 @@ + "linker_set_key" : "const unsigned long long", + "name" : "const unsigned long long", + "referenced_type" : "type-16", +- "self_type" : "type-611", ++ "self_type" : "type-610", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -31790,7 +33202,7 @@ + "linker_set_key" : "const unsigned short", + "name" : "const unsigned short", + "referenced_type" : "type-71", +- "self_type" : "type-561", ++ "self_type" : "type-560", + "size" : 2, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -31808,7 +33220,7 @@ + "linker_set_key" : "const void *const", + "name" : "const void *const", + "referenced_type" : "type-78", +- "self_type" : "type-2197", ++ "self_type" : "type-2193", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -31818,7 +33230,7 @@ + "linker_set_key" : "void *const", + "name" : "void *const", + "referenced_type" : "type-188", +- "self_type" : "type-3478", ++ "self_type" : "type-3472", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -31828,7 +33240,7 @@ + "linker_set_key" : "volatile bool", + "name" : "volatile bool", + "referenced_type" : "type-29", +- "self_type" : "type-409", ++ "self_type" : "type-408", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/Thread.h" + }, +@@ -31838,7 +33250,7 @@ + "linker_set_key" : "volatile int", + "name" : "volatile int", + "referenced_type" : "type-14", +- "self_type" : "type-2149", ++ "self_type" : "type-2145", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + } +@@ -31859,20 +33271,20 @@ + "access" : "private", + "field_name" : "d_", + "field_offset" : 32, +- "referenced_type" : "type-2312" ++ "referenced_type" : "type-2308" + }, + { + "access" : "private", + "field_name" : "s_", + "field_offset" : 64, +- "referenced_type" : "type-2313" ++ "referenced_type" : "type-2309" + } + ], + "linker_set_key" : "Renamer", + "name" : "Renamer", + "record_kind" : "class", +- "referenced_type" : "type-2311", +- "self_type" : "type-2311", ++ "referenced_type" : "type-2307", ++ "self_type" : "type-2307", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/RefBase.h", + "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jE7Renamer", +@@ -31931,8 +33343,8 @@ + "alignment" : 1, + "linker_set_key" : "android::CompileTimeAssert", + "name" : "android::CompileTimeAssert", +- "referenced_type" : "type-3613", +- "self_type" : "type-3613", ++ "referenced_type" : "type-3607", ++ "self_type" : "type-3607", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/Debug.h", + "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE" +@@ -31944,14 +33356,14 @@ + { + "access" : "private", + "field_name" : "mCond", +- "referenced_type" : "type-396" ++ "referenced_type" : "type-395" + } + ], + "linker_set_key" : "android::Condition", + "name" : "android::Condition", + "record_kind" : "class", +- "referenced_type" : "type-395", +- "self_type" : "type-395", ++ "referenced_type" : "type-394", ++ "self_type" : "type-394", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Condition.h", + "unique_id" : "_ZTSN7android9ConditionE" +@@ -31963,17 +33375,17 @@ + { + "access" : "private", + "field_name" : "mVector", +- "referenced_type" : "type-375" ++ "referenced_type" : "type-374" + } + ], + "linker_set_key" : "android::KeyedVector >", + "name" : "android::KeyedVector >", + "record_kind" : "class", +- "referenced_type" : "type-382", +- "self_type" : "type-382", ++ "referenced_type" : "type-381", ++ "self_type" : "type-381", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h", +- "template_args" : [ "type-286", "type-383" ], ++ "template_args" : [ "type-286", "type-382" ], + "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE" + }, + { +@@ -31983,17 +33395,17 @@ + { + "access" : "private", + "field_name" : "mVector", +- "referenced_type" : "type-2154" ++ "referenced_type" : "type-2150" + } + ], + "linker_set_key" : "android::KeyedVector", + "name" : "android::KeyedVector", + "record_kind" : "class", +- "referenced_type" : "type-2153", +- "self_type" : "type-2153", ++ "referenced_type" : "type-2149", ++ "self_type" : "type-2149", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h", +- "template_args" : [ "type-78", "type-2156" ], ++ "template_args" : [ "type-78", "type-2152" ], + "unique_id" : "_ZTSN7android11KeyedVectorIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { +@@ -32043,14 +33455,14 @@ + { + "access" : "private", + "field_name" : "mMutex", +- "referenced_type" : "type-389" ++ "referenced_type" : "type-388" + } + ], + "linker_set_key" : "android::Mutex", + "name" : "android::Mutex", + "record_kind" : "class", +- "referenced_type" : "type-388", +- "self_type" : "type-388", ++ "referenced_type" : "type-387", ++ "self_type" : "type-387", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Mutex.h", + "unique_id" : "_ZTSN7android5MutexE" +@@ -32062,14 +33474,14 @@ + { + "access" : "private", + "field_name" : "mLock", +- "referenced_type" : "type-393" ++ "referenced_type" : "type-392" + } + ], + "linker_set_key" : "android::Mutex::Autolock", + "name" : "android::Mutex::Autolock", + "record_kind" : "class", +- "referenced_type" : "type-392", +- "self_type" : "type-392", ++ "referenced_type" : "type-391", ++ "self_type" : "type-391", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Mutex.h", + "unique_id" : "_ZTSN7android5Mutex8AutolockE" +@@ -32113,14 +33525,14 @@ + { + "access" : "private", + "field_name" : "mRWLock", +- "referenced_type" : "type-400" ++ "referenced_type" : "type-399" + } + ], + "linker_set_key" : "android::RWLock", + "name" : "android::RWLock", + "record_kind" : "class", +- "referenced_type" : "type-399", +- "self_type" : "type-399", ++ "referenced_type" : "type-398", ++ "self_type" : "type-398", + "size" : 40, + "source_file" : "/system/core/libutils/include/utils/RWLock.h", + "unique_id" : "_ZTSN7android6RWLockE" +@@ -32132,14 +33544,14 @@ + { + "access" : "private", + "field_name" : "mLock", +- "referenced_type" : "type-404" ++ "referenced_type" : "type-403" + } + ], + "linker_set_key" : "android::RWLock::AutoRLock", + "name" : "android::RWLock::AutoRLock", + "record_kind" : "class", +- "referenced_type" : "type-403", +- "self_type" : "type-403", ++ "referenced_type" : "type-402", ++ "self_type" : "type-402", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RWLock.h", + "unique_id" : "_ZTSN7android6RWLock9AutoRLockE" +@@ -32151,14 +33563,14 @@ + { + "access" : "private", + "field_name" : "mLock", +- "referenced_type" : "type-404" ++ "referenced_type" : "type-403" + } + ], + "linker_set_key" : "android::RWLock::AutoWLock", + "name" : "android::RWLock::AutoWLock", + "record_kind" : "class", +- "referenced_type" : "type-407", +- "self_type" : "type-407", ++ "referenced_type" : "type-405", ++ "self_type" : "type-405", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RWLock.h", + "unique_id" : "_ZTSN7android6RWLock9AutoWLockE" +@@ -32273,8 +33685,8 @@ + "linker_set_key" : "android::ScopedTrace", + "name" : "android::ScopedTrace", + "record_kind" : "class", +- "referenced_type" : "type-1025", +- "self_type" : "type-1025", ++ "referenced_type" : "type-1023", ++ "self_type" : "type-1023", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Trace.h", + "unique_id" : "_ZTSN7android11ScopedTraceE" +@@ -32291,11 +33703,11 @@ + "linker_set_key" : "android::SortedVector > >", + "name" : "android::SortedVector > >", + "record_kind" : "class", +- "referenced_type" : "type-375", +- "self_type" : "type-375", ++ "referenced_type" : "type-374", ++ "self_type" : "type-374", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h", +- "template_args" : [ "type-376" ], ++ "template_args" : [ "type-375" ], + "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE", + "vtable_components" : + [ +@@ -32349,11 +33761,11 @@ + "linker_set_key" : "android::SortedVector >", + "name" : "android::SortedVector >", + "record_kind" : "class", +- "referenced_type" : "type-2154", +- "self_type" : "type-2154", ++ "referenced_type" : "type-2150", ++ "self_type" : "type-2150", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h", +- "template_args" : [ "type-2155" ], ++ "template_args" : [ "type-2151" ], + "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE", + "vtable_components" : + [ +@@ -32511,7 +33923,7 @@ + "access" : "private", + "field_name" : "mCanCallJava", + "field_offset" : 32, +- "referenced_type" : "type-455" ++ "referenced_type" : "type-453" + }, + { + "access" : "private", +@@ -32523,13 +33935,13 @@ + "access" : "private", + "field_name" : "mLock", + "field_offset" : 96, +- "referenced_type" : "type-388" ++ "referenced_type" : "type-387" + }, + { + "access" : "private", + "field_name" : "mThreadExitedCondition", + "field_offset" : 128, +- "referenced_type" : "type-395" ++ "referenced_type" : "type-394" + }, + { + "access" : "private", +@@ -32541,19 +33953,19 @@ + "access" : "private", + "field_name" : "mExitPending", + "field_offset" : 192, +- "referenced_type" : "type-409" ++ "referenced_type" : "type-408" + }, + { + "access" : "private", + "field_name" : "mRunning", + "field_offset" : 200, +- "referenced_type" : "type-409" ++ "referenced_type" : "type-408" + }, + { + "access" : "private", + "field_name" : "mHoldSelf", + "field_offset" : 224, +- "referenced_type" : "type-452" ++ "referenced_type" : "type-450" + }, + { + "access" : "private", +@@ -32565,8 +33977,8 @@ + "linker_set_key" : "android::Thread", + "name" : "android::Thread", + "record_kind" : "class", +- "referenced_type" : "type-454", +- "self_type" : "type-454", ++ "referenced_type" : "type-452", ++ "self_type" : "type-452", + "size" : 44, + "source_file" : "/system/core/libutils/include/utils/Thread.h", + "unique_id" : "_ZTSN7android6ThreadE", +@@ -32662,8 +34074,8 @@ + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-381", +- "self_type" : "type-381", ++ "referenced_type" : "type-380", ++ "self_type" : "type-380", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", + "template_args" : [ "type-25" ], +@@ -32717,8 +34129,8 @@ + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-380", +- "self_type" : "type-380", ++ "referenced_type" : "type-379", ++ "self_type" : "type-379", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", + "template_args" : [ "type-308" ], +@@ -32827,8 +34239,8 @@ + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-379", +- "self_type" : "type-379", ++ "referenced_type" : "type-378", ++ "self_type" : "type-378", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", + "template_args" : [ "type-332" ], +@@ -32882,11 +34294,11 @@ + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-2221", +- "self_type" : "type-2221", ++ "referenced_type" : "type-2217", ++ "self_type" : "type-2217", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", +- "template_args" : [ "type-2185" ], ++ "template_args" : [ "type-2181" ], + "unique_id" : "_ZTSN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE", + "vtable_components" : + [ +@@ -32937,11 +34349,11 @@ + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-377", +- "self_type" : "type-377", ++ "referenced_type" : "type-376", ++ "self_type" : "type-376", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", +- "template_args" : [ "type-378" ], ++ "template_args" : [ "type-377" ], + "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE", + "vtable_components" : + [ +@@ -32992,11 +34404,11 @@ + "linker_set_key" : "android::Vector >", + "name" : "android::Vector >", + "record_kind" : "class", +- "referenced_type" : "type-2328", +- "self_type" : "type-2328", ++ "referenced_type" : "type-2322", ++ "self_type" : "type-2322", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", +- "template_args" : [ "type-2279" ], ++ "template_args" : [ "type-2275" ], + "unique_id" : "_ZTSN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE", + "vtable_components" : + [ +@@ -33047,8 +34459,8 @@ + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-2322", +- "self_type" : "type-2322", ++ "referenced_type" : "type-2318", ++ "self_type" : "type-2318", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", + "template_args" : [ "type-14" ], +@@ -33209,22 +34621,22 @@ + "alignment" : 1, + "linker_set_key" : "android::aggregate_traits >", + "name" : "android::aggregate_traits >", +- "referenced_type" : "type-3684", +- "self_type" : "type-3684", ++ "referenced_type" : "type-3678", ++ "self_type" : "type-3678", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-286", "type-383" ], ++ "template_args" : [ "type-286", "type-382" ], + "unique_id" : "_ZTSN7android16aggregate_traitsINS_8String16ENS_2spINS_8hardware7IBinderEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::aggregate_traits", + "name" : "android::aggregate_traits", +- "referenced_type" : "type-2277", +- "self_type" : "type-2277", ++ "referenced_type" : "type-2273", ++ "self_type" : "type-2273", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-78", "type-2156" ], ++ "template_args" : [ "type-78", "type-2152" ], + "unique_id" : "_ZTSN7android16aggregate_traitsIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { +@@ -33232,7 +34644,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2136" + } + ], + "fields" : +@@ -33253,7 +34665,7 @@ + "access" : "private", + "field_name" : "mExtras", + "field_offset" : 96, +- "referenced_type" : "type-2146" ++ "referenced_type" : "type-2142" + }, + { + "access" : "private", +@@ -33265,8 +34677,8 @@ + "linker_set_key" : "android::hardware::BHwBinder", + "name" : "android::hardware::BHwBinder", + "record_kind" : "class", +- "referenced_type" : "type-2145", +- "self_type" : "type-2145", ++ "referenced_type" : "type-2141", ++ "self_type" : "type-2141", + "size" : 28, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h", + "unique_id" : "_ZTSN7android8hardware9BHwBinderE", +@@ -33372,7 +34784,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2136" + } + ], + "fields" : +@@ -33381,43 +34793,43 @@ + "access" : "private", + "field_name" : "mHandle", + "field_offset" : 32, +- "referenced_type" : "type-568" ++ "referenced_type" : "type-567" + }, + { + "access" : "private", + "field_name" : "mLock", + "field_offset" : 64, +- "referenced_type" : "type-388" ++ "referenced_type" : "type-387" + }, + { + "access" : "private", + "field_name" : "mAlive", + "field_offset" : 96, +- "referenced_type" : "type-2149" ++ "referenced_type" : "type-2145" + }, + { + "access" : "private", + "field_name" : "mObitsSent", + "field_offset" : 128, +- "referenced_type" : "type-2149" ++ "referenced_type" : "type-2145" + }, + { + "access" : "private", + "field_name" : "mObituaries", + "field_offset" : 160, +- "referenced_type" : "type-2150" ++ "referenced_type" : "type-2146" + }, + { + "access" : "private", + "field_name" : "mObjects", + "field_offset" : 192, +- "referenced_type" : "type-2152" ++ "referenced_type" : "type-2148" + }, + { + "access" : "private", + "field_name" : "mConstantData", + "field_offset" : 352, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "access" : "private", +@@ -33429,8 +34841,8 @@ + "linker_set_key" : "android::hardware::BpHwBinder", + "name" : "android::hardware::BpHwBinder", + "record_kind" : "class", +- "referenced_type" : "type-2148", +- "self_type" : "type-2148", ++ "referenced_type" : "type-2144", ++ "self_type" : "type-2144", + "size" : 60, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h", + "unique_id" : "_ZTSN7android8hardware10BpHwBinderE", +@@ -33547,7 +34959,7 @@ + [ + { + "field_name" : "recipient", +- "referenced_type" : "type-901" ++ "referenced_type" : "type-899" + }, + { + "field_name" : "cookie", +@@ -33562,8 +34974,8 @@ + ], + "linker_set_key" : "android::hardware::BpHwBinder::Obituary", + "name" : "android::hardware::BpHwBinder::Obituary", +- "referenced_type" : "type-2185", +- "self_type" : "type-2185", ++ "referenced_type" : "type-2181", ++ "self_type" : "type-2181", + "size" : 16, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h", + "unique_id" : "_ZTSN7android8hardware10BpHwBinder8ObituaryE" +@@ -33575,14 +34987,14 @@ + { + "access" : "private", + "field_name" : "mObjects", +- "referenced_type" : "type-2153" ++ "referenced_type" : "type-2149" + } + ], + "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager", + "name" : "android::hardware::BpHwBinder::ObjectManager", + "record_kind" : "class", +- "referenced_type" : "type-2152", +- "self_type" : "type-2152", ++ "referenced_type" : "type-2148", ++ "self_type" : "type-2148", + "size" : 20, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h", + "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManagerE" +@@ -33604,13 +35016,13 @@ + { + "field_name" : "func", + "field_offset" : 64, +- "referenced_type" : "type-2157" ++ "referenced_type" : "type-2153" + } + ], + "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager::entry_t", + "name" : "android::hardware::BpHwBinder::ObjectManager::entry_t", +- "referenced_type" : "type-2156", +- "self_type" : "type-2156", ++ "referenced_type" : "type-2152", ++ "self_type" : "type-2152", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h", + "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManager7entry_tE" +@@ -33630,7 +35042,7 @@ + "access" : "private", + "field_name" : "mRemote", + "field_offset" : 32, +- "referenced_type" : "type-2177" ++ "referenced_type" : "type-2173" + }, + { + "access" : "private", +@@ -33642,14 +35054,14 @@ + "access" : "private", + "field_name" : "mState", + "field_offset" : 96, +- "referenced_type" : "type-2179" ++ "referenced_type" : "type-2175" + } + ], + "linker_set_key" : "android::hardware::BpHwRefBase", + "name" : "android::hardware::BpHwRefBase", + "record_kind" : "class", +- "referenced_type" : "type-2176", +- "self_type" : "type-2176", ++ "referenced_type" : "type-2172", ++ "self_type" : "type-2172", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h", + "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE", +@@ -33737,7 +35149,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2283" ++ "referenced_type" : "type-2279" + } + ], + "fields" : +@@ -33752,32 +35164,32 @@ + "access" : "private", + "field_name" : "mSeq", + "field_offset" : 64, +- "referenced_type" : "type-568" ++ "referenced_type" : "type-567" + }, + { + "access" : "private", + "field_name" : "mIndex", + "field_offset" : 96, +- "referenced_type" : "type-568" ++ "referenced_type" : "type-567" + }, + { + "access" : "private", + "field_name" : "mLock", + "field_offset" : 128, +- "referenced_type" : "type-388" ++ "referenced_type" : "type-387" + }, + { + "access" : "private", + "field_name" : "mGlobalState", + "field_offset" : 160, +- "referenced_type" : "type-2280" ++ "referenced_type" : "type-2276" + } + ], + "linker_set_key" : "android::hardware::BufferedTextOutput", + "name" : "android::hardware::BufferedTextOutput", + "record_kind" : "class", +- "referenced_type" : "type-2314", +- "self_type" : "type-2314", ++ "referenced_type" : "type-2310", ++ "self_type" : "type-2310", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h", + "unique_id" : "_ZTSN7android8hardware18BufferedTextOutputE", +@@ -33823,23 +35235,23 @@ + { + "access" : "private", + "field_name" : "mMutex", +- "referenced_type" : "type-665" ++ "referenced_type" : "type-664" + }, + { + "access" : "private", + "field_name" : "mMap", + "field_offset" : 32, +- "referenced_type" : "type-666" ++ "referenced_type" : "type-665" + } + ], + "linker_set_key" : "android::hardware::ConcurrentMap, android::hardware::details::SchedPrio>", + "name" : "android::hardware::ConcurrentMap, android::hardware::details::SchedPrio>", + "record_kind" : "class", +- "referenced_type" : "type-664", +- "self_type" : "type-664", ++ "referenced_type" : "type-663", ++ "self_type" : "type-663", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-309", "type-367" ], ++ "template_args" : [ "type-309", "type-366" ], + "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS0_7details9SchedPrioEEE" + }, + { +@@ -33849,20 +35261,20 @@ + { + "access" : "private", + "field_name" : "mMutex", +- "referenced_type" : "type-671" ++ "referenced_type" : "type-669" + }, + { + "access" : "private", + "field_name" : "mMap", + "field_offset" : 32, +- "referenced_type" : "type-672" ++ "referenced_type" : "type-670" + } + ], + "linker_set_key" : "android::hardware::ConcurrentMap, bool>", + "name" : "android::hardware::ConcurrentMap, bool>", + "record_kind" : "class", +- "referenced_type" : "type-670", +- "self_type" : "type-670", ++ "referenced_type" : "type-668", ++ "self_type" : "type-668", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", + "template_args" : [ "type-309", "type-29" ], +@@ -33901,23 +35313,23 @@ + { + "access" : "private", + "field_name" : "mMutex", +- "referenced_type" : "type-588" ++ "referenced_type" : "type-587" + }, + { + "access" : "private", + "field_name" : "mMap", + "field_offset" : 32, +- "referenced_type" : "type-589" ++ "referenced_type" : "type-588" + } + ], + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "record_kind" : "class", +- "referenced_type" : "type-587", +- "self_type" : "type-587", ++ "referenced_type" : "type-586", ++ "self_type" : "type-586", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-590", "type-591" ], ++ "template_args" : [ "type-589", "type-590" ], + "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEE" + }, + { +@@ -33927,23 +35339,23 @@ + { + "access" : "private", + "field_name" : "mMutex", +- "referenced_type" : "type-348" ++ "referenced_type" : "type-347" + }, + { + "access" : "private", + "field_name" : "mMap", + "field_offset" : 32, +- "referenced_type" : "type-349" ++ "referenced_type" : "type-348" + } + ], + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "record_kind" : "class", +- "referenced_type" : "type-347", +- "self_type" : "type-347", ++ "referenced_type" : "type-346", ++ "self_type" : "type-346", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-350", "type-351" ], ++ "template_args" : [ "type-349", "type-350" ], + "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS0_7IBinderEEEPvEEEEE" + }, + { +@@ -34021,8 +35433,8 @@ + "linker_set_key" : "android::hardware::HexDump", + "name" : "android::hardware::HexDump", + "record_kind" : "class", +- "referenced_type" : "type-2295", +- "self_type" : "type-2295", ++ "referenced_type" : "type-2291", ++ "self_type" : "type-2291", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h", + "unique_id" : "_ZTSN7android8hardware7HexDumpE" +@@ -34131,8 +35543,8 @@ + "linker_set_key" : "android::hardware::IBinder", + "name" : "android::hardware::IBinder", + "record_kind" : "class", +- "referenced_type" : "type-2140", +- "self_type" : "type-2140", ++ "referenced_type" : "type-2136", ++ "self_type" : "type-2136", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h", + "unique_id" : "_ZTSN7android8hardware7IBinderE", +@@ -34248,8 +35660,8 @@ + "linker_set_key" : "android::hardware::IBinder::DeathRecipient", + "name" : "android::hardware::IBinder::DeathRecipient", + "record_kind" : "class", +- "referenced_type" : "type-2190", +- "self_type" : "type-2190", ++ "referenced_type" : "type-2186", ++ "self_type" : "type-2186", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h", + "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE", +@@ -34336,8 +35748,8 @@ + "linker_set_key" : "android::hardware::IInterface", + "name" : "android::hardware::IInterface", + "record_kind" : "class", +- "referenced_type" : "type-2186", +- "self_type" : "type-2186", ++ "referenced_type" : "type-2182", ++ "self_type" : "type-2182", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h", + "unique_id" : "_ZTSN7android8hardware10IInterfaceE", +@@ -34419,43 +35831,43 @@ + { + "access" : "private", + "field_name" : "mProcess", +- "referenced_type" : "type-449" ++ "referenced_type" : "type-448" + }, + { + "access" : "private", + "field_name" : "mPendingStrongDerefs", + "field_offset" : 32, +- "referenced_type" : "type-379" ++ "referenced_type" : "type-378" + }, + { + "access" : "private", + "field_name" : "mPendingWeakDerefs", + "field_offset" : 192, +- "referenced_type" : "type-380" ++ "referenced_type" : "type-379" + }, + { + "access" : "private", + "field_name" : "mPostWriteStrongDerefs", + "field_offset" : 352, +- "referenced_type" : "type-381" ++ "referenced_type" : "type-380" + }, + { + "access" : "private", + "field_name" : "mPostWriteWeakDerefs", + "field_offset" : 512, +- "referenced_type" : "type-380" ++ "referenced_type" : "type-379" + }, + { + "access" : "private", + "field_name" : "mIn", + "field_offset" : 672, +- "referenced_type" : "type-2160" ++ "referenced_type" : "type-2156" + }, + { + "access" : "private", + "field_name" : "mOut", + "field_offset" : 1216, +- "referenced_type" : "type-2160" ++ "referenced_type" : "type-2156" + }, + { + "access" : "private", +@@ -34497,7 +35909,7 @@ + "access" : "private", + "field_name" : "mContextObject", + "field_offset" : 1952, +- "referenced_type" : "type-425" ++ "referenced_type" : "type-424" + }, + { + "access" : "private", +@@ -34515,26 +35927,26 @@ + "access" : "private", + "field_name" : "mPostCommandTasks", + "field_offset" : 2016, +- "referenced_type" : "type-2246" ++ "referenced_type" : "type-2242" + }, + { + "access" : "private", + "field_name" : "mIPCThreadStateBase", + "field_offset" : 2112, +- "referenced_type" : "type-2247" ++ "referenced_type" : "type-2243" + }, + { + "access" : "private", + "field_name" : "mCallRestriction", + "field_offset" : 2144, +- "referenced_type" : "type-2243" ++ "referenced_type" : "type-2239" + } + ], + "linker_set_key" : "android::hardware::IPCThreadState", + "name" : "android::hardware::IPCThreadState", + "record_kind" : "class", +- "referenced_type" : "type-2244", +- "self_type" : "type-2244", ++ "referenced_type" : "type-2240", ++ "self_type" : "type-2240", + "size" : 272, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h", + "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE" +@@ -34546,14 +35958,14 @@ + { + "access" : "private", + "field_name" : "mImpl", +- "referenced_type" : "type-485" ++ "referenced_type" : "type-482" + } + ], + "linker_set_key" : "android::hardware::LazyServiceRegistrar", + "name" : "android::hardware::LazyServiceRegistrar", + "record_kind" : "class", +- "referenced_type" : "type-484", +- "self_type" : "type-484", ++ "referenced_type" : "type-481", ++ "self_type" : "type-481", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h", + "unique_id" : "_ZTSN7android8hardware20LazyServiceRegistrarE" +@@ -34588,8 +36000,8 @@ + ], + "linker_set_key" : "android::hardware::MQDescriptor", + "name" : "android::hardware::MQDescriptor", +- "referenced_type" : "type-992", +- "self_type" : "type-992", ++ "referenced_type" : "type-989", ++ "self_type" : "type-989", + "size" : 32, + "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h", + "template_args" : [ "type-43" ], +@@ -34608,7 +36020,7 @@ + "access" : "private", + "field_name" : "mBufCache", + "field_offset" : 32, +- "referenced_type" : "type-2161" ++ "referenced_type" : "type-2157" + }, + { + "access" : "private", +@@ -34644,7 +36056,7 @@ + "access" : "private", + "field_name" : "mObjects", + "field_offset" : 288, +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + }, + { + "access" : "private", +@@ -34692,7 +36104,7 @@ + "access" : "private", + "field_name" : "mOwner", + "field_offset" : 480, +- "referenced_type" : "type-2162" ++ "referenced_type" : "type-2158" + }, + { + "access" : "private", +@@ -34704,8 +36116,8 @@ + "linker_set_key" : "android::hardware::Parcel", + "name" : "android::hardware::Parcel", + "record_kind" : "class", +- "referenced_type" : "type-2160", +- "self_type" : "type-2160", ++ "referenced_type" : "type-2156", ++ "self_type" : "type-2156", + "size" : 68, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", + "unique_id" : "_ZTSN7android8hardware6ParcelE" +@@ -34732,8 +36144,8 @@ + ], + "linker_set_key" : "android::hardware::Parcel::BufferInfo", + "name" : "android::hardware::Parcel::BufferInfo", +- "referenced_type" : "type-2187", +- "self_type" : "type-2187", ++ "referenced_type" : "type-2183", ++ "self_type" : "type-2183", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", + "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE" +@@ -34765,13 +36177,13 @@ + "access" : "private", + "field_name" : "mThreadCountLock", + "field_offset" : 96, +- "referenced_type" : "type-2250" ++ "referenced_type" : "type-2246" + }, + { + "access" : "private", + "field_name" : "mThreadCountDecrement", + "field_offset" : 128, +- "referenced_type" : "type-2251" ++ "referenced_type" : "type-2247" + }, + { + "access" : "private", +@@ -34795,13 +36207,13 @@ + "access" : "private", + "field_name" : "mLock", + "field_offset" : 288, +- "referenced_type" : "type-388" ++ "referenced_type" : "type-387" + }, + { + "access" : "private", + "field_name" : "mHandleToObject", + "field_offset" : 320, +- "referenced_type" : "type-377" ++ "referenced_type" : "type-376" + }, + { + "access" : "private", +@@ -34813,7 +36225,7 @@ + "access" : "private", + "field_name" : "mBinderContextCheckFunc", + "field_offset" : 512, +- "referenced_type" : "type-2242" ++ "referenced_type" : "type-2238" + }, + { + "access" : "private", +@@ -34825,7 +36237,7 @@ + "access" : "private", + "field_name" : "mContexts", + "field_offset" : 576, +- "referenced_type" : "type-382" ++ "referenced_type" : "type-381" + }, + { + "access" : "private", +@@ -34849,7 +36261,7 @@ + "access" : "private", + "field_name" : "mThreadPoolSeq", + "field_offset" : 800, +- "referenced_type" : "type-2149" ++ "referenced_type" : "type-2145" + }, + { + "access" : "private", +@@ -34861,14 +36273,14 @@ + "access" : "private", + "field_name" : "mCallRestriction", + "field_offset" : 864, +- "referenced_type" : "type-2243" ++ "referenced_type" : "type-2239" + } + ], + "linker_set_key" : "android::hardware::ProcessState", + "name" : "android::hardware::ProcessState", + "record_kind" : "class", +- "referenced_type" : "type-2249", +- "self_type" : "type-2249", ++ "referenced_type" : "type-2245", ++ "self_type" : "type-2245", + "size" : 120, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h", + "unique_id" : "_ZTSN7android8hardware12ProcessStateE", +@@ -34946,7 +36358,7 @@ + [ + { + "field_name" : "binder", +- "referenced_type" : "type-2141" ++ "referenced_type" : "type-2137" + }, + { + "field_name" : "refs", +@@ -34956,8 +36368,8 @@ + ], + "linker_set_key" : "android::hardware::ProcessState::handle_entry", + "name" : "android::hardware::ProcessState::handle_entry", +- "referenced_type" : "type-2227", +- "self_type" : "type-2227", ++ "referenced_type" : "type-2223", ++ "self_type" : "type-2223", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h", + "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE" +@@ -34976,17 +36388,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 168, +- "referenced_type" : "type-500" ++ "referenced_type" : "type-499" + } + ], + "linker_set_key" : "android::hardware::Return", + "name" : "android::hardware::Return", + "record_kind" : "class", +- "referenced_type" : "type-765", +- "self_type" : "type-765", ++ "referenced_type" : "type-763", ++ "self_type" : "type-763", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-500" ], ++ "template_args" : [ "type-499" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_4hidl7manager4V1_015IServiceManager9TransportEEE" + }, + { +@@ -35009,8 +36421,8 @@ + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-758", +- "self_type" : "type-758", ++ "referenced_type" : "type-756", ++ "self_type" : "type-756", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", + "template_args" : [ "type-300" ], +@@ -35030,17 +36442,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 192, +- "referenced_type" : "type-526" ++ "referenced_type" : "type-525" + } + ], + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-945", +- "self_type" : "type-945", ++ "referenced_type" : "type-943", ++ "self_type" : "type-943", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-526" ], ++ "template_args" : [ "type-525" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEE" + }, + { +@@ -35057,17 +36469,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 192, +- "referenced_type" : "type-542" ++ "referenced_type" : "type-541" + } + ], + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-1054", +- "self_type" : "type-1054", ++ "referenced_type" : "type-1052", ++ "self_type" : "type-1052", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-542" ], ++ "template_args" : [ "type-541" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEE" + }, + { +@@ -35084,17 +36496,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 192, +- "referenced_type" : "type-531" ++ "referenced_type" : "type-530" + } + ], + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-1111", +- "self_type" : "type-1111", ++ "referenced_type" : "type-1109", ++ "self_type" : "type-1109", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-531" ], ++ "template_args" : [ "type-530" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEE" + }, + { +@@ -35111,17 +36523,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 192, +- "referenced_type" : "type-548" ++ "referenced_type" : "type-546" + } + ], + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-1946", +- "self_type" : "type-1946", ++ "referenced_type" : "type-1942", ++ "self_type" : "type-1942", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-548" ], ++ "template_args" : [ "type-546" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEE" + }, + { +@@ -35138,17 +36550,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 192, +- "referenced_type" : "type-537" ++ "referenced_type" : "type-535" + } + ], + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-2016", +- "self_type" : "type-2016", ++ "referenced_type" : "type-2012", ++ "self_type" : "type-2012", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-537" ], ++ "template_args" : [ "type-535" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEE" + }, + { +@@ -35232,8 +36644,8 @@ + "linker_set_key" : "android::hardware::TextOutput", + "name" : "android::hardware::TextOutput", + "record_kind" : "class", +- "referenced_type" : "type-2283", +- "self_type" : "type-2283", ++ "referenced_type" : "type-2279", ++ "self_type" : "type-2279", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h", + "unique_id" : "_ZTSN7android8hardware10TextOutputE", +@@ -35279,14 +36691,14 @@ + { + "access" : "private", + "field_name" : "mTO", +- "referenced_type" : "type-2285" ++ "referenced_type" : "type-2281" + } + ], + "linker_set_key" : "android::hardware::TextOutput::Bundle", + "name" : "android::hardware::TextOutput::Bundle", + "record_kind" : "class", +- "referenced_type" : "type-2284", +- "self_type" : "type-2284", ++ "referenced_type" : "type-2280", ++ "self_type" : "type-2280", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h", + "unique_id" : "_ZTSN7android8hardware10TextOutput6BundleE" +@@ -35304,8 +36716,8 @@ + "linker_set_key" : "android::hardware::TypeCode", + "name" : "android::hardware::TypeCode", + "record_kind" : "class", +- "referenced_type" : "type-2291", +- "self_type" : "type-2291", ++ "referenced_type" : "type-2287", ++ "self_type" : "type-2287", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h", + "unique_id" : "_ZTSN7android8hardware8TypeCodeE" +@@ -35317,17 +36729,17 @@ + { + "access" : "private", + "field_name" : "buffer", +- "referenced_type" : "type-362" ++ "referenced_type" : "type-361" + } + ], + "linker_set_key" : "android::hardware::details::DoNotDestruct, android::hardware::details::SchedPrio> >", + "name" : "android::hardware::details::DoNotDestruct, android::hardware::details::SchedPrio> >", + "record_kind" : "class", +- "referenced_type" : "type-674", +- "self_type" : "type-674", ++ "referenced_type" : "type-672", ++ "self_type" : "type-672", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-664" ], ++ "template_args" : [ "type-663" ], + "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS1_9SchedPrioEEEEE" + }, + { +@@ -35337,17 +36749,17 @@ + { + "access" : "private", + "field_name" : "buffer", +- "referenced_type" : "type-362" ++ "referenced_type" : "type-361" + } + ], + "linker_set_key" : "android::hardware::details::DoNotDestruct, bool> >", + "name" : "android::hardware::details::DoNotDestruct, bool> >", + "record_kind" : "class", +- "referenced_type" : "type-678", +- "self_type" : "type-678", ++ "referenced_type" : "type-676", ++ "self_type" : "type-676", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-670" ], ++ "template_args" : [ "type-668" ], + "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEEEE" + }, + { +@@ -35357,14 +36769,14 @@ + { + "access" : "private", + "field_name" : "buffer", +- "referenced_type" : "type-362" ++ "referenced_type" : "type-361" + } + ], + "linker_set_key" : "android::hardware::details::DoNotDestruct > >", + "name" : "android::hardware::details::DoNotDestruct > >", + "record_kind" : "class", +- "referenced_type" : "type-361", +- "self_type" : "type-361", ++ "referenced_type" : "type-360", ++ "self_type" : "type-360", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", + "template_args" : [ "type-326" ], +@@ -35377,17 +36789,17 @@ + { + "access" : "private", + "field_name" : "buffer", +- "referenced_type" : "type-362" ++ "referenced_type" : "type-361" + } + ], + "linker_set_key" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > >", + "name" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > >", + "record_kind" : "class", +- "referenced_type" : "type-601", +- "self_type" : "type-601", ++ "referenced_type" : "type-600", ++ "self_type" : "type-600", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-587" ], ++ "template_args" : [ "type-586" ], + "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEEEE" + }, + { +@@ -35397,17 +36809,17 @@ + { + "access" : "private", + "field_name" : "buffer", +- "referenced_type" : "type-362" ++ "referenced_type" : "type-361" + } + ], + "linker_set_key" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > >", + "name" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > >", + "record_kind" : "class", +- "referenced_type" : "type-364", +- "self_type" : "type-364", ++ "referenced_type" : "type-363", ++ "self_type" : "type-363", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-347" ], ++ "template_args" : [ "type-346" ], + "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS0_7IBinderEEEPvEEEEEEE" + }, + { +@@ -35481,8 +36893,8 @@ + ], + "linker_set_key" : "android::hardware::details::SchedPrio", + "name" : "android::hardware::details::SchedPrio", +- "referenced_type" : "type-367", +- "self_type" : "type-367", ++ "referenced_type" : "type-366", ++ "self_type" : "type-366", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/Static.h", + "unique_id" : "_ZTSN7android8hardware7details9SchedPrioE" +@@ -35567,7 +36979,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-795" ++ "referenced_type" : "type-793" + }, + { + "field_name" : "_pad", +@@ -35578,8 +36990,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-794", +- "self_type" : "type-794", ++ "referenced_type" : "type-792", ++ "self_type" : "type-792", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEUt_E" +@@ -35608,16 +37020,16 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-970" ++ "referenced_type" : "type-968" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer >", + "name" : "android::hardware::details::hidl_pointer >", +- "referenced_type" : "type-969", +- "self_type" : "type-969", ++ "referenced_type" : "type-967", ++ "self_type" : "type-967", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", +- "template_args" : [ "type-972" ], ++ "template_args" : [ "type-970" ], + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEE" + }, + { +@@ -35626,13 +37038,13 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-572" ++ "referenced_type" : "type-571" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer", + "name" : "android::hardware::details::hidl_pointer", +- "referenced_type" : "type-571", +- "self_type" : "type-571", ++ "referenced_type" : "type-570", ++ "self_type" : "type-570", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "template_args" : [ "type-38" ], +@@ -35644,16 +37056,16 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-794" ++ "referenced_type" : "type-792" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer", + "name" : "android::hardware::details::hidl_pointer", +- "referenced_type" : "type-793", +- "self_type" : "type-793", ++ "referenced_type" : "type-791", ++ "self_type" : "type-791", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", +- "template_args" : [ "type-502" ], ++ "template_args" : [ "type-501" ], + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE" + }, + { +@@ -35662,13 +37074,13 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-986" ++ "referenced_type" : "type-984" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer", + "name" : "android::hardware::details::hidl_pointer", +- "referenced_type" : "type-985", +- "self_type" : "type-985", ++ "referenced_type" : "type-983", ++ "self_type" : "type-983", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "template_args" : [ "type-43" ], +@@ -35692,8 +37104,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-986", +- "self_type" : "type-986", ++ "referenced_type" : "type-984", ++ "self_type" : "type-984", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEUt_E" +@@ -35789,7 +37201,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-971" ++ "referenced_type" : "type-969" + }, + { + "field_name" : "_pad", +@@ -35800,8 +37212,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-970", +- "self_type" : "type-970", ++ "referenced_type" : "type-968", ++ "self_type" : "type-968", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEUt_E" +@@ -35824,8 +37236,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-572", +- "self_type" : "type-572", ++ "referenced_type" : "type-571", ++ "self_type" : "type-571", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEUt_E" +@@ -35836,13 +37248,13 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-474" ++ "referenced_type" : "type-473" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer", + "name" : "android::hardware::details::hidl_pointer", +- "referenced_type" : "type-473", +- "self_type" : "type-473", ++ "referenced_type" : "type-472", ++ "self_type" : "type-472", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "template_args" : [ "type-14" ], +@@ -35855,7 +37267,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-475" ++ "referenced_type" : "type-474" + }, + { + "field_name" : "_pad", +@@ -35866,8 +37278,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-474", +- "self_type" : "type-474", ++ "referenced_type" : "type-473", ++ "self_type" : "type-473", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEUt_E" +@@ -35953,8 +37365,8 @@ + "alignment" : 1, + "linker_set_key" : "android::hardware::details::std_array", + "name" : "android::hardware::details::std_array", +- "referenced_type" : "type-989", +- "self_type" : "type-989", ++ "referenced_type" : "type-986", ++ "self_type" : "type-986", + "size" : 1, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "template_args" : [ "type-146" ], +@@ -35967,13 +37379,13 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-973" ++ "referenced_type" : "type-971" + } + ], + "linker_set_key" : "android::hardware::hidl_array", + "name" : "android::hardware::hidl_array", +- "referenced_type" : "type-972", +- "self_type" : "type-972", ++ "referenced_type" : "type-970", ++ "self_type" : "type-970", + "size" : 32, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "template_args" : [ "type-146" ], +@@ -36294,7 +37706,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-969" ++ "referenced_type" : "type-967" + }, + { + "access" : "private", +@@ -36311,11 +37723,11 @@ + ], + "linker_set_key" : "android::hardware::hidl_vec >", + "name" : "android::hardware::hidl_vec >", +- "referenced_type" : "type-968", +- "self_type" : "type-968", ++ "referenced_type" : "type-966", ++ "self_type" : "type-966", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", +- "template_args" : [ "type-972" ], ++ "template_args" : [ "type-970" ], + "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEE" + }, + { +@@ -36325,7 +37737,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-571" ++ "referenced_type" : "type-570" + }, + { + "access" : "private", +@@ -36342,8 +37754,8 @@ + ], + "linker_set_key" : "android::hardware::hidl_vec", + "name" : "android::hardware::hidl_vec", +- "referenced_type" : "type-570", +- "self_type" : "type-570", ++ "referenced_type" : "type-569", ++ "self_type" : "type-569", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "template_args" : [ "type-38" ], +@@ -36356,7 +37768,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-793" ++ "referenced_type" : "type-791" + }, + { + "access" : "private", +@@ -36373,11 +37785,11 @@ + ], + "linker_set_key" : "android::hardware::hidl_vec", + "name" : "android::hardware::hidl_vec", +- "referenced_type" : "type-792", +- "self_type" : "type-792", ++ "referenced_type" : "type-790", ++ "self_type" : "type-790", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", +- "template_args" : [ "type-502" ], ++ "template_args" : [ "type-501" ], + "unique_id" : "_ZTSN7android8hardware8hidl_vecINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE" + }, + { +@@ -36387,7 +37799,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-985" ++ "referenced_type" : "type-983" + }, + { + "access" : "private", +@@ -36404,8 +37816,8 @@ + ], + "linker_set_key" : "android::hardware::hidl_vec", + "name" : "android::hardware::hidl_vec", +- "referenced_type" : "type-984", +- "self_type" : "type-984", ++ "referenced_type" : "type-982", ++ "self_type" : "type-982", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "template_args" : [ "type-43" ], +@@ -36416,7 +37828,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-576" ++ "referenced_type" : "type-575" + } + ], + "fields" : +@@ -36430,8 +37842,8 @@ + "linker_set_key" : "android::hardware::hidl_vec::iter", + "name" : "android::hardware::hidl_vec::iter", + "record_kind" : "class", +- "referenced_type" : "type-575", +- "self_type" : "type-575", ++ "referenced_type" : "type-574", ++ "self_type" : "type-574", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEE4iterILb1EEE" +@@ -36443,7 +37855,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-473" ++ "referenced_type" : "type-472" + }, + { + "access" : "private", +@@ -36460,8 +37872,8 @@ + ], + "linker_set_key" : "android::hardware::hidl_vec", + "name" : "android::hardware::hidl_vec", +- "referenced_type" : "type-472", +- "self_type" : "type-472", ++ "referenced_type" : "type-471", ++ "self_type" : "type-471", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "template_args" : [ "type-14" ], +@@ -36636,7 +38048,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-371" ++ "referenced_type" : "type-370" + }, + { + "referenced_type" : "type-128" +@@ -36648,19 +38060,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 544, +- "referenced_type" : "type-369" ++ "referenced_type" : "type-368" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 576, +- "referenced_type" : "type-370" ++ "referenced_type" : "type-369" + } + ], + "linker_set_key" : "android::hidl::base::V1_0::BpHwBase", + "name" : "android::hidl::base::V1_0::BpHwBase", +- "referenced_type" : "type-368", +- "self_type" : "type-368", ++ "referenced_type" : "type-367", ++ "self_type" : "type-367", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h", + "unique_id" : "_ZTSN7android4hidl4base4V1_08BpHwBaseE", +@@ -36855,7 +38267,7 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 384, +- "referenced_type" : "type-410" ++ "referenced_type" : "type-409" + }, + { + "access" : "private", +@@ -36866,8 +38278,8 @@ + ], + "linker_set_key" : "android::hidl::base::V1_0::BsBase", + "name" : "android::hidl::base::V1_0::BsBase", +- "referenced_type" : "type-2062", +- "self_type" : "type-2062", ++ "referenced_type" : "type-2058", ++ "self_type" : "type-2058", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h", + "unique_id" : "_ZTSN7android4hidl4base4V1_06BsBaseE", +@@ -37144,13 +38556,13 @@ + "access" : "private", + "field_name" : "_hidl_mImpl", + "field_offset" : 544, +- "referenced_type" : "type-526" ++ "referenced_type" : "type-525" + } + ], + "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager", + "name" : "android::hidl::manager::V1_0::BnHwServiceManager", +- "referenced_type" : "type-828", +- "self_type" : "type-828", ++ "referenced_type" : "type-826", ++ "self_type" : "type-826", + "size" : 80, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_018BnHwServiceManagerE", +@@ -37281,13 +38693,13 @@ + "access" : "private", + "field_name" : "_hidl_mImpl", + "field_offset" : 544, +- "referenced_type" : "type-542" ++ "referenced_type" : "type-541" + } + ], + "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification", + "name" : "android::hidl::manager::V1_0::BnHwServiceNotification", +- "referenced_type" : "type-820", +- "self_type" : "type-820", ++ "referenced_type" : "type-818", ++ "self_type" : "type-818", + "size" : 80, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_023BnHwServiceNotificationE", +@@ -37409,7 +38821,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-833" ++ "referenced_type" : "type-831" + }, + { + "referenced_type" : "type-128" +@@ -37421,19 +38833,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 544, +- "referenced_type" : "type-831" ++ "referenced_type" : "type-829" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 576, +- "referenced_type" : "type-832" ++ "referenced_type" : "type-830" + } + ], + "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager", + "name" : "android::hidl::manager::V1_0::BpHwServiceManager", +- "referenced_type" : "type-830", +- "self_type" : "type-830", ++ "referenced_type" : "type-828", ++ "self_type" : "type-828", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_018BpHwServiceManagerE", +@@ -37640,7 +39052,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-825" ++ "referenced_type" : "type-823" + }, + { + "referenced_type" : "type-128" +@@ -37652,19 +39064,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 544, +- "referenced_type" : "type-823" ++ "referenced_type" : "type-821" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 576, +- "referenced_type" : "type-824" ++ "referenced_type" : "type-822" + } + ], + "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification", + "name" : "android::hidl::manager::V1_0::BpHwServiceNotification", +- "referenced_type" : "type-822", +- "self_type" : "type-822", ++ "referenced_type" : "type-820", ++ "self_type" : "type-820", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_023BpHwServiceNotificationE", +@@ -37850,7 +39262,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-504" ++ "referenced_type" : "type-503" + }, + { + "referenced_type" : "type-128" +@@ -37862,7 +39274,7 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 384, +- "referenced_type" : "type-529" ++ "referenced_type" : "type-528" + }, + { + "access" : "private", +@@ -37873,8 +39285,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager", + "name" : "android::hidl::manager::V1_0::BsServiceManager", +- "referenced_type" : "type-917", +- "self_type" : "type-917", ++ "referenced_type" : "type-914", ++ "self_type" : "type-914", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_016BsServiceManagerE", +@@ -38023,7 +39435,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-495" ++ "referenced_type" : "type-493" + }, + { + "referenced_type" : "type-128" +@@ -38035,7 +39447,7 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 384, +- "referenced_type" : "type-545" ++ "referenced_type" : "type-544" + }, + { + "access" : "private", +@@ -38046,8 +39458,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification", + "name" : "android::hidl::manager::V1_0::BsServiceNotification", +- "referenced_type" : "type-1045", +- "self_type" : "type-1045", ++ "referenced_type" : "type-1043", ++ "self_type" : "type-1043", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_021BsServiceNotificationE", +@@ -38180,8 +39592,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager", + "name" : "android::hidl::manager::V1_0::IServiceManager", +- "referenced_type" : "type-504", +- "self_type" : "type-504", ++ "referenced_type" : "type-503", ++ "self_type" : "type-503", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManagerE", +@@ -38338,7 +39750,7 @@ + { + "field_name" : "clientPids", + "field_offset" : 320, +- "referenced_type" : "type-472" ++ "referenced_type" : "type-471" + }, + { + "field_name" : "arch", +@@ -38348,8 +39760,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo", + "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo", +- "referenced_type" : "type-502", +- "self_type" : "type-502", ++ "referenced_type" : "type-501", ++ "self_type" : "type-501", + "size" : 64, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoE" +@@ -38364,8 +39776,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification", + "name" : "android::hidl::manager::V1_0::IServiceNotification", +- "referenced_type" : "type-495", +- "self_type" : "type-495", ++ "referenced_type" : "type-493", ++ "self_type" : "type-493", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_020IServiceNotificationE", +@@ -38487,13 +39899,13 @@ + "access" : "private", + "field_name" : "_hidl_mImpl", + "field_offset" : 544, +- "referenced_type" : "type-531" ++ "referenced_type" : "type-530" + } + ], + "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager", + "name" : "android::hidl::manager::V1_1::BnHwServiceManager", +- "referenced_type" : "type-837", +- "self_type" : "type-837", ++ "referenced_type" : "type-835", ++ "self_type" : "type-835", + "size" : 80, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_118BnHwServiceManagerE", +@@ -38615,7 +40027,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-842" ++ "referenced_type" : "type-840" + }, + { + "referenced_type" : "type-128" +@@ -38627,19 +40039,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 544, +- "referenced_type" : "type-840" ++ "referenced_type" : "type-838" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 576, +- "referenced_type" : "type-841" ++ "referenced_type" : "type-839" + } + ], + "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager", + "name" : "android::hidl::manager::V1_1::BpHwServiceManager", +- "referenced_type" : "type-839", +- "self_type" : "type-839", ++ "referenced_type" : "type-837", ++ "self_type" : "type-837", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_118BpHwServiceManagerE", +@@ -38849,7 +40261,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-514" ++ "referenced_type" : "type-513" + }, + { + "referenced_type" : "type-128" +@@ -38861,7 +40273,7 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 384, +- "referenced_type" : "type-534" ++ "referenced_type" : "type-533" + }, + { + "access" : "private", +@@ -38872,8 +40284,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager", + "name" : "android::hidl::manager::V1_1::BsServiceManager", +- "referenced_type" : "type-1099", +- "self_type" : "type-1099", ++ "referenced_type" : "type-1097", ++ "self_type" : "type-1097", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_116BsServiceManagerE", +@@ -39025,13 +40437,13 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-504" ++ "referenced_type" : "type-503" + } + ], + "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager", + "name" : "android::hidl::manager::V1_1::IServiceManager", +- "referenced_type" : "type-514", +- "self_type" : "type-514", ++ "referenced_type" : "type-513", ++ "self_type" : "type-513", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_115IServiceManagerE", +@@ -39185,13 +40597,13 @@ + "access" : "private", + "field_name" : "_hidl_mImpl", + "field_offset" : 544, +- "referenced_type" : "type-548" ++ "referenced_type" : "type-546" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback", + "name" : "android::hidl::manager::V1_2::BnHwClientCallback", +- "referenced_type" : "type-846", +- "self_type" : "type-846", ++ "referenced_type" : "type-843", ++ "self_type" : "type-843", + "size" : 80, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_218BnHwClientCallbackE", +@@ -39322,13 +40734,13 @@ + "access" : "private", + "field_name" : "_hidl_mImpl", + "field_offset" : 544, +- "referenced_type" : "type-537" ++ "referenced_type" : "type-535" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager", + "name" : "android::hidl::manager::V1_2::BnHwServiceManager", +- "referenced_type" : "type-803", +- "self_type" : "type-803", ++ "referenced_type" : "type-801", ++ "self_type" : "type-801", + "size" : 80, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_218BnHwServiceManagerE", +@@ -39450,7 +40862,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-851" ++ "referenced_type" : "type-849" + }, + { + "referenced_type" : "type-128" +@@ -39462,19 +40874,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 544, +- "referenced_type" : "type-849" ++ "referenced_type" : "type-847" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 576, +- "referenced_type" : "type-850" ++ "referenced_type" : "type-848" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback", + "name" : "android::hidl::manager::V1_2::BpHwClientCallback", +- "referenced_type" : "type-848", +- "self_type" : "type-848", ++ "referenced_type" : "type-846", ++ "self_type" : "type-846", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_218BpHwClientCallbackE", +@@ -39660,7 +41072,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-732" ++ "referenced_type" : "type-729" + }, + { + "referenced_type" : "type-128" +@@ -39672,19 +41084,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 544, +- "referenced_type" : "type-730" ++ "referenced_type" : "type-727" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 576, +- "referenced_type" : "type-731" ++ "referenced_type" : "type-728" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager", + "name" : "android::hidl::manager::V1_2::BpHwServiceManager", +- "referenced_type" : "type-729", +- "self_type" : "type-729", ++ "referenced_type" : "type-726", ++ "self_type" : "type-726", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_218BpHwServiceManagerE", +@@ -39909,7 +41321,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-498" ++ "referenced_type" : "type-497" + }, + { + "referenced_type" : "type-128" +@@ -39921,7 +41333,7 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 384, +- "referenced_type" : "type-553" ++ "referenced_type" : "type-552" + }, + { + "access" : "private", +@@ -39932,8 +41344,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback", + "name" : "android::hidl::manager::V1_2::BsClientCallback", +- "referenced_type" : "type-1929", +- "self_type" : "type-1929", ++ "referenced_type" : "type-1925", ++ "self_type" : "type-1925", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_216BsClientCallbackE", +@@ -40061,7 +41473,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-517" ++ "referenced_type" : "type-516" + }, + { + "referenced_type" : "type-128" +@@ -40073,7 +41485,7 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 384, +- "referenced_type" : "type-540" ++ "referenced_type" : "type-539" + }, + { + "access" : "private", +@@ -40084,8 +41496,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager", + "name" : "android::hidl::manager::V1_2::BsServiceManager", +- "referenced_type" : "type-2004", +- "self_type" : "type-2004", ++ "referenced_type" : "type-2000", ++ "self_type" : "type-2000", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_216BsServiceManagerE", +@@ -40257,8 +41669,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback", + "name" : "android::hidl::manager::V1_2::IClientCallback", +- "referenced_type" : "type-498", +- "self_type" : "type-498", ++ "referenced_type" : "type-497", ++ "self_type" : "type-497", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_215IClientCallbackE", +@@ -40371,13 +41783,13 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-514" ++ "referenced_type" : "type-513" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager", + "name" : "android::hidl::manager::V1_2::IServiceManager", +- "referenced_type" : "type-517", +- "self_type" : "type-517", ++ "referenced_type" : "type-516", ++ "self_type" : "type-516", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_215IServiceManagerE", +@@ -40548,16 +41960,16 @@ + { + "field_name" : "value", + "field_offset" : 32, +- "referenced_type" : "type-383" ++ "referenced_type" : "type-382" + } + ], + "linker_set_key" : "android::key_value_pair_t >", + "name" : "android::key_value_pair_t >", +- "referenced_type" : "type-3615", +- "self_type" : "type-3615", ++ "referenced_type" : "type-3609", ++ "self_type" : "type-3609", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-286", "type-383" ], ++ "template_args" : [ "type-286", "type-382" ], + "unique_id" : "_ZTSN7android16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEE" + }, + { +@@ -40571,16 +41983,16 @@ + { + "field_name" : "value", + "field_offset" : 32, +- "referenced_type" : "type-2156" ++ "referenced_type" : "type-2152" + } + ], + "linker_set_key" : "android::key_value_pair_t", + "name" : "android::key_value_pair_t", +- "referenced_type" : "type-2195", +- "self_type" : "type-2195", ++ "referenced_type" : "type-2191", ++ "self_type" : "type-2191", + "size" : 16, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-78", "type-2156" ], ++ "template_args" : [ "type-78", "type-2152" ], + "unique_id" : "_ZTSN7android16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { +@@ -40590,17 +42002,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-453" ++ "referenced_type" : "type-451" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-452", +- "self_type" : "type-452", ++ "referenced_type" : "type-450", ++ "self_type" : "type-450", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-454" ], ++ "template_args" : [ "type-452" ], + "unique_id" : "_ZTSN7android2spINS_6ThreadEEE" + }, + { +@@ -40616,11 +42028,11 @@ + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-425", +- "self_type" : "type-425", ++ "referenced_type" : "type-424", ++ "self_type" : "type-424", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-426" ], ++ "template_args" : [ "type-425" ], + "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE" + }, + { +@@ -40630,17 +42042,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-2280" ++ "referenced_type" : "type-2276" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-2279", +- "self_type" : "type-2279", ++ "referenced_type" : "type-2275", ++ "self_type" : "type-2275", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-2282" ], ++ "template_args" : [ "type-2278" ], + "unique_id" : "_ZTSN7android2spINS_8hardware18BufferedTextOutput11BufferStateEEE" + }, + { +@@ -40670,17 +42082,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-902" ++ "referenced_type" : "type-900" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-922", +- "self_type" : "type-922", ++ "referenced_type" : "type-920", ++ "self_type" : "type-920", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-923" ], ++ "template_args" : [ "type-921" ], + "unique_id" : "_ZTSN7android2spINS_8hardware7IBinder14DeathRecipientEEE" + }, + { +@@ -40690,17 +42102,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-384" ++ "referenced_type" : "type-383" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-383", +- "self_type" : "type-383", ++ "referenced_type" : "type-382", ++ "self_type" : "type-382", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-386" ], ++ "template_args" : [ "type-385" ], + "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE" + }, + { +@@ -40710,17 +42122,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-929" ++ "referenced_type" : "type-927" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-928", +- "self_type" : "type-928", ++ "referenced_type" : "type-926", ++ "self_type" : "type-926", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-931" ], ++ "template_args" : [ "type-929" ], + "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE" + }, + { +@@ -40730,17 +42142,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-721" ++ "referenced_type" : "type-719" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-720", +- "self_type" : "type-720", ++ "referenced_type" : "type-718", ++ "self_type" : "type-718", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-723" ], ++ "template_args" : [ "type-721" ], + "unique_id" : "_ZTSN7android2spINS_8hardware25PassthroughServiceManagerEEE" + }, + { +@@ -40750,17 +42162,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-445" ++ "referenced_type" : "type-444" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-444", +- "self_type" : "type-444", ++ "referenced_type" : "type-443", ++ "self_type" : "type-443", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-447" ], ++ "template_args" : [ "type-446" ], + "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE" + }, + { +@@ -40770,17 +42182,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-551" ++ "referenced_type" : "type-550" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-555", +- "self_type" : "type-555", ++ "referenced_type" : "type-554", ++ "self_type" : "type-554", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-556" ], ++ "template_args" : [ "type-555" ], + "unique_id" : "_ZTSN7android2spINS_8hardware7details21ClientCounterCallbackEEE" + }, + { +@@ -40790,17 +42202,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-739" ++ "referenced_type" : "type-737" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-744", +- "self_type" : "type-744", ++ "referenced_type" : "type-742", ++ "self_type" : "type-742", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-745" ], ++ "template_args" : [ "type-743" ], + "unique_id" : "_ZTSN7android2spINS_8hardware7details6WaiterEEE" + }, + { +@@ -40816,8 +42228,8 @@ + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-908", +- "self_type" : "type-908", ++ "referenced_type" : "type-906", ++ "self_type" : "type-906", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", + "template_args" : [ "type-306" ], +@@ -40870,17 +42282,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-527" ++ "referenced_type" : "type-526" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-526", +- "self_type" : "type-526", ++ "referenced_type" : "type-525", ++ "self_type" : "type-525", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-504" ], ++ "template_args" : [ "type-503" ], + "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE" + }, + { +@@ -40890,17 +42302,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-543" ++ "referenced_type" : "type-542" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-542", +- "self_type" : "type-542", ++ "referenced_type" : "type-541", ++ "self_type" : "type-541", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-495" ], ++ "template_args" : [ "type-493" ], + "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE" + }, + { +@@ -40910,17 +42322,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-532" ++ "referenced_type" : "type-531" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-531", +- "self_type" : "type-531", ++ "referenced_type" : "type-530", ++ "self_type" : "type-530", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-514" ], ++ "template_args" : [ "type-513" ], + "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE" + }, + { +@@ -40930,17 +42342,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-549" ++ "referenced_type" : "type-547" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-548", +- "self_type" : "type-548", ++ "referenced_type" : "type-546", ++ "self_type" : "type-546", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-498" ], ++ "template_args" : [ "type-497" ], + "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IClientCallbackEEE" + }, + { +@@ -40950,25 +42362,25 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-538" ++ "referenced_type" : "type-536" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-537", +- "self_type" : "type-537", ++ "referenced_type" : "type-535", ++ "self_type" : "type-535", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-517" ], ++ "template_args" : [ "type-516" ], + "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3555", +- "self_type" : "type-3555", ++ "referenced_type" : "type-3548", ++ "self_type" : "type-3548", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-25" ], +@@ -40978,8 +42390,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3553", +- "self_type" : "type-3553", ++ "referenced_type" : "type-3547", ++ "self_type" : "type-3547", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-308" ], +@@ -40989,8 +42401,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3678", +- "self_type" : "type-3678", ++ "referenced_type" : "type-3672", ++ "self_type" : "type-3672", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-286" ], +@@ -41000,96 +42412,96 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3552", +- "self_type" : "type-3552", ++ "referenced_type" : "type-3546", ++ "self_type" : "type-3546", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2144" ], ++ "template_args" : [ "type-2140" ], + "unique_id" : "_ZTSN7android13trait_pointerIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-2272", +- "self_type" : "type-2272", ++ "referenced_type" : "type-2268", ++ "self_type" : "type-2268", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2185" ], ++ "template_args" : [ "type-2181" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-2271", +- "self_type" : "type-2271", ++ "referenced_type" : "type-2267", ++ "self_type" : "type-2267", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2156" ], ++ "template_args" : [ "type-2152" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3676", +- "self_type" : "type-3676", ++ "referenced_type" : "type-3670", ++ "self_type" : "type-3670", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2227" ], ++ "template_args" : [ "type-2223" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer > >", + "name" : "android::trait_pointer > >", +- "referenced_type" : "type-3677", +- "self_type" : "type-3677", ++ "referenced_type" : "type-3671", ++ "self_type" : "type-3671", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3615" ], ++ "template_args" : [ "type-3609" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer >", + "name" : "android::trait_pointer >", +- "referenced_type" : "type-2269", +- "self_type" : "type-2269", ++ "referenced_type" : "type-2265", ++ "self_type" : "type-2265", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2195" ], ++ "template_args" : [ "type-2191" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer >", + "name" : "android::trait_pointer >", +- "referenced_type" : "type-2338", +- "self_type" : "type-2338", ++ "referenced_type" : "type-2334", ++ "self_type" : "type-2334", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2279" ], ++ "template_args" : [ "type-2275" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer >", + "name" : "android::trait_pointer >", +- "referenced_type" : "type-3679", +- "self_type" : "type-3679", ++ "referenced_type" : "type-3673", ++ "self_type" : "type-3673", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-383" ], ++ "template_args" : [ "type-382" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware7IBinderEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-2270", +- "self_type" : "type-2270", ++ "referenced_type" : "type-2266", ++ "self_type" : "type-2266", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-78" ], +@@ -41099,8 +42511,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3704", +- "self_type" : "type-3704", ++ "referenced_type" : "type-3698", ++ "self_type" : "type-3698", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-14" ], +@@ -41110,8 +42522,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-3548", +- "self_type" : "type-3548", ++ "referenced_type" : "type-3542", ++ "self_type" : "type-3542", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-25" ], +@@ -41121,8 +42533,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-3547", +- "self_type" : "type-3547", ++ "referenced_type" : "type-3541", ++ "self_type" : "type-3541", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-308" ], +@@ -41132,8 +42544,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-3668", +- "self_type" : "type-3668", ++ "referenced_type" : "type-3662", ++ "self_type" : "type-3662", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-286" ], +@@ -41143,88 +42555,88 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-3544", +- "self_type" : "type-3544", ++ "referenced_type" : "type-3538", ++ "self_type" : "type-3538", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2144" ], ++ "template_args" : [ "type-2140" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-2264", +- "self_type" : "type-2264", ++ "referenced_type" : "type-2260", ++ "self_type" : "type-2260", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2185" ], ++ "template_args" : [ "type-2181" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-2262", +- "self_type" : "type-2262", ++ "referenced_type" : "type-2258", ++ "self_type" : "type-2258", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2156" ], ++ "template_args" : [ "type-2152" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-3667", +- "self_type" : "type-3667", ++ "referenced_type" : "type-3661", ++ "self_type" : "type-3661", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2227" ], ++ "template_args" : [ "type-2223" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy > >", + "name" : "android::trait_trivial_copy > >", +- "referenced_type" : "type-3670", +- "self_type" : "type-3670", ++ "referenced_type" : "type-3664", ++ "self_type" : "type-3664", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3615" ], ++ "template_args" : [ "type-3609" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy >", + "name" : "android::trait_trivial_copy >", +- "referenced_type" : "type-2263", +- "self_type" : "type-2263", ++ "referenced_type" : "type-2259", ++ "self_type" : "type-2259", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2195" ], ++ "template_args" : [ "type-2191" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy >", + "name" : "android::trait_trivial_copy >", +- "referenced_type" : "type-2336", +- "self_type" : "type-2336", ++ "referenced_type" : "type-2332", ++ "self_type" : "type-2332", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2279" ], ++ "template_args" : [ "type-2275" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy >", + "name" : "android::trait_trivial_copy >", +- "referenced_type" : "type-3669", +- "self_type" : "type-3669", ++ "referenced_type" : "type-3663", ++ "self_type" : "type-3663", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-383" ], ++ "template_args" : [ "type-382" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware7IBinderEEEEE" + }, + { +@@ -41253,8 +42665,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-2261", +- "self_type" : "type-2261", ++ "referenced_type" : "type-2257", ++ "self_type" : "type-2257", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-78" ], +@@ -41264,8 +42676,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-466", +- "self_type" : "type-466", ++ "referenced_type" : "type-465", ++ "self_type" : "type-465", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-6" ], +@@ -41275,8 +42687,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-457", +- "self_type" : "type-457", ++ "referenced_type" : "type-456", ++ "self_type" : "type-456", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-237" ], +@@ -41297,8 +42709,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-374", +- "self_type" : "type-374", ++ "referenced_type" : "type-373", ++ "self_type" : "type-373", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-336" ], +@@ -41396,8 +42808,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-3494", +- "self_type" : "type-3494", ++ "referenced_type" : "type-3488", ++ "self_type" : "type-3488", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-25" ], +@@ -41407,8 +42819,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-3482", +- "self_type" : "type-3482", ++ "referenced_type" : "type-3476", ++ "self_type" : "type-3476", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-308" ], +@@ -41418,8 +42830,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-3661", +- "self_type" : "type-3661", ++ "referenced_type" : "type-3655", ++ "self_type" : "type-3655", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-286" ], +@@ -41429,88 +42841,88 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-3470", +- "self_type" : "type-3470", ++ "referenced_type" : "type-3464", ++ "self_type" : "type-3464", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2144" ], ++ "template_args" : [ "type-2140" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-2256", +- "self_type" : "type-2256", ++ "referenced_type" : "type-2252", ++ "self_type" : "type-2252", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2185" ], ++ "template_args" : [ "type-2181" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-2255", +- "self_type" : "type-2255", ++ "referenced_type" : "type-2251", ++ "self_type" : "type-2251", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2156" ], ++ "template_args" : [ "type-2152" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-3659", +- "self_type" : "type-3659", ++ "referenced_type" : "type-3653", ++ "self_type" : "type-3653", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2227" ], ++ "template_args" : [ "type-2223" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor > >", + "name" : "android::trait_trivial_ctor > >", +- "referenced_type" : "type-3660", +- "self_type" : "type-3660", ++ "referenced_type" : "type-3654", ++ "self_type" : "type-3654", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3615" ], ++ "template_args" : [ "type-3609" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor >", + "name" : "android::trait_trivial_ctor >", +- "referenced_type" : "type-2253", +- "self_type" : "type-2253", ++ "referenced_type" : "type-2249", ++ "self_type" : "type-2249", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2195" ], ++ "template_args" : [ "type-2191" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor >", + "name" : "android::trait_trivial_ctor >", +- "referenced_type" : "type-2278", +- "self_type" : "type-2278", ++ "referenced_type" : "type-2274", ++ "self_type" : "type-2274", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2279" ], ++ "template_args" : [ "type-2275" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor >", + "name" : "android::trait_trivial_ctor >", +- "referenced_type" : "type-3662", +- "self_type" : "type-3662", ++ "referenced_type" : "type-3656", ++ "self_type" : "type-3656", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-383" ], ++ "template_args" : [ "type-382" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware7IBinderEEEEE" + }, + { +@@ -41539,8 +42951,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-2254", +- "self_type" : "type-2254", ++ "referenced_type" : "type-2250", ++ "self_type" : "type-2250", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-78" ], +@@ -41550,8 +42962,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-461", +- "self_type" : "type-461", ++ "referenced_type" : "type-460", ++ "self_type" : "type-460", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-6" ], +@@ -41638,8 +43050,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-390", +- "self_type" : "type-390", ++ "referenced_type" : "type-389", ++ "self_type" : "type-389", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-16" ], +@@ -41682,8 +43094,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-3543", +- "self_type" : "type-3543", ++ "referenced_type" : "type-3537", ++ "self_type" : "type-3537", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-25" ], +@@ -41693,8 +43105,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-3535", +- "self_type" : "type-3535", ++ "referenced_type" : "type-3529", ++ "self_type" : "type-3529", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-308" ], +@@ -41704,8 +43116,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-3664", +- "self_type" : "type-3664", ++ "referenced_type" : "type-3658", ++ "self_type" : "type-3658", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-286" ], +@@ -41715,88 +43127,88 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-3525", +- "self_type" : "type-3525", ++ "referenced_type" : "type-3519", ++ "self_type" : "type-3519", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2144" ], ++ "template_args" : [ "type-2140" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-2260", +- "self_type" : "type-2260", ++ "referenced_type" : "type-2256", ++ "self_type" : "type-2256", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2185" ], ++ "template_args" : [ "type-2181" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-2258", +- "self_type" : "type-2258", ++ "referenced_type" : "type-2254", ++ "self_type" : "type-2254", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2156" ], ++ "template_args" : [ "type-2152" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-3663", +- "self_type" : "type-3663", ++ "referenced_type" : "type-3657", ++ "self_type" : "type-3657", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2227" ], ++ "template_args" : [ "type-2223" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor > >", + "name" : "android::trait_trivial_dtor > >", +- "referenced_type" : "type-3666", +- "self_type" : "type-3666", ++ "referenced_type" : "type-3660", ++ "self_type" : "type-3660", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3615" ], ++ "template_args" : [ "type-3609" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor >", + "name" : "android::trait_trivial_dtor >", +- "referenced_type" : "type-2259", +- "self_type" : "type-2259", ++ "referenced_type" : "type-2255", ++ "self_type" : "type-2255", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2195" ], ++ "template_args" : [ "type-2191" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor >", + "name" : "android::trait_trivial_dtor >", +- "referenced_type" : "type-2335", +- "self_type" : "type-2335", ++ "referenced_type" : "type-2331", ++ "self_type" : "type-2331", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2279" ], ++ "template_args" : [ "type-2275" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor >", + "name" : "android::trait_trivial_dtor >", +- "referenced_type" : "type-3665", +- "self_type" : "type-3665", ++ "referenced_type" : "type-3659", ++ "self_type" : "type-3659", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-383" ], ++ "template_args" : [ "type-382" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware7IBinderEEEEE" + }, + { +@@ -41825,8 +43237,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-2257", +- "self_type" : "type-2257", ++ "referenced_type" : "type-2253", ++ "self_type" : "type-2253", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-78" ], +@@ -41836,8 +43248,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-462", +- "self_type" : "type-462", ++ "referenced_type" : "type-461", ++ "self_type" : "type-461", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-6" ], +@@ -41847,8 +43259,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-451", +- "self_type" : "type-451", ++ "referenced_type" : "type-454", ++ "self_type" : "type-454", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-237" ], +@@ -41924,8 +43336,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-401", +- "self_type" : "type-401", ++ "referenced_type" : "type-400", ++ "self_type" : "type-400", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-16" ], +@@ -41968,8 +43380,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-3551", +- "self_type" : "type-3551", ++ "referenced_type" : "type-3545", ++ "self_type" : "type-3545", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-25" ], +@@ -41979,8 +43391,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-3550", +- "self_type" : "type-3550", ++ "referenced_type" : "type-3544", ++ "self_type" : "type-3544", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-308" ], +@@ -42012,88 +43424,88 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-3549", +- "self_type" : "type-3549", ++ "referenced_type" : "type-3543", ++ "self_type" : "type-3543", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2144" ], ++ "template_args" : [ "type-2140" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-2268", +- "self_type" : "type-2268", ++ "referenced_type" : "type-2264", ++ "self_type" : "type-2264", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2185" ], ++ "template_args" : [ "type-2181" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-2266", +- "self_type" : "type-2266", ++ "referenced_type" : "type-2262", ++ "self_type" : "type-2262", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2156" ], ++ "template_args" : [ "type-2152" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-3671", +- "self_type" : "type-3671", ++ "referenced_type" : "type-3665", ++ "self_type" : "type-3665", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2227" ], ++ "template_args" : [ "type-2223" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move > >", + "name" : "android::trait_trivial_move > >", +- "referenced_type" : "type-3675", +- "self_type" : "type-3675", ++ "referenced_type" : "type-3667", ++ "self_type" : "type-3667", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3615" ], ++ "template_args" : [ "type-3609" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move >", + "name" : "android::trait_trivial_move >", +- "referenced_type" : "type-2267", +- "self_type" : "type-2267", ++ "referenced_type" : "type-2263", ++ "self_type" : "type-2263", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2195" ], ++ "template_args" : [ "type-2191" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move >", + "name" : "android::trait_trivial_move >", +- "referenced_type" : "type-2337", +- "self_type" : "type-2337", ++ "referenced_type" : "type-2333", ++ "self_type" : "type-2333", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2279" ], ++ "template_args" : [ "type-2275" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move >", + "name" : "android::trait_trivial_move >", +- "referenced_type" : "type-3674", +- "self_type" : "type-3674", ++ "referenced_type" : "type-3666", ++ "self_type" : "type-3666", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-383" ], ++ "template_args" : [ "type-382" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware7IBinderEEEEE" + }, + { +@@ -42122,8 +43534,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-2265", +- "self_type" : "type-2265", ++ "referenced_type" : "type-2261", ++ "self_type" : "type-2261", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-78" ], +@@ -42133,8 +43545,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-468", +- "self_type" : "type-468", ++ "referenced_type" : "type-467", ++ "self_type" : "type-467", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-6" ], +@@ -42144,8 +43556,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-458", +- "self_type" : "type-458", ++ "referenced_type" : "type-457", ++ "self_type" : "type-457", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-237" ], +@@ -42166,8 +43578,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-387", +- "self_type" : "type-387", ++ "referenced_type" : "type-386", ++ "self_type" : "type-386", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-336" ], +@@ -42265,8 +43677,8 @@ + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3558", +- "self_type" : "type-3558", ++ "referenced_type" : "type-3552", ++ "self_type" : "type-3552", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-25" ], +@@ -42276,8 +43688,8 @@ + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3557", +- "self_type" : "type-3557", ++ "referenced_type" : "type-3551", ++ "self_type" : "type-3551", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-308" ], +@@ -42287,8 +43699,8 @@ + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3682", +- "self_type" : "type-3682", ++ "referenced_type" : "type-3676", ++ "self_type" : "type-3676", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-286" ], +@@ -42298,96 +43710,96 @@ + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3556", +- "self_type" : "type-3556", ++ "referenced_type" : "type-3549", ++ "self_type" : "type-3549", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2144" ], ++ "template_args" : [ "type-2140" ], + "unique_id" : "_ZTSN7android6traitsIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-2276", +- "self_type" : "type-2276", ++ "referenced_type" : "type-2272", ++ "self_type" : "type-2272", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2185" ], ++ "template_args" : [ "type-2181" ], + "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-2275", +- "self_type" : "type-2275", ++ "referenced_type" : "type-2271", ++ "self_type" : "type-2271", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2156" ], ++ "template_args" : [ "type-2152" ], + "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3680", +- "self_type" : "type-3680", ++ "referenced_type" : "type-3674", ++ "self_type" : "type-3674", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2227" ], ++ "template_args" : [ "type-2223" ], + "unique_id" : "_ZTSN7android6traitsINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits > >", + "name" : "android::traits > >", +- "referenced_type" : "type-3681", +- "self_type" : "type-3681", ++ "referenced_type" : "type-3675", ++ "self_type" : "type-3675", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3615" ], ++ "template_args" : [ "type-3609" ], + "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits >", + "name" : "android::traits >", +- "referenced_type" : "type-2273", +- "self_type" : "type-2273", ++ "referenced_type" : "type-2269", ++ "self_type" : "type-2269", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2195" ], ++ "template_args" : [ "type-2191" ], + "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits >", + "name" : "android::traits >", +- "referenced_type" : "type-2340", +- "self_type" : "type-2340", ++ "referenced_type" : "type-2335", ++ "self_type" : "type-2335", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2279" ], ++ "template_args" : [ "type-2275" ], + "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits >", + "name" : "android::traits >", +- "referenced_type" : "type-3683", +- "self_type" : "type-3683", ++ "referenced_type" : "type-3677", ++ "self_type" : "type-3677", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-383" ], ++ "template_args" : [ "type-382" ], + "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware7IBinderEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-2274", +- "self_type" : "type-2274", ++ "referenced_type" : "type-2270", ++ "self_type" : "type-2270", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-78" ], +@@ -42397,8 +43809,8 @@ + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3705", +- "self_type" : "type-3705", ++ "referenced_type" : "type-3699", ++ "self_type" : "type-3699", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-14" ], +@@ -42409,13 +43821,13 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3424" ++ "referenced_type" : "type-3418" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-3423", +- "self_type" : "type-3423", ++ "referenced_type" : "type-3417", ++ "self_type" : "type-3417", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-25" ], +@@ -42426,13 +43838,13 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3422" ++ "referenced_type" : "type-3416" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-3421", +- "self_type" : "type-3421", ++ "referenced_type" : "type-3415", ++ "self_type" : "type-3415", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-308" ], +@@ -42443,16 +43855,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3420" ++ "referenced_type" : "type-3414" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-3419", +- "self_type" : "type-3419", ++ "referenced_type" : "type-3413", ++ "self_type" : "type-3413", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2144" ], ++ "template_args" : [ "type-2140" ], + "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_8hardware9BHwBinderEEE" + }, + { +@@ -42460,16 +43872,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2207" ++ "referenced_type" : "type-2203" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-2206", +- "self_type" : "type-2206", ++ "referenced_type" : "type-2202", ++ "self_type" : "type-2202", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2185" ], ++ "template_args" : [ "type-2181" ], + "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { +@@ -42477,16 +43889,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3623" ++ "referenced_type" : "type-3617" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-3622", +- "self_type" : "type-3622", ++ "referenced_type" : "type-3616", ++ "self_type" : "type-3616", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2227" ], ++ "template_args" : [ "type-2223" ], + "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware12ProcessState12handle_entryEEE" + }, + { +@@ -42494,16 +43906,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3625" ++ "referenced_type" : "type-3619" + } + ], + "linker_set_key" : "android::use_trivial_move > >", + "name" : "android::use_trivial_move > >", +- "referenced_type" : "type-3624", +- "self_type" : "type-3624", ++ "referenced_type" : "type-3618", ++ "self_type" : "type-3618", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3615" ], ++ "template_args" : [ "type-3609" ], + "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { +@@ -42511,16 +43923,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2205" ++ "referenced_type" : "type-2201" + } + ], + "linker_set_key" : "android::use_trivial_move >", + "name" : "android::use_trivial_move >", +- "referenced_type" : "type-2204", +- "self_type" : "type-2204", ++ "referenced_type" : "type-2200", ++ "self_type" : "type-2200", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2195" ], ++ "template_args" : [ "type-2191" ], + "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { +@@ -42528,16 +43940,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2342" ++ "referenced_type" : "type-2337" + } + ], + "linker_set_key" : "android::use_trivial_move >", + "name" : "android::use_trivial_move >", +- "referenced_type" : "type-2341", +- "self_type" : "type-2341", ++ "referenced_type" : "type-2336", ++ "self_type" : "type-2336", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2279" ], ++ "template_args" : [ "type-2275" ], + "unique_id" : "_ZTSN7android16use_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { +@@ -42545,13 +43957,13 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3686" ++ "referenced_type" : "type-3680" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-3685", +- "self_type" : "type-3685", ++ "referenced_type" : "type-3679", ++ "self_type" : "type-3679", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-14" ], +@@ -42590,7 +44002,7 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-902" ++ "referenced_type" : "type-900" + }, + { + "access" : "private", +@@ -42602,11 +44014,11 @@ + "linker_set_key" : "android::wp", + "name" : "android::wp", + "record_kind" : "class", +- "referenced_type" : "type-901", +- "self_type" : "type-901", ++ "referenced_type" : "type-899", ++ "self_type" : "type-899", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h", +- "template_args" : [ "type-905" ], ++ "template_args" : [ "type-903" ], + "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinder14DeathRecipientEEE" + }, + { +@@ -42616,7 +44028,7 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-2141" ++ "referenced_type" : "type-2137" + }, + { + "access" : "private", +@@ -42628,11 +44040,11 @@ + "linker_set_key" : "android::wp", + "name" : "android::wp", + "record_kind" : "class", +- "referenced_type" : "type-2193", +- "self_type" : "type-2193", ++ "referenced_type" : "type-2189", ++ "self_type" : "type-2189", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h", +- "template_args" : [ "type-2140" ], ++ "template_args" : [ "type-2136" ], + "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinderEEE" + }, + { +@@ -43249,7 +44661,7 @@ + [ + { + "field_name" : "lock", +- "referenced_type" : "type-2321" ++ "referenced_type" : "type-2317" + }, + { + "field_name" : "has_tls", +@@ -43264,8 +44676,8 @@ + ], + "linker_set_key" : "thread_store_t", + "name" : "thread_store_t", +- "referenced_type" : "type-2320", +- "self_type" : "type-2320", ++ "referenced_type" : "type-2316", ++ "self_type" : "type-2316", + "size" : 12, + "source_file" : "/system/core/libcutils/include/cutils/threads.h", + "unique_id" : "thread_store_t" +@@ -43277,8 +44689,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return &&", + "name" : "android::hardware::Return &&", +- "referenced_type" : "type-765", +- "self_type" : "type-767", ++ "referenced_type" : "type-763", ++ "self_type" : "type-765", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -43286,8 +44698,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-758", +- "self_type" : "type-760", ++ "referenced_type" : "type-756", ++ "self_type" : "type-758", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -43295,8 +44707,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-945", +- "self_type" : "type-947", ++ "referenced_type" : "type-943", ++ "self_type" : "type-945", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -43304,8 +44716,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-1054", +- "self_type" : "type-1056", ++ "referenced_type" : "type-1052", ++ "self_type" : "type-1054", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -43313,8 +44725,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-1111", +- "self_type" : "type-1113", ++ "referenced_type" : "type-1109", ++ "self_type" : "type-1111", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -43322,8 +44734,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-1946", +- "self_type" : "type-1948", ++ "referenced_type" : "type-1942", ++ "self_type" : "type-1944", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -43331,8 +44743,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-2016", +- "self_type" : "type-2018", ++ "referenced_type" : "type-2012", ++ "self_type" : "type-2014", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -43367,8 +44779,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::SchedPrio &&", + "name" : "android::hardware::details::SchedPrio &&", +- "referenced_type" : "type-367", +- "self_type" : "type-669", ++ "referenced_type" : "type-366", ++ "self_type" : "type-667", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43421,8 +44833,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec &&", + "name" : "android::hardware::hidl_vec &&", +- "referenced_type" : "type-472", +- "self_type" : "type-785", ++ "referenced_type" : "type-471", ++ "self_type" : "type-783", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -43430,8 +44842,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-425", +- "self_type" : "type-437", ++ "referenced_type" : "type-424", ++ "self_type" : "type-436", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -43448,8 +44860,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-922", +- "self_type" : "type-2233", ++ "referenced_type" : "type-920", ++ "self_type" : "type-2229", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -43457,8 +44869,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-383", +- "self_type" : "type-436", ++ "referenced_type" : "type-382", ++ "self_type" : "type-435", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -43466,8 +44878,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-908", +- "self_type" : "type-942", ++ "referenced_type" : "type-906", ++ "self_type" : "type-940", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -43476,7 +44888,7 @@ + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", + "referenced_type" : "type-81", +- "self_type" : "type-429", ++ "self_type" : "type-428", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -43485,7 +44897,7 @@ + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", + "referenced_type" : "type-300", +- "self_type" : "type-523", ++ "self_type" : "type-522", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -43493,8 +44905,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-526", +- "self_type" : "type-935", ++ "referenced_type" : "type-525", ++ "self_type" : "type-933", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -43502,8 +44914,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-542", +- "self_type" : "type-940", ++ "referenced_type" : "type-541", ++ "self_type" : "type-938", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -43511,8 +44923,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-531", +- "self_type" : "type-717", ++ "referenced_type" : "type-530", ++ "self_type" : "type-715", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -43520,8 +44932,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-548", +- "self_type" : "type-1943", ++ "referenced_type" : "type-546", ++ "self_type" : "type-1939", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -43529,8 +44941,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-537", +- "self_type" : "type-869", ++ "referenced_type" : "type-535", ++ "self_type" : "type-866", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -43539,25 +44951,7 @@ + "linker_set_key" : "android::wp &&", + "name" : "android::wp &&", + "referenced_type" : "type-331", +- "self_type" : "type-342", +- "size" : 4, +- "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "android::wp &&", +- "name" : "android::wp &&", +- "referenced_type" : "type-309", +- "self_type" : "type-668", +- "size" : 4, +- "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "const android::hidl::base::V1_0::IBase *&&", +- "name" : "const android::hidl::base::V1_0::IBase *&&", +- "referenced_type" : "type-329", +- "self_type" : "type-341", ++ "self_type" : "type-343", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43565,8 +44959,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1018", +- "self_type" : "type-1017", ++ "referenced_type" : "type-1016", ++ "self_type" : "type-1015", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43574,8 +44968,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1076", +- "self_type" : "type-1075", ++ "referenced_type" : "type-1074", ++ "self_type" : "type-1073", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43583,8 +44977,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1134", +- "self_type" : "type-1133", ++ "referenced_type" : "type-1132", ++ "self_type" : "type-1131", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43592,8 +44986,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1799", +- "self_type" : "type-1798", ++ "referenced_type" : "type-1795", ++ "self_type" : "type-1794", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43601,8 +44995,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1854", +- "self_type" : "type-1853", ++ "referenced_type" : "type-1850", ++ "self_type" : "type-1849", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43610,8 +45004,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1910", +- "self_type" : "type-1909", ++ "referenced_type" : "type-1906", ++ "self_type" : "type-1905", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43619,8 +45013,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1972", +- "self_type" : "type-1971", ++ "referenced_type" : "type-1968", ++ "self_type" : "type-1967", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43628,8 +45022,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-2047", +- "self_type" : "type-2046", ++ "referenced_type" : "type-2043", ++ "self_type" : "type-2042", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43637,8 +45031,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-2100", +- "self_type" : "type-2099", ++ "referenced_type" : "type-2096", ++ "self_type" : "type-2095", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43646,8 +45040,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-2937", +- "self_type" : "type-2936", ++ "referenced_type" : "type-2931", ++ "self_type" : "type-2930", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43655,8 +45049,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-2992", +- "self_type" : "type-2991", ++ "referenced_type" : "type-2986", ++ "self_type" : "type-2985", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43664,8 +45058,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-3048", +- "self_type" : "type-3047", ++ "referenced_type" : "type-3042", ++ "self_type" : "type-3041", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43673,8 +45067,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-3108", +- "self_type" : "type-3107", ++ "referenced_type" : "type-3102", ++ "self_type" : "type-3101", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43682,8 +45076,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-3181", +- "self_type" : "type-3180", ++ "referenced_type" : "type-3175", ++ "self_type" : "type-3174", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43691,8 +45085,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-3231", +- "self_type" : "type-3230", ++ "referenced_type" : "type-3225", ++ "self_type" : "type-3224", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43700,8 +45094,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1023", +- "self_type" : "type-1022", ++ "referenced_type" : "type-1020", ++ "self_type" : "type-1019", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43709,8 +45103,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1080", +- "self_type" : "type-1079", ++ "referenced_type" : "type-1078", ++ "self_type" : "type-1077", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43718,8 +45112,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1138", +- "self_type" : "type-1137", ++ "referenced_type" : "type-1136", ++ "self_type" : "type-1135", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43727,8 +45121,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1804", +- "self_type" : "type-1803", ++ "referenced_type" : "type-1799", ++ "self_type" : "type-1798", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43736,8 +45130,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1858", +- "self_type" : "type-1857", ++ "referenced_type" : "type-1854", ++ "self_type" : "type-1853", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43745,8 +45139,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1914", +- "self_type" : "type-1913", ++ "referenced_type" : "type-1910", ++ "self_type" : "type-1909", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43754,8 +45148,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1977", +- "self_type" : "type-1976", ++ "referenced_type" : "type-1973", ++ "self_type" : "type-1972", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43763,8 +45157,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2051", +- "self_type" : "type-2050", ++ "referenced_type" : "type-2047", ++ "self_type" : "type-2046", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43772,8 +45166,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2104", +- "self_type" : "type-2103", ++ "referenced_type" : "type-2100", ++ "self_type" : "type-2099", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43781,8 +45175,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2942", +- "self_type" : "type-2941", ++ "referenced_type" : "type-2935", ++ "self_type" : "type-2934", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43790,8 +45184,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2996", +- "self_type" : "type-2995", ++ "referenced_type" : "type-2990", ++ "self_type" : "type-2989", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43799,8 +45193,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3052", +- "self_type" : "type-3051", ++ "referenced_type" : "type-3046", ++ "self_type" : "type-3045", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43808,8 +45202,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3113", +- "self_type" : "type-3112", ++ "referenced_type" : "type-3107", ++ "self_type" : "type-3106", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43817,8 +45211,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3185", +- "self_type" : "type-3184", ++ "referenced_type" : "type-3179", ++ "self_type" : "type-3178", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43826,8 +45220,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3235", +- "self_type" : "type-3234", ++ "referenced_type" : "type-3229", ++ "self_type" : "type-3228", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43835,8 +45229,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1020", +- "self_type" : "type-1019", ++ "referenced_type" : "type-1018", ++ "self_type" : "type-1017", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43844,8 +45238,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1078", +- "self_type" : "type-1077", ++ "referenced_type" : "type-1076", ++ "self_type" : "type-1075", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43853,8 +45247,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1136", +- "self_type" : "type-1135", ++ "referenced_type" : "type-1134", ++ "self_type" : "type-1133", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43862,8 +45256,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1801", +- "self_type" : "type-1800", ++ "referenced_type" : "type-1797", ++ "self_type" : "type-1796", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43871,8 +45265,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1856", +- "self_type" : "type-1855", ++ "referenced_type" : "type-1852", ++ "self_type" : "type-1851", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43880,8 +45274,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1912", +- "self_type" : "type-1911", ++ "referenced_type" : "type-1908", ++ "self_type" : "type-1907", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43889,8 +45283,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1975", +- "self_type" : "type-1974", ++ "referenced_type" : "type-1970", ++ "self_type" : "type-1969", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43898,8 +45292,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2049", +- "self_type" : "type-2048", ++ "referenced_type" : "type-2045", ++ "self_type" : "type-2044", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43907,8 +45301,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2102", +- "self_type" : "type-2101", ++ "referenced_type" : "type-2098", ++ "self_type" : "type-2097", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43916,8 +45310,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2939", +- "self_type" : "type-2938", ++ "referenced_type" : "type-2933", ++ "self_type" : "type-2932", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43925,8 +45319,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2994", +- "self_type" : "type-2993", ++ "referenced_type" : "type-2988", ++ "self_type" : "type-2987", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43934,8 +45328,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3050", +- "self_type" : "type-3049", ++ "referenced_type" : "type-3044", ++ "self_type" : "type-3043", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43943,8 +45337,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3111", +- "self_type" : "type-3110", ++ "referenced_type" : "type-3104", ++ "self_type" : "type-3103", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43952,8 +45346,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3183", +- "self_type" : "type-3182", ++ "referenced_type" : "type-3177", ++ "self_type" : "type-3176", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43961,8 +45355,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3233", +- "self_type" : "type-3232", ++ "referenced_type" : "type-3227", ++ "self_type" : "type-3226", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + } +diff --git a/29/32/x86/source-based/libhwbinder_noltopgo.so.lsdump b/29/32/x86/source-based/libhwbinder_noltopgo.so.lsdump +index ebaf01e..4b7a8b7 100644 +--- a/29/32/x86/source-based/libhwbinder_noltopgo.so.lsdump ++++ b/29/32/x86/source-based/libhwbinder_noltopgo.so.lsdump +@@ -886,30 +886,6 @@ + { + "name" : "_ZN7android8hardware6Parcel12restartWriteEj" + }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIdEEiT_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIfEEiT_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIiEEiT_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIjEEiT_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIxEEiT_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIyEEiT_" +- }, + { + "name" : "_ZN7android8hardware6Parcel12writeCStringEPKc" + }, +@@ -5185,114 +5161,6 @@ + "return_type" : "type-19", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIdEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-69" +- }, +- { +- "referenced_type" : "type-96" +- } +- ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-96" ] +- }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIfEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-69" +- }, +- { +- "referenced_type" : "type-94" +- } +- ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-94" ] +- }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIiEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-69" +- }, +- { +- "referenced_type" : "type-19" +- } +- ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-19" ] +- }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIjEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-69" +- }, +- { +- "referenced_type" : "type-4" +- } +- ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-4" ] +- }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIxEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-69" +- }, +- { +- "referenced_type" : "type-90" +- } +- ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-90" ] +- }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIyEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-69" +- }, +- { +- "referenced_type" : "type-92" +- } +- ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-92" ] +- }, + { + "function_name" : "android::hardware::Parcel::writeCString", + "linker_set_key" : "_ZN7android8hardware6Parcel12writeCStringEPKc", +diff --git a/29/32/x86/source-based/libprotobuf-cpp-full.so.lsdump b/29/32/x86/source-based/libprotobuf-cpp-full.so.lsdump +index 8ccf453..29af03a 100644 +--- a/29/32/x86/source-based/libprotobuf-cpp-full.so.lsdump ++++ b/29/32/x86/source-based/libprotobuf-cpp-full.so.lsdump +@@ -3340,6 +3340,10 @@ + "binding" : "weak", + "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexINSt3__14pairIPKviEEE13FindExtensionERKNS3_12basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEEi" + }, ++ { ++ "binding" : "weak", ++ "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexINSt3__14pairIPKviEEE18ValidateSymbolNameERKNS3_12basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE" ++ }, + { + "binding" : "weak", + "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexINSt3__14pairIPKviEEE19AddNestedExtensionsERKNS0_15DescriptorProtoES7_" +@@ -3368,6 +3372,10 @@ + "binding" : "weak", + "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexIPKNS0_19FileDescriptorProtoEE12AddExtensionERKNS0_20FieldDescriptorProtoES5_" + }, ++ { ++ "binding" : "weak", ++ "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexIPKNS0_19FileDescriptorProtoEE18ValidateSymbolNameERKNSt3__112basic_stringIcNS7_11char_traitsIcEENS7_9allocatorIcEEEE" ++ }, + { + "binding" : "weak", + "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexIPKNS0_19FileDescriptorProtoEE19AddNestedExtensionsERKNS0_15DescriptorProtoES5_" +@@ -28414,6 +28422,23 @@ + "return_type" : "type-4554", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, ++ { ++ "access" : "private", ++ "function_name" : "google::protobuf::SimpleDescriptorDatabase::DescriptorIndex >::ValidateSymbolName", ++ "linker_set_key" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexINSt3__14pairIPKviEEE18ValidateSymbolNameERKNS3_12basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3887" ++ }, ++ { ++ "referenced_type" : "type-3875" ++ } ++ ], ++ "return_type" : "type-12", ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" ++ }, + { + "function_name" : "google::protobuf::SimpleDescriptorDatabase::DescriptorIndex >::AddNestedExtensions", + "linker_set_key" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexINSt3__14pairIPKviEEE19AddNestedExtensionsERKNS0_15DescriptorProtoES7_", +@@ -28546,6 +28571,23 @@ + "return_type" : "type-12", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, ++ { ++ "access" : "private", ++ "function_name" : "google::protobuf::SimpleDescriptorDatabase::DescriptorIndex::ValidateSymbolName", ++ "linker_set_key" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexIPKNS0_19FileDescriptorProtoEE18ValidateSymbolNameERKNSt3__112basic_stringIcNS7_11char_traitsIcEENS7_9allocatorIcEEEE", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3886" ++ }, ++ { ++ "referenced_type" : "type-3875" ++ } ++ ], ++ "return_type" : "type-12", ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" ++ }, + { + "function_name" : "google::protobuf::SimpleDescriptorDatabase::DescriptorIndex::AddNestedExtensions", + "linker_set_key" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexIPKNS0_19FileDescriptorProtoEE19AddNestedExtensionsERKNS0_15DescriptorProtoES5_", +diff --git a/29/32/x86/source-based/libstagefright_foundation.so.lsdump b/29/32/x86/source-based/libstagefright_foundation.so.lsdump +index 55e8d2e..b21b7cf 100644 +--- a/29/32/x86/source-based/libstagefright_foundation.so.lsdump ++++ b/29/32/x86/source-based/libstagefright_foundation.so.lsdump +@@ -689,50 +689,6 @@ + { + "name" : "_ZN7android7ABufferD2Ev" + }, +- { +- "binding" : "weak", +- "name" : "_ZN7android7ALookupI19android_dataspace_tS1_EC2ESt16initializer_listINSt3__14pairIS1_S1_EEE" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android7ALookupINS_10ColorUtils10ColorRangeENS_12ColorAspects5RangeEEC2ESt16initializer_listINSt3__14pairIS2_S4_EEE" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android7ALookupINS_10ColorUtils10ColorRangeEjEC2ESt16initializer_listINSt3__14pairIS2_jEEE" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android7ALookupINS_10ColorUtils13ColorStandardENS_12ColorAspects9PrimariesEEC2ESt16initializer_listINSt3__14pairIS2_S4_EEE" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android7ALookupINS_10ColorUtils13ColorStandardENSt3__14pairINS_12ColorAspects9PrimariesENS5_12MatrixCoeffsEEEEC2ESt16initializer_listINS4_IS2_S8_EEE" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android7ALookupINS_10ColorUtils13ColorStandardEjEC2ESt16initializer_listINSt3__14pairIS2_jEEE" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android7ALookupINS_10ColorUtils13ColorTransferENS_12ColorAspects8TransferEEC2ESt16initializer_listINSt3__14pairIS2_S4_EEE" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android7ALookupINS_10ColorUtils13ColorTransferEjEC2ESt16initializer_listINSt3__14pairIS2_jEEE" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android7ALookupIiNS_12ColorAspects12MatrixCoeffsEEC2ESt16initializer_listINSt3__14pairIiS2_EEE" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android7ALookupIiNS_12ColorAspects8TransferEEC2ESt16initializer_listINSt3__14pairIiS2_EEE" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android7ALookupIiNS_12ColorAspects9PrimariesEEC2ESt16initializer_listINSt3__14pairIiS2_EEE" +- }, + { + "name" : "_ZN7android7ALooper13awaitResponseERKNS_2spINS_11AReplyTokenEEEPNS1_INS_8AMessageEEE" + }, +@@ -5871,182 +5827,6 @@ + "return_type" : "type-33", + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h" + }, +- { +- "function_name" : "android::ALookup::ALookup", +- "linker_set_key" : "_ZN7android7ALookupI19android_dataspace_tS1_EC2ESt16initializer_listINSt3__14pairIS1_S1_EEE", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-669" +- }, +- { +- "referenced_type" : "type-1256" +- } +- ], +- "return_type" : "type-33", +- "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" +- }, +- { +- "function_name" : "android::ALookup::ALookup", +- "linker_set_key" : "_ZN7android7ALookupINS_10ColorUtils10ColorRangeENS_12ColorAspects5RangeEEC2ESt16initializer_listINSt3__14pairIS2_S4_EEE", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-590" +- }, +- { +- "referenced_type" : "type-1258" +- } +- ], +- "return_type" : "type-33", +- "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" +- }, +- { +- "function_name" : "android::ALookup::ALookup", +- "linker_set_key" : "_ZN7android7ALookupINS_10ColorUtils10ColorRangeEjEC2ESt16initializer_listINSt3__14pairIS2_jEEE", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-688" +- }, +- { +- "referenced_type" : "type-1260" +- } +- ], +- "return_type" : "type-33", +- "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" +- }, +- { +- "function_name" : "android::ALookup::ALookup", +- "linker_set_key" : "_ZN7android7ALookupINS_10ColorUtils13ColorStandardENS_12ColorAspects9PrimariesEEC2ESt16initializer_listINSt3__14pairIS2_S4_EEE", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-663" +- }, +- { +- "referenced_type" : "type-1262" +- } +- ], +- "return_type" : "type-33", +- "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" +- }, +- { +- "function_name" : "android::ALookup >::ALookup", +- "linker_set_key" : "_ZN7android7ALookupINS_10ColorUtils13ColorStandardENSt3__14pairINS_12ColorAspects9PrimariesENS5_12MatrixCoeffsEEEEC2ESt16initializer_listINS4_IS2_S8_EEE", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-606" +- }, +- { +- "referenced_type" : "type-1264" +- } +- ], +- "return_type" : "type-33", +- "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" +- }, +- { +- "function_name" : "android::ALookup::ALookup", +- "linker_set_key" : "_ZN7android7ALookupINS_10ColorUtils13ColorStandardEjEC2ESt16initializer_listINSt3__14pairIS2_jEEE", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-677" +- }, +- { +- "referenced_type" : "type-1266" +- } +- ], +- "return_type" : "type-33", +- "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" +- }, +- { +- "function_name" : "android::ALookup::ALookup", +- "linker_set_key" : "_ZN7android7ALookupINS_10ColorUtils13ColorTransferENS_12ColorAspects8TransferEEC2ESt16initializer_listINSt3__14pairIS2_S4_EEE", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-623" +- }, +- { +- "referenced_type" : "type-1268" +- } +- ], +- "return_type" : "type-33", +- "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" +- }, +- { +- "function_name" : "android::ALookup::ALookup", +- "linker_set_key" : "_ZN7android7ALookupINS_10ColorUtils13ColorTransferEjEC2ESt16initializer_listINSt3__14pairIS2_jEEE", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-683" +- }, +- { +- "referenced_type" : "type-1270" +- } +- ], +- "return_type" : "type-33", +- "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" +- }, +- { +- "function_name" : "android::ALookup::ALookup", +- "linker_set_key" : "_ZN7android7ALookupIiNS_12ColorAspects12MatrixCoeffsEEC2ESt16initializer_listINSt3__14pairIiS2_EEE", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-652" +- }, +- { +- "referenced_type" : "type-1272" +- } +- ], +- "return_type" : "type-33", +- "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" +- }, +- { +- "function_name" : "android::ALookup::ALookup", +- "linker_set_key" : "_ZN7android7ALookupIiNS_12ColorAspects8TransferEEC2ESt16initializer_listINSt3__14pairIiS2_EEE", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-645" +- }, +- { +- "referenced_type" : "type-1274" +- } +- ], +- "return_type" : "type-33", +- "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" +- }, +- { +- "function_name" : "android::ALookup::ALookup", +- "linker_set_key" : "_ZN7android7ALookupIiNS_12ColorAspects9PrimariesEEC2ESt16initializer_listINSt3__14pairIiS2_EEE", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-636" +- }, +- { +- "referenced_type" : "type-1276" +- } +- ], +- "return_type" : "type-33", +- "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" +- }, + { + "access" : "private", + "function_name" : "android::ALooper::awaitResponse", +diff --git a/29/64/arm64_armv8-a/source-based/libhidlbase.so.lsdump b/29/64/arm64_armv8-a/source-based/libhidlbase.so.lsdump +index a5069e4..600a84a 100644 +--- a/29/64/arm64_armv8-a/source-based/libhidlbase.so.lsdump ++++ b/29/64/arm64_armv8-a/source-based/libhidlbase.so.lsdump +@@ -14,7 +14,7 @@ + "linker_set_key" : "char [10]", + "name" : "char [10]", + "referenced_type" : "type-43", +- "self_type" : "type-3469", ++ "self_type" : "type-3463", + "size" : 10, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -23,7 +23,7 @@ + "linker_set_key" : "char [11]", + "name" : "char [11]", + "referenced_type" : "type-43", +- "self_type" : "type-3494", ++ "self_type" : "type-3488", + "size" : 11, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -32,7 +32,7 @@ + "linker_set_key" : "char [12]", + "name" : "char [12]", + "referenced_type" : "type-43", +- "self_type" : "type-3464", ++ "self_type" : "type-3458", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -41,7 +41,7 @@ + "linker_set_key" : "char [13]", + "name" : "char [13]", + "referenced_type" : "type-43", +- "self_type" : "type-3461", ++ "self_type" : "type-3455", + "size" : 13, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -50,7 +50,7 @@ + "linker_set_key" : "char [14]", + "name" : "char [14]", + "referenced_type" : "type-43", +- "self_type" : "type-3513", ++ "self_type" : "type-3507", + "size" : 14, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -59,7 +59,7 @@ + "linker_set_key" : "char [15]", + "name" : "char [15]", + "referenced_type" : "type-43", +- "self_type" : "type-3612", ++ "self_type" : "type-3606", + "size" : 15, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -68,7 +68,7 @@ + "linker_set_key" : "char [16]", + "name" : "char [16]", + "referenced_type" : "type-43", +- "self_type" : "type-3498", ++ "self_type" : "type-3492", + "size" : 16, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -77,7 +77,7 @@ + "linker_set_key" : "char [17]", + "name" : "char [17]", + "referenced_type" : "type-43", +- "self_type" : "type-3516", ++ "self_type" : "type-3510", + "size" : 17, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -86,7 +86,7 @@ + "linker_set_key" : "char [18]", + "name" : "char [18]", + "referenced_type" : "type-43", +- "self_type" : "type-3501", ++ "self_type" : "type-3495", + "size" : 18, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -95,7 +95,7 @@ + "linker_set_key" : "char [19]", + "name" : "char [19]", + "referenced_type" : "type-43", +- "self_type" : "type-3532", ++ "self_type" : "type-3526", + "size" : 19, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -104,7 +104,7 @@ + "linker_set_key" : "char [20]", + "name" : "char [20]", + "referenced_type" : "type-43", +- "self_type" : "type-3510", ++ "self_type" : "type-3504", + "size" : 20, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -113,7 +113,7 @@ + "linker_set_key" : "char [22]", + "name" : "char [22]", + "referenced_type" : "type-43", +- "self_type" : "type-3535", ++ "self_type" : "type-3529", + "size" : 22, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -122,7 +122,7 @@ + "linker_set_key" : "char [25]", + "name" : "char [25]", + "referenced_type" : "type-43", +- "self_type" : "type-3525", ++ "self_type" : "type-3519", + "size" : 25, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -131,7 +131,7 @@ + "linker_set_key" : "char [28]", + "name" : "char [28]", + "referenced_type" : "type-43", +- "self_type" : "type-3547", ++ "self_type" : "type-3541", + "size" : 28, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -140,7 +140,7 @@ + "linker_set_key" : "char [29]", + "name" : "char [29]", + "referenced_type" : "type-43", +- "self_type" : "type-3522", ++ "self_type" : "type-3516", + "size" : 29, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -149,7 +149,7 @@ + "linker_set_key" : "char [2]", + "name" : "char [2]", + "referenced_type" : "type-43", +- "self_type" : "type-3473", ++ "self_type" : "type-3467", + "size" : 2, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -158,7 +158,7 @@ + "linker_set_key" : "char [31]", + "name" : "char [31]", + "referenced_type" : "type-43", +- "self_type" : "type-3507", ++ "self_type" : "type-3501", + "size" : 31, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -167,7 +167,7 @@ + "linker_set_key" : "char [32]", + "name" : "char [32]", + "referenced_type" : "type-43", +- "self_type" : "type-3538", ++ "self_type" : "type-3532", + "size" : 32, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -176,7 +176,7 @@ + "linker_set_key" : "char [35]", + "name" : "char [35]", + "referenced_type" : "type-43", +- "self_type" : "type-3529", ++ "self_type" : "type-3523", + "size" : 35, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -185,7 +185,7 @@ + "linker_set_key" : "char [37]", + "name" : "char [37]", + "referenced_type" : "type-43", +- "self_type" : "type-3519", ++ "self_type" : "type-3513", + "size" : 37, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -194,7 +194,7 @@ + "linker_set_key" : "char [3]", + "name" : "char [3]", + "referenced_type" : "type-43", +- "self_type" : "type-3486", ++ "self_type" : "type-3480", + "size" : 3, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -203,7 +203,7 @@ + "linker_set_key" : "char [4]", + "name" : "char [4]", + "referenced_type" : "type-43", +- "self_type" : "type-3609", ++ "self_type" : "type-3603", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -212,7 +212,7 @@ + "linker_set_key" : "char [5]", + "name" : "char [5]", + "referenced_type" : "type-43", +- "self_type" : "type-3615", ++ "self_type" : "type-3609", + "size" : 5, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -221,7 +221,7 @@ + "linker_set_key" : "char [64]", + "name" : "char [64]", + "referenced_type" : "type-43", +- "self_type" : "type-362", ++ "self_type" : "type-361", + "size" : 64, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -230,7 +230,7 @@ + "linker_set_key" : "char [6]", + "name" : "char [6]", + "referenced_type" : "type-43", +- "self_type" : "type-3476", ++ "self_type" : "type-3470", + "size" : 6, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -239,7 +239,7 @@ + "linker_set_key" : "char [7]", + "name" : "char [7]", + "referenced_type" : "type-43", +- "self_type" : "type-3504", ++ "self_type" : "type-3498", + "size" : 7, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -248,7 +248,7 @@ + "linker_set_key" : "char [8]", + "name" : "char [8]", + "referenced_type" : "type-43", +- "self_type" : "type-3491", ++ "self_type" : "type-3483", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -257,7 +257,7 @@ + "linker_set_key" : "char [9]", + "name" : "char [9]", + "referenced_type" : "type-43", +- "self_type" : "type-3480", ++ "self_type" : "type-3474", + "size" : 9, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -281,7 +281,7 @@ + "linker_set_key" : "unsigned char [32]", + "name" : "unsigned char [32]", + "referenced_type" : "type-146", +- "self_type" : "type-972", ++ "self_type" : "type-970", + "size" : 32, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -393,8 +393,8 @@ + "is_integral" : true, + "linker_set_key" : "signed char", + "name" : "signed char", +- "referenced_type" : "type-484", +- "self_type" : "type-484", ++ "referenced_type" : "type-485", ++ "self_type" : "type-485", + "size" : 1 + }, + { +@@ -433,8 +433,8 @@ + "is_unsigned" : true, + "linker_set_key" : "unsigned long long", + "name" : "unsigned long long", +- "referenced_type" : "type-389", +- "self_type" : "type-389", ++ "referenced_type" : "type-388", ++ "self_type" : "type-388", + "size" : 8 + }, + { +@@ -468,14 +468,6 @@ + "binding" : "weak", + "name" : "_ZN7android2spINS_8hardware25PassthroughServiceManagerEED2Ev" + }, +- { +- "binding" : "weak", +- "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_" +- }, + { + "binding" : "weak", + "name" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_" +@@ -2564,6 +2556,230 @@ + { + "name" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_6StatusE" + }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_compareEPKvSA_" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_destroyEPvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE12do_constructEPvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE15do_move_forwardEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE16do_move_backwardEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE7do_copyEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE8do_splatEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_compareES3_S3_" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_destroyEPvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE12do_constructEPvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE15do_move_forwardEPvS3_m" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE16do_move_backwardEPvS3_m" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE7do_copyEPvS3_m" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE8do_splatEPvS3_m" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE10do_destroyEPvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE12do_constructEPvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE10do_destroyEPvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE12do_constructEPvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE15do_move_forwardEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE16do_move_backwardEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE7do_copyEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE8do_splatEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE10do_destroyEPvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE12do_constructEPvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE15do_move_forwardEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE16do_move_backwardEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE7do_copyEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE8do_splatEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE10do_destroyEPvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE12do_constructEPvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE15do_move_forwardEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE16do_move_backwardEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE7do_copyEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE8do_splatEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE10do_destroyEPvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE12do_constructEPvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE7do_copyEPvPKvm" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE8do_splatEPvPKvm" ++ }, + { + "name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv" + }, +@@ -3446,7 +3662,7 @@ + }, + { + "binding" : "weak", +- "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware7details9SchedPrioEEENS_19__map_value_compareIS8_SC_NS_4lessIS8_EELb1EEENS_9allocatorISC_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJOS8_EEENSO_IJEEEEEENS_4pairINS_15__tree_iteratorISC_PNS_11__tree_nodeISC_PvEElEEbEERKT_DpOT0_" ++ "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware7details9SchedPrioEEENS_19__map_value_compareIS8_SC_NS_4lessIS8_EELb1EEENS_9allocatorISC_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSO_IJEEEEEENS_4pairINS_15__tree_iteratorISC_PNS_11__tree_nodeISC_PvEElEEbEERKT_DpOT0_" + }, + { + "binding" : "weak", +@@ -3454,7 +3670,7 @@ + }, + { + "binding" : "weak", +- "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJOS8_EEENSL_IJEEEEEENS_4pairINS_15__tree_iteratorIS9_PNS_11__tree_nodeIS9_PvEElEEbEERKT_DpOT0_" ++ "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSL_IJEEEEEENS_4pairINS_15__tree_iteratorIS9_PNS_11__tree_nodeIS9_PvEElEEbEERKT_DpOT0_" + }, + { + "binding" : "weak", +@@ -4591,8 +4807,8 @@ + ], + "linker_set_key" : "android::Condition::WakeUpType", + "name" : "android::Condition::WakeUpType", +- "referenced_type" : "type-398", +- "self_type" : "type-398", ++ "referenced_type" : "type-397", ++ "self_type" : "type-397", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Condition.h", + "underlying_type" : "type-44", +@@ -4683,8 +4899,8 @@ + ], + "linker_set_key" : "android::hardware::MQDescriptor::GrantorType", + "name" : "android::hardware::MQDescriptor::GrantorType", +- "referenced_type" : "type-992", +- "self_type" : "type-992", ++ "referenced_type" : "type-989", ++ "self_type" : "type-989", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h", + "underlying_type" : "type-14", +@@ -4731,8 +4947,8 @@ + ], + "linker_set_key" : "android::hardware::ProcessState::CallRestriction", + "name" : "android::hardware::ProcessState::CallRestriction", +- "referenced_type" : "type-2244", +- "self_type" : "type-2244", ++ "referenced_type" : "type-2240", ++ "self_type" : "type-2240", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h", + "underlying_type" : "type-14", +@@ -4839,8 +5055,8 @@ + ], + "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent", + "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent", +- "referenced_type" : "type-468", +- "self_type" : "type-468", ++ "referenced_type" : "type-467", ++ "self_type" : "type-467", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "underlying_type" : "type-44", +@@ -4883,8 +5099,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::PidConstant", + "name" : "android::hidl::manager::V1_0::IServiceManager::PidConstant", +- "referenced_type" : "type-502", +- "self_type" : "type-502", ++ "referenced_type" : "type-501", ++ "self_type" : "type-501", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h", + "underlying_type" : "type-14", +@@ -4909,8 +5125,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::Transport", + "name" : "android::hidl::manager::V1_0::IServiceManager::Transport", +- "referenced_type" : "type-501", +- "self_type" : "type-501", ++ "referenced_type" : "type-500", ++ "self_type" : "type-500", + "size" : 1, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h", + "underlying_type" : "type-146", +@@ -5826,12 +6042,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2287" ++ "referenced_type" : "type-2283" + } + ], +- "referenced_type" : "type-2291", +- "return_type" : "type-2287", +- "self_type" : "type-2291", ++ "referenced_type" : "type-2287", ++ "return_type" : "type-2283", ++ "self_type" : "type-2287", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -5844,15 +6060,15 @@ + "referenced_type" : "type-295" + }, + { +- "referenced_type" : "type-693" ++ "referenced_type" : "type-691" + }, + { + "referenced_type" : "type-188" + } + ], +- "referenced_type" : "type-2241", ++ "referenced_type" : "type-2237", + "return_type" : "type-29", +- "self_type" : "type-2241", ++ "self_type" : "type-2237", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -5877,12 +6093,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2303" ++ "referenced_type" : "type-2299" + } + ], +- "referenced_type" : "type-2302", +- "return_type" : "type-2303", +- "self_type" : "type-2302", ++ "referenced_type" : "type-2298", ++ "return_type" : "type-2299", ++ "self_type" : "type-2298", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -5892,16 +6108,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { +- "referenced_type" : "type-989" ++ "referenced_type" : "type-986" + }, + { + "referenced_type" : "type-16" + }, + { +- "referenced_type" : "type-2164" ++ "referenced_type" : "type-2160" + }, + { + "referenced_type" : "type-16" +@@ -5910,9 +6126,9 @@ + "referenced_type" : "type-188" + } + ], +- "referenced_type" : "type-2163", ++ "referenced_type" : "type-2159", + "return_type" : "type-77", +- "self_type" : "type-2163", ++ "self_type" : "type-2159", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -5931,9 +6147,9 @@ + "referenced_type" : "type-188" + } + ], +- "referenced_type" : "type-2157", ++ "referenced_type" : "type-2153", + "return_type" : "type-77", +- "self_type" : "type-2157", ++ "self_type" : "type-2153", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -5949,9 +6165,9 @@ + "referenced_type" : "type-41" + } + ], +- "referenced_type" : "type-3398", ++ "referenced_type" : "type-3392", + "return_type" : "type-77", +- "self_type" : "type-3398", ++ "self_type" : "type-3392", + "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h" + } + ], +@@ -5964,7 +6180,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-540" ++ "referenced_type" : "type-539" + } + ], + "return_type" : "type-77", +@@ -5977,13 +6193,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-449" ++ "referenced_type" : "type-448" + }, + { +- "referenced_type" : "type-2254" ++ "referenced_type" : "type-2250" + } + ], +- "return_type" : "type-3657", ++ "return_type" : "type-3651", + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, + { +@@ -5993,44 +6209,12 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-742" ++ "referenced_type" : "type-740" + } + ], + "return_type" : "type-77", + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +- { +- "function_name" : "android::sp::operator=", +- "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-436" +- }, +- { +- "referenced_type" : "type-437" +- } +- ], +- "return_type" : "type-439", +- "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" +- }, +- { +- "function_name" : "android::sp::operator=", +- "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-436" +- }, +- { +- "referenced_type" : "type-2140" +- } +- ], +- "return_type" : "type-439", +- "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" +- }, + { + "function_name" : "android::wp::operator=", + "linker_set_key" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_", +@@ -6038,13 +6222,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2193" ++ "referenced_type" : "type-2189" + }, + { +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2136" + } + ], +- "return_type" : "type-3571", ++ "return_type" : "type-3565", + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, + { +@@ -6076,7 +6260,7 @@ + "referenced_type" : "type-301" + }, + { +- "referenced_type" : "type-2561" ++ "referenced_type" : "type-2556" + } + ], + "return_type" : "type-120", +@@ -6092,7 +6276,7 @@ + "referenced_type" : "type-301" + }, + { +- "referenced_type" : "type-2562" ++ "referenced_type" : "type-2557" + } + ], + "return_type" : "type-120", +@@ -6124,7 +6308,7 @@ + "referenced_type" : "type-301" + }, + { +- "referenced_type" : "type-2563" ++ "referenced_type" : "type-2558" + } + ], + "return_type" : "type-120", +@@ -6140,7 +6324,7 @@ + "referenced_type" : "type-301" + }, + { +- "referenced_type" : "type-2564" ++ "referenced_type" : "type-2559" + } + ], + "return_type" : "type-120", +@@ -6198,7 +6382,7 @@ + "referenced_type" : "type-32" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + } + ], + "return_type" : "type-120", +@@ -6210,14 +6394,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-757", ++ "return_type" : "type-755", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6228,10 +6412,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2063" ++ "referenced_type" : "type-2059" + }, + { +- "referenced_type" : "type-2567" ++ "referenced_type" : "type-2562" + } + ], + "return_type" : "type-120", +@@ -6244,10 +6428,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2063" ++ "referenced_type" : "type-2059" + }, + { +- "referenced_type" : "type-411" ++ "referenced_type" : "type-410" + } + ], + "return_type" : "type-77", +@@ -6260,10 +6444,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2063" ++ "referenced_type" : "type-2059" + }, + { +- "referenced_type" : "type-411" ++ "referenced_type" : "type-410" + } + ], + "return_type" : "type-77", +@@ -6278,13 +6462,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-2093" ++ "referenced_type" : "type-2089" + }, + { +- "referenced_type" : "type-2094" ++ "referenced_type" : "type-2090" + }, + { +- "referenced_type" : "type-2570" ++ "referenced_type" : "type-2565" + } + ], + "return_type" : "type-14", +@@ -6303,10 +6487,10 @@ + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-2093" ++ "referenced_type" : "type-2089" + }, + { +- "referenced_type" : "type-2094" ++ "referenced_type" : "type-2090" + }, + { + "default_arg" : true, +@@ -6314,7 +6498,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-2571" ++ "referenced_type" : "type-2566" + } + ], + "return_type" : "type-14", +@@ -6329,13 +6513,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-2093" ++ "referenced_type" : "type-2089" + }, + { +- "referenced_type" : "type-2094" ++ "referenced_type" : "type-2090" + }, + { +- "referenced_type" : "type-2572" ++ "referenced_type" : "type-2567" + } + ], + "return_type" : "type-14", +@@ -6352,7 +6536,7 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-2573" ++ "referenced_type" : "type-2568" + } + ], + "return_type" : "type-120", +@@ -6367,13 +6551,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-2093" ++ "referenced_type" : "type-2089" + }, + { +- "referenced_type" : "type-2094" ++ "referenced_type" : "type-2090" + }, + { +- "referenced_type" : "type-2574" ++ "referenced_type" : "type-2569" + } + ], + "return_type" : "type-14", +@@ -6388,13 +6572,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-2093" ++ "referenced_type" : "type-2089" + }, + { +- "referenced_type" : "type-2094" ++ "referenced_type" : "type-2090" + }, + { +- "referenced_type" : "type-2575" ++ "referenced_type" : "type-2570" + } + ], + "return_type" : "type-14", +@@ -6409,13 +6593,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-2093" ++ "referenced_type" : "type-2089" + }, + { +- "referenced_type" : "type-2094" ++ "referenced_type" : "type-2090" + }, + { +- "referenced_type" : "type-2576" ++ "referenced_type" : "type-2571" + } + ], + "return_type" : "type-14", +@@ -6430,13 +6614,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-2093" ++ "referenced_type" : "type-2089" + }, + { +- "referenced_type" : "type-2094" ++ "referenced_type" : "type-2090" + }, + { +- "referenced_type" : "type-2577" ++ "referenced_type" : "type-2572" + } + ], + "return_type" : "type-14", +@@ -6451,13 +6635,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-2093" ++ "referenced_type" : "type-2089" + }, + { +- "referenced_type" : "type-2094" ++ "referenced_type" : "type-2090" + }, + { +- "referenced_type" : "type-2578" ++ "referenced_type" : "type-2573" + } + ], + "return_type" : "type-14", +@@ -6487,7 +6671,7 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + } + ], + "return_type" : "type-77", +@@ -6503,13 +6687,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + }, + { +- "referenced_type" : "type-2090" ++ "referenced_type" : "type-2086" + }, + { +- "referenced_type" : "type-2090" ++ "referenced_type" : "type-2086" + } + ], + "return_type" : "type-77", +@@ -6525,7 +6709,7 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + } + ], + "return_type" : "type-77", +@@ -6541,13 +6725,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + }, + { +- "referenced_type" : "type-2090" ++ "referenced_type" : "type-2086" + }, + { +- "referenced_type" : "type-2090" ++ "referenced_type" : "type-2086" + } + ], + "return_type" : "type-77", +@@ -6598,10 +6782,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2066" ++ "referenced_type" : "type-2062" + }, + { +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + } + ], + "return_type" : "type-120", +@@ -6613,16 +6797,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2066" ++ "referenced_type" : "type-2062" + }, + { +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + }, + { + "referenced_type" : "type-32" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + } + ], + "return_type" : "type-120", +@@ -6635,7 +6819,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + }, + { + "referenced_type" : "type-79" +@@ -6654,10 +6838,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + }, + { +- "referenced_type" : "type-2579" ++ "referenced_type" : "type-2574" + } + ], + "return_type" : "type-120", +@@ -6670,10 +6854,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + }, + { +- "referenced_type" : "type-2580" ++ "referenced_type" : "type-2575" + } + ], + "return_type" : "type-120", +@@ -6686,7 +6870,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + }, + { + "referenced_type" : "type-79" +@@ -6702,10 +6886,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + }, + { +- "referenced_type" : "type-2581" ++ "referenced_type" : "type-2576" + } + ], + "return_type" : "type-120", +@@ -6717,13 +6901,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2066" ++ "referenced_type" : "type-2062" + }, + { +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + }, + { +- "referenced_type" : "type-2582" ++ "referenced_type" : "type-2577" + } + ], + "return_type" : "type-120", +@@ -6735,13 +6919,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2066" ++ "referenced_type" : "type-2062" + }, + { +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + }, + { +- "referenced_type" : "type-2583" ++ "referenced_type" : "type-2578" + } + ], + "return_type" : "type-120", +@@ -6754,10 +6938,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + }, + { +- "referenced_type" : "type-2584" ++ "referenced_type" : "type-2579" + } + ], + "return_type" : "type-120", +@@ -6769,13 +6953,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2066" ++ "referenced_type" : "type-2062" + }, + { +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + }, + { +- "referenced_type" : "type-2585" ++ "referenced_type" : "type-2580" + } + ], + "return_type" : "type-120", +@@ -6788,7 +6972,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + } + ], + "return_type" : "type-120", +@@ -6801,7 +6985,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + } + ], + "return_type" : "type-120", +@@ -6813,13 +6997,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2066" ++ "referenced_type" : "type-2062" + }, + { +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + }, + { +- "referenced_type" : "type-2586" ++ "referenced_type" : "type-2581" + } + ], + "return_type" : "type-120", +@@ -6831,10 +7015,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2066" ++ "referenced_type" : "type-2062" + }, + { +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + } + ], + "return_type" : "type-120", +@@ -6846,10 +7030,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2066" ++ "referenced_type" : "type-2062" + }, + { +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + } + ], + "return_type" : "type-120", +@@ -6862,7 +7046,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + } + ], + "return_type" : "type-120", +@@ -6875,13 +7059,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + }, + { + "referenced_type" : "type-32" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + } + ], + "return_type" : "type-120", +@@ -6894,10 +7078,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + }, + { +- "referenced_type" : "type-693" ++ "referenced_type" : "type-691" + } + ], + "return_type" : "type-77", +@@ -6910,10 +7094,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-919" ++ "referenced_type" : "type-917" + }, + { +- "referenced_type" : "type-693" ++ "referenced_type" : "type-691" + } + ], + "return_type" : "type-77", +@@ -6926,14 +7110,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1008" ++ "referenced_type" : "type-1006" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-527", ++ "return_type" : "type-526", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -6943,7 +7127,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-528" ++ "referenced_type" : "type-527" + }, + { + "referenced_type" : "type-79" +@@ -6962,10 +7146,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-528" ++ "referenced_type" : "type-527" + }, + { +- "referenced_type" : "type-1414" ++ "referenced_type" : "type-1411" + } + ], + "return_type" : "type-120", +@@ -6978,10 +7162,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-528" ++ "referenced_type" : "type-527" + }, + { +- "referenced_type" : "type-1415" ++ "referenced_type" : "type-1412" + } + ], + "return_type" : "type-120", +@@ -6994,14 +7178,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1008" ++ "referenced_type" : "type-1006" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-527", ++ "return_type" : "type-526", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7011,7 +7195,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-528" ++ "referenced_type" : "type-527" + }, + { + "referenced_type" : "type-79" +@@ -7027,10 +7211,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-528" ++ "referenced_type" : "type-527" + }, + { +- "referenced_type" : "type-1416" ++ "referenced_type" : "type-1413" + } + ], + "return_type" : "type-120", +@@ -7043,11 +7227,11 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-528" ++ "referenced_type" : "type-527" + }, + { + "default_arg" : true, +- "referenced_type" : "type-1008" ++ "referenced_type" : "type-1006" + } + ], + "return_type" : "type-14", +@@ -7060,10 +7244,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-528" ++ "referenced_type" : "type-527" + }, + { +- "referenced_type" : "type-1417" ++ "referenced_type" : "type-1414" + } + ], + "return_type" : "type-120", +@@ -7076,7 +7260,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-528" ++ "referenced_type" : "type-527" + } + ], + "return_type" : "type-120", +@@ -7089,7 +7273,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-528" ++ "referenced_type" : "type-527" + } + ], + "return_type" : "type-120", +@@ -7101,10 +7285,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1008" ++ "referenced_type" : "type-1006" + }, + { +- "referenced_type" : "type-737" ++ "referenced_type" : "type-735" + } + ], + "return_type" : "type-29", +@@ -7117,7 +7301,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-528" ++ "referenced_type" : "type-527" + } + ], + "return_type" : "type-120", +@@ -7130,13 +7314,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-528" ++ "referenced_type" : "type-527" + }, + { + "referenced_type" : "type-32" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + } + ], + "return_type" : "type-120", +@@ -7148,14 +7332,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-944", ++ "return_type" : "type-942", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7164,14 +7348,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-866" ++ "referenced_type" : "type-864" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-944", ++ "return_type" : "type-942", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7182,10 +7366,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-917" ++ "referenced_type" : "type-915" + }, + { +- "referenced_type" : "type-1420" ++ "referenced_type" : "type-1417" + } + ], + "return_type" : "type-120", +@@ -7198,10 +7382,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-917" ++ "referenced_type" : "type-915" + }, + { +- "referenced_type" : "type-530" ++ "referenced_type" : "type-529" + } + ], + "return_type" : "type-77", +@@ -7214,10 +7398,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-917" ++ "referenced_type" : "type-915" + }, + { +- "referenced_type" : "type-530" ++ "referenced_type" : "type-529" + } + ], + "return_type" : "type-77", +@@ -7232,13 +7416,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-1000" ++ "referenced_type" : "type-998" + }, + { +- "referenced_type" : "type-1004" ++ "referenced_type" : "type-1002" + }, + { +- "referenced_type" : "type-1426" ++ "referenced_type" : "type-1423" + } + ], + "return_type" : "type-14", +@@ -7251,16 +7435,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-828" ++ "referenced_type" : "type-826" + }, + { + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-1000" ++ "referenced_type" : "type-998" + }, + { +- "referenced_type" : "type-1004" ++ "referenced_type" : "type-1002" + }, + { + "default_arg" : true, +@@ -7268,7 +7452,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-1427" ++ "referenced_type" : "type-1424" + } + ], + "return_type" : "type-14", +@@ -7282,10 +7466,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-828" ++ "referenced_type" : "type-826" + }, + { +- "referenced_type" : "type-1428" ++ "referenced_type" : "type-1425" + } + ], + "return_type" : "type-120", +@@ -7300,13 +7484,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-1000" ++ "referenced_type" : "type-998" + }, + { +- "referenced_type" : "type-1004" ++ "referenced_type" : "type-1002" + }, + { +- "referenced_type" : "type-1429" ++ "referenced_type" : "type-1426" + } + ], + "return_type" : "type-14", +@@ -7321,13 +7505,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-1000" ++ "referenced_type" : "type-998" + }, + { +- "referenced_type" : "type-1004" ++ "referenced_type" : "type-1002" + }, + { +- "referenced_type" : "type-1430" ++ "referenced_type" : "type-1427" + } + ], + "return_type" : "type-14", +@@ -7342,13 +7526,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-1000" ++ "referenced_type" : "type-998" + }, + { +- "referenced_type" : "type-1004" ++ "referenced_type" : "type-1002" + }, + { +- "referenced_type" : "type-1431" ++ "referenced_type" : "type-1428" + } + ], + "return_type" : "type-14", +@@ -7363,13 +7547,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-1000" ++ "referenced_type" : "type-998" + }, + { +- "referenced_type" : "type-1004" ++ "referenced_type" : "type-1002" + }, + { +- "referenced_type" : "type-1432" ++ "referenced_type" : "type-1429" + } + ], + "return_type" : "type-14", +@@ -7384,13 +7568,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-1000" ++ "referenced_type" : "type-998" + }, + { +- "referenced_type" : "type-1004" ++ "referenced_type" : "type-1002" + }, + { +- "referenced_type" : "type-1433" ++ "referenced_type" : "type-1430" + } + ], + "return_type" : "type-14", +@@ -7404,7 +7588,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-828" ++ "referenced_type" : "type-826" + } + ], + "return_type" : "type-120", +@@ -7419,13 +7603,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-1000" ++ "referenced_type" : "type-998" + }, + { +- "referenced_type" : "type-1004" ++ "referenced_type" : "type-1002" + }, + { +- "referenced_type" : "type-1434" ++ "referenced_type" : "type-1431" + } + ], + "return_type" : "type-14", +@@ -7440,13 +7624,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-1000" ++ "referenced_type" : "type-998" + }, + { +- "referenced_type" : "type-1004" ++ "referenced_type" : "type-1002" + }, + { +- "referenced_type" : "type-1435" ++ "referenced_type" : "type-1432" + } + ], + "return_type" : "type-14", +@@ -7459,10 +7643,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-828" ++ "referenced_type" : "type-826" + }, + { +- "referenced_type" : "type-866" ++ "referenced_type" : "type-864" + } + ], + "return_type" : "type-77", +@@ -7475,10 +7659,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-828" ++ "referenced_type" : "type-826" + }, + { +- "referenced_type" : "type-866" ++ "referenced_type" : "type-864" + } + ], + "return_type" : "type-77", +@@ -7491,7 +7675,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-828" ++ "referenced_type" : "type-826" + } + ], + "return_type" : "type-77", +@@ -7504,7 +7688,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-828" ++ "referenced_type" : "type-826" + } + ], + "return_type" : "type-77", +@@ -7517,7 +7701,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-828" ++ "referenced_type" : "type-826" + } + ], + "return_type" : "type-77", +@@ -7529,13 +7713,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-928" ++ "referenced_type" : "type-925" + }, + { +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + }, + { +- "referenced_type" : "type-1436" ++ "referenced_type" : "type-1433" + } + ], + "return_type" : "type-120", +@@ -7548,7 +7732,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-918" ++ "referenced_type" : "type-916" + }, + { + "referenced_type" : "type-79" +@@ -7567,10 +7751,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-918" ++ "referenced_type" : "type-916" + }, + { +- "referenced_type" : "type-1437" ++ "referenced_type" : "type-1434" + } + ], + "return_type" : "type-120", +@@ -7583,10 +7767,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-918" ++ "referenced_type" : "type-916" + }, + { +- "referenced_type" : "type-1438" ++ "referenced_type" : "type-1435" + } + ], + "return_type" : "type-120", +@@ -7599,7 +7783,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-918" ++ "referenced_type" : "type-916" + }, + { + "referenced_type" : "type-48" +@@ -7608,7 +7792,7 @@ + "referenced_type" : "type-48" + } + ], +- "return_type" : "type-764", ++ "return_type" : "type-762", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7618,7 +7802,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-918" ++ "referenced_type" : "type-916" + }, + { + "referenced_type" : "type-79" +@@ -7634,10 +7818,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-918" ++ "referenced_type" : "type-916" + }, + { +- "referenced_type" : "type-1439" ++ "referenced_type" : "type-1436" + } + ], + "return_type" : "type-120", +@@ -7649,13 +7833,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-928" ++ "referenced_type" : "type-925" + }, + { +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + }, + { +- "referenced_type" : "type-1440" ++ "referenced_type" : "type-1437" + } + ], + "return_type" : "type-120", +@@ -7668,13 +7852,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-918" ++ "referenced_type" : "type-916" + }, + { + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-1441" ++ "referenced_type" : "type-1438" + } + ], + "return_type" : "type-120", +@@ -7686,10 +7870,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-928" ++ "referenced_type" : "type-925" + }, + { +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + }, + { + "referenced_type" : "type-48" +@@ -7698,7 +7882,7 @@ + "referenced_type" : "type-48" + } + ], +- "return_type" : "type-764", ++ "return_type" : "type-762", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7708,10 +7892,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-918" ++ "referenced_type" : "type-916" + }, + { +- "referenced_type" : "type-1442" ++ "referenced_type" : "type-1439" + } + ], + "return_type" : "type-120", +@@ -7723,16 +7907,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-928" ++ "referenced_type" : "type-925" + }, + { +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + }, + { + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-1443" ++ "referenced_type" : "type-1440" + } + ], + "return_type" : "type-120", +@@ -7745,7 +7929,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-918" ++ "referenced_type" : "type-916" + } + ], + "return_type" : "type-120", +@@ -7758,7 +7942,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-918" ++ "referenced_type" : "type-916" + } + ], + "return_type" : "type-120", +@@ -7771,7 +7955,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-918" ++ "referenced_type" : "type-916" + }, + { + "referenced_type" : "type-48" +@@ -7780,7 +7964,7 @@ + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-737" ++ "referenced_type" : "type-735" + } + ], + "return_type" : "type-250", +@@ -7793,7 +7977,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-918" ++ "referenced_type" : "type-916" + }, + { + "referenced_type" : "type-48" +@@ -7811,10 +7995,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-928" ++ "referenced_type" : "type-925" + }, + { +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + }, + { + "referenced_type" : "type-48" +@@ -7823,7 +8007,7 @@ + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-737" ++ "referenced_type" : "type-735" + } + ], + "return_type" : "type-250", +@@ -7835,10 +8019,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-928" ++ "referenced_type" : "type-925" + }, + { +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + }, + { + "referenced_type" : "type-48" +@@ -7857,13 +8041,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-918" ++ "referenced_type" : "type-916" + }, + { + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + } + ], + "return_type" : "type-250", +@@ -7876,7 +8060,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-918" ++ "referenced_type" : "type-916" + }, + { + "referenced_type" : "type-48" +@@ -7885,7 +8069,7 @@ + "referenced_type" : "type-48" + } + ], +- "return_type" : "type-757", ++ "return_type" : "type-755", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7895,10 +8079,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-918" ++ "referenced_type" : "type-916" + }, + { +- "referenced_type" : "type-1444" ++ "referenced_type" : "type-1441" + } + ], + "return_type" : "type-120", +@@ -7911,7 +8095,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-918" ++ "referenced_type" : "type-916" + } + ], + "return_type" : "type-120", +@@ -7924,13 +8108,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-918" ++ "referenced_type" : "type-916" + }, + { + "referenced_type" : "type-32" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + } + ], + "return_type" : "type-120", +@@ -7942,16 +8126,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-928" ++ "referenced_type" : "type-925" + }, + { +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + }, + { + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + } + ], + "return_type" : "type-250", +@@ -7963,10 +8147,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-928" ++ "referenced_type" : "type-925" + }, + { +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + }, + { + "referenced_type" : "type-48" +@@ -7975,7 +8159,7 @@ + "referenced_type" : "type-48" + } + ], +- "return_type" : "type-757", ++ "return_type" : "type-755", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7985,10 +8169,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-918" ++ "referenced_type" : "type-916" + }, + { +- "referenced_type" : "type-1445" ++ "referenced_type" : "type-1442" + } + ], + "return_type" : "type-120", +@@ -8001,10 +8185,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-918" ++ "referenced_type" : "type-916" + }, + { +- "referenced_type" : "type-693" ++ "referenced_type" : "type-691" + } + ], + "return_type" : "type-77", +@@ -8017,10 +8201,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-918" ++ "referenced_type" : "type-916" + }, + { +- "referenced_type" : "type-693" ++ "referenced_type" : "type-691" + } + ], + "return_type" : "type-77", +@@ -8033,14 +8217,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1073" ++ "referenced_type" : "type-1071" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-543", ++ "return_type" : "type-542", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8050,7 +8234,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-544" ++ "referenced_type" : "type-543" + }, + { + "referenced_type" : "type-79" +@@ -8069,10 +8253,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-544" ++ "referenced_type" : "type-543" + }, + { +- "referenced_type" : "type-1446" ++ "referenced_type" : "type-1443" + } + ], + "return_type" : "type-120", +@@ -8085,10 +8269,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-544" ++ "referenced_type" : "type-543" + }, + { +- "referenced_type" : "type-1447" ++ "referenced_type" : "type-1444" + } + ], + "return_type" : "type-120", +@@ -8101,14 +8285,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1073" ++ "referenced_type" : "type-1071" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-543", ++ "return_type" : "type-542", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8118,7 +8302,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-544" ++ "referenced_type" : "type-543" + }, + { + "referenced_type" : "type-79" +@@ -8134,10 +8318,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-544" ++ "referenced_type" : "type-543" + }, + { +- "referenced_type" : "type-1448" ++ "referenced_type" : "type-1445" + } + ], + "return_type" : "type-120", +@@ -8150,11 +8334,11 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-544" ++ "referenced_type" : "type-543" + }, + { + "default_arg" : true, +- "referenced_type" : "type-1073" ++ "referenced_type" : "type-1071" + } + ], + "return_type" : "type-14", +@@ -8167,10 +8351,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-544" ++ "referenced_type" : "type-543" + }, + { +- "referenced_type" : "type-1449" ++ "referenced_type" : "type-1446" + } + ], + "return_type" : "type-120", +@@ -8183,7 +8367,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-544" ++ "referenced_type" : "type-543" + } + ], + "return_type" : "type-120", +@@ -8196,7 +8380,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-544" ++ "referenced_type" : "type-543" + } + ], + "return_type" : "type-120", +@@ -8208,10 +8392,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1073" ++ "referenced_type" : "type-1071" + }, + { +- "referenced_type" : "type-737" ++ "referenced_type" : "type-735" + } + ], + "return_type" : "type-29", +@@ -8224,7 +8408,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-544" ++ "referenced_type" : "type-543" + } + ], + "return_type" : "type-120", +@@ -8237,13 +8421,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-544" ++ "referenced_type" : "type-543" + }, + { + "referenced_type" : "type-32" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + } + ], + "return_type" : "type-120", +@@ -8255,14 +8439,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-1053", ++ "return_type" : "type-1051", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8271,14 +8455,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-737" ++ "referenced_type" : "type-735" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-1053", ++ "return_type" : "type-1051", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8289,10 +8473,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1045" ++ "referenced_type" : "type-1043" + }, + { +- "referenced_type" : "type-1452" ++ "referenced_type" : "type-1449" + } + ], + "return_type" : "type-120", +@@ -8305,10 +8489,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1045" ++ "referenced_type" : "type-1043" + }, + { +- "referenced_type" : "type-546" ++ "referenced_type" : "type-545" + } + ], + "return_type" : "type-77", +@@ -8321,10 +8505,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1045" ++ "referenced_type" : "type-1043" + }, + { +- "referenced_type" : "type-546" ++ "referenced_type" : "type-545" + } + ], + "return_type" : "type-77", +@@ -8336,10 +8520,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1033" ++ "referenced_type" : "type-1031" + }, + { +- "referenced_type" : "type-1004" ++ "referenced_type" : "type-1002" + }, + { + "referenced_type" : "type-16" +@@ -8357,10 +8541,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1033" ++ "referenced_type" : "type-1031" + }, + { +- "referenced_type" : "type-1000" ++ "referenced_type" : "type-998" + }, + { + "referenced_type" : "type-16" +@@ -8379,16 +8563,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-820" ++ "referenced_type" : "type-818" + }, + { + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-1086" ++ "referenced_type" : "type-1084" + }, + { +- "referenced_type" : "type-1087" ++ "referenced_type" : "type-1085" + }, + { + "default_arg" : true, +@@ -8396,7 +8580,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-1455" ++ "referenced_type" : "type-1452" + } + ], + "return_type" : "type-14", +@@ -8410,10 +8594,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-820" ++ "referenced_type" : "type-818" + }, + { +- "referenced_type" : "type-1456" ++ "referenced_type" : "type-1453" + } + ], + "return_type" : "type-120", +@@ -8428,13 +8612,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-1086" ++ "referenced_type" : "type-1084" + }, + { +- "referenced_type" : "type-1087" ++ "referenced_type" : "type-1085" + }, + { +- "referenced_type" : "type-1457" ++ "referenced_type" : "type-1454" + } + ], + "return_type" : "type-14", +@@ -8448,7 +8632,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-820" ++ "referenced_type" : "type-818" + } + ], + "return_type" : "type-120", +@@ -8461,10 +8645,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-820" ++ "referenced_type" : "type-818" + }, + { +- "referenced_type" : "type-737" ++ "referenced_type" : "type-735" + } + ], + "return_type" : "type-77", +@@ -8477,10 +8661,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-820" ++ "referenced_type" : "type-818" + }, + { +- "referenced_type" : "type-737" ++ "referenced_type" : "type-735" + } + ], + "return_type" : "type-77", +@@ -8493,7 +8677,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-820" ++ "referenced_type" : "type-818" + } + ], + "return_type" : "type-77", +@@ -8506,7 +8690,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-820" ++ "referenced_type" : "type-818" + } + ], + "return_type" : "type-77", +@@ -8519,7 +8703,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-820" ++ "referenced_type" : "type-818" + } + ], + "return_type" : "type-77", +@@ -8532,7 +8716,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-937" ++ "referenced_type" : "type-934" + }, + { + "referenced_type" : "type-79" +@@ -8551,10 +8735,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-937" ++ "referenced_type" : "type-934" + }, + { +- "referenced_type" : "type-1458" ++ "referenced_type" : "type-1455" + } + ], + "return_type" : "type-120", +@@ -8567,10 +8751,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-937" ++ "referenced_type" : "type-934" + }, + { +- "referenced_type" : "type-1459" ++ "referenced_type" : "type-1456" + } + ], + "return_type" : "type-120", +@@ -8583,7 +8767,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-937" ++ "referenced_type" : "type-934" + }, + { + "referenced_type" : "type-79" +@@ -8599,10 +8783,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-937" ++ "referenced_type" : "type-934" + }, + { +- "referenced_type" : "type-1460" ++ "referenced_type" : "type-1457" + } + ], + "return_type" : "type-120", +@@ -8615,7 +8799,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-937" ++ "referenced_type" : "type-934" + }, + { + "referenced_type" : "type-48" +@@ -8637,10 +8821,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-937" ++ "referenced_type" : "type-934" + }, + { +- "referenced_type" : "type-1461" ++ "referenced_type" : "type-1458" + } + ], + "return_type" : "type-120", +@@ -8652,10 +8836,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1048" ++ "referenced_type" : "type-1046" + }, + { +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + }, + { + "referenced_type" : "type-48" +@@ -8677,7 +8861,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-937" ++ "referenced_type" : "type-934" + } + ], + "return_type" : "type-120", +@@ -8690,7 +8874,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-937" ++ "referenced_type" : "type-934" + } + ], + "return_type" : "type-120", +@@ -8703,7 +8887,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-937" ++ "referenced_type" : "type-934" + } + ], + "return_type" : "type-120", +@@ -8716,13 +8900,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-937" ++ "referenced_type" : "type-934" + }, + { + "referenced_type" : "type-32" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + } + ], + "return_type" : "type-120", +@@ -8735,10 +8919,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-937" ++ "referenced_type" : "type-934" + }, + { +- "referenced_type" : "type-693" ++ "referenced_type" : "type-691" + } + ], + "return_type" : "type-77", +@@ -8751,10 +8935,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-937" ++ "referenced_type" : "type-934" + }, + { +- "referenced_type" : "type-693" ++ "referenced_type" : "type-691" + } + ], + "return_type" : "type-77", +@@ -8767,14 +8951,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1131" ++ "referenced_type" : "type-1129" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-532", ++ "return_type" : "type-531", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8784,7 +8968,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-533" ++ "referenced_type" : "type-532" + }, + { + "referenced_type" : "type-79" +@@ -8803,10 +8987,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-533" ++ "referenced_type" : "type-532" + }, + { +- "referenced_type" : "type-1462" ++ "referenced_type" : "type-1459" + } + ], + "return_type" : "type-120", +@@ -8819,10 +9003,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-533" ++ "referenced_type" : "type-532" + }, + { +- "referenced_type" : "type-1463" ++ "referenced_type" : "type-1460" + } + ], + "return_type" : "type-120", +@@ -8835,14 +9019,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1131" ++ "referenced_type" : "type-1129" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-532", ++ "return_type" : "type-531", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8852,7 +9036,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-533" ++ "referenced_type" : "type-532" + }, + { + "referenced_type" : "type-79" +@@ -8868,10 +9052,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-533" ++ "referenced_type" : "type-532" + }, + { +- "referenced_type" : "type-1464" ++ "referenced_type" : "type-1461" + } + ], + "return_type" : "type-120", +@@ -8884,11 +9068,11 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-533" ++ "referenced_type" : "type-532" + }, + { + "default_arg" : true, +- "referenced_type" : "type-1131" ++ "referenced_type" : "type-1129" + } + ], + "return_type" : "type-14", +@@ -8901,10 +9085,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-533" ++ "referenced_type" : "type-532" + }, + { +- "referenced_type" : "type-1465" ++ "referenced_type" : "type-1462" + } + ], + "return_type" : "type-120", +@@ -8917,7 +9101,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-533" ++ "referenced_type" : "type-532" + } + ], + "return_type" : "type-120", +@@ -8930,7 +9114,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-533" ++ "referenced_type" : "type-532" + } + ], + "return_type" : "type-120", +@@ -8942,10 +9126,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1131" ++ "referenced_type" : "type-1129" + }, + { +- "referenced_type" : "type-737" ++ "referenced_type" : "type-735" + } + ], + "return_type" : "type-29", +@@ -8958,7 +9142,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-533" ++ "referenced_type" : "type-532" + } + ], + "return_type" : "type-120", +@@ -8971,13 +9155,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-533" ++ "referenced_type" : "type-532" + }, + { + "referenced_type" : "type-32" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + } + ], + "return_type" : "type-120", +@@ -8989,14 +9173,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-1110", ++ "return_type" : "type-1108", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -9005,14 +9189,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-866" ++ "referenced_type" : "type-864" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-1110", ++ "return_type" : "type-1108", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -9021,14 +9205,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-717" ++ "referenced_type" : "type-715" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-1110", ++ "return_type" : "type-1108", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -9039,10 +9223,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1099" ++ "referenced_type" : "type-1097" + }, + { +- "referenced_type" : "type-1468" ++ "referenced_type" : "type-1465" + } + ], + "return_type" : "type-120", +@@ -9055,10 +9239,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1099" ++ "referenced_type" : "type-1097" + }, + { +- "referenced_type" : "type-535" ++ "referenced_type" : "type-534" + } + ], + "return_type" : "type-77", +@@ -9071,10 +9255,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1099" ++ "referenced_type" : "type-1097" + }, + { +- "referenced_type" : "type-535" ++ "referenced_type" : "type-534" + } + ], + "return_type" : "type-77", +@@ -9087,16 +9271,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-837" ++ "referenced_type" : "type-835" + }, + { + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-1144" ++ "referenced_type" : "type-1142" + }, + { +- "referenced_type" : "type-1145" ++ "referenced_type" : "type-1143" + }, + { + "default_arg" : true, +@@ -9104,7 +9288,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-1474" ++ "referenced_type" : "type-1471" + } + ], + "return_type" : "type-14", +@@ -9118,10 +9302,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-837" ++ "referenced_type" : "type-835" + }, + { +- "referenced_type" : "type-1475" ++ "referenced_type" : "type-1472" + } + ], + "return_type" : "type-120", +@@ -9136,13 +9320,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-1144" ++ "referenced_type" : "type-1142" + }, + { +- "referenced_type" : "type-1145" ++ "referenced_type" : "type-1143" + }, + { +- "referenced_type" : "type-1476" ++ "referenced_type" : "type-1473" + } + ], + "return_type" : "type-14", +@@ -9156,7 +9340,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-837" ++ "referenced_type" : "type-835" + } + ], + "return_type" : "type-120", +@@ -9169,10 +9353,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-837" ++ "referenced_type" : "type-835" + }, + { +- "referenced_type" : "type-717" ++ "referenced_type" : "type-715" + } + ], + "return_type" : "type-77", +@@ -9185,10 +9369,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-837" ++ "referenced_type" : "type-835" + }, + { +- "referenced_type" : "type-717" ++ "referenced_type" : "type-715" + } + ], + "return_type" : "type-77", +@@ -9201,7 +9385,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-837" ++ "referenced_type" : "type-835" + } + ], + "return_type" : "type-77", +@@ -9214,7 +9398,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-837" ++ "referenced_type" : "type-835" + } + ], + "return_type" : "type-77", +@@ -9227,7 +9411,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-837" ++ "referenced_type" : "type-835" + } + ], + "return_type" : "type-77", +@@ -9240,7 +9424,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1100" ++ "referenced_type" : "type-1098" + }, + { + "referenced_type" : "type-79" +@@ -9259,10 +9443,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1100" ++ "referenced_type" : "type-1098" + }, + { +- "referenced_type" : "type-1477" ++ "referenced_type" : "type-1474" + } + ], + "return_type" : "type-120", +@@ -9275,10 +9459,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1100" ++ "referenced_type" : "type-1098" + }, + { +- "referenced_type" : "type-1478" ++ "referenced_type" : "type-1475" + } + ], + "return_type" : "type-120", +@@ -9291,7 +9475,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1100" ++ "referenced_type" : "type-1098" + }, + { + "referenced_type" : "type-48" +@@ -9300,7 +9484,7 @@ + "referenced_type" : "type-48" + } + ], +- "return_type" : "type-764", ++ "return_type" : "type-762", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9310,7 +9494,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1100" ++ "referenced_type" : "type-1098" + }, + { + "referenced_type" : "type-79" +@@ -9326,10 +9510,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1100" ++ "referenced_type" : "type-1098" + }, + { +- "referenced_type" : "type-1479" ++ "referenced_type" : "type-1476" + } + ], + "return_type" : "type-120", +@@ -9342,13 +9526,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1100" ++ "referenced_type" : "type-1098" + }, + { + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-1480" ++ "referenced_type" : "type-1477" + } + ], + "return_type" : "type-120", +@@ -9361,10 +9545,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1100" ++ "referenced_type" : "type-1098" + }, + { +- "referenced_type" : "type-1481" ++ "referenced_type" : "type-1478" + } + ], + "return_type" : "type-120", +@@ -9377,7 +9561,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1100" ++ "referenced_type" : "type-1098" + } + ], + "return_type" : "type-120", +@@ -9390,7 +9574,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1100" ++ "referenced_type" : "type-1098" + } + ], + "return_type" : "type-120", +@@ -9403,7 +9587,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1100" ++ "referenced_type" : "type-1098" + }, + { + "referenced_type" : "type-48" +@@ -9412,7 +9596,7 @@ + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-737" ++ "referenced_type" : "type-735" + } + ], + "return_type" : "type-250", +@@ -9425,7 +9609,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1100" ++ "referenced_type" : "type-1098" + }, + { + "referenced_type" : "type-48" +@@ -9444,7 +9628,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1100" ++ "referenced_type" : "type-1098" + }, + { + "referenced_type" : "type-48" +@@ -9453,7 +9637,7 @@ + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-737" ++ "referenced_type" : "type-735" + } + ], + "return_type" : "type-250", +@@ -9465,10 +9649,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1103" ++ "referenced_type" : "type-1101" + }, + { +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + }, + { + "referenced_type" : "type-48" +@@ -9477,7 +9661,7 @@ + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-737" ++ "referenced_type" : "type-735" + } + ], + "return_type" : "type-250", +@@ -9490,13 +9674,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1100" ++ "referenced_type" : "type-1098" + }, + { + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + } + ], + "return_type" : "type-250", +@@ -9509,7 +9693,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1100" ++ "referenced_type" : "type-1098" + }, + { + "referenced_type" : "type-48" +@@ -9518,7 +9702,7 @@ + "referenced_type" : "type-48" + } + ], +- "return_type" : "type-757", ++ "return_type" : "type-755", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9528,10 +9712,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1100" ++ "referenced_type" : "type-1098" + }, + { +- "referenced_type" : "type-1482" ++ "referenced_type" : "type-1479" + } + ], + "return_type" : "type-120", +@@ -9544,7 +9728,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1100" ++ "referenced_type" : "type-1098" + } + ], + "return_type" : "type-120", +@@ -9557,13 +9741,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1100" ++ "referenced_type" : "type-1098" + }, + { + "referenced_type" : "type-32" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + } + ], + "return_type" : "type-120", +@@ -9576,10 +9760,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1100" ++ "referenced_type" : "type-1098" + }, + { +- "referenced_type" : "type-1483" ++ "referenced_type" : "type-1480" + } + ], + "return_type" : "type-120", +@@ -9592,10 +9776,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1100" ++ "referenced_type" : "type-1098" + }, + { +- "referenced_type" : "type-693" ++ "referenced_type" : "type-691" + } + ], + "return_type" : "type-77", +@@ -9608,10 +9792,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1100" ++ "referenced_type" : "type-1098" + }, + { +- "referenced_type" : "type-693" ++ "referenced_type" : "type-691" + } + ], + "return_type" : "type-77", +@@ -9624,14 +9808,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1968" ++ "referenced_type" : "type-1964" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-549", ++ "return_type" : "type-547", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9641,7 +9825,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-550" ++ "referenced_type" : "type-548" + }, + { + "referenced_type" : "type-79" +@@ -9660,10 +9844,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-550" ++ "referenced_type" : "type-548" + }, + { +- "referenced_type" : "type-2587" ++ "referenced_type" : "type-2582" + } + ], + "return_type" : "type-120", +@@ -9676,10 +9860,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-550" ++ "referenced_type" : "type-548" + }, + { +- "referenced_type" : "type-2588" ++ "referenced_type" : "type-2583" + } + ], + "return_type" : "type-120", +@@ -9692,14 +9876,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1968" ++ "referenced_type" : "type-1964" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-549", ++ "return_type" : "type-547", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9709,7 +9893,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-550" ++ "referenced_type" : "type-548" + }, + { + "referenced_type" : "type-79" +@@ -9725,10 +9909,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-550" ++ "referenced_type" : "type-548" + }, + { +- "referenced_type" : "type-2589" ++ "referenced_type" : "type-2584" + } + ], + "return_type" : "type-120", +@@ -9741,11 +9925,11 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-550" ++ "referenced_type" : "type-548" + }, + { + "default_arg" : true, +- "referenced_type" : "type-1968" ++ "referenced_type" : "type-1964" + } + ], + "return_type" : "type-14", +@@ -9758,10 +9942,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-550" ++ "referenced_type" : "type-548" + }, + { +- "referenced_type" : "type-2590" ++ "referenced_type" : "type-2585" + } + ], + "return_type" : "type-120", +@@ -9774,7 +9958,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-550" ++ "referenced_type" : "type-548" + } + ], + "return_type" : "type-120", +@@ -9787,7 +9971,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-550" ++ "referenced_type" : "type-548" + } + ], + "return_type" : "type-120", +@@ -9799,10 +9983,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1968" ++ "referenced_type" : "type-1964" + }, + { +- "referenced_type" : "type-737" ++ "referenced_type" : "type-735" + } + ], + "return_type" : "type-29", +@@ -9815,7 +9999,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-550" ++ "referenced_type" : "type-548" + } + ], + "return_type" : "type-120", +@@ -9828,13 +10012,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-550" ++ "referenced_type" : "type-548" + }, + { + "referenced_type" : "type-32" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + } + ], + "return_type" : "type-120", +@@ -9846,14 +10030,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-1945", ++ "return_type" : "type-1941", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9862,14 +10046,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-741" ++ "referenced_type" : "type-738" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-1945", ++ "return_type" : "type-1941", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9879,14 +10063,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-2044" ++ "referenced_type" : "type-2040" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-538", ++ "return_type" : "type-536", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -9896,7 +10080,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-539" ++ "referenced_type" : "type-537" + }, + { + "referenced_type" : "type-79" +@@ -9915,10 +10099,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-539" ++ "referenced_type" : "type-537" + }, + { +- "referenced_type" : "type-2591" ++ "referenced_type" : "type-2586" + } + ], + "return_type" : "type-120", +@@ -9931,10 +10115,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-539" ++ "referenced_type" : "type-537" + }, + { +- "referenced_type" : "type-2592" ++ "referenced_type" : "type-2587" + } + ], + "return_type" : "type-120", +@@ -9947,14 +10131,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-2044" ++ "referenced_type" : "type-2040" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-538", ++ "return_type" : "type-536", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -9964,7 +10148,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-539" ++ "referenced_type" : "type-537" + }, + { + "referenced_type" : "type-79" +@@ -9980,10 +10164,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-539" ++ "referenced_type" : "type-537" + }, + { +- "referenced_type" : "type-2593" ++ "referenced_type" : "type-2588" + } + ], + "return_type" : "type-120", +@@ -9996,11 +10180,11 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-539" ++ "referenced_type" : "type-537" + }, + { + "default_arg" : true, +- "referenced_type" : "type-2044" ++ "referenced_type" : "type-2040" + } + ], + "return_type" : "type-14", +@@ -10013,10 +10197,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-539" ++ "referenced_type" : "type-537" + }, + { +- "referenced_type" : "type-2594" ++ "referenced_type" : "type-2589" + } + ], + "return_type" : "type-120", +@@ -10029,7 +10213,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-539" ++ "referenced_type" : "type-537" + } + ], + "return_type" : "type-120", +@@ -10042,7 +10226,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-539" ++ "referenced_type" : "type-537" + } + ], + "return_type" : "type-120", +@@ -10054,10 +10238,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2044" ++ "referenced_type" : "type-2040" + }, + { +- "referenced_type" : "type-737" ++ "referenced_type" : "type-735" + } + ], + "return_type" : "type-29", +@@ -10070,7 +10254,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-539" ++ "referenced_type" : "type-537" + } + ], + "return_type" : "type-120", +@@ -10083,13 +10267,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-539" ++ "referenced_type" : "type-537" + }, + { + "referenced_type" : "type-32" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + } + ], + "return_type" : "type-120", +@@ -10101,14 +10285,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-2015", ++ "return_type" : "type-2011", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10117,14 +10301,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-866" ++ "referenced_type" : "type-864" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-2015", ++ "return_type" : "type-2011", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10133,14 +10317,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-717" ++ "referenced_type" : "type-715" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-2015", ++ "return_type" : "type-2011", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10149,14 +10333,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-726" ++ "referenced_type" : "type-724" + }, + { + "default_arg" : true, + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-2015", ++ "return_type" : "type-2011", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10167,10 +10351,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1929" ++ "referenced_type" : "type-1925" + }, + { +- "referenced_type" : "type-2597" ++ "referenced_type" : "type-2592" + } + ], + "return_type" : "type-120", +@@ -10183,10 +10367,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1929" ++ "referenced_type" : "type-1925" + }, + { +- "referenced_type" : "type-554" ++ "referenced_type" : "type-553" + } + ], + "return_type" : "type-77", +@@ -10199,10 +10383,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1929" ++ "referenced_type" : "type-1925" + }, + { +- "referenced_type" : "type-554" ++ "referenced_type" : "type-553" + } + ], + "return_type" : "type-77", +@@ -10216,10 +10400,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2004" ++ "referenced_type" : "type-2000" + }, + { +- "referenced_type" : "type-2602" ++ "referenced_type" : "type-2597" + } + ], + "return_type" : "type-120", +@@ -10232,10 +10416,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2004" ++ "referenced_type" : "type-2000" + }, + { +- "referenced_type" : "type-541" ++ "referenced_type" : "type-540" + } + ], + "return_type" : "type-77", +@@ -10248,10 +10432,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2004" ++ "referenced_type" : "type-2000" + }, + { +- "referenced_type" : "type-541" ++ "referenced_type" : "type-540" + } + ], + "return_type" : "type-77", +@@ -10264,16 +10448,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-846" ++ "referenced_type" : "type-843" + }, + { + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-1986" ++ "referenced_type" : "type-1982" + }, + { +- "referenced_type" : "type-1987" ++ "referenced_type" : "type-1983" + }, + { + "default_arg" : true, +@@ -10281,7 +10465,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-2609" ++ "referenced_type" : "type-2604" + } + ], + "return_type" : "type-14", +@@ -10295,10 +10479,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-846" ++ "referenced_type" : "type-843" + }, + { +- "referenced_type" : "type-2610" ++ "referenced_type" : "type-2605" + } + ], + "return_type" : "type-120", +@@ -10313,13 +10497,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-1986" ++ "referenced_type" : "type-1982" + }, + { +- "referenced_type" : "type-1987" ++ "referenced_type" : "type-1983" + }, + { +- "referenced_type" : "type-2611" ++ "referenced_type" : "type-2606" + } + ], + "return_type" : "type-14", +@@ -10333,7 +10517,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-846" ++ "referenced_type" : "type-843" + } + ], + "return_type" : "type-120", +@@ -10346,10 +10530,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-846" ++ "referenced_type" : "type-843" + }, + { +- "referenced_type" : "type-741" ++ "referenced_type" : "type-738" + } + ], + "return_type" : "type-77", +@@ -10362,10 +10546,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-846" ++ "referenced_type" : "type-843" + }, + { +- "referenced_type" : "type-741" ++ "referenced_type" : "type-738" + } + ], + "return_type" : "type-77", +@@ -10378,7 +10562,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-846" ++ "referenced_type" : "type-843" + } + ], + "return_type" : "type-77", +@@ -10391,7 +10575,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-846" ++ "referenced_type" : "type-843" + } + ], + "return_type" : "type-77", +@@ -10404,7 +10588,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-846" ++ "referenced_type" : "type-843" + } + ], + "return_type" : "type-77", +@@ -10417,16 +10601,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-853" ++ "referenced_type" : "type-851" + }, + { + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-2039" ++ "referenced_type" : "type-2035" + }, + { +- "referenced_type" : "type-2040" ++ "referenced_type" : "type-2036" + }, + { + "default_arg" : true, +@@ -10434,7 +10618,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-2612" ++ "referenced_type" : "type-2607" + } + ], + "return_type" : "type-14", +@@ -10448,10 +10632,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-853" ++ "referenced_type" : "type-851" + }, + { +- "referenced_type" : "type-2613" ++ "referenced_type" : "type-2608" + } + ], + "return_type" : "type-120", +@@ -10466,13 +10650,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-2039" ++ "referenced_type" : "type-2035" + }, + { +- "referenced_type" : "type-2040" ++ "referenced_type" : "type-2036" + }, + { +- "referenced_type" : "type-2614" ++ "referenced_type" : "type-2609" + } + ], + "return_type" : "type-14", +@@ -10487,13 +10671,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-2039" ++ "referenced_type" : "type-2035" + }, + { +- "referenced_type" : "type-2040" ++ "referenced_type" : "type-2036" + }, + { +- "referenced_type" : "type-2615" ++ "referenced_type" : "type-2610" + } + ], + "return_type" : "type-14", +@@ -10508,13 +10692,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-2039" ++ "referenced_type" : "type-2035" + }, + { +- "referenced_type" : "type-2040" ++ "referenced_type" : "type-2036" + }, + { +- "referenced_type" : "type-2616" ++ "referenced_type" : "type-2611" + } + ], + "return_type" : "type-14", +@@ -10529,13 +10713,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-2039" ++ "referenced_type" : "type-2035" + }, + { +- "referenced_type" : "type-2040" ++ "referenced_type" : "type-2036" + }, + { +- "referenced_type" : "type-2617" ++ "referenced_type" : "type-2612" + } + ], + "return_type" : "type-14", +@@ -10550,13 +10734,13 @@ + "referenced_type" : "type-304" + }, + { +- "referenced_type" : "type-2039" ++ "referenced_type" : "type-2035" + }, + { +- "referenced_type" : "type-2040" ++ "referenced_type" : "type-2036" + }, + { +- "referenced_type" : "type-2618" ++ "referenced_type" : "type-2613" + } + ], + "return_type" : "type-14", +@@ -10570,7 +10754,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-853" ++ "referenced_type" : "type-851" + } + ], + "return_type" : "type-120", +@@ -10583,10 +10767,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-853" ++ "referenced_type" : "type-851" + }, + { +- "referenced_type" : "type-726" ++ "referenced_type" : "type-724" + } + ], + "return_type" : "type-77", +@@ -10599,10 +10783,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-853" ++ "referenced_type" : "type-851" + }, + { +- "referenced_type" : "type-726" ++ "referenced_type" : "type-724" + } + ], + "return_type" : "type-77", +@@ -10615,7 +10799,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-853" ++ "referenced_type" : "type-851" + } + ], + "return_type" : "type-77", +@@ -10628,7 +10812,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-853" ++ "referenced_type" : "type-851" + } + ], + "return_type" : "type-77", +@@ -10641,7 +10825,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-853" ++ "referenced_type" : "type-851" + } + ], + "return_type" : "type-77", +@@ -10654,7 +10838,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1930" ++ "referenced_type" : "type-1926" + }, + { + "referenced_type" : "type-79" +@@ -10673,10 +10857,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1930" ++ "referenced_type" : "type-1926" + }, + { +- "referenced_type" : "type-2619" ++ "referenced_type" : "type-2614" + } + ], + "return_type" : "type-120", +@@ -10689,10 +10873,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1930" ++ "referenced_type" : "type-1926" + }, + { +- "referenced_type" : "type-2620" ++ "referenced_type" : "type-2615" + } + ], + "return_type" : "type-120", +@@ -10705,7 +10889,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1930" ++ "referenced_type" : "type-1926" + }, + { + "referenced_type" : "type-79" +@@ -10721,10 +10905,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1930" ++ "referenced_type" : "type-1926" + }, + { +- "referenced_type" : "type-2621" ++ "referenced_type" : "type-2616" + } + ], + "return_type" : "type-120", +@@ -10736,13 +10920,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1935" ++ "referenced_type" : "type-1931" + }, + { +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + }, + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + }, + { + "referenced_type" : "type-29" +@@ -10758,10 +10942,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1930" ++ "referenced_type" : "type-1926" + }, + { +- "referenced_type" : "type-2622" ++ "referenced_type" : "type-2617" + } + ], + "return_type" : "type-120", +@@ -10774,7 +10958,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1930" ++ "referenced_type" : "type-1926" + } + ], + "return_type" : "type-120", +@@ -10787,7 +10971,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1930" ++ "referenced_type" : "type-1926" + } + ], + "return_type" : "type-120", +@@ -10800,7 +10984,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1930" ++ "referenced_type" : "type-1926" + } + ], + "return_type" : "type-120", +@@ -10813,13 +10997,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1930" ++ "referenced_type" : "type-1926" + }, + { + "referenced_type" : "type-32" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + } + ], + "return_type" : "type-120", +@@ -10832,10 +11016,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1930" ++ "referenced_type" : "type-1926" + }, + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + }, + { + "referenced_type" : "type-29" +@@ -10851,10 +11035,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1930" ++ "referenced_type" : "type-1926" + }, + { +- "referenced_type" : "type-693" ++ "referenced_type" : "type-691" + } + ], + "return_type" : "type-77", +@@ -10867,10 +11051,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1930" ++ "referenced_type" : "type-1926" + }, + { +- "referenced_type" : "type-693" ++ "referenced_type" : "type-691" + } + ], + "return_type" : "type-77", +@@ -10883,7 +11067,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-732" ++ "referenced_type" : "type-730" + }, + { + "referenced_type" : "type-79" +@@ -10902,16 +11086,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-732" ++ "referenced_type" : "type-730" + }, + { + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + } + ], + "return_type" : "type-250", +@@ -10924,10 +11108,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-732" ++ "referenced_type" : "type-730" + }, + { +- "referenced_type" : "type-2623" ++ "referenced_type" : "type-2618" + } + ], + "return_type" : "type-120", +@@ -10940,10 +11124,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-732" ++ "referenced_type" : "type-730" + }, + { +- "referenced_type" : "type-2624" ++ "referenced_type" : "type-2619" + } + ], + "return_type" : "type-120", +@@ -10956,7 +11140,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-732" ++ "referenced_type" : "type-730" + }, + { + "referenced_type" : "type-48" +@@ -10965,7 +11149,7 @@ + "referenced_type" : "type-48" + } + ], +- "return_type" : "type-764", ++ "return_type" : "type-762", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -10975,7 +11159,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-732" ++ "referenced_type" : "type-730" + }, + { + "referenced_type" : "type-48" +@@ -10984,7 +11168,7 @@ + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + } + ], + "return_type" : "type-250", +@@ -10997,7 +11181,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-732" ++ "referenced_type" : "type-730" + }, + { + "referenced_type" : "type-79" +@@ -11013,10 +11197,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-732" ++ "referenced_type" : "type-730" + }, + { +- "referenced_type" : "type-2625" ++ "referenced_type" : "type-2620" + } + ], + "return_type" : "type-120", +@@ -11029,13 +11213,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-732" ++ "referenced_type" : "type-730" + }, + { + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-2626" ++ "referenced_type" : "type-2621" + } + ], + "return_type" : "type-120", +@@ -11047,19 +11231,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2008" ++ "referenced_type" : "type-2004" + }, + { +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + }, + { + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + } + ], + "return_type" : "type-250", +@@ -11071,10 +11255,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2008" ++ "referenced_type" : "type-2004" + }, + { +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + }, + { + "referenced_type" : "type-48" +@@ -11083,7 +11267,7 @@ + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + } + ], + "return_type" : "type-250", +@@ -11096,10 +11280,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-732" ++ "referenced_type" : "type-730" + }, + { +- "referenced_type" : "type-2627" ++ "referenced_type" : "type-2622" + } + ], + "return_type" : "type-120", +@@ -11112,7 +11296,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-732" ++ "referenced_type" : "type-730" + } + ], + "return_type" : "type-120", +@@ -11125,7 +11309,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-732" ++ "referenced_type" : "type-730" + } + ], + "return_type" : "type-120", +@@ -11138,7 +11322,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-732" ++ "referenced_type" : "type-730" + }, + { + "referenced_type" : "type-48" +@@ -11147,10 +11331,10 @@ + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + }, + { +- "referenced_type" : "type-741" ++ "referenced_type" : "type-738" + } + ], + "return_type" : "type-250", +@@ -11163,13 +11347,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-732" ++ "referenced_type" : "type-730" + }, + { + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-2628" ++ "referenced_type" : "type-2623" + } + ], + "return_type" : "type-120", +@@ -11182,7 +11366,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-732" ++ "referenced_type" : "type-730" + }, + { + "referenced_type" : "type-48" +@@ -11191,7 +11375,7 @@ + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-737" ++ "referenced_type" : "type-735" + } + ], + "return_type" : "type-250", +@@ -11204,13 +11388,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-732" ++ "referenced_type" : "type-730" + }, + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + }, + { +- "referenced_type" : "type-741" ++ "referenced_type" : "type-738" + } + ], + "return_type" : "type-250", +@@ -11223,7 +11407,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-732" ++ "referenced_type" : "type-730" + }, + { + "referenced_type" : "type-48" +@@ -11242,7 +11426,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-732" ++ "referenced_type" : "type-730" + }, + { + "referenced_type" : "type-48" +@@ -11251,7 +11435,7 @@ + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-737" ++ "referenced_type" : "type-735" + } + ], + "return_type" : "type-250", +@@ -11263,10 +11447,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2008" ++ "referenced_type" : "type-2004" + }, + { +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + }, + { + "referenced_type" : "type-48" +@@ -11275,10 +11459,10 @@ + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + }, + { +- "referenced_type" : "type-741" ++ "referenced_type" : "type-738" + } + ], + "return_type" : "type-250", +@@ -11290,16 +11474,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2008" ++ "referenced_type" : "type-2004" + }, + { +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + }, + { + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-2629" ++ "referenced_type" : "type-2624" + } + ], + "return_type" : "type-120", +@@ -11311,16 +11495,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2008" ++ "referenced_type" : "type-2004" + }, + { +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + }, + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + }, + { +- "referenced_type" : "type-741" ++ "referenced_type" : "type-738" + } + ], + "return_type" : "type-250", +@@ -11333,13 +11517,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-732" ++ "referenced_type" : "type-730" + }, + { + "referenced_type" : "type-48" + }, + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + } + ], + "return_type" : "type-250", +@@ -11352,7 +11536,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-732" ++ "referenced_type" : "type-730" + }, + { + "referenced_type" : "type-48" +@@ -11361,7 +11545,7 @@ + "referenced_type" : "type-48" + } + ], +- "return_type" : "type-757", ++ "return_type" : "type-755", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11371,10 +11555,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-732" ++ "referenced_type" : "type-730" + }, + { +- "referenced_type" : "type-2630" ++ "referenced_type" : "type-2625" + } + ], + "return_type" : "type-120", +@@ -11387,7 +11571,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-732" ++ "referenced_type" : "type-730" + } + ], + "return_type" : "type-120", +@@ -11400,13 +11584,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-732" ++ "referenced_type" : "type-730" + }, + { + "referenced_type" : "type-32" + }, + { +- "referenced_type" : "type-1002" ++ "referenced_type" : "type-1000" + } + ], + "return_type" : "type-120", +@@ -11419,10 +11603,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-732" ++ "referenced_type" : "type-730" + }, + { +- "referenced_type" : "type-2631" ++ "referenced_type" : "type-2626" + } + ], + "return_type" : "type-120", +@@ -11435,10 +11619,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-732" ++ "referenced_type" : "type-730" + }, + { +- "referenced_type" : "type-693" ++ "referenced_type" : "type-691" + } + ], + "return_type" : "type-77", +@@ -11451,10 +11635,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-732" ++ "referenced_type" : "type-730" + }, + { +- "referenced_type" : "type-693" ++ "referenced_type" : "type-691" + } + ], + "return_type" : "type-77", +@@ -11468,7 +11652,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2146" ++ "referenced_type" : "type-2142" + } + ], + "return_type" : "type-77", +@@ -11481,10 +11665,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2146" ++ "referenced_type" : "type-2142" + }, + { +- "referenced_type" : "type-2218" ++ "referenced_type" : "type-2214" + }, + { + "default_arg" : true, +@@ -11505,7 +11689,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2146" ++ "referenced_type" : "type-2142" + }, + { + "referenced_type" : "type-78" +@@ -11517,7 +11701,7 @@ + "referenced_type" : "type-188" + }, + { +- "referenced_type" : "type-2156" ++ "referenced_type" : "type-2152" + } + ], + "return_type" : "type-77", +@@ -11530,7 +11714,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2146" ++ "referenced_type" : "type-2142" + }, + { + "referenced_type" : "type-78" +@@ -11546,10 +11730,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2146" ++ "referenced_type" : "type-2142" + } + ], +- "return_type" : "type-2146", ++ "return_type" : "type-2142", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11559,7 +11743,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2146" ++ "referenced_type" : "type-2142" + } + ], + "return_type" : "type-77", +@@ -11572,7 +11756,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2236" ++ "referenced_type" : "type-2232" + } + ], + "return_type" : "type-77", +@@ -11585,7 +11769,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2236" ++ "referenced_type" : "type-2232" + }, + { + "referenced_type" : "type-78" +@@ -11597,7 +11781,7 @@ + "referenced_type" : "type-188" + }, + { +- "referenced_type" : "type-2156" ++ "referenced_type" : "type-2152" + } + ], + "return_type" : "type-77", +@@ -11610,7 +11794,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2236" ++ "referenced_type" : "type-2232" + }, + { + "referenced_type" : "type-78" +@@ -11626,7 +11810,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2236" ++ "referenced_type" : "type-2232" + } + ], + "return_type" : "type-77", +@@ -11639,7 +11823,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2236" ++ "referenced_type" : "type-2232" + } + ], + "return_type" : "type-77", +@@ -11652,7 +11836,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2236" ++ "referenced_type" : "type-2232" + } + ], + "return_type" : "type-77", +@@ -11665,7 +11849,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2236" ++ "referenced_type" : "type-2232" + } + ], + "return_type" : "type-77", +@@ -11678,10 +11862,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2146" ++ "referenced_type" : "type-2142" + }, + { +- "referenced_type" : "type-2172" ++ "referenced_type" : "type-2168" + }, + { + "default_arg" : true, +@@ -11693,7 +11877,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-905" ++ "referenced_type" : "type-903" + } + ], + "return_type" : "type-14", +@@ -11707,10 +11891,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2146" ++ "referenced_type" : "type-2142" + }, + { +- "referenced_type" : "type-2227" ++ "referenced_type" : "type-2223" + } + ], + "return_type" : "type-77", +@@ -11724,7 +11908,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2146" ++ "referenced_type" : "type-2142" + }, + { + "referenced_type" : "type-78" +@@ -11741,7 +11925,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2146" ++ "referenced_type" : "type-2142" + }, + { + "referenced_type" : "type-44" +@@ -11760,7 +11944,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2146" ++ "referenced_type" : "type-2142" + } + ], + "return_type" : "type-265", +@@ -11773,16 +11957,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2146" ++ "referenced_type" : "type-2142" + }, + { + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-2167" ++ "referenced_type" : "type-2163" + }, + { +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "default_arg" : true, +@@ -11790,7 +11974,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-2632" ++ "referenced_type" : "type-2627" + } + ], + "return_type" : "type-14", +@@ -11803,7 +11987,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2146" ++ "referenced_type" : "type-2142" + }, + { + "referenced_type" : "type-14" +@@ -11819,7 +12003,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2146" ++ "referenced_type" : "type-2142" + }, + { + "referenced_type" : "type-14" +@@ -11836,7 +12020,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2146" ++ "referenced_type" : "type-2142" + } + ], + "return_type" : "type-77", +@@ -11850,7 +12034,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2146" ++ "referenced_type" : "type-2142" + } + ], + "return_type" : "type-77", +@@ -11864,7 +12048,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2146" ++ "referenced_type" : "type-2142" + } + ], + "return_type" : "type-77", +@@ -12031,10 +12215,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-3411" ++ "referenced_type" : "type-3405" + } + ], +- "return_type" : "type-384", ++ "return_type" : "type-383", + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h" + }, + { +@@ -12043,10 +12227,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-3406" ++ "referenced_type" : "type-3400" + } + ], +- "return_type" : "type-384", ++ "return_type" : "type-383", + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h" + }, + { +@@ -12056,7 +12240,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3408" ++ "referenced_type" : "type-3402" + } + ], + "return_type" : "type-77", +@@ -12070,7 +12254,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3408" ++ "referenced_type" : "type-3402" + } + ], + "return_type" : "type-77", +@@ -12084,7 +12268,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3408" ++ "referenced_type" : "type-3402" + } + ], + "return_type" : "type-77", +@@ -12098,7 +12282,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3408" ++ "referenced_type" : "type-3402" + } + ], + "return_type" : "type-77", +@@ -12111,7 +12295,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3712" ++ "referenced_type" : "type-3706" + } + ], + "return_type" : "type-77", +@@ -12124,7 +12308,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3712" ++ "referenced_type" : "type-3706" + } + ], + "return_type" : "type-77", +@@ -12137,7 +12321,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3712" ++ "referenced_type" : "type-3706" + } + ], + "return_type" : "type-77", +@@ -12150,7 +12334,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3712" ++ "referenced_type" : "type-3706" + } + ], + "return_type" : "type-77", +@@ -12162,12 +12346,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-693" ++ "referenced_type" : "type-691" + } + ], + "return_type" : "type-300", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h", +- "template_args" : [ "type-302", "type-369", "type-299" ] ++ "template_args" : [ "type-302", "type-368", "type-299" ] + }, + { + "function_name" : "android::hardware::fromBinder", +@@ -12175,12 +12359,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-693" ++ "referenced_type" : "type-691" + } + ], +- "return_type" : "type-543", ++ "return_type" : "type-542", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h", +- "template_args" : [ "type-496", "type-821", "type-819" ] ++ "template_args" : [ "type-494", "type-819", "type-817" ] + }, + { + "function_name" : "android::hardware::fromBinder", +@@ -12188,12 +12372,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-693" ++ "referenced_type" : "type-691" + } + ], +- "return_type" : "type-549", ++ "return_type" : "type-547", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h", +- "template_args" : [ "type-499", "type-847", "type-844" ] ++ "template_args" : [ "type-498", "type-844", "type-842" ] + }, + { + "function_name" : "android::hardware::fromBinder", +@@ -12201,12 +12385,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-693" ++ "referenced_type" : "type-691" + } + ], +- "return_type" : "type-538", ++ "return_type" : "type-536", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h", +- "template_args" : [ "type-518", "type-727", "type-802" ] ++ "template_args" : [ "type-517", "type-725", "type-800" ] + }, + { + "access" : "protected", +@@ -12216,7 +12400,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2181" ++ "referenced_type" : "type-2177" + } + ], + "return_type" : "type-77", +@@ -12230,7 +12414,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2181" ++ "referenced_type" : "type-2177" + }, + { + "referenced_type" : "type-78" +@@ -12247,7 +12431,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2181" ++ "referenced_type" : "type-2177" + }, + { + "referenced_type" : "type-44" +@@ -12267,10 +12451,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2181" ++ "referenced_type" : "type-2177" + }, + { +- "referenced_type" : "type-693" ++ "referenced_type" : "type-691" + } + ], + "return_type" : "type-77", +@@ -12284,10 +12468,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2181" ++ "referenced_type" : "type-2177" + }, + { +- "referenced_type" : "type-693" ++ "referenced_type" : "type-691" + } + ], + "return_type" : "type-77", +@@ -12301,7 +12485,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2181" ++ "referenced_type" : "type-2177" + } + ], + "return_type" : "type-77", +@@ -12315,7 +12499,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2181" ++ "referenced_type" : "type-2177" + } + ], + "return_type" : "type-77", +@@ -12329,7 +12513,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2181" ++ "referenced_type" : "type-2177" + } + ], + "return_type" : "type-77", +@@ -12919,7 +13103,7 @@ + { + "function_name" : "android::hardware::ProcessState::selfOrNull", + "linker_set_key" : "_ZN7android8hardware12ProcessState10selfOrNullEv", +- "return_type" : "type-445", ++ "return_type" : "type-444", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -12929,7 +13113,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2254" ++ "referenced_type" : "type-2250" + } + ], + "return_type" : "type-16", +@@ -12942,13 +13126,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2254" ++ "referenced_type" : "type-2250" + }, + { + "referenced_type" : "type-14" + }, + { +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2136" + } + ], + "return_type" : "type-77", +@@ -12961,7 +13145,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2254" ++ "referenced_type" : "type-2250" + } + ], + "return_type" : "type-16", +@@ -12974,7 +13158,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2254" ++ "referenced_type" : "type-2250" + } + ], + "return_type" : "type-77", +@@ -12987,13 +13171,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2254" ++ "referenced_type" : "type-2250" + }, + { +- "referenced_type" : "type-693" ++ "referenced_type" : "type-691" + } + ], +- "return_type" : "type-384", ++ "return_type" : "type-383", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13003,16 +13187,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2254" ++ "referenced_type" : "type-2250" + }, + { + "referenced_type" : "type-295" + }, + { +- "referenced_type" : "type-693" ++ "referenced_type" : "type-691" + } + ], +- "return_type" : "type-384", ++ "return_type" : "type-383", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13024,7 +13208,7 @@ + "referenced_type" : "type-16" + } + ], +- "return_type" : "type-445", ++ "return_type" : "type-444", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13034,10 +13218,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2254" ++ "referenced_type" : "type-2250" + }, + { +- "referenced_type" : "type-693" ++ "referenced_type" : "type-691" + } + ], + "return_type" : "type-77", +@@ -13050,10 +13234,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2254" ++ "referenced_type" : "type-2250" + }, + { +- "referenced_type" : "type-693" ++ "referenced_type" : "type-691" + }, + { + "referenced_type" : "type-295" +@@ -13069,7 +13253,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2254" ++ "referenced_type" : "type-2250" + }, + { + "referenced_type" : "type-29" +@@ -13085,7 +13269,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2254" ++ "referenced_type" : "type-2250" + } + ], + "return_type" : "type-77", +@@ -13099,13 +13283,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2254" ++ "referenced_type" : "type-2250" + }, + { + "referenced_type" : "type-14" + } + ], +- "return_type" : "type-3623", ++ "return_type" : "type-3617", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13115,10 +13299,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2254" ++ "referenced_type" : "type-2250" + }, + { +- "referenced_type" : "type-2244" ++ "referenced_type" : "type-2240" + } + ], + "return_type" : "type-77", +@@ -13131,13 +13315,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2254" ++ "referenced_type" : "type-2250" + }, + { + "referenced_type" : "type-16" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-999" + } + ], + "return_type" : "type-265", +@@ -13150,10 +13334,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2254" ++ "referenced_type" : "type-2250" + }, + { +- "referenced_type" : "type-2243" ++ "referenced_type" : "type-2239" + }, + { + "referenced_type" : "type-188" +@@ -13170,7 +13354,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2254" ++ "referenced_type" : "type-2250" + } + ], + "return_type" : "type-165", +@@ -13183,13 +13367,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2254" ++ "referenced_type" : "type-2250" + }, + { + "referenced_type" : "type-14" + } + ], +- "return_type" : "type-2194", ++ "return_type" : "type-2190", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13199,13 +13383,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2254" ++ "referenced_type" : "type-2250" + }, + { + "referenced_type" : "type-14" + } + ], +- "return_type" : "type-384", ++ "return_type" : "type-383", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13215,7 +13399,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2254" ++ "referenced_type" : "type-2250" + }, + { + "referenced_type" : "type-16" +@@ -13234,7 +13418,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2254" ++ "referenced_type" : "type-2250" + }, + { + "referenced_type" : "type-14" +@@ -13246,7 +13430,7 @@ + { + "function_name" : "android::hardware::ProcessState::self", + "linker_set_key" : "_ZN7android8hardware12ProcessState4selfEv", +- "return_type" : "type-445", ++ "return_type" : "type-444", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13257,7 +13441,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2254" ++ "referenced_type" : "type-2250" + }, + { + "referenced_type" : "type-16" +@@ -13274,7 +13458,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2254" ++ "referenced_type" : "type-2250" + }, + { + "referenced_type" : "type-16" +@@ -13291,7 +13475,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2254" ++ "referenced_type" : "type-2250" + } + ], + "return_type" : "type-77", +@@ -13305,7 +13489,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2254" ++ "referenced_type" : "type-2250" + } + ], + "return_type" : "type-77", +@@ -13319,7 +13503,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2254" ++ "referenced_type" : "type-2250" + } + ], + "return_type" : "type-77", +@@ -13362,16 +13546,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { +- "referenced_type" : "type-989" ++ "referenced_type" : "type-986" + }, + { + "referenced_type" : "type-16" + }, + { +- "referenced_type" : "type-2164" ++ "referenced_type" : "type-2160" + }, + { + "referenced_type" : "type-16" +@@ -13386,7 +13570,7 @@ + { + "function_name" : "android::hardware::IPCThreadState::selfOrNull", + "linker_set_key" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv", +- "return_type" : "type-3449", ++ "return_type" : "type-3443", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13397,7 +13581,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + } + ], + "return_type" : "type-77", +@@ -13410,7 +13594,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + }, + { + "default_arg" : true, +@@ -13427,10 +13611,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + }, + { +- "referenced_type" : "type-476" ++ "referenced_type" : "type-475" + } + ], + "return_type" : "type-14", +@@ -13443,7 +13627,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + }, + { + "referenced_type" : "type-14" +@@ -13461,7 +13645,7 @@ + "referenced_type" : "type-14" + }, + { +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2136" + } + ], + "return_type" : "type-77", +@@ -13474,7 +13658,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + } + ], + "return_type" : "type-77", +@@ -13487,13 +13671,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + }, + { + "referenced_type" : "type-14" + }, + { +- "referenced_type" : "type-2146" ++ "referenced_type" : "type-2142" + } + ], + "return_type" : "type-77", +@@ -13506,7 +13690,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + } + ], + "return_type" : "type-14", +@@ -13520,7 +13704,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + }, + { + "referenced_type" : "type-14" +@@ -13536,7 +13720,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + } + ], + "return_type" : "type-29", +@@ -13549,7 +13733,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + }, + { + "default_arg" : true, +@@ -13567,7 +13751,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + }, + { + "default_arg" : true, +@@ -13584,7 +13768,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + }, + { + "referenced_type" : "type-14" +@@ -13600,13 +13784,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + }, + { + "referenced_type" : "type-14" + }, + { +- "referenced_type" : "type-2146" ++ "referenced_type" : "type-2142" + } + ], + "return_type" : "type-77", +@@ -13620,14 +13804,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + }, + { +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "default_arg" : true, +- "referenced_type" : "type-476" ++ "referenced_type" : "type-475" + } + ], + "return_type" : "type-14", +@@ -13653,10 +13837,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + }, + { +- "referenced_type" : "type-3455" ++ "referenced_type" : "type-3449" + } + ], + "return_type" : "type-77", +@@ -13669,7 +13853,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + } + ], + "return_type" : "type-29", +@@ -13682,7 +13866,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + }, + { + "referenced_type" : "type-14" +@@ -13698,10 +13882,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + }, + { +- "referenced_type" : "type-426" ++ "referenced_type" : "type-425" + } + ], + "return_type" : "type-77", +@@ -13714,7 +13898,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + } + ], + "return_type" : "type-265", +@@ -13728,7 +13912,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + } + ], + "return_type" : "type-14", +@@ -13741,7 +13925,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + } + ], + "return_type" : "type-14", +@@ -13755,7 +13939,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + } + ], + "return_type" : "type-77", +@@ -13769,7 +13953,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + }, + { + "referenced_type" : "type-14" +@@ -13784,10 +13968,10 @@ + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-2167" ++ "referenced_type" : "type-2163" + }, + { +- "referenced_type" : "type-476" ++ "referenced_type" : "type-475" + } + ], + "return_type" : "type-14", +@@ -13800,7 +13984,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + }, + { + "referenced_type" : "type-14" +@@ -13816,13 +14000,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + }, + { + "referenced_type" : "type-14" + }, + { +- "referenced_type" : "type-2146" ++ "referenced_type" : "type-2142" + } + ], + "return_type" : "type-14", +@@ -13836,7 +14020,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + } + ], + "return_type" : "type-77", +@@ -13849,7 +14033,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + }, + { + "referenced_type" : "type-265" +@@ -13865,13 +14049,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + }, + { + "referenced_type" : "type-14" + }, + { +- "referenced_type" : "type-2146" ++ "referenced_type" : "type-2142" + } + ], + "return_type" : "type-14", +@@ -13884,7 +14068,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + } + ], + "return_type" : "type-77", +@@ -13910,7 +14094,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + }, + { + "referenced_type" : "type-14" +@@ -13922,7 +14106,7 @@ + { + "function_name" : "android::hardware::IPCThreadState::self", + "linker_set_key" : "_ZN7android8hardware14IPCThreadState4selfEv", +- "return_type" : "type-3449", ++ "return_type" : "type-3443", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13932,10 +14116,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + } + ], +- "return_type" : "type-445", ++ "return_type" : "type-444", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13951,7 +14135,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + }, + { + "referenced_type" : "type-14" +@@ -13960,10 +14144,10 @@ + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-2167" ++ "referenced_type" : "type-2163" + }, + { +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-44" +@@ -13980,10 +14164,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + }, + { +- "referenced_type" : "type-2167" ++ "referenced_type" : "type-2163" + }, + { + "referenced_type" : "type-44" +@@ -14000,7 +14184,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + } + ], + "return_type" : "type-77", +@@ -14014,7 +14198,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + } + ], + "return_type" : "type-77", +@@ -14028,7 +14212,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + } + ], + "return_type" : "type-77", +@@ -14042,7 +14226,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3449" ++ "referenced_type" : "type-3443" + } + ], + "return_type" : "type-77", +@@ -14081,10 +14265,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-3431" ++ "referenced_type" : "type-3425" + }, + { +- "referenced_type" : "type-3585" ++ "referenced_type" : "type-3579" + }, + { + "referenced_type" : "type-78" +@@ -14099,10 +14283,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + }, + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + } + ], + "return_type" : "type-29", +@@ -14120,7 +14304,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + }, + { + "referenced_type" : "type-29" +@@ -14142,7 +14326,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2317" ++ "referenced_type" : "type-2313" + }, + { + "referenced_type" : "type-14" +@@ -14158,7 +14342,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2317" ++ "referenced_type" : "type-2313" + } + ], + "return_type" : "type-77", +@@ -14168,7 +14352,7 @@ + "access" : "private", + "function_name" : "android::hardware::BufferedTextOutput::getThreadState", + "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv", +- "return_type" : "type-2318", ++ "return_type" : "type-2314", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { +@@ -14191,7 +14375,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2317" ++ "referenced_type" : "type-2313" + }, + { + "referenced_type" : "type-41" +@@ -14210,7 +14394,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2317" ++ "referenced_type" : "type-2313" + } + ], + "return_type" : "type-77", +@@ -14223,7 +14407,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2317" ++ "referenced_type" : "type-2313" + }, + { + "default_arg" : true, +@@ -14240,7 +14424,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2317" ++ "referenced_type" : "type-2313" + } + ], + "return_type" : "type-77", +@@ -14253,7 +14437,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2317" ++ "referenced_type" : "type-2313" + } + ], + "return_type" : "type-77", +@@ -14266,7 +14450,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2317" ++ "referenced_type" : "type-2313" + } + ], + "return_type" : "type-77", +@@ -14309,14 +14493,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-487" ++ "referenced_type" : "type-486" + }, + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + }, + { + "default_arg" : true, +- "referenced_type" : "type-490" ++ "referenced_type" : "type-489" + } + ], + "return_type" : "type-14", +@@ -14329,7 +14513,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-487" ++ "referenced_type" : "type-486" + } + ], + "return_type" : "type-77", +@@ -14342,7 +14526,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-487" ++ "referenced_type" : "type-486" + } + ], + "return_type" : "type-77", +@@ -14351,7 +14535,7 @@ + { + "function_name" : "android::hardware::defaultServiceManager", + "linker_set_key" : "_ZN7android8hardware21defaultServiceManagerEv", +- "return_type" : "type-527", ++ "return_type" : "type-526", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { +@@ -14360,7 +14544,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + }, + { + "referenced_type" : "type-14" +@@ -14528,7 +14712,7 @@ + "referenced_type" : "type-301" + } + ], +- "return_type" : "type-384", ++ "return_type" : "type-383", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -14540,13 +14724,13 @@ + { + "function_name" : "android::hardware::defaultServiceManager1_1", + "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_1Ev", +- "return_type" : "type-532", ++ "return_type" : "type-531", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { + "function_name" : "android::hardware::defaultServiceManager1_2", + "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_2Ev", +- "return_type" : "type-538", ++ "return_type" : "type-536", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { +@@ -14594,7 +14778,7 @@ + "referenced_type" : "type-16" + }, + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + } + ], + "return_type" : "type-77", +@@ -14616,7 +14800,7 @@ + "referenced_type" : "type-16" + }, + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + } + ], + "return_type" : "type-77", +@@ -14640,13 +14824,13 @@ + { + "function_name" : "android::hardware::getPassthroughServiceManager", + "linker_set_key" : "_ZN7android8hardware28getPassthroughServiceManagerEv", +- "return_type" : "type-527", ++ "return_type" : "type-526", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { + "function_name" : "android::hardware::getPassthroughServiceManager1_1", + "linker_set_key" : "_ZN7android8hardware31getPassthroughServiceManager1_1Ev", +- "return_type" : "type-532", ++ "return_type" : "type-531", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { +@@ -14668,7 +14852,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-238" +@@ -14684,7 +14868,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-151" +@@ -14700,7 +14884,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-14" +@@ -14716,7 +14900,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-265" +@@ -14732,7 +14916,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-146" +@@ -14749,7 +14933,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-16" +@@ -14765,7 +14949,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-16" +@@ -14781,7 +14965,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-78" +@@ -14790,7 +14974,7 @@ + "referenced_type" : "type-16" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-999" + } + ], + "return_type" : "type-14", +@@ -14803,7 +14987,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-6" +@@ -14819,15 +15003,15 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { +- "referenced_type" : "type-3585" ++ "referenced_type" : "type-3579" + } + ], + "return_type" : "type-14", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-3903" ] ++ "template_args" : [ "type-3896" ] + }, + { + "function_name" : "android::hardware::Parcel::writeUint16", +@@ -14836,7 +15020,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-71" +@@ -14852,7 +15036,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-44" +@@ -14868,7 +15052,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-16" +@@ -14885,7 +15069,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-16" +@@ -14901,7 +15085,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-41" +@@ -14917,7 +15101,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-16" +@@ -14934,7 +15118,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-16" +@@ -14951,7 +15135,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-16" +@@ -14967,7 +15151,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-288" +@@ -14986,7 +15170,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-295" +@@ -15002,10 +15186,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { +- "referenced_type" : "type-3582" ++ "referenced_type" : "type-3576" + } + ], + "return_type" : "type-14", +@@ -15018,7 +15202,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-78" +@@ -15038,7 +15222,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + } + ], + "return_type" : "type-77", +@@ -15052,7 +15236,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + } + ], + "return_type" : "type-77", +@@ -15066,7 +15250,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + } + ], + "return_type" : "type-77", +@@ -15079,10 +15263,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-999" + }, + { + "referenced_type" : "type-16" +@@ -15101,7 +15285,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-16" +@@ -15117,10 +15301,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { +- "referenced_type" : "type-3566" ++ "referenced_type" : "type-3560" + } + ], + "return_type" : "type-14", +@@ -15133,10 +15317,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { +- "referenced_type" : "type-693" ++ "referenced_type" : "type-691" + } + ], + "return_type" : "type-14", +@@ -15155,10 +15339,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-999" + } + ], + "return_type" : "type-14", +@@ -15178,22 +15362,22 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { +- "referenced_type" : "type-989" ++ "referenced_type" : "type-986" + }, + { + "referenced_type" : "type-16" + }, + { +- "referenced_type" : "type-2164" ++ "referenced_type" : "type-2160" + }, + { + "referenced_type" : "type-16" + }, + { +- "referenced_type" : "type-2162" ++ "referenced_type" : "type-2158" + }, + { + "referenced_type" : "type-188" +@@ -15209,7 +15393,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-78" +@@ -15218,7 +15402,7 @@ + "referenced_type" : "type-16" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-999" + }, + { + "referenced_type" : "type-16" +@@ -15237,7 +15421,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-41" +@@ -15253,7 +15437,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + } + ], + "return_type" : "type-77", +@@ -15267,7 +15451,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + } + ], + "return_type" : "type-14", +@@ -15280,10 +15464,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-999" + }, + { + "referenced_type" : "type-16" +@@ -15308,7 +15492,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-11" +@@ -15324,7 +15508,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-11" +@@ -15351,7 +15535,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-11" +@@ -15373,10 +15557,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-999" + }, + { + "referenced_type" : "type-16" +@@ -15395,7 +15579,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-78" +@@ -15414,7 +15598,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-16" +@@ -15433,10 +15617,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { +- "referenced_type" : "type-989" ++ "referenced_type" : "type-986" + }, + { + "referenced_type" : "type-16" +@@ -15452,7 +15636,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + } + ], + "return_type" : "type-77", +@@ -15466,7 +15650,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-16" +@@ -15482,7 +15666,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-14" +@@ -15499,7 +15683,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + } + ], + "return_type" : "type-77", +@@ -15512,7 +15696,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "referenced_type" : "type-29" +@@ -15528,10 +15712,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { +- "referenced_type" : "type-484" ++ "referenced_type" : "type-485" + } + ], + "return_type" : "type-14", +@@ -15544,7 +15728,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + } + ], + "return_type" : "type-77", +@@ -15557,7 +15741,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + } + ], + "return_type" : "type-77", +@@ -15570,7 +15754,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + } + ], + "return_type" : "type-77", +@@ -15583,7 +15767,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + } + ], + "return_type" : "type-77", +@@ -15762,7 +15946,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2298" ++ "referenced_type" : "type-2294" + }, + { + "referenced_type" : "type-78" +@@ -15785,7 +15969,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2298" ++ "referenced_type" : "type-2294" + }, + { + "referenced_type" : "type-78" +@@ -15808,10 +15992,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2136" + } + ], +- "return_type" : "type-2143", ++ "return_type" : "type-2139", + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, + { +@@ -15821,10 +16005,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2136" + } + ], +- "return_type" : "type-2146", ++ "return_type" : "type-2142", + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, + { +@@ -15834,7 +16018,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2136" + } + ], + "return_type" : "type-77", +@@ -15848,7 +16032,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2136" + } + ], + "return_type" : "type-77", +@@ -15862,7 +16046,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2136" + } + ], + "return_type" : "type-77", +@@ -15876,7 +16060,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2136" + } + ], + "return_type" : "type-77", +@@ -15987,9 +16171,9 @@ + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-944", ++ "return_type" : "type-942", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-505", "type-302", "type-829" ] ++ "template_args" : [ "type-504", "type-302", "type-827" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16006,9 +16190,9 @@ + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-1053", ++ "return_type" : "type-1051", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-496", "type-302", "type-821" ] ++ "template_args" : [ "type-494", "type-302", "type-819" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16025,9 +16209,9 @@ + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-1110", ++ "return_type" : "type-1108", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-515", "type-302", "type-838" ] ++ "template_args" : [ "type-514", "type-302", "type-836" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16035,7 +16219,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-527" ++ "referenced_type" : "type-526" + }, + { + "referenced_type" : "type-41" +@@ -16044,9 +16228,9 @@ + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-1110", ++ "return_type" : "type-1108", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-515", "type-505", "type-838" ] ++ "template_args" : [ "type-514", "type-504", "type-836" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16063,9 +16247,9 @@ + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-1945", ++ "return_type" : "type-1941", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-499", "type-302", "type-847" ] ++ "template_args" : [ "type-498", "type-302", "type-844" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16082,9 +16266,9 @@ + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-2015", ++ "return_type" : "type-2011", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-518", "type-302", "type-727" ] ++ "template_args" : [ "type-517", "type-302", "type-725" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16092,7 +16276,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-527" ++ "referenced_type" : "type-526" + }, + { + "referenced_type" : "type-41" +@@ -16101,9 +16285,9 @@ + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-2015", ++ "return_type" : "type-2011", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-518", "type-505", "type-727" ] ++ "template_args" : [ "type-517", "type-504", "type-725" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16111,7 +16295,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-532" ++ "referenced_type" : "type-531" + }, + { + "referenced_type" : "type-41" +@@ -16120,9 +16304,9 @@ + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-2015", ++ "return_type" : "type-2011", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-518", "type-515", "type-727" ] ++ "template_args" : [ "type-517", "type-514", "type-725" ] + }, + { + "function_name" : "android::hardware::details::getDescriptor", +@@ -16133,7 +16317,7 @@ + "referenced_type" : "type-301" + } + ], +- "return_type" : "type-1490", ++ "return_type" : "type-1487", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h" + }, + { +@@ -16209,12 +16393,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-543" ++ "referenced_type" : "type-542" + } + ], +- "return_type" : "type-543", ++ "return_type" : "type-542", + "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h", +- "template_args" : [ "type-496", "type-77" ] ++ "template_args" : [ "type-494", "type-77" ] + }, + { + "function_name" : "android::hardware::details::wrapPassthrough", +@@ -16222,12 +16406,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-549" ++ "referenced_type" : "type-547" + } + ], +- "return_type" : "type-549", ++ "return_type" : "type-547", + "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h", +- "template_args" : [ "type-499", "type-77" ] ++ "template_args" : [ "type-498", "type-77" ] + }, + { + "access" : "protected", +@@ -16237,7 +16421,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + }, + { + "referenced_type" : "type-142" +@@ -16254,7 +16438,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + }, + { + "default_arg" : true, +@@ -16272,7 +16456,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + }, + { + "referenced_type" : "type-96" +@@ -16288,7 +16472,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + }, + { + "referenced_type" : "type-35" +@@ -16307,7 +16491,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + }, + { + "referenced_type" : "type-35" +@@ -16326,7 +16510,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + } + ], + "return_type" : "type-77", +@@ -16339,7 +16523,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + } + ], + "return_type" : "type-77", +@@ -16352,7 +16536,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-584" ++ "referenced_type" : "type-583" + } + ], + "return_type" : "type-77", +@@ -16389,10 +16573,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-805" ++ "referenced_type" : "type-803" + }, + { +- "referenced_type" : "type-805" ++ "referenced_type" : "type-803" + } + ], + "return_type" : "type-77", +@@ -16401,7 +16585,7 @@ + { + "function_name" : "android::hardware::details::getVndkVersionStr", + "linker_set_key" : "_ZN7android8hardware7details17getVndkVersionStrEv", +- "return_type" : "type-630", ++ "return_type" : "type-629", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16410,7 +16594,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1008" ++ "referenced_type" : "type-1006" + }, + { + "referenced_type" : "type-29" +@@ -16419,9 +16603,9 @@ + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-527", ++ "return_type" : "type-526", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-829", "type-505", "type-77", "type-77" ] ++ "template_args" : [ "type-827", "type-504", "type-77", "type-77" ] + }, + { + "function_name" : "android::hardware::details::getServiceInternal", +@@ -16429,7 +16613,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1073" ++ "referenced_type" : "type-1071" + }, + { + "referenced_type" : "type-29" +@@ -16438,9 +16622,9 @@ + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-543", ++ "return_type" : "type-542", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-821", "type-496", "type-77", "type-77" ] ++ "template_args" : [ "type-819", "type-494", "type-77", "type-77" ] + }, + { + "function_name" : "android::hardware::details::getServiceInternal", +@@ -16448,7 +16632,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1131" ++ "referenced_type" : "type-1129" + }, + { + "referenced_type" : "type-29" +@@ -16457,9 +16641,9 @@ + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-532", ++ "return_type" : "type-531", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-838", "type-515", "type-77", "type-77" ] ++ "template_args" : [ "type-836", "type-514", "type-77", "type-77" ] + }, + { + "function_name" : "android::hardware::details::getServiceInternal", +@@ -16467,7 +16651,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1968" ++ "referenced_type" : "type-1964" + }, + { + "referenced_type" : "type-29" +@@ -16476,9 +16660,9 @@ + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-549", ++ "return_type" : "type-547", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-847", "type-499", "type-77", "type-77" ] ++ "template_args" : [ "type-844", "type-498", "type-77", "type-77" ] + }, + { + "function_name" : "android::hardware::details::getServiceInternal", +@@ -16486,7 +16670,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2044" ++ "referenced_type" : "type-2040" + }, + { + "referenced_type" : "type-29" +@@ -16495,20 +16679,20 @@ + "referenced_type" : "type-29" + } + ], +- "return_type" : "type-538", ++ "return_type" : "type-536", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-727", "type-518", "type-77", "type-77" ] ++ "template_args" : [ "type-725", "type-517", "type-77", "type-77" ] + }, + { + "function_name" : "android::hardware::details::getBnConstructorMap", + "linker_set_key" : "_ZN7android8hardware7details19getBnConstructorMapEv", +- "return_type" : "type-883", ++ "return_type" : "type-880", + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, + { + "function_name" : "android::hardware::details::getBsConstructorMap", + "linker_set_key" : "_ZN7android8hardware7details19getBsConstructorMapEv", +- "return_type" : "type-884", ++ "return_type" : "type-881", + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, + { +@@ -16517,10 +16701,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-805" ++ "referenced_type" : "type-803" + }, + { +- "referenced_type" : "type-805" ++ "referenced_type" : "type-803" + }, + { + "referenced_type" : "type-29" +@@ -16550,7 +16734,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-805" ++ "referenced_type" : "type-803" + } + ], + "return_type" : "type-77", +@@ -16562,10 +16746,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-413" ++ "referenced_type" : "type-411" + }, + { +- "referenced_type" : "type-805" ++ "referenced_type" : "type-803" + } + ], + "return_type" : "type-14", +@@ -16579,16 +16763,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2143" ++ "referenced_type" : "type-2139" + }, + { + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-2167" ++ "referenced_type" : "type-2163" + }, + { +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "default_arg" : true, +@@ -16596,7 +16780,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-2633" ++ "referenced_type" : "type-2628" + } + ], + "return_type" : "type-14", +@@ -16609,10 +16793,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2143" ++ "referenced_type" : "type-2139" + }, + { +- "referenced_type" : "type-2170" ++ "referenced_type" : "type-2166" + }, + { + "default_arg" : true, +@@ -16633,10 +16817,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2143" ++ "referenced_type" : "type-2139" + } + ], +- "return_type" : "type-2143", ++ "return_type" : "type-2139", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16646,7 +16830,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2143" ++ "referenced_type" : "type-2139" + }, + { + "referenced_type" : "type-78" +@@ -16658,7 +16842,7 @@ + "referenced_type" : "type-188" + }, + { +- "referenced_type" : "type-2156" ++ "referenced_type" : "type-2152" + } + ], + "return_type" : "type-77", +@@ -16671,7 +16855,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2143" ++ "referenced_type" : "type-2139" + }, + { + "referenced_type" : "type-78" +@@ -16687,10 +16871,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2143" ++ "referenced_type" : "type-2139" + }, + { +- "referenced_type" : "type-2172" ++ "referenced_type" : "type-2168" + }, + { + "default_arg" : true, +@@ -16702,7 +16886,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-905" ++ "referenced_type" : "type-903" + } + ], + "return_type" : "type-14", +@@ -16715,7 +16899,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2143" ++ "referenced_type" : "type-2139" + } + ], + "return_type" : "type-29", +@@ -16729,7 +16913,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2143" ++ "referenced_type" : "type-2139" + }, + { + "referenced_type" : "type-29" +@@ -16746,10 +16930,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2143" ++ "referenced_type" : "type-2139" + } + ], +- "return_type" : "type-2175", ++ "return_type" : "type-2171", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16759,7 +16943,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2143" ++ "referenced_type" : "type-2139" + } + ], + "return_type" : "type-14", +@@ -16772,7 +16956,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2143" ++ "referenced_type" : "type-2139" + } + ], + "return_type" : "type-14", +@@ -16785,16 +16969,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2143" ++ "referenced_type" : "type-2139" + }, + { + "referenced_type" : "type-44" + }, + { +- "referenced_type" : "type-2167" ++ "referenced_type" : "type-2163" + }, + { +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "default_arg" : true, +@@ -16802,7 +16986,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-2634" ++ "referenced_type" : "type-2629" + } + ], + "return_type" : "type-14", +@@ -16815,7 +16999,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2143" ++ "referenced_type" : "type-2139" + } + ], + "return_type" : "type-77", +@@ -16828,7 +17012,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2143" ++ "referenced_type" : "type-2139" + } + ], + "return_type" : "type-77", +@@ -16842,7 +17026,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2143" ++ "referenced_type" : "type-2139" + } + ], + "return_type" : "type-77", +@@ -16856,7 +17040,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2143" ++ "referenced_type" : "type-2139" + } + ], + "return_type" : "type-77", +@@ -16870,7 +17054,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2143" ++ "referenced_type" : "type-2139" + } + ], + "return_type" : "type-77", +@@ -16882,13 +17066,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2287" ++ "referenced_type" : "type-2283" + }, + { +- "referenced_type" : "type-3716" ++ "referenced_type" : "type-3710" + } + ], +- "return_type" : "type-2287", ++ "return_type" : "type-2283", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -16897,13 +17081,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2287" ++ "referenced_type" : "type-2283" + }, + { +- "referenced_type" : "type-3715" ++ "referenced_type" : "type-3709" + } + ], +- "return_type" : "type-2287", ++ "return_type" : "type-2283", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -16937,402 +17121,1630 @@ + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +- "function_name" : "android::hardware::BpHwBinder::findObject", +- "linker_set_key" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_compare", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_compareEPKvSA_", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2185" ++ "referenced_type" : "type-3635" ++ }, ++ { ++ "referenced_type" : "type-78" + }, + { + "referenced_type" : "type-78" + } + ], +- "return_type" : "type-188", +- "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" ++ "return_type" : "type-14", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::BpHwBinder::ObjectManager::find", +- "linker_set_key" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_destroy", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_destroyEPvm", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2238" ++ "referenced_type" : "type-3635" + }, + { +- "referenced_type" : "type-78" ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-16" + } + ], +- "return_type" : "type-188", +- "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::hidl_handle::getNativeHandle", +- "linker_set_key" : "_ZNK7android8hardware11hidl_handle15getNativeHandleEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_construct", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE12do_constructEPvm", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-37" ++ "referenced_type" : "type-3635" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-16" + } + ], +- "return_type" : "type-11", +- "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::hidl_handle::operator const native_handle *", +- "linker_set_key" : "_ZNK7android8hardware11hidl_handlecvPK13native_handleEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_move_forward", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE15do_move_forwardEPvPKvm", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-37" ++ "referenced_type" : "type-3635" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" + } + ], +- "return_type" : "type-11", +- "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::hidl_handle::operator->", +- "linker_set_key" : "_ZNK7android8hardware11hidl_handleptEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_move_backward", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE16do_move_backwardEPvPKvm", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-37" ++ "referenced_type" : "type-3635" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" + } + ], +- "return_type" : "type-11", +- "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::hidl_string::size", +- "linker_set_key" : "_ZNK7android8hardware11hidl_string4sizeEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_copy", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE7do_copyEPvPKvm", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-56" ++ "referenced_type" : "type-3635" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" + } + ], +- "return_type" : "type-16", +- "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::hidl_string::c_str", +- "linker_set_key" : "_ZNK7android8hardware11hidl_string5c_strEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_splat", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE8do_splatEPvPKvm", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-56" ++ "referenced_type" : "type-3635" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" + } + ], +- "return_type" : "type-41", +- "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::hidl_string::empty", +- "linker_set_key" : "_ZNK7android8hardware11hidl_string5emptyEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_compare", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_compareES3_S3_", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-56" ++ "referenced_type" : "type-2217" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-78" + } + ], +- "return_type" : "type-29", +- "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ "return_type" : "type-14", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::hidl_string::operator basic_string", +- "linker_set_key" : "_ZNK7android8hardware11hidl_stringcvNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_destroy", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_destroyEPvm", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-56" ++ "referenced_type" : "type-2217" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-16" + } + ], +- "return_type" : "type-642", +- "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::ProcessState::isContextManager", +- "linker_set_key" : "_ZNK7android8hardware12ProcessState16isContextManagerEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_construct", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE12do_constructEPvm", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3664" ++ "referenced_type" : "type-2217" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-16" + } + ], +- "return_type" : "type-29", +- "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::IPCThreadState::getCallingPid", +- "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_move_forward", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE15do_move_forwardEPvS3_m", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3452" ++ "referenced_type" : "type-2217" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" + } + ], +- "return_type" : "type-14", +- "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::IPCThreadState::getCallingSid", +- "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_move_backward", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE16do_move_backwardEPvS3_m", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3452" ++ "referenced_type" : "type-2217" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" + } + ], +- "return_type" : "type-41", +- "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::IPCThreadState::getCallingUid", +- "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_copy", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE7do_copyEPvS3_m", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3452" ++ "referenced_type" : "type-2217" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" + } + ], +- "return_type" : "type-44", +- "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::IPCThreadState::isServingCall", +- "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_splat", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE8do_splatEPvS3_m", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3452" ++ "referenced_type" : "type-2217" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" + } + ], +- "return_type" : "type-29", +- "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::IPCThreadState::getStrictModePolicy", +- "linker_set_key" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv", ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE10do_destroyEPvm", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3452" ++ "referenced_type" : "type-2329" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-16" + } + ], +- "return_type" : "type-14", +- "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::IPCThreadState::getLastTransactionBinderFlags", +- "linker_set_key" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv", ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE12do_constructEPvm", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3452" ++ "referenced_type" : "type-2329" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-16" + } + ], +- "return_type" : "type-14", +- "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "access" : "private", +- "function_name" : "android::hardware::BufferedTextOutput::getBuffer", +- "linker_set_key" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv", ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvm", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2321" ++ "referenced_type" : "type-2329" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" + } + ], +- "return_type" : "type-2282", +- "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::clearCache", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10clearCacheEv", ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvm", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-2329" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" + } + ], + "return_type" : "type-77", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::errorCheck", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10errorCheckEv", ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvm", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-2329" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" + } + ], +- "return_type" : "type-14", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::findBuffer", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10findBufferEPKvmPbPmS5_", ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvm", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-2329" ++ }, ++ { ++ "referenced_type" : "type-188" + }, + { + "referenced_type" : "type-78" + }, + { + "referenced_type" : "type-16" +- }, ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE10do_destroyEPvm", ++ "parameters" : ++ [ + { +- "referenced_type" : "type-3594" ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2222" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-188" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-16" + } + ], +- "return_type" : "type-14", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::ipcObjects", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10ipcObjectsEv", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE12do_constructEPvm", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-2222" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-16" + } + ], +- "return_type" : "type-16", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::readBuffer", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEmPmPPKv", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE15do_move_forwardEPvPKvm", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-2222" + }, + { +- "referenced_type" : "type-16" ++ "referenced_type" : "type-188" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-78" + }, + { +- "referenced_type" : "type-3598" ++ "referenced_type" : "type-16" + } + ], +- "return_type" : "type-14", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::readBuffer", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEmPmjmmPPKv", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE16do_move_backwardEPvPKvm", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" +- }, +- { +- "referenced_type" : "type-16" +- }, +- { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-2222" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-188" + }, + { +- "referenced_type" : "type-16" ++ "referenced_type" : "type-78" + }, + { + "referenced_type" : "type-16" +- }, +- { +- "referenced_type" : "type-3598" + } + ], +- "return_type" : "type-14", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::readDouble", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEPd", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE7do_copyEPvPKvm", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-2222" + }, + { +- "referenced_type" : "type-3593" ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" + } + ], +- "return_type" : "type-14", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::readDouble", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEv", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE8do_splatEPvPKvm", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-2222" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" + } + ], +- "return_type" : "type-6", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::readObject", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pm", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE10do_destroyEPvm", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3639" + }, + { +- "default_arg" : true, +- "referenced_type" : "type-1001" +- } ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE12do_constructEPvm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3639" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE15do_move_forwardEPvPKvm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3639" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE16do_move_backwardEPvPKvm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3639" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE7do_copyEPvPKvm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3639" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE8do_splatEPvPKvm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3639" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3432" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3432" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3432" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3432" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3432" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3432" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3436" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3436" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3436" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3436" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3436" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3436" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE10do_destroyEPvm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3428" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE12do_constructEPvm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3428" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE15do_move_forwardEPvPKvm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3428" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE16do_move_backwardEPvPKvm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3428" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE7do_copyEPvPKvm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3428" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE8do_splatEPvPKvm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3428" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorIiE10do_destroyEPvm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2322" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorIiE12do_constructEPvm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2322" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2322" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2322" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorIiE7do_copyEPvPKvm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2322" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorIiE8do_splatEPvPKvm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2322" ++ }, ++ { ++ "referenced_type" : "type-188" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" ++ } ++ ], ++ "return_type" : "type-77", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "function_name" : "android::hardware::BpHwBinder::findObject", ++ "linker_set_key" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2181" ++ }, ++ { ++ "referenced_type" : "type-78" ++ } ++ ], ++ "return_type" : "type-188", ++ "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" ++ }, ++ { ++ "function_name" : "android::hardware::BpHwBinder::ObjectManager::find", ++ "linker_set_key" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2234" ++ }, ++ { ++ "referenced_type" : "type-78" ++ } ++ ], ++ "return_type" : "type-188", ++ "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" ++ }, ++ { ++ "function_name" : "android::hardware::hidl_handle::getNativeHandle", ++ "linker_set_key" : "_ZNK7android8hardware11hidl_handle15getNativeHandleEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-37" ++ } ++ ], ++ "return_type" : "type-11", ++ "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ }, ++ { ++ "function_name" : "android::hardware::hidl_handle::operator const native_handle *", ++ "linker_set_key" : "_ZNK7android8hardware11hidl_handlecvPK13native_handleEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-37" ++ } ++ ], ++ "return_type" : "type-11", ++ "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ }, ++ { ++ "function_name" : "android::hardware::hidl_handle::operator->", ++ "linker_set_key" : "_ZNK7android8hardware11hidl_handleptEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-37" ++ } ++ ], ++ "return_type" : "type-11", ++ "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ }, ++ { ++ "function_name" : "android::hardware::hidl_string::size", ++ "linker_set_key" : "_ZNK7android8hardware11hidl_string4sizeEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-56" ++ } ++ ], ++ "return_type" : "type-16", ++ "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ }, ++ { ++ "function_name" : "android::hardware::hidl_string::c_str", ++ "linker_set_key" : "_ZNK7android8hardware11hidl_string5c_strEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-56" ++ } ++ ], ++ "return_type" : "type-41", ++ "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ }, ++ { ++ "function_name" : "android::hardware::hidl_string::empty", ++ "linker_set_key" : "_ZNK7android8hardware11hidl_string5emptyEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-56" ++ } ++ ], ++ "return_type" : "type-29", ++ "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ }, ++ { ++ "function_name" : "android::hardware::hidl_string::operator basic_string", ++ "linker_set_key" : "_ZNK7android8hardware11hidl_stringcvNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-56" ++ } ++ ], ++ "return_type" : "type-641", ++ "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ }, ++ { ++ "function_name" : "android::hardware::ProcessState::isContextManager", ++ "linker_set_key" : "_ZNK7android8hardware12ProcessState16isContextManagerEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3658" ++ } ++ ], ++ "return_type" : "type-29", ++ "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" ++ }, ++ { ++ "function_name" : "android::hardware::IPCThreadState::getCallingPid", ++ "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3446" ++ } ++ ], ++ "return_type" : "type-14", ++ "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ }, ++ { ++ "function_name" : "android::hardware::IPCThreadState::getCallingSid", ++ "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3446" ++ } ++ ], ++ "return_type" : "type-41", ++ "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ }, ++ { ++ "function_name" : "android::hardware::IPCThreadState::getCallingUid", ++ "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3446" ++ } ++ ], ++ "return_type" : "type-44", ++ "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ }, ++ { ++ "function_name" : "android::hardware::IPCThreadState::isServingCall", ++ "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3446" ++ } ++ ], ++ "return_type" : "type-29", ++ "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ }, ++ { ++ "function_name" : "android::hardware::IPCThreadState::getStrictModePolicy", ++ "linker_set_key" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3446" ++ } ++ ], ++ "return_type" : "type-14", ++ "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ }, ++ { ++ "function_name" : "android::hardware::IPCThreadState::getLastTransactionBinderFlags", ++ "linker_set_key" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3446" ++ } ++ ], ++ "return_type" : "type-14", ++ "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ }, ++ { ++ "access" : "private", ++ "function_name" : "android::hardware::BufferedTextOutput::getBuffer", ++ "linker_set_key" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2317" ++ } ++ ], ++ "return_type" : "type-2278", ++ "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" ++ }, ++ { ++ "access" : "private", ++ "function_name" : "android::hardware::Parcel::clearCache", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10clearCacheEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3573" ++ } + ], +- "return_type" : "type-3597", ++ "return_type" : "type-77", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::errorCheck", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10errorCheckEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3573" ++ } ++ ], ++ "return_type" : "type-14", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::findBuffer", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10findBufferEPKvmPbPmS5_", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3573" ++ }, ++ { ++ "referenced_type" : "type-78" ++ }, ++ { ++ "referenced_type" : "type-16" ++ }, ++ { ++ "referenced_type" : "type-3588" ++ }, ++ { ++ "referenced_type" : "type-999" ++ }, ++ { ++ "referenced_type" : "type-999" ++ } ++ ], ++ "return_type" : "type-14", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "access" : "private", ++ "function_name" : "android::hardware::Parcel::ipcObjects", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10ipcObjectsEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3573" ++ } ++ ], ++ "return_type" : "type-16", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::readBuffer", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEmPmPPKv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3573" ++ }, ++ { ++ "referenced_type" : "type-16" ++ }, ++ { ++ "referenced_type" : "type-999" ++ }, ++ { ++ "referenced_type" : "type-3592" ++ } ++ ], ++ "return_type" : "type-14", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "access" : "private", ++ "function_name" : "android::hardware::Parcel::readBuffer", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEmPmjmmPPKv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3573" ++ }, ++ { ++ "referenced_type" : "type-16" ++ }, ++ { ++ "referenced_type" : "type-999" ++ }, ++ { ++ "referenced_type" : "type-44" ++ }, ++ { ++ "referenced_type" : "type-16" ++ }, ++ { ++ "referenced_type" : "type-16" ++ }, ++ { ++ "referenced_type" : "type-3592" ++ } ++ ], ++ "return_type" : "type-14", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::readDouble", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEPd", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3573" ++ }, ++ { ++ "referenced_type" : "type-3587" ++ } ++ ], ++ "return_type" : "type-14", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::readDouble", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3573" ++ } ++ ], ++ "return_type" : "type-6", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::readObject", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pm", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3573" ++ }, ++ { ++ "default_arg" : true, ++ "referenced_type" : "type-999" ++ } ++ ], ++ "return_type" : "type-3591", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-3904" ] ++ "template_args" : [ "type-3897" ] + }, + { + "function_name" : "android::hardware::Parcel::readUint16", +@@ -17341,10 +18753,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { +- "referenced_type" : "type-3589" ++ "referenced_type" : "type-3583" + } + ], + "return_type" : "type-14", +@@ -17357,10 +18769,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { +- "referenced_type" : "type-3590" ++ "referenced_type" : "type-3584" + } + ], + "return_type" : "type-14", +@@ -17373,7 +18785,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + } + ], + "return_type" : "type-44", +@@ -17386,10 +18798,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-999" + } + ], + "return_type" : "type-14", +@@ -17402,7 +18814,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + } + ], + "return_type" : "type-16", +@@ -17416,7 +18828,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + } + ], + "return_type" : "type-77", +@@ -17430,7 +18842,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + } + ], + "return_type" : "type-16", +@@ -17443,7 +18855,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + } + ], + "return_type" : "type-41", +@@ -17456,7 +18868,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { + "referenced_type" : "type-16" +@@ -17473,10 +18885,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-999" + } + ], + "return_type" : "type-14", +@@ -17490,7 +18902,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + } + ], + "return_type" : "type-16", +@@ -17504,7 +18916,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + } + ], + "return_type" : "type-77", +@@ -17517,7 +18929,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + } + ], + "return_type" : "type-16", +@@ -17530,7 +18942,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + } + ], + "return_type" : "type-16", +@@ -17543,7 +18955,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + } + ], + "return_type" : "type-16", +@@ -17556,7 +18968,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { + "referenced_type" : "type-297" +@@ -17572,10 +18984,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { +- "referenced_type" : "type-3595" ++ "referenced_type" : "type-3589" + } + ], + "return_type" : "type-14", +@@ -17588,7 +19000,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + } + ], + "return_type" : "type-287", +@@ -17602,7 +19014,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + } + ], + "return_type" : "type-16", +@@ -17615,16 +19027,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { +- "referenced_type" : "type-3598" ++ "referenced_type" : "type-3592" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-999" + }, + { +- "referenced_type" : "type-3594" ++ "referenced_type" : "type-3588" + } + ], + "return_type" : "type-14", +@@ -17637,10 +19049,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + } + ], +- "return_type" : "type-2194", ++ "return_type" : "type-2190", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17651,7 +19063,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + } + ], + "return_type" : "type-16", +@@ -17664,13 +19076,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { + "referenced_type" : "type-78" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-999" + } + ], + "return_type" : "type-14", +@@ -17683,7 +19095,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { + "referenced_type" : "type-16" +@@ -17699,7 +19111,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { + "referenced_type" : "type-41" +@@ -17715,10 +19127,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { +- "referenced_type" : "type-436" ++ "referenced_type" : "type-435" + } + ], + "return_type" : "type-14", +@@ -17731,10 +19143,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + } + ], +- "return_type" : "type-384", ++ "return_type" : "type-383", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17744,13 +19156,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { + "referenced_type" : "type-16" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-999" + }, + { + "referenced_type" : "type-16" +@@ -17759,7 +19171,7 @@ + "referenced_type" : "type-16" + }, + { +- "referenced_type" : "type-3598" ++ "referenced_type" : "type-3592" + } + ], + "return_type" : "type-14", +@@ -17772,16 +19184,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { + "referenced_type" : "type-16" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-999" + }, + { +- "referenced_type" : "type-3598" ++ "referenced_type" : "type-3592" + } + ], + "return_type" : "type-14", +@@ -17795,10 +19207,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { +- "referenced_type" : "type-3602" ++ "referenced_type" : "type-3596" + }, + { + "referenced_type" : "type-16" +@@ -17823,10 +19235,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-999" + } + ], + "return_type" : "type-288", +@@ -17840,7 +19252,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { + "referenced_type" : "type-16" +@@ -17860,7 +19272,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { + "referenced_type" : "type-16" +@@ -17879,13 +19291,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { +- "referenced_type" : "type-3598" ++ "referenced_type" : "type-3592" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-999" + }, + { + "referenced_type" : "type-16" +@@ -17894,7 +19306,7 @@ + "referenced_type" : "type-16" + }, + { +- "referenced_type" : "type-3594" ++ "referenced_type" : "type-3588" + } + ], + "return_type" : "type-14", +@@ -17907,10 +19319,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { +- "referenced_type" : "type-3599" ++ "referenced_type" : "type-3593" + } + ], + "return_type" : "type-14", +@@ -17923,7 +19335,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { + "referenced_type" : "type-16" +@@ -17932,7 +19344,7 @@ + "referenced_type" : "type-16" + }, + { +- "referenced_type" : "type-3599" ++ "referenced_type" : "type-3593" + } + ], + "return_type" : "type-14", +@@ -17945,10 +19357,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { +- "referenced_type" : "type-436" ++ "referenced_type" : "type-435" + } + ], + "return_type" : "type-14", +@@ -17961,13 +19373,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { + "referenced_type" : "type-16" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-999" + }, + { + "referenced_type" : "type-16" +@@ -17976,7 +19388,7 @@ + "referenced_type" : "type-16" + }, + { +- "referenced_type" : "type-3598" ++ "referenced_type" : "type-3592" + } + ], + "return_type" : "type-14", +@@ -17989,10 +19401,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { +- "referenced_type" : "type-3599" ++ "referenced_type" : "type-3593" + } + ], + "return_type" : "type-14", +@@ -18006,10 +19418,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { +- "referenced_type" : "type-3599" ++ "referenced_type" : "type-3593" + }, + { + "referenced_type" : "type-29" +@@ -18033,7 +19445,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { + "referenced_type" : "type-16" +@@ -18042,7 +19454,7 @@ + "referenced_type" : "type-16" + }, + { +- "referenced_type" : "type-3599" ++ "referenced_type" : "type-3593" + } + ], + "return_type" : "type-14", +@@ -18055,10 +19467,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + } + ], +- "return_type" : "type-989", ++ "return_type" : "type-986", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -18068,7 +19480,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { + "referenced_type" : "type-188" +@@ -18087,10 +19499,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { +- "referenced_type" : "type-2287" ++ "referenced_type" : "type-2283" + }, + { + "default_arg" : true, +@@ -18108,7 +19520,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + } + ], + "return_type" : "type-16", +@@ -18122,10 +19534,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + } + ], +- "return_type" : "type-2164", ++ "return_type" : "type-2160", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -18135,7 +19547,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + } + ], + "return_type" : "type-16", +@@ -18148,10 +19560,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { +- "referenced_type" : "type-3594" ++ "referenced_type" : "type-3588" + } + ], + "return_type" : "type-14", +@@ -18164,7 +19576,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + } + ], + "return_type" : "type-29", +@@ -18177,10 +19589,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { +- "referenced_type" : "type-3587" ++ "referenced_type" : "type-3580" + } + ], + "return_type" : "type-14", +@@ -18193,7 +19605,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + } + ], + "return_type" : "type-16", +@@ -18206,10 +19618,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { +- "referenced_type" : "type-3592" ++ "referenced_type" : "type-3586" + } + ], + "return_type" : "type-14", +@@ -18222,7 +19634,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + } + ], + "return_type" : "type-238", +@@ -18235,10 +19647,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { +- "referenced_type" : "type-3588" ++ "referenced_type" : "type-3582" + } + ], + "return_type" : "type-14", +@@ -18251,10 +19663,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { +- "referenced_type" : "type-476" ++ "referenced_type" : "type-475" + } + ], + "return_type" : "type-14", +@@ -18267,7 +19679,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + } + ], + "return_type" : "type-14", +@@ -18280,10 +19692,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { +- "referenced_type" : "type-3591" ++ "referenced_type" : "type-3585" + } + ], + "return_type" : "type-14", +@@ -18296,7 +19708,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + } + ], + "return_type" : "type-265", +@@ -18309,7 +19721,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3579" ++ "referenced_type" : "type-3573" + }, + { + "referenced_type" : "type-231" +@@ -18328,7 +19740,7 @@ + "referenced_type" : "type-111" + } + ], +- "return_type" : "type-643", ++ "return_type" : "type-642", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -18338,7 +19750,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2142" ++ "referenced_type" : "type-2138" + }, + { + "referenced_type" : "type-78" +@@ -18367,7 +19779,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2174" ++ "referenced_type" : "type-2170" + }, + { + "referenced_type" : "type-78" +@@ -18384,7 +19796,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2146" ++ "referenced_type" : "type-2142" + } + ], + "return_type" : "type-77", +@@ -18398,7 +19810,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2181" ++ "referenced_type" : "type-2177" + } + ], + "return_type" : "type-77", +@@ -18412,7 +19824,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2146" ++ "referenced_type" : "type-2142" + }, + { + "referenced_type" : "type-78" +@@ -18429,7 +19841,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2181" ++ "referenced_type" : "type-2177" + }, + { + "referenced_type" : "type-78" +@@ -18446,7 +19858,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2146" ++ "referenced_type" : "type-2142" + }, + { + "referenced_type" : "type-44" +@@ -18466,7 +19878,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2181" ++ "referenced_type" : "type-2177" + }, + { + "referenced_type" : "type-44" +@@ -18487,7 +19899,7 @@ + "referenced_type" : "type-16" + }, + { +- "referenced_type" : "type-1001" ++ "referenced_type" : "type-999" + } + ], + "return_type" : "type-265", +@@ -18525,7 +19937,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-3399" ++ "referenced_type" : "type-3393" + }, + { + "default_arg" : true, +@@ -18545,7 +19957,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-3399" ++ "referenced_type" : "type-3393" + }, + { + "default_arg" : true, +@@ -18633,55 +20045,55 @@ + { + "linker_set_key" : "_ZN7android8hardware12gTextBuffersE", + "name" : "android::hardware::gTextBuffers", +- "referenced_type" : "type-2324", ++ "referenced_type" : "type-2320", + "source_file" : "/system/libhwbinder/include/hwbinder/Static.h" + }, + { + "linker_set_key" : "_ZN7android8hardware13gProcessMutexE", + "name" : "android::hardware::gProcessMutex", +- "referenced_type" : "type-394", ++ "referenced_type" : "type-393", + "source_file" : "/system/libhwbinder/include/hwbinder/Static.h" + }, + { + "linker_set_key" : "_ZN7android8hardware4aerrE", + "name" : "android::hardware::aerr", +- "referenced_type" : "type-2287", ++ "referenced_type" : "type-2283", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { + "linker_set_key" : "_ZN7android8hardware4alogE", + "name" : "android::hardware::alog", +- "referenced_type" : "type-2287", ++ "referenced_type" : "type-2283", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { + "linker_set_key" : "_ZN7android8hardware4aoutE", + "name" : "android::hardware::aout", +- "referenced_type" : "type-2287", ++ "referenced_type" : "type-2283", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { + "linker_set_key" : "_ZN7android8hardware7details14gServiceSidMapE", + "name" : "android::hardware::details::gServiceSidMap", +- "referenced_type" : "type-645", ++ "referenced_type" : "type-644", + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, + { + "linker_set_key" : "_ZN7android8hardware7details15gServicePrioMapE", + "name" : "android::hardware::details::gServicePrioMap", +- "referenced_type" : "type-646", ++ "referenced_type" : "type-645", + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, + { + "linker_set_key" : "_ZN7android8hardware7details6gBnMapE", + "name" : "android::hardware::details::gBnMap", +- "referenced_type" : "type-361", ++ "referenced_type" : "type-360", + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, + { + "linker_set_key" : "_ZN7android8hardware8gProcessE", + "name" : "android::hardware::gProcess", +- "referenced_type" : "type-2635", ++ "referenced_type" : "type-2630", + "source_file" : "/system/libhwbinder/include/hwbinder/Static.h" + } + ], +@@ -18691,8 +20103,8 @@ + "alignment" : 8, + "linker_set_key" : "android::Mutex &", + "name" : "android::Mutex &", +- "referenced_type" : "type-390", +- "self_type" : "type-394", ++ "referenced_type" : "type-389", ++ "self_type" : "type-393", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Mutex.h" + }, +@@ -18700,8 +20112,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RWLock &", + "name" : "android::RWLock &", +- "referenced_type" : "type-400", +- "self_type" : "type-405", ++ "referenced_type" : "type-399", ++ "self_type" : "type-404", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RWLock.h" + }, +@@ -18709,8 +20121,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase *const &", + "name" : "android::RefBase *const &", +- "referenced_type" : "type-3420", +- "self_type" : "type-3443", ++ "referenced_type" : "type-3414", ++ "self_type" : "type-3437", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -18718,8 +20130,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_type *const &", + "name" : "android::RefBase::weakref_type *const &", +- "referenced_type" : "type-3418", +- "self_type" : "type-3439", ++ "referenced_type" : "type-3412", ++ "self_type" : "type-3433", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -18745,8 +20157,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder *const &", + "name" : "android::hardware::BHwBinder *const &", +- "referenced_type" : "type-3416", +- "self_type" : "type-3435", ++ "referenced_type" : "type-3410", ++ "self_type" : "type-3429", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -18754,8 +20166,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ConcurrentMap, android::hardware::details::SchedPrio> &", + "name" : "android::hardware::ConcurrentMap, android::hardware::details::SchedPrio> &", +- "referenced_type" : "type-663", +- "self_type" : "type-675", ++ "referenced_type" : "type-662", ++ "self_type" : "type-673", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -18763,8 +20175,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ConcurrentMap, bool> &", + "name" : "android::hardware::ConcurrentMap, bool> &", +- "referenced_type" : "type-669", +- "self_type" : "type-678", ++ "referenced_type" : "type-667", ++ "self_type" : "type-676", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -18772,8 +20184,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > &", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > &", +- "referenced_type" : "type-588", +- "self_type" : "type-884", ++ "referenced_type" : "type-587", ++ "self_type" : "type-881", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, +@@ -18781,8 +20193,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > &", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > &", +- "referenced_type" : "type-347", +- "self_type" : "type-883", ++ "referenced_type" : "type-346", ++ "self_type" : "type-880", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, +@@ -18790,8 +20202,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::HexDump &", + "name" : "android::hardware::HexDump &", +- "referenced_type" : "type-2297", +- "self_type" : "type-2299", ++ "referenced_type" : "type-2293", ++ "self_type" : "type-2295", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -18799,8 +20211,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Parcel &", + "name" : "android::hardware::Parcel &", +- "referenced_type" : "type-1221", +- "self_type" : "type-1220", ++ "referenced_type" : "type-1219", ++ "self_type" : "type-1218", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -18808,8 +20220,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Parcel &", + "name" : "android::hardware::Parcel &", +- "referenced_type" : "type-2371", +- "self_type" : "type-2370", ++ "referenced_type" : "type-2367", ++ "self_type" : "type-2366", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -18826,8 +20238,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Parcel &", + "name" : "android::hardware::Parcel &", +- "referenced_type" : "type-3697", +- "self_type" : "type-3696", ++ "referenced_type" : "type-3693", ++ "self_type" : "type-3692", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -18835,8 +20247,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ProcessState::handle_entry &", + "name" : "android::hardware::ProcessState::handle_entry &", +- "referenced_type" : "type-2228", +- "self_type" : "type-3646", ++ "referenced_type" : "type-2224", ++ "self_type" : "type-3640", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -18844,8 +20256,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Return &", + "name" : "android::hardware::Return &", +- "referenced_type" : "type-764", +- "self_type" : "type-767", ++ "referenced_type" : "type-762", ++ "self_type" : "type-765", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18853,8 +20265,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-757", +- "self_type" : "type-760", ++ "referenced_type" : "type-755", ++ "self_type" : "type-758", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18862,8 +20274,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-944", +- "self_type" : "type-947", ++ "referenced_type" : "type-942", ++ "self_type" : "type-945", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18871,8 +20283,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-1053", +- "self_type" : "type-1056", ++ "referenced_type" : "type-1051", ++ "self_type" : "type-1054", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18880,8 +20292,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-1110", +- "self_type" : "type-1113", ++ "referenced_type" : "type-1108", ++ "self_type" : "type-1111", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18889,8 +20301,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-1945", +- "self_type" : "type-1948", ++ "referenced_type" : "type-1941", ++ "self_type" : "type-1944", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18898,8 +20310,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-2015", +- "self_type" : "type-2018", ++ "referenced_type" : "type-2011", ++ "self_type" : "type-2014", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18934,8 +20346,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-2190", +- "self_type" : "type-2189", ++ "referenced_type" : "type-2186", ++ "self_type" : "type-2185", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -18943,8 +20355,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-2240", +- "self_type" : "type-2239", ++ "referenced_type" : "type-2236", ++ "self_type" : "type-2235", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -18952,8 +20364,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-2285", +- "self_type" : "type-2287", ++ "referenced_type" : "type-2281", ++ "self_type" : "type-2283", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -18961,8 +20373,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-3304", +- "self_type" : "type-3303", ++ "referenced_type" : "type-3298", ++ "self_type" : "type-3297", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -18970,8 +20382,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-3345", +- "self_type" : "type-3344", ++ "referenced_type" : "type-3339", ++ "self_type" : "type-3338", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -18979,8 +20391,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-3659", +- "self_type" : "type-3658", ++ "referenced_type" : "type-3653", ++ "self_type" : "type-3652", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -18988,8 +20400,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::details::hidl_pointer > &", + "name" : "android::hardware::details::hidl_pointer > &", +- "referenced_type" : "type-968", +- "self_type" : "type-1035", ++ "referenced_type" : "type-966", ++ "self_type" : "type-1033", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -18997,8 +20409,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::details::hidl_pointer &", + "name" : "android::hardware::details::hidl_pointer &", +- "referenced_type" : "type-572", +- "self_type" : "type-1031", ++ "referenced_type" : "type-571", ++ "self_type" : "type-1029", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19006,8 +20418,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::details::hidl_pointer &", + "name" : "android::hardware::details::hidl_pointer &", +- "referenced_type" : "type-792", +- "self_type" : "type-808", ++ "referenced_type" : "type-790", ++ "self_type" : "type-806", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19025,7 +20437,7 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer &", + "name" : "android::hardware::details::hidl_pointer &", + "referenced_type" : "type-9", +- "self_type" : "type-587", ++ "self_type" : "type-586", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19033,8 +20445,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::details::hidl_pointer &", + "name" : "android::hardware::details::hidl_pointer &", +- "referenced_type" : "type-474", +- "self_type" : "type-779", ++ "referenced_type" : "type-473", ++ "self_type" : "type-777", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19051,8 +20463,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::hidl_array &", + "name" : "android::hardware::hidl_array &", +- "referenced_type" : "type-971", +- "self_type" : "type-1038", ++ "referenced_type" : "type-969", ++ "self_type" : "type-1036", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19087,8 +20499,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::hidl_vec > &", + "name" : "android::hardware::hidl_vec > &", +- "referenced_type" : "type-967", +- "self_type" : "type-976", ++ "referenced_type" : "type-965", ++ "self_type" : "type-974", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19096,8 +20508,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::hidl_vec &", + "name" : "android::hardware::hidl_vec &", +- "referenced_type" : "type-571", +- "self_type" : "type-966", ++ "referenced_type" : "type-570", ++ "self_type" : "type-964", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19105,8 +20517,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::hidl_vec::iter &", + "name" : "android::hardware::hidl_vec::iter &", +- "referenced_type" : "type-576", +- "self_type" : "type-580", ++ "referenced_type" : "type-575", ++ "self_type" : "type-579", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19114,8 +20526,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::hidl_vec &", + "name" : "android::hardware::hidl_vec &", +- "referenced_type" : "type-473", +- "self_type" : "type-785", ++ "referenced_type" : "type-472", ++ "self_type" : "type-783", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19123,8 +20535,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &", + "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &", +- "referenced_type" : "type-503", +- "self_type" : "type-813", ++ "referenced_type" : "type-502", ++ "self_type" : "type-811", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19132,8 +20544,8 @@ + "alignment" : 8, + "linker_set_key" : "android::key_value_pair_t > &", + "name" : "android::key_value_pair_t > &", +- "referenced_type" : "type-3621", +- "self_type" : "type-3632", ++ "referenced_type" : "type-3615", ++ "self_type" : "type-3626", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -19141,8 +20553,8 @@ + "alignment" : 8, + "linker_set_key" : "android::key_value_pair_t &", + "name" : "android::key_value_pair_t &", +- "referenced_type" : "type-2196", +- "self_type" : "type-2209", ++ "referenced_type" : "type-2192", ++ "self_type" : "type-2205", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -19150,8 +20562,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-426", +- "self_type" : "type-3445", ++ "referenced_type" : "type-425", ++ "self_type" : "type-3439", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19159,8 +20571,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-2281", +- "self_type" : "type-2309", ++ "referenced_type" : "type-2277", ++ "self_type" : "type-2305", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19168,8 +20580,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-384", +- "self_type" : "type-439", ++ "referenced_type" : "type-383", ++ "self_type" : "type-438", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19177,8 +20589,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-445", +- "self_type" : "type-3657", ++ "referenced_type" : "type-444", ++ "self_type" : "type-3651", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19186,8 +20598,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-743", +- "self_type" : "type-746", ++ "referenced_type" : "type-741", ++ "self_type" : "type-744", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19195,8 +20607,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-907", +- "self_type" : "type-942", ++ "referenced_type" : "type-905", ++ "self_type" : "type-940", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19205,7 +20617,7 @@ + "linker_set_key" : "android::sp &", + "name" : "android::sp &", + "referenced_type" : "type-300", +- "self_type" : "type-612", ++ "self_type" : "type-611", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19213,8 +20625,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-527", +- "self_type" : "type-935", ++ "referenced_type" : "type-526", ++ "self_type" : "type-933", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19222,8 +20634,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-543", +- "self_type" : "type-938", ++ "referenced_type" : "type-542", ++ "self_type" : "type-935", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19231,8 +20643,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-532", +- "self_type" : "type-725", ++ "referenced_type" : "type-531", ++ "self_type" : "type-722", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19240,8 +20652,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-549", +- "self_type" : "type-1943", ++ "referenced_type" : "type-547", ++ "self_type" : "type-1939", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19249,8 +20661,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-538", +- "self_type" : "type-733", ++ "referenced_type" : "type-536", ++ "self_type" : "type-731", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19259,7 +20671,7 @@ + "linker_set_key" : "android::wp &", + "name" : "android::wp &", + "referenced_type" : "type-331", +- "self_type" : "type-425", ++ "self_type" : "type-424", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -19267,8 +20679,8 @@ + "alignment" : 8, + "linker_set_key" : "android::wp &", + "name" : "android::wp &", +- "referenced_type" : "type-900", +- "self_type" : "type-2216", ++ "referenced_type" : "type-898", ++ "self_type" : "type-2212", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -19276,8 +20688,8 @@ + "alignment" : 8, + "linker_set_key" : "android::wp &", + "name" : "android::wp &", +- "referenced_type" : "type-2194", +- "self_type" : "type-3571", ++ "referenced_type" : "type-2190", ++ "self_type" : "type-3565", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -19286,7 +20698,7 @@ + "linker_set_key" : "android::wp &", + "name" : "android::wp &", + "referenced_type" : "type-309", +- "self_type" : "type-414", ++ "self_type" : "type-413", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -19294,8 +20706,8 @@ + "alignment" : 8, + "linker_set_key" : "char *const &", + "name" : "char *const &", +- "referenced_type" : "type-3606", +- "self_type" : "type-3607", ++ "referenced_type" : "type-3600", ++ "self_type" : "type-3601", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19303,8 +20715,8 @@ + "alignment" : 8, + "linker_set_key" : "char const (&)[10]", + "name" : "char const (&)[10]", +- "referenced_type" : "type-3468", +- "self_type" : "type-3470", ++ "referenced_type" : "type-3462", ++ "self_type" : "type-3464", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19312,8 +20724,8 @@ + "alignment" : 8, + "linker_set_key" : "char const (&)[11]", + "name" : "char const (&)[11]", +- "referenced_type" : "type-3493", +- "self_type" : "type-3495", ++ "referenced_type" : "type-3487", ++ "self_type" : "type-3489", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19321,8 +20733,8 @@ + "alignment" : 8, + "linker_set_key" : "char const (&)[12]", + "name" : "char const (&)[12]", +- "referenced_type" : "type-3463", +- "self_type" : "type-3466", ++ "referenced_type" : "type-3457", ++ "self_type" : "type-3459", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19330,8 +20742,8 @@ + "alignment" : 8, + "linker_set_key" : "char const (&)[13]", + "name" : "char const (&)[13]", +- "referenced_type" : "type-3460", +- "self_type" : "type-3462", ++ "referenced_type" : "type-3454", ++ "self_type" : "type-3456", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19339,8 +20751,8 @@ + "alignment" : 8, + "linker_set_key" : "char const (&)[14]", + "name" : "char const (&)[14]", +- "referenced_type" : "type-3512", +- "self_type" : "type-3514", ++ "referenced_type" : "type-3506", ++ "self_type" : "type-3508", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19348,8 +20760,8 @@ + "alignment" : 8, + "linker_set_key" : "char const (&)[15]", + "name" : "char const (&)[15]", +- "referenced_type" : "type-3611", +- "self_type" : "type-3613", ++ "referenced_type" : "type-3605", ++ "self_type" : "type-3607", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19357,8 +20769,8 @@ + "alignment" : 8, + "linker_set_key" : "char const (&)[16]", + "name" : "char const (&)[16]", +- "referenced_type" : "type-3497", +- "self_type" : "type-3499", ++ "referenced_type" : "type-3491", ++ "self_type" : "type-3493", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19366,8 +20778,8 @@ + "alignment" : 8, + "linker_set_key" : "char const (&)[17]", + "name" : "char const (&)[17]", +- "referenced_type" : "type-3515", +- "self_type" : "type-3517", ++ "referenced_type" : "type-3509", ++ "self_type" : "type-3511", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19375,8 +20787,8 @@ + "alignment" : 8, + "linker_set_key" : "char const (&)[18]", + "name" : "char const (&)[18]", +- "referenced_type" : "type-3500", +- "self_type" : "type-3502", ++ "referenced_type" : "type-3494", ++ "self_type" : "type-3496", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19384,8 +20796,8 @@ + "alignment" : 8, + "linker_set_key" : "char const (&)[19]", + "name" : "char const (&)[19]", +- "referenced_type" : "type-3531", +- "self_type" : "type-3533", ++ "referenced_type" : "type-3525", ++ "self_type" : "type-3527", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19393,8 +20805,8 @@ + "alignment" : 8, + "linker_set_key" : "char const (&)[20]", + "name" : "char const (&)[20]", +- "referenced_type" : "type-3509", +- "self_type" : "type-3511", ++ "referenced_type" : "type-3503", ++ "self_type" : "type-3505", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19402,8 +20814,8 @@ + "alignment" : 8, + "linker_set_key" : "char const (&)[22]", + "name" : "char const (&)[22]", +- "referenced_type" : "type-3534", +- "self_type" : "type-3536", ++ "referenced_type" : "type-3528", ++ "self_type" : "type-3530", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19411,8 +20823,8 @@ + "alignment" : 8, + "linker_set_key" : "char const (&)[25]", + "name" : "char const (&)[25]", +- "referenced_type" : "type-3524", +- "self_type" : "type-3526", ++ "referenced_type" : "type-3518", ++ "self_type" : "type-3520", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19420,8 +20832,8 @@ + "alignment" : 8, + "linker_set_key" : "char const (&)[28]", + "name" : "char const (&)[28]", +- "referenced_type" : "type-3546", +- "self_type" : "type-3548", ++ "referenced_type" : "type-3540", ++ "self_type" : "type-3542", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19429,8 +20841,8 @@ + "alignment" : 8, + "linker_set_key" : "char const (&)[29]", + "name" : "char const (&)[29]", +- "referenced_type" : "type-3521", +- "self_type" : "type-3523", ++ "referenced_type" : "type-3515", ++ "self_type" : "type-3517", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19438,8 +20850,8 @@ + "alignment" : 8, + "linker_set_key" : "char const (&)[2]", + "name" : "char const (&)[2]", +- "referenced_type" : "type-3472", +- "self_type" : "type-3474", ++ "referenced_type" : "type-3466", ++ "self_type" : "type-3468", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19447,8 +20859,8 @@ + "alignment" : 8, + "linker_set_key" : "char const (&)[31]", + "name" : "char const (&)[31]", +- "referenced_type" : "type-3506", +- "self_type" : "type-3508", ++ "referenced_type" : "type-3500", ++ "self_type" : "type-3502", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19456,8 +20868,8 @@ + "alignment" : 8, + "linker_set_key" : "char const (&)[32]", + "name" : "char const (&)[32]", +- "referenced_type" : "type-3537", +- "self_type" : "type-3540", ++ "referenced_type" : "type-3531", ++ "self_type" : "type-3534", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19465,8 +20877,8 @@ + "alignment" : 8, + "linker_set_key" : "char const (&)[35]", + "name" : "char const (&)[35]", +- "referenced_type" : "type-3528", +- "self_type" : "type-3530", ++ "referenced_type" : "type-3522", ++ "self_type" : "type-3524", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19474,8 +20886,8 @@ + "alignment" : 8, + "linker_set_key" : "char const (&)[37]", + "name" : "char const (&)[37]", +- "referenced_type" : "type-3518", +- "self_type" : "type-3520", ++ "referenced_type" : "type-3512", ++ "self_type" : "type-3514", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19483,8 +20895,8 @@ + "alignment" : 8, + "linker_set_key" : "char const (&)[3]", + "name" : "char const (&)[3]", +- "referenced_type" : "type-3485", +- "self_type" : "type-3489", ++ "referenced_type" : "type-3479", ++ "self_type" : "type-3481", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19492,8 +20904,8 @@ + "alignment" : 8, + "linker_set_key" : "char const (&)[4]", + "name" : "char const (&)[4]", +- "referenced_type" : "type-3608", +- "self_type" : "type-3610", ++ "referenced_type" : "type-3602", ++ "self_type" : "type-3604", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19501,8 +20913,8 @@ + "alignment" : 8, + "linker_set_key" : "char const (&)[5]", + "name" : "char const (&)[5]", +- "referenced_type" : "type-3614", +- "self_type" : "type-3616", ++ "referenced_type" : "type-3608", ++ "self_type" : "type-3610", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19510,8 +20922,8 @@ + "alignment" : 8, + "linker_set_key" : "char const (&)[6]", + "name" : "char const (&)[6]", +- "referenced_type" : "type-3475", +- "self_type" : "type-3478", ++ "referenced_type" : "type-3469", ++ "self_type" : "type-3471", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19519,8 +20931,8 @@ + "alignment" : 8, + "linker_set_key" : "char const (&)[7]", + "name" : "char const (&)[7]", +- "referenced_type" : "type-3503", +- "self_type" : "type-3505", ++ "referenced_type" : "type-3497", ++ "self_type" : "type-3499", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19528,8 +20940,8 @@ + "alignment" : 8, + "linker_set_key" : "char const (&)[8]", + "name" : "char const (&)[8]", +- "referenced_type" : "type-3490", +- "self_type" : "type-3492", ++ "referenced_type" : "type-3482", ++ "self_type" : "type-3486", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19537,8 +20949,8 @@ + "alignment" : 8, + "linker_set_key" : "char const (&)[9]", + "name" : "char const (&)[9]", +- "referenced_type" : "type-3479", +- "self_type" : "type-3481", ++ "referenced_type" : "type-3473", ++ "self_type" : "type-3475", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19564,8 +20976,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::BpHwBinder::Obituary &", + "name" : "const android::hardware::BpHwBinder::Obituary &", +- "referenced_type" : "type-2203", +- "self_type" : "type-2227", ++ "referenced_type" : "type-2199", ++ "self_type" : "type-2223", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -19573,8 +20985,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &", + "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &", +- "referenced_type" : "type-2210", +- "self_type" : "type-2211", ++ "referenced_type" : "type-2206", ++ "self_type" : "type-2207", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -19582,8 +20994,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::HexDump &", + "name" : "const android::hardware::HexDump &", +- "referenced_type" : "type-2300", +- "self_type" : "type-3716", ++ "referenced_type" : "type-2296", ++ "self_type" : "type-3710", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19591,8 +21003,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1084", +- "self_type" : "type-1086", ++ "referenced_type" : "type-1082", ++ "self_type" : "type-1084", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -19600,8 +21012,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1142", +- "self_type" : "type-1144", ++ "referenced_type" : "type-1140", ++ "self_type" : "type-1142", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -19609,8 +21021,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1215", +- "self_type" : "type-1217", ++ "referenced_type" : "type-1213", ++ "self_type" : "type-1215", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19618,8 +21030,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1780", +- "self_type" : "type-1782", ++ "referenced_type" : "type-1776", ++ "self_type" : "type-1778", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19627,8 +21039,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1862", +- "self_type" : "type-1864", ++ "referenced_type" : "type-1858", ++ "self_type" : "type-1860", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -19636,8 +21048,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1918", +- "self_type" : "type-1920", ++ "referenced_type" : "type-1914", ++ "self_type" : "type-1916", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -19645,8 +21057,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1984", +- "self_type" : "type-1986", ++ "referenced_type" : "type-1980", ++ "self_type" : "type-1982", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -19654,8 +21066,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2037", +- "self_type" : "type-2039", ++ "referenced_type" : "type-2033", ++ "self_type" : "type-2035", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19663,8 +21075,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2091", +- "self_type" : "type-2093", ++ "referenced_type" : "type-2087", ++ "self_type" : "type-2089", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -19672,8 +21084,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2166", +- "self_type" : "type-2167", ++ "referenced_type" : "type-2162", ++ "self_type" : "type-2163", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -19681,8 +21093,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2365", +- "self_type" : "type-2367", ++ "referenced_type" : "type-2361", ++ "self_type" : "type-2363", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19690,8 +21102,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2921", +- "self_type" : "type-2923", ++ "referenced_type" : "type-2915", ++ "self_type" : "type-2917", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19699,8 +21111,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3003", +- "self_type" : "type-3005", ++ "referenced_type" : "type-2997", ++ "self_type" : "type-2999", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -19708,8 +21120,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3059", +- "self_type" : "type-3061", ++ "referenced_type" : "type-3053", ++ "self_type" : "type-3055", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -19717,8 +21129,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3123", +- "self_type" : "type-3125", ++ "referenced_type" : "type-3117", ++ "self_type" : "type-3119", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -19735,8 +21147,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3174", +- "self_type" : "type-3176", ++ "referenced_type" : "type-3168", ++ "self_type" : "type-3170", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19744,8 +21156,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3225", +- "self_type" : "type-3227", ++ "referenced_type" : "type-3219", ++ "self_type" : "type-3221", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -19753,8 +21165,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3668", +- "self_type" : "type-3690", ++ "referenced_type" : "type-3664", ++ "self_type" : "type-3685", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19762,8 +21174,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-998", +- "self_type" : "type-1000", ++ "referenced_type" : "type-996", ++ "self_type" : "type-998", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19771,8 +21183,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::ProcessState::handle_entry &", + "name" : "const android::hardware::ProcessState::handle_entry &", +- "referenced_type" : "type-3625", +- "self_type" : "type-3647", ++ "referenced_type" : "type-3619", ++ "self_type" : "type-3641", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -19780,8 +21192,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Return &", + "name" : "const android::hardware::Return &", +- "referenced_type" : "type-460", +- "self_type" : "type-951", ++ "referenced_type" : "type-459", ++ "self_type" : "type-948", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -19789,8 +21201,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Return &", + "name" : "const android::hardware::Return &", +- "referenced_type" : "type-714", +- "self_type" : "type-715", ++ "referenced_type" : "type-712", ++ "self_type" : "type-713", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -19807,8 +21219,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::TypeCode &", + "name" : "const android::hardware::TypeCode &", +- "referenced_type" : "type-2295", +- "self_type" : "type-3715", ++ "referenced_type" : "type-2291", ++ "self_type" : "type-3709", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19816,8 +21228,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::details::SchedPrio &", + "name" : "const android::hardware::details::SchedPrio &", +- "referenced_type" : "type-1010", +- "self_type" : "type-1009", ++ "referenced_type" : "type-1008", ++ "self_type" : "type-1007", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -19834,8 +21246,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::details::hidl_pointer &", + "name" : "const android::hardware::details::hidl_pointer &", +- "referenced_type" : "type-492", +- "self_type" : "type-786", ++ "referenced_type" : "type-491", ++ "self_type" : "type-784", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19870,8 +21282,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::hidl_vec > &", + "name" : "const android::hardware::hidl_vec > &", +- "referenced_type" : "type-2083", +- "self_type" : "type-2096", ++ "referenced_type" : "type-2079", ++ "self_type" : "type-2092", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19879,8 +21291,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::hidl_vec &", + "name" : "const android::hardware::hidl_vec &", +- "referenced_type" : "type-574", +- "self_type" : "type-1002", ++ "referenced_type" : "type-573", ++ "self_type" : "type-1000", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19888,8 +21300,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::hidl_vec &", + "name" : "const android::hardware::hidl_vec &", +- "referenced_type" : "type-981", +- "self_type" : "type-1003", ++ "referenced_type" : "type-979", ++ "self_type" : "type-1001", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19897,8 +21309,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::hidl_vec::iter &", + "name" : "const android::hardware::hidl_vec::iter &", +- "referenced_type" : "type-581", +- "self_type" : "type-583", ++ "referenced_type" : "type-580", ++ "self_type" : "type-582", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19906,8 +21318,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::hidl_vec &", + "name" : "const android::hardware::hidl_vec &", +- "referenced_type" : "type-477", +- "self_type" : "type-479", ++ "referenced_type" : "type-476", ++ "self_type" : "type-478", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19924,8 +21336,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hidl::base::V1_0::IBase *const &", + "name" : "const android::hidl::base::V1_0::IBase *const &", +- "referenced_type" : "type-345", +- "self_type" : "type-346", ++ "referenced_type" : "type-341", ++ "self_type" : "type-342", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -19933,8 +21345,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &", + "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &", +- "referenced_type" : "type-980", +- "self_type" : "type-1033", ++ "referenced_type" : "type-978", ++ "self_type" : "type-1031", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19942,8 +21354,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::key_value_pair_t > &", + "name" : "const android::key_value_pair_t > &", +- "referenced_type" : "type-3620", +- "self_type" : "type-3622", ++ "referenced_type" : "type-3614", ++ "self_type" : "type-3616", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -19951,8 +21363,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::key_value_pair_t &", + "name" : "const android::key_value_pair_t &", +- "referenced_type" : "type-2195", +- "self_type" : "type-2197", ++ "referenced_type" : "type-2191", ++ "self_type" : "type-2193", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -19960,8 +21372,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-3450", +- "self_type" : "type-3458", ++ "referenced_type" : "type-3444", ++ "self_type" : "type-3452", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19969,8 +21381,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-2308", +- "self_type" : "type-2307", ++ "referenced_type" : "type-2304", ++ "self_type" : "type-2303", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19978,8 +21390,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-2168", +- "self_type" : "type-2170", ++ "referenced_type" : "type-2164", ++ "self_type" : "type-2166", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -19987,8 +21399,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-2217", +- "self_type" : "type-2218", ++ "referenced_type" : "type-2213", ++ "self_type" : "type-2214", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -19996,8 +21408,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-3288", +- "self_type" : "type-3290", ++ "referenced_type" : "type-3282", ++ "self_type" : "type-3284", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -20005,8 +21417,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-2334", +- "self_type" : "type-2336", ++ "referenced_type" : "type-2330", ++ "self_type" : "type-2332", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, +@@ -20014,8 +21426,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-3388", +- "self_type" : "type-3390", ++ "referenced_type" : "type-3382", ++ "self_type" : "type-3384", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, +@@ -20023,8 +21435,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-3395", +- "self_type" : "type-3397", ++ "referenced_type" : "type-3389", ++ "self_type" : "type-3391", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, +@@ -20032,8 +21444,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-440", +- "self_type" : "type-693", ++ "referenced_type" : "type-439", ++ "self_type" : "type-691", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20041,8 +21453,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-3407", +- "self_type" : "type-3406", ++ "referenced_type" : "type-3401", ++ "self_type" : "type-3400", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h" + }, +@@ -20050,8 +21462,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-718", +- "self_type" : "type-724", ++ "referenced_type" : "type-716", ++ "self_type" : "type-721", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20059,8 +21471,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-450", +- "self_type" : "type-3431", ++ "referenced_type" : "type-449", ++ "self_type" : "type-3425", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20068,8 +21480,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-906", +- "self_type" : "type-909", ++ "referenced_type" : "type-904", ++ "self_type" : "type-907", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20086,8 +21498,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-411", +- "self_type" : "type-413", ++ "referenced_type" : "type-410", ++ "self_type" : "type-411", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20095,8 +21507,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-530", +- "self_type" : "type-866", ++ "referenced_type" : "type-529", ++ "self_type" : "type-864", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20104,8 +21516,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-546", +- "self_type" : "type-737", ++ "referenced_type" : "type-545", ++ "self_type" : "type-735", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20113,8 +21525,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-535", +- "self_type" : "type-717", ++ "referenced_type" : "type-534", ++ "self_type" : "type-715", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20122,8 +21534,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-554", +- "self_type" : "type-741", ++ "referenced_type" : "type-553", ++ "self_type" : "type-738", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20131,8 +21543,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-541", +- "self_type" : "type-726", ++ "referenced_type" : "type-540", ++ "self_type" : "type-724", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20140,8 +21552,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-423", +- "self_type" : "type-424", ++ "referenced_type" : "type-422", ++ "self_type" : "type-423", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20149,8 +21561,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-2171", +- "self_type" : "type-2172", ++ "referenced_type" : "type-2167", ++ "self_type" : "type-2168", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -20158,8 +21570,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-1212", +- "self_type" : "type-1214", ++ "referenced_type" : "type-1210", ++ "self_type" : "type-1212", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -20167,8 +21579,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-2362", +- "self_type" : "type-2364", ++ "referenced_type" : "type-2358", ++ "self_type" : "type-2360", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -20185,8 +21597,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-3565", +- "self_type" : "type-3566", ++ "referenced_type" : "type-3559", ++ "self_type" : "type-3560", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20194,8 +21606,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-3653", +- "self_type" : "type-3660", ++ "referenced_type" : "type-3649", ++ "self_type" : "type-3654", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -20203,8 +21615,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-418", +- "self_type" : "type-419", ++ "referenced_type" : "type-417", ++ "self_type" : "type-418", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20212,8 +21624,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-415", +- "self_type" : "type-689", ++ "referenced_type" : "type-414", ++ "self_type" : "type-687", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20221,8 +21633,8 @@ + "alignment" : 8, + "linker_set_key" : "const bool &", + "name" : "const bool &", +- "referenced_type" : "type-456", +- "self_type" : "type-480", ++ "referenced_type" : "type-454", ++ "self_type" : "type-479", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20231,7 +21643,7 @@ + "linker_set_key" : "const char &", + "name" : "const char &", + "referenced_type" : "type-42", +- "self_type" : "type-2306", ++ "self_type" : "type-2302", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -20239,8 +21651,8 @@ + "alignment" : 8, + "linker_set_key" : "const char *const &", + "name" : "const char *const &", +- "referenced_type" : "type-2289", +- "self_type" : "type-2290", ++ "referenced_type" : "type-2285", ++ "self_type" : "type-2286", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -20257,8 +21669,8 @@ + "alignment" : 8, + "linker_set_key" : "const flat_binder_object &", + "name" : "const flat_binder_object &", +- "referenced_type" : "type-3583", +- "self_type" : "type-3585", ++ "referenced_type" : "type-3577", ++ "self_type" : "type-3579", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -20266,8 +21678,8 @@ + "alignment" : 8, + "linker_set_key" : "const float &", + "name" : "const float &", +- "referenced_type" : "type-616", +- "self_type" : "type-617", ++ "referenced_type" : "type-615", ++ "self_type" : "type-616", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20283,155 +21695,155 @@ + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1062", +- "self_type" : "type-1064", ++ "referenced_type" : "type-1060", ++ "self_type" : "type-1062", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1119", +- "self_type" : "type-1121", ++ "referenced_type" : "type-1117", ++ "self_type" : "type-1119", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1195", +- "self_type" : "type-1197", ++ "referenced_type" : "type-1193", ++ "self_type" : "type-1195", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1300", +- "self_type" : "type-1302", ++ "referenced_type" : "type-1297", ++ "self_type" : "type-1299", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1370", +- "self_type" : "type-1372", ++ "referenced_type" : "type-1367", ++ "self_type" : "type-1369", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1502", +- "self_type" : "type-1504", ++ "referenced_type" : "type-1499", ++ "self_type" : "type-1501", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1541", +- "self_type" : "type-1543", ++ "referenced_type" : "type-1537", ++ "self_type" : "type-1539", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1609", +- "self_type" : "type-1611", ++ "referenced_type" : "type-1605", ++ "self_type" : "type-1607", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1635", +- "self_type" : "type-1643", ++ "referenced_type" : "type-1631", ++ "self_type" : "type-1639", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1679", +- "self_type" : "type-1681", ++ "referenced_type" : "type-1675", ++ "self_type" : "type-1677", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1753", +- "self_type" : "type-1755", ++ "referenced_type" : "type-1749", ++ "self_type" : "type-1751", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1840", +- "self_type" : "type-1842", ++ "referenced_type" : "type-1836", ++ "self_type" : "type-1838", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1895", +- "self_type" : "type-1897", ++ "referenced_type" : "type-1891", ++ "self_type" : "type-1893", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1955", +- "self_type" : "type-1957", ++ "referenced_type" : "type-1951", ++ "self_type" : "type-1953", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2027", +- "self_type" : "type-2029", ++ "referenced_type" : "type-2023", ++ "self_type" : "type-2025", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2073", +- "self_type" : "type-2075", ++ "referenced_type" : "type-2069", ++ "self_type" : "type-2071", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2123", +- "self_type" : "type-2125", ++ "referenced_type" : "type-2119", ++ "self_type" : "type-2121", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2346", +- "self_type" : "type-2348", ++ "referenced_type" : "type-2342", ++ "self_type" : "type-2344", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2449", +- "self_type" : "type-2451", ++ "referenced_type" : "type-2444", ++ "self_type" : "type-2446", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2519", +- "self_type" : "type-2521", ++ "referenced_type" : "type-2514", ++ "self_type" : "type-2516", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2643", +- "self_type" : "type-2645", ++ "referenced_type" : "type-2638", ++ "self_type" : "type-2640", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2682", +- "self_type" : "type-2684", ++ "referenced_type" : "type-2676", ++ "self_type" : "type-2678", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -20444,113 +21856,113 @@ + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2750", +- "self_type" : "type-2752", ++ "referenced_type" : "type-2744", ++ "self_type" : "type-2746", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2776", +- "self_type" : "type-2784", ++ "referenced_type" : "type-2770", ++ "self_type" : "type-2778", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2820", +- "self_type" : "type-2822", ++ "referenced_type" : "type-2814", ++ "self_type" : "type-2816", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2894", +- "self_type" : "type-2896", ++ "referenced_type" : "type-2888", ++ "self_type" : "type-2890", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2981", +- "self_type" : "type-2983", ++ "referenced_type" : "type-2975", ++ "self_type" : "type-2977", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3036", +- "self_type" : "type-3038", ++ "referenced_type" : "type-3030", ++ "self_type" : "type-3032", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3094", +- "self_type" : "type-3096", ++ "referenced_type" : "type-3088", ++ "self_type" : "type-3090", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3164", +- "self_type" : "type-3166", ++ "referenced_type" : "type-3158", ++ "self_type" : "type-3160", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3208", +- "self_type" : "type-3210", ++ "referenced_type" : "type-3202", ++ "self_type" : "type-3204", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3257", +- "self_type" : "type-3259", ++ "referenced_type" : "type-3251", ++ "self_type" : "type-3253", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3404", +- "self_type" : "type-3412", ++ "referenced_type" : "type-3398", ++ "self_type" : "type-3408", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3792", +- "self_type" : "type-3794", ++ "referenced_type" : "type-3785", ++ "self_type" : "type-3787", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3862", +- "self_type" : "type-3864", ++ "referenced_type" : "type-3855", ++ "self_type" : "type-3857", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-470", +- "self_type" : "type-472", ++ "referenced_type" : "type-469", ++ "self_type" : "type-471", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-567", +- "self_type" : "type-570", ++ "referenced_type" : "type-566", ++ "self_type" : "type-568", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-654", +- "self_type" : "type-656", ++ "referenced_type" : "type-653", ++ "self_type" : "type-655", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -20563,36 +21975,36 @@ + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-702", +- "self_type" : "type-704", ++ "referenced_type" : "type-700", ++ "self_type" : "type-702", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-780", +- "self_type" : "type-782", ++ "referenced_type" : "type-778", ++ "self_type" : "type-780", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-810", +- "self_type" : "type-818", ++ "referenced_type" : "type-808", ++ "self_type" : "type-816", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-874", +- "self_type" : "type-876", ++ "referenced_type" : "type-872", ++ "self_type" : "type-874", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-959", +- "self_type" : "type-961", ++ "referenced_type" : "type-957", ++ "self_type" : "type-959", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -20608,8 +22020,8 @@ + "alignment" : 8, + "linker_set_key" : "const long &", + "name" : "const long &", +- "referenced_type" : "type-605", +- "self_type" : "type-606", ++ "referenced_type" : "type-604", ++ "self_type" : "type-605", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20617,8 +22029,8 @@ + "alignment" : 8, + "linker_set_key" : "const short &", + "name" : "const short &", +- "referenced_type" : "type-548", +- "self_type" : "type-561", ++ "referenced_type" : "type-549", ++ "self_type" : "type-560", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20626,8 +22038,8 @@ + "alignment" : 8, + "linker_set_key" : "const signed char &", + "name" : "const signed char &", +- "referenced_type" : "type-483", +- "self_type" : "type-491", ++ "referenced_type" : "type-484", ++ "self_type" : "type-490", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20635,8 +22047,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1006", +- "self_type" : "type-1008", ++ "referenced_type" : "type-1004", ++ "self_type" : "type-1006", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20644,8 +22056,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1071", +- "self_type" : "type-1073", ++ "referenced_type" : "type-1069", ++ "self_type" : "type-1071", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20653,8 +22065,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1129", +- "self_type" : "type-1131", ++ "referenced_type" : "type-1127", ++ "self_type" : "type-1129", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20662,8 +22074,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1242", +- "self_type" : "type-1244", ++ "referenced_type" : "type-1239", ++ "self_type" : "type-1241", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20671,8 +22083,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1313", +- "self_type" : "type-1315", ++ "referenced_type" : "type-1310", ++ "self_type" : "type-1312", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -20680,8 +22092,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1391", +- "self_type" : "type-1393", ++ "referenced_type" : "type-1388", ++ "self_type" : "type-1390", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20689,8 +22101,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1495", +- "self_type" : "type-1545", ++ "referenced_type" : "type-1492", ++ "self_type" : "type-1541", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -20698,8 +22110,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1582", +- "self_type" : "type-1591", ++ "referenced_type" : "type-1581", ++ "self_type" : "type-1589", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -20707,8 +22119,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1628", +- "self_type" : "type-1630", ++ "referenced_type" : "type-1624", ++ "self_type" : "type-1626", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -20716,8 +22128,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1788", +- "self_type" : "type-1790", ++ "referenced_type" : "type-1784", ++ "self_type" : "type-1786", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20725,8 +22137,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1849", +- "self_type" : "type-1851", ++ "referenced_type" : "type-1845", ++ "self_type" : "type-1847", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20734,8 +22146,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1905", +- "self_type" : "type-1907", ++ "referenced_type" : "type-1901", ++ "self_type" : "type-1903", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20743,8 +22155,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1966", +- "self_type" : "type-1968", ++ "referenced_type" : "type-1962", ++ "self_type" : "type-1964", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20761,8 +22173,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2042", +- "self_type" : "type-2044", ++ "referenced_type" : "type-2038", ++ "self_type" : "type-2040", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20770,8 +22182,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2088", +- "self_type" : "type-2090", ++ "referenced_type" : "type-2084", ++ "self_type" : "type-2086", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -20779,8 +22191,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2392", +- "self_type" : "type-2394", ++ "referenced_type" : "type-2387", ++ "self_type" : "type-2389", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20788,8 +22200,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2462", +- "self_type" : "type-2464", ++ "referenced_type" : "type-2457", ++ "self_type" : "type-2459", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -20797,8 +22209,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2540", +- "self_type" : "type-2542", ++ "referenced_type" : "type-2535", ++ "self_type" : "type-2537", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20806,8 +22218,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2636", +- "self_type" : "type-2686", ++ "referenced_type" : "type-2631", ++ "self_type" : "type-2680", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -20815,8 +22227,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2723", +- "self_type" : "type-2732", ++ "referenced_type" : "type-2720", ++ "self_type" : "type-2728", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -20824,8 +22236,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2769", +- "self_type" : "type-2771", ++ "referenced_type" : "type-2763", ++ "self_type" : "type-2765", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -20833,8 +22245,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2929", +- "self_type" : "type-2931", ++ "referenced_type" : "type-2923", ++ "self_type" : "type-2925", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20842,8 +22254,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2990", +- "self_type" : "type-2992", ++ "referenced_type" : "type-2984", ++ "self_type" : "type-2986", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20851,8 +22263,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3046", +- "self_type" : "type-3048", ++ "referenced_type" : "type-3040", ++ "self_type" : "type-3042", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20860,8 +22272,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3105", +- "self_type" : "type-3107", ++ "referenced_type" : "type-3099", ++ "self_type" : "type-3101", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20869,8 +22281,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3179", +- "self_type" : "type-3181", ++ "referenced_type" : "type-3173", ++ "self_type" : "type-3175", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20878,8 +22290,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3222", +- "self_type" : "type-3224", ++ "referenced_type" : "type-3216", ++ "self_type" : "type-3218", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -20887,8 +22299,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-358", +- "self_type" : "type-360", ++ "referenced_type" : "type-357", ++ "self_type" : "type-359", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20896,8 +22308,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3734", +- "self_type" : "type-3736", ++ "referenced_type" : "type-3727", ++ "self_type" : "type-3729", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20905,8 +22317,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3805", +- "self_type" : "type-3807", ++ "referenced_type" : "type-3798", ++ "self_type" : "type-3800", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -20914,8 +22326,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3883", +- "self_type" : "type-3885", ++ "referenced_type" : "type-3876", ++ "self_type" : "type-3878", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20923,8 +22335,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-488", +- "self_type" : "type-490", ++ "referenced_type" : "type-487", ++ "self_type" : "type-489", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -20941,8 +22353,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-599", +- "self_type" : "type-601", ++ "referenced_type" : "type-598", ++ "self_type" : "type-600", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20950,8 +22362,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-647", +- "self_type" : "type-706", ++ "referenced_type" : "type-646", ++ "self_type" : "type-704", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -20959,7 +22371,7 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-751", ++ "referenced_type" : "type-752", + "self_type" : "type-761", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" +@@ -20968,8 +22380,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-803", +- "self_type" : "type-805", ++ "referenced_type" : "type-801", ++ "self_type" : "type-803", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -20977,8 +22389,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-1386", +- "self_type" : "type-1385", ++ "referenced_type" : "type-1383", ++ "self_type" : "type-1382", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20986,8 +22398,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-2535", +- "self_type" : "type-2534", ++ "referenced_type" : "type-2530", ++ "self_type" : "type-2529", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20995,8 +22407,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-3878", +- "self_type" : "type-3877", ++ "referenced_type" : "type-3871", ++ "self_type" : "type-3870", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21004,8 +22416,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-594", +- "self_type" : "type-593", ++ "referenced_type" : "type-593", ++ "self_type" : "type-592", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21013,8 +22425,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-1238", +- "self_type" : "type-1237", ++ "referenced_type" : "type-1235", ++ "self_type" : "type-1234", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21022,8 +22434,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-2388", +- "self_type" : "type-2387", ++ "referenced_type" : "type-2383", ++ "self_type" : "type-2382", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21031,8 +22443,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-353", +- "self_type" : "type-352", ++ "referenced_type" : "type-352", ++ "self_type" : "type-351", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21040,8 +22452,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-3730", +- "self_type" : "type-3729", ++ "referenced_type" : "type-3723", ++ "self_type" : "type-3722", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21049,8 +22461,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::function &", + "name" : "const std::function &", +- "referenced_type" : "type-1184", +- "self_type" : "type-1186", ++ "referenced_type" : "type-1182", ++ "self_type" : "type-1184", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -21058,8 +22470,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::function &", + "name" : "const std::function &", +- "referenced_type" : "type-2117", +- "self_type" : "type-2119", ++ "referenced_type" : "type-2113", ++ "self_type" : "type-2117", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -21076,8 +22488,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::function &", + "name" : "const std::function &", +- "referenced_type" : "type-3251", +- "self_type" : "type-3253", ++ "referenced_type" : "type-3245", ++ "self_type" : "type-3249", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -21085,8 +22497,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::function &", + "name" : "const std::function &", +- "referenced_type" : "type-3453", +- "self_type" : "type-3455", ++ "referenced_type" : "type-3447", ++ "self_type" : "type-3449", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -21094,8 +22506,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::unique_ptr > &", + "name" : "const std::unique_ptr > &", +- "referenced_type" : "type-3580", +- "self_type" : "type-3582", ++ "referenced_type" : "type-3574", ++ "self_type" : "type-3576", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -21103,8 +22515,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-1616", +- "self_type" : "type-1619", ++ "referenced_type" : "type-1612", ++ "self_type" : "type-1614", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21112,8 +22524,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-2757", +- "self_type" : "type-2760", ++ "referenced_type" : "type-2751", ++ "self_type" : "type-2753", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21121,8 +22533,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-787", +- "self_type" : "type-790", ++ "referenced_type" : "type-785", ++ "self_type" : "type-787", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21130,8 +22542,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1040", +- "self_type" : "type-1039", ++ "referenced_type" : "type-1038", ++ "self_type" : "type-1037", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21139,8 +22551,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1090", +- "self_type" : "type-1089", ++ "referenced_type" : "type-1088", ++ "self_type" : "type-1087", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21148,8 +22560,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1108", +- "self_type" : "type-1107", ++ "referenced_type" : "type-1106", ++ "self_type" : "type-1105", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21157,8 +22569,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1148", +- "self_type" : "type-1147", ++ "referenced_type" : "type-1146", ++ "self_type" : "type-1145", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21166,8 +22578,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1228", +- "self_type" : "type-1227", ++ "referenced_type" : "type-1226", ++ "self_type" : "type-1225", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21175,8 +22587,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1337", +- "self_type" : "type-1336", ++ "referenced_type" : "type-1334", ++ "self_type" : "type-1333", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21184,8 +22596,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1401", +- "self_type" : "type-1400", ++ "referenced_type" : "type-1398", ++ "self_type" : "type-1397", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21193,8 +22605,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1525", +- "self_type" : "type-1524", ++ "referenced_type" : "type-1521", ++ "self_type" : "type-1520", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21202,8 +22614,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1551", +- "self_type" : "type-1550", ++ "referenced_type" : "type-1547", ++ "self_type" : "type-1546", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21211,8 +22623,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1580", +- "self_type" : "type-1579", ++ "referenced_type" : "type-1579", ++ "self_type" : "type-1578", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21229,8 +22641,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1663", +- "self_type" : "type-1662", ++ "referenced_type" : "type-1658", ++ "self_type" : "type-1657", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21238,8 +22650,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1696", +- "self_type" : "type-1695", ++ "referenced_type" : "type-1692", ++ "self_type" : "type-1691", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21247,8 +22659,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1699", +- "self_type" : "type-1698", ++ "referenced_type" : "type-1695", ++ "self_type" : "type-1694", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21256,8 +22668,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1820", +- "self_type" : "type-1819", ++ "referenced_type" : "type-1816", ++ "self_type" : "type-1815", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21265,8 +22677,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1868", +- "self_type" : "type-1867", ++ "referenced_type" : "type-1864", ++ "self_type" : "type-1863", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21274,8 +22686,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1885", +- "self_type" : "type-1884", ++ "referenced_type" : "type-1881", ++ "self_type" : "type-1880", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21283,8 +22695,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1924", +- "self_type" : "type-1923", ++ "referenced_type" : "type-1920", ++ "self_type" : "type-1919", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21292,8 +22704,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1992", +- "self_type" : "type-1991", ++ "referenced_type" : "type-1987", ++ "self_type" : "type-1986", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21301,8 +22713,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2057", +- "self_type" : "type-2056", ++ "referenced_type" : "type-2053", ++ "self_type" : "type-2052", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21310,8 +22722,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2111", +- "self_type" : "type-2110", ++ "referenced_type" : "type-2107", ++ "self_type" : "type-2106", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21319,8 +22731,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2130", +- "self_type" : "type-2129", ++ "referenced_type" : "type-2126", ++ "self_type" : "type-2125", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21328,8 +22740,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2378", +- "self_type" : "type-2377", ++ "referenced_type" : "type-2374", ++ "self_type" : "type-2373", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21337,8 +22749,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2486", +- "self_type" : "type-2485", ++ "referenced_type" : "type-2481", ++ "self_type" : "type-2480", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21346,8 +22758,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2550", +- "self_type" : "type-2549", ++ "referenced_type" : "type-2545", ++ "self_type" : "type-2544", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21355,8 +22767,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2666", +- "self_type" : "type-2665", ++ "referenced_type" : "type-2660", ++ "self_type" : "type-2659", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21364,8 +22776,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2692", +- "self_type" : "type-2691", ++ "referenced_type" : "type-2686", ++ "self_type" : "type-2685", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21373,8 +22785,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2721", +- "self_type" : "type-2720", ++ "referenced_type" : "type-2718", ++ "self_type" : "type-2717", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21382,8 +22794,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2804", +- "self_type" : "type-2803", ++ "referenced_type" : "type-2797", ++ "self_type" : "type-2796", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21391,8 +22803,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2837", +- "self_type" : "type-2836", ++ "referenced_type" : "type-2831", ++ "self_type" : "type-2830", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21400,8 +22812,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2840", +- "self_type" : "type-2839", ++ "referenced_type" : "type-2834", ++ "self_type" : "type-2833", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21409,8 +22821,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2961", +- "self_type" : "type-2960", ++ "referenced_type" : "type-2955", ++ "self_type" : "type-2954", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21418,8 +22830,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3009", +- "self_type" : "type-3008", ++ "referenced_type" : "type-3003", ++ "self_type" : "type-3002", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21427,8 +22839,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3026", +- "self_type" : "type-3025", ++ "referenced_type" : "type-3020", ++ "self_type" : "type-3019", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21436,8 +22848,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3065", +- "self_type" : "type-3064", ++ "referenced_type" : "type-3059", ++ "self_type" : "type-3058", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21445,8 +22857,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3131", +- "self_type" : "type-3130", ++ "referenced_type" : "type-3124", ++ "self_type" : "type-3123", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21454,8 +22866,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3194", +- "self_type" : "type-3193", ++ "referenced_type" : "type-3188", ++ "self_type" : "type-3187", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21463,8 +22875,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3245", +- "self_type" : "type-3244", ++ "referenced_type" : "type-3239", ++ "self_type" : "type-3238", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21472,8 +22884,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3264", +- "self_type" : "type-3263", ++ "referenced_type" : "type-3258", ++ "self_type" : "type-3257", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21490,8 +22902,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3720", +- "self_type" : "type-3719", ++ "referenced_type" : "type-3714", ++ "self_type" : "type-3713", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21499,8 +22911,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3829", +- "self_type" : "type-3828", ++ "referenced_type" : "type-3822", ++ "self_type" : "type-3821", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21508,8 +22920,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3893", +- "self_type" : "type-3892", ++ "referenced_type" : "type-3886", ++ "self_type" : "type-3885", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21526,8 +22938,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-521", +- "self_type" : "type-520", ++ "referenced_type" : "type-520", ++ "self_type" : "type-519", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21535,8 +22947,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-610", +- "self_type" : "type-609", ++ "referenced_type" : "type-609", ++ "self_type" : "type-608", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21544,8 +22956,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-686", +- "self_type" : "type-685", ++ "referenced_type" : "type-684", ++ "self_type" : "type-683", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21553,8 +22965,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-712", +- "self_type" : "type-711", ++ "referenced_type" : "type-710", ++ "self_type" : "type-709", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21562,8 +22974,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-749", +- "self_type" : "type-748", ++ "referenced_type" : "type-750", ++ "self_type" : "type-749", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21571,8 +22983,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-858", +- "self_type" : "type-857", ++ "referenced_type" : "type-855", ++ "self_type" : "type-854", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21580,8 +22992,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-891", +- "self_type" : "type-890", ++ "referenced_type" : "type-889", ++ "self_type" : "type-888", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21589,8 +23001,8 @@ + "alignment" : 8, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-894", +- "self_type" : "type-893", ++ "referenced_type" : "type-892", ++ "self_type" : "type-891", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21607,8 +23019,8 @@ + "alignment" : 8, + "linker_set_key" : "const unsigned char &", + "name" : "const unsigned char &", +- "referenced_type" : "type-523", +- "self_type" : "type-537", ++ "referenced_type" : "type-522", ++ "self_type" : "type-538", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -21616,8 +23028,8 @@ + "alignment" : 8, + "linker_set_key" : "const unsigned char *const &", + "name" : "const unsigned char *const &", +- "referenced_type" : "type-3541", +- "self_type" : "type-3542", ++ "referenced_type" : "type-3535", ++ "self_type" : "type-3536", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21635,7 +23047,7 @@ + "linker_set_key" : "const unsigned long &", + "name" : "const unsigned long &", + "referenced_type" : "type-190", +- "self_type" : "type-615", ++ "self_type" : "type-614", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -21643,8 +23055,8 @@ + "alignment" : 8, + "linker_set_key" : "const unsigned long *const &", + "name" : "const unsigned long *const &", +- "referenced_type" : "type-3543", +- "self_type" : "type-3545", ++ "referenced_type" : "type-3537", ++ "self_type" : "type-3539", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21652,8 +23064,8 @@ + "alignment" : 8, + "linker_set_key" : "const unsigned long long &", + "name" : "const unsigned long long &", +- "referenced_type" : "type-2165", +- "self_type" : "type-3467", ++ "referenced_type" : "type-2161", ++ "self_type" : "type-3460", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21661,8 +23073,8 @@ + "alignment" : 8, + "linker_set_key" : "const unsigned short &", + "name" : "const unsigned short &", +- "referenced_type" : "type-562", +- "self_type" : "type-566", ++ "referenced_type" : "type-561", ++ "self_type" : "type-565", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -21670,8 +23082,8 @@ + "alignment" : 8, + "linker_set_key" : "const void *const &", + "name" : "const void *const &", +- "referenced_type" : "type-2198", +- "self_type" : "type-2199", ++ "referenced_type" : "type-2194", ++ "self_type" : "type-2195", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -21688,8 +23100,8 @@ + "alignment" : 8, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-1174", +- "self_type" : "type-1173", ++ "referenced_type" : "type-1172", ++ "self_type" : "type-1171", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -21697,8 +23109,8 @@ + "alignment" : 8, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-1603", +- "self_type" : "type-1602", ++ "referenced_type" : "type-1602", ++ "self_type" : "type-1601", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21706,8 +23118,8 @@ + "alignment" : 8, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-2023", +- "self_type" : "type-2022", ++ "referenced_type" : "type-2019", ++ "self_type" : "type-2018", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -21724,8 +23136,8 @@ + "alignment" : 8, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-2304", +- "self_type" : "type-2303", ++ "referenced_type" : "type-2300", ++ "self_type" : "type-2299", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21733,8 +23145,8 @@ + "alignment" : 8, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-2744", +- "self_type" : "type-2743", ++ "referenced_type" : "type-2741", ++ "self_type" : "type-2740", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21742,8 +23154,8 @@ + "alignment" : 8, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3160", +- "self_type" : "type-3159", ++ "referenced_type" : "type-3154", ++ "self_type" : "type-3153", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -21751,8 +23163,8 @@ + "alignment" : 8, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3365", +- "self_type" : "type-3364", ++ "referenced_type" : "type-3359", ++ "self_type" : "type-3358", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21760,8 +23172,8 @@ + "alignment" : 8, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3552", +- "self_type" : "type-3551", ++ "referenced_type" : "type-3546", ++ "self_type" : "type-3545", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21769,8 +23181,8 @@ + "alignment" : 8, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3618", +- "self_type" : "type-3617", ++ "referenced_type" : "type-3612", ++ "self_type" : "type-3611", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21778,8 +23190,8 @@ + "alignment" : 8, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3704", +- "self_type" : "type-3703", ++ "referenced_type" : "type-3698", ++ "self_type" : "type-3697", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21787,8 +23199,8 @@ + "alignment" : 8, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3718", +- "self_type" : "type-3717", ++ "referenced_type" : "type-3712", ++ "self_type" : "type-3711", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21805,8 +23217,8 @@ + "alignment" : 8, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-774", +- "self_type" : "type-773", ++ "referenced_type" : "type-775", ++ "self_type" : "type-774", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21815,7 +23227,7 @@ + "linker_set_key" : "unsigned char &", + "name" : "unsigned char &", + "referenced_type" : "type-146", +- "self_type" : "type-508", ++ "self_type" : "type-507", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -21823,8 +23235,8 @@ + "alignment" : 8, + "linker_set_key" : "void *const &", + "name" : "void *const &", +- "referenced_type" : "type-3482", +- "self_type" : "type-3484", ++ "referenced_type" : "type-3476", ++ "self_type" : "type-3478", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + } +@@ -21853,8 +23265,8 @@ + "alignment" : 8, + "linker_set_key" : "android::Condition *", + "name" : "android::Condition *", +- "referenced_type" : "type-396", +- "self_type" : "type-399", ++ "referenced_type" : "type-395", ++ "self_type" : "type-398", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Condition.h" + }, +@@ -21862,8 +23274,8 @@ + "alignment" : 8, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-2249", +- "self_type" : "type-2248", ++ "referenced_type" : "type-2245", ++ "self_type" : "type-2244", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -21871,8 +23283,8 @@ + "alignment" : 8, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-3348", +- "self_type" : "type-3347", ++ "referenced_type" : "type-3342", ++ "self_type" : "type-3341", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -21880,8 +23292,8 @@ + "alignment" : 8, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-3448", +- "self_type" : "type-3447", ++ "referenced_type" : "type-3442", ++ "self_type" : "type-3441", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -21889,8 +23301,8 @@ + "alignment" : 8, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-3604", +- "self_type" : "type-3603", ++ "referenced_type" : "type-3598", ++ "self_type" : "type-3597", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -21898,8 +23310,8 @@ + "alignment" : 8, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-3662", +- "self_type" : "type-3661", ++ "referenced_type" : "type-3656", ++ "self_type" : "type-3655", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -21907,8 +23319,8 @@ + "alignment" : 8, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-3709", +- "self_type" : "type-3708", ++ "referenced_type" : "type-3703", ++ "self_type" : "type-3702", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -21916,8 +23328,8 @@ + "alignment" : 8, + "linker_set_key" : "android::KeyedVector > *", + "name" : "android::KeyedVector > *", +- "referenced_type" : "type-383", +- "self_type" : "type-3648", ++ "referenced_type" : "type-382", ++ "self_type" : "type-3642", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -21925,8 +23337,8 @@ + "alignment" : 8, + "linker_set_key" : "android::KeyedVector *", + "name" : "android::KeyedVector *", +- "referenced_type" : "type-2152", +- "self_type" : "type-2229", ++ "referenced_type" : "type-2148", ++ "self_type" : "type-2225", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -21934,8 +23346,8 @@ + "alignment" : 8, + "linker_set_key" : "android::Mutex *", + "name" : "android::Mutex *", +- "referenced_type" : "type-390", +- "self_type" : "type-392", ++ "referenced_type" : "type-389", ++ "self_type" : "type-391", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Mutex.h" + }, +@@ -21943,8 +23355,8 @@ + "alignment" : 8, + "linker_set_key" : "android::Mutex::Autolock *", + "name" : "android::Mutex::Autolock *", +- "referenced_type" : "type-393", +- "self_type" : "type-395", ++ "referenced_type" : "type-392", ++ "self_type" : "type-394", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Mutex.h" + }, +@@ -21952,8 +23364,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RWLock *", + "name" : "android::RWLock *", +- "referenced_type" : "type-400", +- "self_type" : "type-403", ++ "referenced_type" : "type-399", ++ "self_type" : "type-402", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RWLock.h" + }, +@@ -21961,8 +23373,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RWLock::AutoRLock *", + "name" : "android::RWLock::AutoRLock *", +- "referenced_type" : "type-404", +- "self_type" : "type-406", ++ "referenced_type" : "type-403", ++ "self_type" : "type-405", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RWLock.h" + }, +@@ -21970,8 +23382,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RWLock::AutoWLock *", + "name" : "android::RWLock::AutoWLock *", +- "referenced_type" : "type-408", +- "self_type" : "type-409", ++ "referenced_type" : "type-406", ++ "self_type" : "type-408", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RWLock.h" + }, +@@ -21989,7 +23401,7 @@ + "linker_set_key" : "android::RefBase **", + "name" : "android::RefBase **", + "referenced_type" : "type-25", +- "self_type" : "type-3415", ++ "self_type" : "type-3409", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -21997,8 +23409,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase *const *", + "name" : "android::RefBase *const *", +- "referenced_type" : "type-3420", +- "self_type" : "type-3421", ++ "referenced_type" : "type-3414", ++ "self_type" : "type-3415", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -22006,8 +23418,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1060", +- "self_type" : "type-1059", ++ "referenced_type" : "type-1058", ++ "self_type" : "type-1057", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22015,8 +23427,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1117", +- "self_type" : "type-1116", ++ "referenced_type" : "type-1115", ++ "self_type" : "type-1114", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22024,8 +23436,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1192", +- "self_type" : "type-1191", ++ "referenced_type" : "type-1190", ++ "self_type" : "type-1189", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22033,8 +23445,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1298", +- "self_type" : "type-1297", ++ "referenced_type" : "type-1295", ++ "self_type" : "type-1294", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22042,8 +23454,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1367", +- "self_type" : "type-1366", ++ "referenced_type" : "type-1364", ++ "self_type" : "type-1363", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22051,8 +23463,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1499", +- "self_type" : "type-1498", ++ "referenced_type" : "type-1496", ++ "self_type" : "type-1495", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22060,8 +23472,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1510", +- "self_type" : "type-1509", ++ "referenced_type" : "type-1507", ++ "self_type" : "type-1506", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22069,8 +23481,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1538", +- "self_type" : "type-1537", ++ "referenced_type" : "type-1534", ++ "self_type" : "type-1533", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22078,8 +23490,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1606", +- "self_type" : "type-1605", ++ "referenced_type" : "type-1600", ++ "self_type" : "type-1599", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22087,8 +23499,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1676", +- "self_type" : "type-1675", ++ "referenced_type" : "type-1672", ++ "self_type" : "type-1671", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22096,8 +23508,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1750", +- "self_type" : "type-1749", ++ "referenced_type" : "type-1746", ++ "self_type" : "type-1745", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22105,8 +23517,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1838", +- "self_type" : "type-1837", ++ "referenced_type" : "type-1834", ++ "self_type" : "type-1833", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22114,8 +23526,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1893", +- "self_type" : "type-1892", ++ "referenced_type" : "type-1889", ++ "self_type" : "type-1888", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22123,8 +23535,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1953", +- "self_type" : "type-1952", ++ "referenced_type" : "type-1949", ++ "self_type" : "type-1948", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22132,8 +23544,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2025", +- "self_type" : "type-2024", ++ "referenced_type" : "type-2021", ++ "self_type" : "type-2020", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22141,8 +23553,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2071", +- "self_type" : "type-2070", ++ "referenced_type" : "type-2067", ++ "self_type" : "type-2066", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22159,8 +23571,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2121", +- "self_type" : "type-2120", ++ "referenced_type" : "type-2116", ++ "self_type" : "type-2115", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22168,8 +23580,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2137", +- "self_type" : "type-2136", ++ "referenced_type" : "type-2133", ++ "self_type" : "type-2132", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22177,8 +23589,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2214", +- "self_type" : "type-2213", ++ "referenced_type" : "type-2210", ++ "self_type" : "type-2209", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22186,8 +23598,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2311", +- "self_type" : "type-2310", ++ "referenced_type" : "type-2307", ++ "self_type" : "type-2306", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22195,8 +23607,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2328", +- "self_type" : "type-2327", ++ "referenced_type" : "type-2326", ++ "self_type" : "type-2325", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22204,8 +23616,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2447", +- "self_type" : "type-2446", ++ "referenced_type" : "type-2442", ++ "self_type" : "type-2441", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22213,8 +23625,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2516", +- "self_type" : "type-2515", ++ "referenced_type" : "type-2511", ++ "self_type" : "type-2510", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22222,8 +23634,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2640", +- "self_type" : "type-2639", ++ "referenced_type" : "type-2635", ++ "self_type" : "type-2634", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22231,8 +23643,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2651", +- "self_type" : "type-2650", ++ "referenced_type" : "type-2646", ++ "self_type" : "type-2645", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22249,8 +23661,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2679", +- "self_type" : "type-2678", ++ "referenced_type" : "type-2673", ++ "self_type" : "type-2672", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22258,8 +23670,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2747", +- "self_type" : "type-2746", ++ "referenced_type" : "type-2739", ++ "self_type" : "type-2738", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22267,8 +23679,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2817", +- "self_type" : "type-2816", ++ "referenced_type" : "type-2811", ++ "self_type" : "type-2810", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22276,8 +23688,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2891", +- "self_type" : "type-2890", ++ "referenced_type" : "type-2885", ++ "self_type" : "type-2884", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22285,8 +23697,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2979", +- "self_type" : "type-2978", ++ "referenced_type" : "type-2973", ++ "self_type" : "type-2972", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22294,8 +23706,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3034", +- "self_type" : "type-3033", ++ "referenced_type" : "type-3028", ++ "self_type" : "type-3027", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22303,8 +23715,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3092", +- "self_type" : "type-3091", ++ "referenced_type" : "type-3086", ++ "self_type" : "type-3085", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22312,8 +23724,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3162", +- "self_type" : "type-3161", ++ "referenced_type" : "type-3156", ++ "self_type" : "type-3155", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22321,8 +23733,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3206", +- "self_type" : "type-3205", ++ "referenced_type" : "type-3200", ++ "self_type" : "type-3199", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22330,8 +23742,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3255", +- "self_type" : "type-3254", ++ "referenced_type" : "type-3248", ++ "self_type" : "type-3247", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22339,8 +23751,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3271", +- "self_type" : "type-3270", ++ "referenced_type" : "type-3265", ++ "self_type" : "type-3264", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22348,8 +23760,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3321", +- "self_type" : "type-3320", ++ "referenced_type" : "type-3315", ++ "self_type" : "type-3314", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22357,8 +23769,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3371", +- "self_type" : "type-3370", ++ "referenced_type" : "type-3365", ++ "self_type" : "type-3364", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22366,8 +23778,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3383", +- "self_type" : "type-3382", ++ "referenced_type" : "type-3378", ++ "self_type" : "type-3377", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22375,8 +23787,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3393", +- "self_type" : "type-3392", ++ "referenced_type" : "type-3387", ++ "self_type" : "type-3386", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22384,8 +23796,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3401", +- "self_type" : "type-3400", ++ "referenced_type" : "type-3395", ++ "self_type" : "type-3394", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22393,8 +23805,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3429", +- "self_type" : "type-3428", ++ "referenced_type" : "type-3423", ++ "self_type" : "type-3422", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22402,8 +23814,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3568", +- "self_type" : "type-3567", ++ "referenced_type" : "type-3562", ++ "self_type" : "type-3561", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22411,8 +23823,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3634", +- "self_type" : "type-3633", ++ "referenced_type" : "type-3628", ++ "self_type" : "type-3627", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22420,8 +23832,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3699", +- "self_type" : "type-3698", ++ "referenced_type" : "type-3691", ++ "self_type" : "type-3690", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22429,8 +23841,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3790", +- "self_type" : "type-3789", ++ "referenced_type" : "type-3783", ++ "self_type" : "type-3782", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22438,8 +23850,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3859", +- "self_type" : "type-3858", ++ "referenced_type" : "type-3852", ++ "self_type" : "type-3851", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22447,8 +23859,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-465", +- "self_type" : "type-464", ++ "referenced_type" : "type-464", ++ "self_type" : "type-463", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22456,8 +23868,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-564", +- "self_type" : "type-563", ++ "referenced_type" : "type-563", ++ "self_type" : "type-562", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22465,8 +23877,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-651", +- "self_type" : "type-650", ++ "referenced_type" : "type-650", ++ "self_type" : "type-649", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22474,8 +23886,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-662", +- "self_type" : "type-661", ++ "referenced_type" : "type-661", ++ "self_type" : "type-660", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22483,8 +23895,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-699", +- "self_type" : "type-698", ++ "referenced_type" : "type-697", ++ "self_type" : "type-696", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22492,8 +23904,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-777", +- "self_type" : "type-776", ++ "referenced_type" : "type-773", ++ "self_type" : "type-772", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22501,8 +23913,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-871", +- "self_type" : "type-870", ++ "referenced_type" : "type-869", ++ "self_type" : "type-868", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22510,8 +23922,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-956", +- "self_type" : "type-955", ++ "referenced_type" : "type-954", ++ "self_type" : "type-953", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22529,7 +23941,7 @@ + "linker_set_key" : "android::RefBase::weakref_type **", + "name" : "android::RefBase::weakref_type **", + "referenced_type" : "type-308", +- "self_type" : "type-3414", ++ "self_type" : "type-3407", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -22537,8 +23949,8 @@ + "alignment" : 8, + "linker_set_key" : "android::RefBase::weakref_type *const *", + "name" : "android::RefBase::weakref_type *const *", +- "referenced_type" : "type-3418", +- "self_type" : "type-3419", ++ "referenced_type" : "type-3412", ++ "self_type" : "type-3413", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -22555,8 +23967,8 @@ + "alignment" : 8, + "linker_set_key" : "android::ScopedTrace *", + "name" : "android::ScopedTrace *", +- "referenced_type" : "type-1024", +- "self_type" : "type-1025", ++ "referenced_type" : "type-1022", ++ "self_type" : "type-1023", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Trace.h" + }, +@@ -22564,8 +23976,8 @@ + "alignment" : 8, + "linker_set_key" : "android::SortedVector > > *", + "name" : "android::SortedVector > > *", +- "referenced_type" : "type-376", +- "self_type" : "type-3639", ++ "referenced_type" : "type-375", ++ "self_type" : "type-3633", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -22573,8 +23985,8 @@ + "alignment" : 8, + "linker_set_key" : "android::SortedVector > *", + "name" : "android::SortedVector > *", +- "referenced_type" : "type-2153", +- "self_type" : "type-2219", ++ "referenced_type" : "type-2149", ++ "self_type" : "type-2215", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -22600,8 +24012,8 @@ + "alignment" : 8, + "linker_set_key" : "android::Thread *", + "name" : "android::Thread *", +- "referenced_type" : "type-455", +- "self_type" : "type-454", ++ "referenced_type" : "type-453", ++ "self_type" : "type-452", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -22609,8 +24021,8 @@ + "alignment" : 8, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-382", +- "self_type" : "type-3440", ++ "referenced_type" : "type-381", ++ "self_type" : "type-3434", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22618,8 +24030,8 @@ + "alignment" : 8, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-381", +- "self_type" : "type-3436", ++ "referenced_type" : "type-380", ++ "self_type" : "type-3430", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22636,8 +24048,8 @@ + "alignment" : 8, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-380", +- "self_type" : "type-3432", ++ "referenced_type" : "type-379", ++ "self_type" : "type-3426", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22645,8 +24057,8 @@ + "alignment" : 8, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-2150", +- "self_type" : "type-2149", ++ "referenced_type" : "type-2146", ++ "self_type" : "type-2145", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -22654,8 +24066,8 @@ + "alignment" : 8, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-2222", +- "self_type" : "type-2224", ++ "referenced_type" : "type-2218", ++ "self_type" : "type-2220", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22663,8 +24075,8 @@ + "alignment" : 8, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-3280", +- "self_type" : "type-3279", ++ "referenced_type" : "type-3274", ++ "self_type" : "type-3273", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -22672,8 +24084,8 @@ + "alignment" : 8, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-3457", +- "self_type" : "type-3456", ++ "referenced_type" : "type-3451", ++ "self_type" : "type-3450", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -22681,8 +24093,8 @@ + "alignment" : 8, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-3578", +- "self_type" : "type-3577", ++ "referenced_type" : "type-3572", ++ "self_type" : "type-3571", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -22690,8 +24102,8 @@ + "alignment" : 8, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-3656", +- "self_type" : "type-3655", ++ "referenced_type" : "type-3648", ++ "self_type" : "type-3647", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -22699,8 +24111,8 @@ + "alignment" : 8, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-378", +- "self_type" : "type-3642", ++ "referenced_type" : "type-377", ++ "self_type" : "type-3636", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22708,8 +24120,8 @@ + "alignment" : 8, + "linker_set_key" : "android::Vector > *", + "name" : "android::Vector > *", +- "referenced_type" : "type-2330", +- "self_type" : "type-2331", ++ "referenced_type" : "type-2324", ++ "self_type" : "type-2327", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22717,8 +24129,8 @@ + "alignment" : 8, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-2324", +- "self_type" : "type-2329", ++ "referenced_type" : "type-2320", ++ "self_type" : "type-2323", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22735,8 +24147,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1043", +- "self_type" : "type-1042", ++ "referenced_type" : "type-1041", ++ "self_type" : "type-1040", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22744,8 +24156,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1097", +- "self_type" : "type-1096", ++ "referenced_type" : "type-1095", ++ "self_type" : "type-1094", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22753,8 +24165,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1226", +- "self_type" : "type-1225", ++ "referenced_type" : "type-1224", ++ "self_type" : "type-1223", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22762,8 +24174,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1568", +- "self_type" : "type-1567", ++ "referenced_type" : "type-1564", ++ "self_type" : "type-1563", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -22771,8 +24183,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1702", +- "self_type" : "type-1701", ++ "referenced_type" : "type-1698", ++ "self_type" : "type-1697", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22780,8 +24192,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1714", +- "self_type" : "type-1713", ++ "referenced_type" : "type-1710", ++ "self_type" : "type-1709", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22789,8 +24201,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1823", +- "self_type" : "type-1822", ++ "referenced_type" : "type-1819", ++ "self_type" : "type-1818", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22798,8 +24210,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1875", +- "self_type" : "type-1874", ++ "referenced_type" : "type-1871", ++ "self_type" : "type-1870", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22807,8 +24219,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1927", +- "self_type" : "type-1926", ++ "referenced_type" : "type-1923", ++ "self_type" : "type-1922", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22816,8 +24228,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2001", +- "self_type" : "type-2000", ++ "referenced_type" : "type-1997", ++ "self_type" : "type-1996", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22825,8 +24237,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2060", +- "self_type" : "type-2059", ++ "referenced_type" : "type-2056", ++ "self_type" : "type-2055", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22834,8 +24246,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2144", +- "self_type" : "type-2143", ++ "referenced_type" : "type-2140", ++ "self_type" : "type-2139", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, +@@ -22843,8 +24255,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2376", +- "self_type" : "type-2375", ++ "referenced_type" : "type-2372", ++ "self_type" : "type-2371", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22852,8 +24264,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2709", +- "self_type" : "type-2708", ++ "referenced_type" : "type-2703", ++ "self_type" : "type-2702", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -22861,8 +24273,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2843", +- "self_type" : "type-2842", ++ "referenced_type" : "type-2837", ++ "self_type" : "type-2836", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22870,8 +24282,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2855", +- "self_type" : "type-2854", ++ "referenced_type" : "type-2849", ++ "self_type" : "type-2848", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22879,8 +24291,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2964", +- "self_type" : "type-2963", ++ "referenced_type" : "type-2958", ++ "self_type" : "type-2957", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22888,8 +24300,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3016", +- "self_type" : "type-3015", ++ "referenced_type" : "type-3010", ++ "self_type" : "type-3009", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22897,8 +24309,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3068", +- "self_type" : "type-3067", ++ "referenced_type" : "type-3062", ++ "self_type" : "type-3061", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22906,8 +24318,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3140", +- "self_type" : "type-3139", ++ "referenced_type" : "type-3134", ++ "self_type" : "type-3133", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22915,8 +24327,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3197", +- "self_type" : "type-3196", ++ "referenced_type" : "type-3191", ++ "self_type" : "type-3190", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22933,8 +24345,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3714", +- "self_type" : "type-3713", ++ "referenced_type" : "type-3708", ++ "self_type" : "type-3707", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22942,8 +24354,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-735", +- "self_type" : "type-734", ++ "referenced_type" : "type-733", ++ "self_type" : "type-732", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -22951,8 +24363,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-897", +- "self_type" : "type-896", ++ "referenced_type" : "type-895", ++ "self_type" : "type-894", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22960,8 +24372,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-914", +- "self_type" : "type-913", ++ "referenced_type" : "type-912", ++ "self_type" : "type-911", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22969,8 +24381,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder **", + "name" : "android::hardware::BHwBinder **", +- "referenced_type" : "type-2143", +- "self_type" : "type-3413", ++ "referenced_type" : "type-2139", ++ "self_type" : "type-3406", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -22978,8 +24390,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder *const *", + "name" : "android::hardware::BHwBinder *const *", +- "referenced_type" : "type-3416", +- "self_type" : "type-3417", ++ "referenced_type" : "type-3410", ++ "self_type" : "type-3411", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -22987,8 +24399,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder::Extras *", + "name" : "android::hardware::BHwBinder::Extras *", +- "referenced_type" : "type-2176", +- "self_type" : "type-2175", ++ "referenced_type" : "type-2172", ++ "self_type" : "type-2171", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -22996,8 +24408,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BHwBinder::Extras *", + "name" : "android::hardware::BHwBinder::Extras *", +- "referenced_type" : "type-3296", +- "self_type" : "type-3295", ++ "referenced_type" : "type-3290", ++ "self_type" : "type-3289", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -23005,8 +24417,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BpHwBinder *", + "name" : "android::hardware::BpHwBinder *", +- "referenced_type" : "type-2147", +- "self_type" : "type-2146", ++ "referenced_type" : "type-2143", ++ "self_type" : "type-2142", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, +@@ -23014,8 +24426,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BpHwBinder::Obituary *", + "name" : "android::hardware::BpHwBinder::Obituary *", +- "referenced_type" : "type-2186", +- "self_type" : "type-2201", ++ "referenced_type" : "type-2182", ++ "self_type" : "type-2197", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -23023,8 +24435,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager *", + "name" : "android::hardware::BpHwBinder::ObjectManager *", +- "referenced_type" : "type-2151", +- "self_type" : "type-2236", ++ "referenced_type" : "type-2147", ++ "self_type" : "type-2232", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -23032,8 +24444,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BpHwRefBase *", + "name" : "android::hardware::BpHwRefBase *", +- "referenced_type" : "type-2177", +- "self_type" : "type-2181", ++ "referenced_type" : "type-2173", ++ "self_type" : "type-2177", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -23041,8 +24453,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BufferedTextOutput *", + "name" : "android::hardware::BufferedTextOutput *", +- "referenced_type" : "type-2316", +- "self_type" : "type-2317", ++ "referenced_type" : "type-2312", ++ "self_type" : "type-2313", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -23050,8 +24462,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *", + "name" : "android::hardware::BufferedTextOutput::BufferState *", +- "referenced_type" : "type-2283", +- "self_type" : "type-2282", ++ "referenced_type" : "type-2279", ++ "self_type" : "type-2278", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23059,8 +24471,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *", + "name" : "android::hardware::BufferedTextOutput::BufferState *", +- "referenced_type" : "type-3351", +- "self_type" : "type-3350", ++ "referenced_type" : "type-3345", ++ "self_type" : "type-3344", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23068,8 +24480,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *", + "name" : "android::hardware::BufferedTextOutput::BufferState *", +- "referenced_type" : "type-3706", +- "self_type" : "type-3705", ++ "referenced_type" : "type-3700", ++ "self_type" : "type-3699", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -23077,8 +24489,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *", + "name" : "android::hardware::BufferedTextOutput::ThreadState *", +- "referenced_type" : "type-2319", +- "self_type" : "type-2318", ++ "referenced_type" : "type-2315", ++ "self_type" : "type-2314", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -23086,8 +24498,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *", + "name" : "android::hardware::BufferedTextOutput::ThreadState *", +- "referenced_type" : "type-3377", +- "self_type" : "type-3376", ++ "referenced_type" : "type-3371", ++ "self_type" : "type-3370", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -23095,8 +24507,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ConcurrentMap, android::hardware::details::SchedPrio> *", + "name" : "android::hardware::ConcurrentMap, android::hardware::details::SchedPrio> *", +- "referenced_type" : "type-663", +- "self_type" : "type-666", ++ "referenced_type" : "type-662", ++ "self_type" : "type-665", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -23104,8 +24516,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ConcurrentMap, bool> *", + "name" : "android::hardware::ConcurrentMap, bool> *", +- "referenced_type" : "type-669", +- "self_type" : "type-672", ++ "referenced_type" : "type-667", ++ "self_type" : "type-670", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -23122,8 +24534,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", +- "referenced_type" : "type-588", +- "self_type" : "type-603", ++ "referenced_type" : "type-587", ++ "self_type" : "type-602", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -23131,8 +24543,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", +- "referenced_type" : "type-347", +- "self_type" : "type-365", ++ "referenced_type" : "type-346", ++ "self_type" : "type-364", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -23149,8 +24561,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::HexDump *", + "name" : "android::hardware::HexDump *", +- "referenced_type" : "type-2297", +- "self_type" : "type-2298", ++ "referenced_type" : "type-2293", ++ "self_type" : "type-2294", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -23167,8 +24579,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1047", +- "self_type" : "type-1046", ++ "referenced_type" : "type-1045", ++ "self_type" : "type-1044", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23176,8 +24588,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1102", +- "self_type" : "type-1101", ++ "referenced_type" : "type-1100", ++ "self_type" : "type-1099", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23185,8 +24597,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1251", +- "self_type" : "type-1250", ++ "referenced_type" : "type-1248", ++ "self_type" : "type-1247", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23194,8 +24606,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1341", +- "self_type" : "type-1340", ++ "referenced_type" : "type-1338", ++ "self_type" : "type-1337", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23203,8 +24615,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1406", +- "self_type" : "type-1405", ++ "referenced_type" : "type-1403", ++ "self_type" : "type-1402", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23212,8 +24624,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1531", +- "self_type" : "type-1530", ++ "referenced_type" : "type-1527", ++ "self_type" : "type-1526", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23221,8 +24633,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1667", +- "self_type" : "type-1666", ++ "referenced_type" : "type-1663", ++ "self_type" : "type-1662", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23230,8 +24642,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1704", +- "self_type" : "type-1703", ++ "referenced_type" : "type-1700", ++ "self_type" : "type-1699", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23239,8 +24651,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1722", +- "self_type" : "type-1721", ++ "referenced_type" : "type-1718", ++ "self_type" : "type-1717", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23248,8 +24660,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1826", +- "self_type" : "type-1825", ++ "referenced_type" : "type-1822", ++ "self_type" : "type-1821", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23257,8 +24669,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1879", +- "self_type" : "type-1878", ++ "referenced_type" : "type-1875", ++ "self_type" : "type-1874", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23266,8 +24678,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1933", +- "self_type" : "type-1932", ++ "referenced_type" : "type-1929", ++ "self_type" : "type-1928", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23275,8 +24687,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2007", +- "self_type" : "type-2006", ++ "referenced_type" : "type-2003", ++ "self_type" : "type-2002", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23284,8 +24696,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2065", +- "self_type" : "type-2064", ++ "referenced_type" : "type-2061", ++ "self_type" : "type-2060", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23293,8 +24705,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2135", +- "self_type" : "type-2134", ++ "referenced_type" : "type-2130", ++ "self_type" : "type-2129", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23302,8 +24714,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2139", +- "self_type" : "type-2140", ++ "referenced_type" : "type-2135", ++ "self_type" : "type-2136", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23311,8 +24723,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2402", +- "self_type" : "type-2401", ++ "referenced_type" : "type-2397", ++ "self_type" : "type-2396", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23320,8 +24732,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2490", +- "self_type" : "type-2489", ++ "referenced_type" : "type-2485", ++ "self_type" : "type-2484", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23329,8 +24741,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2554", +- "self_type" : "type-2553", ++ "referenced_type" : "type-2549", ++ "self_type" : "type-2548", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23338,8 +24750,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2672", +- "self_type" : "type-2671", ++ "referenced_type" : "type-2666", ++ "self_type" : "type-2665", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23347,8 +24759,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2808", +- "self_type" : "type-2807", ++ "referenced_type" : "type-2802", ++ "self_type" : "type-2801", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23356,8 +24768,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2845", +- "self_type" : "type-2844", ++ "referenced_type" : "type-2839", ++ "self_type" : "type-2838", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23365,8 +24777,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2863", +- "self_type" : "type-2862", ++ "referenced_type" : "type-2857", ++ "self_type" : "type-2856", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23374,8 +24786,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2967", +- "self_type" : "type-2966", ++ "referenced_type" : "type-2961", ++ "self_type" : "type-2960", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23383,8 +24795,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3020", +- "self_type" : "type-3019", ++ "referenced_type" : "type-3014", ++ "self_type" : "type-3013", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23392,8 +24804,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3073", +- "self_type" : "type-3072", ++ "referenced_type" : "type-3067", ++ "self_type" : "type-3066", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23401,8 +24813,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3145", +- "self_type" : "type-3144", ++ "referenced_type" : "type-3139", ++ "self_type" : "type-3138", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23410,8 +24822,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3200", +- "self_type" : "type-3199", ++ "referenced_type" : "type-3194", ++ "self_type" : "type-3193", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23419,8 +24831,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3269", +- "self_type" : "type-3268", ++ "referenced_type" : "type-3262", ++ "self_type" : "type-3261", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23428,8 +24840,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3744", +- "self_type" : "type-3743", ++ "referenced_type" : "type-3737", ++ "self_type" : "type-3736", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23437,8 +24849,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3833", +- "self_type" : "type-3832", ++ "referenced_type" : "type-3826", ++ "self_type" : "type-3825", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23446,8 +24858,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-386", +- "self_type" : "type-385", ++ "referenced_type" : "type-385", ++ "self_type" : "type-384", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23455,8 +24867,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3897", +- "self_type" : "type-3896", ++ "referenced_type" : "type-3890", ++ "self_type" : "type-3889", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23464,8 +24876,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-526", +- "self_type" : "type-525", ++ "referenced_type" : "type-525", ++ "self_type" : "type-524", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23473,8 +24885,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-614", +- "self_type" : "type-613", ++ "referenced_type" : "type-613", ++ "self_type" : "type-612", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23482,8 +24894,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-692", +- "self_type" : "type-691", ++ "referenced_type" : "type-690", ++ "self_type" : "type-689", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23491,8 +24903,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-862", +- "self_type" : "type-861", ++ "referenced_type" : "type-860", ++ "self_type" : "type-859", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23500,8 +24912,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-899", +- "self_type" : "type-898", ++ "referenced_type" : "type-897", ++ "self_type" : "type-896", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23509,8 +24921,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-925", +- "self_type" : "type-924", ++ "referenced_type" : "type-923", ++ "self_type" : "type-922", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23518,8 +24930,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-1093", +- "self_type" : "type-1092", ++ "referenced_type" : "type-1091", ++ "self_type" : "type-1090", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23527,8 +24939,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-1095", +- "self_type" : "type-1094", ++ "referenced_type" : "type-1093", ++ "self_type" : "type-1092", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23536,8 +24948,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-1706", +- "self_type" : "type-1705", ++ "referenced_type" : "type-1702", ++ "self_type" : "type-1701", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23545,8 +24957,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-1871", +- "self_type" : "type-1870", ++ "referenced_type" : "type-1867", ++ "self_type" : "type-1866", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23554,8 +24966,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-1873", +- "self_type" : "type-1872", ++ "referenced_type" : "type-1869", ++ "self_type" : "type-1868", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23563,8 +24975,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-1995", +- "self_type" : "type-1994", ++ "referenced_type" : "type-1991", ++ "self_type" : "type-1990", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23572,8 +24984,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-1998", +- "self_type" : "type-1997", ++ "referenced_type" : "type-1994", ++ "self_type" : "type-1993", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23581,8 +24993,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-2115", +- "self_type" : "type-2114", ++ "referenced_type" : "type-2111", ++ "self_type" : "type-2110", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23590,8 +25002,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-2191", +- "self_type" : "type-2192", ++ "referenced_type" : "type-2187", ++ "self_type" : "type-2188", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23599,8 +25011,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-2847", +- "self_type" : "type-2846", ++ "referenced_type" : "type-2841", ++ "self_type" : "type-2840", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23608,8 +25020,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-3012", +- "self_type" : "type-3011", ++ "referenced_type" : "type-3006", ++ "self_type" : "type-3005", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23617,8 +25029,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-3014", +- "self_type" : "type-3013", ++ "referenced_type" : "type-3008", ++ "self_type" : "type-3007", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23626,8 +25038,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-3134", +- "self_type" : "type-3133", ++ "referenced_type" : "type-3128", ++ "self_type" : "type-3127", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23635,8 +25047,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-3137", +- "self_type" : "type-3136", ++ "referenced_type" : "type-3131", ++ "self_type" : "type-3130", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23644,8 +25056,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-3249", +- "self_type" : "type-3248", ++ "referenced_type" : "type-3243", ++ "self_type" : "type-3242", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23653,8 +25065,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-902", +- "self_type" : "type-901", ++ "referenced_type" : "type-900", ++ "self_type" : "type-899", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23662,8 +25074,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-1049", +- "self_type" : "type-1048", ++ "referenced_type" : "type-1047", ++ "self_type" : "type-1046", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23671,8 +25083,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-1104", +- "self_type" : "type-1103", ++ "referenced_type" : "type-1102", ++ "self_type" : "type-1101", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23680,8 +25092,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-1725", +- "self_type" : "type-1724", ++ "referenced_type" : "type-1721", ++ "self_type" : "type-1720", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23689,8 +25101,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-1828", +- "self_type" : "type-1827", ++ "referenced_type" : "type-1824", ++ "self_type" : "type-1823", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23698,8 +25110,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-1881", +- "self_type" : "type-1880", ++ "referenced_type" : "type-1877", ++ "self_type" : "type-1876", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23707,8 +25119,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-1936", +- "self_type" : "type-1935", ++ "referenced_type" : "type-1932", ++ "self_type" : "type-1931", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23716,8 +25128,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-2009", +- "self_type" : "type-2008", ++ "referenced_type" : "type-2005", ++ "self_type" : "type-2004", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23725,8 +25137,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-2067", +- "self_type" : "type-2066", ++ "referenced_type" : "type-2063", ++ "self_type" : "type-2062", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23734,8 +25146,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-2187", +- "self_type" : "type-3408", ++ "referenced_type" : "type-2183", ++ "self_type" : "type-3402", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23743,8 +25155,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-2866", +- "self_type" : "type-2865", ++ "referenced_type" : "type-2860", ++ "self_type" : "type-2859", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23752,8 +25164,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-2969", +- "self_type" : "type-2968", ++ "referenced_type" : "type-2963", ++ "self_type" : "type-2962", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23761,8 +25173,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-3022", +- "self_type" : "type-3021", ++ "referenced_type" : "type-3016", ++ "self_type" : "type-3015", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23770,8 +25182,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-3076", +- "self_type" : "type-3075", ++ "referenced_type" : "type-3070", ++ "self_type" : "type-3069", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23779,8 +25191,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-3147", +- "self_type" : "type-3146", ++ "referenced_type" : "type-3141", ++ "self_type" : "type-3140", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23788,8 +25200,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-3202", +- "self_type" : "type-3201", ++ "referenced_type" : "type-3196", ++ "self_type" : "type-3195", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23797,8 +25209,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-929", +- "self_type" : "type-928", ++ "referenced_type" : "type-926", ++ "self_type" : "type-925", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23806,8 +25218,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::IPCThreadState *", + "name" : "android::hardware::IPCThreadState *", +- "referenced_type" : "type-2245", +- "self_type" : "type-3449", ++ "referenced_type" : "type-2241", ++ "self_type" : "type-3443", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -23815,8 +25227,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::LazyServiceRegistrar *", + "name" : "android::hardware::LazyServiceRegistrar *", +- "referenced_type" : "type-485", +- "self_type" : "type-487", ++ "referenced_type" : "type-482", ++ "self_type" : "type-486", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -23824,8 +25236,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1005", +- "self_type" : "type-1004", ++ "referenced_type" : "type-1003", ++ "self_type" : "type-1002", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -23833,8 +25245,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1088", +- "self_type" : "type-1087", ++ "referenced_type" : "type-1086", ++ "self_type" : "type-1085", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -23842,8 +25254,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1146", +- "self_type" : "type-1145", ++ "referenced_type" : "type-1144", ++ "self_type" : "type-1143", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -23851,8 +25263,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1219", +- "self_type" : "type-1218", ++ "referenced_type" : "type-1217", ++ "self_type" : "type-1216", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -23860,8 +25272,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1787", +- "self_type" : "type-1786", ++ "referenced_type" : "type-1783", ++ "self_type" : "type-1782", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -23869,8 +25281,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1866", +- "self_type" : "type-1865", ++ "referenced_type" : "type-1862", ++ "self_type" : "type-1861", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -23878,8 +25290,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1922", +- "self_type" : "type-1921", ++ "referenced_type" : "type-1918", ++ "self_type" : "type-1917", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -23887,8 +25299,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1988", +- "self_type" : "type-1987", ++ "referenced_type" : "type-1984", ++ "self_type" : "type-1983", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -23896,8 +25308,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2041", +- "self_type" : "type-2040", ++ "referenced_type" : "type-2037", ++ "self_type" : "type-2036", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -23905,8 +25317,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2095", +- "self_type" : "type-2094", ++ "referenced_type" : "type-2091", ++ "self_type" : "type-2090", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -23914,8 +25326,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2159", +- "self_type" : "type-2158", ++ "referenced_type" : "type-2155", ++ "self_type" : "type-2154", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -23923,8 +25335,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2369", +- "self_type" : "type-2368", ++ "referenced_type" : "type-2365", ++ "self_type" : "type-2364", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -23932,8 +25344,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2928", +- "self_type" : "type-2927", ++ "referenced_type" : "type-2922", ++ "self_type" : "type-2921", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -23941,8 +25353,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3007", +- "self_type" : "type-3006", ++ "referenced_type" : "type-3001", ++ "self_type" : "type-3000", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -23950,8 +25362,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3063", +- "self_type" : "type-3062", ++ "referenced_type" : "type-3057", ++ "self_type" : "type-3056", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -23959,8 +25371,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3127", +- "self_type" : "type-3126", ++ "referenced_type" : "type-3121", ++ "self_type" : "type-3120", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -23968,8 +25380,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3178", +- "self_type" : "type-3177", ++ "referenced_type" : "type-3172", ++ "self_type" : "type-3171", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -23986,8 +25398,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3229", +- "self_type" : "type-3228", ++ "referenced_type" : "type-3223", ++ "self_type" : "type-3222", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -23995,8 +25407,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3695", +- "self_type" : "type-3694", ++ "referenced_type" : "type-3689", ++ "self_type" : "type-3688", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24004,8 +25416,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::PassthroughServiceManager *", + "name" : "android::hardware::PassthroughServiceManager *", +- "referenced_type" : "type-1559", +- "self_type" : "type-1558", ++ "referenced_type" : "type-1555", ++ "self_type" : "type-1554", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24013,8 +25425,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::PassthroughServiceManager *", + "name" : "android::hardware::PassthroughServiceManager *", +- "referenced_type" : "type-2700", +- "self_type" : "type-2699", ++ "referenced_type" : "type-2694", ++ "self_type" : "type-2693", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24022,8 +25434,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::PassthroughServiceManager *", + "name" : "android::hardware::PassthroughServiceManager *", +- "referenced_type" : "type-721", +- "self_type" : "type-720", ++ "referenced_type" : "type-719", ++ "self_type" : "type-718", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24031,8 +25443,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::PoolThread *", + "name" : "android::hardware::PoolThread *", +- "referenced_type" : "type-3638", +- "self_type" : "type-3637", ++ "referenced_type" : "type-3632", ++ "self_type" : "type-3631", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24040,8 +25452,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1051", +- "self_type" : "type-1050", ++ "referenced_type" : "type-1049", ++ "self_type" : "type-1048", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24049,8 +25461,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1106", +- "self_type" : "type-1105", ++ "referenced_type" : "type-1104", ++ "self_type" : "type-1103", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24058,8 +25470,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1290", +- "self_type" : "type-1289", ++ "referenced_type" : "type-1287", ++ "self_type" : "type-1286", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24067,8 +25479,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1670", +- "self_type" : "type-1669", ++ "referenced_type" : "type-1665", ++ "self_type" : "type-1664", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24076,8 +25488,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1727", +- "self_type" : "type-1726", ++ "referenced_type" : "type-1723", ++ "self_type" : "type-1722", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24085,8 +25497,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1830", +- "self_type" : "type-1829", ++ "referenced_type" : "type-1826", ++ "self_type" : "type-1825", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24094,8 +25506,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1883", +- "self_type" : "type-1882", ++ "referenced_type" : "type-1879", ++ "self_type" : "type-1878", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24103,8 +25515,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1938", +- "self_type" : "type-1937", ++ "referenced_type" : "type-1934", ++ "self_type" : "type-1933", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24112,8 +25524,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2012", +- "self_type" : "type-2011", ++ "referenced_type" : "type-2007", ++ "self_type" : "type-2006", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24121,8 +25533,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2069", +- "self_type" : "type-2068", ++ "referenced_type" : "type-2065", ++ "self_type" : "type-2064", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24130,8 +25542,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2250", +- "self_type" : "type-2254", ++ "referenced_type" : "type-2246", ++ "self_type" : "type-2250", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24139,8 +25551,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2440", +- "self_type" : "type-2439", ++ "referenced_type" : "type-2435", ++ "self_type" : "type-2434", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24148,8 +25560,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2811", +- "self_type" : "type-2810", ++ "referenced_type" : "type-2804", ++ "self_type" : "type-2803", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24157,8 +25569,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2868", +- "self_type" : "type-2867", ++ "referenced_type" : "type-2862", ++ "self_type" : "type-2861", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24166,8 +25578,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2971", +- "self_type" : "type-2970", ++ "referenced_type" : "type-2965", ++ "self_type" : "type-2964", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24175,8 +25587,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3024", +- "self_type" : "type-3023", ++ "referenced_type" : "type-3018", ++ "self_type" : "type-3017", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24184,8 +25596,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3078", +- "self_type" : "type-3077", ++ "referenced_type" : "type-3072", ++ "self_type" : "type-3071", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24193,8 +25605,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3150", +- "self_type" : "type-3149", ++ "referenced_type" : "type-3143", ++ "self_type" : "type-3142", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24202,8 +25614,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3204", +- "self_type" : "type-3203", ++ "referenced_type" : "type-3198", ++ "self_type" : "type-3197", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24211,8 +25623,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3783", +- "self_type" : "type-3782", ++ "referenced_type" : "type-3776", ++ "self_type" : "type-3775", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24220,8 +25632,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-447", +- "self_type" : "type-446", ++ "referenced_type" : "type-446", ++ "self_type" : "type-445", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24229,8 +25641,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-865", +- "self_type" : "type-864", ++ "referenced_type" : "type-862", ++ "self_type" : "type-861", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24238,8 +25650,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-932", +- "self_type" : "type-931", ++ "referenced_type" : "type-930", ++ "self_type" : "type-929", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24247,8 +25659,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::ProcessState::handle_entry *", + "name" : "android::hardware::ProcessState::handle_entry *", +- "referenced_type" : "type-2228", +- "self_type" : "type-3623", ++ "referenced_type" : "type-2224", ++ "self_type" : "type-3617", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -24256,8 +25668,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Return *", + "name" : "android::hardware::Return *", +- "referenced_type" : "type-764", +- "self_type" : "type-765", ++ "referenced_type" : "type-762", ++ "self_type" : "type-763", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24265,8 +25677,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-757", +- "self_type" : "type-758", ++ "referenced_type" : "type-755", ++ "self_type" : "type-756", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24274,8 +25686,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-944", +- "self_type" : "type-945", ++ "referenced_type" : "type-942", ++ "self_type" : "type-943", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24283,8 +25695,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-1053", +- "self_type" : "type-1054", ++ "referenced_type" : "type-1051", ++ "self_type" : "type-1052", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24292,8 +25704,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-1110", +- "self_type" : "type-1111", ++ "referenced_type" : "type-1108", ++ "self_type" : "type-1109", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24301,8 +25713,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-1945", +- "self_type" : "type-1946", ++ "referenced_type" : "type-1941", ++ "self_type" : "type-1942", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24310,8 +25722,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-2015", +- "self_type" : "type-2016", ++ "referenced_type" : "type-2011", ++ "self_type" : "type-2012", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24346,8 +25758,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)", + "name" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)", +- "referenced_type" : "type-2291", +- "self_type" : "type-2292", ++ "referenced_type" : "type-2287", ++ "self_type" : "type-2288", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -24355,8 +25767,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::TextOutput *", + "name" : "android::hardware::TextOutput *", +- "referenced_type" : "type-2285", +- "self_type" : "type-3712", ++ "referenced_type" : "type-2281", ++ "self_type" : "type-3706", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -24364,8 +25776,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::TextOutput::Bundle *", + "name" : "android::hardware::TextOutput::Bundle *", +- "referenced_type" : "type-2286", +- "self_type" : "type-2288", ++ "referenced_type" : "type-2282", ++ "self_type" : "type-2284", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -24373,8 +25785,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::TypeCode *", + "name" : "android::hardware::TypeCode *", +- "referenced_type" : "type-2293", +- "self_type" : "type-2294", ++ "referenced_type" : "type-2289", ++ "self_type" : "type-2290", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -24382,8 +25794,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::details::ClientCounterCallback *", + "name" : "android::hardware::details::ClientCounterCallback *", +- "referenced_type" : "type-1359", +- "self_type" : "type-1358", ++ "referenced_type" : "type-1356", ++ "self_type" : "type-1355", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24391,8 +25803,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::details::ClientCounterCallback *", + "name" : "android::hardware::details::ClientCounterCallback *", +- "referenced_type" : "type-2508", +- "self_type" : "type-2507", ++ "referenced_type" : "type-2503", ++ "self_type" : "type-2502", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24400,8 +25812,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::details::ClientCounterCallback *", + "name" : "android::hardware::details::ClientCounterCallback *", +- "referenced_type" : "type-3851", +- "self_type" : "type-3850", ++ "referenced_type" : "type-3844", ++ "self_type" : "type-3843", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24409,8 +25821,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::details::ClientCounterCallback *", + "name" : "android::hardware::details::ClientCounterCallback *", +- "referenced_type" : "type-553", +- "self_type" : "type-552", ++ "referenced_type" : "type-552", ++ "self_type" : "type-551", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24418,8 +25830,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::details::DoNotDestruct, android::hardware::details::SchedPrio> > *", + "name" : "android::hardware::details::DoNotDestruct, android::hardware::details::SchedPrio> > *", +- "referenced_type" : "type-673", +- "self_type" : "type-676", ++ "referenced_type" : "type-671", ++ "self_type" : "type-674", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -24427,8 +25839,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::details::DoNotDestruct, bool> > *", + "name" : "android::hardware::details::DoNotDestruct, bool> > *", +- "referenced_type" : "type-677", +- "self_type" : "type-679", ++ "referenced_type" : "type-675", ++ "self_type" : "type-677", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -24436,8 +25848,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::details::DoNotDestruct > > *", + "name" : "android::hardware::details::DoNotDestruct > > *", +- "referenced_type" : "type-361", +- "self_type" : "type-363", ++ "referenced_type" : "type-360", ++ "self_type" : "type-362", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -24445,8 +25857,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > > *", + "name" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > > *", +- "referenced_type" : "type-602", +- "self_type" : "type-604", ++ "referenced_type" : "type-601", ++ "self_type" : "type-603", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -24454,8 +25866,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > > *", + "name" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > > *", +- "referenced_type" : "type-364", +- "self_type" : "type-367", ++ "referenced_type" : "type-363", ++ "self_type" : "type-365", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -24464,7 +25876,7 @@ + "linker_set_key" : "android::hardware::details::HidlInstrumentor *", + "name" : "android::hardware::details::HidlInstrumentor *", + "referenced_type" : "type-128", +- "self_type" : "type-584", ++ "self_type" : "type-583", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24481,8 +25893,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::details::Waiter *", + "name" : "android::hardware::details::Waiter *", +- "referenced_type" : "type-1572", +- "self_type" : "type-1571", ++ "referenced_type" : "type-1568", ++ "self_type" : "type-1567", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24490,8 +25902,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::details::Waiter *", + "name" : "android::hardware::details::Waiter *", +- "referenced_type" : "type-2713", +- "self_type" : "type-2712", ++ "referenced_type" : "type-2707", ++ "self_type" : "type-2706", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24499,8 +25911,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::details::Waiter *", + "name" : "android::hardware::details::Waiter *", +- "referenced_type" : "type-739", +- "self_type" : "type-738", ++ "referenced_type" : "type-737", ++ "self_type" : "type-736", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24508,8 +25920,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::details::hidl_pointer > *", + "name" : "android::hardware::details::hidl_pointer > *", +- "referenced_type" : "type-968", +- "self_type" : "type-1034", ++ "referenced_type" : "type-966", ++ "self_type" : "type-1032", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24517,8 +25929,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::details::hidl_pointer *", + "name" : "android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-572", +- "self_type" : "type-1030", ++ "referenced_type" : "type-571", ++ "self_type" : "type-1028", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24526,8 +25938,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::details::hidl_pointer *", + "name" : "android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-792", +- "self_type" : "type-807", ++ "referenced_type" : "type-790", ++ "self_type" : "type-805", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24545,7 +25957,7 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer *", + "name" : "android::hardware::details::hidl_pointer *", + "referenced_type" : "type-9", +- "self_type" : "type-494", ++ "self_type" : "type-495", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24553,8 +25965,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::details::hidl_pointer *", + "name" : "android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-474", +- "self_type" : "type-775", ++ "referenced_type" : "type-473", ++ "self_type" : "type-771", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24571,8 +25983,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::hidl_array *", + "name" : "android::hardware::hidl_array *", +- "referenced_type" : "type-971", +- "self_type" : "type-970", ++ "referenced_type" : "type-969", ++ "self_type" : "type-968", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24625,8 +26037,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::hidl_vec > *", + "name" : "android::hardware::hidl_vec > *", +- "referenced_type" : "type-967", +- "self_type" : "type-973", ++ "referenced_type" : "type-965", ++ "self_type" : "type-971", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -24634,8 +26046,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::hidl_vec *", + "name" : "android::hardware::hidl_vec *", +- "referenced_type" : "type-571", +- "self_type" : "type-963", ++ "referenced_type" : "type-570", ++ "self_type" : "type-960", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -24643,8 +26055,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::hidl_vec *", + "name" : "android::hardware::hidl_vec *", +- "referenced_type" : "type-791", +- "self_type" : "type-795", ++ "referenced_type" : "type-789", ++ "self_type" : "type-793", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -24652,8 +26064,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::hidl_vec::iter *", + "name" : "android::hardware::hidl_vec::iter *", +- "referenced_type" : "type-576", +- "self_type" : "type-579", ++ "referenced_type" : "type-575", ++ "self_type" : "type-577", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -24661,8 +26073,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::hidl_vec *", + "name" : "android::hardware::hidl_vec *", +- "referenced_type" : "type-473", +- "self_type" : "type-783", ++ "referenced_type" : "type-472", ++ "self_type" : "type-781", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -24688,8 +26100,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hidl::base::V1_0::BpHwBase *", + "name" : "android::hidl::base::V1_0::BpHwBase *", +- "referenced_type" : "type-369", +- "self_type" : "type-919", ++ "referenced_type" : "type-368", ++ "self_type" : "type-917", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24697,8 +26109,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hidl::base::V1_0::BsBase *", + "name" : "android::hidl::base::V1_0::BsBase *", +- "referenced_type" : "type-2061", +- "self_type" : "type-2063", ++ "referenced_type" : "type-2057", ++ "self_type" : "type-2059", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24715,8 +26127,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager *", + "name" : "android::hidl::manager::V1_0::BnHwServiceManager *", +- "referenced_type" : "type-827", +- "self_type" : "type-828", ++ "referenced_type" : "type-825", ++ "self_type" : "type-826", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h" + }, +@@ -24724,8 +26136,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification *", + "name" : "android::hidl::manager::V1_0::BnHwServiceNotification *", +- "referenced_type" : "type-819", +- "self_type" : "type-820", ++ "referenced_type" : "type-817", ++ "self_type" : "type-818", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -24733,8 +26145,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager *", + "name" : "android::hidl::manager::V1_0::BpHwServiceManager *", +- "referenced_type" : "type-829", +- "self_type" : "type-918", ++ "referenced_type" : "type-827", ++ "self_type" : "type-916", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24742,8 +26154,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification *", + "name" : "android::hidl::manager::V1_0::BpHwServiceNotification *", +- "referenced_type" : "type-821", +- "self_type" : "type-937", ++ "referenced_type" : "type-819", ++ "self_type" : "type-934", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24751,8 +26163,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager *", + "name" : "android::hidl::manager::V1_0::BsServiceManager *", +- "referenced_type" : "type-916", +- "self_type" : "type-917", ++ "referenced_type" : "type-913", ++ "self_type" : "type-915", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24760,8 +26172,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification *", + "name" : "android::hidl::manager::V1_0::BsServiceNotification *", +- "referenced_type" : "type-1044", +- "self_type" : "type-1045", ++ "referenced_type" : "type-1042", ++ "self_type" : "type-1043", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24769,8 +26181,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager *", + "name" : "android::hidl::manager::V1_0::IServiceManager *", +- "referenced_type" : "type-505", +- "self_type" : "type-528", ++ "referenced_type" : "type-504", ++ "self_type" : "type-527", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24778,8 +26190,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *", + "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *", +- "referenced_type" : "type-503", +- "self_type" : "type-794", ++ "referenced_type" : "type-502", ++ "self_type" : "type-792", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24787,8 +26199,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *", + "name" : "android::hidl::manager::V1_0::IServiceNotification *", +- "referenced_type" : "type-496", +- "self_type" : "type-544", ++ "referenced_type" : "type-494", ++ "self_type" : "type-543", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24796,8 +26208,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager *", + "name" : "android::hidl::manager::V1_1::BnHwServiceManager *", +- "referenced_type" : "type-836", +- "self_type" : "type-837", ++ "referenced_type" : "type-833", ++ "self_type" : "type-835", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -24805,8 +26217,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager *", + "name" : "android::hidl::manager::V1_1::BpHwServiceManager *", +- "referenced_type" : "type-838", +- "self_type" : "type-1100", ++ "referenced_type" : "type-836", ++ "self_type" : "type-1098", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24814,8 +26226,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager *", + "name" : "android::hidl::manager::V1_1::BsServiceManager *", +- "referenced_type" : "type-1098", +- "self_type" : "type-1099", ++ "referenced_type" : "type-1096", ++ "self_type" : "type-1097", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24823,8 +26235,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager *", + "name" : "android::hidl::manager::V1_1::IServiceManager *", +- "referenced_type" : "type-515", +- "self_type" : "type-533", ++ "referenced_type" : "type-514", ++ "self_type" : "type-532", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24832,8 +26244,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback *", + "name" : "android::hidl::manager::V1_2::BnHwClientCallback *", +- "referenced_type" : "type-844", +- "self_type" : "type-846", ++ "referenced_type" : "type-842", ++ "self_type" : "type-843", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -24841,8 +26253,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager *", + "name" : "android::hidl::manager::V1_2::BnHwServiceManager *", +- "referenced_type" : "type-802", +- "self_type" : "type-853", ++ "referenced_type" : "type-800", ++ "self_type" : "type-851", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h" + }, +@@ -24850,8 +26262,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback *", + "name" : "android::hidl::manager::V1_2::BpHwClientCallback *", +- "referenced_type" : "type-847", +- "self_type" : "type-1930", ++ "referenced_type" : "type-844", ++ "self_type" : "type-1926", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24859,8 +26271,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager *", + "name" : "android::hidl::manager::V1_2::BpHwServiceManager *", +- "referenced_type" : "type-727", +- "self_type" : "type-732", ++ "referenced_type" : "type-725", ++ "self_type" : "type-730", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24868,8 +26280,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback *", + "name" : "android::hidl::manager::V1_2::BsClientCallback *", +- "referenced_type" : "type-1928", +- "self_type" : "type-1929", ++ "referenced_type" : "type-1924", ++ "self_type" : "type-1925", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24877,8 +26289,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager *", + "name" : "android::hidl::manager::V1_2::BsServiceManager *", +- "referenced_type" : "type-2003", +- "self_type" : "type-2004", ++ "referenced_type" : "type-1999", ++ "self_type" : "type-2000", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24886,8 +26298,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback *", + "name" : "android::hidl::manager::V1_2::IClientCallback *", +- "referenced_type" : "type-499", +- "self_type" : "type-550", ++ "referenced_type" : "type-498", ++ "self_type" : "type-548", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24895,8 +26307,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager *", + "name" : "android::hidl::manager::V1_2::IServiceManager *", +- "referenced_type" : "type-518", +- "self_type" : "type-539", ++ "referenced_type" : "type-517", ++ "self_type" : "type-537", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24904,8 +26316,8 @@ + "alignment" : 8, + "linker_set_key" : "android::key_value_pair_t > *", + "name" : "android::key_value_pair_t > *", +- "referenced_type" : "type-3621", +- "self_type" : "type-3624", ++ "referenced_type" : "type-3615", ++ "self_type" : "type-3618", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -24913,8 +26325,8 @@ + "alignment" : 8, + "linker_set_key" : "android::key_value_pair_t *", + "name" : "android::key_value_pair_t *", +- "referenced_type" : "type-2196", +- "self_type" : "type-2200", ++ "referenced_type" : "type-2192", ++ "self_type" : "type-2196", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -24922,8 +26334,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-453", +- "self_type" : "type-3636", ++ "referenced_type" : "type-451", ++ "self_type" : "type-3630", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24931,8 +26343,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-426", +- "self_type" : "type-457", ++ "referenced_type" : "type-425", ++ "self_type" : "type-456", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24940,8 +26352,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-2281", +- "self_type" : "type-2314", ++ "referenced_type" : "type-2277", ++ "self_type" : "type-2310", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -24958,8 +26370,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-921", +- "self_type" : "type-923", ++ "referenced_type" : "type-919", ++ "self_type" : "type-921", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24967,8 +26379,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-384", +- "self_type" : "type-436", ++ "referenced_type" : "type-383", ++ "self_type" : "type-435", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24976,8 +26388,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-719", +- "self_type" : "type-742", ++ "referenced_type" : "type-717", ++ "self_type" : "type-740", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24985,8 +26397,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-445", +- "self_type" : "type-449", ++ "referenced_type" : "type-444", ++ "self_type" : "type-448", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24994,8 +26406,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-556", +- "self_type" : "type-558", ++ "referenced_type" : "type-555", ++ "self_type" : "type-557", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25003,8 +26415,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-743", +- "self_type" : "type-745", ++ "referenced_type" : "type-741", ++ "self_type" : "type-743", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25012,8 +26424,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-907", +- "self_type" : "type-940", ++ "referenced_type" : "type-905", ++ "self_type" : "type-938", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25022,7 +26434,7 @@ + "linker_set_key" : "android::sp *", + "name" : "android::sp *", + "referenced_type" : "type-81", +- "self_type" : "type-429", ++ "self_type" : "type-428", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25031,7 +26443,7 @@ + "linker_set_key" : "android::sp *", + "name" : "android::sp *", + "referenced_type" : "type-300", +- "self_type" : "type-434", ++ "self_type" : "type-433", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25039,8 +26451,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-527", +- "self_type" : "type-529", ++ "referenced_type" : "type-526", ++ "self_type" : "type-528", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25048,8 +26460,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-543", +- "self_type" : "type-545", ++ "referenced_type" : "type-542", ++ "self_type" : "type-544", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25057,8 +26469,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-532", +- "self_type" : "type-534", ++ "referenced_type" : "type-531", ++ "self_type" : "type-533", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25066,8 +26478,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-549", +- "self_type" : "type-551", ++ "referenced_type" : "type-547", ++ "self_type" : "type-550", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25075,8 +26487,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-538", +- "self_type" : "type-540", ++ "referenced_type" : "type-536", ++ "self_type" : "type-539", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25085,7 +26497,7 @@ + "linker_set_key" : "android::wp *", + "name" : "android::wp *", + "referenced_type" : "type-331", +- "self_type" : "type-422", ++ "self_type" : "type-420", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25093,8 +26505,8 @@ + "alignment" : 8, + "linker_set_key" : "android::wp *", + "name" : "android::wp *", +- "referenced_type" : "type-900", +- "self_type" : "type-905", ++ "referenced_type" : "type-898", ++ "self_type" : "type-903", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25102,8 +26514,8 @@ + "alignment" : 8, + "linker_set_key" : "android::wp *", + "name" : "android::wp *", +- "referenced_type" : "type-2194", +- "self_type" : "type-2193", ++ "referenced_type" : "type-2190", ++ "self_type" : "type-2189", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25112,7 +26524,7 @@ + "linker_set_key" : "android::wp *", + "name" : "android::wp *", + "referenced_type" : "type-307", +- "self_type" : "type-417", ++ "self_type" : "type-416", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25138,8 +26550,8 @@ + "alignment" : 8, + "linker_set_key" : "bool (*)(const android::String16 &, const android::sp &, void *)", + "name" : "bool (*)(const android::String16 &, const android::sp &, void *)", +- "referenced_type" : "type-2241", +- "self_type" : "type-2243", ++ "referenced_type" : "type-2237", ++ "self_type" : "type-2239", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, +@@ -25148,7 +26560,7 @@ + "linker_set_key" : "bool *", + "name" : "bool *", + "referenced_type" : "type-29", +- "self_type" : "type-3594", ++ "self_type" : "type-3588", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -25174,8 +26586,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::KeyedVector > *", + "name" : "const android::KeyedVector > *", +- "referenced_type" : "type-3649", +- "self_type" : "type-3651", ++ "referenced_type" : "type-3643", ++ "self_type" : "type-3645", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -25183,8 +26595,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::KeyedVector *", + "name" : "const android::KeyedVector *", +- "referenced_type" : "type-2230", +- "self_type" : "type-2231", ++ "referenced_type" : "type-2226", ++ "self_type" : "type-2227", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -25210,8 +26622,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::SortedVector > > *", + "name" : "const android::SortedVector > > *", +- "referenced_type" : "type-3640", +- "self_type" : "type-3641", ++ "referenced_type" : "type-3634", ++ "self_type" : "type-3635", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -25219,8 +26631,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::SortedVector > *", + "name" : "const android::SortedVector > *", +- "referenced_type" : "type-2220", +- "self_type" : "type-2221", ++ "referenced_type" : "type-2216", ++ "self_type" : "type-2217", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -25246,8 +26658,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-3441", +- "self_type" : "type-3442", ++ "referenced_type" : "type-3435", ++ "self_type" : "type-3436", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25255,8 +26667,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-3437", +- "self_type" : "type-3438", ++ "referenced_type" : "type-3431", ++ "self_type" : "type-3432", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25273,8 +26685,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-3433", +- "self_type" : "type-3434", ++ "referenced_type" : "type-3427", ++ "self_type" : "type-3428", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25282,8 +26694,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-2225", +- "self_type" : "type-2226", ++ "referenced_type" : "type-2221", ++ "self_type" : "type-2222", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25291,8 +26703,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-3644", +- "self_type" : "type-3645", ++ "referenced_type" : "type-3638", ++ "self_type" : "type-3639", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25300,8 +26712,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::Vector > *", + "name" : "const android::Vector > *", +- "referenced_type" : "type-2332", +- "self_type" : "type-2333", ++ "referenced_type" : "type-2328", ++ "self_type" : "type-2329", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25309,8 +26721,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-2325", +- "self_type" : "type-2326", ++ "referenced_type" : "type-2321", ++ "self_type" : "type-2322", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25327,8 +26739,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::BHwBinder *", + "name" : "const android::hardware::BHwBinder *", +- "referenced_type" : "type-2173", +- "self_type" : "type-2174", ++ "referenced_type" : "type-2169", ++ "self_type" : "type-2170", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -25336,8 +26748,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::BpHwBinder *", + "name" : "const android::hardware::BpHwBinder *", +- "referenced_type" : "type-2184", +- "self_type" : "type-2185", ++ "referenced_type" : "type-2180", ++ "self_type" : "type-2181", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -25345,8 +26757,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::BpHwBinder::Obituary *", + "name" : "const android::hardware::BpHwBinder::Obituary *", +- "referenced_type" : "type-2203", +- "self_type" : "type-2204", ++ "referenced_type" : "type-2199", ++ "self_type" : "type-2200", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -25354,8 +26766,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager *", + "name" : "const android::hardware::BpHwBinder::ObjectManager *", +- "referenced_type" : "type-2237", +- "self_type" : "type-2238", ++ "referenced_type" : "type-2233", ++ "self_type" : "type-2234", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -25363,8 +26775,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::BpHwRefBase *", + "name" : "const android::hardware::BpHwRefBase *", +- "referenced_type" : "type-2182", +- "self_type" : "type-2183", ++ "referenced_type" : "type-2178", ++ "self_type" : "type-2179", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -25372,8 +26784,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::BufferedTextOutput *", + "name" : "const android::hardware::BufferedTextOutput *", +- "referenced_type" : "type-2320", +- "self_type" : "type-2321", ++ "referenced_type" : "type-2316", ++ "self_type" : "type-2317", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -25381,8 +26793,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::ConcurrentMap, android::hardware::details::SchedPrio> *", + "name" : "const android::hardware::ConcurrentMap, android::hardware::details::SchedPrio> *", +- "referenced_type" : "type-1011", +- "self_type" : "type-1012", ++ "referenced_type" : "type-1009", ++ "self_type" : "type-1010", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -25390,8 +26802,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::ConcurrentMap, bool> *", + "name" : "const android::hardware::ConcurrentMap, bool> *", +- "referenced_type" : "type-1013", +- "self_type" : "type-1014", ++ "referenced_type" : "type-1011", ++ "self_type" : "type-1012", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -25399,8 +26811,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::ConcurrentMap > *", + "name" : "const android::hardware::ConcurrentMap > *", +- "referenced_type" : "type-343", +- "self_type" : "type-344", ++ "referenced_type" : "type-344", ++ "self_type" : "type-345", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -25408,8 +26820,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", + "name" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", +- "referenced_type" : "type-596", +- "self_type" : "type-598", ++ "referenced_type" : "type-595", ++ "self_type" : "type-596", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -25417,8 +26829,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", + "name" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", +- "referenced_type" : "type-355", +- "self_type" : "type-357", ++ "referenced_type" : "type-354", ++ "self_type" : "type-355", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -25426,8 +26838,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::HexDump *", + "name" : "const android::hardware::HexDump *", +- "referenced_type" : "type-2300", +- "self_type" : "type-2301", ++ "referenced_type" : "type-2296", ++ "self_type" : "type-2297", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -25435,8 +26847,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::IBinder *", + "name" : "const android::hardware::IBinder *", +- "referenced_type" : "type-1286", +- "self_type" : "type-1288", ++ "referenced_type" : "type-1283", ++ "self_type" : "type-1285", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25444,8 +26856,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::IBinder *", + "name" : "const android::hardware::IBinder *", +- "referenced_type" : "type-2141", +- "self_type" : "type-2142", ++ "referenced_type" : "type-2137", ++ "self_type" : "type-2138", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, +@@ -25453,8 +26865,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::IBinder *", + "name" : "const android::hardware::IBinder *", +- "referenced_type" : "type-2436", +- "self_type" : "type-2438", ++ "referenced_type" : "type-2431", ++ "self_type" : "type-2433", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25462,8 +26874,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::IBinder *", + "name" : "const android::hardware::IBinder *", +- "referenced_type" : "type-3779", +- "self_type" : "type-3781", ++ "referenced_type" : "type-3772", ++ "self_type" : "type-3774", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25471,8 +26883,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::IBinder *", + "name" : "const android::hardware::IBinder *", +- "referenced_type" : "type-442", +- "self_type" : "type-444", ++ "referenced_type" : "type-441", ++ "self_type" : "type-443", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25480,8 +26892,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::IBinder::DeathRecipient *", + "name" : "const android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-2232", +- "self_type" : "type-2233", ++ "referenced_type" : "type-2228", ++ "self_type" : "type-2229", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25489,8 +26901,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::IInterface *", + "name" : "const android::hardware::IInterface *", +- "referenced_type" : "type-3410", +- "self_type" : "type-3411", ++ "referenced_type" : "type-3404", ++ "self_type" : "type-3405", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25498,8 +26910,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::IPCThreadState *", + "name" : "const android::hardware::IPCThreadState *", +- "referenced_type" : "type-3451", +- "self_type" : "type-3452", ++ "referenced_type" : "type-3445", ++ "self_type" : "type-3446", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -25507,8 +26919,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Parcel *", + "name" : "const android::hardware::Parcel *", +- "referenced_type" : "type-2166", +- "self_type" : "type-3579", ++ "referenced_type" : "type-2162", ++ "self_type" : "type-3573", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -25516,8 +26928,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::ProcessState *", + "name" : "const android::hardware::ProcessState *", +- "referenced_type" : "type-3663", +- "self_type" : "type-3664", ++ "referenced_type" : "type-3657", ++ "self_type" : "type-3658", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25525,8 +26937,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::ProcessState::handle_entry *", + "name" : "const android::hardware::ProcessState::handle_entry *", +- "referenced_type" : "type-3625", +- "self_type" : "type-3626", ++ "referenced_type" : "type-3619", ++ "self_type" : "type-3620", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -25534,8 +26946,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Return *", + "name" : "const android::hardware::Return *", +- "referenced_type" : "type-768", +- "self_type" : "type-769", ++ "referenced_type" : "type-766", ++ "self_type" : "type-767", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25543,8 +26955,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-762", +- "self_type" : "type-763", ++ "referenced_type" : "type-759", ++ "self_type" : "type-760", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25552,8 +26964,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-948", +- "self_type" : "type-949", ++ "referenced_type" : "type-946", ++ "self_type" : "type-947", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25561,8 +26973,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-1057", +- "self_type" : "type-1058", ++ "referenced_type" : "type-1055", ++ "self_type" : "type-1056", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25570,8 +26982,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-1114", +- "self_type" : "type-1115", ++ "referenced_type" : "type-1112", ++ "self_type" : "type-1113", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25579,8 +26991,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-1949", +- "self_type" : "type-1950", ++ "referenced_type" : "type-1945", ++ "self_type" : "type-1946", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25588,8 +27000,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-2019", +- "self_type" : "type-2020", ++ "referenced_type" : "type-2015", ++ "self_type" : "type-2016", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25597,8 +27009,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::Return *", + "name" : "const android::hardware::Return *", +- "referenced_type" : "type-460", +- "self_type" : "type-461", ++ "referenced_type" : "type-459", ++ "self_type" : "type-460", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25615,8 +27027,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::TypeCode *", + "name" : "const android::hardware::TypeCode *", +- "referenced_type" : "type-2295", +- "self_type" : "type-2296", ++ "referenced_type" : "type-2291", ++ "self_type" : "type-2292", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -25624,8 +27036,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::details::Waiter *", + "name" : "const android::hardware::details::Waiter *", +- "referenced_type" : "type-1585", +- "self_type" : "type-1587", ++ "referenced_type" : "type-1576", ++ "self_type" : "type-1583", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25633,8 +27045,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::details::Waiter *", + "name" : "const android::hardware::details::Waiter *", +- "referenced_type" : "type-2726", +- "self_type" : "type-2728", ++ "referenced_type" : "type-2715", ++ "self_type" : "type-2722", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25642,8 +27054,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::details::Waiter *", + "name" : "const android::hardware::details::Waiter *", +- "referenced_type" : "type-754", +- "self_type" : "type-756", ++ "referenced_type" : "type-747", ++ "self_type" : "type-754", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25651,8 +27063,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::details::hidl_pointer > *", + "name" : "const android::hardware::details::hidl_pointer > *", +- "referenced_type" : "type-1036", +- "self_type" : "type-1037", ++ "referenced_type" : "type-1034", ++ "self_type" : "type-1035", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -25660,8 +27072,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::details::hidl_pointer *", + "name" : "const android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-607", +- "self_type" : "type-608", ++ "referenced_type" : "type-606", ++ "self_type" : "type-607", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -25669,8 +27081,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::details::hidl_pointer *", + "name" : "const android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-809", +- "self_type" : "type-812", ++ "referenced_type" : "type-807", ++ "self_type" : "type-810", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -25696,8 +27108,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::details::hidl_pointer *", + "name" : "const android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-492", +- "self_type" : "type-493", ++ "referenced_type" : "type-491", ++ "self_type" : "type-492", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -25714,8 +27126,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::hidl_array *", + "name" : "const android::hardware::hidl_array *", +- "referenced_type" : "type-2082", +- "self_type" : "type-2081", ++ "referenced_type" : "type-2078", ++ "self_type" : "type-2077", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -25723,8 +27135,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::hidl_death_recipient *", + "name" : "const android::hardware::hidl_death_recipient *", +- "referenced_type" : "type-432", +- "self_type" : "type-433", ++ "referenced_type" : "type-430", ++ "self_type" : "type-432", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25759,8 +27171,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::hidl_vec > *", + "name" : "const android::hardware::hidl_vec > *", +- "referenced_type" : "type-2083", +- "self_type" : "type-2084", ++ "referenced_type" : "type-2079", ++ "self_type" : "type-2080", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -25768,8 +27180,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::hidl_vec *", + "name" : "const android::hardware::hidl_vec *", +- "referenced_type" : "type-574", +- "self_type" : "type-575", ++ "referenced_type" : "type-573", ++ "self_type" : "type-574", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -25777,8 +27189,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::hidl_vec *", + "name" : "const android::hardware::hidl_vec *", +- "referenced_type" : "type-981", +- "self_type" : "type-982", ++ "referenced_type" : "type-979", ++ "self_type" : "type-980", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -25786,8 +27198,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::hidl_vec::iter *", + "name" : "const android::hardware::hidl_vec::iter *", +- "referenced_type" : "type-581", +- "self_type" : "type-582", ++ "referenced_type" : "type-580", ++ "self_type" : "type-581", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -25795,8 +27207,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hardware::hidl_vec *", + "name" : "const android::hardware::hidl_vec *", +- "referenced_type" : "type-477", +- "self_type" : "type-478", ++ "referenced_type" : "type-476", ++ "self_type" : "type-477", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -25813,8 +27225,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase *", + "name" : "const android::hidl::base::V1_0::BpHwBase *", +- "referenced_type" : "type-373", +- "self_type" : "type-374", ++ "referenced_type" : "type-372", ++ "self_type" : "type-373", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, +@@ -25831,8 +27243,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceManager *", + "name" : "const android::hidl::manager::V1_0::BpHwServiceManager *", +- "referenced_type" : "type-833", +- "self_type" : "type-835", ++ "referenced_type" : "type-831", ++ "self_type" : "type-832", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, +@@ -25840,8 +27252,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceNotification *", + "name" : "const android::hidl::manager::V1_0::BpHwServiceNotification *", +- "referenced_type" : "type-825", +- "self_type" : "type-826", ++ "referenced_type" : "type-823", ++ "self_type" : "type-824", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, +@@ -25849,8 +27261,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager *", + "name" : "const android::hidl::manager::V1_0::IServiceManager *", +- "referenced_type" : "type-504", +- "self_type" : "type-506", ++ "referenced_type" : "type-503", ++ "self_type" : "type-505", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -25858,8 +27270,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *", + "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *", +- "referenced_type" : "type-980", +- "self_type" : "type-979", ++ "referenced_type" : "type-978", ++ "self_type" : "type-977", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -25867,8 +27279,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *", + "name" : "const android::hidl::manager::V1_0::IServiceNotification *", +- "referenced_type" : "type-495", +- "self_type" : "type-497", ++ "referenced_type" : "type-493", ++ "self_type" : "type-496", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, +@@ -25876,8 +27288,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hidl::manager::V1_1::BpHwServiceManager *", + "name" : "const android::hidl::manager::V1_1::BpHwServiceManager *", +- "referenced_type" : "type-842", +- "self_type" : "type-843", ++ "referenced_type" : "type-840", ++ "self_type" : "type-841", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, +@@ -25885,8 +27297,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hidl::manager::V1_1::IServiceManager *", + "name" : "const android::hidl::manager::V1_1::IServiceManager *", +- "referenced_type" : "type-514", +- "self_type" : "type-516", ++ "referenced_type" : "type-513", ++ "self_type" : "type-515", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, +@@ -25894,8 +27306,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hidl::manager::V1_2::BpHwClientCallback *", + "name" : "const android::hidl::manager::V1_2::BpHwClientCallback *", +- "referenced_type" : "type-851", +- "self_type" : "type-852", ++ "referenced_type" : "type-849", ++ "self_type" : "type-850", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, +@@ -25903,8 +27315,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hidl::manager::V1_2::BpHwServiceManager *", + "name" : "const android::hidl::manager::V1_2::BpHwServiceManager *", +- "referenced_type" : "type-854", +- "self_type" : "type-856", ++ "referenced_type" : "type-852", ++ "self_type" : "type-853", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, +@@ -25912,8 +27324,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hidl::manager::V1_2::IClientCallback *", + "name" : "const android::hidl::manager::V1_2::IClientCallback *", +- "referenced_type" : "type-498", +- "self_type" : "type-500", ++ "referenced_type" : "type-497", ++ "self_type" : "type-499", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, +@@ -25921,8 +27333,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager *", + "name" : "const android::hidl::manager::V1_2::IServiceManager *", +- "referenced_type" : "type-517", +- "self_type" : "type-519", ++ "referenced_type" : "type-516", ++ "self_type" : "type-518", + "size" : 8, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, +@@ -25930,8 +27342,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::key_value_pair_t > *", + "name" : "const android::key_value_pair_t > *", +- "referenced_type" : "type-3620", +- "self_type" : "type-3627", ++ "referenced_type" : "type-3614", ++ "self_type" : "type-3621", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -25939,8 +27351,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::key_value_pair_t *", + "name" : "const android::key_value_pair_t *", +- "referenced_type" : "type-2195", +- "self_type" : "type-2202", ++ "referenced_type" : "type-2191", ++ "self_type" : "type-2198", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -25948,8 +27360,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-3643", +- "self_type" : "type-3650", ++ "referenced_type" : "type-3637", ++ "self_type" : "type-3644", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25957,8 +27369,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-3450", +- "self_type" : "type-3459", ++ "referenced_type" : "type-3444", ++ "self_type" : "type-3453", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25966,8 +27378,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-2308", +- "self_type" : "type-2315", ++ "referenced_type" : "type-2304", ++ "self_type" : "type-2311", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -25984,8 +27396,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-2217", +- "self_type" : "type-2235", ++ "referenced_type" : "type-2213", ++ "self_type" : "type-2231", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25993,8 +27405,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-440", +- "self_type" : "type-441", ++ "referenced_type" : "type-439", ++ "self_type" : "type-440", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26002,8 +27414,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-3407", +- "self_type" : "type-3409", ++ "referenced_type" : "type-3401", ++ "self_type" : "type-3403", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26011,8 +27423,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-450", +- "self_type" : "type-451", ++ "referenced_type" : "type-449", ++ "self_type" : "type-450", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26020,8 +27432,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-559", +- "self_type" : "type-560", ++ "referenced_type" : "type-558", ++ "self_type" : "type-559", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26029,8 +27441,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-747", +- "self_type" : "type-753", ++ "referenced_type" : "type-745", ++ "self_type" : "type-746", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26038,8 +27450,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-906", +- "self_type" : "type-943", ++ "referenced_type" : "type-904", ++ "self_type" : "type-941", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26056,8 +27468,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-411", +- "self_type" : "type-435", ++ "referenced_type" : "type-410", ++ "self_type" : "type-434", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26065,8 +27477,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-530", +- "self_type" : "type-531", ++ "referenced_type" : "type-529", ++ "self_type" : "type-530", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26074,8 +27486,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-546", +- "self_type" : "type-547", ++ "referenced_type" : "type-545", ++ "self_type" : "type-546", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26083,8 +27495,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-535", +- "self_type" : "type-536", ++ "referenced_type" : "type-534", ++ "self_type" : "type-535", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26092,8 +27504,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-554", +- "self_type" : "type-555", ++ "referenced_type" : "type-553", ++ "self_type" : "type-554", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26101,8 +27513,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-541", +- "self_type" : "type-542", ++ "referenced_type" : "type-540", ++ "self_type" : "type-541", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26110,8 +27522,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::wp *", + "name" : "const android::wp *", +- "referenced_type" : "type-423", +- "self_type" : "type-428", ++ "referenced_type" : "type-422", ++ "self_type" : "type-427", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26119,8 +27531,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::wp *", + "name" : "const android::wp *", +- "referenced_type" : "type-2171", +- "self_type" : "type-2223", ++ "referenced_type" : "type-2167", ++ "self_type" : "type-2219", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26128,8 +27540,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::wp *", + "name" : "const android::wp *", +- "referenced_type" : "type-3565", +- "self_type" : "type-3573", ++ "referenced_type" : "type-3559", ++ "self_type" : "type-3567", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26137,8 +27549,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::wp *", + "name" : "const android::wp *", +- "referenced_type" : "type-418", +- "self_type" : "type-420", ++ "referenced_type" : "type-417", ++ "self_type" : "type-419", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26146,8 +27558,8 @@ + "alignment" : 8, + "linker_set_key" : "const android::wp *", + "name" : "const android::wp *", +- "referenced_type" : "type-415", +- "self_type" : "type-416", ++ "referenced_type" : "type-414", ++ "self_type" : "type-415", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26155,8 +27567,8 @@ + "alignment" : 8, + "linker_set_key" : "const binder_buffer_object *", + "name" : "const binder_buffer_object *", +- "referenced_type" : "type-3600", +- "self_type" : "type-3602", ++ "referenced_type" : "type-3594", ++ "self_type" : "type-3596", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26191,8 +27603,8 @@ + "alignment" : 8, + "linker_set_key" : "const dirent *", + "name" : "const dirent *", +- "referenced_type" : "type-1777", +- "self_type" : "type-1831", ++ "referenced_type" : "type-1773", ++ "self_type" : "type-1827", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26200,8 +27612,8 @@ + "alignment" : 8, + "linker_set_key" : "const dirent *", + "name" : "const dirent *", +- "referenced_type" : "type-2918", +- "self_type" : "type-2972", ++ "referenced_type" : "type-2912", ++ "self_type" : "type-2966", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26209,8 +27621,8 @@ + "alignment" : 8, + "linker_set_key" : "const dirent *", + "name" : "const dirent *", +- "referenced_type" : "type-995", +- "self_type" : "type-1052", ++ "referenced_type" : "type-993", ++ "self_type" : "type-1050", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26218,8 +27630,8 @@ + "alignment" : 8, + "linker_set_key" : "const flat_binder_object *", + "name" : "const flat_binder_object *", +- "referenced_type" : "type-3583", +- "self_type" : "type-3597", ++ "referenced_type" : "type-3577", ++ "self_type" : "type-3591", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26228,7 +27640,7 @@ + "linker_set_key" : "const int *", + "name" : "const int *", + "referenced_type" : "type-569", +- "self_type" : "type-977", ++ "self_type" : "type-975", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26255,7 +27667,7 @@ + "linker_set_key" : "const native_handle **", + "name" : "const native_handle **", + "referenced_type" : "type-11", +- "self_type" : "type-3599", ++ "self_type" : "type-3593", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26263,8 +27675,8 @@ + "alignment" : 8, + "linker_set_key" : "const unsigned char *", + "name" : "const unsigned char *", +- "referenced_type" : "type-523", +- "self_type" : "type-989", ++ "referenced_type" : "type-522", ++ "self_type" : "type-986", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26273,7 +27685,7 @@ + "linker_set_key" : "const unsigned long *", + "name" : "const unsigned long *", + "referenced_type" : "type-190", +- "self_type" : "type-3544", ++ "self_type" : "type-3538", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -26281,8 +27693,8 @@ + "alignment" : 8, + "linker_set_key" : "const unsigned long long *", + "name" : "const unsigned long long *", +- "referenced_type" : "type-2165", +- "self_type" : "type-2164", ++ "referenced_type" : "type-2161", ++ "self_type" : "type-2160", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26300,7 +27712,7 @@ + "linker_set_key" : "const void **", + "name" : "const void **", + "referenced_type" : "type-78", +- "self_type" : "type-3598", ++ "self_type" : "type-3592", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26309,7 +27721,7 @@ + "linker_set_key" : "double *", + "name" : "double *", + "referenced_type" : "type-6", +- "self_type" : "type-3593", ++ "self_type" : "type-3587", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26318,7 +27730,7 @@ + "linker_set_key" : "float *", + "name" : "float *", + "referenced_type" : "type-238", +- "self_type" : "type-3592", ++ "self_type" : "type-3586", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26336,7 +27748,7 @@ + "linker_set_key" : "int *", + "name" : "int *", + "referenced_type" : "type-14", +- "self_type" : "type-476", ++ "self_type" : "type-475", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26354,7 +27766,7 @@ + "linker_set_key" : "long *", + "name" : "long *", + "referenced_type" : "type-265", +- "self_type" : "type-3591", ++ "self_type" : "type-3585", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26372,7 +27784,7 @@ + "linker_set_key" : "short *", + "name" : "short *", + "referenced_type" : "type-151", +- "self_type" : "type-3588", ++ "self_type" : "type-3582", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26380,8 +27792,8 @@ + "alignment" : 8, + "linker_set_key" : "signed char *", + "name" : "signed char *", +- "referenced_type" : "type-484", +- "self_type" : "type-3587", ++ "referenced_type" : "type-485", ++ "self_type" : "type-3580", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26389,8 +27801,8 @@ + "alignment" : 8, + "linker_set_key" : "std::__1::basic_ostream &(*)(std::__1::basic_ostream &)", + "name" : "std::__1::basic_ostream &(*)(std::__1::basic_ostream &)", +- "referenced_type" : "type-2302", +- "self_type" : "type-2305", ++ "referenced_type" : "type-2298", ++ "self_type" : "type-2301", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -26398,8 +27810,8 @@ + "alignment" : 8, + "linker_set_key" : "std::unique_ptr > *", + "name" : "std::unique_ptr > *", +- "referenced_type" : "type-3596", +- "self_type" : "type-3595", ++ "referenced_type" : "type-3590", ++ "self_type" : "type-3589", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26407,8 +27819,8 @@ + "alignment" : 8, + "linker_set_key" : "std::vector > *)>, std::allocator > *)> > > *", + "name" : "std::vector > *)>, std::allocator > *)> > > *", +- "referenced_type" : "type-1711", +- "self_type" : "type-1710", ++ "referenced_type" : "type-1707", ++ "self_type" : "type-1706", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26416,8 +27828,8 @@ + "alignment" : 8, + "linker_set_key" : "std::vector > *)>, std::allocator > *)> > > *", + "name" : "std::vector > *)>, std::allocator > *)> > > *", +- "referenced_type" : "type-2852", +- "self_type" : "type-2851", ++ "referenced_type" : "type-2846", ++ "self_type" : "type-2845", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26425,8 +27837,8 @@ + "alignment" : 8, + "linker_set_key" : "std::vector > *)>, std::allocator > *)> > > *", + "name" : "std::vector > *)>, std::allocator > *)> > > *", +- "referenced_type" : "type-911", +- "self_type" : "type-910", ++ "referenced_type" : "type-909", ++ "self_type" : "type-908", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26453,7 +27865,7 @@ + "linker_set_key" : "unsigned int *", + "name" : "unsigned int *", + "referenced_type" : "type-44", +- "self_type" : "type-3590", ++ "self_type" : "type-3584", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26462,7 +27874,7 @@ + "linker_set_key" : "unsigned long *", + "name" : "unsigned long *", + "referenced_type" : "type-16", +- "self_type" : "type-1001", ++ "self_type" : "type-999", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -26470,8 +27882,8 @@ + "alignment" : 8, + "linker_set_key" : "unsigned long long *", + "name" : "unsigned long long *", +- "referenced_type" : "type-389", +- "self_type" : "type-2161", ++ "referenced_type" : "type-388", ++ "self_type" : "type-2157", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26480,7 +27892,7 @@ + "linker_set_key" : "unsigned short *", + "name" : "unsigned short *", + "referenced_type" : "type-71", +- "self_type" : "type-3589", ++ "self_type" : "type-3583", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26488,8 +27900,8 @@ + "alignment" : 8, + "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)", + "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)", +- "referenced_type" : "type-2163", +- "self_type" : "type-2162", ++ "referenced_type" : "type-2159", ++ "self_type" : "type-2158", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26497,8 +27909,8 @@ + "alignment" : 8, + "linker_set_key" : "void (*)(const void *, void *, void *)", + "name" : "void (*)(const void *, void *, void *)", +- "referenced_type" : "type-2157", +- "self_type" : "type-2156", ++ "referenced_type" : "type-2153", ++ "self_type" : "type-2152", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -26506,8 +27918,8 @@ + "alignment" : 8, + "linker_set_key" : "void (*)(void *, const char *)", + "name" : "void (*)(void *, const char *)", +- "referenced_type" : "type-3398", +- "self_type" : "type-3399", ++ "referenced_type" : "type-3392", ++ "self_type" : "type-3393", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h" + }, +@@ -26538,7 +27950,7 @@ + "linker_set_key" : "android::RefBase *const", + "name" : "android::RefBase *const", + "referenced_type" : "type-25", +- "self_type" : "type-3420", ++ "self_type" : "type-3414", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -26547,8 +27959,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1059", +- "self_type" : "type-1061", ++ "referenced_type" : "type-1057", ++ "self_type" : "type-1059", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26557,8 +27969,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1116", +- "self_type" : "type-1118", ++ "referenced_type" : "type-1114", ++ "self_type" : "type-1116", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26567,8 +27979,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1191", +- "self_type" : "type-1193", ++ "referenced_type" : "type-1189", ++ "self_type" : "type-1191", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26577,8 +27989,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1297", +- "self_type" : "type-1299", ++ "referenced_type" : "type-1294", ++ "self_type" : "type-1296", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26587,8 +27999,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1366", +- "self_type" : "type-1368", ++ "referenced_type" : "type-1363", ++ "self_type" : "type-1365", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26597,8 +28009,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1498", +- "self_type" : "type-1500", ++ "referenced_type" : "type-1495", ++ "self_type" : "type-1497", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26607,8 +28019,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1509", +- "self_type" : "type-1508", ++ "referenced_type" : "type-1506", ++ "self_type" : "type-1505", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26617,8 +28029,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1537", +- "self_type" : "type-1539", ++ "referenced_type" : "type-1533", ++ "self_type" : "type-1535", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26627,8 +28039,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1605", +- "self_type" : "type-1607", ++ "referenced_type" : "type-1599", ++ "self_type" : "type-1603", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26637,8 +28049,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1675", +- "self_type" : "type-1677", ++ "referenced_type" : "type-1671", ++ "self_type" : "type-1673", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26647,8 +28059,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1749", +- "self_type" : "type-1751", ++ "referenced_type" : "type-1745", ++ "self_type" : "type-1747", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26657,8 +28069,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1837", +- "self_type" : "type-1839", ++ "referenced_type" : "type-1833", ++ "self_type" : "type-1835", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26667,8 +28079,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1892", +- "self_type" : "type-1894", ++ "referenced_type" : "type-1888", ++ "self_type" : "type-1890", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26677,8 +28089,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1952", +- "self_type" : "type-1954", ++ "referenced_type" : "type-1948", ++ "self_type" : "type-1950", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26687,8 +28099,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2024", +- "self_type" : "type-2026", ++ "referenced_type" : "type-2020", ++ "self_type" : "type-2022", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26697,8 +28109,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2070", +- "self_type" : "type-2072", ++ "referenced_type" : "type-2066", ++ "self_type" : "type-2068", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26717,8 +28129,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2120", +- "self_type" : "type-2122", ++ "referenced_type" : "type-2115", ++ "self_type" : "type-2118", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26727,8 +28139,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2136", +- "self_type" : "type-2138", ++ "referenced_type" : "type-2132", ++ "self_type" : "type-2134", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26737,8 +28149,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2213", +- "self_type" : "type-2215", ++ "referenced_type" : "type-2209", ++ "self_type" : "type-2211", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26747,8 +28159,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2310", +- "self_type" : "type-2312", ++ "referenced_type" : "type-2306", ++ "self_type" : "type-2308", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26757,8 +28169,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2327", +- "self_type" : "type-2340", ++ "referenced_type" : "type-2325", ++ "self_type" : "type-2338", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26767,8 +28179,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2446", +- "self_type" : "type-2448", ++ "referenced_type" : "type-2441", ++ "self_type" : "type-2443", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26777,8 +28189,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2515", +- "self_type" : "type-2517", ++ "referenced_type" : "type-2510", ++ "self_type" : "type-2512", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26787,8 +28199,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2639", +- "self_type" : "type-2641", ++ "referenced_type" : "type-2634", ++ "self_type" : "type-2636", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26797,8 +28209,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2650", +- "self_type" : "type-2649", ++ "referenced_type" : "type-2645", ++ "self_type" : "type-2644", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26817,8 +28229,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2678", +- "self_type" : "type-2680", ++ "referenced_type" : "type-2672", ++ "self_type" : "type-2674", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26827,8 +28239,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2746", +- "self_type" : "type-2748", ++ "referenced_type" : "type-2738", ++ "self_type" : "type-2742", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26837,8 +28249,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2816", +- "self_type" : "type-2818", ++ "referenced_type" : "type-2810", ++ "self_type" : "type-2812", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26847,8 +28259,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2890", +- "self_type" : "type-2892", ++ "referenced_type" : "type-2884", ++ "self_type" : "type-2886", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26857,8 +28269,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2978", +- "self_type" : "type-2980", ++ "referenced_type" : "type-2972", ++ "self_type" : "type-2974", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26867,8 +28279,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3033", +- "self_type" : "type-3035", ++ "referenced_type" : "type-3027", ++ "self_type" : "type-3029", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26877,8 +28289,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3091", +- "self_type" : "type-3093", ++ "referenced_type" : "type-3085", ++ "self_type" : "type-3087", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26887,8 +28299,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3161", +- "self_type" : "type-3163", ++ "referenced_type" : "type-3155", ++ "self_type" : "type-3157", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26897,8 +28309,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3205", +- "self_type" : "type-3207", ++ "referenced_type" : "type-3199", ++ "self_type" : "type-3201", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26907,8 +28319,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3254", +- "self_type" : "type-3256", ++ "referenced_type" : "type-3247", ++ "self_type" : "type-3250", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26917,8 +28329,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3270", +- "self_type" : "type-3272", ++ "referenced_type" : "type-3264", ++ "self_type" : "type-3266", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26927,8 +28339,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3320", +- "self_type" : "type-3322", ++ "referenced_type" : "type-3314", ++ "self_type" : "type-3316", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26937,8 +28349,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3370", +- "self_type" : "type-3372", ++ "referenced_type" : "type-3364", ++ "self_type" : "type-3366", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26947,8 +28359,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3382", +- "self_type" : "type-3391", ++ "referenced_type" : "type-3377", ++ "self_type" : "type-3385", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26957,8 +28369,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3392", +- "self_type" : "type-3394", ++ "referenced_type" : "type-3386", ++ "self_type" : "type-3388", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26967,8 +28379,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3400", +- "self_type" : "type-3403", ++ "referenced_type" : "type-3394", ++ "self_type" : "type-3396", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26977,8 +28389,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3428", +- "self_type" : "type-3430", ++ "referenced_type" : "type-3422", ++ "self_type" : "type-3424", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26987,8 +28399,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3567", +- "self_type" : "type-3569", ++ "referenced_type" : "type-3561", ++ "self_type" : "type-3563", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26997,8 +28409,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3633", +- "self_type" : "type-3635", ++ "referenced_type" : "type-3627", ++ "self_type" : "type-3629", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27007,8 +28419,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3698", +- "self_type" : "type-3700", ++ "referenced_type" : "type-3690", ++ "self_type" : "type-3694", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27017,8 +28429,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3789", +- "self_type" : "type-3791", ++ "referenced_type" : "type-3782", ++ "self_type" : "type-3784", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27027,8 +28439,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3858", +- "self_type" : "type-3860", ++ "referenced_type" : "type-3851", ++ "self_type" : "type-3853", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27037,8 +28449,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-464", +- "self_type" : "type-466", ++ "referenced_type" : "type-463", ++ "self_type" : "type-465", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27047,8 +28459,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-563", +- "self_type" : "type-565", ++ "referenced_type" : "type-562", ++ "self_type" : "type-564", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27057,8 +28469,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-650", +- "self_type" : "type-652", ++ "referenced_type" : "type-649", ++ "self_type" : "type-651", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27067,8 +28479,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-661", +- "self_type" : "type-660", ++ "referenced_type" : "type-660", ++ "self_type" : "type-659", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27077,8 +28489,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-698", +- "self_type" : "type-700", ++ "referenced_type" : "type-696", ++ "self_type" : "type-698", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27087,8 +28499,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-776", +- "self_type" : "type-778", ++ "referenced_type" : "type-772", ++ "self_type" : "type-776", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27097,8 +28509,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-870", +- "self_type" : "type-872", ++ "referenced_type" : "type-868", ++ "self_type" : "type-870", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27107,8 +28519,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-955", +- "self_type" : "type-957", ++ "referenced_type" : "type-953", ++ "self_type" : "type-955", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27118,7 +28530,7 @@ + "linker_set_key" : "android::RefBase::weakref_type *const", + "name" : "android::RefBase::weakref_type *const", + "referenced_type" : "type-308", +- "self_type" : "type-3418", ++ "self_type" : "type-3412", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -27127,8 +28539,8 @@ + "is_const" : true, + "linker_set_key" : "android::hardware::BHwBinder *const", + "name" : "android::hardware::BHwBinder *const", +- "referenced_type" : "type-2143", +- "self_type" : "type-3416", ++ "referenced_type" : "type-2139", ++ "self_type" : "type-3410", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -27137,8 +28549,8 @@ + "is_const" : true, + "linker_set_key" : "android::hardware::IBinder *const", + "name" : "android::hardware::IBinder *const", +- "referenced_type" : "type-2140", +- "self_type" : "type-2178", ++ "referenced_type" : "type-2136", ++ "self_type" : "type-2174", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -27148,7 +28560,7 @@ + "linker_set_key" : "char *const", + "name" : "char *const", + "referenced_type" : "type-186", +- "self_type" : "type-3606", ++ "self_type" : "type-3600", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27157,8 +28569,8 @@ + "is_const" : true, + "linker_set_key" : "char const[10]", + "name" : "char const[10]", +- "referenced_type" : "type-3469", +- "self_type" : "type-3468", ++ "referenced_type" : "type-3463", ++ "self_type" : "type-3462", + "size" : 10, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27167,8 +28579,8 @@ + "is_const" : true, + "linker_set_key" : "char const[11]", + "name" : "char const[11]", +- "referenced_type" : "type-3494", +- "self_type" : "type-3493", ++ "referenced_type" : "type-3488", ++ "self_type" : "type-3487", + "size" : 11, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27177,8 +28589,8 @@ + "is_const" : true, + "linker_set_key" : "char const[12]", + "name" : "char const[12]", +- "referenced_type" : "type-3464", +- "self_type" : "type-3463", ++ "referenced_type" : "type-3458", ++ "self_type" : "type-3457", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27187,8 +28599,8 @@ + "is_const" : true, + "linker_set_key" : "char const[13]", + "name" : "char const[13]", +- "referenced_type" : "type-3461", +- "self_type" : "type-3460", ++ "referenced_type" : "type-3455", ++ "self_type" : "type-3454", + "size" : 13, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27197,8 +28609,8 @@ + "is_const" : true, + "linker_set_key" : "char const[14]", + "name" : "char const[14]", +- "referenced_type" : "type-3513", +- "self_type" : "type-3512", ++ "referenced_type" : "type-3507", ++ "self_type" : "type-3506", + "size" : 14, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27207,8 +28619,8 @@ + "is_const" : true, + "linker_set_key" : "char const[15]", + "name" : "char const[15]", +- "referenced_type" : "type-3612", +- "self_type" : "type-3611", ++ "referenced_type" : "type-3606", ++ "self_type" : "type-3605", + "size" : 15, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27217,8 +28629,8 @@ + "is_const" : true, + "linker_set_key" : "char const[16]", + "name" : "char const[16]", +- "referenced_type" : "type-3498", +- "self_type" : "type-3497", ++ "referenced_type" : "type-3492", ++ "self_type" : "type-3491", + "size" : 16, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27227,8 +28639,8 @@ + "is_const" : true, + "linker_set_key" : "char const[17]", + "name" : "char const[17]", +- "referenced_type" : "type-3516", +- "self_type" : "type-3515", ++ "referenced_type" : "type-3510", ++ "self_type" : "type-3509", + "size" : 17, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27237,8 +28649,8 @@ + "is_const" : true, + "linker_set_key" : "char const[18]", + "name" : "char const[18]", +- "referenced_type" : "type-3501", +- "self_type" : "type-3500", ++ "referenced_type" : "type-3495", ++ "self_type" : "type-3494", + "size" : 18, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27247,8 +28659,8 @@ + "is_const" : true, + "linker_set_key" : "char const[19]", + "name" : "char const[19]", +- "referenced_type" : "type-3532", +- "self_type" : "type-3531", ++ "referenced_type" : "type-3526", ++ "self_type" : "type-3525", + "size" : 19, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27257,8 +28669,8 @@ + "is_const" : true, + "linker_set_key" : "char const[20]", + "name" : "char const[20]", +- "referenced_type" : "type-3510", +- "self_type" : "type-3509", ++ "referenced_type" : "type-3504", ++ "self_type" : "type-3503", + "size" : 20, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27267,8 +28679,8 @@ + "is_const" : true, + "linker_set_key" : "char const[22]", + "name" : "char const[22]", +- "referenced_type" : "type-3535", +- "self_type" : "type-3534", ++ "referenced_type" : "type-3529", ++ "self_type" : "type-3528", + "size" : 22, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27277,8 +28689,8 @@ + "is_const" : true, + "linker_set_key" : "char const[25]", + "name" : "char const[25]", +- "referenced_type" : "type-3525", +- "self_type" : "type-3524", ++ "referenced_type" : "type-3519", ++ "self_type" : "type-3518", + "size" : 25, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27287,8 +28699,8 @@ + "is_const" : true, + "linker_set_key" : "char const[28]", + "name" : "char const[28]", +- "referenced_type" : "type-3547", +- "self_type" : "type-3546", ++ "referenced_type" : "type-3541", ++ "self_type" : "type-3540", + "size" : 28, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27297,8 +28709,8 @@ + "is_const" : true, + "linker_set_key" : "char const[29]", + "name" : "char const[29]", +- "referenced_type" : "type-3522", +- "self_type" : "type-3521", ++ "referenced_type" : "type-3516", ++ "self_type" : "type-3515", + "size" : 29, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27307,8 +28719,8 @@ + "is_const" : true, + "linker_set_key" : "char const[2]", + "name" : "char const[2]", +- "referenced_type" : "type-3473", +- "self_type" : "type-3472", ++ "referenced_type" : "type-3467", ++ "self_type" : "type-3466", + "size" : 2, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27317,8 +28729,8 @@ + "is_const" : true, + "linker_set_key" : "char const[31]", + "name" : "char const[31]", +- "referenced_type" : "type-3507", +- "self_type" : "type-3506", ++ "referenced_type" : "type-3501", ++ "self_type" : "type-3500", + "size" : 31, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27327,8 +28739,8 @@ + "is_const" : true, + "linker_set_key" : "char const[32]", + "name" : "char const[32]", +- "referenced_type" : "type-3538", +- "self_type" : "type-3537", ++ "referenced_type" : "type-3532", ++ "self_type" : "type-3531", + "size" : 32, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27337,8 +28749,8 @@ + "is_const" : true, + "linker_set_key" : "char const[35]", + "name" : "char const[35]", +- "referenced_type" : "type-3529", +- "self_type" : "type-3528", ++ "referenced_type" : "type-3523", ++ "self_type" : "type-3522", + "size" : 35, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27347,8 +28759,8 @@ + "is_const" : true, + "linker_set_key" : "char const[37]", + "name" : "char const[37]", +- "referenced_type" : "type-3519", +- "self_type" : "type-3518", ++ "referenced_type" : "type-3513", ++ "self_type" : "type-3512", + "size" : 37, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27357,8 +28769,8 @@ + "is_const" : true, + "linker_set_key" : "char const[3]", + "name" : "char const[3]", +- "referenced_type" : "type-3486", +- "self_type" : "type-3485", ++ "referenced_type" : "type-3480", ++ "self_type" : "type-3479", + "size" : 3, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27367,8 +28779,8 @@ + "is_const" : true, + "linker_set_key" : "char const[4]", + "name" : "char const[4]", +- "referenced_type" : "type-3609", +- "self_type" : "type-3608", ++ "referenced_type" : "type-3603", ++ "self_type" : "type-3602", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27377,8 +28789,8 @@ + "is_const" : true, + "linker_set_key" : "char const[5]", + "name" : "char const[5]", +- "referenced_type" : "type-3615", +- "self_type" : "type-3614", ++ "referenced_type" : "type-3609", ++ "self_type" : "type-3608", + "size" : 5, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27387,8 +28799,8 @@ + "is_const" : true, + "linker_set_key" : "char const[6]", + "name" : "char const[6]", +- "referenced_type" : "type-3476", +- "self_type" : "type-3475", ++ "referenced_type" : "type-3470", ++ "self_type" : "type-3469", + "size" : 6, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27397,8 +28809,8 @@ + "is_const" : true, + "linker_set_key" : "char const[7]", + "name" : "char const[7]", +- "referenced_type" : "type-3504", +- "self_type" : "type-3503", ++ "referenced_type" : "type-3498", ++ "self_type" : "type-3497", + "size" : 7, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27407,8 +28819,8 @@ + "is_const" : true, + "linker_set_key" : "char const[8]", + "name" : "char const[8]", +- "referenced_type" : "type-3491", +- "self_type" : "type-3490", ++ "referenced_type" : "type-3483", ++ "self_type" : "type-3482", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27417,8 +28829,8 @@ + "is_const" : true, + "linker_set_key" : "char const[9]", + "name" : "char const[9]", +- "referenced_type" : "type-3480", +- "self_type" : "type-3479", ++ "referenced_type" : "type-3474", ++ "self_type" : "type-3473", + "size" : 9, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27437,8 +28849,8 @@ + "is_const" : true, + "linker_set_key" : "const android::KeyedVector >", + "name" : "const android::KeyedVector >", +- "referenced_type" : "type-383", +- "self_type" : "type-3649", ++ "referenced_type" : "type-382", ++ "self_type" : "type-3643", + "size" : 40, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -27447,8 +28859,8 @@ + "is_const" : true, + "linker_set_key" : "const android::KeyedVector", + "name" : "const android::KeyedVector", +- "referenced_type" : "type-2152", +- "self_type" : "type-2230", ++ "referenced_type" : "type-2148", ++ "self_type" : "type-2226", + "size" : 40, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -27477,8 +28889,8 @@ + "is_const" : true, + "linker_set_key" : "const android::SortedVector > >", + "name" : "const android::SortedVector > >", +- "referenced_type" : "type-376", +- "self_type" : "type-3640", ++ "referenced_type" : "type-375", ++ "self_type" : "type-3634", + "size" : 40, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -27487,8 +28899,8 @@ + "is_const" : true, + "linker_set_key" : "const android::SortedVector >", + "name" : "const android::SortedVector >", +- "referenced_type" : "type-2153", +- "self_type" : "type-2220", ++ "referenced_type" : "type-2149", ++ "self_type" : "type-2216", + "size" : 40, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -27517,8 +28929,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-382", +- "self_type" : "type-3441", ++ "referenced_type" : "type-381", ++ "self_type" : "type-3435", + "size" : 40, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -27527,8 +28939,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-381", +- "self_type" : "type-3437", ++ "referenced_type" : "type-380", ++ "self_type" : "type-3431", + "size" : 40, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -27547,8 +28959,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-380", +- "self_type" : "type-3433", ++ "referenced_type" : "type-379", ++ "self_type" : "type-3427", + "size" : 40, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -27557,8 +28969,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-2222", +- "self_type" : "type-2225", ++ "referenced_type" : "type-2218", ++ "self_type" : "type-2221", + "size" : 40, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -27567,8 +28979,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-378", +- "self_type" : "type-3644", ++ "referenced_type" : "type-377", ++ "self_type" : "type-3638", + "size" : 40, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -27577,8 +28989,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector >", + "name" : "const android::Vector >", +- "referenced_type" : "type-2330", +- "self_type" : "type-2332", ++ "referenced_type" : "type-2324", ++ "self_type" : "type-2328", + "size" : 40, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -27587,8 +28999,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-2324", +- "self_type" : "type-2325", ++ "referenced_type" : "type-2320", ++ "self_type" : "type-2321", + "size" : 40, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -27607,8 +29019,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BHwBinder", + "name" : "const android::hardware::BHwBinder", +- "referenced_type" : "type-2144", +- "self_type" : "type-2173", ++ "referenced_type" : "type-2140", ++ "self_type" : "type-2169", + "size" : 48, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -27617,8 +29029,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BpHwBinder", + "name" : "const android::hardware::BpHwBinder", +- "referenced_type" : "type-2147", +- "self_type" : "type-2184", ++ "referenced_type" : "type-2143", ++ "self_type" : "type-2180", + "size" : 144, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -27627,8 +29039,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BpHwBinder::Obituary", + "name" : "const android::hardware::BpHwBinder::Obituary", +- "referenced_type" : "type-2186", +- "self_type" : "type-2203", ++ "referenced_type" : "type-2182", ++ "self_type" : "type-2199", + "size" : 32, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -27637,8 +29049,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager", + "name" : "const android::hardware::BpHwBinder::ObjectManager", +- "referenced_type" : "type-2151", +- "self_type" : "type-2237", ++ "referenced_type" : "type-2147", ++ "self_type" : "type-2233", + "size" : 40, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -27647,8 +29059,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t", + "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t", +- "referenced_type" : "type-2155", +- "self_type" : "type-2210", ++ "referenced_type" : "type-2151", ++ "self_type" : "type-2206", + "size" : 24, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -27657,8 +29069,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BpHwRefBase", + "name" : "const android::hardware::BpHwRefBase", +- "referenced_type" : "type-2177", +- "self_type" : "type-2182", ++ "referenced_type" : "type-2173", ++ "self_type" : "type-2178", + "size" : 48, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -27667,8 +29079,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BufferedTextOutput", + "name" : "const android::hardware::BufferedTextOutput", +- "referenced_type" : "type-2316", +- "self_type" : "type-2320", ++ "referenced_type" : "type-2312", ++ "self_type" : "type-2316", + "size" : 72, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -27677,8 +29089,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ConcurrentMap, android::hardware::details::SchedPrio>", + "name" : "const android::hardware::ConcurrentMap, android::hardware::details::SchedPrio>", +- "referenced_type" : "type-663", +- "self_type" : "type-1011", ++ "referenced_type" : "type-662", ++ "self_type" : "type-1009", + "size" : 64, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -27687,8 +29099,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ConcurrentMap, bool>", + "name" : "const android::hardware::ConcurrentMap, bool>", +- "referenced_type" : "type-669", +- "self_type" : "type-1013", ++ "referenced_type" : "type-667", ++ "self_type" : "type-1011", + "size" : 64, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -27698,7 +29110,7 @@ + "linker_set_key" : "const android::hardware::ConcurrentMap >", + "name" : "const android::hardware::ConcurrentMap >", + "referenced_type" : "type-326", +- "self_type" : "type-343", ++ "self_type" : "type-344", + "size" : 64, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -27707,8 +29119,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "name" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", +- "referenced_type" : "type-588", +- "self_type" : "type-596", ++ "referenced_type" : "type-587", ++ "self_type" : "type-595", + "size" : 64, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -27717,8 +29129,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "name" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", +- "referenced_type" : "type-347", +- "self_type" : "type-355", ++ "referenced_type" : "type-346", ++ "self_type" : "type-354", + "size" : 64, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -27727,8 +29139,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::HexDump", + "name" : "const android::hardware::HexDump", +- "referenced_type" : "type-2297", +- "self_type" : "type-2300", ++ "referenced_type" : "type-2293", ++ "self_type" : "type-2296", + "size" : 48, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27737,8 +29149,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder", + "name" : "const android::hardware::IBinder", +- "referenced_type" : "type-1287", +- "self_type" : "type-1286", ++ "referenced_type" : "type-1284", ++ "self_type" : "type-1283", + "size" : 24, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -27747,8 +29159,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder", + "name" : "const android::hardware::IBinder", +- "referenced_type" : "type-2139", +- "self_type" : "type-2141", ++ "referenced_type" : "type-2135", ++ "self_type" : "type-2137", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, +@@ -27757,8 +29169,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder", + "name" : "const android::hardware::IBinder", +- "referenced_type" : "type-2437", +- "self_type" : "type-2436", ++ "referenced_type" : "type-2432", ++ "self_type" : "type-2431", + "size" : 24, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -27767,8 +29179,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder", + "name" : "const android::hardware::IBinder", +- "referenced_type" : "type-3780", +- "self_type" : "type-3779", ++ "referenced_type" : "type-3773", ++ "self_type" : "type-3772", + "size" : 24, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -27777,8 +29189,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder", + "name" : "const android::hardware::IBinder", +- "referenced_type" : "type-443", +- "self_type" : "type-442", ++ "referenced_type" : "type-442", ++ "self_type" : "type-441", + "size" : 24, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -27787,8 +29199,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder::DeathRecipient", + "name" : "const android::hardware::IBinder::DeathRecipient", +- "referenced_type" : "type-2191", +- "self_type" : "type-2232", ++ "referenced_type" : "type-2187", ++ "self_type" : "type-2228", + "size" : 24, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27797,8 +29209,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IInterface", + "name" : "const android::hardware::IInterface", +- "referenced_type" : "type-2187", +- "self_type" : "type-3410", ++ "referenced_type" : "type-2183", ++ "self_type" : "type-3404", + "size" : 24, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -27807,8 +29219,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IPCThreadState", + "name" : "const android::hardware::IPCThreadState", +- "referenced_type" : "type-2245", +- "self_type" : "type-3451", ++ "referenced_type" : "type-2241", ++ "self_type" : "type-3445", + "size" : 528, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -27817,8 +29229,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1085", +- "self_type" : "type-1084", ++ "referenced_type" : "type-1083", ++ "self_type" : "type-1082", + "size" : 136, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -27827,8 +29239,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1143", +- "self_type" : "type-1142", ++ "referenced_type" : "type-1141", ++ "self_type" : "type-1140", + "size" : 136, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -27837,8 +29249,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1216", +- "self_type" : "type-1215", ++ "referenced_type" : "type-1214", ++ "self_type" : "type-1213", + "size" : 136, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -27847,8 +29259,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1781", +- "self_type" : "type-1780", ++ "referenced_type" : "type-1777", ++ "self_type" : "type-1776", + "size" : 136, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -27857,8 +29269,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1863", +- "self_type" : "type-1862", ++ "referenced_type" : "type-1859", ++ "self_type" : "type-1858", + "size" : 136, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -27867,8 +29279,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1919", +- "self_type" : "type-1918", ++ "referenced_type" : "type-1915", ++ "self_type" : "type-1914", + "size" : 136, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -27877,8 +29289,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1985", +- "self_type" : "type-1984", ++ "referenced_type" : "type-1981", ++ "self_type" : "type-1980", + "size" : 136, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -27887,8 +29299,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2038", +- "self_type" : "type-2037", ++ "referenced_type" : "type-2034", ++ "self_type" : "type-2033", + "size" : 136, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -27897,8 +29309,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2092", +- "self_type" : "type-2091", ++ "referenced_type" : "type-2088", ++ "self_type" : "type-2087", + "size" : 136, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -27907,8 +29319,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2159", +- "self_type" : "type-2166", ++ "referenced_type" : "type-2155", ++ "self_type" : "type-2162", + "size" : 136, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -27917,8 +29329,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2366", +- "self_type" : "type-2365", ++ "referenced_type" : "type-2362", ++ "self_type" : "type-2361", + "size" : 136, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -27927,8 +29339,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2922", +- "self_type" : "type-2921", ++ "referenced_type" : "type-2916", ++ "self_type" : "type-2915", + "size" : 136, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -27937,8 +29349,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3004", +- "self_type" : "type-3003", ++ "referenced_type" : "type-2998", ++ "self_type" : "type-2997", + "size" : 136, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -27947,8 +29359,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3060", +- "self_type" : "type-3059", ++ "referenced_type" : "type-3054", ++ "self_type" : "type-3053", + "size" : 136, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -27957,8 +29369,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3124", +- "self_type" : "type-3123", ++ "referenced_type" : "type-3118", ++ "self_type" : "type-3117", + "size" : 136, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -27967,8 +29379,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3175", +- "self_type" : "type-3174", ++ "referenced_type" : "type-3169", ++ "self_type" : "type-3168", + "size" : 136, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -27987,8 +29399,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3226", +- "self_type" : "type-3225", ++ "referenced_type" : "type-3220", ++ "self_type" : "type-3219", + "size" : 136, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -27997,8 +29409,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3669", +- "self_type" : "type-3668", ++ "referenced_type" : "type-3665", ++ "self_type" : "type-3664", + "size" : 136, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28007,8 +29419,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-999", +- "self_type" : "type-998", ++ "referenced_type" : "type-997", ++ "self_type" : "type-996", + "size" : 136, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28017,8 +29429,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ProcessState", + "name" : "const android::hardware::ProcessState", +- "referenced_type" : "type-2250", +- "self_type" : "type-3663", ++ "referenced_type" : "type-2246", ++ "self_type" : "type-3657", + "size" : 328, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28027,8 +29439,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ProcessState::handle_entry", + "name" : "const android::hardware::ProcessState::handle_entry", +- "referenced_type" : "type-2228", +- "self_type" : "type-3625", ++ "referenced_type" : "type-2224", ++ "self_type" : "type-3619", + "size" : 16, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -28037,8 +29449,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return", + "name" : "const android::hardware::Return", +- "referenced_type" : "type-764", +- "self_type" : "type-768", ++ "referenced_type" : "type-762", ++ "self_type" : "type-766", + "size" : 40, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28047,8 +29459,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-757", +- "self_type" : "type-762", ++ "referenced_type" : "type-755", ++ "self_type" : "type-759", + "size" : 48, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28057,8 +29469,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-944", +- "self_type" : "type-948", ++ "referenced_type" : "type-942", ++ "self_type" : "type-946", + "size" : 48, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28067,8 +29479,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-1053", +- "self_type" : "type-1057", ++ "referenced_type" : "type-1051", ++ "self_type" : "type-1055", + "size" : 48, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28077,8 +29489,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-1110", +- "self_type" : "type-1114", ++ "referenced_type" : "type-1108", ++ "self_type" : "type-1112", + "size" : 48, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28087,8 +29499,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-1945", +- "self_type" : "type-1949", ++ "referenced_type" : "type-1941", ++ "self_type" : "type-1945", + "size" : 48, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28097,8 +29509,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-2015", +- "self_type" : "type-2019", ++ "referenced_type" : "type-2011", ++ "self_type" : "type-2015", + "size" : 48, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28108,7 +29520,7 @@ + "linker_set_key" : "const android::hardware::Return", + "name" : "const android::hardware::Return", + "referenced_type" : "type-250", +- "self_type" : "type-460", ++ "self_type" : "type-459", + "size" : 40, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28118,7 +29530,7 @@ + "linker_set_key" : "const android::hardware::Return", + "name" : "const android::hardware::Return", + "referenced_type" : "type-120", +- "self_type" : "type-714", ++ "self_type" : "type-712", + "size" : 40, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28137,8 +29549,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::TypeCode", + "name" : "const android::hardware::TypeCode", +- "referenced_type" : "type-2293", +- "self_type" : "type-2295", ++ "referenced_type" : "type-2289", ++ "self_type" : "type-2291", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -28147,8 +29559,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::SchedPrio", + "name" : "const android::hardware::details::SchedPrio", +- "referenced_type" : "type-368", +- "self_type" : "type-1010", ++ "referenced_type" : "type-367", ++ "self_type" : "type-1008", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -28157,8 +29569,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::Waiter", + "name" : "const android::hardware::details::Waiter", +- "referenced_type" : "type-1586", +- "self_type" : "type-1585", ++ "referenced_type" : "type-1577", ++ "self_type" : "type-1576", + "size" : 176, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28167,8 +29579,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::Waiter", + "name" : "const android::hardware::details::Waiter", +- "referenced_type" : "type-2727", +- "self_type" : "type-2726", ++ "referenced_type" : "type-2716", ++ "self_type" : "type-2715", + "size" : 176, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28177,8 +29589,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::Waiter", + "name" : "const android::hardware::details::Waiter", +- "referenced_type" : "type-755", +- "self_type" : "type-754", ++ "referenced_type" : "type-748", ++ "self_type" : "type-747", + "size" : 176, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28187,8 +29599,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::hidl_pointer >", + "name" : "const android::hardware::details::hidl_pointer >", +- "referenced_type" : "type-968", +- "self_type" : "type-1036", ++ "referenced_type" : "type-966", ++ "self_type" : "type-1034", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28197,8 +29609,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::hidl_pointer", + "name" : "const android::hardware::details::hidl_pointer", +- "referenced_type" : "type-572", +- "self_type" : "type-607", ++ "referenced_type" : "type-571", ++ "self_type" : "type-606", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28207,8 +29619,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::hidl_pointer", + "name" : "const android::hardware::details::hidl_pointer", +- "referenced_type" : "type-792", +- "self_type" : "type-809", ++ "referenced_type" : "type-790", ++ "self_type" : "type-807", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28237,8 +29649,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::hidl_pointer", + "name" : "const android::hardware::details::hidl_pointer", +- "referenced_type" : "type-474", +- "self_type" : "type-492", ++ "referenced_type" : "type-473", ++ "self_type" : "type-491", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28257,8 +29669,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_array", + "name" : "const android::hardware::hidl_array", +- "referenced_type" : "type-971", +- "self_type" : "type-2082", ++ "referenced_type" : "type-969", ++ "self_type" : "type-2078", + "size" : 32, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28268,7 +29680,7 @@ + "linker_set_key" : "const android::hardware::hidl_death_recipient", + "name" : "const android::hardware::hidl_death_recipient", + "referenced_type" : "type-83", +- "self_type" : "type-432", ++ "self_type" : "type-430", + "size" : 24, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28307,8 +29719,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_vec >", + "name" : "const android::hardware::hidl_vec >", +- "referenced_type" : "type-967", +- "self_type" : "type-2083", ++ "referenced_type" : "type-965", ++ "self_type" : "type-2079", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28317,8 +29729,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_vec", + "name" : "const android::hardware::hidl_vec", +- "referenced_type" : "type-571", +- "self_type" : "type-574", ++ "referenced_type" : "type-570", ++ "self_type" : "type-573", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28327,8 +29739,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_vec", + "name" : "const android::hardware::hidl_vec", +- "referenced_type" : "type-791", +- "self_type" : "type-981", ++ "referenced_type" : "type-789", ++ "self_type" : "type-979", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28337,8 +29749,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_vec::iter", + "name" : "const android::hardware::hidl_vec::iter", +- "referenced_type" : "type-576", +- "self_type" : "type-581", ++ "referenced_type" : "type-575", ++ "self_type" : "type-580", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28347,8 +29759,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_vec", + "name" : "const android::hardware::hidl_vec", +- "referenced_type" : "type-473", +- "self_type" : "type-477", ++ "referenced_type" : "type-472", ++ "self_type" : "type-476", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28367,8 +29779,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase", + "name" : "const android::hidl::base::V1_0::BpHwBase", +- "referenced_type" : "type-369", +- "self_type" : "type-373", ++ "referenced_type" : "type-368", ++ "self_type" : "type-372", + "size" : 216, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, +@@ -28398,7 +29810,7 @@ + "linker_set_key" : "const android::hidl::base::V1_0::IBase *const", + "name" : "const android::hidl::base::V1_0::IBase *const", + "referenced_type" : "type-329", +- "self_type" : "type-345", ++ "self_type" : "type-341", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -28407,8 +29819,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceManager", + "name" : "const android::hidl::manager::V1_0::BpHwServiceManager", +- "referenced_type" : "type-829", +- "self_type" : "type-833", ++ "referenced_type" : "type-827", ++ "self_type" : "type-831", + "size" : 216, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, +@@ -28417,8 +29829,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceNotification", + "name" : "const android::hidl::manager::V1_0::BpHwServiceNotification", +- "referenced_type" : "type-821", +- "self_type" : "type-825", ++ "referenced_type" : "type-819", ++ "self_type" : "type-823", + "size" : 216, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, +@@ -28427,8 +29839,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager", + "name" : "const android::hidl::manager::V1_0::IServiceManager", +- "referenced_type" : "type-505", +- "self_type" : "type-504", ++ "referenced_type" : "type-504", ++ "self_type" : "type-503", + "size" : 24, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -28437,8 +29849,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo", + "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo", +- "referenced_type" : "type-503", +- "self_type" : "type-980", ++ "referenced_type" : "type-502", ++ "self_type" : "type-978", + "size" : 64, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28447,8 +29859,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::PidConstant", + "name" : "const android::hidl::manager::V1_0::IServiceManager::PidConstant", +- "referenced_type" : "type-502", +- "self_type" : "type-509", ++ "referenced_type" : "type-501", ++ "self_type" : "type-508", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -28457,8 +29869,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::Transport", + "name" : "const android::hidl::manager::V1_0::IServiceManager::Transport", +- "referenced_type" : "type-501", +- "self_type" : "type-507", ++ "referenced_type" : "type-500", ++ "self_type" : "type-506", + "size" : 1, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -28467,8 +29879,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification", + "name" : "const android::hidl::manager::V1_0::IServiceNotification", +- "referenced_type" : "type-496", +- "self_type" : "type-495", ++ "referenced_type" : "type-494", ++ "self_type" : "type-493", + "size" : 24, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, +@@ -28477,8 +29889,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_1::BpHwServiceManager", + "name" : "const android::hidl::manager::V1_1::BpHwServiceManager", +- "referenced_type" : "type-838", +- "self_type" : "type-842", ++ "referenced_type" : "type-836", ++ "self_type" : "type-840", + "size" : 216, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, +@@ -28487,8 +29899,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_1::IServiceManager", + "name" : "const android::hidl::manager::V1_1::IServiceManager", +- "referenced_type" : "type-515", +- "self_type" : "type-514", ++ "referenced_type" : "type-514", ++ "self_type" : "type-513", + "size" : 24, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, +@@ -28497,8 +29909,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_2::BpHwClientCallback", + "name" : "const android::hidl::manager::V1_2::BpHwClientCallback", +- "referenced_type" : "type-847", +- "self_type" : "type-851", ++ "referenced_type" : "type-844", ++ "self_type" : "type-849", + "size" : 216, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, +@@ -28507,8 +29919,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_2::BpHwServiceManager", + "name" : "const android::hidl::manager::V1_2::BpHwServiceManager", +- "referenced_type" : "type-727", +- "self_type" : "type-854", ++ "referenced_type" : "type-725", ++ "self_type" : "type-852", + "size" : 216, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, +@@ -28517,8 +29929,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_2::IClientCallback", + "name" : "const android::hidl::manager::V1_2::IClientCallback", +- "referenced_type" : "type-499", +- "self_type" : "type-498", ++ "referenced_type" : "type-498", ++ "self_type" : "type-497", + "size" : 24, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, +@@ -28527,8 +29939,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager", + "name" : "const android::hidl::manager::V1_2::IServiceManager", +- "referenced_type" : "type-518", +- "self_type" : "type-517", ++ "referenced_type" : "type-517", ++ "self_type" : "type-516", + "size" : 24, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, +@@ -28537,8 +29949,8 @@ + "is_const" : true, + "linker_set_key" : "const android::key_value_pair_t >", + "name" : "const android::key_value_pair_t >", +- "referenced_type" : "type-3621", +- "self_type" : "type-3620", ++ "referenced_type" : "type-3615", ++ "self_type" : "type-3614", + "size" : 16, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -28547,8 +29959,8 @@ + "is_const" : true, + "linker_set_key" : "const android::key_value_pair_t", + "name" : "const android::key_value_pair_t", +- "referenced_type" : "type-2196", +- "self_type" : "type-2195", ++ "referenced_type" : "type-2192", ++ "self_type" : "type-2191", + "size" : 32, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -28557,8 +29969,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-453", +- "self_type" : "type-3643", ++ "referenced_type" : "type-451", ++ "self_type" : "type-3637", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28567,8 +29979,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-426", +- "self_type" : "type-3450", ++ "referenced_type" : "type-425", ++ "self_type" : "type-3444", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28577,8 +29989,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-2281", +- "self_type" : "type-2308", ++ "referenced_type" : "type-2277", ++ "self_type" : "type-2304", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -28596,16 +30008,16 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-2169", +- "self_type" : "type-2168", ++ "referenced_type" : "type-2165", ++ "self_type" : "type-2164", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-3289", +- "self_type" : "type-3288", ++ "referenced_type" : "type-3283", ++ "self_type" : "type-3282", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -28613,8 +30025,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-921", +- "self_type" : "type-2217", ++ "referenced_type" : "type-919", ++ "self_type" : "type-2213", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -28622,24 +30034,24 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-2335", +- "self_type" : "type-2334", ++ "referenced_type" : "type-2331", ++ "self_type" : "type-2330", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-3389", +- "self_type" : "type-3388", ++ "referenced_type" : "type-3383", ++ "self_type" : "type-3382", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-3396", +- "self_type" : "type-3395", ++ "referenced_type" : "type-3390", ++ "self_type" : "type-3389", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -28647,8 +30059,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-384", +- "self_type" : "type-440", ++ "referenced_type" : "type-383", ++ "self_type" : "type-439", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28657,8 +30069,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-927", +- "self_type" : "type-3407", ++ "referenced_type" : "type-924", ++ "self_type" : "type-3401", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28667,8 +30079,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-719", +- "self_type" : "type-718", ++ "referenced_type" : "type-717", ++ "self_type" : "type-716", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28677,8 +30089,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-445", +- "self_type" : "type-450", ++ "referenced_type" : "type-444", ++ "self_type" : "type-449", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28687,8 +30099,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-556", +- "self_type" : "type-559", ++ "referenced_type" : "type-555", ++ "self_type" : "type-558", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28697,8 +30109,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-743", +- "self_type" : "type-747", ++ "referenced_type" : "type-741", ++ "self_type" : "type-745", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28707,8 +30119,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-907", +- "self_type" : "type-906", ++ "referenced_type" : "type-905", ++ "self_type" : "type-904", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -28728,7 +30140,7 @@ + "linker_set_key" : "const android::sp", + "name" : "const android::sp", + "referenced_type" : "type-300", +- "self_type" : "type-411", ++ "self_type" : "type-410", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -28737,8 +30149,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-527", +- "self_type" : "type-530", ++ "referenced_type" : "type-526", ++ "self_type" : "type-529", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28747,8 +30159,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-543", +- "self_type" : "type-546", ++ "referenced_type" : "type-542", ++ "self_type" : "type-545", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28757,8 +30169,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-532", +- "self_type" : "type-535", ++ "referenced_type" : "type-531", ++ "self_type" : "type-534", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28767,8 +30179,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-549", +- "self_type" : "type-554", ++ "referenced_type" : "type-547", ++ "self_type" : "type-553", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28777,8 +30189,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-538", +- "self_type" : "type-541", ++ "referenced_type" : "type-536", ++ "self_type" : "type-540", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28788,7 +30200,7 @@ + "linker_set_key" : "const android::wp", + "name" : "const android::wp", + "referenced_type" : "type-331", +- "self_type" : "type-423", ++ "self_type" : "type-422", + "size" : 16, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -28797,8 +30209,8 @@ + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-900", +- "self_type" : "type-2171", ++ "referenced_type" : "type-898", ++ "self_type" : "type-2167", + "size" : 16, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -28806,8 +30218,8 @@ + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-1213", +- "self_type" : "type-1212", ++ "referenced_type" : "type-1211", ++ "self_type" : "type-1210", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -28815,8 +30227,8 @@ + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-2194", +- "self_type" : "type-3565", ++ "referenced_type" : "type-2190", ++ "self_type" : "type-3559", + "size" : 16, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -28824,8 +30236,8 @@ + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-2363", +- "self_type" : "type-2362", ++ "referenced_type" : "type-2359", ++ "self_type" : "type-2358", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -28840,8 +30252,8 @@ + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-3654", +- "self_type" : "type-3653", ++ "referenced_type" : "type-3650", ++ "self_type" : "type-3649", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -28850,7 +30262,7 @@ + "linker_set_key" : "const android::wp", + "name" : "const android::wp", + "referenced_type" : "type-307", +- "self_type" : "type-418", ++ "self_type" : "type-417", + "size" : 16, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -28860,7 +30272,7 @@ + "linker_set_key" : "const android::wp", + "name" : "const android::wp", + "referenced_type" : "type-309", +- "self_type" : "type-415", ++ "self_type" : "type-414", + "size" : 16, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -28869,8 +30281,8 @@ + "is_const" : true, + "linker_set_key" : "const binder_buffer_object", + "name" : "const binder_buffer_object", +- "referenced_type" : "type-3601", +- "self_type" : "type-3600", ++ "referenced_type" : "type-3595", ++ "self_type" : "type-3594", + "size" : 40, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -28880,7 +30292,7 @@ + "linker_set_key" : "const bool", + "name" : "const bool", + "referenced_type" : "type-29", +- "self_type" : "type-456", ++ "self_type" : "type-454", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -28900,7 +30312,7 @@ + "linker_set_key" : "const char *const", + "name" : "const char *const", + "referenced_type" : "type-41", +- "self_type" : "type-2289", ++ "self_type" : "type-2285", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -28929,8 +30341,8 @@ + "is_const" : true, + "linker_set_key" : "const dirent", + "name" : "const dirent", +- "referenced_type" : "type-1778", +- "self_type" : "type-1777", ++ "referenced_type" : "type-1774", ++ "self_type" : "type-1773", + "size" : 280, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28939,8 +30351,8 @@ + "is_const" : true, + "linker_set_key" : "const dirent", + "name" : "const dirent", +- "referenced_type" : "type-2919", +- "self_type" : "type-2918", ++ "referenced_type" : "type-2913", ++ "self_type" : "type-2912", + "size" : 280, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28949,8 +30361,8 @@ + "is_const" : true, + "linker_set_key" : "const dirent", + "name" : "const dirent", +- "referenced_type" : "type-996", +- "self_type" : "type-995", ++ "referenced_type" : "type-994", ++ "self_type" : "type-993", + "size" : 280, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28969,8 +30381,8 @@ + "is_const" : true, + "linker_set_key" : "const flat_binder_object", + "name" : "const flat_binder_object", +- "referenced_type" : "type-3584", +- "self_type" : "type-3583", ++ "referenced_type" : "type-3578", ++ "self_type" : "type-3577", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -28980,7 +30392,7 @@ + "linker_set_key" : "const float", + "name" : "const float", + "referenced_type" : "type-238", +- "self_type" : "type-616", ++ "self_type" : "type-615", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -28998,176 +30410,176 @@ + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1063", +- "self_type" : "type-1062", ++ "referenced_type" : "type-1061", ++ "self_type" : "type-1060", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1120", +- "self_type" : "type-1119", ++ "referenced_type" : "type-1118", ++ "self_type" : "type-1117", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1196", +- "self_type" : "type-1195", ++ "referenced_type" : "type-1194", ++ "self_type" : "type-1193", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1301", +- "self_type" : "type-1300", ++ "referenced_type" : "type-1298", ++ "self_type" : "type-1297", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1371", +- "self_type" : "type-1370", ++ "referenced_type" : "type-1368", ++ "self_type" : "type-1367", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1503", +- "self_type" : "type-1502", ++ "referenced_type" : "type-1500", ++ "self_type" : "type-1499", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1542", +- "self_type" : "type-1541", ++ "referenced_type" : "type-1538", ++ "self_type" : "type-1537", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1610", +- "self_type" : "type-1609", ++ "referenced_type" : "type-1606", ++ "self_type" : "type-1605", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1636", +- "self_type" : "type-1635", ++ "referenced_type" : "type-1632", ++ "self_type" : "type-1631", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1680", +- "self_type" : "type-1679", ++ "referenced_type" : "type-1676", ++ "self_type" : "type-1675", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1754", +- "self_type" : "type-1753", ++ "referenced_type" : "type-1750", ++ "self_type" : "type-1749", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1841", +- "self_type" : "type-1840", ++ "referenced_type" : "type-1837", ++ "self_type" : "type-1836", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1896", +- "self_type" : "type-1895", ++ "referenced_type" : "type-1892", ++ "self_type" : "type-1891", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1956", +- "self_type" : "type-1955", ++ "referenced_type" : "type-1952", ++ "self_type" : "type-1951", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2028", +- "self_type" : "type-2027", ++ "referenced_type" : "type-2024", ++ "self_type" : "type-2023", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2074", +- "self_type" : "type-2073", ++ "referenced_type" : "type-2070", ++ "self_type" : "type-2069", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2124", +- "self_type" : "type-2123", ++ "referenced_type" : "type-2120", ++ "self_type" : "type-2119", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2347", +- "self_type" : "type-2346", ++ "referenced_type" : "type-2343", ++ "self_type" : "type-2342", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2450", +- "self_type" : "type-2449", ++ "referenced_type" : "type-2445", ++ "self_type" : "type-2444", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2520", +- "self_type" : "type-2519", ++ "referenced_type" : "type-2515", ++ "self_type" : "type-2514", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2644", +- "self_type" : "type-2643", ++ "referenced_type" : "type-2639", ++ "self_type" : "type-2638", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2683", +- "self_type" : "type-2682", ++ "referenced_type" : "type-2677", ++ "self_type" : "type-2676", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -29182,128 +30594,128 @@ + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2751", +- "self_type" : "type-2750", ++ "referenced_type" : "type-2745", ++ "self_type" : "type-2744", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2777", +- "self_type" : "type-2776", ++ "referenced_type" : "type-2771", ++ "self_type" : "type-2770", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2821", +- "self_type" : "type-2820", ++ "referenced_type" : "type-2815", ++ "self_type" : "type-2814", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2895", +- "self_type" : "type-2894", ++ "referenced_type" : "type-2889", ++ "self_type" : "type-2888", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2982", +- "self_type" : "type-2981", ++ "referenced_type" : "type-2976", ++ "self_type" : "type-2975", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3037", +- "self_type" : "type-3036", ++ "referenced_type" : "type-3031", ++ "self_type" : "type-3030", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3095", +- "self_type" : "type-3094", ++ "referenced_type" : "type-3089", ++ "self_type" : "type-3088", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3165", +- "self_type" : "type-3164", ++ "referenced_type" : "type-3159", ++ "self_type" : "type-3158", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3209", +- "self_type" : "type-3208", ++ "referenced_type" : "type-3203", ++ "self_type" : "type-3202", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3258", +- "self_type" : "type-3257", ++ "referenced_type" : "type-3252", ++ "self_type" : "type-3251", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3405", +- "self_type" : "type-3404", ++ "referenced_type" : "type-3399", ++ "self_type" : "type-3398", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3793", +- "self_type" : "type-3792", ++ "referenced_type" : "type-3786", ++ "self_type" : "type-3785", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3863", +- "self_type" : "type-3862", ++ "referenced_type" : "type-3856", ++ "self_type" : "type-3855", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-471", +- "self_type" : "type-470", ++ "referenced_type" : "type-470", ++ "self_type" : "type-469", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-568", +- "self_type" : "type-567", ++ "referenced_type" : "type-567", ++ "self_type" : "type-566", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-655", +- "self_type" : "type-654", ++ "referenced_type" : "type-654", ++ "self_type" : "type-653", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -29318,40 +30730,40 @@ + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-703", +- "self_type" : "type-702", ++ "referenced_type" : "type-701", ++ "self_type" : "type-700", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-781", +- "self_type" : "type-780", ++ "referenced_type" : "type-779", ++ "self_type" : "type-778", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-811", +- "self_type" : "type-810", ++ "referenced_type" : "type-809", ++ "self_type" : "type-808", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-875", +- "self_type" : "type-874", ++ "referenced_type" : "type-873", ++ "self_type" : "type-872", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-960", +- "self_type" : "type-959", ++ "referenced_type" : "type-958", ++ "self_type" : "type-957", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -29370,7 +30782,7 @@ + "linker_set_key" : "const long", + "name" : "const long", + "referenced_type" : "type-265", +- "self_type" : "type-605", ++ "self_type" : "type-604", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -29390,7 +30802,7 @@ + "linker_set_key" : "const short", + "name" : "const short", + "referenced_type" : "type-151", +- "self_type" : "type-548", ++ "self_type" : "type-549", + "size" : 2, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -29399,8 +30811,8 @@ + "is_const" : true, + "linker_set_key" : "const signed char", + "name" : "const signed char", +- "referenced_type" : "type-484", +- "self_type" : "type-483", ++ "referenced_type" : "type-485", ++ "self_type" : "type-484", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -29409,8 +30821,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1070", +- "self_type" : "type-1069", ++ "referenced_type" : "type-1068", ++ "self_type" : "type-1067", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29419,8 +30831,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1128", +- "self_type" : "type-1127", ++ "referenced_type" : "type-1126", ++ "self_type" : "type-1125", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29429,8 +30841,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1203", +- "self_type" : "type-1202", ++ "referenced_type" : "type-1201", ++ "self_type" : "type-1200", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29439,8 +30851,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1310", +- "self_type" : "type-1309", ++ "referenced_type" : "type-1307", ++ "self_type" : "type-1306", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29449,8 +30861,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1383", +- "self_type" : "type-1382", ++ "referenced_type" : "type-1380", ++ "self_type" : "type-1379", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29459,8 +30871,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1507", +- "self_type" : "type-1506", ++ "referenced_type" : "type-1504", ++ "self_type" : "type-1503", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29469,8 +30881,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1548", +- "self_type" : "type-1547", ++ "referenced_type" : "type-1544", ++ "self_type" : "type-1543", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29479,8 +30891,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1625", +- "self_type" : "type-1624", ++ "referenced_type" : "type-1620", ++ "self_type" : "type-1619", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29489,8 +30901,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1684", +- "self_type" : "type-1683", ++ "referenced_type" : "type-1680", ++ "self_type" : "type-1679", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29499,8 +30911,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1776", +- "self_type" : "type-1775", ++ "referenced_type" : "type-1772", ++ "self_type" : "type-1771", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29509,8 +30921,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1848", +- "self_type" : "type-1847", ++ "referenced_type" : "type-1844", ++ "self_type" : "type-1843", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29519,8 +30931,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1904", +- "self_type" : "type-1903", ++ "referenced_type" : "type-1900", ++ "self_type" : "type-1899", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29529,8 +30941,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1963", +- "self_type" : "type-1962", ++ "referenced_type" : "type-1959", ++ "self_type" : "type-1958", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29539,8 +30951,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2035", +- "self_type" : "type-2034", ++ "referenced_type" : "type-2031", ++ "self_type" : "type-2030", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29549,8 +30961,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2087", +- "self_type" : "type-2086", ++ "referenced_type" : "type-2082", ++ "self_type" : "type-2081", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29559,8 +30971,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2127", +- "self_type" : "type-2126", ++ "referenced_type" : "type-2123", ++ "self_type" : "type-2122", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29569,8 +30981,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2354", +- "self_type" : "type-2353", ++ "referenced_type" : "type-2350", ++ "self_type" : "type-2349", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29579,8 +30991,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2459", +- "self_type" : "type-2458", ++ "referenced_type" : "type-2454", ++ "self_type" : "type-2453", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29589,8 +31001,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2532", +- "self_type" : "type-2531", ++ "referenced_type" : "type-2527", ++ "self_type" : "type-2526", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29599,8 +31011,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2648", +- "self_type" : "type-2647", ++ "referenced_type" : "type-2643", ++ "self_type" : "type-2642", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29609,8 +31021,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2689", +- "self_type" : "type-2688", ++ "referenced_type" : "type-2683", ++ "self_type" : "type-2682", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29619,8 +31031,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2766", +- "self_type" : "type-2765", ++ "referenced_type" : "type-2759", ++ "self_type" : "type-2758", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29629,8 +31041,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2825", +- "self_type" : "type-2824", ++ "referenced_type" : "type-2819", ++ "self_type" : "type-2818", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29649,8 +31061,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2917", +- "self_type" : "type-2916", ++ "referenced_type" : "type-2911", ++ "self_type" : "type-2910", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29659,8 +31071,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2989", +- "self_type" : "type-2988", ++ "referenced_type" : "type-2983", ++ "self_type" : "type-2982", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29669,8 +31081,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3045", +- "self_type" : "type-3044", ++ "referenced_type" : "type-3039", ++ "self_type" : "type-3038", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29679,8 +31091,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3102", +- "self_type" : "type-3101", ++ "referenced_type" : "type-3096", ++ "self_type" : "type-3095", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29689,8 +31101,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3172", +- "self_type" : "type-3171", ++ "referenced_type" : "type-3166", ++ "self_type" : "type-3165", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29699,8 +31111,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3221", +- "self_type" : "type-3220", ++ "referenced_type" : "type-3214", ++ "self_type" : "type-3213", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29709,8 +31121,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3261", +- "self_type" : "type-3260", ++ "referenced_type" : "type-3255", ++ "self_type" : "type-3254", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29719,8 +31131,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3488", +- "self_type" : "type-3487", ++ "referenced_type" : "type-3485", ++ "self_type" : "type-3484", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29729,8 +31141,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3802", +- "self_type" : "type-3801", ++ "referenced_type" : "type-3795", ++ "self_type" : "type-3794", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29739,8 +31151,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3875", +- "self_type" : "type-3874", ++ "referenced_type" : "type-3868", ++ "self_type" : "type-3867", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29749,8 +31161,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-482", +- "self_type" : "type-481", ++ "referenced_type" : "type-481", ++ "self_type" : "type-480", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29759,8 +31171,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-586", +- "self_type" : "type-585", ++ "referenced_type" : "type-585", ++ "self_type" : "type-584", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29769,8 +31181,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-659", +- "self_type" : "type-658", ++ "referenced_type" : "type-658", ++ "self_type" : "type-657", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29779,8 +31191,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-709", +- "self_type" : "type-708", ++ "referenced_type" : "type-707", ++ "self_type" : "type-706", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29789,8 +31201,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-799", +- "self_type" : "type-798", ++ "referenced_type" : "type-796", ++ "self_type" : "type-795", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29799,8 +31211,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-879", +- "self_type" : "type-878", ++ "referenced_type" : "type-877", ++ "self_type" : "type-876", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29809,8 +31221,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-994", +- "self_type" : "type-993", ++ "referenced_type" : "type-992", ++ "self_type" : "type-991", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29819,8 +31231,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1029", +- "self_type" : "type-1028", ++ "referenced_type" : "type-1027", ++ "self_type" : "type-1026", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29829,8 +31241,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1083", +- "self_type" : "type-1082", ++ "referenced_type" : "type-1081", ++ "self_type" : "type-1080", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29839,8 +31251,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1141", +- "self_type" : "type-1140", ++ "referenced_type" : "type-1139", ++ "self_type" : "type-1138", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29849,8 +31261,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1331", +- "self_type" : "type-1330", ++ "referenced_type" : "type-1328", ++ "self_type" : "type-1327", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29859,8 +31271,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1523", +- "self_type" : "type-1522", ++ "referenced_type" : "type-1519", ++ "self_type" : "type-1518", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29869,8 +31281,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1642", +- "self_type" : "type-1641", ++ "referenced_type" : "type-1638", ++ "self_type" : "type-1637", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29879,8 +31291,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1694", +- "self_type" : "type-1693", ++ "referenced_type" : "type-1689", ++ "self_type" : "type-1688", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29889,8 +31301,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1809", +- "self_type" : "type-1808", ++ "referenced_type" : "type-1805", ++ "self_type" : "type-1804", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29899,8 +31311,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1861", +- "self_type" : "type-1860", ++ "referenced_type" : "type-1857", ++ "self_type" : "type-1856", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29909,8 +31321,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1917", +- "self_type" : "type-1916", ++ "referenced_type" : "type-1913", ++ "self_type" : "type-1912", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29919,8 +31331,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1983", +- "self_type" : "type-1982", ++ "referenced_type" : "type-1978", ++ "self_type" : "type-1977", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29929,8 +31341,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2055", +- "self_type" : "type-2054", ++ "referenced_type" : "type-2051", ++ "self_type" : "type-2050", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29939,8 +31351,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2109", +- "self_type" : "type-2108", ++ "referenced_type" : "type-2105", ++ "self_type" : "type-2104", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29949,8 +31361,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2480", +- "self_type" : "type-2479", ++ "referenced_type" : "type-2475", ++ "self_type" : "type-2474", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29959,8 +31371,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2664", +- "self_type" : "type-2663", ++ "referenced_type" : "type-2658", ++ "self_type" : "type-2657", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29969,8 +31381,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2783", +- "self_type" : "type-2782", ++ "referenced_type" : "type-2777", ++ "self_type" : "type-2776", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29979,8 +31391,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2835", +- "self_type" : "type-2834", ++ "referenced_type" : "type-2828", ++ "self_type" : "type-2827", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29989,8 +31401,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2950", +- "self_type" : "type-2949", ++ "referenced_type" : "type-2944", ++ "self_type" : "type-2943", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -29999,8 +31411,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3002", +- "self_type" : "type-3001", ++ "referenced_type" : "type-2996", ++ "self_type" : "type-2995", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30009,8 +31421,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3058", +- "self_type" : "type-3057", ++ "referenced_type" : "type-3052", ++ "self_type" : "type-3051", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30019,8 +31431,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3122", +- "self_type" : "type-3121", ++ "referenced_type" : "type-3115", ++ "self_type" : "type-3114", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30029,8 +31441,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3192", +- "self_type" : "type-3191", ++ "referenced_type" : "type-3186", ++ "self_type" : "type-3185", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30039,8 +31451,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3243", +- "self_type" : "type-3242", ++ "referenced_type" : "type-3237", ++ "self_type" : "type-3236", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30049,8 +31461,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3823", +- "self_type" : "type-3822", ++ "referenced_type" : "type-3816", ++ "self_type" : "type-3815", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30059,8 +31471,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-513", +- "self_type" : "type-512", ++ "referenced_type" : "type-512", ++ "self_type" : "type-511", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30069,8 +31481,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-684", +- "self_type" : "type-683", ++ "referenced_type" : "type-682", ++ "self_type" : "type-681", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30079,8 +31491,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-817", +- "self_type" : "type-816", ++ "referenced_type" : "type-815", ++ "self_type" : "type-814", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30089,8 +31501,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-889", +- "self_type" : "type-888", ++ "referenced_type" : "type-886", ++ "self_type" : "type-885", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30099,8 +31511,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1027", +- "self_type" : "type-1026", ++ "referenced_type" : "type-1025", ++ "self_type" : "type-1024", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30109,8 +31521,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1081", +- "self_type" : "type-1080", ++ "referenced_type" : "type-1079", ++ "self_type" : "type-1078", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30119,8 +31531,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1139", +- "self_type" : "type-1138", ++ "referenced_type" : "type-1137", ++ "self_type" : "type-1136", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30129,8 +31541,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1329", +- "self_type" : "type-1328", ++ "referenced_type" : "type-1326", ++ "self_type" : "type-1325", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30139,8 +31551,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1521", +- "self_type" : "type-1520", ++ "referenced_type" : "type-1517", ++ "self_type" : "type-1516", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30149,8 +31561,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1640", +- "self_type" : "type-1639", ++ "referenced_type" : "type-1636", ++ "self_type" : "type-1635", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30159,8 +31571,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1691", +- "self_type" : "type-1690", ++ "referenced_type" : "type-1687", ++ "self_type" : "type-1686", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30169,8 +31581,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1807", +- "self_type" : "type-1806", ++ "referenced_type" : "type-1803", ++ "self_type" : "type-1802", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30179,8 +31591,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1859", +- "self_type" : "type-1858", ++ "referenced_type" : "type-1855", ++ "self_type" : "type-1854", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30189,8 +31601,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1915", +- "self_type" : "type-1914", ++ "referenced_type" : "type-1911", ++ "self_type" : "type-1910", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30199,8 +31611,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1980", +- "self_type" : "type-1979", ++ "referenced_type" : "type-1976", ++ "self_type" : "type-1975", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30209,8 +31621,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2053", +- "self_type" : "type-2052", ++ "referenced_type" : "type-2049", ++ "self_type" : "type-2048", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30219,8 +31631,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2107", +- "self_type" : "type-2106", ++ "referenced_type" : "type-2103", ++ "self_type" : "type-2102", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30229,8 +31641,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2478", +- "self_type" : "type-2477", ++ "referenced_type" : "type-2473", ++ "self_type" : "type-2472", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30239,8 +31651,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2662", +- "self_type" : "type-2661", ++ "referenced_type" : "type-2656", ++ "self_type" : "type-2655", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30249,8 +31661,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2781", +- "self_type" : "type-2780", ++ "referenced_type" : "type-2775", ++ "self_type" : "type-2774", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30259,8 +31671,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2832", +- "self_type" : "type-2831", ++ "referenced_type" : "type-2826", ++ "self_type" : "type-2825", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30269,8 +31681,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2948", +- "self_type" : "type-2947", ++ "referenced_type" : "type-2942", ++ "self_type" : "type-2941", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30279,8 +31691,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3000", +- "self_type" : "type-2999", ++ "referenced_type" : "type-2994", ++ "self_type" : "type-2993", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30289,8 +31701,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3056", +- "self_type" : "type-3055", ++ "referenced_type" : "type-3050", ++ "self_type" : "type-3049", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30299,8 +31711,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3119", +- "self_type" : "type-3118", ++ "referenced_type" : "type-3113", ++ "self_type" : "type-3112", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30309,8 +31721,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3190", +- "self_type" : "type-3189", ++ "referenced_type" : "type-3184", ++ "self_type" : "type-3183", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30319,8 +31731,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3241", +- "self_type" : "type-3240", ++ "referenced_type" : "type-3235", ++ "self_type" : "type-3234", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30329,8 +31741,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3821", +- "self_type" : "type-3820", ++ "referenced_type" : "type-3814", ++ "self_type" : "type-3813", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30339,8 +31751,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-511", +- "self_type" : "type-510", ++ "referenced_type" : "type-510", ++ "self_type" : "type-509", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30349,8 +31761,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-682", +- "self_type" : "type-681", ++ "referenced_type" : "type-680", ++ "self_type" : "type-679", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30359,8 +31771,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-815", +- "self_type" : "type-814", ++ "referenced_type" : "type-813", ++ "self_type" : "type-812", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30369,8 +31781,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-886", +- "self_type" : "type-885", ++ "referenced_type" : "type-884", ++ "self_type" : "type-883", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30379,8 +31791,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1007", +- "self_type" : "type-1006", ++ "referenced_type" : "type-1005", ++ "self_type" : "type-1004", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -30389,8 +31801,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1072", +- "self_type" : "type-1071", ++ "referenced_type" : "type-1070", ++ "self_type" : "type-1069", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -30399,8 +31811,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1130", +- "self_type" : "type-1129", ++ "referenced_type" : "type-1128", ++ "self_type" : "type-1127", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -30409,8 +31821,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1243", +- "self_type" : "type-1242", ++ "referenced_type" : "type-1240", ++ "self_type" : "type-1239", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30419,8 +31831,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1314", +- "self_type" : "type-1313", ++ "referenced_type" : "type-1311", ++ "self_type" : "type-1310", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -30429,8 +31841,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1392", +- "self_type" : "type-1391", ++ "referenced_type" : "type-1389", ++ "self_type" : "type-1388", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30439,8 +31851,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1496", +- "self_type" : "type-1495", ++ "referenced_type" : "type-1493", ++ "self_type" : "type-1492", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -30449,8 +31861,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1583", +- "self_type" : "type-1582", ++ "referenced_type" : "type-1582", ++ "self_type" : "type-1581", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -30459,8 +31871,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1629", +- "self_type" : "type-1628", ++ "referenced_type" : "type-1625", ++ "self_type" : "type-1624", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -30469,8 +31881,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1789", +- "self_type" : "type-1788", ++ "referenced_type" : "type-1785", ++ "self_type" : "type-1784", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -30479,8 +31891,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1850", +- "self_type" : "type-1849", ++ "referenced_type" : "type-1846", ++ "self_type" : "type-1845", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -30489,8 +31901,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1906", +- "self_type" : "type-1905", ++ "referenced_type" : "type-1902", ++ "self_type" : "type-1901", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -30499,8 +31911,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1967", +- "self_type" : "type-1966", ++ "referenced_type" : "type-1963", ++ "self_type" : "type-1962", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -30509,8 +31921,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2043", +- "self_type" : "type-2042", ++ "referenced_type" : "type-2039", ++ "self_type" : "type-2038", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -30519,8 +31931,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2089", +- "self_type" : "type-2088", ++ "referenced_type" : "type-2085", ++ "self_type" : "type-2084", + "size" : 24, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -30529,8 +31941,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2393", +- "self_type" : "type-2392", ++ "referenced_type" : "type-2388", ++ "self_type" : "type-2387", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30539,8 +31951,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2463", +- "self_type" : "type-2462", ++ "referenced_type" : "type-2458", ++ "self_type" : "type-2457", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -30549,8 +31961,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2541", +- "self_type" : "type-2540", ++ "referenced_type" : "type-2536", ++ "self_type" : "type-2535", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30559,8 +31971,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2637", +- "self_type" : "type-2636", ++ "referenced_type" : "type-2632", ++ "self_type" : "type-2631", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -30569,8 +31981,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2724", +- "self_type" : "type-2723", ++ "referenced_type" : "type-2721", ++ "self_type" : "type-2720", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -30579,8 +31991,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2770", +- "self_type" : "type-2769", ++ "referenced_type" : "type-2764", ++ "self_type" : "type-2763", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -30589,8 +32001,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2930", +- "self_type" : "type-2929", ++ "referenced_type" : "type-2924", ++ "self_type" : "type-2923", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -30599,8 +32011,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2991", +- "self_type" : "type-2990", ++ "referenced_type" : "type-2985", ++ "self_type" : "type-2984", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -30609,8 +32021,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3047", +- "self_type" : "type-3046", ++ "referenced_type" : "type-3041", ++ "self_type" : "type-3040", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -30619,8 +32031,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3106", +- "self_type" : "type-3105", ++ "referenced_type" : "type-3100", ++ "self_type" : "type-3099", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -30629,8 +32041,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3180", +- "self_type" : "type-3179", ++ "referenced_type" : "type-3174", ++ "self_type" : "type-3173", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -30639,8 +32051,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3223", +- "self_type" : "type-3222", ++ "referenced_type" : "type-3217", ++ "self_type" : "type-3216", + "size" : 24, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -30649,8 +32061,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-359", +- "self_type" : "type-358", ++ "referenced_type" : "type-358", ++ "self_type" : "type-357", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30659,8 +32071,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3735", +- "self_type" : "type-3734", ++ "referenced_type" : "type-3728", ++ "self_type" : "type-3727", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30669,8 +32081,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3806", +- "self_type" : "type-3805", ++ "referenced_type" : "type-3799", ++ "self_type" : "type-3798", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -30679,8 +32091,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3884", +- "self_type" : "type-3883", ++ "referenced_type" : "type-3877", ++ "self_type" : "type-3876", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30699,8 +32111,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-489", +- "self_type" : "type-488", ++ "referenced_type" : "type-488", ++ "self_type" : "type-487", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -30719,8 +32131,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-600", +- "self_type" : "type-599", ++ "referenced_type" : "type-599", ++ "self_type" : "type-598", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30729,8 +32141,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-648", +- "self_type" : "type-647", ++ "referenced_type" : "type-647", ++ "self_type" : "type-646", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -30739,8 +32151,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-752", +- "self_type" : "type-751", ++ "referenced_type" : "type-753", ++ "self_type" : "type-752", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -30749,8 +32161,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-804", +- "self_type" : "type-803", ++ "referenced_type" : "type-802", ++ "self_type" : "type-801", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -30759,8 +32171,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-1387", +- "self_type" : "type-1386", ++ "referenced_type" : "type-1384", ++ "self_type" : "type-1383", + "size" : 48, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30769,8 +32181,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-2536", +- "self_type" : "type-2535", ++ "referenced_type" : "type-2531", ++ "self_type" : "type-2530", + "size" : 48, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30779,8 +32191,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-3879", +- "self_type" : "type-3878", ++ "referenced_type" : "type-3872", ++ "self_type" : "type-3871", + "size" : 48, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30789,8 +32201,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-595", +- "self_type" : "type-594", ++ "referenced_type" : "type-594", ++ "self_type" : "type-593", + "size" : 48, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30799,8 +32211,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-1239", +- "self_type" : "type-1238", ++ "referenced_type" : "type-1236", ++ "self_type" : "type-1235", + "size" : 48, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30809,8 +32221,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-2389", +- "self_type" : "type-2388", ++ "referenced_type" : "type-2384", ++ "self_type" : "type-2383", + "size" : 48, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30819,8 +32231,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-354", +- "self_type" : "type-353", ++ "referenced_type" : "type-353", ++ "self_type" : "type-352", + "size" : 48, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30829,8 +32241,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-3731", +- "self_type" : "type-3730", ++ "referenced_type" : "type-3724", ++ "self_type" : "type-3723", + "size" : 48, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -30839,8 +32251,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-1185", +- "self_type" : "type-1184", ++ "referenced_type" : "type-1183", ++ "self_type" : "type-1182", + "size" : 48, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -30849,8 +32261,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-1223", +- "self_type" : "type-1222", ++ "referenced_type" : "type-1221", ++ "self_type" : "type-1220", + "size" : 48, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -30859,8 +32271,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-2118", +- "self_type" : "type-2117", ++ "referenced_type" : "type-2114", ++ "self_type" : "type-2113", + "size" : 48, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -30869,8 +32281,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-2373", +- "self_type" : "type-2372", ++ "referenced_type" : "type-2369", ++ "self_type" : "type-2368", + "size" : 48, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -30889,8 +32301,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-3252", +- "self_type" : "type-3251", ++ "referenced_type" : "type-3246", ++ "self_type" : "type-3245", + "size" : 48, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -30909,8 +32321,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-3454", +- "self_type" : "type-3453", ++ "referenced_type" : "type-3448", ++ "self_type" : "type-3447", + "size" : 48, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -30919,8 +32331,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-3702", +- "self_type" : "type-3701", ++ "referenced_type" : "type-3696", ++ "self_type" : "type-3695", + "size" : 48, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -30929,8 +32341,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1068", +- "self_type" : "type-1067", ++ "referenced_type" : "type-1066", ++ "self_type" : "type-1065", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -30939,8 +32351,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1125", +- "self_type" : "type-1124", ++ "referenced_type" : "type-1123", ++ "self_type" : "type-1122", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -30949,8 +32361,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1765", +- "self_type" : "type-1764", ++ "referenced_type" : "type-1761", ++ "self_type" : "type-1760", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -30959,8 +32371,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1846", +- "self_type" : "type-1845", ++ "referenced_type" : "type-1842", ++ "self_type" : "type-1841", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -30969,8 +32381,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1901", +- "self_type" : "type-1900", ++ "referenced_type" : "type-1897", ++ "self_type" : "type-1896", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -30979,8 +32391,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1961", +- "self_type" : "type-1960", ++ "referenced_type" : "type-1957", ++ "self_type" : "type-1956", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -30989,8 +32401,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-2033", +- "self_type" : "type-2032", ++ "referenced_type" : "type-2029", ++ "self_type" : "type-2028", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -30999,8 +32411,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-2080", +- "self_type" : "type-2079", ++ "referenced_type" : "type-2076", ++ "self_type" : "type-2075", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31009,8 +32421,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-2906", +- "self_type" : "type-2905", ++ "referenced_type" : "type-2900", ++ "self_type" : "type-2899", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31019,8 +32431,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-2987", +- "self_type" : "type-2986", ++ "referenced_type" : "type-2981", ++ "self_type" : "type-2980", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31029,8 +32441,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-3042", +- "self_type" : "type-3041", ++ "referenced_type" : "type-3036", ++ "self_type" : "type-3035", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31039,8 +32451,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-3100", +- "self_type" : "type-3099", ++ "referenced_type" : "type-3094", ++ "self_type" : "type-3093", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31049,8 +32461,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-3170", +- "self_type" : "type-3169", ++ "referenced_type" : "type-3164", ++ "self_type" : "type-3163", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31059,8 +32471,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-3215", +- "self_type" : "type-3214", ++ "referenced_type" : "type-3209", ++ "self_type" : "type-3208", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31069,8 +32481,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-975", +- "self_type" : "type-974", ++ "referenced_type" : "type-973", ++ "self_type" : "type-972", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31079,8 +32491,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1066", +- "self_type" : "type-1065", ++ "referenced_type" : "type-1064", ++ "self_type" : "type-1063", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31089,8 +32501,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1123", +- "self_type" : "type-1122", ++ "referenced_type" : "type-1121", ++ "self_type" : "type-1120", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31099,8 +32511,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1759", +- "self_type" : "type-1758", ++ "referenced_type" : "type-1754", ++ "self_type" : "type-1753", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31109,8 +32521,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1844", +- "self_type" : "type-1843", ++ "referenced_type" : "type-1840", ++ "self_type" : "type-1839", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31119,8 +32531,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1899", +- "self_type" : "type-1898", ++ "referenced_type" : "type-1895", ++ "self_type" : "type-1894", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31129,8 +32541,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1959", +- "self_type" : "type-1958", ++ "referenced_type" : "type-1955", ++ "self_type" : "type-1954", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31139,8 +32551,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-2031", +- "self_type" : "type-2030", ++ "referenced_type" : "type-2027", ++ "self_type" : "type-2026", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31149,8 +32561,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-2077", +- "self_type" : "type-2076", ++ "referenced_type" : "type-2073", ++ "self_type" : "type-2072", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31159,8 +32571,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-2900", +- "self_type" : "type-2899", ++ "referenced_type" : "type-2893", ++ "self_type" : "type-2892", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31169,8 +32581,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-2985", +- "self_type" : "type-2984", ++ "referenced_type" : "type-2979", ++ "self_type" : "type-2978", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31179,8 +32591,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-3040", +- "self_type" : "type-3039", ++ "referenced_type" : "type-3034", ++ "self_type" : "type-3033", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31189,8 +32601,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-3098", +- "self_type" : "type-3097", ++ "referenced_type" : "type-3092", ++ "self_type" : "type-3091", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31199,8 +32611,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-3168", +- "self_type" : "type-3167", ++ "referenced_type" : "type-3162", ++ "self_type" : "type-3161", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31209,8 +32621,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-3212", +- "self_type" : "type-3211", ++ "referenced_type" : "type-3206", ++ "self_type" : "type-3205", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31219,8 +32631,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-965", +- "self_type" : "type-964", ++ "referenced_type" : "type-962", ++ "self_type" : "type-961", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31229,8 +32641,8 @@ + "is_const" : true, + "linker_set_key" : "const std::unique_ptr >", + "name" : "const std::unique_ptr >", +- "referenced_type" : "type-3581", +- "self_type" : "type-3580", ++ "referenced_type" : "type-3575", ++ "self_type" : "type-3574", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -31239,8 +32651,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-1617", +- "self_type" : "type-1616", ++ "referenced_type" : "type-1613", ++ "self_type" : "type-1612", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31249,8 +32661,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-2758", +- "self_type" : "type-2757", ++ "referenced_type" : "type-2752", ++ "self_type" : "type-2751", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31259,8 +32671,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-788", +- "self_type" : "type-787", ++ "referenced_type" : "type-786", ++ "self_type" : "type-785", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31269,8 +32681,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1041", +- "self_type" : "type-1040", ++ "referenced_type" : "type-1039", ++ "self_type" : "type-1038", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31279,8 +32691,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1091", +- "self_type" : "type-1090", ++ "referenced_type" : "type-1089", ++ "self_type" : "type-1088", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31289,8 +32701,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1109", +- "self_type" : "type-1108", ++ "referenced_type" : "type-1107", ++ "self_type" : "type-1106", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31299,8 +32711,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1149", +- "self_type" : "type-1148", ++ "referenced_type" : "type-1147", ++ "self_type" : "type-1146", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31309,8 +32721,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1229", +- "self_type" : "type-1228", ++ "referenced_type" : "type-1227", ++ "self_type" : "type-1226", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31319,8 +32731,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1338", +- "self_type" : "type-1337", ++ "referenced_type" : "type-1335", ++ "self_type" : "type-1334", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31329,8 +32741,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1402", +- "self_type" : "type-1401", ++ "referenced_type" : "type-1399", ++ "self_type" : "type-1398", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31339,8 +32751,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1526", +- "self_type" : "type-1525", ++ "referenced_type" : "type-1522", ++ "self_type" : "type-1521", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31349,8 +32761,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1552", +- "self_type" : "type-1551", ++ "referenced_type" : "type-1548", ++ "self_type" : "type-1547", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31359,8 +32771,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1581", +- "self_type" : "type-1580", ++ "referenced_type" : "type-1580", ++ "self_type" : "type-1579", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31379,8 +32791,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1664", +- "self_type" : "type-1663", ++ "referenced_type" : "type-1659", ++ "self_type" : "type-1658", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31389,8 +32801,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1697", +- "self_type" : "type-1696", ++ "referenced_type" : "type-1693", ++ "self_type" : "type-1692", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31399,8 +32811,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1700", +- "self_type" : "type-1699", ++ "referenced_type" : "type-1696", ++ "self_type" : "type-1695", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31409,8 +32821,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1821", +- "self_type" : "type-1820", ++ "referenced_type" : "type-1817", ++ "self_type" : "type-1816", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31419,8 +32831,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1869", +- "self_type" : "type-1868", ++ "referenced_type" : "type-1865", ++ "self_type" : "type-1864", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31429,8 +32841,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1886", +- "self_type" : "type-1885", ++ "referenced_type" : "type-1882", ++ "self_type" : "type-1881", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31439,8 +32851,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1925", +- "self_type" : "type-1924", ++ "referenced_type" : "type-1921", ++ "self_type" : "type-1920", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31449,8 +32861,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1993", +- "self_type" : "type-1992", ++ "referenced_type" : "type-1988", ++ "self_type" : "type-1987", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31459,8 +32871,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2058", +- "self_type" : "type-2057", ++ "referenced_type" : "type-2054", ++ "self_type" : "type-2053", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31469,8 +32881,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2112", +- "self_type" : "type-2111", ++ "referenced_type" : "type-2108", ++ "self_type" : "type-2107", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31479,8 +32891,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2131", +- "self_type" : "type-2130", ++ "referenced_type" : "type-2127", ++ "self_type" : "type-2126", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31489,8 +32901,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2379", +- "self_type" : "type-2378", ++ "referenced_type" : "type-2375", ++ "self_type" : "type-2374", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31499,8 +32911,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2487", +- "self_type" : "type-2486", ++ "referenced_type" : "type-2482", ++ "self_type" : "type-2481", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31509,8 +32921,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2551", +- "self_type" : "type-2550", ++ "referenced_type" : "type-2546", ++ "self_type" : "type-2545", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31519,8 +32931,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2667", +- "self_type" : "type-2666", ++ "referenced_type" : "type-2661", ++ "self_type" : "type-2660", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31529,8 +32941,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2693", +- "self_type" : "type-2692", ++ "referenced_type" : "type-2687", ++ "self_type" : "type-2686", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31539,8 +32951,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2722", +- "self_type" : "type-2721", ++ "referenced_type" : "type-2719", ++ "self_type" : "type-2718", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31549,8 +32961,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2805", +- "self_type" : "type-2804", ++ "referenced_type" : "type-2798", ++ "self_type" : "type-2797", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31559,8 +32971,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2838", +- "self_type" : "type-2837", ++ "referenced_type" : "type-2832", ++ "self_type" : "type-2831", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31569,8 +32981,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2841", +- "self_type" : "type-2840", ++ "referenced_type" : "type-2835", ++ "self_type" : "type-2834", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31579,8 +32991,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2962", +- "self_type" : "type-2961", ++ "referenced_type" : "type-2956", ++ "self_type" : "type-2955", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31589,8 +33001,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3010", +- "self_type" : "type-3009", ++ "referenced_type" : "type-3004", ++ "self_type" : "type-3003", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31599,8 +33011,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3027", +- "self_type" : "type-3026", ++ "referenced_type" : "type-3021", ++ "self_type" : "type-3020", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31609,8 +33021,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3066", +- "self_type" : "type-3065", ++ "referenced_type" : "type-3060", ++ "self_type" : "type-3059", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31619,8 +33031,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3132", +- "self_type" : "type-3131", ++ "referenced_type" : "type-3125", ++ "self_type" : "type-3124", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31629,8 +33041,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3195", +- "self_type" : "type-3194", ++ "referenced_type" : "type-3189", ++ "self_type" : "type-3188", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31639,8 +33051,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3246", +- "self_type" : "type-3245", ++ "referenced_type" : "type-3240", ++ "self_type" : "type-3239", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31649,8 +33061,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3265", +- "self_type" : "type-3264", ++ "referenced_type" : "type-3259", ++ "self_type" : "type-3258", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31669,8 +33081,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3721", +- "self_type" : "type-3720", ++ "referenced_type" : "type-3715", ++ "self_type" : "type-3714", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31679,8 +33091,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3830", +- "self_type" : "type-3829", ++ "referenced_type" : "type-3823", ++ "self_type" : "type-3822", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31689,8 +33101,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3894", +- "self_type" : "type-3893", ++ "referenced_type" : "type-3887", ++ "self_type" : "type-3886", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31709,8 +33121,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-522", +- "self_type" : "type-521", ++ "referenced_type" : "type-521", ++ "self_type" : "type-520", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31719,8 +33131,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-611", +- "self_type" : "type-610", ++ "referenced_type" : "type-610", ++ "self_type" : "type-609", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31729,8 +33141,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-687", +- "self_type" : "type-686", ++ "referenced_type" : "type-685", ++ "self_type" : "type-684", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31739,8 +33151,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-713", +- "self_type" : "type-712", ++ "referenced_type" : "type-711", ++ "self_type" : "type-710", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31749,8 +33161,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-750", +- "self_type" : "type-749", ++ "referenced_type" : "type-751", ++ "self_type" : "type-750", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31759,8 +33171,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-859", +- "self_type" : "type-858", ++ "referenced_type" : "type-856", ++ "self_type" : "type-855", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31769,8 +33181,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-892", +- "self_type" : "type-891", ++ "referenced_type" : "type-890", ++ "self_type" : "type-889", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31779,8 +33191,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-895", +- "self_type" : "type-894", ++ "referenced_type" : "type-893", ++ "self_type" : "type-892", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31800,7 +33212,7 @@ + "linker_set_key" : "const unsigned char", + "name" : "const unsigned char", + "referenced_type" : "type-146", +- "self_type" : "type-523", ++ "self_type" : "type-522", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -31809,8 +33221,8 @@ + "is_const" : true, + "linker_set_key" : "const unsigned char *const", + "name" : "const unsigned char *const", +- "referenced_type" : "type-989", +- "self_type" : "type-3541", ++ "referenced_type" : "type-986", ++ "self_type" : "type-3535", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -31839,8 +33251,8 @@ + "is_const" : true, + "linker_set_key" : "const unsigned long *const", + "name" : "const unsigned long *const", +- "referenced_type" : "type-3544", +- "self_type" : "type-3543", ++ "referenced_type" : "type-3538", ++ "self_type" : "type-3537", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -31849,8 +33261,8 @@ + "is_const" : true, + "linker_set_key" : "const unsigned long long", + "name" : "const unsigned long long", +- "referenced_type" : "type-389", +- "self_type" : "type-2165", ++ "referenced_type" : "type-388", ++ "self_type" : "type-2161", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -31860,7 +33272,7 @@ + "linker_set_key" : "const unsigned short", + "name" : "const unsigned short", + "referenced_type" : "type-71", +- "self_type" : "type-562", ++ "self_type" : "type-561", + "size" : 2, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -31878,7 +33290,7 @@ + "linker_set_key" : "const void *const", + "name" : "const void *const", + "referenced_type" : "type-78", +- "self_type" : "type-2198", ++ "self_type" : "type-2194", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -31888,7 +33300,7 @@ + "linker_set_key" : "void *const", + "name" : "void *const", + "referenced_type" : "type-188", +- "self_type" : "type-3482", ++ "self_type" : "type-3476", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -31898,7 +33310,7 @@ + "linker_set_key" : "volatile bool", + "name" : "volatile bool", + "referenced_type" : "type-29", +- "self_type" : "type-410", ++ "self_type" : "type-409", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/Thread.h" + }, +@@ -31908,7 +33320,7 @@ + "linker_set_key" : "volatile int", + "name" : "volatile int", + "referenced_type" : "type-14", +- "self_type" : "type-2148", ++ "self_type" : "type-2144", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + } +@@ -31929,20 +33341,20 @@ + "access" : "private", + "field_name" : "d_", + "field_offset" : 64, +- "referenced_type" : "type-2314" ++ "referenced_type" : "type-2310" + }, + { + "access" : "private", + "field_name" : "s_", + "field_offset" : 128, +- "referenced_type" : "type-2315" ++ "referenced_type" : "type-2311" + } + ], + "linker_set_key" : "Renamer", + "name" : "Renamer", + "record_kind" : "class", +- "referenced_type" : "type-2313", +- "self_type" : "type-2313", ++ "referenced_type" : "type-2309", ++ "self_type" : "type-2309", + "size" : 24, + "source_file" : "/system/core/libutils/include/utils/RefBase.h", + "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_mE7Renamer", +@@ -32001,8 +33413,8 @@ + "alignment" : 1, + "linker_set_key" : "android::CompileTimeAssert", + "name" : "android::CompileTimeAssert", +- "referenced_type" : "type-3619", +- "self_type" : "type-3619", ++ "referenced_type" : "type-3613", ++ "self_type" : "type-3613", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/Debug.h", + "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE" +@@ -32014,14 +33426,14 @@ + { + "access" : "private", + "field_name" : "mCond", +- "referenced_type" : "type-397" ++ "referenced_type" : "type-396" + } + ], + "linker_set_key" : "android::Condition", + "name" : "android::Condition", + "record_kind" : "class", +- "referenced_type" : "type-396", +- "self_type" : "type-396", ++ "referenced_type" : "type-395", ++ "self_type" : "type-395", + "size" : 48, + "source_file" : "/system/core/libutils/include/utils/Condition.h", + "unique_id" : "_ZTSN7android9ConditionE" +@@ -32033,17 +33445,17 @@ + { + "access" : "private", + "field_name" : "mVector", +- "referenced_type" : "type-376" ++ "referenced_type" : "type-375" + } + ], + "linker_set_key" : "android::KeyedVector >", + "name" : "android::KeyedVector >", + "record_kind" : "class", +- "referenced_type" : "type-383", +- "self_type" : "type-383", ++ "referenced_type" : "type-382", ++ "self_type" : "type-382", + "size" : 40, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h", +- "template_args" : [ "type-287", "type-384" ], ++ "template_args" : [ "type-287", "type-383" ], + "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE" + }, + { +@@ -32053,17 +33465,17 @@ + { + "access" : "private", + "field_name" : "mVector", +- "referenced_type" : "type-2153" ++ "referenced_type" : "type-2149" + } + ], + "linker_set_key" : "android::KeyedVector", + "name" : "android::KeyedVector", + "record_kind" : "class", +- "referenced_type" : "type-2152", +- "self_type" : "type-2152", ++ "referenced_type" : "type-2148", ++ "self_type" : "type-2148", + "size" : 40, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h", +- "template_args" : [ "type-78", "type-2155" ], ++ "template_args" : [ "type-78", "type-2151" ], + "unique_id" : "_ZTSN7android11KeyedVectorIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { +@@ -32113,14 +33525,14 @@ + { + "access" : "private", + "field_name" : "mMutex", +- "referenced_type" : "type-391" ++ "referenced_type" : "type-390" + } + ], + "linker_set_key" : "android::Mutex", + "name" : "android::Mutex", + "record_kind" : "class", +- "referenced_type" : "type-390", +- "self_type" : "type-390", ++ "referenced_type" : "type-389", ++ "self_type" : "type-389", + "size" : 40, + "source_file" : "/system/core/libutils/include/utils/Mutex.h", + "unique_id" : "_ZTSN7android5MutexE" +@@ -32132,14 +33544,14 @@ + { + "access" : "private", + "field_name" : "mLock", +- "referenced_type" : "type-394" ++ "referenced_type" : "type-393" + } + ], + "linker_set_key" : "android::Mutex::Autolock", + "name" : "android::Mutex::Autolock", + "record_kind" : "class", +- "referenced_type" : "type-393", +- "self_type" : "type-393", ++ "referenced_type" : "type-392", ++ "self_type" : "type-392", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Mutex.h", + "unique_id" : "_ZTSN7android5Mutex8AutolockE" +@@ -32183,14 +33595,14 @@ + { + "access" : "private", + "field_name" : "mRWLock", +- "referenced_type" : "type-401" ++ "referenced_type" : "type-400" + } + ], + "linker_set_key" : "android::RWLock", + "name" : "android::RWLock", + "record_kind" : "class", +- "referenced_type" : "type-400", +- "self_type" : "type-400", ++ "referenced_type" : "type-399", ++ "self_type" : "type-399", + "size" : 56, + "source_file" : "/system/core/libutils/include/utils/RWLock.h", + "unique_id" : "_ZTSN7android6RWLockE" +@@ -32202,14 +33614,14 @@ + { + "access" : "private", + "field_name" : "mLock", +- "referenced_type" : "type-405" ++ "referenced_type" : "type-404" + } + ], + "linker_set_key" : "android::RWLock::AutoRLock", + "name" : "android::RWLock::AutoRLock", + "record_kind" : "class", +- "referenced_type" : "type-404", +- "self_type" : "type-404", ++ "referenced_type" : "type-403", ++ "self_type" : "type-403", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RWLock.h", + "unique_id" : "_ZTSN7android6RWLock9AutoRLockE" +@@ -32221,14 +33633,14 @@ + { + "access" : "private", + "field_name" : "mLock", +- "referenced_type" : "type-405" ++ "referenced_type" : "type-404" + } + ], + "linker_set_key" : "android::RWLock::AutoWLock", + "name" : "android::RWLock::AutoWLock", + "record_kind" : "class", +- "referenced_type" : "type-408", +- "self_type" : "type-408", ++ "referenced_type" : "type-406", ++ "self_type" : "type-406", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RWLock.h", + "unique_id" : "_ZTSN7android6RWLock9AutoWLockE" +@@ -32343,8 +33755,8 @@ + "linker_set_key" : "android::ScopedTrace", + "name" : "android::ScopedTrace", + "record_kind" : "class", +- "referenced_type" : "type-1024", +- "self_type" : "type-1024", ++ "referenced_type" : "type-1022", ++ "self_type" : "type-1022", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Trace.h", + "unique_id" : "_ZTSN7android11ScopedTraceE" +@@ -32361,11 +33773,11 @@ + "linker_set_key" : "android::SortedVector > >", + "name" : "android::SortedVector > >", + "record_kind" : "class", +- "referenced_type" : "type-376", +- "self_type" : "type-376", ++ "referenced_type" : "type-375", ++ "self_type" : "type-375", + "size" : 40, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h", +- "template_args" : [ "type-377" ], ++ "template_args" : [ "type-376" ], + "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE", + "vtable_components" : + [ +@@ -32419,11 +33831,11 @@ + "linker_set_key" : "android::SortedVector >", + "name" : "android::SortedVector >", + "record_kind" : "class", +- "referenced_type" : "type-2153", +- "self_type" : "type-2153", ++ "referenced_type" : "type-2149", ++ "self_type" : "type-2149", + "size" : 40, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h", +- "template_args" : [ "type-2154" ], ++ "template_args" : [ "type-2150" ], + "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE", + "vtable_components" : + [ +@@ -32581,7 +33993,7 @@ + "access" : "private", + "field_name" : "mCanCallJava", + "field_offset" : 64, +- "referenced_type" : "type-456" ++ "referenced_type" : "type-454" + }, + { + "access" : "private", +@@ -32593,13 +34005,13 @@ + "access" : "private", + "field_name" : "mLock", + "field_offset" : 192, +- "referenced_type" : "type-390" ++ "referenced_type" : "type-389" + }, + { + "access" : "private", + "field_name" : "mThreadExitedCondition", + "field_offset" : 512, +- "referenced_type" : "type-396" ++ "referenced_type" : "type-395" + }, + { + "access" : "private", +@@ -32611,19 +34023,19 @@ + "access" : "private", + "field_name" : "mExitPending", + "field_offset" : 928, +- "referenced_type" : "type-410" ++ "referenced_type" : "type-409" + }, + { + "access" : "private", + "field_name" : "mRunning", + "field_offset" : 936, +- "referenced_type" : "type-410" ++ "referenced_type" : "type-409" + }, + { + "access" : "private", + "field_name" : "mHoldSelf", + "field_offset" : 960, +- "referenced_type" : "type-453" ++ "referenced_type" : "type-451" + }, + { + "access" : "private", +@@ -32635,8 +34047,8 @@ + "linker_set_key" : "android::Thread", + "name" : "android::Thread", + "record_kind" : "class", +- "referenced_type" : "type-455", +- "self_type" : "type-455", ++ "referenced_type" : "type-453", ++ "self_type" : "type-453", + "size" : 152, + "source_file" : "/system/core/libutils/include/utils/Thread.h", + "unique_id" : "_ZTSN7android6ThreadE", +@@ -32732,8 +34144,8 @@ + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-382", +- "self_type" : "type-382", ++ "referenced_type" : "type-381", ++ "self_type" : "type-381", + "size" : 40, + "source_file" : "/system/core/libutils/include/utils/Vector.h", + "template_args" : [ "type-25" ], +@@ -32787,8 +34199,8 @@ + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-381", +- "self_type" : "type-381", ++ "referenced_type" : "type-380", ++ "self_type" : "type-380", + "size" : 40, + "source_file" : "/system/core/libutils/include/utils/Vector.h", + "template_args" : [ "type-308" ], +@@ -32897,8 +34309,8 @@ + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-380", +- "self_type" : "type-380", ++ "referenced_type" : "type-379", ++ "self_type" : "type-379", + "size" : 40, + "source_file" : "/system/core/libutils/include/utils/Vector.h", + "template_args" : [ "type-332" ], +@@ -32952,11 +34364,11 @@ + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-2222", +- "self_type" : "type-2222", ++ "referenced_type" : "type-2218", ++ "self_type" : "type-2218", + "size" : 40, + "source_file" : "/system/core/libutils/include/utils/Vector.h", +- "template_args" : [ "type-2186" ], ++ "template_args" : [ "type-2182" ], + "unique_id" : "_ZTSN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE", + "vtable_components" : + [ +@@ -33007,11 +34419,11 @@ + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-378", +- "self_type" : "type-378", ++ "referenced_type" : "type-377", ++ "self_type" : "type-377", + "size" : 40, + "source_file" : "/system/core/libutils/include/utils/Vector.h", +- "template_args" : [ "type-379" ], ++ "template_args" : [ "type-378" ], + "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE", + "vtable_components" : + [ +@@ -33062,11 +34474,11 @@ + "linker_set_key" : "android::Vector >", + "name" : "android::Vector >", + "record_kind" : "class", +- "referenced_type" : "type-2330", +- "self_type" : "type-2330", ++ "referenced_type" : "type-2324", ++ "self_type" : "type-2324", + "size" : 40, + "source_file" : "/system/core/libutils/include/utils/Vector.h", +- "template_args" : [ "type-2281" ], ++ "template_args" : [ "type-2277" ], + "unique_id" : "_ZTSN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE", + "vtable_components" : + [ +@@ -33117,8 +34529,8 @@ + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-2324", +- "self_type" : "type-2324", ++ "referenced_type" : "type-2320", ++ "self_type" : "type-2320", + "size" : 40, + "source_file" : "/system/core/libutils/include/utils/Vector.h", + "template_args" : [ "type-14" ], +@@ -33279,22 +34691,22 @@ + "alignment" : 1, + "linker_set_key" : "android::aggregate_traits >", + "name" : "android::aggregate_traits >", +- "referenced_type" : "type-3691", +- "self_type" : "type-3691", ++ "referenced_type" : "type-3684", ++ "self_type" : "type-3684", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-287", "type-384" ], ++ "template_args" : [ "type-287", "type-383" ], + "unique_id" : "_ZTSN7android16aggregate_traitsINS_8String16ENS_2spINS_8hardware7IBinderEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::aggregate_traits", + "name" : "android::aggregate_traits", +- "referenced_type" : "type-2279", +- "self_type" : "type-2279", ++ "referenced_type" : "type-2275", ++ "self_type" : "type-2275", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-78", "type-2155" ], ++ "template_args" : [ "type-78", "type-2151" ], + "unique_id" : "_ZTSN7android16aggregate_traitsIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { +@@ -33302,7 +34714,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2139" ++ "referenced_type" : "type-2135" + } + ], + "fields" : +@@ -33323,7 +34735,7 @@ + "access" : "private", + "field_name" : "mExtras", + "field_offset" : 128, +- "referenced_type" : "type-2145" ++ "referenced_type" : "type-2141" + }, + { + "access" : "private", +@@ -33335,8 +34747,8 @@ + "linker_set_key" : "android::hardware::BHwBinder", + "name" : "android::hardware::BHwBinder", + "record_kind" : "class", +- "referenced_type" : "type-2144", +- "self_type" : "type-2144", ++ "referenced_type" : "type-2140", ++ "self_type" : "type-2140", + "size" : 48, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h", + "unique_id" : "_ZTSN7android8hardware9BHwBinderE", +@@ -33442,7 +34854,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2139" ++ "referenced_type" : "type-2135" + } + ], + "fields" : +@@ -33457,37 +34869,37 @@ + "access" : "private", + "field_name" : "mLock", + "field_offset" : 96, +- "referenced_type" : "type-390" ++ "referenced_type" : "type-389" + }, + { + "access" : "private", + "field_name" : "mAlive", + "field_offset" : 416, +- "referenced_type" : "type-2148" ++ "referenced_type" : "type-2144" + }, + { + "access" : "private", + "field_name" : "mObitsSent", + "field_offset" : 448, +- "referenced_type" : "type-2148" ++ "referenced_type" : "type-2144" + }, + { + "access" : "private", + "field_name" : "mObituaries", + "field_offset" : 512, +- "referenced_type" : "type-2149" ++ "referenced_type" : "type-2145" + }, + { + "access" : "private", + "field_name" : "mObjects", + "field_offset" : 576, +- "referenced_type" : "type-2151" ++ "referenced_type" : "type-2147" + }, + { + "access" : "private", + "field_name" : "mConstantData", + "field_offset" : 896, +- "referenced_type" : "type-2158" ++ "referenced_type" : "type-2154" + }, + { + "access" : "private", +@@ -33499,8 +34911,8 @@ + "linker_set_key" : "android::hardware::BpHwBinder", + "name" : "android::hardware::BpHwBinder", + "record_kind" : "class", +- "referenced_type" : "type-2147", +- "self_type" : "type-2147", ++ "referenced_type" : "type-2143", ++ "self_type" : "type-2143", + "size" : 144, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h", + "unique_id" : "_ZTSN7android8hardware10BpHwBinderE", +@@ -33617,7 +35029,7 @@ + [ + { + "field_name" : "recipient", +- "referenced_type" : "type-900" ++ "referenced_type" : "type-898" + }, + { + "field_name" : "cookie", +@@ -33632,8 +35044,8 @@ + ], + "linker_set_key" : "android::hardware::BpHwBinder::Obituary", + "name" : "android::hardware::BpHwBinder::Obituary", +- "referenced_type" : "type-2186", +- "self_type" : "type-2186", ++ "referenced_type" : "type-2182", ++ "self_type" : "type-2182", + "size" : 32, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h", + "unique_id" : "_ZTSN7android8hardware10BpHwBinder8ObituaryE" +@@ -33645,14 +35057,14 @@ + { + "access" : "private", + "field_name" : "mObjects", +- "referenced_type" : "type-2152" ++ "referenced_type" : "type-2148" + } + ], + "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager", + "name" : "android::hardware::BpHwBinder::ObjectManager", + "record_kind" : "class", +- "referenced_type" : "type-2151", +- "self_type" : "type-2151", ++ "referenced_type" : "type-2147", ++ "self_type" : "type-2147", + "size" : 40, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h", + "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManagerE" +@@ -33674,13 +35086,13 @@ + { + "field_name" : "func", + "field_offset" : 128, +- "referenced_type" : "type-2156" ++ "referenced_type" : "type-2152" + } + ], + "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager::entry_t", + "name" : "android::hardware::BpHwBinder::ObjectManager::entry_t", +- "referenced_type" : "type-2155", +- "self_type" : "type-2155", ++ "referenced_type" : "type-2151", ++ "self_type" : "type-2151", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h", + "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManager7entry_tE" +@@ -33700,7 +35112,7 @@ + "access" : "private", + "field_name" : "mRemote", + "field_offset" : 64, +- "referenced_type" : "type-2178" ++ "referenced_type" : "type-2174" + }, + { + "access" : "private", +@@ -33712,14 +35124,14 @@ + "access" : "private", + "field_name" : "mState", + "field_offset" : 192, +- "referenced_type" : "type-2180" ++ "referenced_type" : "type-2176" + } + ], + "linker_set_key" : "android::hardware::BpHwRefBase", + "name" : "android::hardware::BpHwRefBase", + "record_kind" : "class", +- "referenced_type" : "type-2177", +- "self_type" : "type-2177", ++ "referenced_type" : "type-2173", ++ "self_type" : "type-2173", + "size" : 48, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h", + "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE", +@@ -33807,7 +35219,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2285" ++ "referenced_type" : "type-2281" + } + ], + "fields" : +@@ -33834,20 +35246,20 @@ + "access" : "private", + "field_name" : "mLock", + "field_offset" : 160, +- "referenced_type" : "type-390" ++ "referenced_type" : "type-389" + }, + { + "access" : "private", + "field_name" : "mGlobalState", + "field_offset" : 512, +- "referenced_type" : "type-2282" ++ "referenced_type" : "type-2278" + } + ], + "linker_set_key" : "android::hardware::BufferedTextOutput", + "name" : "android::hardware::BufferedTextOutput", + "record_kind" : "class", +- "referenced_type" : "type-2316", +- "self_type" : "type-2316", ++ "referenced_type" : "type-2312", ++ "self_type" : "type-2312", + "size" : 72, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h", + "unique_id" : "_ZTSN7android8hardware18BufferedTextOutputE", +@@ -33893,23 +35305,23 @@ + { + "access" : "private", + "field_name" : "mMutex", +- "referenced_type" : "type-664" ++ "referenced_type" : "type-663" + }, + { + "access" : "private", + "field_name" : "mMap", + "field_offset" : 320, +- "referenced_type" : "type-665" ++ "referenced_type" : "type-664" + } + ], + "linker_set_key" : "android::hardware::ConcurrentMap, android::hardware::details::SchedPrio>", + "name" : "android::hardware::ConcurrentMap, android::hardware::details::SchedPrio>", + "record_kind" : "class", +- "referenced_type" : "type-663", +- "self_type" : "type-663", ++ "referenced_type" : "type-662", ++ "self_type" : "type-662", + "size" : 64, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-309", "type-368" ], ++ "template_args" : [ "type-309", "type-367" ], + "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS0_7details9SchedPrioEEE" + }, + { +@@ -33919,20 +35331,20 @@ + { + "access" : "private", + "field_name" : "mMutex", +- "referenced_type" : "type-670" ++ "referenced_type" : "type-668" + }, + { + "access" : "private", + "field_name" : "mMap", + "field_offset" : 320, +- "referenced_type" : "type-671" ++ "referenced_type" : "type-669" + } + ], + "linker_set_key" : "android::hardware::ConcurrentMap, bool>", + "name" : "android::hardware::ConcurrentMap, bool>", + "record_kind" : "class", +- "referenced_type" : "type-669", +- "self_type" : "type-669", ++ "referenced_type" : "type-667", ++ "self_type" : "type-667", + "size" : 64, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", + "template_args" : [ "type-309", "type-29" ], +@@ -33971,23 +35383,23 @@ + { + "access" : "private", + "field_name" : "mMutex", +- "referenced_type" : "type-589" ++ "referenced_type" : "type-588" + }, + { + "access" : "private", + "field_name" : "mMap", + "field_offset" : 320, +- "referenced_type" : "type-590" ++ "referenced_type" : "type-589" + } + ], + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "record_kind" : "class", +- "referenced_type" : "type-588", +- "self_type" : "type-588", ++ "referenced_type" : "type-587", ++ "self_type" : "type-587", + "size" : 64, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-591", "type-592" ], ++ "template_args" : [ "type-590", "type-591" ], + "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEE" + }, + { +@@ -33997,23 +35409,23 @@ + { + "access" : "private", + "field_name" : "mMutex", +- "referenced_type" : "type-348" ++ "referenced_type" : "type-347" + }, + { + "access" : "private", + "field_name" : "mMap", + "field_offset" : 320, +- "referenced_type" : "type-349" ++ "referenced_type" : "type-348" + } + ], + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "record_kind" : "class", +- "referenced_type" : "type-347", +- "self_type" : "type-347", ++ "referenced_type" : "type-346", ++ "self_type" : "type-346", + "size" : 64, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-350", "type-351" ], ++ "template_args" : [ "type-349", "type-350" ], + "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS0_7IBinderEEEPvEEEEE" + }, + { +@@ -34091,8 +35503,8 @@ + "linker_set_key" : "android::hardware::HexDump", + "name" : "android::hardware::HexDump", + "record_kind" : "class", +- "referenced_type" : "type-2297", +- "self_type" : "type-2297", ++ "referenced_type" : "type-2293", ++ "self_type" : "type-2293", + "size" : 48, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h", + "unique_id" : "_ZTSN7android8hardware7HexDumpE" +@@ -34201,8 +35613,8 @@ + "linker_set_key" : "android::hardware::IBinder", + "name" : "android::hardware::IBinder", + "record_kind" : "class", +- "referenced_type" : "type-2139", +- "self_type" : "type-2139", ++ "referenced_type" : "type-2135", ++ "self_type" : "type-2135", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h", + "unique_id" : "_ZTSN7android8hardware7IBinderE", +@@ -34318,8 +35730,8 @@ + "linker_set_key" : "android::hardware::IBinder::DeathRecipient", + "name" : "android::hardware::IBinder::DeathRecipient", + "record_kind" : "class", +- "referenced_type" : "type-2191", +- "self_type" : "type-2191", ++ "referenced_type" : "type-2187", ++ "self_type" : "type-2187", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h", + "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE", +@@ -34406,8 +35818,8 @@ + "linker_set_key" : "android::hardware::IInterface", + "name" : "android::hardware::IInterface", + "record_kind" : "class", +- "referenced_type" : "type-2187", +- "self_type" : "type-2187", ++ "referenced_type" : "type-2183", ++ "self_type" : "type-2183", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h", + "unique_id" : "_ZTSN7android8hardware10IInterfaceE", +@@ -34489,43 +35901,43 @@ + { + "access" : "private", + "field_name" : "mProcess", +- "referenced_type" : "type-450" ++ "referenced_type" : "type-449" + }, + { + "access" : "private", + "field_name" : "mPendingStrongDerefs", + "field_offset" : 64, +- "referenced_type" : "type-380" ++ "referenced_type" : "type-379" + }, + { + "access" : "private", + "field_name" : "mPendingWeakDerefs", + "field_offset" : 384, +- "referenced_type" : "type-381" ++ "referenced_type" : "type-380" + }, + { + "access" : "private", + "field_name" : "mPostWriteStrongDerefs", + "field_offset" : 704, +- "referenced_type" : "type-382" ++ "referenced_type" : "type-381" + }, + { + "access" : "private", + "field_name" : "mPostWriteWeakDerefs", + "field_offset" : 1024, +- "referenced_type" : "type-381" ++ "referenced_type" : "type-380" + }, + { + "access" : "private", + "field_name" : "mIn", + "field_offset" : 1344, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "access" : "private", + "field_name" : "mOut", + "field_offset" : 2432, +- "referenced_type" : "type-2159" ++ "referenced_type" : "type-2155" + }, + { + "access" : "private", +@@ -34567,7 +35979,7 @@ + "access" : "private", + "field_name" : "mContextObject", + "field_offset" : 3776, +- "referenced_type" : "type-426" ++ "referenced_type" : "type-425" + }, + { + "access" : "private", +@@ -34585,26 +35997,26 @@ + "access" : "private", + "field_name" : "mPostCommandTasks", + "field_offset" : 3904, +- "referenced_type" : "type-2247" ++ "referenced_type" : "type-2243" + }, + { + "access" : "private", + "field_name" : "mIPCThreadStateBase", + "field_offset" : 4096, +- "referenced_type" : "type-2248" ++ "referenced_type" : "type-2244" + }, + { + "access" : "private", + "field_name" : "mCallRestriction", + "field_offset" : 4160, +- "referenced_type" : "type-2244" ++ "referenced_type" : "type-2240" + } + ], + "linker_set_key" : "android::hardware::IPCThreadState", + "name" : "android::hardware::IPCThreadState", + "record_kind" : "class", +- "referenced_type" : "type-2245", +- "self_type" : "type-2245", ++ "referenced_type" : "type-2241", ++ "self_type" : "type-2241", + "size" : 528, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h", + "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE" +@@ -34616,14 +36028,14 @@ + { + "access" : "private", + "field_name" : "mImpl", +- "referenced_type" : "type-486" ++ "referenced_type" : "type-483" + } + ], + "linker_set_key" : "android::hardware::LazyServiceRegistrar", + "name" : "android::hardware::LazyServiceRegistrar", + "record_kind" : "class", +- "referenced_type" : "type-485", +- "self_type" : "type-485", ++ "referenced_type" : "type-482", ++ "self_type" : "type-482", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h", + "unique_id" : "_ZTSN7android8hardware20LazyServiceRegistrarE" +@@ -34658,8 +36070,8 @@ + ], + "linker_set_key" : "android::hardware::MQDescriptor", + "name" : "android::hardware::MQDescriptor", +- "referenced_type" : "type-991", +- "self_type" : "type-991", ++ "referenced_type" : "type-988", ++ "self_type" : "type-988", + "size" : 32, + "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h", + "template_args" : [ "type-43" ], +@@ -34678,7 +36090,7 @@ + "access" : "private", + "field_name" : "mBufCache", + "field_offset" : 64, +- "referenced_type" : "type-2160" ++ "referenced_type" : "type-2156" + }, + { + "access" : "private", +@@ -34714,7 +36126,7 @@ + "access" : "private", + "field_name" : "mObjects", + "field_offset" : 576, +- "referenced_type" : "type-2161" ++ "referenced_type" : "type-2157" + }, + { + "access" : "private", +@@ -34762,7 +36174,7 @@ + "access" : "private", + "field_name" : "mOwner", + "field_offset" : 960, +- "referenced_type" : "type-2162" ++ "referenced_type" : "type-2158" + }, + { + "access" : "private", +@@ -34774,8 +36186,8 @@ + "linker_set_key" : "android::hardware::Parcel", + "name" : "android::hardware::Parcel", + "record_kind" : "class", +- "referenced_type" : "type-2159", +- "self_type" : "type-2159", ++ "referenced_type" : "type-2155", ++ "self_type" : "type-2155", + "size" : 136, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", + "unique_id" : "_ZTSN7android8hardware6ParcelE" +@@ -34792,18 +36204,18 @@ + { + "field_name" : "buffer", + "field_offset" : 64, +- "referenced_type" : "type-389" ++ "referenced_type" : "type-388" + }, + { + "field_name" : "bufend", + "field_offset" : 128, +- "referenced_type" : "type-389" ++ "referenced_type" : "type-388" + } + ], + "linker_set_key" : "android::hardware::Parcel::BufferInfo", + "name" : "android::hardware::Parcel::BufferInfo", +- "referenced_type" : "type-2188", +- "self_type" : "type-2188", ++ "referenced_type" : "type-2184", ++ "self_type" : "type-2184", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", + "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE" +@@ -34835,13 +36247,13 @@ + "access" : "private", + "field_name" : "mThreadCountLock", + "field_offset" : 192, +- "referenced_type" : "type-2251" ++ "referenced_type" : "type-2247" + }, + { + "access" : "private", + "field_name" : "mThreadCountDecrement", + "field_offset" : 512, +- "referenced_type" : "type-2252" ++ "referenced_type" : "type-2248" + }, + { + "access" : "private", +@@ -34865,13 +36277,13 @@ + "access" : "private", + "field_name" : "mLock", + "field_offset" : 1088, +- "referenced_type" : "type-390" ++ "referenced_type" : "type-389" + }, + { + "access" : "private", + "field_name" : "mHandleToObject", + "field_offset" : 1408, +- "referenced_type" : "type-378" ++ "referenced_type" : "type-377" + }, + { + "access" : "private", +@@ -34883,7 +36295,7 @@ + "access" : "private", + "field_name" : "mBinderContextCheckFunc", + "field_offset" : 1792, +- "referenced_type" : "type-2243" ++ "referenced_type" : "type-2239" + }, + { + "access" : "private", +@@ -34895,7 +36307,7 @@ + "access" : "private", + "field_name" : "mContexts", + "field_offset" : 1920, +- "referenced_type" : "type-383" ++ "referenced_type" : "type-382" + }, + { + "access" : "private", +@@ -34919,7 +36331,7 @@ + "access" : "private", + "field_name" : "mThreadPoolSeq", + "field_offset" : 2336, +- "referenced_type" : "type-2148" ++ "referenced_type" : "type-2144" + }, + { + "access" : "private", +@@ -34931,14 +36343,14 @@ + "access" : "private", + "field_name" : "mCallRestriction", + "field_offset" : 2432, +- "referenced_type" : "type-2244" ++ "referenced_type" : "type-2240" + } + ], + "linker_set_key" : "android::hardware::ProcessState", + "name" : "android::hardware::ProcessState", + "record_kind" : "class", +- "referenced_type" : "type-2250", +- "self_type" : "type-2250", ++ "referenced_type" : "type-2246", ++ "self_type" : "type-2246", + "size" : 328, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h", + "unique_id" : "_ZTSN7android8hardware12ProcessStateE", +@@ -35016,7 +36428,7 @@ + [ + { + "field_name" : "binder", +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2136" + }, + { + "field_name" : "refs", +@@ -35026,8 +36438,8 @@ + ], + "linker_set_key" : "android::hardware::ProcessState::handle_entry", + "name" : "android::hardware::ProcessState::handle_entry", +- "referenced_type" : "type-2228", +- "self_type" : "type-2228", ++ "referenced_type" : "type-2224", ++ "self_type" : "type-2224", + "size" : 16, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h", + "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE" +@@ -35046,17 +36458,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 264, +- "referenced_type" : "type-501" ++ "referenced_type" : "type-500" + } + ], + "linker_set_key" : "android::hardware::Return", + "name" : "android::hardware::Return", + "record_kind" : "class", +- "referenced_type" : "type-764", +- "self_type" : "type-764", ++ "referenced_type" : "type-762", ++ "self_type" : "type-762", + "size" : 40, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-501" ], ++ "template_args" : [ "type-500" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_4hidl7manager4V1_015IServiceManager9TransportEEE" + }, + { +@@ -35079,8 +36491,8 @@ + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-757", +- "self_type" : "type-757", ++ "referenced_type" : "type-755", ++ "self_type" : "type-755", + "size" : 48, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", + "template_args" : [ "type-300" ], +@@ -35100,17 +36512,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 320, +- "referenced_type" : "type-527" ++ "referenced_type" : "type-526" + } + ], + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-944", +- "self_type" : "type-944", ++ "referenced_type" : "type-942", ++ "self_type" : "type-942", + "size" : 48, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-527" ], ++ "template_args" : [ "type-526" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEE" + }, + { +@@ -35127,17 +36539,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 320, +- "referenced_type" : "type-543" ++ "referenced_type" : "type-542" + } + ], + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-1053", +- "self_type" : "type-1053", ++ "referenced_type" : "type-1051", ++ "self_type" : "type-1051", + "size" : 48, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-543" ], ++ "template_args" : [ "type-542" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEE" + }, + { +@@ -35154,17 +36566,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 320, +- "referenced_type" : "type-532" ++ "referenced_type" : "type-531" + } + ], + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-1110", +- "self_type" : "type-1110", ++ "referenced_type" : "type-1108", ++ "self_type" : "type-1108", + "size" : 48, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-532" ], ++ "template_args" : [ "type-531" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEE" + }, + { +@@ -35181,17 +36593,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 320, +- "referenced_type" : "type-549" ++ "referenced_type" : "type-547" + } + ], + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-1945", +- "self_type" : "type-1945", ++ "referenced_type" : "type-1941", ++ "self_type" : "type-1941", + "size" : 48, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-549" ], ++ "template_args" : [ "type-547" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEE" + }, + { +@@ -35208,17 +36620,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 320, +- "referenced_type" : "type-538" ++ "referenced_type" : "type-536" + } + ], + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-2015", +- "self_type" : "type-2015", ++ "referenced_type" : "type-2011", ++ "self_type" : "type-2011", + "size" : 48, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-538" ], ++ "template_args" : [ "type-536" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEE" + }, + { +@@ -35302,8 +36714,8 @@ + "linker_set_key" : "android::hardware::TextOutput", + "name" : "android::hardware::TextOutput", + "record_kind" : "class", +- "referenced_type" : "type-2285", +- "self_type" : "type-2285", ++ "referenced_type" : "type-2281", ++ "self_type" : "type-2281", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h", + "unique_id" : "_ZTSN7android8hardware10TextOutputE", +@@ -35349,14 +36761,14 @@ + { + "access" : "private", + "field_name" : "mTO", +- "referenced_type" : "type-2287" ++ "referenced_type" : "type-2283" + } + ], + "linker_set_key" : "android::hardware::TextOutput::Bundle", + "name" : "android::hardware::TextOutput::Bundle", + "record_kind" : "class", +- "referenced_type" : "type-2286", +- "self_type" : "type-2286", ++ "referenced_type" : "type-2282", ++ "self_type" : "type-2282", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h", + "unique_id" : "_ZTSN7android8hardware10TextOutput6BundleE" +@@ -35374,8 +36786,8 @@ + "linker_set_key" : "android::hardware::TypeCode", + "name" : "android::hardware::TypeCode", + "record_kind" : "class", +- "referenced_type" : "type-2293", +- "self_type" : "type-2293", ++ "referenced_type" : "type-2289", ++ "self_type" : "type-2289", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h", + "unique_id" : "_ZTSN7android8hardware8TypeCodeE" +@@ -35387,17 +36799,17 @@ + { + "access" : "private", + "field_name" : "buffer", +- "referenced_type" : "type-362" ++ "referenced_type" : "type-361" + } + ], + "linker_set_key" : "android::hardware::details::DoNotDestruct, android::hardware::details::SchedPrio> >", + "name" : "android::hardware::details::DoNotDestruct, android::hardware::details::SchedPrio> >", + "record_kind" : "class", +- "referenced_type" : "type-673", +- "self_type" : "type-673", ++ "referenced_type" : "type-671", ++ "self_type" : "type-671", + "size" : 64, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-663" ], ++ "template_args" : [ "type-662" ], + "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS1_9SchedPrioEEEEE" + }, + { +@@ -35407,17 +36819,17 @@ + { + "access" : "private", + "field_name" : "buffer", +- "referenced_type" : "type-362" ++ "referenced_type" : "type-361" + } + ], + "linker_set_key" : "android::hardware::details::DoNotDestruct, bool> >", + "name" : "android::hardware::details::DoNotDestruct, bool> >", + "record_kind" : "class", +- "referenced_type" : "type-677", +- "self_type" : "type-677", ++ "referenced_type" : "type-675", ++ "self_type" : "type-675", + "size" : 64, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-669" ], ++ "template_args" : [ "type-667" ], + "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEEEE" + }, + { +@@ -35427,14 +36839,14 @@ + { + "access" : "private", + "field_name" : "buffer", +- "referenced_type" : "type-362" ++ "referenced_type" : "type-361" + } + ], + "linker_set_key" : "android::hardware::details::DoNotDestruct > >", + "name" : "android::hardware::details::DoNotDestruct > >", + "record_kind" : "class", +- "referenced_type" : "type-361", +- "self_type" : "type-361", ++ "referenced_type" : "type-360", ++ "self_type" : "type-360", + "size" : 64, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", + "template_args" : [ "type-326" ], +@@ -35447,17 +36859,17 @@ + { + "access" : "private", + "field_name" : "buffer", +- "referenced_type" : "type-362" ++ "referenced_type" : "type-361" + } + ], + "linker_set_key" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > >", + "name" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > >", + "record_kind" : "class", +- "referenced_type" : "type-602", +- "self_type" : "type-602", ++ "referenced_type" : "type-601", ++ "self_type" : "type-601", + "size" : 64, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-588" ], ++ "template_args" : [ "type-587" ], + "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEEEE" + }, + { +@@ -35467,17 +36879,17 @@ + { + "access" : "private", + "field_name" : "buffer", +- "referenced_type" : "type-362" ++ "referenced_type" : "type-361" + } + ], + "linker_set_key" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > >", + "name" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > >", + "record_kind" : "class", +- "referenced_type" : "type-364", +- "self_type" : "type-364", ++ "referenced_type" : "type-363", ++ "self_type" : "type-363", + "size" : 64, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-347" ], ++ "template_args" : [ "type-346" ], + "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS0_7IBinderEEEPvEEEEEEE" + }, + { +@@ -35551,8 +36963,8 @@ + ], + "linker_set_key" : "android::hardware::details::SchedPrio", + "name" : "android::hardware::details::SchedPrio", +- "referenced_type" : "type-368", +- "self_type" : "type-368", ++ "referenced_type" : "type-367", ++ "self_type" : "type-367", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/Static.h", + "unique_id" : "_ZTSN7android8hardware7details9SchedPrioE" +@@ -35637,7 +37049,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-794" ++ "referenced_type" : "type-792" + }, + { + "field_name" : "_pad", +@@ -35648,8 +37060,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-793", +- "self_type" : "type-793", ++ "referenced_type" : "type-791", ++ "self_type" : "type-791", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEUt_E" +@@ -35678,16 +37090,16 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-969" ++ "referenced_type" : "type-967" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer >", + "name" : "android::hardware::details::hidl_pointer >", +- "referenced_type" : "type-968", +- "self_type" : "type-968", ++ "referenced_type" : "type-966", ++ "self_type" : "type-966", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", +- "template_args" : [ "type-971" ], ++ "template_args" : [ "type-969" ], + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLm32EJEEEEE" + }, + { +@@ -35696,13 +37108,13 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-573" ++ "referenced_type" : "type-572" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer", + "name" : "android::hardware::details::hidl_pointer", +- "referenced_type" : "type-572", +- "self_type" : "type-572", ++ "referenced_type" : "type-571", ++ "self_type" : "type-571", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "template_args" : [ "type-38" ], +@@ -35714,16 +37126,16 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-793" ++ "referenced_type" : "type-791" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer", + "name" : "android::hardware::details::hidl_pointer", +- "referenced_type" : "type-792", +- "self_type" : "type-792", ++ "referenced_type" : "type-790", ++ "self_type" : "type-790", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", +- "template_args" : [ "type-503" ], ++ "template_args" : [ "type-502" ], + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE" + }, + { +@@ -35732,13 +37144,13 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-985" ++ "referenced_type" : "type-983" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer", + "name" : "android::hardware::details::hidl_pointer", +- "referenced_type" : "type-984", +- "self_type" : "type-984", ++ "referenced_type" : "type-982", ++ "self_type" : "type-982", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "template_args" : [ "type-43" ], +@@ -35762,8 +37174,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-985", +- "self_type" : "type-985", ++ "referenced_type" : "type-983", ++ "self_type" : "type-983", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEUt_E" +@@ -35859,7 +37271,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-970" ++ "referenced_type" : "type-968" + }, + { + "field_name" : "_pad", +@@ -35870,8 +37282,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-969", +- "self_type" : "type-969", ++ "referenced_type" : "type-967", ++ "self_type" : "type-967", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLm32EJEEEEUt_E" +@@ -35894,8 +37306,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-573", +- "self_type" : "type-573", ++ "referenced_type" : "type-572", ++ "self_type" : "type-572", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEUt_E" +@@ -35906,13 +37318,13 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-475" ++ "referenced_type" : "type-474" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer", + "name" : "android::hardware::details::hidl_pointer", +- "referenced_type" : "type-474", +- "self_type" : "type-474", ++ "referenced_type" : "type-473", ++ "self_type" : "type-473", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "template_args" : [ "type-14" ], +@@ -35925,7 +37337,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-476" ++ "referenced_type" : "type-475" + }, + { + "field_name" : "_pad", +@@ -35936,8 +37348,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-475", +- "self_type" : "type-475", ++ "referenced_type" : "type-474", ++ "self_type" : "type-474", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEUt_E" +@@ -36023,8 +37435,8 @@ + "alignment" : 1, + "linker_set_key" : "android::hardware::details::std_array", + "name" : "android::hardware::details::std_array", +- "referenced_type" : "type-987", +- "self_type" : "type-987", ++ "referenced_type" : "type-985", ++ "self_type" : "type-985", + "size" : 1, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "template_args" : [ "type-146" ], +@@ -36037,13 +37449,13 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-972" ++ "referenced_type" : "type-970" + } + ], + "linker_set_key" : "android::hardware::hidl_array", + "name" : "android::hardware::hidl_array", +- "referenced_type" : "type-971", +- "self_type" : "type-971", ++ "referenced_type" : "type-969", ++ "self_type" : "type-969", + "size" : 32, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "template_args" : [ "type-146" ], +@@ -36364,7 +37776,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-968" ++ "referenced_type" : "type-966" + }, + { + "access" : "private", +@@ -36381,11 +37793,11 @@ + ], + "linker_set_key" : "android::hardware::hidl_vec >", + "name" : "android::hardware::hidl_vec >", +- "referenced_type" : "type-967", +- "self_type" : "type-967", ++ "referenced_type" : "type-965", ++ "self_type" : "type-965", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", +- "template_args" : [ "type-971" ], ++ "template_args" : [ "type-969" ], + "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIhLm32EJEEEEE" + }, + { +@@ -36395,7 +37807,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-572" ++ "referenced_type" : "type-571" + }, + { + "access" : "private", +@@ -36412,8 +37824,8 @@ + ], + "linker_set_key" : "android::hardware::hidl_vec", + "name" : "android::hardware::hidl_vec", +- "referenced_type" : "type-571", +- "self_type" : "type-571", ++ "referenced_type" : "type-570", ++ "self_type" : "type-570", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "template_args" : [ "type-38" ], +@@ -36426,7 +37838,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-792" ++ "referenced_type" : "type-790" + }, + { + "access" : "private", +@@ -36443,11 +37855,11 @@ + ], + "linker_set_key" : "android::hardware::hidl_vec", + "name" : "android::hardware::hidl_vec", +- "referenced_type" : "type-791", +- "self_type" : "type-791", ++ "referenced_type" : "type-789", ++ "self_type" : "type-789", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", +- "template_args" : [ "type-503" ], ++ "template_args" : [ "type-502" ], + "unique_id" : "_ZTSN7android8hardware8hidl_vecINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE" + }, + { +@@ -36457,7 +37869,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-984" ++ "referenced_type" : "type-982" + }, + { + "access" : "private", +@@ -36474,8 +37886,8 @@ + ], + "linker_set_key" : "android::hardware::hidl_vec", + "name" : "android::hardware::hidl_vec", +- "referenced_type" : "type-983", +- "self_type" : "type-983", ++ "referenced_type" : "type-981", ++ "self_type" : "type-981", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "template_args" : [ "type-43" ], +@@ -36486,7 +37898,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-577" ++ "referenced_type" : "type-576" + } + ], + "fields" : +@@ -36500,8 +37912,8 @@ + "linker_set_key" : "android::hardware::hidl_vec::iter", + "name" : "android::hardware::hidl_vec::iter", + "record_kind" : "class", +- "referenced_type" : "type-576", +- "self_type" : "type-576", ++ "referenced_type" : "type-575", ++ "self_type" : "type-575", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEE4iterILb1EEE" +@@ -36513,7 +37925,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-474" ++ "referenced_type" : "type-473" + }, + { + "access" : "private", +@@ -36530,8 +37942,8 @@ + ], + "linker_set_key" : "android::hardware::hidl_vec", + "name" : "android::hardware::hidl_vec", +- "referenced_type" : "type-473", +- "self_type" : "type-473", ++ "referenced_type" : "type-472", ++ "self_type" : "type-472", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "template_args" : [ "type-14" ], +@@ -36706,7 +38118,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-372" ++ "referenced_type" : "type-371" + }, + { + "referenced_type" : "type-128" +@@ -36718,19 +38130,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 1088, +- "referenced_type" : "type-370" ++ "referenced_type" : "type-369" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 1408, +- "referenced_type" : "type-371" ++ "referenced_type" : "type-370" + } + ], + "linker_set_key" : "android::hidl::base::V1_0::BpHwBase", + "name" : "android::hidl::base::V1_0::BpHwBase", +- "referenced_type" : "type-369", +- "self_type" : "type-369", ++ "referenced_type" : "type-368", ++ "self_type" : "type-368", + "size" : 216, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h", + "unique_id" : "_ZTSN7android4hidl4base4V1_08BpHwBaseE", +@@ -36925,7 +38337,7 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 768, +- "referenced_type" : "type-411" ++ "referenced_type" : "type-410" + }, + { + "access" : "private", +@@ -36936,8 +38348,8 @@ + ], + "linker_set_key" : "android::hidl::base::V1_0::BsBase", + "name" : "android::hidl::base::V1_0::BsBase", +- "referenced_type" : "type-2061", +- "self_type" : "type-2061", ++ "referenced_type" : "type-2057", ++ "self_type" : "type-2057", + "size" : 136, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h", + "unique_id" : "_ZTSN7android4hidl4base4V1_06BsBaseE", +@@ -37214,13 +38626,13 @@ + "access" : "private", + "field_name" : "_hidl_mImpl", + "field_offset" : 1024, +- "referenced_type" : "type-527" ++ "referenced_type" : "type-526" + } + ], + "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager", + "name" : "android::hidl::manager::V1_0::BnHwServiceManager", +- "referenced_type" : "type-827", +- "self_type" : "type-827", ++ "referenced_type" : "type-825", ++ "self_type" : "type-825", + "size" : 152, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_018BnHwServiceManagerE", +@@ -37351,13 +38763,13 @@ + "access" : "private", + "field_name" : "_hidl_mImpl", + "field_offset" : 1024, +- "referenced_type" : "type-543" ++ "referenced_type" : "type-542" + } + ], + "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification", + "name" : "android::hidl::manager::V1_0::BnHwServiceNotification", +- "referenced_type" : "type-819", +- "self_type" : "type-819", ++ "referenced_type" : "type-817", ++ "self_type" : "type-817", + "size" : 152, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_023BnHwServiceNotificationE", +@@ -37479,7 +38891,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-832" ++ "referenced_type" : "type-830" + }, + { + "referenced_type" : "type-128" +@@ -37491,19 +38903,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 1088, +- "referenced_type" : "type-830" ++ "referenced_type" : "type-828" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 1408, +- "referenced_type" : "type-831" ++ "referenced_type" : "type-829" + } + ], + "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager", + "name" : "android::hidl::manager::V1_0::BpHwServiceManager", +- "referenced_type" : "type-829", +- "self_type" : "type-829", ++ "referenced_type" : "type-827", ++ "self_type" : "type-827", + "size" : 216, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_018BpHwServiceManagerE", +@@ -37710,7 +39122,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-824" ++ "referenced_type" : "type-822" + }, + { + "referenced_type" : "type-128" +@@ -37722,19 +39134,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 1088, +- "referenced_type" : "type-822" ++ "referenced_type" : "type-820" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 1408, +- "referenced_type" : "type-823" ++ "referenced_type" : "type-821" + } + ], + "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification", + "name" : "android::hidl::manager::V1_0::BpHwServiceNotification", +- "referenced_type" : "type-821", +- "self_type" : "type-821", ++ "referenced_type" : "type-819", ++ "self_type" : "type-819", + "size" : 216, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_023BpHwServiceNotificationE", +@@ -37920,7 +39332,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-505" ++ "referenced_type" : "type-504" + }, + { + "referenced_type" : "type-128" +@@ -37932,7 +39344,7 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 768, +- "referenced_type" : "type-530" ++ "referenced_type" : "type-529" + }, + { + "access" : "private", +@@ -37943,8 +39355,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager", + "name" : "android::hidl::manager::V1_0::BsServiceManager", +- "referenced_type" : "type-916", +- "self_type" : "type-916", ++ "referenced_type" : "type-913", ++ "self_type" : "type-913", + "size" : 136, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_016BsServiceManagerE", +@@ -38093,7 +39505,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-496" ++ "referenced_type" : "type-494" + }, + { + "referenced_type" : "type-128" +@@ -38105,7 +39517,7 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 768, +- "referenced_type" : "type-546" ++ "referenced_type" : "type-545" + }, + { + "access" : "private", +@@ -38116,8 +39528,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification", + "name" : "android::hidl::manager::V1_0::BsServiceNotification", +- "referenced_type" : "type-1044", +- "self_type" : "type-1044", ++ "referenced_type" : "type-1042", ++ "self_type" : "type-1042", + "size" : 136, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_021BsServiceNotificationE", +@@ -38250,8 +39662,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager", + "name" : "android::hidl::manager::V1_0::IServiceManager", +- "referenced_type" : "type-505", +- "self_type" : "type-505", ++ "referenced_type" : "type-504", ++ "self_type" : "type-504", + "size" : 24, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManagerE", +@@ -38408,7 +39820,7 @@ + { + "field_name" : "clientPids", + "field_offset" : 320, +- "referenced_type" : "type-473" ++ "referenced_type" : "type-472" + }, + { + "field_name" : "arch", +@@ -38418,8 +39830,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo", + "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo", +- "referenced_type" : "type-503", +- "self_type" : "type-503", ++ "referenced_type" : "type-502", ++ "self_type" : "type-502", + "size" : 64, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoE" +@@ -38434,8 +39846,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification", + "name" : "android::hidl::manager::V1_0::IServiceNotification", +- "referenced_type" : "type-496", +- "self_type" : "type-496", ++ "referenced_type" : "type-494", ++ "self_type" : "type-494", + "size" : 24, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_020IServiceNotificationE", +@@ -38557,13 +39969,13 @@ + "access" : "private", + "field_name" : "_hidl_mImpl", + "field_offset" : 1024, +- "referenced_type" : "type-532" ++ "referenced_type" : "type-531" + } + ], + "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager", + "name" : "android::hidl::manager::V1_1::BnHwServiceManager", +- "referenced_type" : "type-836", +- "self_type" : "type-836", ++ "referenced_type" : "type-833", ++ "self_type" : "type-833", + "size" : 152, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_118BnHwServiceManagerE", +@@ -38685,7 +40097,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-841" ++ "referenced_type" : "type-839" + }, + { + "referenced_type" : "type-128" +@@ -38697,19 +40109,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 1088, +- "referenced_type" : "type-839" ++ "referenced_type" : "type-837" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 1408, +- "referenced_type" : "type-840" ++ "referenced_type" : "type-838" + } + ], + "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager", + "name" : "android::hidl::manager::V1_1::BpHwServiceManager", +- "referenced_type" : "type-838", +- "self_type" : "type-838", ++ "referenced_type" : "type-836", ++ "self_type" : "type-836", + "size" : 216, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_118BpHwServiceManagerE", +@@ -38919,7 +40331,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-515" ++ "referenced_type" : "type-514" + }, + { + "referenced_type" : "type-128" +@@ -38931,7 +40343,7 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 768, +- "referenced_type" : "type-535" ++ "referenced_type" : "type-534" + }, + { + "access" : "private", +@@ -38942,8 +40354,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager", + "name" : "android::hidl::manager::V1_1::BsServiceManager", +- "referenced_type" : "type-1098", +- "self_type" : "type-1098", ++ "referenced_type" : "type-1096", ++ "self_type" : "type-1096", + "size" : 136, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_116BsServiceManagerE", +@@ -39095,13 +40507,13 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-505" ++ "referenced_type" : "type-504" + } + ], + "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager", + "name" : "android::hidl::manager::V1_1::IServiceManager", +- "referenced_type" : "type-515", +- "self_type" : "type-515", ++ "referenced_type" : "type-514", ++ "self_type" : "type-514", + "size" : 24, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_115IServiceManagerE", +@@ -39255,13 +40667,13 @@ + "access" : "private", + "field_name" : "_hidl_mImpl", + "field_offset" : 1024, +- "referenced_type" : "type-549" ++ "referenced_type" : "type-547" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback", + "name" : "android::hidl::manager::V1_2::BnHwClientCallback", +- "referenced_type" : "type-844", +- "self_type" : "type-844", ++ "referenced_type" : "type-842", ++ "self_type" : "type-842", + "size" : 152, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_218BnHwClientCallbackE", +@@ -39392,13 +40804,13 @@ + "access" : "private", + "field_name" : "_hidl_mImpl", + "field_offset" : 1024, +- "referenced_type" : "type-538" ++ "referenced_type" : "type-536" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager", + "name" : "android::hidl::manager::V1_2::BnHwServiceManager", +- "referenced_type" : "type-802", +- "self_type" : "type-802", ++ "referenced_type" : "type-800", ++ "self_type" : "type-800", + "size" : 152, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_218BnHwServiceManagerE", +@@ -39520,7 +40932,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-850" ++ "referenced_type" : "type-847" + }, + { + "referenced_type" : "type-128" +@@ -39532,19 +40944,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 1088, +- "referenced_type" : "type-848" ++ "referenced_type" : "type-845" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 1408, +- "referenced_type" : "type-849" ++ "referenced_type" : "type-846" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback", + "name" : "android::hidl::manager::V1_2::BpHwClientCallback", +- "referenced_type" : "type-847", +- "self_type" : "type-847", ++ "referenced_type" : "type-844", ++ "self_type" : "type-844", + "size" : 216, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_218BpHwClientCallbackE", +@@ -39730,7 +41142,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-730" ++ "referenced_type" : "type-728" + }, + { + "referenced_type" : "type-128" +@@ -39742,19 +41154,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 1088, +- "referenced_type" : "type-728" ++ "referenced_type" : "type-726" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 1408, +- "referenced_type" : "type-729" ++ "referenced_type" : "type-727" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager", + "name" : "android::hidl::manager::V1_2::BpHwServiceManager", +- "referenced_type" : "type-727", +- "self_type" : "type-727", ++ "referenced_type" : "type-725", ++ "self_type" : "type-725", + "size" : 216, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_218BpHwServiceManagerE", +@@ -39979,7 +41391,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-499" ++ "referenced_type" : "type-498" + }, + { + "referenced_type" : "type-128" +@@ -39991,7 +41403,7 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 768, +- "referenced_type" : "type-554" ++ "referenced_type" : "type-553" + }, + { + "access" : "private", +@@ -40002,8 +41414,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback", + "name" : "android::hidl::manager::V1_2::BsClientCallback", +- "referenced_type" : "type-1928", +- "self_type" : "type-1928", ++ "referenced_type" : "type-1924", ++ "self_type" : "type-1924", + "size" : 136, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_216BsClientCallbackE", +@@ -40131,7 +41543,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-518" ++ "referenced_type" : "type-517" + }, + { + "referenced_type" : "type-128" +@@ -40143,7 +41555,7 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 768, +- "referenced_type" : "type-541" ++ "referenced_type" : "type-540" + }, + { + "access" : "private", +@@ -40154,8 +41566,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager", + "name" : "android::hidl::manager::V1_2::BsServiceManager", +- "referenced_type" : "type-2003", +- "self_type" : "type-2003", ++ "referenced_type" : "type-1999", ++ "self_type" : "type-1999", + "size" : 136, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_216BsServiceManagerE", +@@ -40327,8 +41739,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback", + "name" : "android::hidl::manager::V1_2::IClientCallback", +- "referenced_type" : "type-499", +- "self_type" : "type-499", ++ "referenced_type" : "type-498", ++ "self_type" : "type-498", + "size" : 24, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_215IClientCallbackE", +@@ -40441,13 +41853,13 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-515" ++ "referenced_type" : "type-514" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager", + "name" : "android::hidl::manager::V1_2::IServiceManager", +- "referenced_type" : "type-518", +- "self_type" : "type-518", ++ "referenced_type" : "type-517", ++ "self_type" : "type-517", + "size" : 24, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_215IServiceManagerE", +@@ -40618,16 +42030,16 @@ + { + "field_name" : "value", + "field_offset" : 64, +- "referenced_type" : "type-384" ++ "referenced_type" : "type-383" + } + ], + "linker_set_key" : "android::key_value_pair_t >", + "name" : "android::key_value_pair_t >", +- "referenced_type" : "type-3621", +- "self_type" : "type-3621", ++ "referenced_type" : "type-3615", ++ "self_type" : "type-3615", + "size" : 16, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-287", "type-384" ], ++ "template_args" : [ "type-287", "type-383" ], + "unique_id" : "_ZTSN7android16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEE" + }, + { +@@ -40641,16 +42053,16 @@ + { + "field_name" : "value", + "field_offset" : 64, +- "referenced_type" : "type-2155" ++ "referenced_type" : "type-2151" + } + ], + "linker_set_key" : "android::key_value_pair_t", + "name" : "android::key_value_pair_t", +- "referenced_type" : "type-2196", +- "self_type" : "type-2196", ++ "referenced_type" : "type-2192", ++ "self_type" : "type-2192", + "size" : 32, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-78", "type-2155" ], ++ "template_args" : [ "type-78", "type-2151" ], + "unique_id" : "_ZTSN7android16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { +@@ -40660,17 +42072,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-454" ++ "referenced_type" : "type-452" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-453", +- "self_type" : "type-453", ++ "referenced_type" : "type-451", ++ "self_type" : "type-451", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-455" ], ++ "template_args" : [ "type-453" ], + "unique_id" : "_ZTSN7android2spINS_6ThreadEEE" + }, + { +@@ -40686,11 +42098,11 @@ + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-426", +- "self_type" : "type-426", ++ "referenced_type" : "type-425", ++ "self_type" : "type-425", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-427" ], ++ "template_args" : [ "type-426" ], + "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE" + }, + { +@@ -40700,17 +42112,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-2282" ++ "referenced_type" : "type-2278" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-2281", +- "self_type" : "type-2281", ++ "referenced_type" : "type-2277", ++ "self_type" : "type-2277", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-2284" ], ++ "template_args" : [ "type-2280" ], + "unique_id" : "_ZTSN7android2spINS_8hardware18BufferedTextOutput11BufferStateEEE" + }, + { +@@ -40740,17 +42152,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-901" ++ "referenced_type" : "type-899" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-921", +- "self_type" : "type-921", ++ "referenced_type" : "type-919", ++ "self_type" : "type-919", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-922" ], ++ "template_args" : [ "type-920" ], + "unique_id" : "_ZTSN7android2spINS_8hardware7IBinder14DeathRecipientEEE" + }, + { +@@ -40760,17 +42172,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-385" ++ "referenced_type" : "type-384" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-384", +- "self_type" : "type-384", ++ "referenced_type" : "type-383", ++ "self_type" : "type-383", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-387" ], ++ "template_args" : [ "type-386" ], + "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE" + }, + { +@@ -40780,17 +42192,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-928" ++ "referenced_type" : "type-925" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-927", +- "self_type" : "type-927", ++ "referenced_type" : "type-924", ++ "self_type" : "type-924", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-930" ], ++ "template_args" : [ "type-927" ], + "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE" + }, + { +@@ -40800,17 +42212,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-720" ++ "referenced_type" : "type-718" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-719", +- "self_type" : "type-719", ++ "referenced_type" : "type-717", ++ "self_type" : "type-717", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-722" ], ++ "template_args" : [ "type-720" ], + "unique_id" : "_ZTSN7android2spINS_8hardware25PassthroughServiceManagerEEE" + }, + { +@@ -40820,17 +42232,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-446" ++ "referenced_type" : "type-445" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-445", +- "self_type" : "type-445", ++ "referenced_type" : "type-444", ++ "self_type" : "type-444", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-448" ], ++ "template_args" : [ "type-447" ], + "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE" + }, + { +@@ -40840,17 +42252,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-552" ++ "referenced_type" : "type-551" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-556", +- "self_type" : "type-556", ++ "referenced_type" : "type-555", ++ "self_type" : "type-555", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-557" ], ++ "template_args" : [ "type-556" ], + "unique_id" : "_ZTSN7android2spINS_8hardware7details21ClientCounterCallbackEEE" + }, + { +@@ -40860,17 +42272,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-738" ++ "referenced_type" : "type-736" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-743", +- "self_type" : "type-743", ++ "referenced_type" : "type-741", ++ "self_type" : "type-741", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-744" ], ++ "template_args" : [ "type-742" ], + "unique_id" : "_ZTSN7android2spINS_8hardware7details6WaiterEEE" + }, + { +@@ -40886,8 +42298,8 @@ + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-907", +- "self_type" : "type-907", ++ "referenced_type" : "type-905", ++ "self_type" : "type-905", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", + "template_args" : [ "type-306" ], +@@ -40940,17 +42352,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-528" ++ "referenced_type" : "type-527" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-527", +- "self_type" : "type-527", ++ "referenced_type" : "type-526", ++ "self_type" : "type-526", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-505" ], ++ "template_args" : [ "type-504" ], + "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE" + }, + { +@@ -40960,17 +42372,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-544" ++ "referenced_type" : "type-543" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-543", +- "self_type" : "type-543", ++ "referenced_type" : "type-542", ++ "self_type" : "type-542", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-496" ], ++ "template_args" : [ "type-494" ], + "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE" + }, + { +@@ -40980,17 +42392,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-533" ++ "referenced_type" : "type-532" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-532", +- "self_type" : "type-532", ++ "referenced_type" : "type-531", ++ "self_type" : "type-531", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-515" ], ++ "template_args" : [ "type-514" ], + "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE" + }, + { +@@ -41000,17 +42412,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-550" ++ "referenced_type" : "type-548" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-549", +- "self_type" : "type-549", ++ "referenced_type" : "type-547", ++ "self_type" : "type-547", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-499" ], ++ "template_args" : [ "type-498" ], + "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IClientCallbackEEE" + }, + { +@@ -41020,25 +42432,25 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-539" ++ "referenced_type" : "type-537" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-538", +- "self_type" : "type-538", ++ "referenced_type" : "type-536", ++ "self_type" : "type-536", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-518" ], ++ "template_args" : [ "type-517" ], + "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3561", +- "self_type" : "type-3561", ++ "referenced_type" : "type-3555", ++ "self_type" : "type-3555", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-25" ], +@@ -41048,8 +42460,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3560", +- "self_type" : "type-3560", ++ "referenced_type" : "type-3554", ++ "self_type" : "type-3554", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-308" ], +@@ -41059,8 +42471,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3684", +- "self_type" : "type-3684", ++ "referenced_type" : "type-3678", ++ "self_type" : "type-3678", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-287" ], +@@ -41070,96 +42482,96 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3559", +- "self_type" : "type-3559", ++ "referenced_type" : "type-3553", ++ "self_type" : "type-3553", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2143" ], ++ "template_args" : [ "type-2139" ], + "unique_id" : "_ZTSN7android13trait_pointerIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-2274", +- "self_type" : "type-2274", ++ "referenced_type" : "type-2270", ++ "self_type" : "type-2270", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2186" ], ++ "template_args" : [ "type-2182" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-2273", +- "self_type" : "type-2273", ++ "referenced_type" : "type-2269", ++ "self_type" : "type-2269", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2155" ], ++ "template_args" : [ "type-2151" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3682", +- "self_type" : "type-3682", ++ "referenced_type" : "type-3676", ++ "self_type" : "type-3676", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2228" ], ++ "template_args" : [ "type-2224" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer > >", + "name" : "android::trait_pointer > >", +- "referenced_type" : "type-3683", +- "self_type" : "type-3683", ++ "referenced_type" : "type-3677", ++ "self_type" : "type-3677", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3621" ], ++ "template_args" : [ "type-3615" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer >", + "name" : "android::trait_pointer >", +- "referenced_type" : "type-2271", +- "self_type" : "type-2271", ++ "referenced_type" : "type-2267", ++ "self_type" : "type-2267", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2196" ], ++ "template_args" : [ "type-2192" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer >", + "name" : "android::trait_pointer >", +- "referenced_type" : "type-2341", +- "self_type" : "type-2341", ++ "referenced_type" : "type-2336", ++ "self_type" : "type-2336", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2281" ], ++ "template_args" : [ "type-2277" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer >", + "name" : "android::trait_pointer >", +- "referenced_type" : "type-3685", +- "self_type" : "type-3685", ++ "referenced_type" : "type-3679", ++ "self_type" : "type-3679", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-384" ], ++ "template_args" : [ "type-383" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware7IBinderEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-2272", +- "self_type" : "type-2272", ++ "referenced_type" : "type-2268", ++ "self_type" : "type-2268", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-78" ], +@@ -41169,8 +42581,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3710", +- "self_type" : "type-3710", ++ "referenced_type" : "type-3704", ++ "self_type" : "type-3704", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-14" ], +@@ -41180,8 +42592,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-3554", +- "self_type" : "type-3554", ++ "referenced_type" : "type-3548", ++ "self_type" : "type-3548", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-25" ], +@@ -41191,8 +42603,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-3553", +- "self_type" : "type-3553", ++ "referenced_type" : "type-3547", ++ "self_type" : "type-3547", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-308" ], +@@ -41202,8 +42614,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-3676", +- "self_type" : "type-3676", ++ "referenced_type" : "type-3670", ++ "self_type" : "type-3670", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-287" ], +@@ -41213,88 +42625,88 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-3550", +- "self_type" : "type-3550", ++ "referenced_type" : "type-3544", ++ "self_type" : "type-3544", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2143" ], ++ "template_args" : [ "type-2139" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-2266", +- "self_type" : "type-2266", ++ "referenced_type" : "type-2262", ++ "self_type" : "type-2262", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2186" ], ++ "template_args" : [ "type-2182" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-2264", +- "self_type" : "type-2264", ++ "referenced_type" : "type-2260", ++ "self_type" : "type-2260", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2155" ], ++ "template_args" : [ "type-2151" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-3675", +- "self_type" : "type-3675", ++ "referenced_type" : "type-3669", ++ "self_type" : "type-3669", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2228" ], ++ "template_args" : [ "type-2224" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy > >", + "name" : "android::trait_trivial_copy > >", +- "referenced_type" : "type-3678", +- "self_type" : "type-3678", ++ "referenced_type" : "type-3672", ++ "self_type" : "type-3672", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3621" ], ++ "template_args" : [ "type-3615" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy >", + "name" : "android::trait_trivial_copy >", +- "referenced_type" : "type-2265", +- "self_type" : "type-2265", ++ "referenced_type" : "type-2261", ++ "self_type" : "type-2261", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2196" ], ++ "template_args" : [ "type-2192" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy >", + "name" : "android::trait_trivial_copy >", +- "referenced_type" : "type-2338", +- "self_type" : "type-2338", ++ "referenced_type" : "type-2334", ++ "self_type" : "type-2334", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2281" ], ++ "template_args" : [ "type-2277" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy >", + "name" : "android::trait_trivial_copy >", +- "referenced_type" : "type-3677", +- "self_type" : "type-3677", ++ "referenced_type" : "type-3671", ++ "self_type" : "type-3671", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-384" ], ++ "template_args" : [ "type-383" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware7IBinderEEEEE" + }, + { +@@ -41323,8 +42735,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-2263", +- "self_type" : "type-2263", ++ "referenced_type" : "type-2259", ++ "self_type" : "type-2259", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-78" ], +@@ -41334,8 +42746,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-467", +- "self_type" : "type-467", ++ "referenced_type" : "type-466", ++ "self_type" : "type-466", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-6" ], +@@ -41345,8 +42757,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-458", +- "self_type" : "type-458", ++ "referenced_type" : "type-457", ++ "self_type" : "type-457", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-238" ], +@@ -41426,7 +42838,7 @@ + "self_type" : "type-412", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-389" ], ++ "template_args" : [ "type-388" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE" + }, + { +@@ -41466,8 +42878,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-3496", +- "self_type" : "type-3496", ++ "referenced_type" : "type-3490", ++ "self_type" : "type-3490", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-25" ], +@@ -41477,8 +42889,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-3483", +- "self_type" : "type-3483", ++ "referenced_type" : "type-3477", ++ "self_type" : "type-3477", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-308" ], +@@ -41488,8 +42900,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-3667", +- "self_type" : "type-3667", ++ "referenced_type" : "type-3661", ++ "self_type" : "type-3661", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-287" ], +@@ -41499,88 +42911,88 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-3471", +- "self_type" : "type-3471", ++ "referenced_type" : "type-3465", ++ "self_type" : "type-3465", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2143" ], ++ "template_args" : [ "type-2139" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-2258", +- "self_type" : "type-2258", ++ "referenced_type" : "type-2254", ++ "self_type" : "type-2254", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2186" ], ++ "template_args" : [ "type-2182" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-2257", +- "self_type" : "type-2257", ++ "referenced_type" : "type-2253", ++ "self_type" : "type-2253", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2155" ], ++ "template_args" : [ "type-2151" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-3665", +- "self_type" : "type-3665", ++ "referenced_type" : "type-3659", ++ "self_type" : "type-3659", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2228" ], ++ "template_args" : [ "type-2224" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor > >", + "name" : "android::trait_trivial_ctor > >", +- "referenced_type" : "type-3666", +- "self_type" : "type-3666", ++ "referenced_type" : "type-3660", ++ "self_type" : "type-3660", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3621" ], ++ "template_args" : [ "type-3615" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor >", + "name" : "android::trait_trivial_ctor >", +- "referenced_type" : "type-2255", +- "self_type" : "type-2255", ++ "referenced_type" : "type-2251", ++ "self_type" : "type-2251", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2196" ], ++ "template_args" : [ "type-2192" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor >", + "name" : "android::trait_trivial_ctor >", +- "referenced_type" : "type-2280", +- "self_type" : "type-2280", ++ "referenced_type" : "type-2276", ++ "self_type" : "type-2276", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2281" ], ++ "template_args" : [ "type-2277" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor >", + "name" : "android::trait_trivial_ctor >", +- "referenced_type" : "type-3670", +- "self_type" : "type-3670", ++ "referenced_type" : "type-3662", ++ "self_type" : "type-3662", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-384" ], ++ "template_args" : [ "type-383" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware7IBinderEEEEE" + }, + { +@@ -41609,8 +43021,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-2256", +- "self_type" : "type-2256", ++ "referenced_type" : "type-2252", ++ "self_type" : "type-2252", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-78" ], +@@ -41620,8 +43032,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-462", +- "self_type" : "type-462", ++ "referenced_type" : "type-461", ++ "self_type" : "type-461", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-6" ], +@@ -41708,11 +43120,11 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-388", +- "self_type" : "type-388", ++ "referenced_type" : "type-387", ++ "self_type" : "type-387", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-389" ], ++ "template_args" : [ "type-388" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE" + }, + { +@@ -41752,8 +43164,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-3549", +- "self_type" : "type-3549", ++ "referenced_type" : "type-3543", ++ "self_type" : "type-3543", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-25" ], +@@ -41763,8 +43175,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-3539", +- "self_type" : "type-3539", ++ "referenced_type" : "type-3533", ++ "self_type" : "type-3533", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-308" ], +@@ -41774,8 +43186,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-3672", +- "self_type" : "type-3672", ++ "referenced_type" : "type-3666", ++ "self_type" : "type-3666", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-287" ], +@@ -41785,88 +43197,88 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-3527", +- "self_type" : "type-3527", ++ "referenced_type" : "type-3521", ++ "self_type" : "type-3521", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2143" ], ++ "template_args" : [ "type-2139" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-2262", +- "self_type" : "type-2262", ++ "referenced_type" : "type-2258", ++ "self_type" : "type-2258", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2186" ], ++ "template_args" : [ "type-2182" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-2260", +- "self_type" : "type-2260", ++ "referenced_type" : "type-2256", ++ "self_type" : "type-2256", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2155" ], ++ "template_args" : [ "type-2151" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-3671", +- "self_type" : "type-3671", ++ "referenced_type" : "type-3663", ++ "self_type" : "type-3663", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2228" ], ++ "template_args" : [ "type-2224" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor > >", + "name" : "android::trait_trivial_dtor > >", +- "referenced_type" : "type-3674", +- "self_type" : "type-3674", ++ "referenced_type" : "type-3668", ++ "self_type" : "type-3668", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3621" ], ++ "template_args" : [ "type-3615" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor >", + "name" : "android::trait_trivial_dtor >", +- "referenced_type" : "type-2261", +- "self_type" : "type-2261", ++ "referenced_type" : "type-2257", ++ "self_type" : "type-2257", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2196" ], ++ "template_args" : [ "type-2192" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor >", + "name" : "android::trait_trivial_dtor >", +- "referenced_type" : "type-2337", +- "self_type" : "type-2337", ++ "referenced_type" : "type-2333", ++ "self_type" : "type-2333", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2281" ], ++ "template_args" : [ "type-2277" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor >", + "name" : "android::trait_trivial_dtor >", +- "referenced_type" : "type-3673", +- "self_type" : "type-3673", ++ "referenced_type" : "type-3667", ++ "self_type" : "type-3667", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-384" ], ++ "template_args" : [ "type-383" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware7IBinderEEEEE" + }, + { +@@ -41895,8 +43307,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-2259", +- "self_type" : "type-2259", ++ "referenced_type" : "type-2255", ++ "self_type" : "type-2255", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-78" ], +@@ -41906,8 +43318,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-463", +- "self_type" : "type-463", ++ "referenced_type" : "type-462", ++ "self_type" : "type-462", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-6" ], +@@ -41917,8 +43329,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-452", +- "self_type" : "type-452", ++ "referenced_type" : "type-455", ++ "self_type" : "type-455", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-238" ], +@@ -41994,11 +43406,11 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-402", +- "self_type" : "type-402", ++ "referenced_type" : "type-401", ++ "self_type" : "type-401", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-389" ], ++ "template_args" : [ "type-388" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE" + }, + { +@@ -42038,8 +43450,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-3558", +- "self_type" : "type-3558", ++ "referenced_type" : "type-3552", ++ "self_type" : "type-3552", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-25" ], +@@ -42049,8 +43461,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-3557", +- "self_type" : "type-3557", ++ "referenced_type" : "type-3550", ++ "self_type" : "type-3550", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-308" ], +@@ -42082,88 +43494,88 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-3556", +- "self_type" : "type-3556", ++ "referenced_type" : "type-3549", ++ "self_type" : "type-3549", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2143" ], ++ "template_args" : [ "type-2139" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-2270", +- "self_type" : "type-2270", ++ "referenced_type" : "type-2266", ++ "self_type" : "type-2266", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2186" ], ++ "template_args" : [ "type-2182" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-2268", +- "self_type" : "type-2268", ++ "referenced_type" : "type-2264", ++ "self_type" : "type-2264", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2155" ], ++ "template_args" : [ "type-2151" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-3679", +- "self_type" : "type-3679", ++ "referenced_type" : "type-3673", ++ "self_type" : "type-3673", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2228" ], ++ "template_args" : [ "type-2224" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move > >", + "name" : "android::trait_trivial_move > >", +- "referenced_type" : "type-3681", +- "self_type" : "type-3681", ++ "referenced_type" : "type-3675", ++ "self_type" : "type-3675", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3621" ], ++ "template_args" : [ "type-3615" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move >", + "name" : "android::trait_trivial_move >", +- "referenced_type" : "type-2269", +- "self_type" : "type-2269", ++ "referenced_type" : "type-2265", ++ "self_type" : "type-2265", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2196" ], ++ "template_args" : [ "type-2192" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move >", + "name" : "android::trait_trivial_move >", +- "referenced_type" : "type-2339", +- "self_type" : "type-2339", ++ "referenced_type" : "type-2335", ++ "self_type" : "type-2335", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2281" ], ++ "template_args" : [ "type-2277" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move >", + "name" : "android::trait_trivial_move >", +- "referenced_type" : "type-3680", +- "self_type" : "type-3680", ++ "referenced_type" : "type-3674", ++ "self_type" : "type-3674", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-384" ], ++ "template_args" : [ "type-383" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware7IBinderEEEEE" + }, + { +@@ -42192,8 +43604,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-2267", +- "self_type" : "type-2267", ++ "referenced_type" : "type-2263", ++ "self_type" : "type-2263", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-78" ], +@@ -42203,8 +43615,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-469", +- "self_type" : "type-469", ++ "referenced_type" : "type-468", ++ "self_type" : "type-468", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-6" ], +@@ -42214,8 +43626,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-459", +- "self_type" : "type-459", ++ "referenced_type" : "type-458", ++ "self_type" : "type-458", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-238" ], +@@ -42236,8 +43648,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-375", +- "self_type" : "type-375", ++ "referenced_type" : "type-374", ++ "self_type" : "type-374", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-336" ], +@@ -42295,7 +43707,7 @@ + "self_type" : "type-421", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-389" ], ++ "template_args" : [ "type-388" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE" + }, + { +@@ -42335,8 +43747,8 @@ + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3564", +- "self_type" : "type-3564", ++ "referenced_type" : "type-3558", ++ "self_type" : "type-3558", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-25" ], +@@ -42346,8 +43758,8 @@ + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3563", +- "self_type" : "type-3563", ++ "referenced_type" : "type-3557", ++ "self_type" : "type-3557", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-308" ], +@@ -42357,8 +43769,8 @@ + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3688", +- "self_type" : "type-3688", ++ "referenced_type" : "type-3682", ++ "self_type" : "type-3682", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-287" ], +@@ -42368,96 +43780,96 @@ + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3562", +- "self_type" : "type-3562", ++ "referenced_type" : "type-3556", ++ "self_type" : "type-3556", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2143" ], ++ "template_args" : [ "type-2139" ], + "unique_id" : "_ZTSN7android6traitsIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-2278", +- "self_type" : "type-2278", ++ "referenced_type" : "type-2274", ++ "self_type" : "type-2274", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2186" ], ++ "template_args" : [ "type-2182" ], + "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-2277", +- "self_type" : "type-2277", ++ "referenced_type" : "type-2273", ++ "self_type" : "type-2273", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2155" ], ++ "template_args" : [ "type-2151" ], + "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3686", +- "self_type" : "type-3686", ++ "referenced_type" : "type-3680", ++ "self_type" : "type-3680", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2228" ], ++ "template_args" : [ "type-2224" ], + "unique_id" : "_ZTSN7android6traitsINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits > >", + "name" : "android::traits > >", +- "referenced_type" : "type-3687", +- "self_type" : "type-3687", ++ "referenced_type" : "type-3681", ++ "self_type" : "type-3681", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3621" ], ++ "template_args" : [ "type-3615" ], + "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits >", + "name" : "android::traits >", +- "referenced_type" : "type-2275", +- "self_type" : "type-2275", ++ "referenced_type" : "type-2271", ++ "self_type" : "type-2271", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2196" ], ++ "template_args" : [ "type-2192" ], + "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits >", + "name" : "android::traits >", +- "referenced_type" : "type-2342", +- "self_type" : "type-2342", ++ "referenced_type" : "type-2337", ++ "self_type" : "type-2337", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2281" ], ++ "template_args" : [ "type-2277" ], + "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits >", + "name" : "android::traits >", +- "referenced_type" : "type-3689", +- "self_type" : "type-3689", ++ "referenced_type" : "type-3683", ++ "self_type" : "type-3683", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-384" ], ++ "template_args" : [ "type-383" ], + "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware7IBinderEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-2276", +- "self_type" : "type-2276", ++ "referenced_type" : "type-2272", ++ "self_type" : "type-2272", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-78" ], +@@ -42467,8 +43879,8 @@ + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3711", +- "self_type" : "type-3711", ++ "referenced_type" : "type-3705", ++ "self_type" : "type-3705", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-14" ], +@@ -42479,13 +43891,13 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3427" ++ "referenced_type" : "type-3421" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-3426", +- "self_type" : "type-3426", ++ "referenced_type" : "type-3420", ++ "self_type" : "type-3420", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-25" ], +@@ -42496,13 +43908,13 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3425" ++ "referenced_type" : "type-3419" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-3424", +- "self_type" : "type-3424", ++ "referenced_type" : "type-3418", ++ "self_type" : "type-3418", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-308" ], +@@ -42513,16 +43925,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3423" ++ "referenced_type" : "type-3417" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-3422", +- "self_type" : "type-3422", ++ "referenced_type" : "type-3416", ++ "self_type" : "type-3416", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2143" ], ++ "template_args" : [ "type-2139" ], + "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_8hardware9BHwBinderEEE" + }, + { +@@ -42530,16 +43942,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2208" ++ "referenced_type" : "type-2204" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-2207", +- "self_type" : "type-2207", ++ "referenced_type" : "type-2203", ++ "self_type" : "type-2203", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2186" ], ++ "template_args" : [ "type-2182" ], + "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { +@@ -42547,16 +43959,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3629" ++ "referenced_type" : "type-3623" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-3628", +- "self_type" : "type-3628", ++ "referenced_type" : "type-3622", ++ "self_type" : "type-3622", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2228" ], ++ "template_args" : [ "type-2224" ], + "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware12ProcessState12handle_entryEEE" + }, + { +@@ -42564,16 +43976,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3631" ++ "referenced_type" : "type-3625" + } + ], + "linker_set_key" : "android::use_trivial_move > >", + "name" : "android::use_trivial_move > >", +- "referenced_type" : "type-3630", +- "self_type" : "type-3630", ++ "referenced_type" : "type-3624", ++ "self_type" : "type-3624", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3621" ], ++ "template_args" : [ "type-3615" ], + "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { +@@ -42581,16 +43993,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2206" ++ "referenced_type" : "type-2202" + } + ], + "linker_set_key" : "android::use_trivial_move >", + "name" : "android::use_trivial_move >", +- "referenced_type" : "type-2205", +- "self_type" : "type-2205", ++ "referenced_type" : "type-2201", ++ "self_type" : "type-2201", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2196" ], ++ "template_args" : [ "type-2192" ], + "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { +@@ -42598,16 +44010,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2344" ++ "referenced_type" : "type-2340" + } + ], + "linker_set_key" : "android::use_trivial_move >", + "name" : "android::use_trivial_move >", +- "referenced_type" : "type-2343", +- "self_type" : "type-2343", ++ "referenced_type" : "type-2339", ++ "self_type" : "type-2339", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2281" ], ++ "template_args" : [ "type-2277" ], + "unique_id" : "_ZTSN7android16use_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { +@@ -42615,13 +44027,13 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3693" ++ "referenced_type" : "type-3687" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-3692", +- "self_type" : "type-3692", ++ "referenced_type" : "type-3686", ++ "self_type" : "type-3686", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-14" ], +@@ -42660,7 +44072,7 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-901" ++ "referenced_type" : "type-899" + }, + { + "access" : "private", +@@ -42672,11 +44084,11 @@ + "linker_set_key" : "android::wp", + "name" : "android::wp", + "record_kind" : "class", +- "referenced_type" : "type-900", +- "self_type" : "type-900", ++ "referenced_type" : "type-898", ++ "self_type" : "type-898", + "size" : 16, + "source_file" : "/system/core/libutils/include/utils/RefBase.h", +- "template_args" : [ "type-904" ], ++ "template_args" : [ "type-902" ], + "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinder14DeathRecipientEEE" + }, + { +@@ -42686,7 +44098,7 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2136" + }, + { + "access" : "private", +@@ -42698,11 +44110,11 @@ + "linker_set_key" : "android::wp", + "name" : "android::wp", + "record_kind" : "class", +- "referenced_type" : "type-2194", +- "self_type" : "type-2194", ++ "referenced_type" : "type-2190", ++ "self_type" : "type-2190", + "size" : 16, + "source_file" : "/system/core/libutils/include/utils/RefBase.h", +- "template_args" : [ "type-2139" ], ++ "template_args" : [ "type-2135" ], + "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinderEEE" + }, + { +@@ -43319,7 +44731,7 @@ + [ + { + "field_name" : "lock", +- "referenced_type" : "type-2323" ++ "referenced_type" : "type-2319" + }, + { + "field_name" : "has_tls", +@@ -43334,8 +44746,8 @@ + ], + "linker_set_key" : "thread_store_t", + "name" : "thread_store_t", +- "referenced_type" : "type-2322", +- "self_type" : "type-2322", ++ "referenced_type" : "type-2318", ++ "self_type" : "type-2318", + "size" : 48, + "source_file" : "/system/core/libcutils/include/cutils/threads.h", + "unique_id" : "thread_store_t" +@@ -43347,8 +44759,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Return &&", + "name" : "android::hardware::Return &&", +- "referenced_type" : "type-764", +- "self_type" : "type-766", ++ "referenced_type" : "type-762", ++ "self_type" : "type-764", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -43356,8 +44768,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-757", +- "self_type" : "type-759", ++ "referenced_type" : "type-755", ++ "self_type" : "type-757", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -43365,8 +44777,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-944", +- "self_type" : "type-946", ++ "referenced_type" : "type-942", ++ "self_type" : "type-944", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -43374,8 +44786,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-1053", +- "self_type" : "type-1055", ++ "referenced_type" : "type-1051", ++ "self_type" : "type-1053", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -43383,8 +44795,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-1110", +- "self_type" : "type-1112", ++ "referenced_type" : "type-1108", ++ "self_type" : "type-1110", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -43392,8 +44804,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-1945", +- "self_type" : "type-1947", ++ "referenced_type" : "type-1941", ++ "self_type" : "type-1943", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -43401,8 +44813,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-2015", +- "self_type" : "type-2017", ++ "referenced_type" : "type-2011", ++ "self_type" : "type-2013", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -43437,8 +44849,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::details::SchedPrio &&", + "name" : "android::hardware::details::SchedPrio &&", +- "referenced_type" : "type-368", +- "self_type" : "type-668", ++ "referenced_type" : "type-367", ++ "self_type" : "type-666", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43491,8 +44903,8 @@ + "alignment" : 8, + "linker_set_key" : "android::hardware::hidl_vec &&", + "name" : "android::hardware::hidl_vec &&", +- "referenced_type" : "type-473", +- "self_type" : "type-784", ++ "referenced_type" : "type-472", ++ "self_type" : "type-782", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -43500,8 +44912,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-426", +- "self_type" : "type-438", ++ "referenced_type" : "type-425", ++ "self_type" : "type-437", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -43518,8 +44930,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-921", +- "self_type" : "type-2234", ++ "referenced_type" : "type-919", ++ "self_type" : "type-2230", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -43527,8 +44939,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-384", +- "self_type" : "type-437", ++ "referenced_type" : "type-383", ++ "self_type" : "type-436", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -43536,8 +44948,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-907", +- "self_type" : "type-941", ++ "referenced_type" : "type-905", ++ "self_type" : "type-939", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -43546,7 +44958,7 @@ + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", + "referenced_type" : "type-81", +- "self_type" : "type-430", ++ "self_type" : "type-429", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -43555,7 +44967,7 @@ + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", + "referenced_type" : "type-300", +- "self_type" : "type-524", ++ "self_type" : "type-523", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -43563,8 +44975,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-527", +- "self_type" : "type-934", ++ "referenced_type" : "type-526", ++ "self_type" : "type-931", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -43572,8 +44984,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-543", +- "self_type" : "type-939", ++ "referenced_type" : "type-542", ++ "self_type" : "type-937", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -43581,8 +44993,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-532", +- "self_type" : "type-716", ++ "referenced_type" : "type-531", ++ "self_type" : "type-714", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -43590,8 +45002,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-549", +- "self_type" : "type-1942", ++ "referenced_type" : "type-547", ++ "self_type" : "type-1938", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -43599,8 +45011,8 @@ + "alignment" : 8, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-538", +- "self_type" : "type-867", ++ "referenced_type" : "type-536", ++ "self_type" : "type-865", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -43609,25 +45021,7 @@ + "linker_set_key" : "android::wp &&", + "name" : "android::wp &&", + "referenced_type" : "type-331", +- "self_type" : "type-342", +- "size" : 8, +- "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" +- }, +- { +- "alignment" : 8, +- "linker_set_key" : "android::wp &&", +- "name" : "android::wp &&", +- "referenced_type" : "type-309", +- "self_type" : "type-667", +- "size" : 8, +- "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" +- }, +- { +- "alignment" : 8, +- "linker_set_key" : "const android::hidl::base::V1_0::IBase *&&", +- "name" : "const android::hidl::base::V1_0::IBase *&&", +- "referenced_type" : "type-329", +- "self_type" : "type-341", ++ "self_type" : "type-343", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43635,8 +45029,8 @@ + "alignment" : 8, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1017", +- "self_type" : "type-1016", ++ "referenced_type" : "type-1015", ++ "self_type" : "type-1014", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43644,8 +45038,8 @@ + "alignment" : 8, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1075", +- "self_type" : "type-1074", ++ "referenced_type" : "type-1073", ++ "self_type" : "type-1072", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43653,8 +45047,8 @@ + "alignment" : 8, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1133", +- "self_type" : "type-1132", ++ "referenced_type" : "type-1131", ++ "self_type" : "type-1130", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43662,8 +45056,8 @@ + "alignment" : 8, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1798", +- "self_type" : "type-1797", ++ "referenced_type" : "type-1794", ++ "self_type" : "type-1793", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43671,8 +45065,8 @@ + "alignment" : 8, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1853", +- "self_type" : "type-1852", ++ "referenced_type" : "type-1849", ++ "self_type" : "type-1848", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43680,8 +45074,8 @@ + "alignment" : 8, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1909", +- "self_type" : "type-1908", ++ "referenced_type" : "type-1905", ++ "self_type" : "type-1904", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43689,8 +45083,8 @@ + "alignment" : 8, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1971", +- "self_type" : "type-1970", ++ "referenced_type" : "type-1967", ++ "self_type" : "type-1966", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43698,8 +45092,8 @@ + "alignment" : 8, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-2046", +- "self_type" : "type-2045", ++ "referenced_type" : "type-2042", ++ "self_type" : "type-2041", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43707,8 +45101,8 @@ + "alignment" : 8, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-2099", +- "self_type" : "type-2098", ++ "referenced_type" : "type-2095", ++ "self_type" : "type-2094", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43716,8 +45110,8 @@ + "alignment" : 8, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-2939", +- "self_type" : "type-2938", ++ "referenced_type" : "type-2933", ++ "self_type" : "type-2932", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43725,8 +45119,8 @@ + "alignment" : 8, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-2994", +- "self_type" : "type-2993", ++ "referenced_type" : "type-2988", ++ "self_type" : "type-2987", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43734,8 +45128,8 @@ + "alignment" : 8, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-3050", +- "self_type" : "type-3049", ++ "referenced_type" : "type-3044", ++ "self_type" : "type-3043", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43743,8 +45137,8 @@ + "alignment" : 8, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-3110", +- "self_type" : "type-3109", ++ "referenced_type" : "type-3104", ++ "self_type" : "type-3103", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43752,8 +45146,8 @@ + "alignment" : 8, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-3183", +- "self_type" : "type-3182", ++ "referenced_type" : "type-3177", ++ "self_type" : "type-3176", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43761,8 +45155,8 @@ + "alignment" : 8, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-3233", +- "self_type" : "type-3232", ++ "referenced_type" : "type-3227", ++ "self_type" : "type-3226", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43770,8 +45164,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1022", +- "self_type" : "type-1021", ++ "referenced_type" : "type-1019", ++ "self_type" : "type-1018", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43779,8 +45173,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1079", +- "self_type" : "type-1078", ++ "referenced_type" : "type-1077", ++ "self_type" : "type-1076", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43788,8 +45182,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1137", +- "self_type" : "type-1136", ++ "referenced_type" : "type-1135", ++ "self_type" : "type-1134", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43797,8 +45191,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1803", +- "self_type" : "type-1802", ++ "referenced_type" : "type-1798", ++ "self_type" : "type-1797", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43806,8 +45200,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1857", +- "self_type" : "type-1856", ++ "referenced_type" : "type-1853", ++ "self_type" : "type-1852", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43815,8 +45209,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1913", +- "self_type" : "type-1912", ++ "referenced_type" : "type-1909", ++ "self_type" : "type-1908", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43824,8 +45218,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1976", +- "self_type" : "type-1975", ++ "referenced_type" : "type-1972", ++ "self_type" : "type-1971", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43833,8 +45227,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2050", +- "self_type" : "type-2049", ++ "referenced_type" : "type-2046", ++ "self_type" : "type-2045", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43842,8 +45236,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2103", +- "self_type" : "type-2102", ++ "referenced_type" : "type-2099", ++ "self_type" : "type-2098", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43851,8 +45245,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2944", +- "self_type" : "type-2943", ++ "referenced_type" : "type-2937", ++ "self_type" : "type-2936", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43860,8 +45254,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2998", +- "self_type" : "type-2997", ++ "referenced_type" : "type-2992", ++ "self_type" : "type-2991", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43869,8 +45263,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3054", +- "self_type" : "type-3053", ++ "referenced_type" : "type-3048", ++ "self_type" : "type-3047", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43878,8 +45272,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3115", +- "self_type" : "type-3114", ++ "referenced_type" : "type-3109", ++ "self_type" : "type-3108", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43887,8 +45281,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3187", +- "self_type" : "type-3186", ++ "referenced_type" : "type-3181", ++ "self_type" : "type-3180", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43896,8 +45290,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3237", +- "self_type" : "type-3236", ++ "referenced_type" : "type-3231", ++ "self_type" : "type-3230", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43905,8 +45299,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1019", +- "self_type" : "type-1018", ++ "referenced_type" : "type-1017", ++ "self_type" : "type-1016", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43914,8 +45308,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1077", +- "self_type" : "type-1076", ++ "referenced_type" : "type-1075", ++ "self_type" : "type-1074", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43923,8 +45317,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1135", +- "self_type" : "type-1134", ++ "referenced_type" : "type-1133", ++ "self_type" : "type-1132", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43932,8 +45326,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1800", +- "self_type" : "type-1799", ++ "referenced_type" : "type-1796", ++ "self_type" : "type-1795", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43941,8 +45335,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1855", +- "self_type" : "type-1854", ++ "referenced_type" : "type-1851", ++ "self_type" : "type-1850", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43950,8 +45344,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1911", +- "self_type" : "type-1910", ++ "referenced_type" : "type-1907", ++ "self_type" : "type-1906", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43959,8 +45353,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1973", +- "self_type" : "type-1972", ++ "referenced_type" : "type-1969", ++ "self_type" : "type-1968", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43968,8 +45362,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2048", +- "self_type" : "type-2047", ++ "referenced_type" : "type-2044", ++ "self_type" : "type-2043", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43977,8 +45371,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2101", +- "self_type" : "type-2100", ++ "referenced_type" : "type-2097", ++ "self_type" : "type-2096", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43986,8 +45380,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2941", +- "self_type" : "type-2940", ++ "referenced_type" : "type-2935", ++ "self_type" : "type-2934", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -43995,8 +45389,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2996", +- "self_type" : "type-2995", ++ "referenced_type" : "type-2990", ++ "self_type" : "type-2989", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44004,8 +45398,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3052", +- "self_type" : "type-3051", ++ "referenced_type" : "type-3046", ++ "self_type" : "type-3045", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44013,8 +45407,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3112", +- "self_type" : "type-3111", ++ "referenced_type" : "type-3106", ++ "self_type" : "type-3105", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44022,8 +45416,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3185", +- "self_type" : "type-3184", ++ "referenced_type" : "type-3179", ++ "self_type" : "type-3178", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44031,8 +45425,8 @@ + "alignment" : 8, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3235", +- "self_type" : "type-3234", ++ "referenced_type" : "type-3229", ++ "self_type" : "type-3228", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + } +diff --git a/29/64/arm64_armv8-a/source-based/libhwbinder_noltopgo.so.lsdump b/29/64/arm64_armv8-a/source-based/libhwbinder_noltopgo.so.lsdump +index c4eb8e7..5bb725f 100644 +--- a/29/64/arm64_armv8-a/source-based/libhwbinder_noltopgo.so.lsdump ++++ b/29/64/arm64_armv8-a/source-based/libhwbinder_noltopgo.so.lsdump +@@ -887,34 +887,6 @@ + { + "name" : "_ZN7android8hardware6Parcel12restartWriteEm" + }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIdEEiT_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIfEEiT_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIiEEiT_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIjEEiT_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIlEEiT_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedImEEiT_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIyEEiT_" +- }, + { + "name" : "_ZN7android8hardware6Parcel12writeCStringEPKc" + }, +@@ -5194,132 +5166,6 @@ + "return_type" : "type-9", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIdEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-18" +- }, +- { +- "referenced_type" : "type-104" +- } +- ], +- "return_type" : "type-9", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-104" ] +- }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIfEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-18" +- }, +- { +- "referenced_type" : "type-102" +- } +- ], +- "return_type" : "type-9", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-102" ] +- }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIiEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-18" +- }, +- { +- "referenced_type" : "type-9" +- } +- ], +- "return_type" : "type-9", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-9" ] +- }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIjEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-18" +- }, +- { +- "referenced_type" : "type-4" +- } +- ], +- "return_type" : "type-9", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-4" ] +- }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIlEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-18" +- }, +- { +- "referenced_type" : "type-100" +- } +- ], +- "return_type" : "type-9", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-100" ] +- }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedImEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-18" +- }, +- { +- "referenced_type" : "type-7" +- } +- ], +- "return_type" : "type-9", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-7" ] +- }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIyEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-18" +- }, +- { +- "referenced_type" : "type-13" +- } +- ], +- "return_type" : "type-9", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-13" ] +- }, + { + "function_name" : "android::hardware::Parcel::writeCString", + "linker_set_key" : "_ZN7android8hardware6Parcel12writeCStringEPKc", +diff --git a/29/64/arm64_armv8-a/source-based/libprotobuf-cpp-full.so.lsdump b/29/64/arm64_armv8-a/source-based/libprotobuf-cpp-full.so.lsdump +index 9cdaa07..c433fa7 100644 +--- a/29/64/arm64_armv8-a/source-based/libprotobuf-cpp-full.so.lsdump ++++ b/29/64/arm64_armv8-a/source-based/libprotobuf-cpp-full.so.lsdump +@@ -3330,6 +3330,10 @@ + "binding" : "weak", + "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexINSt3__14pairIPKviEEE13FindExtensionERKNS3_12basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEEi" + }, ++ { ++ "binding" : "weak", ++ "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexINSt3__14pairIPKviEEE18ValidateSymbolNameERKNS3_12basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE" ++ }, + { + "binding" : "weak", + "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexINSt3__14pairIPKviEEE19AddNestedExtensionsERKNS0_15DescriptorProtoES7_" +@@ -3358,6 +3362,10 @@ + "binding" : "weak", + "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexIPKNS0_19FileDescriptorProtoEE12AddExtensionERKNS0_20FieldDescriptorProtoES5_" + }, ++ { ++ "binding" : "weak", ++ "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexIPKNS0_19FileDescriptorProtoEE18ValidateSymbolNameERKNSt3__112basic_stringIcNS7_11char_traitsIcEENS7_9allocatorIcEEEE" ++ }, + { + "binding" : "weak", + "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexIPKNS0_19FileDescriptorProtoEE19AddNestedExtensionsERKNS0_15DescriptorProtoES5_" +@@ -28368,6 +28376,23 @@ + "return_type" : "type-4579", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, ++ { ++ "access" : "private", ++ "function_name" : "google::protobuf::SimpleDescriptorDatabase::DescriptorIndex >::ValidateSymbolName", ++ "linker_set_key" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexINSt3__14pairIPKviEEE18ValidateSymbolNameERKNS3_12basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3918" ++ }, ++ { ++ "referenced_type" : "type-3908" ++ } ++ ], ++ "return_type" : "type-17", ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" ++ }, + { + "function_name" : "google::protobuf::SimpleDescriptorDatabase::DescriptorIndex >::AddNestedExtensions", + "linker_set_key" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexINSt3__14pairIPKviEEE19AddNestedExtensionsERKNS0_15DescriptorProtoES7_", +@@ -28500,6 +28525,23 @@ + "return_type" : "type-17", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, ++ { ++ "access" : "private", ++ "function_name" : "google::protobuf::SimpleDescriptorDatabase::DescriptorIndex::ValidateSymbolName", ++ "linker_set_key" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexIPKNS0_19FileDescriptorProtoEE18ValidateSymbolNameERKNSt3__112basic_stringIcNS7_11char_traitsIcEENS7_9allocatorIcEEEE", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3917" ++ }, ++ { ++ "referenced_type" : "type-3908" ++ } ++ ], ++ "return_type" : "type-17", ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" ++ }, + { + "function_name" : "google::protobuf::SimpleDescriptorDatabase::DescriptorIndex::AddNestedExtensions", + "linker_set_key" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexIPKNS0_19FileDescriptorProtoEE19AddNestedExtensionsERKNS0_15DescriptorProtoES5_", +diff --git a/29/64/arm64_armv8-a/source-based/libstagefright_foundation.so.lsdump b/29/64/arm64_armv8-a/source-based/libstagefright_foundation.so.lsdump +index 01d539a..18bc1b3 100644 +--- a/29/64/arm64_armv8-a/source-based/libstagefright_foundation.so.lsdump ++++ b/29/64/arm64_armv8-a/source-based/libstagefright_foundation.so.lsdump +@@ -690,50 +690,10 @@ + { + "name" : "_ZN7android7ABufferD2Ev" + }, +- { +- "binding" : "weak", +- "name" : "_ZN7android7ALookupI19android_dataspace_tS1_EC2ESt16initializer_listINSt3__14pairIS1_S1_EEE" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android7ALookupINS_10ColorUtils10ColorRangeENS_12ColorAspects5RangeEEC2ESt16initializer_listINSt3__14pairIS2_S4_EEE" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android7ALookupINS_10ColorUtils10ColorRangeEjEC2ESt16initializer_listINSt3__14pairIS2_jEEE" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android7ALookupINS_10ColorUtils13ColorStandardENS_12ColorAspects9PrimariesEEC2ESt16initializer_listINSt3__14pairIS2_S4_EEE" +- }, + { + "binding" : "weak", + "name" : "_ZN7android7ALookupINS_10ColorUtils13ColorStandardENSt3__14pairINS_12ColorAspects9PrimariesENS5_12MatrixCoeffsEEEEC2ESt16initializer_listINS4_IS2_S8_EEE" + }, +- { +- "binding" : "weak", +- "name" : "_ZN7android7ALookupINS_10ColorUtils13ColorStandardEjEC2ESt16initializer_listINSt3__14pairIS2_jEEE" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android7ALookupINS_10ColorUtils13ColorTransferENS_12ColorAspects8TransferEEC2ESt16initializer_listINSt3__14pairIS2_S4_EEE" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android7ALookupINS_10ColorUtils13ColorTransferEjEC2ESt16initializer_listINSt3__14pairIS2_jEEE" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android7ALookupIiNS_12ColorAspects12MatrixCoeffsEEC2ESt16initializer_listINSt3__14pairIiS2_EEE" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android7ALookupIiNS_12ColorAspects8TransferEEC2ESt16initializer_listINSt3__14pairIiS2_EEE" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android7ALookupIiNS_12ColorAspects9PrimariesEEC2ESt16initializer_listINSt3__14pairIiS2_EEE" +- }, + { + "name" : "_ZN7android7ALooper13awaitResponseERKNS_2spINS_11AReplyTokenEEEPNS1_INS_8AMessageEEE" + }, +@@ -5863,70 +5823,6 @@ + "return_type" : "type-34", + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ABuffer.h" + }, +- { +- "function_name" : "android::ALookup::ALookup", +- "linker_set_key" : "_ZN7android7ALookupI19android_dataspace_tS1_EC2ESt16initializer_listINSt3__14pairIS1_S1_EEE", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-674" +- }, +- { +- "referenced_type" : "type-1259" +- } +- ], +- "return_type" : "type-34", +- "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" +- }, +- { +- "function_name" : "android::ALookup::ALookup", +- "linker_set_key" : "_ZN7android7ALookupINS_10ColorUtils10ColorRangeENS_12ColorAspects5RangeEEC2ESt16initializer_listINSt3__14pairIS2_S4_EEE", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-595" +- }, +- { +- "referenced_type" : "type-1261" +- } +- ], +- "return_type" : "type-34", +- "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" +- }, +- { +- "function_name" : "android::ALookup::ALookup", +- "linker_set_key" : "_ZN7android7ALookupINS_10ColorUtils10ColorRangeEjEC2ESt16initializer_listINSt3__14pairIS2_jEEE", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-693" +- }, +- { +- "referenced_type" : "type-1263" +- } +- ], +- "return_type" : "type-34", +- "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" +- }, +- { +- "function_name" : "android::ALookup::ALookup", +- "linker_set_key" : "_ZN7android7ALookupINS_10ColorUtils13ColorStandardENS_12ColorAspects9PrimariesEEC2ESt16initializer_listINSt3__14pairIS2_S4_EEE", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-668" +- }, +- { +- "referenced_type" : "type-1265" +- } +- ], +- "return_type" : "type-34", +- "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" +- }, + { + "function_name" : "android::ALookup >::ALookup", + "linker_set_key" : "_ZN7android7ALookupINS_10ColorUtils13ColorStandardENSt3__14pairINS_12ColorAspects9PrimariesENS5_12MatrixCoeffsEEEEC2ESt16initializer_listINS4_IS2_S8_EEE", +@@ -5943,102 +5839,6 @@ + "return_type" : "type-34", + "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" + }, +- { +- "function_name" : "android::ALookup::ALookup", +- "linker_set_key" : "_ZN7android7ALookupINS_10ColorUtils13ColorStandardEjEC2ESt16initializer_listINSt3__14pairIS2_jEEE", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-682" +- }, +- { +- "referenced_type" : "type-1269" +- } +- ], +- "return_type" : "type-34", +- "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" +- }, +- { +- "function_name" : "android::ALookup::ALookup", +- "linker_set_key" : "_ZN7android7ALookupINS_10ColorUtils13ColorTransferENS_12ColorAspects8TransferEEC2ESt16initializer_listINSt3__14pairIS2_S4_EEE", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-628" +- }, +- { +- "referenced_type" : "type-1271" +- } +- ], +- "return_type" : "type-34", +- "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" +- }, +- { +- "function_name" : "android::ALookup::ALookup", +- "linker_set_key" : "_ZN7android7ALookupINS_10ColorUtils13ColorTransferEjEC2ESt16initializer_listINSt3__14pairIS2_jEEE", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-688" +- }, +- { +- "referenced_type" : "type-1273" +- } +- ], +- "return_type" : "type-34", +- "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" +- }, +- { +- "function_name" : "android::ALookup::ALookup", +- "linker_set_key" : "_ZN7android7ALookupIiNS_12ColorAspects12MatrixCoeffsEEC2ESt16initializer_listINSt3__14pairIiS2_EEE", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-657" +- }, +- { +- "referenced_type" : "type-1275" +- } +- ], +- "return_type" : "type-34", +- "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" +- }, +- { +- "function_name" : "android::ALookup::ALookup", +- "linker_set_key" : "_ZN7android7ALookupIiNS_12ColorAspects8TransferEEC2ESt16initializer_listINSt3__14pairIiS2_EEE", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-650" +- }, +- { +- "referenced_type" : "type-1277" +- } +- ], +- "return_type" : "type-34", +- "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" +- }, +- { +- "function_name" : "android::ALookup::ALookup", +- "linker_set_key" : "_ZN7android7ALookupIiNS_12ColorAspects9PrimariesEEC2ESt16initializer_listINSt3__14pairIiS2_EEE", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-641" +- }, +- { +- "referenced_type" : "type-1279" +- } +- ], +- "return_type" : "type-34", +- "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALookup.h" +- }, + { + "access" : "private", + "function_name" : "android::ALooper::awaitResponse", +diff --git a/29/64/arm_armv7-a-neon/source-based/libhidlbase.so.lsdump b/29/64/arm_armv7-a-neon/source-based/libhidlbase.so.lsdump +index 12aeee8..3577746 100644 +--- a/29/64/arm_armv7-a-neon/source-based/libhidlbase.so.lsdump ++++ b/29/64/arm_armv7-a-neon/source-based/libhidlbase.so.lsdump +@@ -5,16 +5,16 @@ + "alignment" : 1, + "linker_set_key" : "char [0]", + "name" : "char [0]", +- "referenced_type" : "type-48", +- "self_type" : "type-231", ++ "referenced_type" : "type-47", ++ "self_type" : "type-230", + "source_file" : "/system/core/liblog/include/log/log_read.h" + }, + { + "alignment" : 1, + "linker_set_key" : "char [10]", + "name" : "char [10]", +- "referenced_type" : "type-48", +- "self_type" : "type-3656", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3649", + "size" : 10, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -22,8 +22,8 @@ + "alignment" : 1, + "linker_set_key" : "char [11]", + "name" : "char [11]", +- "referenced_type" : "type-48", +- "self_type" : "type-3679", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3672", + "size" : 11, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -31,8 +31,8 @@ + "alignment" : 1, + "linker_set_key" : "char [12]", + "name" : "char [12]", +- "referenced_type" : "type-48", +- "self_type" : "type-3653", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3646", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -40,8 +40,8 @@ + "alignment" : 1, + "linker_set_key" : "char [13]", + "name" : "char [13]", +- "referenced_type" : "type-48", +- "self_type" : "type-3649", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3642", + "size" : 13, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -49,8 +49,8 @@ + "alignment" : 1, + "linker_set_key" : "char [14]", + "name" : "char [14]", +- "referenced_type" : "type-48", +- "self_type" : "type-3698", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3691", + "size" : 14, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -58,8 +58,8 @@ + "alignment" : 1, + "linker_set_key" : "char [15]", + "name" : "char [15]", +- "referenced_type" : "type-48", +- "self_type" : "type-3796", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3789", + "size" : 15, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -67,8 +67,8 @@ + "alignment" : 1, + "linker_set_key" : "char [16]", + "name" : "char [16]", +- "referenced_type" : "type-48", +- "self_type" : "type-47", ++ "referenced_type" : "type-47", ++ "self_type" : "type-46", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -76,8 +76,8 @@ + "alignment" : 1, + "linker_set_key" : "char [17]", + "name" : "char [17]", +- "referenced_type" : "type-48", +- "self_type" : "type-3701", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3694", + "size" : 17, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -85,8 +85,8 @@ + "alignment" : 1, + "linker_set_key" : "char [18]", + "name" : "char [18]", +- "referenced_type" : "type-48", +- "self_type" : "type-3685", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3678", + "size" : 18, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -94,8 +94,8 @@ + "alignment" : 1, + "linker_set_key" : "char [19]", + "name" : "char [19]", +- "referenced_type" : "type-48", +- "self_type" : "type-3717", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3710", + "size" : 19, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -103,8 +103,8 @@ + "alignment" : 1, + "linker_set_key" : "char [20]", + "name" : "char [20]", +- "referenced_type" : "type-48", +- "self_type" : "type-3695", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3688", + "size" : 20, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -112,8 +112,8 @@ + "alignment" : 1, + "linker_set_key" : "char [22]", + "name" : "char [22]", +- "referenced_type" : "type-48", +- "self_type" : "type-3720", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3713", + "size" : 22, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -121,8 +121,8 @@ + "alignment" : 1, + "linker_set_key" : "char [25]", + "name" : "char [25]", +- "referenced_type" : "type-48", +- "self_type" : "type-3710", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3703", + "size" : 25, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -130,8 +130,8 @@ + "alignment" : 1, + "linker_set_key" : "char [28]", + "name" : "char [28]", +- "referenced_type" : "type-48", +- "self_type" : "type-3733", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3726", + "size" : 28, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -139,8 +139,8 @@ + "alignment" : 1, + "linker_set_key" : "char [29]", + "name" : "char [29]", +- "referenced_type" : "type-48", +- "self_type" : "type-3707", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3700", + "size" : 29, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -148,8 +148,8 @@ + "alignment" : 1, + "linker_set_key" : "char [2]", + "name" : "char [2]", +- "referenced_type" : "type-48", +- "self_type" : "type-3660", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3652", + "size" : 2, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -157,8 +157,8 @@ + "alignment" : 1, + "linker_set_key" : "char [31]", + "name" : "char [31]", +- "referenced_type" : "type-48", +- "self_type" : "type-3692", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3684", + "size" : 31, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -166,8 +166,8 @@ + "alignment" : 1, + "linker_set_key" : "char [32]", + "name" : "char [32]", +- "referenced_type" : "type-48", +- "self_type" : "type-3724", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3717", + "size" : 32, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -175,8 +175,8 @@ + "alignment" : 1, + "linker_set_key" : "char [35]", + "name" : "char [35]", +- "referenced_type" : "type-48", +- "self_type" : "type-3713", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3706", + "size" : 35, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -184,8 +184,8 @@ + "alignment" : 1, + "linker_set_key" : "char [37]", + "name" : "char [37]", +- "referenced_type" : "type-48", +- "self_type" : "type-3704", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3697", + "size" : 37, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -193,8 +193,8 @@ + "alignment" : 1, + "linker_set_key" : "char [3]", + "name" : "char [3]", +- "referenced_type" : "type-48", +- "self_type" : "type-3672", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3665", + "size" : 3, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -202,8 +202,8 @@ + "alignment" : 1, + "linker_set_key" : "char [4]", + "name" : "char [4]", +- "referenced_type" : "type-48", +- "self_type" : "type-3793", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3786", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -211,8 +211,8 @@ + "alignment" : 1, + "linker_set_key" : "char [5]", + "name" : "char [5]", +- "referenced_type" : "type-48", +- "self_type" : "type-3799", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3792", + "size" : 5, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -220,8 +220,8 @@ + "alignment" : 1, + "linker_set_key" : "char [6]", + "name" : "char [6]", +- "referenced_type" : "type-48", +- "self_type" : "type-3664", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3657", + "size" : 6, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -229,8 +229,8 @@ + "alignment" : 1, + "linker_set_key" : "char [7]", + "name" : "char [7]", +- "referenced_type" : "type-48", +- "self_type" : "type-3688", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3681", + "size" : 7, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -238,8 +238,8 @@ + "alignment" : 1, + "linker_set_key" : "char [8]", + "name" : "char [8]", +- "referenced_type" : "type-48", +- "self_type" : "type-3676", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3669", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -247,16 +247,16 @@ + "alignment" : 1, + "linker_set_key" : "char [9]", + "name" : "char [9]", +- "referenced_type" : "type-48", +- "self_type" : "type-3667", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3660", + "size" : 9, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { + "linker_set_key" : "float []", + "name" : "float []", +- "referenced_type" : "type-298", +- "self_type" : "type-297", ++ "referenced_type" : "type-297", ++ "self_type" : "type-296", + "source_file" : "/system/core/libsystem/include/system/graphics.h" + }, + { +@@ -271,8 +271,8 @@ + "alignment" : 1, + "linker_set_key" : "unsigned char [32]", + "name" : "unsigned char [32]", +- "referenced_type" : "type-199", +- "self_type" : "type-1013", ++ "referenced_type" : "type-198", ++ "self_type" : "type-1010", + "size" : 32, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -280,8 +280,8 @@ + "alignment" : 1, + "linker_set_key" : "unsigned char [5121]", + "name" : "unsigned char [5121]", +- "referenced_type" : "type-199", +- "self_type" : "type-238", ++ "referenced_type" : "type-198", ++ "self_type" : "type-237", + "size" : 5121, + "source_file" : "/system/core/liblog/include/log/log_read.h" + }, +@@ -290,7 +290,7 @@ + "linker_set_key" : "unsigned int [8]", + "name" : "unsigned int [8]", + "referenced_type" : "type-1", +- "self_type" : "type-288", ++ "self_type" : "type-287", + "size" : 32, + "source_file" : "/system/core/libsystem/include/system/graphics.h" + } +@@ -303,8 +303,8 @@ + "is_unsigned" : true, + "linker_set_key" : "bool", + "name" : "bool", +- "referenced_type" : "type-44", +- "self_type" : "type-44", ++ "referenced_type" : "type-43", ++ "self_type" : "type-43", + "size" : 1 + }, + { +@@ -313,8 +313,8 @@ + "is_unsigned" : true, + "linker_set_key" : "char", + "name" : "char", +- "referenced_type" : "type-48", +- "self_type" : "type-48", ++ "referenced_type" : "type-47", ++ "self_type" : "type-47", + "size" : 1 + }, + { +@@ -323,8 +323,8 @@ + "is_unsigned" : true, + "linker_set_key" : "char16_t", + "name" : "char16_t", +- "referenced_type" : "type-345", +- "self_type" : "type-345", ++ "referenced_type" : "type-344", ++ "self_type" : "type-344", + "size" : 2 + }, + { +@@ -339,8 +339,8 @@ + "alignment" : 4, + "linker_set_key" : "float", + "name" : "float", +- "referenced_type" : "type-298", +- "self_type" : "type-298", ++ "referenced_type" : "type-297", ++ "self_type" : "type-297", + "size" : 4 + }, + { +@@ -357,16 +357,16 @@ + "is_integral" : true, + "linker_set_key" : "long", + "name" : "long", +- "referenced_type" : "type-111", +- "self_type" : "type-111", ++ "referenced_type" : "type-110", ++ "self_type" : "type-110", + "size" : 4 + }, + { + "alignment" : 8, + "linker_set_key" : "long double", + "name" : "long double", +- "referenced_type" : "type-61", +- "self_type" : "type-61", ++ "referenced_type" : "type-60", ++ "self_type" : "type-60", + "size" : 8 + }, + { +@@ -402,8 +402,8 @@ + "is_unsigned" : true, + "linker_set_key" : "unsigned char", + "name" : "unsigned char", +- "referenced_type" : "type-199", +- "self_type" : "type-199", ++ "referenced_type" : "type-198", ++ "self_type" : "type-198", + "size" : 1 + }, + { +@@ -422,8 +422,8 @@ + "is_unsigned" : true, + "linker_set_key" : "unsigned long", + "name" : "unsigned long", +- "referenced_type" : "type-416", +- "self_type" : "type-416", ++ "referenced_type" : "type-415", ++ "self_type" : "type-415", + "size" : 4 + }, + { +@@ -442,15 +442,15 @@ + "is_unsigned" : true, + "linker_set_key" : "unsigned short", + "name" : "unsigned short", +- "referenced_type" : "type-132", +- "self_type" : "type-132", ++ "referenced_type" : "type-131", ++ "self_type" : "type-131", + "size" : 2 + }, + { + "linker_set_key" : "void", + "name" : "void", +- "referenced_type" : "type-106", +- "self_type" : "type-106" ++ "referenced_type" : "type-105", ++ "self_type" : "type-105" + } + ], + "elf_functions" : +@@ -467,14 +467,6 @@ + "binding" : "weak", + "name" : "_ZN7android2spINS_8hardware25PassthroughServiceManagerEED2Ev" + }, +- { +- "binding" : "weak", +- "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_" +- }, + { + "binding" : "weak", + "name" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_" +@@ -2563,6 +2555,230 @@ + { + "name" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_6StatusE" + }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_compareEPKvSA_" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE8do_splatEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_compareES3_S3_" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE15do_move_forwardEPvS3_j" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE16do_move_backwardEPvS3_j" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE7do_copyEPvS3_j" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE8do_splatEPvS3_j" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE8do_splatEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE8do_splatEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE8do_splatEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE8do_splatEPvPKvj" ++ }, + { + "name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv" + }, +@@ -3457,7 +3673,7 @@ + }, + { + "binding" : "weak", +- "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware7details9SchedPrioEEENS_19__map_value_compareIS8_SC_NS_4lessIS8_EELb1EEENS_9allocatorISC_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJOS8_EEENSO_IJEEEEEENS_4pairINS_15__tree_iteratorISC_PNS_11__tree_nodeISC_PvEEiEEbEERKT_DpOT0_" ++ "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware7details9SchedPrioEEENS_19__map_value_compareIS8_SC_NS_4lessIS8_EELb1EEENS_9allocatorISC_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSO_IJEEEEEENS_4pairINS_15__tree_iteratorISC_PNS_11__tree_nodeISC_PvEEiEEbEERKT_DpOT0_" + }, + { + "binding" : "weak", +@@ -3465,7 +3681,7 @@ + }, + { + "binding" : "weak", +- "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJOS8_EEENSL_IJEEEEEENS_4pairINS_15__tree_iteratorIS9_PNS_11__tree_nodeIS9_PvEEiEEbEERKT_DpOT0_" ++ "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSL_IJEEEEEENS_4pairINS_15__tree_iteratorIS9_PNS_11__tree_nodeIS9_PvEEiEEbEERKT_DpOT0_" + }, + { + "binding" : "weak", +@@ -4620,8 +4836,8 @@ + ], + "linker_set_key" : "android::Condition::WakeUpType", + "name" : "android::Condition::WakeUpType", +- "referenced_type" : "type-444", +- "self_type" : "type-444", ++ "referenced_type" : "type-442", ++ "self_type" : "type-442", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Condition.h", + "underlying_type" : "type-1", +@@ -4638,8 +4854,8 @@ + ], + "linker_set_key" : "android::String16::StaticLinkage", + "name" : "android::String16::StaticLinkage", +- "referenced_type" : "type-347", +- "self_type" : "type-347", ++ "referenced_type" : "type-346", ++ "self_type" : "type-346", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String16.h", + "underlying_type" : "type-1", +@@ -4656,8 +4872,8 @@ + ], + "linker_set_key" : "android::String8::StaticLinkage", + "name" : "android::String8::StaticLinkage", +- "referenced_type" : "type-222", +- "self_type" : "type-222", ++ "referenced_type" : "type-221", ++ "self_type" : "type-221", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String8.h", + "underlying_type" : "type-1", +@@ -4682,8 +4898,8 @@ + ], + "linker_set_key" : "android::hardware::HidlReturnRestriction", + "name" : "android::hardware::HidlReturnRestriction", +- "referenced_type" : "type-176", +- "self_type" : "type-176", ++ "referenced_type" : "type-175", ++ "self_type" : "type-175", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", + "underlying_type" : "type-19", +@@ -4712,8 +4928,8 @@ + ], + "linker_set_key" : "android::hardware::MQDescriptor::GrantorType", + "name" : "android::hardware::MQDescriptor::GrantorType", +- "referenced_type" : "type-1033", +- "self_type" : "type-1033", ++ "referenced_type" : "type-1030", ++ "self_type" : "type-1030", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h", + "underlying_type" : "type-19", +@@ -4734,8 +4950,8 @@ + ], + "linker_set_key" : "android::hardware::MQFlavor", + "name" : "android::hardware::MQFlavor", +- "referenced_type" : "type-332", +- "self_type" : "type-332", ++ "referenced_type" : "type-331", ++ "self_type" : "type-331", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h", + "underlying_type" : "type-1", +@@ -4760,8 +4976,8 @@ + ], + "linker_set_key" : "android::hardware::ProcessState::CallRestriction", + "name" : "android::hardware::ProcessState::CallRestriction", +- "referenced_type" : "type-2433", +- "self_type" : "type-2433", ++ "referenced_type" : "type-2428", ++ "self_type" : "type-2428", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h", + "underlying_type" : "type-19", +@@ -4814,8 +5030,8 @@ + ], + "linker_set_key" : "android::hardware::Status::Exception", + "name" : "android::hardware::Status::Exception", +- "referenced_type" : "type-165", +- "self_type" : "type-165", ++ "referenced_type" : "type-164", ++ "self_type" : "type-164", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", + "underlying_type" : "type-19", +@@ -4868,8 +5084,8 @@ + ], + "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent", + "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent", +- "referenced_type" : "type-183", +- "self_type" : "type-183", ++ "referenced_type" : "type-182", ++ "self_type" : "type-182", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "underlying_type" : "type-1", +@@ -4894,8 +5110,8 @@ + ], + "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture", + "name" : "android::hidl::base::V1_0::DebugInfo::Architecture", +- "referenced_type" : "type-336", +- "self_type" : "type-336", ++ "referenced_type" : "type-335", ++ "self_type" : "type-335", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h", + "underlying_type" : "type-19", +@@ -4912,8 +5128,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::PidConstant", + "name" : "android::hidl::manager::V1_0::IServiceManager::PidConstant", +- "referenced_type" : "type-547", +- "self_type" : "type-547", ++ "referenced_type" : "type-545", ++ "self_type" : "type-545", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h", + "underlying_type" : "type-19", +@@ -4938,11 +5154,11 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::Transport", + "name" : "android::hidl::manager::V1_0::IServiceManager::Transport", +- "referenced_type" : "type-546", +- "self_type" : "type-546", ++ "referenced_type" : "type-544", ++ "self_type" : "type-544", + "size" : 1, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h", +- "underlying_type" : "type-199", ++ "underlying_type" : "type-198", + "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager9TransportE" + }, + { +@@ -4988,8 +5204,8 @@ + ], + "linker_set_key" : "android_LogPriority", + "name" : "android_LogPriority", +- "referenced_type" : "type-267", +- "self_type" : "type-267", ++ "referenced_type" : "type-266", ++ "self_type" : "type-266", + "size" : 4, + "source_file" : "/system/core/liblog/include/android/log.h", + "underlying_type" : "type-1", +@@ -5042,8 +5258,8 @@ + ], + "linker_set_key" : "android_color_mode_t", + "name" : "android_color_mode_t", +- "referenced_type" : "type-275", +- "self_type" : "type-275", ++ "referenced_type" : "type-274", ++ "self_type" : "type-274", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h", + "underlying_type" : "type-1", +@@ -5068,8 +5284,8 @@ + ], + "linker_set_key" : "android_color_mode_v1_1_t", + "name" : "android_color_mode_v1_1_t", +- "referenced_type" : "type-280", +- "self_type" : "type-280", ++ "referenced_type" : "type-279", ++ "self_type" : "type-279", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h", + "underlying_type" : "type-1", +@@ -5110,8 +5326,8 @@ + ], + "linker_set_key" : "android_color_transform_t", + "name" : "android_color_transform_t", +- "referenced_type" : "type-276", +- "self_type" : "type-276", ++ "referenced_type" : "type-275", ++ "self_type" : "type-275", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h", + "underlying_type" : "type-1", +@@ -5352,8 +5568,8 @@ + ], + "linker_set_key" : "android_dataspace_t", + "name" : "android_dataspace_t", +- "referenced_type" : "type-274", +- "self_type" : "type-274", ++ "referenced_type" : "type-273", ++ "self_type" : "type-273", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h", + "underlying_type" : "type-1", +@@ -5382,8 +5598,8 @@ + ], + "linker_set_key" : "android_dataspace_v1_1_t", + "name" : "android_dataspace_v1_1_t", +- "referenced_type" : "type-279", +- "self_type" : "type-279", ++ "referenced_type" : "type-278", ++ "self_type" : "type-278", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h", + "underlying_type" : "type-1", +@@ -5412,8 +5628,8 @@ + ], + "linker_set_key" : "android_dataspace_v1_2_t", + "name" : "android_dataspace_v1_2_t", +- "referenced_type" : "type-283", +- "self_type" : "type-283", ++ "referenced_type" : "type-282", ++ "self_type" : "type-282", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h", + "underlying_type" : "type-1", +@@ -5454,8 +5670,8 @@ + ], + "linker_set_key" : "android_flex_component", + "name" : "android_flex_component", +- "referenced_type" : "type-289", +- "self_type" : "type-289", ++ "referenced_type" : "type-288", ++ "self_type" : "type-288", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics.h", + "underlying_type" : "type-1", +@@ -5492,8 +5708,8 @@ + ], + "linker_set_key" : "android_flex_format", + "name" : "android_flex_format", +- "referenced_type" : "type-292", +- "self_type" : "type-292", ++ "referenced_type" : "type-291", ++ "self_type" : "type-291", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics.h", + "underlying_type" : "type-1", +@@ -5518,8 +5734,8 @@ + ], + "linker_set_key" : "android_hdr_t", + "name" : "android_hdr_t", +- "referenced_type" : "type-277", +- "self_type" : "type-277", ++ "referenced_type" : "type-276", ++ "self_type" : "type-276", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h", + "underlying_type" : "type-1", +@@ -5536,8 +5752,8 @@ + ], + "linker_set_key" : "android_hdr_v1_2_t", + "name" : "android_hdr_v1_2_t", +- "referenced_type" : "type-282", +- "self_type" : "type-282", ++ "referenced_type" : "type-281", ++ "self_type" : "type-281", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h", + "underlying_type" : "type-1", +@@ -5566,8 +5782,8 @@ + ], + "linker_set_key" : "android_pixel_format_sw_t", + "name" : "android_pixel_format_sw_t", +- "referenced_type" : "type-286", +- "self_type" : "type-286", ++ "referenced_type" : "type-285", ++ "self_type" : "type-285", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-sw.h", + "underlying_type" : "type-1", +@@ -5660,8 +5876,8 @@ + ], + "linker_set_key" : "android_pixel_format_t", + "name" : "android_pixel_format_t", +- "referenced_type" : "type-271", +- "self_type" : "type-271", ++ "referenced_type" : "type-270", ++ "self_type" : "type-270", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h", + "underlying_type" : "type-1", +@@ -5702,8 +5918,8 @@ + ], + "linker_set_key" : "android_pixel_format_v1_1_t", + "name" : "android_pixel_format_v1_1_t", +- "referenced_type" : "type-278", +- "self_type" : "type-278", ++ "referenced_type" : "type-277", ++ "self_type" : "type-277", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h", + "underlying_type" : "type-1", +@@ -5720,8 +5936,8 @@ + ], + "linker_set_key" : "android_pixel_format_v1_2_t", + "name" : "android_pixel_format_v1_2_t", +- "referenced_type" : "type-285", +- "self_type" : "type-285", ++ "referenced_type" : "type-284", ++ "self_type" : "type-284", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h", + "underlying_type" : "type-1", +@@ -5750,8 +5966,8 @@ + ], + "linker_set_key" : "android_render_intent_v1_1_t", + "name" : "android_render_intent_v1_1_t", +- "referenced_type" : "type-281", +- "self_type" : "type-281", ++ "referenced_type" : "type-280", ++ "self_type" : "type-280", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h", + "underlying_type" : "type-1", +@@ -5784,8 +6000,8 @@ + ], + "linker_set_key" : "android_transform_t", + "name" : "android_transform_t", +- "referenced_type" : "type-272", +- "self_type" : "type-272", ++ "referenced_type" : "type-271", ++ "self_type" : "type-271", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h", + "underlying_type" : "type-1", +@@ -5838,8 +6054,8 @@ + ], + "linker_set_key" : "log_id", + "name" : "log_id", +- "referenced_type" : "type-268", +- "self_type" : "type-268", ++ "referenced_type" : "type-267", ++ "self_type" : "type-267", + "size" : 4, + "source_file" : "/system/core/liblog/include/android/log.h", + "underlying_type" : "type-1", +@@ -5855,12 +6071,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2476" ++ "referenced_type" : "type-2471" + } + ], +- "referenced_type" : "type-2480", +- "return_type" : "type-2476", +- "self_type" : "type-2480", ++ "referenced_type" : "type-2475", ++ "return_type" : "type-2471", ++ "self_type" : "type-2475", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -5870,18 +6086,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-350" ++ "referenced_type" : "type-349" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "referenced_type" : "type-2430", +- "return_type" : "type-44", +- "self_type" : "type-2430", ++ "referenced_type" : "type-2425", ++ "return_type" : "type-43", ++ "self_type" : "type-2425", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -5891,12 +6107,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "referenced_type" : "type-303", ++ "referenced_type" : "type-302", + "return_type" : "type-19", +- "self_type" : "type-303", ++ "self_type" : "type-302", + "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h" + }, + { +@@ -5906,12 +6122,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2492" ++ "referenced_type" : "type-2487" + } + ], +- "referenced_type" : "type-2491", +- "return_type" : "type-2492", +- "self_type" : "type-2491", ++ "referenced_type" : "type-2486", ++ "return_type" : "type-2487", ++ "self_type" : "type-2486", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -5921,27 +6137,27 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-1030" ++ "referenced_type" : "type-1027" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2353" ++ "referenced_type" : "type-2348" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "referenced_type" : "type-2352", +- "return_type" : "type-106", +- "self_type" : "type-2352", ++ "referenced_type" : "type-2347", ++ "return_type" : "type-105", ++ "self_type" : "type-2347", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -5951,18 +6167,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "referenced_type" : "type-2346", +- "return_type" : "type-106", +- "self_type" : "type-2346", ++ "referenced_type" : "type-2341", ++ "return_type" : "type-105", ++ "self_type" : "type-2341", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -5972,15 +6188,15 @@ + "parameters" : + [ + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "referenced_type" : "type-2541", +- "return_type" : "type-106", +- "self_type" : "type-2541", ++ "referenced_type" : "type-2536", ++ "return_type" : "type-105", ++ "self_type" : "type-2536", + "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h" + } + ], +@@ -5993,10 +6209,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-587" ++ "referenced_type" : "type-585" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, + { +@@ -6006,13 +6222,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-495" ++ "referenced_type" : "type-493" + }, + { +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + } + ], +- "return_type" : "type-3841", ++ "return_type" : "type-3834", + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, + { +@@ -6022,42 +6238,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-788" ++ "referenced_type" : "type-785" + } + ], +- "return_type" : "type-106", +- "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" +- }, +- { +- "function_name" : "android::sp::operator=", +- "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-482" +- }, +- { +- "referenced_type" : "type-483" +- } +- ], +- "return_type" : "type-485", +- "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" +- }, +- { +- "function_name" : "android::sp::operator=", +- "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-482" +- }, +- { +- "referenced_type" : "type-2329" +- } +- ], +- "return_type" : "type-485", ++ "return_type" : "type-105", + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, + { +@@ -6067,13 +6251,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2381" ++ "referenced_type" : "type-2376" + }, + { +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + } + ], +- "return_type" : "type-3757", ++ "return_type" : "type-3750", + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, + { +@@ -6086,13 +6270,13 @@ + "referenced_type" : "type-33" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6105,10 +6289,10 @@ + "referenced_type" : "type-33" + }, + { +- "referenced_type" : "type-2766" ++ "referenced_type" : "type-2760" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6121,10 +6305,10 @@ + "referenced_type" : "type-33" + }, + { +- "referenced_type" : "type-2767" ++ "referenced_type" : "type-2761" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6137,10 +6321,10 @@ + "referenced_type" : "type-33" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6153,10 +6337,10 @@ + "referenced_type" : "type-33" + }, + { +- "referenced_type" : "type-2768" ++ "referenced_type" : "type-2762" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6169,10 +6353,10 @@ + "referenced_type" : "type-33" + }, + { +- "referenced_type" : "type-2769" ++ "referenced_type" : "type-2763" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6185,7 +6369,7 @@ + "referenced_type" : "type-33" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6198,7 +6382,7 @@ + "referenced_type" : "type-33" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6211,7 +6395,7 @@ + "referenced_type" : "type-33" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6224,13 +6408,13 @@ + "referenced_type" : "type-33" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6239,14 +6423,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-801", ++ "return_type" : "type-798", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6257,13 +6441,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2250" ++ "referenced_type" : "type-2245" + }, + { +- "referenced_type" : "type-2772" ++ "referenced_type" : "type-2766" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h" + }, + { +@@ -6273,13 +6457,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2250" ++ "referenced_type" : "type-2245" + }, + { +- "referenced_type" : "type-459" ++ "referenced_type" : "type-456" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h" + }, + { +@@ -6289,13 +6473,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2250" ++ "referenced_type" : "type-2245" + }, + { +- "referenced_type" : "type-459" ++ "referenced_type" : "type-456" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h" + }, + { +@@ -6304,16 +6488,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-2280" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2281" ++ "referenced_type" : "type-2276" + }, + { +- "referenced_type" : "type-2775" ++ "referenced_type" : "type-2769" + } + ], + "return_type" : "type-19", +@@ -6326,16 +6510,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2280" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2281" ++ "referenced_type" : "type-2276" + }, + { + "default_arg" : true, +@@ -6343,7 +6527,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-2776" ++ "referenced_type" : "type-2770" + } + ], + "return_type" : "type-19", +@@ -6355,16 +6539,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-2280" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2281" ++ "referenced_type" : "type-2276" + }, + { +- "referenced_type" : "type-2777" ++ "referenced_type" : "type-2771" + } + ], + "return_type" : "type-19", +@@ -6378,13 +6562,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-2778" ++ "referenced_type" : "type-2772" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, + { +@@ -6393,16 +6577,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-2280" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2281" ++ "referenced_type" : "type-2276" + }, + { +- "referenced_type" : "type-2779" ++ "referenced_type" : "type-2773" + } + ], + "return_type" : "type-19", +@@ -6414,16 +6598,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-2280" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2281" ++ "referenced_type" : "type-2276" + }, + { +- "referenced_type" : "type-2780" ++ "referenced_type" : "type-2774" + } + ], + "return_type" : "type-19", +@@ -6435,16 +6619,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-2280" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2281" ++ "referenced_type" : "type-2276" + }, + { +- "referenced_type" : "type-2781" ++ "referenced_type" : "type-2775" + } + ], + "return_type" : "type-19", +@@ -6456,16 +6640,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-2280" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2281" ++ "referenced_type" : "type-2276" + }, + { +- "referenced_type" : "type-2782" ++ "referenced_type" : "type-2776" + } + ], + "return_type" : "type-19", +@@ -6477,16 +6661,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-2280" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2281" ++ "referenced_type" : "type-2276" + }, + { +- "referenced_type" : "type-2783" ++ "referenced_type" : "type-2777" + } + ], + "return_type" : "type-19", +@@ -6500,10 +6684,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, + { +@@ -6513,13 +6697,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, + { +@@ -6529,19 +6713,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-2277" ++ "referenced_type" : "type-2272" + }, + { +- "referenced_type" : "type-2277" ++ "referenced_type" : "type-2272" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, + { +@@ -6551,13 +6735,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, + { +@@ -6567,19 +6751,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-2277" ++ "referenced_type" : "type-2272" + }, + { +- "referenced_type" : "type-2277" ++ "referenced_type" : "type-2272" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, + { +@@ -6589,10 +6773,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, + { +@@ -6602,10 +6786,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, + { +@@ -6615,10 +6799,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, + { +@@ -6627,13 +6811,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2253" ++ "referenced_type" : "type-2248" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6642,19 +6826,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2253" ++ "referenced_type" : "type-2248" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6664,16 +6848,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6683,13 +6867,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + }, + { +- "referenced_type" : "type-2784" ++ "referenced_type" : "type-2778" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6699,13 +6883,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + }, + { +- "referenced_type" : "type-2785" ++ "referenced_type" : "type-2779" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6715,13 +6899,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6731,13 +6915,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + }, + { +- "referenced_type" : "type-2786" ++ "referenced_type" : "type-2780" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6746,16 +6930,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2253" ++ "referenced_type" : "type-2248" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-2787" ++ "referenced_type" : "type-2781" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6764,16 +6948,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2253" ++ "referenced_type" : "type-2248" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-2788" ++ "referenced_type" : "type-2782" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6783,13 +6967,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + }, + { +- "referenced_type" : "type-2789" ++ "referenced_type" : "type-2783" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6798,16 +6982,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2253" ++ "referenced_type" : "type-2248" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-2790" ++ "referenced_type" : "type-2784" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6817,10 +7001,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6830,10 +7014,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6842,16 +7026,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2253" ++ "referenced_type" : "type-2248" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-2791" ++ "referenced_type" : "type-2785" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6860,13 +7044,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2253" ++ "referenced_type" : "type-2248" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6875,13 +7059,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2253" ++ "referenced_type" : "type-2248" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6891,10 +7075,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6904,16 +7088,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6923,13 +7107,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6939,13 +7123,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6955,14 +7139,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1048" ++ "referenced_type" : "type-1045" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-575", ++ "return_type" : "type-573", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -6972,16 +7156,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -6991,13 +7175,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + }, + { +- "referenced_type" : "type-1570" ++ "referenced_type" : "type-1566" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7007,13 +7191,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + }, + { +- "referenced_type" : "type-1571" ++ "referenced_type" : "type-1567" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7023,14 +7207,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1048" ++ "referenced_type" : "type-1045" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-575", ++ "return_type" : "type-573", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7040,13 +7224,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7056,13 +7240,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + }, + { +- "referenced_type" : "type-1572" ++ "referenced_type" : "type-1568" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7072,11 +7256,11 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + }, + { + "default_arg" : true, +- "referenced_type" : "type-1048" ++ "referenced_type" : "type-1045" + } + ], + "return_type" : "type-19", +@@ -7089,13 +7273,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + }, + { +- "referenced_type" : "type-1573" ++ "referenced_type" : "type-1569" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7105,10 +7289,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7118,10 +7302,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7130,13 +7314,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1048" ++ "referenced_type" : "type-1045" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7146,10 +7330,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7159,16 +7343,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7177,14 +7361,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-986", ++ "return_type" : "type-983", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7193,14 +7377,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-910" ++ "referenced_type" : "type-906" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-986", ++ "return_type" : "type-983", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7211,13 +7395,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-958" ++ "referenced_type" : "type-955" + }, + { +- "referenced_type" : "type-1576" ++ "referenced_type" : "type-1572" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h" + }, + { +@@ -7227,13 +7411,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-958" ++ "referenced_type" : "type-955" + }, + { +- "referenced_type" : "type-578" ++ "referenced_type" : "type-576" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h" + }, + { +@@ -7243,13 +7427,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-958" ++ "referenced_type" : "type-955" + }, + { +- "referenced_type" : "type-578" ++ "referenced_type" : "type-576" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h" + }, + { +@@ -7258,16 +7442,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { +- "referenced_type" : "type-1582" ++ "referenced_type" : "type-1578" + } + ], + "return_type" : "type-19", +@@ -7280,16 +7464,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-872" ++ "referenced_type" : "type-869" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { + "default_arg" : true, +@@ -7297,7 +7481,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-1583" ++ "referenced_type" : "type-1579" + } + ], + "return_type" : "type-19", +@@ -7311,13 +7495,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-872" ++ "referenced_type" : "type-869" + }, + { +- "referenced_type" : "type-1584" ++ "referenced_type" : "type-1580" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h" + }, + { +@@ -7326,16 +7510,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { +- "referenced_type" : "type-1585" ++ "referenced_type" : "type-1581" + } + ], + "return_type" : "type-19", +@@ -7347,16 +7531,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { +- "referenced_type" : "type-1586" ++ "referenced_type" : "type-1582" + } + ], + "return_type" : "type-19", +@@ -7368,16 +7552,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { +- "referenced_type" : "type-1587" ++ "referenced_type" : "type-1583" + } + ], + "return_type" : "type-19", +@@ -7389,16 +7573,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { +- "referenced_type" : "type-1588" ++ "referenced_type" : "type-1584" + } + ], + "return_type" : "type-19", +@@ -7410,16 +7594,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { +- "referenced_type" : "type-1589" ++ "referenced_type" : "type-1585" + } + ], + "return_type" : "type-19", +@@ -7433,10 +7617,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-872" ++ "referenced_type" : "type-869" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h" + }, + { +@@ -7445,16 +7629,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { +- "referenced_type" : "type-1590" ++ "referenced_type" : "type-1586" + } + ], + "return_type" : "type-19", +@@ -7466,16 +7650,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { +- "referenced_type" : "type-1591" ++ "referenced_type" : "type-1587" + } + ], + "return_type" : "type-19", +@@ -7488,13 +7672,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-872" ++ "referenced_type" : "type-869" + }, + { +- "referenced_type" : "type-910" ++ "referenced_type" : "type-906" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h" + }, + { +@@ -7504,13 +7688,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-872" ++ "referenced_type" : "type-869" + }, + { +- "referenced_type" : "type-910" ++ "referenced_type" : "type-906" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h" + }, + { +@@ -7520,10 +7704,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-872" ++ "referenced_type" : "type-869" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h" + }, + { +@@ -7533,10 +7717,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-872" ++ "referenced_type" : "type-869" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h" + }, + { +@@ -7546,10 +7730,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-872" ++ "referenced_type" : "type-869" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h" + }, + { +@@ -7558,16 +7742,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-969" ++ "referenced_type" : "type-966" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-1592" ++ "referenced_type" : "type-1588" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7577,16 +7761,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7596,13 +7780,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-1593" ++ "referenced_type" : "type-1589" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7612,13 +7796,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-1594" ++ "referenced_type" : "type-1590" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7628,16 +7812,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-807", ++ "return_type" : "type-804", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7647,13 +7831,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7663,13 +7847,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-1595" ++ "referenced_type" : "type-1591" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7678,16 +7862,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-969" ++ "referenced_type" : "type-966" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-1596" ++ "referenced_type" : "type-1592" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7697,16 +7881,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-1597" ++ "referenced_type" : "type-1593" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7715,19 +7899,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-969" ++ "referenced_type" : "type-966" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-807", ++ "return_type" : "type-804", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7737,13 +7921,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-1598" ++ "referenced_type" : "type-1594" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7752,19 +7936,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-969" ++ "referenced_type" : "type-966" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-1599" ++ "referenced_type" : "type-1595" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7774,10 +7958,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7787,10 +7971,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7800,19 +7984,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7822,16 +8006,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7840,22 +8024,22 @@ + "parameters" : + [ + { +- "referenced_type" : "type-969" ++ "referenced_type" : "type-966" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7864,19 +8048,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-969" ++ "referenced_type" : "type-966" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7886,16 +8070,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7905,16 +8089,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-801", ++ "return_type" : "type-798", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7924,13 +8108,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-1600" ++ "referenced_type" : "type-1596" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7940,10 +8124,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7953,16 +8137,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7971,19 +8155,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-969" ++ "referenced_type" : "type-966" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7992,19 +8176,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-969" ++ "referenced_type" : "type-966" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-801", ++ "return_type" : "type-798", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -8014,13 +8198,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-1601" ++ "referenced_type" : "type-1597" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -8030,13 +8214,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -8046,13 +8230,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -8062,14 +8246,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1115" ++ "referenced_type" : "type-1112" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-590", ++ "return_type" : "type-588", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8079,16 +8263,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8098,13 +8282,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + }, + { +- "referenced_type" : "type-1602" ++ "referenced_type" : "type-1598" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8114,13 +8298,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + }, + { +- "referenced_type" : "type-1603" ++ "referenced_type" : "type-1599" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8130,14 +8314,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1115" ++ "referenced_type" : "type-1112" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-590", ++ "return_type" : "type-588", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8147,13 +8331,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8163,13 +8347,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + }, + { +- "referenced_type" : "type-1604" ++ "referenced_type" : "type-1600" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8179,11 +8363,11 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + }, + { + "default_arg" : true, +- "referenced_type" : "type-1115" ++ "referenced_type" : "type-1112" + } + ], + "return_type" : "type-19", +@@ -8196,13 +8380,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + }, + { +- "referenced_type" : "type-1605" ++ "referenced_type" : "type-1601" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8212,10 +8396,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8225,10 +8409,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8237,13 +8421,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1115" ++ "referenced_type" : "type-1112" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8253,10 +8437,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8266,16 +8450,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8284,14 +8468,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1093", ++ "return_type" : "type-1090", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8300,14 +8484,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1093", ++ "return_type" : "type-1090", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8318,13 +8502,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1085" ++ "referenced_type" : "type-1082" + }, + { +- "referenced_type" : "type-1608" ++ "referenced_type" : "type-1604" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h" + }, + { +@@ -8334,13 +8518,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1085" ++ "referenced_type" : "type-1082" + }, + { +- "referenced_type" : "type-593" ++ "referenced_type" : "type-591" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h" + }, + { +@@ -8350,13 +8534,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1085" ++ "referenced_type" : "type-1082" + }, + { +- "referenced_type" : "type-593" ++ "referenced_type" : "type-591" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h" + }, + { +@@ -8365,10 +8549,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1072" ++ "referenced_type" : "type-1069" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { + "referenced_type" : "type-1" +@@ -8386,10 +8570,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1072" ++ "referenced_type" : "type-1069" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { + "referenced_type" : "type-1" +@@ -8408,16 +8592,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-863" ++ "referenced_type" : "type-860" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1128" ++ "referenced_type" : "type-1125" + }, + { +- "referenced_type" : "type-1129" ++ "referenced_type" : "type-1126" + }, + { + "default_arg" : true, +@@ -8425,7 +8609,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-1611" ++ "referenced_type" : "type-1607" + } + ], + "return_type" : "type-19", +@@ -8439,13 +8623,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-863" ++ "referenced_type" : "type-860" + }, + { +- "referenced_type" : "type-1612" ++ "referenced_type" : "type-1608" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, + { +@@ -8454,16 +8638,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1128" ++ "referenced_type" : "type-1125" + }, + { +- "referenced_type" : "type-1129" ++ "referenced_type" : "type-1126" + }, + { +- "referenced_type" : "type-1613" ++ "referenced_type" : "type-1609" + } + ], + "return_type" : "type-19", +@@ -8477,10 +8661,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-863" ++ "referenced_type" : "type-860" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, + { +@@ -8490,13 +8674,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-863" ++ "referenced_type" : "type-860" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, + { +@@ -8506,13 +8690,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-863" ++ "referenced_type" : "type-860" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, + { +@@ -8522,10 +8706,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-863" ++ "referenced_type" : "type-860" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, + { +@@ -8535,10 +8719,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-863" ++ "referenced_type" : "type-860" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, + { +@@ -8548,10 +8732,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-863" ++ "referenced_type" : "type-860" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, + { +@@ -8561,16 +8745,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8580,13 +8764,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-1614" ++ "referenced_type" : "type-1610" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8596,13 +8780,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-1615" ++ "referenced_type" : "type-1611" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8612,13 +8796,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8628,13 +8812,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-1616" ++ "referenced_type" : "type-1612" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8644,19 +8828,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8666,13 +8850,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-1617" ++ "referenced_type" : "type-1613" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8681,22 +8865,22 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1088" ++ "referenced_type" : "type-1085" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8706,10 +8890,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8719,10 +8903,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8732,10 +8916,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8745,16 +8929,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8764,13 +8948,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8780,13 +8964,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8796,14 +8980,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1176" ++ "referenced_type" : "type-1173" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-580", ++ "return_type" : "type-578", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8813,16 +8997,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8832,13 +9016,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + }, + { +- "referenced_type" : "type-1618" ++ "referenced_type" : "type-1614" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8848,13 +9032,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + }, + { +- "referenced_type" : "type-1619" ++ "referenced_type" : "type-1615" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8864,14 +9048,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1176" ++ "referenced_type" : "type-1173" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-580", ++ "return_type" : "type-578", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8881,13 +9065,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8897,13 +9081,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + }, + { +- "referenced_type" : "type-1620" ++ "referenced_type" : "type-1616" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8913,11 +9097,11 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + }, + { + "default_arg" : true, +- "referenced_type" : "type-1176" ++ "referenced_type" : "type-1173" + } + ], + "return_type" : "type-19", +@@ -8930,13 +9114,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + }, + { +- "referenced_type" : "type-1621" ++ "referenced_type" : "type-1617" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8946,10 +9130,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8959,10 +9143,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8971,13 +9155,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1176" ++ "referenced_type" : "type-1173" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8987,10 +9171,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -9000,16 +9184,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -9018,14 +9202,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1153", ++ "return_type" : "type-1150", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -9034,14 +9218,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-910" ++ "referenced_type" : "type-906" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1153", ++ "return_type" : "type-1150", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -9050,14 +9234,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-764" ++ "referenced_type" : "type-761" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1153", ++ "return_type" : "type-1150", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -9068,13 +9252,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1141" ++ "referenced_type" : "type-1138" + }, + { +- "referenced_type" : "type-1624" ++ "referenced_type" : "type-1620" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h" + }, + { +@@ -9084,13 +9268,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1141" ++ "referenced_type" : "type-1138" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-581" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h" + }, + { +@@ -9100,13 +9284,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1141" ++ "referenced_type" : "type-1138" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-581" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h" + }, + { +@@ -9116,16 +9300,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-880" ++ "referenced_type" : "type-877" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1189" ++ "referenced_type" : "type-1186" + }, + { +- "referenced_type" : "type-1190" ++ "referenced_type" : "type-1187" + }, + { + "default_arg" : true, +@@ -9133,7 +9317,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-1630" ++ "referenced_type" : "type-1626" + } + ], + "return_type" : "type-19", +@@ -9147,13 +9331,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-880" ++ "referenced_type" : "type-877" + }, + { +- "referenced_type" : "type-1631" ++ "referenced_type" : "type-1627" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, + { +@@ -9162,16 +9346,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1189" ++ "referenced_type" : "type-1186" + }, + { +- "referenced_type" : "type-1190" ++ "referenced_type" : "type-1187" + }, + { +- "referenced_type" : "type-1632" ++ "referenced_type" : "type-1628" + } + ], + "return_type" : "type-19", +@@ -9185,10 +9369,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-880" ++ "referenced_type" : "type-877" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, + { +@@ -9198,13 +9382,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-880" ++ "referenced_type" : "type-877" + }, + { +- "referenced_type" : "type-764" ++ "referenced_type" : "type-761" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, + { +@@ -9214,13 +9398,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-880" ++ "referenced_type" : "type-877" + }, + { +- "referenced_type" : "type-764" ++ "referenced_type" : "type-761" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, + { +@@ -9230,10 +9414,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-880" ++ "referenced_type" : "type-877" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, + { +@@ -9243,10 +9427,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-880" ++ "referenced_type" : "type-877" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, + { +@@ -9256,10 +9440,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-880" ++ "referenced_type" : "type-877" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, + { +@@ -9269,16 +9453,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9288,13 +9472,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-1633" ++ "referenced_type" : "type-1629" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9304,13 +9488,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-1634" ++ "referenced_type" : "type-1630" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9320,16 +9504,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-807", ++ "return_type" : "type-804", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9339,13 +9523,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9355,13 +9539,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-1635" ++ "referenced_type" : "type-1631" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9371,16 +9555,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-1636" ++ "referenced_type" : "type-1632" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9390,13 +9574,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-1637" ++ "referenced_type" : "type-1633" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9406,10 +9590,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9419,10 +9603,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9432,19 +9616,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9454,16 +9638,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9473,19 +9657,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9494,22 +9678,22 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1145" ++ "referenced_type" : "type-1142" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9519,16 +9703,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9538,16 +9722,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-801", ++ "return_type" : "type-798", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9557,13 +9741,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-1638" ++ "referenced_type" : "type-1634" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9573,10 +9757,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9586,16 +9770,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9605,13 +9789,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-1639" ++ "referenced_type" : "type-1635" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9621,13 +9805,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9637,13 +9821,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9653,14 +9837,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1235" ++ "referenced_type" : "type-1232" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-595", ++ "return_type" : "type-593", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9670,16 +9854,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9689,13 +9873,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + }, + { +- "referenced_type" : "type-1640" ++ "referenced_type" : "type-1636" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9705,13 +9889,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + }, + { +- "referenced_type" : "type-1641" ++ "referenced_type" : "type-1637" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9721,14 +9905,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1235" ++ "referenced_type" : "type-1232" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-595", ++ "return_type" : "type-593", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9738,13 +9922,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9754,13 +9938,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + }, + { +- "referenced_type" : "type-1642" ++ "referenced_type" : "type-1638" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9770,11 +9954,11 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + }, + { + "default_arg" : true, +- "referenced_type" : "type-1235" ++ "referenced_type" : "type-1232" + } + ], + "return_type" : "type-19", +@@ -9787,13 +9971,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + }, + { +- "referenced_type" : "type-1643" ++ "referenced_type" : "type-1639" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9803,10 +9987,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9816,10 +10000,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9828,13 +10012,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1235" ++ "referenced_type" : "type-1232" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9844,10 +10028,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9857,16 +10041,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9875,14 +10059,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1213", ++ "return_type" : "type-1210", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9891,14 +10075,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-787" ++ "referenced_type" : "type-784" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1213", ++ "return_type" : "type-1210", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9908,14 +10092,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1314" ++ "referenced_type" : "type-1311" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-585", ++ "return_type" : "type-583", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -9925,16 +10109,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -9944,13 +10128,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + }, + { +- "referenced_type" : "type-1644" ++ "referenced_type" : "type-1640" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -9960,13 +10144,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + }, + { +- "referenced_type" : "type-1645" ++ "referenced_type" : "type-1641" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -9976,14 +10160,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1314" ++ "referenced_type" : "type-1311" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-585", ++ "return_type" : "type-583", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -9993,13 +10177,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10009,13 +10193,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + }, + { +- "referenced_type" : "type-1646" ++ "referenced_type" : "type-1642" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10025,11 +10209,11 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + }, + { + "default_arg" : true, +- "referenced_type" : "type-1314" ++ "referenced_type" : "type-1311" + } + ], + "return_type" : "type-19", +@@ -10042,13 +10226,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + }, + { +- "referenced_type" : "type-1647" ++ "referenced_type" : "type-1643" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10058,10 +10242,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10071,10 +10255,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10083,13 +10267,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1314" ++ "referenced_type" : "type-1311" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10099,10 +10283,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10112,16 +10296,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10130,14 +10314,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1284", ++ "return_type" : "type-1281", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10146,14 +10330,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-910" ++ "referenced_type" : "type-906" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1284", ++ "return_type" : "type-1281", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10162,14 +10346,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-764" ++ "referenced_type" : "type-761" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1284", ++ "return_type" : "type-1281", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10178,14 +10362,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-773" ++ "referenced_type" : "type-769" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1284", ++ "return_type" : "type-1281", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10196,13 +10380,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1198" ++ "referenced_type" : "type-1195" + }, + { +- "referenced_type" : "type-1650" ++ "referenced_type" : "type-1646" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h" + }, + { +@@ -10212,13 +10396,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1198" ++ "referenced_type" : "type-1195" + }, + { +- "referenced_type" : "type-600" ++ "referenced_type" : "type-598" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h" + }, + { +@@ -10228,13 +10412,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1198" ++ "referenced_type" : "type-1195" + }, + { +- "referenced_type" : "type-600" ++ "referenced_type" : "type-598" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h" + }, + { +@@ -10245,13 +10429,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1273" ++ "referenced_type" : "type-1269" + }, + { +- "referenced_type" : "type-1655" ++ "referenced_type" : "type-1651" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h" + }, + { +@@ -10261,13 +10445,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1273" ++ "referenced_type" : "type-1269" + }, + { +- "referenced_type" : "type-588" ++ "referenced_type" : "type-586" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h" + }, + { +@@ -10277,13 +10461,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1273" ++ "referenced_type" : "type-1269" + }, + { +- "referenced_type" : "type-588" ++ "referenced_type" : "type-586" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h" + }, + { +@@ -10293,16 +10477,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-889" ++ "referenced_type" : "type-886" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1255" ++ "referenced_type" : "type-1252" + }, + { +- "referenced_type" : "type-1256" ++ "referenced_type" : "type-1253" + }, + { + "default_arg" : true, +@@ -10310,7 +10494,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-1662" ++ "referenced_type" : "type-1658" + } + ], + "return_type" : "type-19", +@@ -10324,13 +10508,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-889" ++ "referenced_type" : "type-886" + }, + { +- "referenced_type" : "type-1663" ++ "referenced_type" : "type-1659" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, + { +@@ -10339,16 +10523,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1255" ++ "referenced_type" : "type-1252" + }, + { +- "referenced_type" : "type-1256" ++ "referenced_type" : "type-1253" + }, + { +- "referenced_type" : "type-1664" ++ "referenced_type" : "type-1660" + } + ], + "return_type" : "type-19", +@@ -10362,10 +10546,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-889" ++ "referenced_type" : "type-886" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, + { +@@ -10375,13 +10559,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-889" ++ "referenced_type" : "type-886" + }, + { +- "referenced_type" : "type-787" ++ "referenced_type" : "type-784" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, + { +@@ -10391,13 +10575,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-889" ++ "referenced_type" : "type-886" + }, + { +- "referenced_type" : "type-787" ++ "referenced_type" : "type-784" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, + { +@@ -10407,10 +10591,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-889" ++ "referenced_type" : "type-886" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, + { +@@ -10420,10 +10604,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-889" ++ "referenced_type" : "type-886" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, + { +@@ -10433,10 +10617,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-889" ++ "referenced_type" : "type-886" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, + { +@@ -10446,16 +10630,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-896" ++ "referenced_type" : "type-893" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1309" ++ "referenced_type" : "type-1306" + }, + { +- "referenced_type" : "type-1310" ++ "referenced_type" : "type-1307" + }, + { + "default_arg" : true, +@@ -10463,7 +10647,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-1665" ++ "referenced_type" : "type-1661" + } + ], + "return_type" : "type-19", +@@ -10477,13 +10661,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-896" ++ "referenced_type" : "type-893" + }, + { +- "referenced_type" : "type-1666" ++ "referenced_type" : "type-1662" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h" + }, + { +@@ -10492,16 +10676,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1309" ++ "referenced_type" : "type-1306" + }, + { +- "referenced_type" : "type-1310" ++ "referenced_type" : "type-1307" + }, + { +- "referenced_type" : "type-1667" ++ "referenced_type" : "type-1663" + } + ], + "return_type" : "type-19", +@@ -10513,16 +10697,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1309" ++ "referenced_type" : "type-1306" + }, + { +- "referenced_type" : "type-1310" ++ "referenced_type" : "type-1307" + }, + { +- "referenced_type" : "type-1668" ++ "referenced_type" : "type-1664" + } + ], + "return_type" : "type-19", +@@ -10534,16 +10718,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1309" ++ "referenced_type" : "type-1306" + }, + { +- "referenced_type" : "type-1310" ++ "referenced_type" : "type-1307" + }, + { +- "referenced_type" : "type-1669" ++ "referenced_type" : "type-1665" + } + ], + "return_type" : "type-19", +@@ -10555,16 +10739,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1309" ++ "referenced_type" : "type-1306" + }, + { +- "referenced_type" : "type-1310" ++ "referenced_type" : "type-1307" + }, + { +- "referenced_type" : "type-1670" ++ "referenced_type" : "type-1666" + } + ], + "return_type" : "type-19", +@@ -10576,16 +10760,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1309" ++ "referenced_type" : "type-1306" + }, + { +- "referenced_type" : "type-1310" ++ "referenced_type" : "type-1307" + }, + { +- "referenced_type" : "type-1671" ++ "referenced_type" : "type-1667" + } + ], + "return_type" : "type-19", +@@ -10599,10 +10783,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-896" ++ "referenced_type" : "type-893" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h" + }, + { +@@ -10612,13 +10796,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-896" ++ "referenced_type" : "type-893" + }, + { +- "referenced_type" : "type-773" ++ "referenced_type" : "type-769" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h" + }, + { +@@ -10628,13 +10812,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-896" ++ "referenced_type" : "type-893" + }, + { +- "referenced_type" : "type-773" ++ "referenced_type" : "type-769" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h" + }, + { +@@ -10644,10 +10828,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-896" ++ "referenced_type" : "type-893" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h" + }, + { +@@ -10657,10 +10841,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-896" ++ "referenced_type" : "type-893" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h" + }, + { +@@ -10670,10 +10854,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-896" ++ "referenced_type" : "type-893" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h" + }, + { +@@ -10683,16 +10867,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10702,13 +10886,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-1672" ++ "referenced_type" : "type-1668" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10718,13 +10902,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-1673" ++ "referenced_type" : "type-1669" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10734,13 +10918,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10750,13 +10934,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-1674" ++ "referenced_type" : "type-1670" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10765,19 +10949,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1203" ++ "referenced_type" : "type-1200" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10787,13 +10971,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1671" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10803,10 +10987,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10816,10 +11000,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10829,10 +11013,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10842,16 +11026,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10861,16 +11045,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10880,13 +11064,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10896,13 +11080,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10912,16 +11096,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -10931,19 +11115,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -10953,13 +11137,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-1676" ++ "referenced_type" : "type-1672" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -10969,13 +11153,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-1677" ++ "referenced_type" : "type-1673" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -10985,16 +11169,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-807", ++ "return_type" : "type-804", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11004,19 +11188,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11026,13 +11210,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11042,13 +11226,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-1678" ++ "referenced_type" : "type-1674" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11058,16 +11242,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-1679" ++ "referenced_type" : "type-1675" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11076,22 +11260,22 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1277" ++ "referenced_type" : "type-1273" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11100,22 +11284,22 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1277" ++ "referenced_type" : "type-1273" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11125,13 +11309,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-1680" ++ "referenced_type" : "type-1676" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11141,10 +11325,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11154,10 +11338,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11167,22 +11351,22 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-787" ++ "referenced_type" : "type-784" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11192,16 +11376,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-1681" ++ "referenced_type" : "type-1677" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11211,19 +11395,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11233,16 +11417,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-787" ++ "referenced_type" : "type-784" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11252,16 +11436,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11271,19 +11455,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11292,25 +11476,25 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1277" ++ "referenced_type" : "type-1273" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-787" ++ "referenced_type" : "type-784" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11319,19 +11503,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1277" ++ "referenced_type" : "type-1273" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-1682" ++ "referenced_type" : "type-1678" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11340,19 +11524,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1277" ++ "referenced_type" : "type-1273" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-787" ++ "referenced_type" : "type-784" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11362,16 +11546,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11381,16 +11565,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-801", ++ "return_type" : "type-798", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11400,13 +11584,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-1683" ++ "referenced_type" : "type-1679" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11416,10 +11600,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11429,16 +11613,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11448,13 +11632,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-1684" ++ "referenced_type" : "type-1680" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11464,13 +11648,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11480,13 +11664,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11497,10 +11681,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11510,14 +11694,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { +- "referenced_type" : "type-2406" ++ "referenced_type" : "type-2401" + }, + { + "default_arg" : true, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "default_arg" : true, +@@ -11534,22 +11718,22 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-2345" ++ "referenced_type" : "type-2340" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11559,13 +11743,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11575,10 +11759,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], +- "return_type" : "type-2335", ++ "return_type" : "type-2330", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11588,10 +11772,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11601,10 +11785,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2424" ++ "referenced_type" : "type-2419" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11614,22 +11798,22 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2424" ++ "referenced_type" : "type-2419" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-2345" ++ "referenced_type" : "type-2340" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11639,13 +11823,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2424" ++ "referenced_type" : "type-2419" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11655,10 +11839,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2424" ++ "referenced_type" : "type-2419" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11668,10 +11852,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2424" ++ "referenced_type" : "type-2419" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11681,10 +11865,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2424" ++ "referenced_type" : "type-2419" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11694,10 +11878,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2424" ++ "referenced_type" : "type-2419" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11707,14 +11891,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { +- "referenced_type" : "type-2360" ++ "referenced_type" : "type-2355" + }, + { + "default_arg" : true, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "default_arg" : true, +@@ -11722,7 +11906,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-949" ++ "referenced_type" : "type-946" + } + ], + "return_type" : "type-19", +@@ -11736,13 +11920,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { +- "referenced_type" : "type-2415" ++ "referenced_type" : "type-2410" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11753,13 +11937,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11770,16 +11954,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11789,7 +11973,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], + "return_type" : "type-19", +@@ -11802,16 +11986,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2355" ++ "referenced_type" : "type-2350" + }, + { +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "default_arg" : true, +@@ -11819,7 +12003,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-2792" ++ "referenced_type" : "type-2786" + } + ], + "return_type" : "type-19", +@@ -11832,13 +12016,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11848,13 +12032,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11865,10 +12049,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11879,10 +12063,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11893,10 +12077,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11905,10 +12089,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-126" ++ "referenced_type" : "type-125" + } + ], +- "return_type" : "type-157", ++ "return_type" : "type-156", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -11917,10 +12101,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-124" ++ "referenced_type" : "type-123" + } + ], +- "return_type" : "type-157", ++ "return_type" : "type-156", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -11929,7 +12113,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { + "referenced_type" : "type-19" +@@ -11938,7 +12122,7 @@ + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-157", ++ "return_type" : "type-156", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -11949,10 +12133,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-158" ++ "referenced_type" : "type-157" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { + "referenced_type" : "type-86" +@@ -11961,7 +12145,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -11972,10 +12156,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-158" ++ "referenced_type" : "type-157" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -11986,10 +12170,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-158" ++ "referenced_type" : "type-157" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { + "referenced_type" : "type-86" +@@ -11998,7 +12182,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12009,10 +12193,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-158" ++ "referenced_type" : "type-157" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12022,10 +12206,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-158" ++ "referenced_type" : "type-157" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12035,10 +12219,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-158" ++ "referenced_type" : "type-157" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12048,10 +12232,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-158" ++ "referenced_type" : "type-157" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12060,10 +12244,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2553" ++ "referenced_type" : "type-2548" + } + ], +- "return_type" : "type-71", ++ "return_type" : "type-70", + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h" + }, + { +@@ -12072,10 +12256,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2546" ++ "referenced_type" : "type-2541" + } + ], +- "return_type" : "type-71", ++ "return_type" : "type-70", + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h" + }, + { +@@ -12085,10 +12269,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2550" ++ "referenced_type" : "type-2545" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h" + }, + { +@@ -12099,10 +12283,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2550" ++ "referenced_type" : "type-2545" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h" + }, + { +@@ -12113,10 +12297,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2550" ++ "referenced_type" : "type-2545" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h" + }, + { +@@ -12127,10 +12311,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2550" ++ "referenced_type" : "type-2545" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h" + }, + { +@@ -12140,10 +12324,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3886" ++ "referenced_type" : "type-3879" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -12153,10 +12337,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3886" ++ "referenced_type" : "type-3879" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -12166,10 +12350,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3886" ++ "referenced_type" : "type-3879" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -12179,10 +12363,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3886" ++ "referenced_type" : "type-3879" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -12191,12 +12375,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-356", ++ "return_type" : "type-355", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h", +- "template_args" : [ "type-34", "type-419", "type-355" ] ++ "template_args" : [ "type-34", "type-417", "type-354" ] + }, + { + "function_name" : "android::hardware::fromBinder", +@@ -12204,12 +12388,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-590", ++ "return_type" : "type-588", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h", +- "template_args" : [ "type-541", "type-864", "type-862" ] ++ "template_args" : [ "type-539", "type-861", "type-859" ] + }, + { + "function_name" : "android::hardware::fromBinder", +@@ -12217,12 +12401,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-595", ++ "return_type" : "type-593", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h", +- "template_args" : [ "type-544", "type-890", "type-888" ] ++ "template_args" : [ "type-542", "type-887", "type-884" ] + }, + { + "function_name" : "android::hardware::fromBinder", +@@ -12230,12 +12414,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-585", ++ "return_type" : "type-583", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h", +- "template_args" : [ "type-565", "type-774", "type-845" ] ++ "template_args" : [ "type-563", "type-770", "type-842" ] + }, + { + "access" : "protected", +@@ -12245,10 +12429,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2364" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -12259,13 +12443,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2364" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -12276,16 +12460,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2364" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -12296,13 +12480,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2364" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -12313,13 +12497,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2364" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -12330,10 +12514,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2364" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -12344,10 +12528,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2364" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -12358,10 +12542,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2364" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -12372,10 +12556,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12385,17 +12569,17 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { +- "referenced_type" : "type-91" ++ "referenced_type" : "type-90" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12405,13 +12589,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { + "referenced_type" : "type-86" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12421,13 +12605,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { + "referenced_type" : "type-16" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12437,13 +12621,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12453,10 +12637,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12466,13 +12650,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { + "referenced_type" : "type-86" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12482,13 +12666,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { + "referenced_type" : "type-16" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12498,13 +12682,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12514,10 +12698,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12527,10 +12711,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12540,10 +12724,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12553,13 +12737,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { + "referenced_type" : "type-86" + } + ], +- "return_type" : "type-88", ++ "return_type" : "type-87", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12569,13 +12753,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { + "referenced_type" : "type-16" + } + ], +- "return_type" : "type-88", ++ "return_type" : "type-87", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12585,13 +12769,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + } + ], +- "return_type" : "type-88", ++ "return_type" : "type-87", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12601,16 +12785,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12620,10 +12804,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12634,16 +12818,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12654,13 +12838,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-116" ++ "referenced_type" : "type-115" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12670,13 +12854,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-116" ++ "referenced_type" : "type-115" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12686,13 +12870,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12702,16 +12886,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12721,13 +12905,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-115" ++ "referenced_type" : "type-114" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12737,13 +12921,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12753,10 +12937,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12766,13 +12950,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-116" ++ "referenced_type" : "type-115" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12782,13 +12966,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12798,16 +12982,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12817,13 +13001,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-115" ++ "referenced_type" : "type-114" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12833,13 +13017,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12849,10 +13033,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12862,10 +13046,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12875,10 +13059,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12888,13 +13072,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-116" ++ "referenced_type" : "type-115" + } + ], +- "return_type" : "type-118", ++ "return_type" : "type-117", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12904,13 +13088,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "return_type" : "type-118", ++ "return_type" : "type-117", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12920,13 +13104,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-115" ++ "referenced_type" : "type-114" + } + ], +- "return_type" : "type-118", ++ "return_type" : "type-117", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12936,19 +13120,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-118", ++ "return_type" : "type-117", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "function_name" : "android::hardware::ProcessState::selfOrNull", + "linker_set_key" : "_ZN7android8hardware12ProcessState10selfOrNullEv", +- "return_type" : "type-491", ++ "return_type" : "type-489", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -12958,7 +13142,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + } + ], + "return_type" : "type-1", +@@ -12971,16 +13155,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -12990,7 +13174,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + } + ], + "return_type" : "type-1", +@@ -13003,10 +13187,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13016,13 +13200,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-71", ++ "return_type" : "type-70", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13032,16 +13216,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { +- "referenced_type" : "type-350" ++ "referenced_type" : "type-349" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-71", ++ "return_type" : "type-70", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13053,7 +13237,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-491", ++ "return_type" : "type-489", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13063,13 +13247,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13079,16 +13263,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + }, + { +- "referenced_type" : "type-350" ++ "referenced_type" : "type-349" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13098,13 +13282,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13114,10 +13298,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13128,13 +13312,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-3809", ++ "return_type" : "type-3802", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13144,13 +13328,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { +- "referenced_type" : "type-2433" ++ "referenced_type" : "type-2428" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13160,13 +13344,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + } + ], + "return_type" : "type-19", +@@ -13179,16 +13363,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { +- "referenced_type" : "type-2432" ++ "referenced_type" : "type-2427" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13199,10 +13383,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + } + ], +- "return_type" : "type-221", ++ "return_type" : "type-220", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13212,13 +13396,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-2382", ++ "return_type" : "type-2377", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13228,13 +13412,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-71", ++ "return_type" : "type-70", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13244,13 +13428,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "return_type" : "type-19", +@@ -13263,7 +13447,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { + "referenced_type" : "type-19" +@@ -13275,7 +13459,7 @@ + { + "function_name" : "android::hardware::ProcessState::self", + "linker_set_key" : "_ZN7android8hardware12ProcessState4selfEv", +- "return_type" : "type-491", ++ "return_type" : "type-489", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13286,13 +13470,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13303,13 +13487,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13320,10 +13504,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13334,10 +13518,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13348,10 +13532,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13360,10 +13544,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-137" ++ "referenced_type" : "type-136" + }, + { +- "referenced_type" : "type-373" ++ "referenced_type" : "type-372" + } + ], + "return_type" : "type-19", +@@ -13375,10 +13559,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-168" ++ "referenced_type" : "type-167" + }, + { +- "referenced_type" : "type-371" ++ "referenced_type" : "type-370" + } + ], + "return_type" : "type-19", +@@ -13391,31 +13575,31 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-1030" ++ "referenced_type" : "type-1027" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2353" ++ "referenced_type" : "type-2348" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { + "function_name" : "android::hardware::IPCThreadState::selfOrNull", + "linker_set_key" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv", +- "return_type" : "type-3638", ++ "return_type" : "type-3631", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13426,10 +13610,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13439,14 +13623,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13456,10 +13640,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { +- "referenced_type" : "type-521" ++ "referenced_type" : "type-519" + } + ], + "return_type" : "type-19", +@@ -13472,13 +13656,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13490,10 +13674,10 @@ + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13503,10 +13687,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13516,16 +13700,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13535,7 +13719,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], + "return_type" : "type-19", +@@ -13549,7 +13733,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "referenced_type" : "type-19" +@@ -13565,10 +13749,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13578,14 +13762,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13596,11 +13780,11 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "return_type" : "type-19", +@@ -13613,13 +13797,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13629,16 +13813,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13649,14 +13833,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "default_arg" : true, +- "referenced_type" : "type-521" ++ "referenced_type" : "type-519" + } + ], + "return_type" : "type-19", +@@ -13669,10 +13853,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13682,13 +13866,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { +- "referenced_type" : "type-3644" ++ "referenced_type" : "type-3637" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13698,10 +13882,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13711,13 +13895,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13727,13 +13911,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { +- "referenced_type" : "type-472" ++ "referenced_type" : "type-470" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13743,7 +13927,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], + "return_type" : "type-447", +@@ -13757,7 +13941,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], + "return_type" : "type-19", +@@ -13770,7 +13954,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], + "return_type" : "type-19", +@@ -13784,10 +13968,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13798,7 +13982,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "referenced_type" : "type-19" +@@ -13813,10 +13997,10 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2355" ++ "referenced_type" : "type-2350" + }, + { +- "referenced_type" : "type-521" ++ "referenced_type" : "type-519" + } + ], + "return_type" : "type-19", +@@ -13829,7 +14013,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "referenced_type" : "type-19" +@@ -13845,13 +14029,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], + "return_type" : "type-19", +@@ -13865,10 +14049,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13878,13 +14062,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "referenced_type" : "type-447" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13894,13 +14078,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], + "return_type" : "type-19", +@@ -13913,10 +14097,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13926,10 +14110,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13939,19 +14123,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { + "function_name" : "android::hardware::IPCThreadState::self", + "linker_set_key" : "_ZN7android8hardware14IPCThreadState4selfEv", +- "return_type" : "type-3638", ++ "return_type" : "type-3631", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13961,16 +14145,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], +- "return_type" : "type-491", ++ "return_type" : "type-489", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { + "function_name" : "android::hardware::IPCThreadState::shutdown", + "linker_set_key" : "_ZN7android8hardware14IPCThreadState8shutdownEv", +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13980,7 +14164,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "referenced_type" : "type-19" +@@ -13989,10 +14173,10 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2355" ++ "referenced_type" : "type-2350" + }, + { +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -14009,10 +14193,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { +- "referenced_type" : "type-2355" ++ "referenced_type" : "type-2350" + }, + { + "referenced_type" : "type-1" +@@ -14029,10 +14213,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -14043,10 +14227,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -14057,10 +14241,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -14071,10 +14255,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -14083,10 +14267,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-166" ++ "referenced_type" : "type-165" + }, + { +- "referenced_type" : "type-370" ++ "referenced_type" : "type-369" + } + ], + "return_type" : "type-19", +@@ -14098,10 +14282,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-370" ++ "referenced_type" : "type-369" + } + ], +- "return_type" : "type-134", ++ "return_type" : "type-133", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -14110,16 +14294,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-3622" ++ "referenced_type" : "type-3615" + }, + { +- "referenced_type" : "type-3772" ++ "referenced_type" : "type-3765" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -14128,13 +14312,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, + { +@@ -14149,19 +14333,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, + { + "function_name" : "android::hardware::joinRpcThreadpool", + "linker_set_key" : "_ZN7android8hardware17joinRpcThreadpoolEv", +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, + { +@@ -14171,13 +14355,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2507" ++ "referenced_type" : "type-2502" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { +@@ -14187,17 +14371,17 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2507" ++ "referenced_type" : "type-2502" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { + "access" : "private", + "function_name" : "android::hardware::BufferedTextOutput::getThreadState", + "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv", +- "return_type" : "type-2508", ++ "return_type" : "type-2503", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { +@@ -14207,10 +14391,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { +@@ -14220,10 +14404,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2507" ++ "referenced_type" : "type-2502" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { + "referenced_type" : "type-1" +@@ -14239,10 +14423,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2507" ++ "referenced_type" : "type-2502" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { +@@ -14252,14 +14436,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2507" ++ "referenced_type" : "type-2502" + }, + { + "default_arg" : true, + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { +@@ -14269,10 +14453,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2507" ++ "referenced_type" : "type-2502" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { +@@ -14282,10 +14466,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2507" ++ "referenced_type" : "type-2502" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { +@@ -14295,10 +14479,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2507" ++ "referenced_type" : "type-2502" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { +@@ -14307,10 +14491,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-376" ++ "referenced_type" : "type-375" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -14338,14 +14522,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-532" ++ "referenced_type" : "type-530" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { + "default_arg" : true, +- "referenced_type" : "type-535" ++ "referenced_type" : "type-533" + } + ], + "return_type" : "type-19", +@@ -14358,10 +14542,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-532" ++ "referenced_type" : "type-530" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, + { +@@ -14371,16 +14555,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-532" ++ "referenced_type" : "type-530" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, + { + "function_name" : "android::hardware::defaultServiceManager", + "linker_set_key" : "_ZN7android8hardware21defaultServiceManagerEv", +- "return_type" : "type-575", ++ "return_type" : "type-573", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { +@@ -14389,7 +14573,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { + "referenced_type" : "type-19" +@@ -14398,7 +14582,7 @@ + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, + { +@@ -14413,10 +14597,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-371" ++ "referenced_type" : "type-370" + }, + { + "referenced_type" : "type-1" +@@ -14434,10 +14618,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-124" ++ "referenced_type" : "type-123" + }, + { +- "referenced_type" : "type-371" ++ "referenced_type" : "type-370" + }, + { + "referenced_type" : "type-1" +@@ -14455,10 +14639,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-371" ++ "referenced_type" : "type-370" + }, + { + "referenced_type" : "type-1" +@@ -14479,10 +14663,10 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, + { +@@ -14491,10 +14675,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-370" ++ "referenced_type" : "type-369" + }, + { + "referenced_type" : "type-1" +@@ -14512,10 +14696,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-124" ++ "referenced_type" : "type-123" + }, + { +- "referenced_type" : "type-370" ++ "referenced_type" : "type-369" + }, + { + "referenced_type" : "type-1" +@@ -14533,10 +14717,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-370" ++ "referenced_type" : "type-369" + }, + { + "referenced_type" : "type-1" +@@ -14557,25 +14741,25 @@ + "referenced_type" : "type-33" + } + ], +- "return_type" : "type-71", ++ "return_type" : "type-70", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { + "function_name" : "android::hardware::joinBinderRpcThreadpool", + "linker_set_key" : "_ZN7android8hardware23joinBinderRpcThreadpoolEv", +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { + "function_name" : "android::hardware::defaultServiceManager1_1", + "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_1Ev", +- "return_type" : "type-580", ++ "return_type" : "type-578", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { + "function_name" : "android::hardware::defaultServiceManager1_2", + "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_2Ev", +- "return_type" : "type-585", ++ "return_type" : "type-583", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { +@@ -14585,13 +14769,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-363" ++ "referenced_type" : "type-362" + }, + { +- "referenced_type" : "type-367" ++ "referenced_type" : "type-366" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -14601,10 +14785,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-363" ++ "referenced_type" : "type-362" + } + ], +- "return_type" : "type-361", ++ "return_type" : "type-360", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -14614,19 +14798,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-363" ++ "referenced_type" : "type-362" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -14636,19 +14820,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-363" ++ "referenced_type" : "type-362" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -14660,22 +14844,22 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { + "function_name" : "android::hardware::getPassthroughServiceManager", + "linker_set_key" : "_ZN7android8hardware28getPassthroughServiceManagerEv", +- "return_type" : "type-575", ++ "return_type" : "type-573", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { + "function_name" : "android::hardware::getPassthroughServiceManager1_1", + "linker_set_key" : "_ZN7android8hardware31getPassthroughServiceManager1_1Ev", +- "return_type" : "type-580", ++ "return_type" : "type-578", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { +@@ -14684,10 +14868,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-176" ++ "referenced_type" : "type-175" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -14697,10 +14881,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-298" ++ "referenced_type" : "type-297" + } + ], + "return_type" : "type-19", +@@ -14713,7 +14897,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-2" +@@ -14729,7 +14913,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-19" +@@ -14745,7 +14929,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-447" +@@ -14761,10 +14945,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-199" ++ "referenced_type" : "type-198" + } + ], + "return_type" : "type-19", +@@ -14778,7 +14962,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -14794,7 +14978,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -14810,16 +14994,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + } + ], + "return_type" : "type-19", +@@ -14832,7 +15016,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-4" +@@ -14848,15 +15032,15 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-3772" ++ "referenced_type" : "type-3765" + } + ], + "return_type" : "type-19", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-4082" ] ++ "template_args" : [ "type-4074" ] + }, + { + "function_name" : "android::hardware::Parcel::writeUint16", +@@ -14865,10 +15049,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + } + ], + "return_type" : "type-19", +@@ -14881,7 +15065,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -14897,7 +15081,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-21" +@@ -14914,7 +15098,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -14930,10 +15114,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], + "return_type" : "type-19", +@@ -14946,13 +15130,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-245", ++ "return_type" : "type-244", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -14963,7 +15147,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -14980,7 +15164,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -14996,10 +15180,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-343" ++ "referenced_type" : "type-342" + }, + { + "referenced_type" : "type-1" +@@ -15015,10 +15199,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-350" ++ "referenced_type" : "type-349" + } + ], + "return_type" : "type-19", +@@ -15031,10 +15215,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-3769" ++ "referenced_type" : "type-3762" + } + ], + "return_type" : "type-19", +@@ -15047,10 +15231,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { + "referenced_type" : "type-1" +@@ -15067,10 +15251,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15081,10 +15265,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15095,10 +15279,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15108,10 +15292,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + }, + { + "referenced_type" : "type-1" +@@ -15130,7 +15314,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -15146,10 +15330,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-3753" ++ "referenced_type" : "type-3746" + } + ], + "return_type" : "type-19", +@@ -15162,10 +15346,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], + "return_type" : "type-19", +@@ -15184,10 +15368,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + } + ], + "return_type" : "type-19", +@@ -15207,28 +15391,28 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-1030" ++ "referenced_type" : "type-1027" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2353" ++ "referenced_type" : "type-2348" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2351" ++ "referenced_type" : "type-2346" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15238,16 +15422,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + }, + { + "referenced_type" : "type-1" +@@ -15266,10 +15450,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], + "return_type" : "type-19", +@@ -15282,10 +15466,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15296,7 +15480,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], + "return_type" : "type-19", +@@ -15309,10 +15493,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + }, + { + "referenced_type" : "type-1" +@@ -15337,7 +15521,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-16" +@@ -15353,13 +15537,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-16" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "default_arg" : true, +@@ -15380,7 +15564,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-16" +@@ -15402,10 +15586,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + }, + { + "referenced_type" : "type-1" +@@ -15424,10 +15608,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { + "referenced_type" : "type-1" +@@ -15443,7 +15627,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -15452,7 +15636,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15462,10 +15646,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-1030" ++ "referenced_type" : "type-1027" + }, + { + "referenced_type" : "type-1" +@@ -15481,10 +15665,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15495,7 +15679,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -15511,13 +15695,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15528,10 +15712,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15541,10 +15725,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "return_type" : "type-19", +@@ -15557,7 +15741,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-550" +@@ -15573,10 +15757,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15586,10 +15770,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15599,10 +15783,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15612,10 +15796,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15627,7 +15811,7 @@ + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-104", ++ "return_type" : "type-103", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -15637,16 +15821,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-166" ++ "referenced_type" : "type-165" + }, + { + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -15656,13 +15840,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-166" ++ "referenced_type" : "type-165" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -15674,7 +15858,7 @@ + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-104", ++ "return_type" : "type-103", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -15686,16 +15870,16 @@ + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "return_type" : "type-104", ++ "return_type" : "type-103", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { + "function_name" : "android::hardware::Status::ok", + "linker_set_key" : "_ZN7android8hardware6Status2okEv", +- "return_type" : "type-104", ++ "return_type" : "type-103", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -15706,7 +15890,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-166" ++ "referenced_type" : "type-165" + }, + { + "referenced_type" : "type-19" +@@ -15715,7 +15899,7 @@ + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -15726,7 +15910,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-166" ++ "referenced_type" : "type-165" + }, + { + "referenced_type" : "type-19" +@@ -15735,10 +15919,10 @@ + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -15749,7 +15933,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-166" ++ "referenced_type" : "type-165" + }, + { + "referenced_type" : "type-19" +@@ -15758,7 +15942,7 @@ + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -15769,7 +15953,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-166" ++ "referenced_type" : "type-165" + }, + { + "referenced_type" : "type-19" +@@ -15778,10 +15962,10 @@ + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -15791,10 +15975,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2487" ++ "referenced_type" : "type-2482" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { + "referenced_type" : "type-1" +@@ -15804,7 +15988,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -15814,10 +15998,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2487" ++ "referenced_type" : "type-2482" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { + "referenced_type" : "type-1" +@@ -15827,7 +16011,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -15837,10 +16021,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + } + ], +- "return_type" : "type-2332", ++ "return_type" : "type-2327", + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, + { +@@ -15850,10 +16034,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + } + ], +- "return_type" : "type-2335", ++ "return_type" : "type-2330", + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, + { +@@ -15863,10 +16047,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, + { +@@ -15877,10 +16061,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, + { +@@ -15891,10 +16075,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, + { +@@ -15905,10 +16089,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, + { +@@ -15918,13 +16102,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-301" ++ "referenced_type" : "type-300" + }, + { +- "referenced_type" : "type-308" ++ "referenced_type" : "type-307" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, + { +@@ -15934,13 +16118,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-301" ++ "referenced_type" : "type-300" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, + { +@@ -15950,10 +16134,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-301" ++ "referenced_type" : "type-300" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, + { +@@ -15963,10 +16147,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-301" ++ "referenced_type" : "type-300" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, + { +@@ -15976,10 +16160,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-301" ++ "referenced_type" : "type-300" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, + { +@@ -15989,16 +16173,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-301" ++ "referenced_type" : "type-300" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, + { + "function_name" : "android::hardware::details::debuggable", + "linker_set_key" : "_ZN7android8hardware7details10debuggableEv", +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -16007,18 +16191,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-356" ++ "referenced_type" : "type-355" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-986", ++ "return_type" : "type-983", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-552", "type-34", "type-873" ] ++ "template_args" : [ "type-548", "type-34", "type-870" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16026,18 +16210,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-356" ++ "referenced_type" : "type-355" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1093", ++ "return_type" : "type-1090", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-541", "type-34", "type-864" ] ++ "template_args" : [ "type-539", "type-34", "type-861" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16045,18 +16229,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-356" ++ "referenced_type" : "type-355" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1153", ++ "return_type" : "type-1150", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-562", "type-34", "type-881" ] ++ "template_args" : [ "type-560", "type-34", "type-878" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16064,18 +16248,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-575" ++ "referenced_type" : "type-573" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1153", ++ "return_type" : "type-1150", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-562", "type-552", "type-881" ] ++ "template_args" : [ "type-560", "type-548", "type-878" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16083,18 +16267,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-356" ++ "referenced_type" : "type-355" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1213", ++ "return_type" : "type-1210", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-544", "type-34", "type-890" ] ++ "template_args" : [ "type-542", "type-34", "type-887" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16102,18 +16286,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-356" ++ "referenced_type" : "type-355" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1284", ++ "return_type" : "type-1281", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-565", "type-34", "type-774" ] ++ "template_args" : [ "type-563", "type-34", "type-770" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16121,18 +16305,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-575" ++ "referenced_type" : "type-573" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1284", ++ "return_type" : "type-1281", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-565", "type-552", "type-774" ] ++ "template_args" : [ "type-563", "type-548", "type-770" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16140,18 +16324,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-580" ++ "referenced_type" : "type-578" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1284", ++ "return_type" : "type-1281", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-565", "type-562", "type-774" ] ++ "template_args" : [ "type-563", "type-560", "type-770" ] + }, + { + "function_name" : "android::hardware::details::getDescriptor", +@@ -16162,7 +16346,7 @@ + "referenced_type" : "type-33" + } + ], +- "return_type" : "type-685", ++ "return_type" : "type-683", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h" + }, + { +@@ -16172,10 +16356,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-172" ++ "referenced_type" : "type-171" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -16185,10 +16369,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-172" ++ "referenced_type" : "type-171" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -16198,13 +16382,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-172" ++ "referenced_type" : "type-171" + }, + { +- "referenced_type" : "type-173" ++ "referenced_type" : "type-172" + } + ], +- "return_type" : "type-266", ++ "return_type" : "type-265", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -16213,10 +16397,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16225,12 +16409,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-356" ++ "referenced_type" : "type-355" + } + ], +- "return_type" : "type-356", ++ "return_type" : "type-355", + "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h", +- "template_args" : [ "type-34", "type-106" ] ++ "template_args" : [ "type-34", "type-105" ] + }, + { + "function_name" : "android::hardware::details::wrapPassthrough", +@@ -16238,12 +16422,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-590" ++ "referenced_type" : "type-588" + } + ], +- "return_type" : "type-590", ++ "return_type" : "type-588", + "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h", +- "template_args" : [ "type-541", "type-106" ] ++ "template_args" : [ "type-539", "type-105" ] + }, + { + "function_name" : "android::hardware::details::wrapPassthrough", +@@ -16251,12 +16435,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-595" ++ "referenced_type" : "type-593" + } + ], +- "return_type" : "type-595", ++ "return_type" : "type-593", + "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h", +- "template_args" : [ "type-544", "type-106" ] ++ "template_args" : [ "type-542", "type-105" ] + }, + { + "access" : "protected", +@@ -16266,13 +16450,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-273" ++ "referenced_type" : "type-272" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16283,14 +16467,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16301,13 +16485,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-247" ++ "referenced_type" : "type-246" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16317,16 +16501,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-214" ++ "referenced_type" : "type-213" + }, + { +- "referenced_type" : "type-214" ++ "referenced_type" : "type-213" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16336,16 +16520,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-214" ++ "referenced_type" : "type-213" + }, + { +- "referenced_type" : "type-214" ++ "referenced_type" : "type-213" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16355,10 +16539,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16368,10 +16552,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16381,10 +16565,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16396,14 +16580,14 @@ + "referenced_type" : "type-33" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h" + }, + { +@@ -16418,19 +16602,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-849" ++ "referenced_type" : "type-845" + }, + { +- "referenced_type" : "type-849" ++ "referenced_type" : "type-845" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { + "function_name" : "android::hardware::details::getVndkVersionStr", + "linker_set_key" : "_ZN7android8hardware7details17getVndkVersionStrEv", +- "return_type" : "type-686", ++ "return_type" : "type-684", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16439,18 +16623,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1048" ++ "referenced_type" : "type-1045" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-575", ++ "return_type" : "type-573", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-873", "type-552", "type-106", "type-106" ] ++ "template_args" : [ "type-870", "type-548", "type-105", "type-105" ] + }, + { + "function_name" : "android::hardware::details::getServiceInternal", +@@ -16458,18 +16642,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1115" ++ "referenced_type" : "type-1112" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-590", ++ "return_type" : "type-588", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-864", "type-541", "type-106", "type-106" ] ++ "template_args" : [ "type-861", "type-539", "type-105", "type-105" ] + }, + { + "function_name" : "android::hardware::details::getServiceInternal", +@@ -16477,18 +16661,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1176" ++ "referenced_type" : "type-1173" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-580", ++ "return_type" : "type-578", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-881", "type-562", "type-106", "type-106" ] ++ "template_args" : [ "type-878", "type-560", "type-105", "type-105" ] + }, + { + "function_name" : "android::hardware::details::getServiceInternal", +@@ -16496,18 +16680,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1235" ++ "referenced_type" : "type-1232" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-595", ++ "return_type" : "type-593", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-890", "type-544", "type-106", "type-106" ] ++ "template_args" : [ "type-887", "type-542", "type-105", "type-105" ] + }, + { + "function_name" : "android::hardware::details::getServiceInternal", +@@ -16515,29 +16699,29 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1314" ++ "referenced_type" : "type-1311" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-585", ++ "return_type" : "type-583", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-774", "type-565", "type-106", "type-106" ] ++ "template_args" : [ "type-770", "type-563", "type-105", "type-105" ] + }, + { + "function_name" : "android::hardware::details::getBnConstructorMap", + "linker_set_key" : "_ZN7android8hardware7details19getBnConstructorMapEv", +- "return_type" : "type-926", ++ "return_type" : "type-923", + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, + { + "function_name" : "android::hardware::details::getBsConstructorMap", + "linker_set_key" : "_ZN7android8hardware7details19getBsConstructorMapEv", +- "return_type" : "type-927", ++ "return_type" : "type-924", + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, + { +@@ -16546,19 +16730,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-849" ++ "referenced_type" : "type-845" + }, + { +- "referenced_type" : "type-849" ++ "referenced_type" : "type-845" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-356", ++ "return_type" : "type-355", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { +@@ -16567,10 +16751,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-356" ++ "referenced_type" : "type-355" + } + ], +- "return_type" : "type-356", ++ "return_type" : "type-355", + "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h" + }, + { +@@ -16579,10 +16763,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-849" ++ "referenced_type" : "type-845" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { +@@ -16591,10 +16775,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-849" ++ "referenced_type" : "type-845" + } + ], + "return_type" : "type-19", +@@ -16608,16 +16792,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2355" ++ "referenced_type" : "type-2350" + }, + { +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "default_arg" : true, +@@ -16625,7 +16809,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-2793" ++ "referenced_type" : "type-2787" + } + ], + "return_type" : "type-19", +@@ -16638,14 +16822,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + }, + { +- "referenced_type" : "type-2358" ++ "referenced_type" : "type-2353" + }, + { + "default_arg" : true, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "default_arg" : true, +@@ -16662,10 +16846,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], +- "return_type" : "type-2332", ++ "return_type" : "type-2327", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16675,22 +16859,22 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-2345" ++ "referenced_type" : "type-2340" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16700,13 +16884,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16716,14 +16900,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + }, + { +- "referenced_type" : "type-2360" ++ "referenced_type" : "type-2355" + }, + { + "default_arg" : true, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "default_arg" : true, +@@ -16731,7 +16915,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-949" ++ "referenced_type" : "type-946" + } + ], + "return_type" : "type-19", +@@ -16744,10 +16928,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16758,13 +16942,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16775,10 +16959,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], +- "return_type" : "type-2363", ++ "return_type" : "type-2358", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16788,7 +16972,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], + "return_type" : "type-19", +@@ -16801,7 +16985,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], + "return_type" : "type-19", +@@ -16814,16 +16998,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2355" ++ "referenced_type" : "type-2350" + }, + { +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "default_arg" : true, +@@ -16831,7 +17015,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-2794" ++ "referenced_type" : "type-2788" + } + ], + "return_type" : "type-19", +@@ -16844,10 +17028,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16857,10 +17041,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16871,10 +17055,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16885,10 +17069,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16899,10 +17083,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16911,13 +17095,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2476" ++ "referenced_type" : "type-2471" + }, + { +- "referenced_type" : "type-3888" ++ "referenced_type" : "type-3881" + } + ], +- "return_type" : "type-2476", ++ "return_type" : "type-2471", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -16926,13 +17110,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2476" ++ "referenced_type" : "type-2471" + }, + { +- "referenced_type" : "type-3887" ++ "referenced_type" : "type-3880" + } + ], +- "return_type" : "type-2476", ++ "return_type" : "type-2471", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -16941,13 +17125,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-119" ++ "referenced_type" : "type-118" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-119", ++ "return_type" : "type-118", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -16956,469 +17140,1697 @@ + "parameters" : + [ + { +- "referenced_type" : "type-264" ++ "referenced_type" : "type-263" + }, + { +- "referenced_type" : "type-168" ++ "referenced_type" : "type-167" + } + ], +- "return_type" : "type-264", ++ "return_type" : "type-263", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +- "function_name" : "android::hardware::BpHwBinder::findObject", +- "linker_set_key" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_compare", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_compareEPKvSA_", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2373" ++ "referenced_type" : "type-3821" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-245", +- "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" ++ "return_type" : "type-19", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::BpHwBinder::ObjectManager::find", +- "linker_set_key" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_destroy", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_destroyEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2426" ++ "referenced_type" : "type-3821" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-245", +- "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::hidl_handle::getNativeHandle", +- "linker_set_key" : "_ZNK7android8hardware11hidl_handle15getNativeHandleEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_construct", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE12do_constructEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-95" ++ "referenced_type" : "type-3821" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-16", +- "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::hidl_handle::operator const native_handle *", +- "linker_set_key" : "_ZNK7android8hardware11hidl_handlecvPK13native_handleEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_move_forward", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE15do_move_forwardEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-95" ++ "referenced_type" : "type-3821" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-16", +- "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::hidl_handle::operator->", +- "linker_set_key" : "_ZNK7android8hardware11hidl_handleptEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_move_backward", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE16do_move_backwardEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-95" ++ "referenced_type" : "type-3821" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-16", +- "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::hidl_string::size", +- "linker_set_key" : "_ZNK7android8hardware11hidl_string4sizeEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_copy", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE7do_copyEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-117" ++ "referenced_type" : "type-3821" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-1", +- "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::hidl_string::c_str", +- "linker_set_key" : "_ZNK7android8hardware11hidl_string5c_strEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_splat", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE8do_splatEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-117" ++ "referenced_type" : "type-3821" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-99", +- "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::hidl_string::empty", +- "linker_set_key" : "_ZNK7android8hardware11hidl_string5emptyEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_compare", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_compareES3_S3_", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-117" ++ "referenced_type" : "type-2404" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-44", +- "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ "return_type" : "type-19", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::hidl_string::operator basic_string", +- "linker_set_key" : "_ZNK7android8hardware11hidl_stringcvNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_destroy", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_destroyEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-117" ++ "referenced_type" : "type-2404" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-700", +- "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::ProcessState::isContextManager", +- "linker_set_key" : "_ZNK7android8hardware12ProcessState16isContextManagerEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_construct", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE12do_constructEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3847" ++ "referenced_type" : "type-2404" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-44", +- "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::IPCThreadState::getCallingPid", +- "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_move_forward", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE15do_move_forwardEPvS3_j", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3641" ++ "referenced_type" : "type-2404" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::IPCThreadState::getCallingSid", +- "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_move_backward", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE16do_move_backwardEPvS3_j", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3641" ++ "referenced_type" : "type-2404" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-99", +- "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::IPCThreadState::getCallingUid", +- "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_copy", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE7do_copyEPvS3_j", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3641" ++ "referenced_type" : "type-2404" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-1", +- "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::IPCThreadState::isServingCall", +- "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_splat", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE8do_splatEPvS3_j", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3641" ++ "referenced_type" : "type-2404" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-44", +- "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::IPCThreadState::getStrictModePolicy", +- "linker_set_key" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv", ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE10do_destroyEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3641" ++ "referenced_type" : "type-2516" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::IPCThreadState::getLastTransactionBinderFlags", +- "linker_set_key" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv", ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE12do_constructEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3641" ++ "referenced_type" : "type-2516" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "access" : "private", +- "function_name" : "android::hardware::BufferedTextOutput::getBuffer", +- "linker_set_key" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv", ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2511" ++ "referenced_type" : "type-2516" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-2471", +- "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::clearCache", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10clearCacheEv", ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-2516" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::errorCheck", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10errorCheckEv", ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-2516" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::findBuffer", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_", ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-2516" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-1" ++ "referenced_type" : "type-138" + }, + { +- "referenced_type" : "type-3779" ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE10do_destroyEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2409" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::ipcObjects", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10ipcObjectsEv", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE12do_constructEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-2409" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-1", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::readBuffer", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE15do_move_forwardEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-2409" + }, + { +- "referenced_type" : "type-1" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-138" + }, + { +- "referenced_type" : "type-3783" ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::readBuffer", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE16do_move_backwardEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-2409" + }, + { +- "referenced_type" : "type-1" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-138" + }, + { + "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE7do_copyEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2409" + }, + { +- "referenced_type" : "type-1" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-1" ++ "referenced_type" : "type-138" + }, + { +- "referenced_type" : "type-3783" ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::readDouble", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEPd", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE8do_splatEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-2409" + }, + { +- "referenced_type" : "type-3778" ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::readDouble", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEv", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE10do_destroyEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3825" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-4", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::readObject", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE12do_constructEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3825" + }, + { +- "default_arg" : true, +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-3782", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-4083" ] ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::readUint16", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint16EPt", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE15do_move_forwardEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3825" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" + }, + { +- "referenced_type" : "type-3775" ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::readUint32", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32EPj", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE16do_move_backwardEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3825" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::readUint32", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32Ev", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE7do_copyEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" +- } +- ], +- "return_type" : "type-1", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" +- }, +- { +- "function_name" : "android::hardware::Parcel::readUint64", ++ "referenced_type" : "type-3825" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE8do_splatEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3825" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3622" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3622" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3622" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3622" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3622" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3622" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3626" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3626" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3626" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3626" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3626" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3626" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE10do_destroyEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3618" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE12do_constructEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3618" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE15do_move_forwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3618" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE16do_move_backwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3618" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE7do_copyEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3618" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE8do_splatEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3618" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorIiE10do_destroyEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2511" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorIiE12do_constructEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2511" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2511" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2511" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorIiE7do_copyEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2511" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorIiE8do_splatEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2511" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "function_name" : "android::hardware::BpHwBinder::findObject", ++ "linker_set_key" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2368" ++ }, ++ { ++ "referenced_type" : "type-138" ++ } ++ ], ++ "return_type" : "type-244", ++ "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" ++ }, ++ { ++ "function_name" : "android::hardware::BpHwBinder::ObjectManager::find", ++ "linker_set_key" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2421" ++ }, ++ { ++ "referenced_type" : "type-138" ++ } ++ ], ++ "return_type" : "type-244", ++ "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" ++ }, ++ { ++ "function_name" : "android::hardware::hidl_handle::getNativeHandle", ++ "linker_set_key" : "_ZNK7android8hardware11hidl_handle15getNativeHandleEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-94" ++ } ++ ], ++ "return_type" : "type-16", ++ "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ }, ++ { ++ "function_name" : "android::hardware::hidl_handle::operator const native_handle *", ++ "linker_set_key" : "_ZNK7android8hardware11hidl_handlecvPK13native_handleEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-94" ++ } ++ ], ++ "return_type" : "type-16", ++ "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ }, ++ { ++ "function_name" : "android::hardware::hidl_handle::operator->", ++ "linker_set_key" : "_ZNK7android8hardware11hidl_handleptEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-94" ++ } ++ ], ++ "return_type" : "type-16", ++ "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ }, ++ { ++ "function_name" : "android::hardware::hidl_string::size", ++ "linker_set_key" : "_ZNK7android8hardware11hidl_string4sizeEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-116" ++ } ++ ], ++ "return_type" : "type-1", ++ "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ }, ++ { ++ "function_name" : "android::hardware::hidl_string::c_str", ++ "linker_set_key" : "_ZNK7android8hardware11hidl_string5c_strEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-116" ++ } ++ ], ++ "return_type" : "type-98", ++ "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ }, ++ { ++ "function_name" : "android::hardware::hidl_string::empty", ++ "linker_set_key" : "_ZNK7android8hardware11hidl_string5emptyEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-116" ++ } ++ ], ++ "return_type" : "type-43", ++ "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ }, ++ { ++ "function_name" : "android::hardware::hidl_string::operator basic_string", ++ "linker_set_key" : "_ZNK7android8hardware11hidl_stringcvNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-116" ++ } ++ ], ++ "return_type" : "type-698", ++ "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ }, ++ { ++ "function_name" : "android::hardware::ProcessState::isContextManager", ++ "linker_set_key" : "_ZNK7android8hardware12ProcessState16isContextManagerEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3840" ++ } ++ ], ++ "return_type" : "type-43", ++ "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" ++ }, ++ { ++ "function_name" : "android::hardware::IPCThreadState::getCallingPid", ++ "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3634" ++ } ++ ], ++ "return_type" : "type-19", ++ "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ }, ++ { ++ "function_name" : "android::hardware::IPCThreadState::getCallingSid", ++ "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3634" ++ } ++ ], ++ "return_type" : "type-98", ++ "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ }, ++ { ++ "function_name" : "android::hardware::IPCThreadState::getCallingUid", ++ "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3634" ++ } ++ ], ++ "return_type" : "type-1", ++ "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ }, ++ { ++ "function_name" : "android::hardware::IPCThreadState::isServingCall", ++ "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3634" ++ } ++ ], ++ "return_type" : "type-43", ++ "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ }, ++ { ++ "function_name" : "android::hardware::IPCThreadState::getStrictModePolicy", ++ "linker_set_key" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3634" ++ } ++ ], ++ "return_type" : "type-19", ++ "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ }, ++ { ++ "function_name" : "android::hardware::IPCThreadState::getLastTransactionBinderFlags", ++ "linker_set_key" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3634" ++ } ++ ], ++ "return_type" : "type-19", ++ "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ }, ++ { ++ "access" : "private", ++ "function_name" : "android::hardware::BufferedTextOutput::getBuffer", ++ "linker_set_key" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2506" ++ } ++ ], ++ "return_type" : "type-2466", ++ "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" ++ }, ++ { ++ "access" : "private", ++ "function_name" : "android::hardware::Parcel::clearCache", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10clearCacheEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3759" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::errorCheck", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10errorCheckEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3759" ++ } ++ ], ++ "return_type" : "type-19", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::findBuffer", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3759" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ }, ++ { ++ "referenced_type" : "type-3772" ++ }, ++ { ++ "referenced_type" : "type-1038" ++ }, ++ { ++ "referenced_type" : "type-1038" ++ } ++ ], ++ "return_type" : "type-19", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "access" : "private", ++ "function_name" : "android::hardware::Parcel::ipcObjects", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10ipcObjectsEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3759" ++ } ++ ], ++ "return_type" : "type-1", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::readBuffer", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3759" ++ }, ++ { ++ "referenced_type" : "type-1" ++ }, ++ { ++ "referenced_type" : "type-1038" ++ }, ++ { ++ "referenced_type" : "type-3776" ++ } ++ ], ++ "return_type" : "type-19", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "access" : "private", ++ "function_name" : "android::hardware::Parcel::readBuffer", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3759" ++ }, ++ { ++ "referenced_type" : "type-1" ++ }, ++ { ++ "referenced_type" : "type-1038" ++ }, ++ { ++ "referenced_type" : "type-1" ++ }, ++ { ++ "referenced_type" : "type-1" ++ }, ++ { ++ "referenced_type" : "type-1" ++ }, ++ { ++ "referenced_type" : "type-3776" ++ } ++ ], ++ "return_type" : "type-19", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::readDouble", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEPd", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3759" ++ }, ++ { ++ "referenced_type" : "type-3771" ++ } ++ ], ++ "return_type" : "type-19", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::readDouble", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3759" ++ } ++ ], ++ "return_type" : "type-4", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::readObject", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3759" ++ }, ++ { ++ "default_arg" : true, ++ "referenced_type" : "type-1038" ++ } ++ ], ++ "return_type" : "type-3775", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", ++ "template_args" : [ "type-4075" ] ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::readUint16", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint16EPt", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3759" ++ }, ++ { ++ "referenced_type" : "type-3768" ++ } ++ ], ++ "return_type" : "type-19", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::readUint32", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32EPj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3759" ++ }, ++ { ++ "referenced_type" : "type-1038" ++ } ++ ], ++ "return_type" : "type-19", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::readUint32", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32Ev", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3759" ++ } ++ ], ++ "return_type" : "type-1", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::readUint64", + "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64EPy", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-2350" ++ "referenced_type" : "type-2345" + } + ], + "return_type" : "type-19", +@@ -17431,7 +18843,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], + "return_type" : "type-21", +@@ -17445,10 +18857,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17459,7 +18871,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], + "return_type" : "type-1", +@@ -17472,10 +18884,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], +- "return_type" : "type-99", ++ "return_type" : "type-98", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17485,13 +18897,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-139", ++ "return_type" : "type-138", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17502,10 +18914,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + } + ], + "return_type" : "type-19", +@@ -17519,7 +18931,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], + "return_type" : "type-1", +@@ -17533,10 +18945,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17546,7 +18958,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], + "return_type" : "type-1", +@@ -17559,7 +18971,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], + "return_type" : "type-1", +@@ -17572,7 +18984,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], + "return_type" : "type-1", +@@ -17585,10 +18997,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-352" ++ "referenced_type" : "type-351" + } + ], + "return_type" : "type-19", +@@ -17601,10 +19013,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-3780" ++ "referenced_type" : "type-3773" + } + ], + "return_type" : "type-19", +@@ -17617,10 +19029,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], +- "return_type" : "type-342", ++ "return_type" : "type-341", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17631,7 +19043,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], + "return_type" : "type-1", +@@ -17644,16 +19056,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-3783" ++ "referenced_type" : "type-3776" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + }, + { +- "referenced_type" : "type-3779" ++ "referenced_type" : "type-3772" + } + ], + "return_type" : "type-19", +@@ -17666,10 +19078,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], +- "return_type" : "type-2382", ++ "return_type" : "type-2377", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17680,7 +19092,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], + "return_type" : "type-1", +@@ -17693,13 +19105,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + } + ], + "return_type" : "type-19", +@@ -17712,13 +19124,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17728,13 +19140,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17744,10 +19156,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-482" ++ "referenced_type" : "type-480" + } + ], + "return_type" : "type-19", +@@ -17760,10 +19172,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], +- "return_type" : "type-71", ++ "return_type" : "type-70", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17773,13 +19185,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + }, + { + "referenced_type" : "type-1" +@@ -17788,7 +19200,7 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-3783" ++ "referenced_type" : "type-3776" + } + ], + "return_type" : "type-19", +@@ -17801,16 +19213,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + }, + { +- "referenced_type" : "type-3783" ++ "referenced_type" : "type-3776" + } + ], + "return_type" : "type-19", +@@ -17824,10 +19236,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-3787" ++ "referenced_type" : "type-3780" + }, + { + "referenced_type" : "type-1" +@@ -17842,7 +19254,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17852,13 +19264,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + } + ], +- "return_type" : "type-343", ++ "return_type" : "type-342", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17869,7 +19281,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { + "referenced_type" : "type-1" +@@ -17878,7 +19290,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17889,7 +19301,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { + "referenced_type" : "type-1" +@@ -17898,7 +19310,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17908,13 +19320,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-3783" ++ "referenced_type" : "type-3776" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + }, + { + "referenced_type" : "type-1" +@@ -17923,7 +19335,7 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-3779" ++ "referenced_type" : "type-3772" + } + ], + "return_type" : "type-19", +@@ -17936,10 +19348,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-3784" ++ "referenced_type" : "type-3777" + } + ], + "return_type" : "type-19", +@@ -17952,7 +19364,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { + "referenced_type" : "type-1" +@@ -17961,7 +19373,7 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-3784" ++ "referenced_type" : "type-3777" + } + ], + "return_type" : "type-19", +@@ -17974,10 +19386,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-482" ++ "referenced_type" : "type-480" + } + ], + "return_type" : "type-19", +@@ -17990,13 +19402,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + }, + { + "referenced_type" : "type-1" +@@ -18005,7 +19417,7 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-3783" ++ "referenced_type" : "type-3776" + } + ], + "return_type" : "type-19", +@@ -18018,10 +19430,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-3784" ++ "referenced_type" : "type-3777" + } + ], + "return_type" : "type-19", +@@ -18035,13 +19447,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-3784" ++ "referenced_type" : "type-3777" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "default_arg" : true, +@@ -18062,7 +19474,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { + "referenced_type" : "type-1" +@@ -18071,7 +19483,7 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-3784" ++ "referenced_type" : "type-3777" + } + ], + "return_type" : "type-19", +@@ -18084,10 +19496,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], +- "return_type" : "type-1030", ++ "return_type" : "type-1027", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -18097,10 +19509,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "referenced_type" : "type-1" +@@ -18116,17 +19528,17 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-2476" ++ "referenced_type" : "type-2471" + }, + { + "default_arg" : true, + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -18137,7 +19549,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], + "return_type" : "type-1", +@@ -18151,10 +19563,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], +- "return_type" : "type-2353", ++ "return_type" : "type-2348", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -18164,7 +19576,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], + "return_type" : "type-1", +@@ -18177,10 +19589,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-3779" ++ "referenced_type" : "type-3772" + } + ], + "return_type" : "type-19", +@@ -18193,10 +19605,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -18206,10 +19618,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-3773" ++ "referenced_type" : "type-3766" + } + ], + "return_type" : "type-19", +@@ -18222,7 +19634,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], + "return_type" : "type-1", +@@ -18235,10 +19647,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-3777" ++ "referenced_type" : "type-3770" + } + ], + "return_type" : "type-19", +@@ -18251,10 +19663,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], +- "return_type" : "type-298", ++ "return_type" : "type-297", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -18264,10 +19676,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-3774" ++ "referenced_type" : "type-3767" + } + ], + "return_type" : "type-19", +@@ -18280,10 +19692,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-521" ++ "referenced_type" : "type-519" + } + ], + "return_type" : "type-19", +@@ -18296,7 +19708,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], + "return_type" : "type-19", +@@ -18309,10 +19721,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-3776" ++ "referenced_type" : "type-3769" + } + ], + "return_type" : "type-19", +@@ -18325,7 +19737,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], + "return_type" : "type-447", +@@ -18338,10 +19750,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-291" ++ "referenced_type" : "type-290" + } + ], + "return_type" : "type-19", +@@ -18354,10 +19766,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-171" ++ "referenced_type" : "type-170" + } + ], +- "return_type" : "type-701", ++ "return_type" : "type-699", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -18367,13 +19779,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2331" ++ "referenced_type" : "type-2326" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, + { +@@ -18383,10 +19795,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-175" ++ "referenced_type" : "type-174" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -18396,13 +19808,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2362" ++ "referenced_type" : "type-2357" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-245", ++ "return_type" : "type-244", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -18413,10 +19825,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -18427,10 +19839,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2364" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -18441,13 +19853,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -18458,13 +19870,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2364" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -18475,16 +19887,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -18495,16 +19907,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2364" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -18516,7 +19928,7 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + } + ], + "return_type" : "type-19", +@@ -18531,7 +19943,7 @@ + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { + "referenced_type" : "type-1" +@@ -18550,18 +19962,18 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "default_arg" : true, +- "referenced_type" : "type-2542" ++ "referenced_type" : "type-2537" + }, + { + "default_arg" : true, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h" + }, + { +@@ -18574,14 +19986,14 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-2542" ++ "referenced_type" : "type-2537" + }, + { + "default_arg" : true, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h" + }, + { +@@ -18593,7 +20005,7 @@ + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-99", ++ "return_type" : "type-98", + "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h" + } + ], +@@ -18602,115 +20014,115 @@ + { + "linker_set_key" : "_ZN7android4hidl4base4V1_05IBase10descriptorE", + "name" : "android::hidl::base::V1_0::IBase::descriptor", +- "referenced_type" : "type-99", ++ "referenced_type" : "type-98", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { + "linker_set_key" : "_ZN7android4hidl7manager4V1_015IServiceManager10descriptorE", + "name" : "android::hidl::manager::V1_0::IServiceManager::descriptor", +- "referenced_type" : "type-99", ++ "referenced_type" : "type-98", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { + "linker_set_key" : "_ZN7android4hidl7manager4V1_020IServiceNotification10descriptorE", + "name" : "android::hidl::manager::V1_0::IServiceNotification::descriptor", +- "referenced_type" : "type-99", ++ "referenced_type" : "type-98", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { + "linker_set_key" : "_ZN7android4hidl7manager4V1_115IServiceManager10descriptorE", + "name" : "android::hidl::manager::V1_1::IServiceManager::descriptor", +- "referenced_type" : "type-99", ++ "referenced_type" : "type-98", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { + "linker_set_key" : "_ZN7android4hidl7manager4V1_215IClientCallback10descriptorE", + "name" : "android::hidl::manager::V1_2::IClientCallback::descriptor", +- "referenced_type" : "type-99", ++ "referenced_type" : "type-98", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { + "linker_set_key" : "_ZN7android4hidl7manager4V1_215IServiceManager10descriptorE", + "name" : "android::hidl::manager::V1_2::IServiceManager::descriptor", +- "referenced_type" : "type-99", ++ "referenced_type" : "type-98", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { + "linker_set_key" : "_ZN7android8hardware11hidl_handle21kOffsetOfNativeHandleE", + "name" : "android::hardware::hidl_handle::kOffsetOfNativeHandle", +- "referenced_type" : "type-246", ++ "referenced_type" : "type-245", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "_ZN7android8hardware11hidl_memory13kOffsetOfNameE", + "name" : "android::hardware::hidl_memory::kOffsetOfName", +- "referenced_type" : "type-246", ++ "referenced_type" : "type-245", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "_ZN7android8hardware11hidl_memory15kOffsetOfHandleE", + "name" : "android::hardware::hidl_memory::kOffsetOfHandle", +- "referenced_type" : "type-246", ++ "referenced_type" : "type-245", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "_ZN7android8hardware11hidl_string15kOffsetOfBufferE", + "name" : "android::hardware::hidl_string::kOffsetOfBuffer", +- "referenced_type" : "type-246", ++ "referenced_type" : "type-245", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "_ZN7android8hardware12gTextBuffersE", + "name" : "android::hardware::gTextBuffers", +- "referenced_type" : "type-2514", ++ "referenced_type" : "type-2509", + "source_file" : "/system/libhwbinder/include/hwbinder/Static.h" + }, + { + "linker_set_key" : "_ZN7android8hardware13gProcessMutexE", + "name" : "android::hardware::gProcessMutex", +- "referenced_type" : "type-440", ++ "referenced_type" : "type-438", + "source_file" : "/system/libhwbinder/include/hwbinder/Static.h" + }, + { + "linker_set_key" : "_ZN7android8hardware4aerrE", + "name" : "android::hardware::aerr", +- "referenced_type" : "type-2476", ++ "referenced_type" : "type-2471", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { + "linker_set_key" : "_ZN7android8hardware4alogE", + "name" : "android::hardware::alog", +- "referenced_type" : "type-2476", ++ "referenced_type" : "type-2471", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { + "linker_set_key" : "_ZN7android8hardware4aoutE", + "name" : "android::hardware::aout", +- "referenced_type" : "type-2476", ++ "referenced_type" : "type-2471", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { + "linker_set_key" : "_ZN7android8hardware7details14gServiceSidMapE", + "name" : "android::hardware::details::gServiceSidMap", +- "referenced_type" : "type-703", ++ "referenced_type" : "type-701", + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, + { + "linker_set_key" : "_ZN7android8hardware7details15gServicePrioMapE", + "name" : "android::hardware::details::gServicePrioMap", +- "referenced_type" : "type-704", ++ "referenced_type" : "type-702", + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, + { + "linker_set_key" : "_ZN7android8hardware7details6gBnMapE", + "name" : "android::hardware::details::gBnMap", +- "referenced_type" : "type-412", ++ "referenced_type" : "type-410", + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, + { + "linker_set_key" : "_ZN7android8hardware8gProcessE", + "name" : "android::hardware::gProcess", +- "referenced_type" : "type-2795", ++ "referenced_type" : "type-2789", + "source_file" : "/system/libhwbinder/include/hwbinder/Static.h" + } + ], +@@ -18720,8 +20132,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Mutex &", + "name" : "android::Mutex &", +- "referenced_type" : "type-436", +- "self_type" : "type-440", ++ "referenced_type" : "type-433", ++ "self_type" : "type-438", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Mutex.h" + }, +@@ -18729,8 +20141,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RWLock &", + "name" : "android::RWLock &", +- "referenced_type" : "type-448", +- "self_type" : "type-452", ++ "referenced_type" : "type-444", ++ "self_type" : "type-450", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RWLock.h" + }, +@@ -18738,8 +20150,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase *const &", + "name" : "android::RefBase *const &", +- "referenced_type" : "type-3611", +- "self_type" : "type-3634", ++ "referenced_type" : "type-3604", ++ "self_type" : "type-3627", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -18747,8 +20159,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_type *const &", + "name" : "android::RefBase::weakref_type *const &", +- "referenced_type" : "type-3609", +- "self_type" : "type-3630", ++ "referenced_type" : "type-3602", ++ "self_type" : "type-3623", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -18756,8 +20168,8 @@ + "alignment" : 4, + "linker_set_key" : "android::String16 &", + "name" : "android::String16 &", +- "referenced_type" : "type-342", +- "self_type" : "type-351", ++ "referenced_type" : "type-341", ++ "self_type" : "type-350", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String16.h" + }, +@@ -18765,8 +20177,8 @@ + "alignment" : 4, + "linker_set_key" : "android::String8 &", + "name" : "android::String8 &", +- "referenced_type" : "type-221", +- "self_type" : "type-226", ++ "referenced_type" : "type-220", ++ "self_type" : "type-225", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String8.h" + }, +@@ -18774,8 +20186,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *const &", + "name" : "android::hardware::BHwBinder *const &", +- "referenced_type" : "type-3607", +- "self_type" : "type-3626", ++ "referenced_type" : "type-3600", ++ "self_type" : "type-3619", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -18784,7 +20196,7 @@ + "linker_set_key" : "android::hardware::ConcurrentMap, android::hardware::details::SchedPrio> &", + "name" : "android::hardware::ConcurrentMap, android::hardware::details::SchedPrio> &", + "referenced_type" : "type-29", +- "self_type" : "type-49", ++ "self_type" : "type-48", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -18792,8 +20204,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ConcurrentMap, bool> &", + "name" : "android::hardware::ConcurrentMap, bool> &", +- "referenced_type" : "type-41", +- "self_type" : "type-52", ++ "referenced_type" : "type-40", ++ "self_type" : "type-51", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -18801,8 +20213,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > &", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > &", +- "referenced_type" : "type-635", +- "self_type" : "type-927", ++ "referenced_type" : "type-633", ++ "self_type" : "type-924", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, +@@ -18810,8 +20222,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > &", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > &", +- "referenced_type" : "type-398", +- "self_type" : "type-926", ++ "referenced_type" : "type-396", ++ "self_type" : "type-923", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, +@@ -18819,8 +20231,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::HexDump &", + "name" : "android::hardware::HexDump &", +- "referenced_type" : "type-2486", +- "self_type" : "type-2488", ++ "referenced_type" : "type-2481", ++ "self_type" : "type-2483", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -18828,8 +20240,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel &", + "name" : "android::hardware::Parcel &", +- "referenced_type" : "type-1376", +- "self_type" : "type-1375", ++ "referenced_type" : "type-1373", ++ "self_type" : "type-1372", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -18837,8 +20249,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel &", + "name" : "android::hardware::Parcel &", +- "referenced_type" : "type-2577", +- "self_type" : "type-2576", ++ "referenced_type" : "type-2572", ++ "self_type" : "type-2571", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -18846,8 +20258,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel &", + "name" : "android::hardware::Parcel &", +- "referenced_type" : "type-374", +- "self_type" : "type-373", ++ "referenced_type" : "type-373", ++ "self_type" : "type-372", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -18855,8 +20267,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel &", + "name" : "android::hardware::Parcel &", +- "referenced_type" : "type-3921", +- "self_type" : "type-3920", ++ "referenced_type" : "type-3914", ++ "self_type" : "type-3913", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -18864,8 +20276,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState::handle_entry &", + "name" : "android::hardware::ProcessState::handle_entry &", +- "referenced_type" : "type-2416", +- "self_type" : "type-3833", ++ "referenced_type" : "type-2411", ++ "self_type" : "type-3826", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -18873,8 +20285,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return &", + "name" : "android::hardware::Return &", +- "referenced_type" : "type-807", +- "self_type" : "type-810", ++ "referenced_type" : "type-804", ++ "self_type" : "type-807", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18882,8 +20294,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-801", +- "self_type" : "type-804", ++ "referenced_type" : "type-798", ++ "self_type" : "type-801", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18891,8 +20303,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-986", +- "self_type" : "type-989", ++ "referenced_type" : "type-983", ++ "self_type" : "type-986", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18900,8 +20312,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-1093", +- "self_type" : "type-1096", ++ "referenced_type" : "type-1090", ++ "self_type" : "type-1093", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18909,8 +20321,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-1153", +- "self_type" : "type-1156", ++ "referenced_type" : "type-1150", ++ "self_type" : "type-1153", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18918,8 +20330,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-1213", +- "self_type" : "type-1216", ++ "referenced_type" : "type-1210", ++ "self_type" : "type-1213", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18927,8 +20339,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-1284", +- "self_type" : "type-1287", ++ "referenced_type" : "type-1281", ++ "self_type" : "type-1284", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18936,8 +20348,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return &", + "name" : "android::hardware::Return &", +- "referenced_type" : "type-309", +- "self_type" : "type-312", ++ "referenced_type" : "type-308", ++ "self_type" : "type-311", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18945,8 +20357,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return &", + "name" : "android::hardware::Return &", +- "referenced_type" : "type-102", +- "self_type" : "type-179", ++ "referenced_type" : "type-101", ++ "self_type" : "type-178", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18954,8 +20366,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Status &", + "name" : "android::hardware::Status &", +- "referenced_type" : "type-104", +- "self_type" : "type-170", ++ "referenced_type" : "type-103", ++ "self_type" : "type-169", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18963,8 +20375,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-2378", +- "self_type" : "type-2377", ++ "referenced_type" : "type-2373", ++ "self_type" : "type-2372", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -18972,8 +20384,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-2429", +- "self_type" : "type-2428", ++ "referenced_type" : "type-2424", ++ "self_type" : "type-2423", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -18981,8 +20393,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-2474", +- "self_type" : "type-2476", ++ "referenced_type" : "type-2469", ++ "self_type" : "type-2471", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -18990,8 +20402,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-3484", +- "self_type" : "type-3483", ++ "referenced_type" : "type-3477", ++ "self_type" : "type-3476", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -18999,8 +20411,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-3535", +- "self_type" : "type-3534", ++ "referenced_type" : "type-3528", ++ "self_type" : "type-3527", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -19008,8 +20420,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-3843", +- "self_type" : "type-3842", ++ "referenced_type" : "type-3836", ++ "self_type" : "type-3835", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -19017,8 +20429,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer > &", + "name" : "android::hardware::details::hidl_pointer > &", +- "referenced_type" : "type-1009", +- "self_type" : "type-1075", ++ "referenced_type" : "type-1006", ++ "self_type" : "type-1071", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19026,8 +20438,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer &", + "name" : "android::hardware::details::hidl_pointer &", +- "referenced_type" : "type-620", +- "self_type" : "type-1071", ++ "referenced_type" : "type-618", ++ "self_type" : "type-1068", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19035,8 +20447,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer &", + "name" : "android::hardware::details::hidl_pointer &", +- "referenced_type" : "type-835", +- "self_type" : "type-852", ++ "referenced_type" : "type-832", ++ "self_type" : "type-848", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19044,8 +20456,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer &", + "name" : "android::hardware::details::hidl_pointer &", +- "referenced_type" : "type-97", +- "self_type" : "type-150", ++ "referenced_type" : "type-96", ++ "self_type" : "type-149", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19054,7 +20466,7 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer &", + "name" : "android::hardware::details::hidl_pointer &", + "referenced_type" : "type-14", +- "self_type" : "type-643", ++ "self_type" : "type-641", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19062,8 +20474,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer &", + "name" : "android::hardware::details::hidl_pointer &", +- "referenced_type" : "type-519", +- "self_type" : "type-823", ++ "referenced_type" : "type-517", ++ "self_type" : "type-820", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19071,8 +20483,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::return_status &", + "name" : "android::hardware::details::return_status &", +- "referenced_type" : "type-103", +- "self_type" : "type-266", ++ "referenced_type" : "type-102", ++ "self_type" : "type-265", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -19080,8 +20492,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_array &", + "name" : "android::hardware::hidl_array &", +- "referenced_type" : "type-1012", +- "self_type" : "type-1078", ++ "referenced_type" : "type-1009", ++ "self_type" : "type-1075", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19089,8 +20501,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_handle &", + "name" : "android::hardware::hidl_handle &", +- "referenced_type" : "type-77", +- "self_type" : "type-88", ++ "referenced_type" : "type-76", ++ "self_type" : "type-87", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19098,8 +20510,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_memory &", + "name" : "android::hardware::hidl_memory &", +- "referenced_type" : "type-121", +- "self_type" : "type-125", ++ "referenced_type" : "type-120", ++ "self_type" : "type-124", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19107,8 +20519,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_string &", + "name" : "android::hardware::hidl_string &", +- "referenced_type" : "type-96", +- "self_type" : "type-118", ++ "referenced_type" : "type-95", ++ "self_type" : "type-117", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19116,8 +20528,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec > &", + "name" : "android::hardware::hidl_vec > &", +- "referenced_type" : "type-1008", +- "self_type" : "type-1018", ++ "referenced_type" : "type-1005", ++ "self_type" : "type-1015", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19125,8 +20537,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec &", + "name" : "android::hardware::hidl_vec &", +- "referenced_type" : "type-619", +- "self_type" : "type-1007", ++ "referenced_type" : "type-617", ++ "self_type" : "type-1004", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19134,8 +20546,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec::iter &", + "name" : "android::hardware::hidl_vec::iter &", +- "referenced_type" : "type-625", +- "self_type" : "type-628", ++ "referenced_type" : "type-622", ++ "self_type" : "type-626", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19143,8 +20555,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec &", + "name" : "android::hardware::hidl_vec &", +- "referenced_type" : "type-518", +- "self_type" : "type-829", ++ "referenced_type" : "type-516", ++ "self_type" : "type-826", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19152,8 +20564,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &", + "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &", +- "referenced_type" : "type-548", +- "self_type" : "type-861", ++ "referenced_type" : "type-546", ++ "self_type" : "type-858", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19161,8 +20573,8 @@ + "alignment" : 4, + "linker_set_key" : "android::key_value_pair_t > &", + "name" : "android::key_value_pair_t > &", +- "referenced_type" : "type-3807", +- "self_type" : "type-3819", ++ "referenced_type" : "type-3800", ++ "self_type" : "type-3812", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -19170,8 +20582,8 @@ + "alignment" : 4, + "linker_set_key" : "android::key_value_pair_t &", + "name" : "android::key_value_pair_t &", +- "referenced_type" : "type-2384", +- "self_type" : "type-2397", ++ "referenced_type" : "type-2379", ++ "self_type" : "type-2392", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -19179,8 +20591,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-472", +- "self_type" : "type-3635", ++ "referenced_type" : "type-470", ++ "self_type" : "type-3628", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19188,8 +20600,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-2470", +- "self_type" : "type-2499", ++ "referenced_type" : "type-2465", ++ "self_type" : "type-2494", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19197,8 +20609,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-71", +- "self_type" : "type-485", ++ "referenced_type" : "type-70", ++ "self_type" : "type-483", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19206,8 +20618,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-491", +- "self_type" : "type-3841", ++ "referenced_type" : "type-489", ++ "self_type" : "type-3834", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19215,8 +20627,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-789", +- "self_type" : "type-793", ++ "referenced_type" : "type-786", ++ "self_type" : "type-789", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19224,8 +20636,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-951", +- "self_type" : "type-984", ++ "referenced_type" : "type-948", ++ "self_type" : "type-980", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19233,8 +20645,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-356", +- "self_type" : "type-660", ++ "referenced_type" : "type-355", ++ "self_type" : "type-658", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19242,8 +20654,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-575", +- "self_type" : "type-976", ++ "referenced_type" : "type-573", ++ "self_type" : "type-973", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19251,8 +20663,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-590", +- "self_type" : "type-979", ++ "referenced_type" : "type-588", ++ "self_type" : "type-976", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19260,8 +20672,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-580", +- "self_type" : "type-771", ++ "referenced_type" : "type-578", ++ "self_type" : "type-768", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19269,8 +20681,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-595", +- "self_type" : "type-1210", ++ "referenced_type" : "type-593", ++ "self_type" : "type-1207", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19278,8 +20690,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-585", +- "self_type" : "type-779", ++ "referenced_type" : "type-583", ++ "self_type" : "type-776", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19287,8 +20699,8 @@ + "alignment" : 4, + "linker_set_key" : "android::wp &", + "name" : "android::wp &", +- "referenced_type" : "type-383", +- "self_type" : "type-471", ++ "referenced_type" : "type-382", ++ "self_type" : "type-469", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -19296,8 +20708,8 @@ + "alignment" : 4, + "linker_set_key" : "android::wp &", + "name" : "android::wp &", +- "referenced_type" : "type-944", +- "self_type" : "type-2404", ++ "referenced_type" : "type-941", ++ "self_type" : "type-2399", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -19305,8 +20717,8 @@ + "alignment" : 4, + "linker_set_key" : "android::wp &", + "name" : "android::wp &", +- "referenced_type" : "type-2382", +- "self_type" : "type-3757", ++ "referenced_type" : "type-2377", ++ "self_type" : "type-3750", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -19315,7 +20727,7 @@ + "linker_set_key" : "android::wp &", + "name" : "android::wp &", + "referenced_type" : "type-32", +- "self_type" : "type-461", ++ "self_type" : "type-459", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -19323,8 +20735,8 @@ + "alignment" : 4, + "linker_set_key" : "char *const &", + "name" : "char *const &", +- "referenced_type" : "type-3790", +- "self_type" : "type-3791", ++ "referenced_type" : "type-3783", ++ "self_type" : "type-3784", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19332,8 +20744,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[10]", + "name" : "char const (&)[10]", +- "referenced_type" : "type-3655", +- "self_type" : "type-3657", ++ "referenced_type" : "type-3648", ++ "self_type" : "type-3650", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19341,8 +20753,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[11]", + "name" : "char const (&)[11]", +- "referenced_type" : "type-3678", +- "self_type" : "type-3680", ++ "referenced_type" : "type-3671", ++ "self_type" : "type-3673", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19350,8 +20762,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[12]", + "name" : "char const (&)[12]", +- "referenced_type" : "type-3652", +- "self_type" : "type-3654", ++ "referenced_type" : "type-3645", ++ "self_type" : "type-3647", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19359,8 +20771,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[13]", + "name" : "char const (&)[13]", +- "referenced_type" : "type-3648", +- "self_type" : "type-3651", ++ "referenced_type" : "type-3641", ++ "self_type" : "type-3644", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19368,8 +20780,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[14]", + "name" : "char const (&)[14]", +- "referenced_type" : "type-3697", +- "self_type" : "type-3699", ++ "referenced_type" : "type-3690", ++ "self_type" : "type-3692", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19377,8 +20789,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[15]", + "name" : "char const (&)[15]", +- "referenced_type" : "type-3795", +- "self_type" : "type-3797", ++ "referenced_type" : "type-3788", ++ "self_type" : "type-3790", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19386,8 +20798,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[16]", + "name" : "char const (&)[16]", +- "referenced_type" : "type-3681", +- "self_type" : "type-3682", ++ "referenced_type" : "type-3674", ++ "self_type" : "type-3675", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19395,8 +20807,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[17]", + "name" : "char const (&)[17]", +- "referenced_type" : "type-3700", +- "self_type" : "type-3702", ++ "referenced_type" : "type-3693", ++ "self_type" : "type-3695", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19404,8 +20816,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[18]", + "name" : "char const (&)[18]", +- "referenced_type" : "type-3684", +- "self_type" : "type-3686", ++ "referenced_type" : "type-3677", ++ "self_type" : "type-3679", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19413,17 +20825,17 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[19]", + "name" : "char const (&)[19]", +- "referenced_type" : "type-3716", +- "self_type" : "type-3718", ++ "referenced_type" : "type-3709", ++ "self_type" : "type-3711", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { + "alignment" : 4, + "linker_set_key" : "char const (&)[20]", +- "name" : "char const (&)[20]", +- "referenced_type" : "type-3694", +- "self_type" : "type-3696", ++ "name" : "char const (&)[20]", ++ "referenced_type" : "type-3687", ++ "self_type" : "type-3689", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19431,8 +20843,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[22]", + "name" : "char const (&)[22]", +- "referenced_type" : "type-3719", +- "self_type" : "type-3722", ++ "referenced_type" : "type-3712", ++ "self_type" : "type-3714", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19440,8 +20852,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[25]", + "name" : "char const (&)[25]", +- "referenced_type" : "type-3709", +- "self_type" : "type-3711", ++ "referenced_type" : "type-3702", ++ "self_type" : "type-3704", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19449,8 +20861,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[28]", + "name" : "char const (&)[28]", +- "referenced_type" : "type-3732", +- "self_type" : "type-3734", ++ "referenced_type" : "type-3725", ++ "self_type" : "type-3727", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19458,8 +20870,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[29]", + "name" : "char const (&)[29]", +- "referenced_type" : "type-3706", +- "self_type" : "type-3708", ++ "referenced_type" : "type-3699", ++ "self_type" : "type-3701", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19467,8 +20879,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[2]", + "name" : "char const (&)[2]", +- "referenced_type" : "type-3659", +- "self_type" : "type-3661", ++ "referenced_type" : "type-3651", ++ "self_type" : "type-3654", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19476,8 +20888,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[31]", + "name" : "char const (&)[31]", +- "referenced_type" : "type-3691", +- "self_type" : "type-3693", ++ "referenced_type" : "type-3683", ++ "self_type" : "type-3686", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19485,8 +20897,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[32]", + "name" : "char const (&)[32]", +- "referenced_type" : "type-3723", +- "self_type" : "type-3725", ++ "referenced_type" : "type-3716", ++ "self_type" : "type-3718", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19494,8 +20906,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[35]", + "name" : "char const (&)[35]", +- "referenced_type" : "type-3712", +- "self_type" : "type-3714", ++ "referenced_type" : "type-3705", ++ "self_type" : "type-3707", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19503,8 +20915,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[37]", + "name" : "char const (&)[37]", +- "referenced_type" : "type-3703", +- "self_type" : "type-3705", ++ "referenced_type" : "type-3696", ++ "self_type" : "type-3698", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19512,8 +20924,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[3]", + "name" : "char const (&)[3]", +- "referenced_type" : "type-3671", +- "self_type" : "type-3674", ++ "referenced_type" : "type-3664", ++ "self_type" : "type-3667", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19521,8 +20933,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[4]", + "name" : "char const (&)[4]", +- "referenced_type" : "type-3792", +- "self_type" : "type-3794", ++ "referenced_type" : "type-3785", ++ "self_type" : "type-3787", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19530,8 +20942,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[5]", + "name" : "char const (&)[5]", +- "referenced_type" : "type-3798", +- "self_type" : "type-3800", ++ "referenced_type" : "type-3791", ++ "self_type" : "type-3793", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19539,8 +20951,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[6]", + "name" : "char const (&)[6]", +- "referenced_type" : "type-3663", +- "self_type" : "type-3665", ++ "referenced_type" : "type-3656", ++ "self_type" : "type-3658", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19548,8 +20960,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[7]", + "name" : "char const (&)[7]", +- "referenced_type" : "type-3687", +- "self_type" : "type-3690", ++ "referenced_type" : "type-3680", ++ "self_type" : "type-3682", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19557,8 +20969,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[8]", + "name" : "char const (&)[8]", +- "referenced_type" : "type-3675", +- "self_type" : "type-3677", ++ "referenced_type" : "type-3668", ++ "self_type" : "type-3670", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19566,8 +20978,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[9]", + "name" : "char const (&)[9]", +- "referenced_type" : "type-3666", +- "self_type" : "type-3668", ++ "referenced_type" : "type-3659", ++ "self_type" : "type-3661", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19575,8 +20987,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::String16 &", + "name" : "const android::String16 &", +- "referenced_type" : "type-348", +- "self_type" : "type-350", ++ "referenced_type" : "type-347", ++ "self_type" : "type-349", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String16.h" + }, +@@ -19584,8 +20996,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::String8 &", + "name" : "const android::String8 &", +- "referenced_type" : "type-223", +- "self_type" : "type-225", ++ "referenced_type" : "type-222", ++ "self_type" : "type-224", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String8.h" + }, +@@ -19593,8 +21005,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BpHwBinder::Obituary &", + "name" : "const android::hardware::BpHwBinder::Obituary &", +- "referenced_type" : "type-2391", +- "self_type" : "type-2415", ++ "referenced_type" : "type-2386", ++ "self_type" : "type-2410", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -19602,8 +21014,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &", + "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &", +- "referenced_type" : "type-2398", +- "self_type" : "type-2399", ++ "referenced_type" : "type-2393", ++ "self_type" : "type-2394", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -19611,8 +21023,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::HexDump &", + "name" : "const android::hardware::HexDump &", +- "referenced_type" : "type-2489", +- "self_type" : "type-3888", ++ "referenced_type" : "type-2484", ++ "self_type" : "type-3881", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19620,8 +21032,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1038", +- "self_type" : "type-1040", ++ "referenced_type" : "type-1035", ++ "self_type" : "type-1037", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19629,8 +21041,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1126", +- "self_type" : "type-1128", ++ "referenced_type" : "type-1123", ++ "self_type" : "type-1125", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -19638,8 +21050,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1187", +- "self_type" : "type-1189", ++ "referenced_type" : "type-1184", ++ "self_type" : "type-1186", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -19647,8 +21059,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1253", +- "self_type" : "type-1255", ++ "referenced_type" : "type-1250", ++ "self_type" : "type-1252", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -19656,8 +21068,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1307", +- "self_type" : "type-1309", ++ "referenced_type" : "type-1304", ++ "self_type" : "type-1306", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19665,8 +21077,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1370", +- "self_type" : "type-1372", ++ "referenced_type" : "type-1367", ++ "self_type" : "type-1369", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19674,8 +21086,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1964", +- "self_type" : "type-1966", ++ "referenced_type" : "type-1959", ++ "self_type" : "type-1961", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19683,8 +21095,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2048", +- "self_type" : "type-2050", ++ "referenced_type" : "type-2043", ++ "self_type" : "type-2045", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -19692,8 +21104,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2107", +- "self_type" : "type-2109", ++ "referenced_type" : "type-2102", ++ "self_type" : "type-2104", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -19701,8 +21113,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2172", +- "self_type" : "type-2174", ++ "referenced_type" : "type-2167", ++ "self_type" : "type-2169", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -19710,8 +21122,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2224", +- "self_type" : "type-2226", ++ "referenced_type" : "type-2219", ++ "self_type" : "type-2221", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19719,8 +21131,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2278", +- "self_type" : "type-2280", ++ "referenced_type" : "type-2273", ++ "self_type" : "type-2275", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -19728,8 +21140,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2354", +- "self_type" : "type-2355", ++ "referenced_type" : "type-2349", ++ "self_type" : "type-2350", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -19737,8 +21149,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2571", +- "self_type" : "type-2573", ++ "referenced_type" : "type-2566", ++ "self_type" : "type-2568", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19746,8 +21158,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3103", +- "self_type" : "type-3105", ++ "referenced_type" : "type-3096", ++ "self_type" : "type-3098", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19755,8 +21167,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3183", +- "self_type" : "type-3186", ++ "referenced_type" : "type-3176", ++ "self_type" : "type-3178", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -19764,8 +21176,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3250", +- "self_type" : "type-3252", ++ "referenced_type" : "type-3243", ++ "self_type" : "type-3245", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -19773,8 +21185,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3308", +- "self_type" : "type-3310", ++ "referenced_type" : "type-3300", ++ "self_type" : "type-3303", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -19782,8 +21194,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3353", +- "self_type" : "type-3355", ++ "referenced_type" : "type-3346", ++ "self_type" : "type-3348", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19791,8 +21203,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3409", +- "self_type" : "type-3411", ++ "referenced_type" : "type-3398", ++ "self_type" : "type-3404", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -19800,8 +21212,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-368", +- "self_type" : "type-370", ++ "referenced_type" : "type-367", ++ "self_type" : "type-369", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19809,8 +21221,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3915", +- "self_type" : "type-3917", ++ "referenced_type" : "type-3908", ++ "self_type" : "type-3910", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19818,8 +21230,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::ProcessState::handle_entry &", + "name" : "const android::hardware::ProcessState::handle_entry &", +- "referenced_type" : "type-3812", +- "self_type" : "type-3834", ++ "referenced_type" : "type-3804", ++ "self_type" : "type-3827", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -19827,8 +21239,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return &", + "name" : "const android::hardware::Return &", +- "referenced_type" : "type-506", +- "self_type" : "type-992", ++ "referenced_type" : "type-504", ++ "self_type" : "type-989", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -19836,8 +21248,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return &", + "name" : "const android::hardware::Return &", +- "referenced_type" : "type-101", +- "self_type" : "type-107", ++ "referenced_type" : "type-100", ++ "self_type" : "type-106", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -19845,8 +21257,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Status &", + "name" : "const android::hardware::Status &", +- "referenced_type" : "type-167", +- "self_type" : "type-168", ++ "referenced_type" : "type-166", ++ "self_type" : "type-167", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -19854,8 +21266,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::TypeCode &", + "name" : "const android::hardware::TypeCode &", +- "referenced_type" : "type-2484", +- "self_type" : "type-3887", ++ "referenced_type" : "type-2479", ++ "self_type" : "type-3880", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19863,8 +21275,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::SchedPrio &", + "name" : "const android::hardware::details::SchedPrio &", +- "referenced_type" : "type-1050", +- "self_type" : "type-1049", ++ "referenced_type" : "type-1047", ++ "self_type" : "type-1046", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -19873,7 +21285,7 @@ + "linker_set_key" : "const android::hardware::details::hidl_pointer &", + "name" : "const android::hardware::details::hidl_pointer &", + "referenced_type" : "type-13", +- "self_type" : "type-76", ++ "self_type" : "type-75", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19881,8 +21293,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::hidl_pointer &", + "name" : "const android::hardware::details::hidl_pointer &", +- "referenced_type" : "type-537", +- "self_type" : "type-830", ++ "referenced_type" : "type-535", ++ "self_type" : "type-827", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19890,8 +21302,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_handle &", + "name" : "const android::hardware::hidl_handle &", +- "referenced_type" : "type-79", +- "self_type" : "type-83", ++ "referenced_type" : "type-78", ++ "self_type" : "type-82", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19899,8 +21311,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_memory &", + "name" : "const android::hardware::hidl_memory &", +- "referenced_type" : "type-123", +- "self_type" : "type-124", ++ "referenced_type" : "type-122", ++ "self_type" : "type-123", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19908,8 +21320,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_string &", + "name" : "const android::hardware::hidl_string &", +- "referenced_type" : "type-110", +- "self_type" : "type-112", ++ "referenced_type" : "type-109", ++ "self_type" : "type-111", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19917,8 +21329,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec > &", + "name" : "const android::hardware::hidl_vec > &", +- "referenced_type" : "type-2270", +- "self_type" : "type-2283", ++ "referenced_type" : "type-2264", ++ "self_type" : "type-2278", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19926,8 +21338,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec &", + "name" : "const android::hardware::hidl_vec &", +- "referenced_type" : "type-622", +- "self_type" : "type-1042", ++ "referenced_type" : "type-620", ++ "self_type" : "type-1039", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19935,8 +21347,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec &", + "name" : "const android::hardware::hidl_vec &", +- "referenced_type" : "type-1022", +- "self_type" : "type-1043", ++ "referenced_type" : "type-1019", ++ "self_type" : "type-1040", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19944,8 +21356,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec::iter &", + "name" : "const android::hardware::hidl_vec::iter &", +- "referenced_type" : "type-629", +- "self_type" : "type-631", ++ "referenced_type" : "type-627", ++ "self_type" : "type-629", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19953,8 +21365,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec &", + "name" : "const android::hardware::hidl_vec &", +- "referenced_type" : "type-523", +- "self_type" : "type-525", ++ "referenced_type" : "type-521", ++ "self_type" : "type-523", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19962,8 +21374,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_version &", + "name" : "const android::hardware::hidl_version &", +- "referenced_type" : "type-135", +- "self_type" : "type-137", ++ "referenced_type" : "type-134", ++ "self_type" : "type-136", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19971,8 +21383,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::base::V1_0::IBase *const &", + "name" : "const android::hidl::base::V1_0::IBase *const &", +- "referenced_type" : "type-396", +- "self_type" : "type-397", ++ "referenced_type" : "type-390", ++ "self_type" : "type-391", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -19980,8 +21392,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &", + "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &", +- "referenced_type" : "type-1021", +- "self_type" : "type-1072", ++ "referenced_type" : "type-1018", ++ "self_type" : "type-1069", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19989,8 +21401,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::key_value_pair_t > &", + "name" : "const android::key_value_pair_t > &", +- "referenced_type" : "type-3806", +- "self_type" : "type-3808", ++ "referenced_type" : "type-3799", ++ "self_type" : "type-3801", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -19998,8 +21410,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::key_value_pair_t &", + "name" : "const android::key_value_pair_t &", +- "referenced_type" : "type-2383", +- "self_type" : "type-2385", ++ "referenced_type" : "type-2378", ++ "self_type" : "type-2380", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20007,8 +21419,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-3640", +- "self_type" : "type-3647", ++ "referenced_type" : "type-3633", ++ "self_type" : "type-3640", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20016,8 +21428,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-2498", +- "self_type" : "type-2497", ++ "referenced_type" : "type-2493", ++ "self_type" : "type-2492", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20025,8 +21437,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-2356", +- "self_type" : "type-2358", ++ "referenced_type" : "type-2351", ++ "self_type" : "type-2353", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -20034,8 +21446,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-2405", +- "self_type" : "type-2406", ++ "referenced_type" : "type-2400", ++ "self_type" : "type-2401", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20043,8 +21455,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-3467", +- "self_type" : "type-3469", ++ "referenced_type" : "type-3460", ++ "self_type" : "type-3462", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -20052,8 +21464,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-2524", +- "self_type" : "type-2526", ++ "referenced_type" : "type-2517", ++ "self_type" : "type-2521", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, +@@ -20061,8 +21473,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-2538", +- "self_type" : "type-2540", ++ "referenced_type" : "type-2533", ++ "self_type" : "type-2535", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, +@@ -20070,8 +21482,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-3583", +- "self_type" : "type-3587", ++ "referenced_type" : "type-3576", ++ "self_type" : "type-3578", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, +@@ -20079,8 +21491,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-3592", +- "self_type" : "type-3594", ++ "referenced_type" : "type-3585", ++ "self_type" : "type-3587", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, +@@ -20088,8 +21500,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-70", +- "self_type" : "type-69", ++ "referenced_type" : "type-69", ++ "self_type" : "type-68", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20097,8 +21509,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-2547", +- "self_type" : "type-2546", ++ "referenced_type" : "type-2542", ++ "self_type" : "type-2541", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h" + }, +@@ -20106,8 +21518,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-765", +- "self_type" : "type-770", ++ "referenced_type" : "type-762", ++ "self_type" : "type-767", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20115,8 +21527,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-496", +- "self_type" : "type-3622", ++ "referenced_type" : "type-494", ++ "self_type" : "type-3615", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20124,8 +21536,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-950", +- "self_type" : "type-953", ++ "referenced_type" : "type-947", ++ "self_type" : "type-950", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20133,8 +21545,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-141", +- "self_type" : "type-140", ++ "referenced_type" : "type-140", ++ "self_type" : "type-139", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -20142,8 +21554,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-459", +- "self_type" : "type-460", ++ "referenced_type" : "type-456", ++ "self_type" : "type-458", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20151,8 +21563,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-578", +- "self_type" : "type-910", ++ "referenced_type" : "type-576", ++ "self_type" : "type-906", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20160,8 +21572,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-593", +- "self_type" : "type-783", ++ "referenced_type" : "type-591", ++ "self_type" : "type-780", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20169,8 +21581,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-583", +- "self_type" : "type-764", ++ "referenced_type" : "type-581", ++ "self_type" : "type-761", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20178,8 +21590,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-600", +- "self_type" : "type-787", ++ "referenced_type" : "type-598", ++ "self_type" : "type-784", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20187,8 +21599,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-588", +- "self_type" : "type-773", ++ "referenced_type" : "type-586", ++ "self_type" : "type-769", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20196,8 +21608,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-469", +- "self_type" : "type-470", ++ "referenced_type" : "type-467", ++ "self_type" : "type-468", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20205,8 +21617,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-2359", +- "self_type" : "type-2360", ++ "referenced_type" : "type-2354", ++ "self_type" : "type-2355", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -20214,8 +21626,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-1367", +- "self_type" : "type-1369", ++ "referenced_type" : "type-1364", ++ "self_type" : "type-1366", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -20223,8 +21635,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-2568", +- "self_type" : "type-2570", ++ "referenced_type" : "type-2563", ++ "self_type" : "type-2565", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -20232,8 +21644,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-365", +- "self_type" : "type-367", ++ "referenced_type" : "type-364", ++ "self_type" : "type-366", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -20241,8 +21653,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-3752", +- "self_type" : "type-3753", ++ "referenced_type" : "type-3745", ++ "self_type" : "type-3746", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20250,8 +21662,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-3912", +- "self_type" : "type-3914", ++ "referenced_type" : "type-3905", ++ "self_type" : "type-3907", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -20259,8 +21671,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-464", +- "self_type" : "type-465", ++ "referenced_type" : "type-462", ++ "self_type" : "type-463", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20268,8 +21680,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-64", +- "self_type" : "type-63", ++ "referenced_type" : "type-63", ++ "self_type" : "type-62", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20277,8 +21689,8 @@ + "alignment" : 4, + "linker_set_key" : "const bool &", + "name" : "const bool &", +- "referenced_type" : "type-502", +- "self_type" : "type-538", ++ "referenced_type" : "type-500", ++ "self_type" : "type-537", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20286,8 +21698,8 @@ + "alignment" : 4, + "linker_set_key" : "const char &", + "name" : "const char &", +- "referenced_type" : "type-100", +- "self_type" : "type-2495", ++ "referenced_type" : "type-99", ++ "self_type" : "type-2490", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -20295,8 +21707,8 @@ + "alignment" : 4, + "linker_set_key" : "const char *const &", + "name" : "const char *const &", +- "referenced_type" : "type-2478", +- "self_type" : "type-2479", ++ "referenced_type" : "type-2473", ++ "self_type" : "type-2474", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -20313,8 +21725,8 @@ + "alignment" : 4, + "linker_set_key" : "const flat_binder_object &", + "name" : "const flat_binder_object &", +- "referenced_type" : "type-3770", +- "self_type" : "type-3772", ++ "referenced_type" : "type-3763", ++ "self_type" : "type-3765", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -20322,8 +21734,8 @@ + "alignment" : 4, + "linker_set_key" : "const float &", + "name" : "const float &", +- "referenced_type" : "type-665", +- "self_type" : "type-666", ++ "referenced_type" : "type-663", ++ "self_type" : "type-664", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20332,7 +21744,7 @@ + "linker_set_key" : "const int &", + "name" : "const int &", + "referenced_type" : "type-624", +- "self_type" : "type-632", ++ "self_type" : "type-630", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20346,352 +21758,352 @@ + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1000", +- "self_type" : "type-1003", ++ "referenced_type" : "type-1099", ++ "self_type" : "type-1101", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1102", +- "self_type" : "type-1104", ++ "referenced_type" : "type-1159", ++ "self_type" : "type-1161", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1162", +- "self_type" : "type-1164", ++ "referenced_type" : "type-1220", ++ "self_type" : "type-1222", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1223", +- "self_type" : "type-1225", ++ "referenced_type" : "type-127", ++ "self_type" : "type-129", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-128", +- "self_type" : "type-130", ++ "referenced_type" : "type-1294", ++ "self_type" : "type-1296", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1297", +- "self_type" : "type-1299", ++ "referenced_type" : "type-1347", ++ "self_type" : "type-1349", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1350", +- "self_type" : "type-1352", ++ "referenced_type" : "type-1453", ++ "self_type" : "type-1455", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1457", +- "self_type" : "type-1459", ++ "referenced_type" : "type-1522", ++ "self_type" : "type-1525", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1527", +- "self_type" : "type-1529", ++ "referenced_type" : "type-1689", ++ "self_type" : "type-1691", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1693", +- "self_type" : "type-1695", ++ "referenced_type" : "type-1727", ++ "self_type" : "type-1729", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1732", +- "self_type" : "type-1735", ++ "referenced_type" : "type-1792", ++ "self_type" : "type-1794", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1797", +- "self_type" : "type-1799", ++ "referenced_type" : "type-1818", ++ "self_type" : "type-1827", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1823", +- "self_type" : "type-1832", ++ "referenced_type" : "type-1861", ++ "self_type" : "type-1863", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1866", +- "self_type" : "type-1869", ++ "referenced_type" : "type-1933", ++ "self_type" : "type-1935", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1938", +- "self_type" : "type-1941", ++ "referenced_type" : "type-2019", ++ "self_type" : "type-2021", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2024", +- "self_type" : "type-2026", ++ "referenced_type" : "type-2077", ++ "self_type" : "type-2079", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2082", +- "self_type" : "type-2084", ++ "referenced_type" : "type-2136", ++ "self_type" : "type-2138", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2141", +- "self_type" : "type-2143", ++ "referenced_type" : "type-2209", ++ "self_type" : "type-2211", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2214", +- "self_type" : "type-2216", ++ "referenced_type" : "type-2255", ++ "self_type" : "type-2257", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2260", +- "self_type" : "type-2262", ++ "referenced_type" : "type-2306", ++ "self_type" : "type-2308", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2311", +- "self_type" : "type-2313", ++ "referenced_type" : "type-2543", ++ "self_type" : "type-2549", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2548", +- "self_type" : "type-2554", ++ "referenced_type" : "type-2650", ++ "self_type" : "type-2652", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2656", +- "self_type" : "type-2658", ++ "referenced_type" : "type-2719", ++ "self_type" : "type-2722", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2726", +- "self_type" : "type-2728", ++ "referenced_type" : "type-2830", ++ "self_type" : "type-2833", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2837", +- "self_type" : "type-2839", ++ "referenced_type" : "type-2868", ++ "self_type" : "type-2870", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2875", +- "self_type" : "type-2877", ++ "referenced_type" : "type-2926", ++ "self_type" : "type-2931", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2933", ++ "referenced_type" : "type-2934", + "self_type" : "type-2936", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2941", +- "self_type" : "type-2944", ++ "referenced_type" : "type-3003", ++ "self_type" : "type-3005", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3010", +- "self_type" : "type-3012", ++ "referenced_type" : "type-3075", ++ "self_type" : "type-3077", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3082", +- "self_type" : "type-3084", ++ "referenced_type" : "type-3154", ++ "self_type" : "type-3156", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3161", +- "self_type" : "type-3163", ++ "referenced_type" : "type-3221", ++ "self_type" : "type-3223", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3228", +- "self_type" : "type-3230", ++ "referenced_type" : "type-326", ++ "self_type" : "type-328", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-327", +- "self_type" : "type-329", ++ "referenced_type" : "type-3276", ++ "self_type" : "type-3278", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3283", +- "self_type" : "type-3285", ++ "referenced_type" : "type-3326", ++ "self_type" : "type-3328", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3333", +- "self_type" : "type-3335", ++ "referenced_type" : "type-3337", ++ "self_type" : "type-3339", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3344", +- "self_type" : "type-3346", ++ "referenced_type" : "type-3383", ++ "self_type" : "type-3385", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3390", +- "self_type" : "type-3392", ++ "referenced_type" : "type-3427", ++ "self_type" : "type-3429", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3434", +- "self_type" : "type-3436", ++ "referenced_type" : "type-3887", ++ "self_type" : "type-3889", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3894", +- "self_type" : "type-3896", ++ "referenced_type" : "type-3996", ++ "self_type" : "type-3998", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-4004", +- "self_type" : "type-4006", ++ "referenced_type" : "type-4069", ++ "self_type" : "type-4071", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-4077", +- "self_type" : "type-4079", ++ "referenced_type" : "type-513", ++ "self_type" : "type-515", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-515", +- "self_type" : "type-517", ++ "referenced_type" : "type-613", ++ "self_type" : "type-616", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-616", +- "self_type" : "type-618", ++ "referenced_type" : "type-708", ++ "self_type" : "type-710", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-710", +- "self_type" : "type-712", ++ "referenced_type" : "type-746", ++ "self_type" : "type-748", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-749", +- "self_type" : "type-752", ++ "referenced_type" : "type-821", ++ "self_type" : "type-823", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-824", +- "self_type" : "type-826", ++ "referenced_type" : "type-83", ++ "self_type" : "type-85", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-84", +- "self_type" : "type-87", ++ "referenced_type" : "type-851", ++ "self_type" : "type-865", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-854", +- "self_type" : "type-868", ++ "referenced_type" : "type-914", ++ "self_type" : "type-916", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-917", +- "self_type" : "type-920", ++ "referenced_type" : "type-997", ++ "self_type" : "type-999", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const log_msg &", + "name" : "const log_msg &", +- "referenced_type" : "type-239", +- "self_type" : "type-241", ++ "referenced_type" : "type-238", ++ "self_type" : "type-240", + "size" : 4, + "source_file" : "/system/core/liblog/include/log/log_read.h" + }, +@@ -20699,8 +22111,8 @@ + "alignment" : 4, + "linker_set_key" : "const long long &", + "name" : "const long long &", +- "referenced_type" : "type-653", +- "self_type" : "type-659", ++ "referenced_type" : "type-651", ++ "self_type" : "type-657", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20708,8 +22120,8 @@ + "alignment" : 4, + "linker_set_key" : "const short &", + "name" : "const short &", +- "referenced_type" : "type-609", +- "self_type" : "type-610", ++ "referenced_type" : "type-607", ++ "self_type" : "type-608", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20718,7 +22130,7 @@ + "linker_set_key" : "const signed char &", + "name" : "const signed char &", + "referenced_type" : "type-549", +- "self_type" : "type-570", ++ "self_type" : "type-568", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20726,8 +22138,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1046", +- "self_type" : "type-1048", ++ "referenced_type" : "type-1043", ++ "self_type" : "type-1045", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20735,8 +22147,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1109", +- "self_type" : "type-1149", ++ "referenced_type" : "type-1108", ++ "self_type" : "type-1146", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -20744,8 +22156,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1113", +- "self_type" : "type-1115", ++ "referenced_type" : "type-1110", ++ "self_type" : "type-1112", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20753,8 +22165,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-113", +- "self_type" : "type-115", ++ "referenced_type" : "type-112", ++ "self_type" : "type-114", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -20762,8 +22174,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1174", +- "self_type" : "type-1176", ++ "referenced_type" : "type-1171", ++ "self_type" : "type-1173", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20771,8 +22183,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1233", +- "self_type" : "type-1235", ++ "referenced_type" : "type-1230", ++ "self_type" : "type-1232", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20780,8 +22192,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1312", +- "self_type" : "type-1314", ++ "referenced_type" : "type-1309", ++ "self_type" : "type-1311", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20789,8 +22201,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1398", +- "self_type" : "type-1400", ++ "referenced_type" : "type-1394", ++ "self_type" : "type-1396", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20798,8 +22210,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1467", +- "self_type" : "type-1469", ++ "referenced_type" : "type-1463", ++ "self_type" : "type-1465", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -20807,8 +22219,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1546", +- "self_type" : "type-1548", ++ "referenced_type" : "type-1542", ++ "self_type" : "type-1544", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20816,8 +22228,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1774", +- "self_type" : "type-1786", ++ "referenced_type" : "type-1769", ++ "self_type" : "type-1781", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -20825,8 +22237,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1815", +- "self_type" : "type-1818", ++ "referenced_type" : "type-1810", ++ "self_type" : "type-1812", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -20834,8 +22246,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1972", +- "self_type" : "type-1974", ++ "referenced_type" : "type-1967", ++ "self_type" : "type-1969", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20843,8 +22255,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2031", +- "self_type" : "type-2070", ++ "referenced_type" : "type-2028", ++ "self_type" : "type-2065", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -20852,8 +22264,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2035", +- "self_type" : "type-2037", ++ "referenced_type" : "type-2030", ++ "self_type" : "type-2032", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20861,8 +22273,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-206", +- "self_type" : "type-214", ++ "referenced_type" : "type-205", ++ "self_type" : "type-213", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -20870,8 +22282,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2094", +- "self_type" : "type-2096", ++ "referenced_type" : "type-2089", ++ "self_type" : "type-2091", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20879,8 +22291,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2151", +- "self_type" : "type-2153", ++ "referenced_type" : "type-2146", ++ "self_type" : "type-2148", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20888,8 +22300,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2229", +- "self_type" : "type-2231", ++ "referenced_type" : "type-2224", ++ "self_type" : "type-2226", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20897,8 +22309,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2275", +- "self_type" : "type-2277", ++ "referenced_type" : "type-2270", ++ "self_type" : "type-2272", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -20906,8 +22318,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2599", +- "self_type" : "type-2601", ++ "referenced_type" : "type-2593", ++ "self_type" : "type-2595", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20915,8 +22327,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2666", +- "self_type" : "type-2668", ++ "referenced_type" : "type-2660", ++ "self_type" : "type-2662", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -20924,8 +22336,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2744", +- "self_type" : "type-2746", ++ "referenced_type" : "type-2738", ++ "self_type" : "type-2740", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20933,8 +22345,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2814", +- "self_type" : "type-2816", ++ "referenced_type" : "type-2807", ++ "self_type" : "type-2810", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20942,8 +22354,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2878", +- "self_type" : "type-2882", ++ "referenced_type" : "type-2871", ++ "self_type" : "type-2875", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -20951,8 +22363,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2961", +- "self_type" : "type-2963", ++ "referenced_type" : "type-2954", ++ "self_type" : "type-2956", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -20960,8 +22372,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3111", +- "self_type" : "type-3113", ++ "referenced_type" : "type-3104", ++ "self_type" : "type-3106", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20969,8 +22381,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3151", +- "self_type" : "type-3185", ++ "referenced_type" : "type-3144", ++ "self_type" : "type-3179", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -20978,8 +22390,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3170", +- "self_type" : "type-3172", ++ "referenced_type" : "type-3163", ++ "self_type" : "type-3165", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20987,8 +22399,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3189", +- "self_type" : "type-3194", ++ "referenced_type" : "type-3182", ++ "self_type" : "type-3189", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -20996,8 +22408,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3237", +- "self_type" : "type-3239", ++ "referenced_type" : "type-3230", ++ "self_type" : "type-3232", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -21005,8 +22417,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3292", +- "self_type" : "type-3294", ++ "referenced_type" : "type-3285", ++ "self_type" : "type-3287", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -21014,8 +22426,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3301", +- "self_type" : "type-3307", ++ "referenced_type" : "type-3294", ++ "self_type" : "type-3302", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21023,8 +22435,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3358", +- "self_type" : "type-3360", ++ "referenced_type" : "type-3351", ++ "self_type" : "type-3353", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -21032,8 +22444,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3402", +- "self_type" : "type-3408", ++ "referenced_type" : "type-3395", ++ "self_type" : "type-3397", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -21041,8 +22453,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3942", +- "self_type" : "type-3944", ++ "referenced_type" : "type-3934", ++ "self_type" : "type-3936", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21050,8 +22462,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-4016", +- "self_type" : "type-4018", ++ "referenced_type" : "type-4008", ++ "self_type" : "type-4010", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -21059,8 +22471,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-409", +- "self_type" : "type-411", ++ "referenced_type" : "type-407", ++ "self_type" : "type-409", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21068,8 +22480,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-533", +- "self_type" : "type-535", ++ "referenced_type" : "type-531", ++ "self_type" : "type-533", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -21077,8 +22489,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-646", +- "self_type" : "type-648", ++ "referenced_type" : "type-644", ++ "self_type" : "type-646", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21086,8 +22498,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-799", +- "self_type" : "type-813", ++ "referenced_type" : "type-796", ++ "self_type" : "type-810", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21095,8 +22507,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-846", +- "self_type" : "type-849", ++ "referenced_type" : "type-843", ++ "self_type" : "type-845", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -21104,8 +22516,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-1541", +- "self_type" : "type-1540", ++ "referenced_type" : "type-1537", ++ "self_type" : "type-1536", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21113,8 +22525,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-2739", +- "self_type" : "type-2738", ++ "referenced_type" : "type-2733", ++ "self_type" : "type-2732", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21122,8 +22534,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-2809", +- "self_type" : "type-2808", ++ "referenced_type" : "type-2803", ++ "self_type" : "type-2802", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21131,8 +22543,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-641", +- "self_type" : "type-640", ++ "referenced_type" : "type-639", ++ "self_type" : "type-638", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21140,8 +22552,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-1394", +- "self_type" : "type-1393", ++ "referenced_type" : "type-1390", ++ "self_type" : "type-1389", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21149,8 +22561,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-2595", +- "self_type" : "type-2594", ++ "referenced_type" : "type-2589", ++ "self_type" : "type-2588", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21158,8 +22570,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-3938", +- "self_type" : "type-3937", ++ "referenced_type" : "type-3930", ++ "self_type" : "type-3929", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21167,8 +22579,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-404", +- "self_type" : "type-403", ++ "referenced_type" : "type-402", ++ "self_type" : "type-401", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21176,8 +22588,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function &", + "name" : "const std::function &", +- "referenced_type" : "type-1337", +- "self_type" : "type-1339", ++ "referenced_type" : "type-1334", ++ "self_type" : "type-1336", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -21185,8 +22597,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function &", + "name" : "const std::function &", +- "referenced_type" : "type-2305", +- "self_type" : "type-2310", ++ "referenced_type" : "type-2300", ++ "self_type" : "type-2305", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -21194,8 +22606,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function &", + "name" : "const std::function &", +- "referenced_type" : "type-306", +- "self_type" : "type-308", ++ "referenced_type" : "type-305", ++ "self_type" : "type-307", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -21203,8 +22615,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function &", + "name" : "const std::function &", +- "referenced_type" : "type-3642", +- "self_type" : "type-3644", ++ "referenced_type" : "type-3635", ++ "self_type" : "type-3637", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -21212,8 +22624,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function &", + "name" : "const std::function &", +- "referenced_type" : "type-3761", +- "self_type" : "type-3765", ++ "referenced_type" : "type-3754", ++ "self_type" : "type-3758", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -21221,8 +22633,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::unique_ptr > &", + "name" : "const std::unique_ptr > &", +- "referenced_type" : "type-3767", +- "self_type" : "type-3769", ++ "referenced_type" : "type-3760", ++ "self_type" : "type-3762", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -21230,8 +22642,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-1804", +- "self_type" : "type-1806", ++ "referenced_type" : "type-1799", ++ "self_type" : "type-1801", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21239,8 +22651,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-2949", +- "self_type" : "type-2951", ++ "referenced_type" : "type-2942", ++ "self_type" : "type-2944", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21248,8 +22660,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-831", +- "self_type" : "type-833", ++ "referenced_type" : "type-828", ++ "self_type" : "type-830", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21257,8 +22669,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1080", +- "self_type" : "type-1079", ++ "referenced_type" : "type-1077", ++ "self_type" : "type-1076", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21266,8 +22678,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1132", +- "self_type" : "type-1131", ++ "referenced_type" : "type-1129", ++ "self_type" : "type-1128", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21275,8 +22687,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1151", +- "self_type" : "type-1150", ++ "referenced_type" : "type-1148", ++ "self_type" : "type-1147", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21284,8 +22696,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1170", +- "self_type" : "type-1169", ++ "referenced_type" : "type-1167", ++ "self_type" : "type-1166", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21293,8 +22705,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1193", +- "self_type" : "type-1192", ++ "referenced_type" : "type-1190", ++ "self_type" : "type-1189", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21302,8 +22714,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1260", +- "self_type" : "type-1259", ++ "referenced_type" : "type-1257", ++ "self_type" : "type-1256", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21311,8 +22723,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1326", +- "self_type" : "type-1325", ++ "referenced_type" : "type-1323", ++ "self_type" : "type-1322", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21320,8 +22732,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1384", +- "self_type" : "type-1383", ++ "referenced_type" : "type-1381", ++ "self_type" : "type-1380", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21329,8 +22741,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1492", +- "self_type" : "type-1491", ++ "referenced_type" : "type-1488", ++ "self_type" : "type-1487", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21338,8 +22750,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-155", +- "self_type" : "type-154", ++ "referenced_type" : "type-154", ++ "self_type" : "type-153", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21347,8 +22759,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1556", +- "self_type" : "type-1555", ++ "referenced_type" : "type-1552", ++ "self_type" : "type-1551", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21356,8 +22768,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1716", +- "self_type" : "type-1715", ++ "referenced_type" : "type-1711", ++ "self_type" : "type-1710", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21365,8 +22777,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1741", +- "self_type" : "type-1740", ++ "referenced_type" : "type-1736", ++ "self_type" : "type-1735", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21374,8 +22786,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1850", +- "self_type" : "type-1849", ++ "referenced_type" : "type-1845", ++ "self_type" : "type-1844", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21383,8 +22795,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1884", +- "self_type" : "type-1883", ++ "referenced_type" : "type-1878", ++ "self_type" : "type-1877", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21392,8 +22804,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1889", +- "self_type" : "type-1888", ++ "referenced_type" : "type-1884", ++ "self_type" : "type-1883", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21401,8 +22813,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2004", +- "self_type" : "type-2003", ++ "referenced_type" : "type-1999", ++ "self_type" : "type-1998", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21410,8 +22822,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2054", +- "self_type" : "type-2053", ++ "referenced_type" : "type-2049", ++ "self_type" : "type-2048", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21419,8 +22831,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2072", +- "self_type" : "type-2071", ++ "referenced_type" : "type-2067", ++ "self_type" : "type-2066", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21428,8 +22840,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2090", +- "self_type" : "type-2089", ++ "referenced_type" : "type-2085", ++ "self_type" : "type-2084", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21437,8 +22849,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2113", +- "self_type" : "type-2112", ++ "referenced_type" : "type-2108", ++ "self_type" : "type-2107", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21446,8 +22858,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-216", +- "self_type" : "type-215", ++ "referenced_type" : "type-215", ++ "self_type" : "type-214", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21455,8 +22867,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2179", +- "self_type" : "type-2178", ++ "referenced_type" : "type-2174", ++ "self_type" : "type-2173", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21464,8 +22876,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-219", +- "self_type" : "type-218", ++ "referenced_type" : "type-218", ++ "self_type" : "type-217", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21473,8 +22885,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2243", +- "self_type" : "type-2242", ++ "referenced_type" : "type-2238", ++ "self_type" : "type-2237", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21482,8 +22894,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2298", +- "self_type" : "type-2297", ++ "referenced_type" : "type-2293", ++ "self_type" : "type-2292", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21491,8 +22903,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2319", +- "self_type" : "type-2318", ++ "referenced_type" : "type-2313", ++ "self_type" : "type-2312", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21500,8 +22912,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2585", +- "self_type" : "type-2584", ++ "referenced_type" : "type-2580", ++ "self_type" : "type-2579", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21509,8 +22921,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2691", +- "self_type" : "type-2690", ++ "referenced_type" : "type-2685", ++ "self_type" : "type-2684", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21518,8 +22930,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2754", +- "self_type" : "type-2753", ++ "referenced_type" : "type-2748", ++ "self_type" : "type-2747", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21527,8 +22939,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2825", +- "self_type" : "type-2824", ++ "referenced_type" : "type-2819", ++ "self_type" : "type-2818", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21536,8 +22948,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2861", +- "self_type" : "type-2860", ++ "referenced_type" : "type-2854", ++ "self_type" : "type-2853", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21545,8 +22957,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2884", +- "self_type" : "type-2883", ++ "referenced_type" : "type-2877", ++ "self_type" : "type-2876", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21554,8 +22966,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2994", +- "self_type" : "type-2993", ++ "referenced_type" : "type-2986", ++ "self_type" : "type-2985", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21563,8 +22975,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3005", +- "self_type" : "type-3004", ++ "referenced_type" : "type-2998", ++ "self_type" : "type-2997", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21572,8 +22984,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3027", +- "self_type" : "type-3026", ++ "referenced_type" : "type-3020", ++ "self_type" : "type-3019", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21581,8 +22993,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3140", +- "self_type" : "type-3139", ++ "referenced_type" : "type-3133", ++ "self_type" : "type-3132", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21590,8 +23002,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3192", +- "self_type" : "type-3191", ++ "referenced_type" : "type-3185", ++ "self_type" : "type-3184", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21599,8 +23011,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3198", +- "self_type" : "type-3197", ++ "referenced_type" : "type-3191", ++ "self_type" : "type-3190", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21608,8 +23020,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3217", +- "self_type" : "type-3216", ++ "referenced_type" : "type-3210", ++ "self_type" : "type-3209", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21617,8 +23029,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3256", +- "self_type" : "type-3255", ++ "referenced_type" : "type-3249", ++ "self_type" : "type-3248", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21626,8 +23038,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3314", +- "self_type" : "type-3313", ++ "referenced_type" : "type-3307", ++ "self_type" : "type-3306", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21635,8 +23047,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3369", +- "self_type" : "type-3368", ++ "referenced_type" : "type-3362", ++ "self_type" : "type-3361", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21644,8 +23056,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3376", +- "self_type" : "type-3375", ++ "referenced_type" : "type-3369", ++ "self_type" : "type-3368", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21653,8 +23065,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3406", +- "self_type" : "type-3405", ++ "referenced_type" : "type-3402", ++ "self_type" : "type-3401", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21662,8 +23074,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3426", +- "self_type" : "type-3425", ++ "referenced_type" : "type-3419", ++ "self_type" : "type-3418", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21671,8 +23083,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3440", +- "self_type" : "type-3439", ++ "referenced_type" : "type-3433", ++ "self_type" : "type-3432", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21680,8 +23092,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-388", +- "self_type" : "type-387", ++ "referenced_type" : "type-387", ++ "self_type" : "type-386", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21689,8 +23101,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3928", +- "self_type" : "type-3927", ++ "referenced_type" : "type-3921", ++ "self_type" : "type-3920", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21698,8 +23110,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-4042", +- "self_type" : "type-4041", ++ "referenced_type" : "type-4034", ++ "self_type" : "type-4033", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21707,8 +23119,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-568", +- "self_type" : "type-567", ++ "referenced_type" : "type-566", ++ "self_type" : "type-565", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21716,8 +23128,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-59", +- "self_type" : "type-58", ++ "referenced_type" : "type-58", ++ "self_type" : "type-57", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21725,8 +23137,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-657", +- "self_type" : "type-656", ++ "referenced_type" : "type-655", ++ "self_type" : "type-654", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21734,8 +23146,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-733", +- "self_type" : "type-732", ++ "referenced_type" : "type-730", ++ "self_type" : "type-729", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21743,8 +23155,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-758", +- "self_type" : "type-757", ++ "referenced_type" : "type-755", ++ "self_type" : "type-754", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21752,8 +23164,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-901", +- "self_type" : "type-900", ++ "referenced_type" : "type-898", ++ "self_type" : "type-897", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21761,8 +23173,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-93", +- "self_type" : "type-92", ++ "referenced_type" : "type-92", ++ "self_type" : "type-91", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21770,8 +23182,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-935", +- "self_type" : "type-934", ++ "referenced_type" : "type-931", ++ "self_type" : "type-930", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21779,8 +23191,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-940", +- "self_type" : "type-939", ++ "referenced_type" : "type-937", ++ "self_type" : "type-936", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21788,8 +23200,8 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned char &", + "name" : "const unsigned char &", +- "referenced_type" : "type-604", +- "self_type" : "type-608", ++ "referenced_type" : "type-603", ++ "self_type" : "type-606", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -21797,8 +23209,8 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned char *const &", + "name" : "const unsigned char *const &", +- "referenced_type" : "type-3727", +- "self_type" : "type-3728", ++ "referenced_type" : "type-3720", ++ "self_type" : "type-3721", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21806,8 +23218,8 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned int &", + "name" : "const unsigned int &", +- "referenced_type" : "type-246", +- "self_type" : "type-651", ++ "referenced_type" : "type-245", ++ "self_type" : "type-650", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -21815,8 +23227,8 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned int *const &", + "name" : "const unsigned int *const &", +- "referenced_type" : "type-3729", +- "self_type" : "type-3731", ++ "referenced_type" : "type-3722", ++ "self_type" : "type-3724", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21824,8 +23236,8 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned long long &", + "name" : "const unsigned long long &", +- "referenced_type" : "type-661", +- "self_type" : "type-664", ++ "referenced_type" : "type-659", ++ "self_type" : "type-662", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -21833,7 +23245,7 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned short &", + "name" : "const unsigned short &", +- "referenced_type" : "type-614", ++ "referenced_type" : "type-612", + "self_type" : "type-615", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" +@@ -21842,8 +23254,8 @@ + "alignment" : 4, + "linker_set_key" : "const void *const &", + "name" : "const void *const &", +- "referenced_type" : "type-2386", +- "self_type" : "type-2387", ++ "referenced_type" : "type-2381", ++ "self_type" : "type-2382", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -21852,7 +23264,7 @@ + "linker_set_key" : "int &", + "name" : "int &", + "referenced_type" : "type-19", +- "self_type" : "type-339", ++ "self_type" : "type-338", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -21860,8 +23272,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-120", +- "self_type" : "type-119", ++ "referenced_type" : "type-119", ++ "self_type" : "type-118", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21869,8 +23281,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-1295", +- "self_type" : "type-1294", ++ "referenced_type" : "type-1293", ++ "self_type" : "type-1292", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -21878,8 +23290,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-1795", +- "self_type" : "type-1794", ++ "referenced_type" : "type-1790", ++ "self_type" : "type-1789", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21887,8 +23299,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-2212", +- "self_type" : "type-2211", ++ "referenced_type" : "type-2208", ++ "self_type" : "type-2207", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -21896,8 +23308,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-2493", +- "self_type" : "type-2492", ++ "referenced_type" : "type-2488", ++ "self_type" : "type-2487", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21905,8 +23317,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-265", +- "self_type" : "type-264", ++ "referenced_type" : "type-264", ++ "self_type" : "type-263", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -21914,8 +23326,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-2893", +- "self_type" : "type-2892", ++ "referenced_type" : "type-2886", ++ "self_type" : "type-2885", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21923,8 +23335,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3319", +- "self_type" : "type-3318", ++ "referenced_type" : "type-3312", ++ "self_type" : "type-3311", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21932,8 +23344,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3561", +- "self_type" : "type-3560", ++ "referenced_type" : "type-3554", ++ "self_type" : "type-3553", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21941,8 +23353,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3586", +- "self_type" : "type-3585", ++ "referenced_type" : "type-3580", ++ "self_type" : "type-3579", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -21950,8 +23362,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3739", +- "self_type" : "type-3738", ++ "referenced_type" : "type-3732", ++ "self_type" : "type-3731", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21959,8 +23371,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3803", +- "self_type" : "type-3802", ++ "referenced_type" : "type-3796", ++ "self_type" : "type-3795", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21968,8 +23380,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3879", +- "self_type" : "type-3878", ++ "referenced_type" : "type-3872", ++ "self_type" : "type-3871", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21977,8 +23389,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3890", +- "self_type" : "type-3889", ++ "referenced_type" : "type-3883", ++ "self_type" : "type-3882", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21986,8 +23398,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-822", +- "self_type" : "type-821", ++ "referenced_type" : "type-819", ++ "self_type" : "type-818", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21995,8 +23407,8 @@ + "alignment" : 4, + "linker_set_key" : "unsigned char &", + "name" : "unsigned char &", +- "referenced_type" : "type-199", +- "self_type" : "type-555", ++ "referenced_type" : "type-198", ++ "self_type" : "type-553", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -22004,8 +23416,8 @@ + "alignment" : 4, + "linker_set_key" : "void *const &", + "name" : "void *const &", +- "referenced_type" : "type-3669", +- "self_type" : "type-3670", ++ "referenced_type" : "type-3662", ++ "self_type" : "type-3663", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + } +@@ -22016,8 +23428,8 @@ + "alignment" : 4, + "linker_set_key" : "android::CallStack *", + "name" : "android::CallStack *", +- "referenced_type" : "type-256", +- "self_type" : "type-257", ++ "referenced_type" : "type-255", ++ "self_type" : "type-256", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/CallStack.h" + }, +@@ -22025,8 +23437,8 @@ + "alignment" : 4, + "linker_set_key" : "android::CallStack::StackDeleter *", + "name" : "android::CallStack::StackDeleter *", +- "referenced_type" : "type-260", +- "self_type" : "type-261", ++ "referenced_type" : "type-259", ++ "self_type" : "type-260", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/CallStack.h" + }, +@@ -22034,8 +23446,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Condition *", + "name" : "android::Condition *", +- "referenced_type" : "type-442", +- "self_type" : "type-445", ++ "referenced_type" : "type-440", ++ "self_type" : "type-443", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Condition.h" + }, +@@ -22043,8 +23455,8 @@ + "alignment" : 4, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-2438", +- "self_type" : "type-2437", ++ "referenced_type" : "type-2433", ++ "self_type" : "type-2432", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -22052,8 +23464,8 @@ + "alignment" : 4, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-3539", +- "self_type" : "type-3538", ++ "referenced_type" : "type-3532", ++ "self_type" : "type-3531", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -22061,8 +23473,8 @@ + "alignment" : 4, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-3637", +- "self_type" : "type-3636", ++ "referenced_type" : "type-3630", ++ "self_type" : "type-3629", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -22070,8 +23482,8 @@ + "alignment" : 4, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-3789", +- "self_type" : "type-3788", ++ "referenced_type" : "type-3782", ++ "self_type" : "type-3781", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -22079,8 +23491,8 @@ + "alignment" : 4, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-3845", +- "self_type" : "type-3844", ++ "referenced_type" : "type-3838", ++ "self_type" : "type-3837", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -22088,8 +23500,8 @@ + "alignment" : 4, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-3883", +- "self_type" : "type-3882", ++ "referenced_type" : "type-3876", ++ "self_type" : "type-3875", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -22097,8 +23509,8 @@ + "alignment" : 4, + "linker_set_key" : "android::KeyedVector > *", + "name" : "android::KeyedVector > *", +- "referenced_type" : "type-433", +- "self_type" : "type-3835", ++ "referenced_type" : "type-431", ++ "self_type" : "type-3828", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -22106,8 +23518,8 @@ + "alignment" : 4, + "linker_set_key" : "android::KeyedVector *", + "name" : "android::KeyedVector *", +- "referenced_type" : "type-2341", +- "self_type" : "type-2417", ++ "referenced_type" : "type-2336", ++ "self_type" : "type-2412", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -22115,8 +23527,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Mutex *", + "name" : "android::Mutex *", +- "referenced_type" : "type-436", +- "self_type" : "type-438", ++ "referenced_type" : "type-433", ++ "self_type" : "type-436", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Mutex.h" + }, +@@ -22124,8 +23536,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Mutex::Autolock *", + "name" : "android::Mutex::Autolock *", +- "referenced_type" : "type-439", +- "self_type" : "type-441", ++ "referenced_type" : "type-437", ++ "self_type" : "type-439", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Mutex.h" + }, +@@ -22133,8 +23545,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RWLock *", + "name" : "android::RWLock *", +- "referenced_type" : "type-448", +- "self_type" : "type-450", ++ "referenced_type" : "type-444", ++ "self_type" : "type-448", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RWLock.h" + }, +@@ -22142,8 +23554,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RWLock::AutoRLock *", + "name" : "android::RWLock::AutoRLock *", +- "referenced_type" : "type-451", +- "self_type" : "type-453", ++ "referenced_type" : "type-449", ++ "self_type" : "type-451", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RWLock.h" + }, +@@ -22151,8 +23563,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RWLock::AutoWLock *", + "name" : "android::RWLock::AutoWLock *", +- "referenced_type" : "type-455", +- "self_type" : "type-456", ++ "referenced_type" : "type-452", ++ "self_type" : "type-454", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RWLock.h" + }, +@@ -22161,7 +23573,7 @@ + "linker_set_key" : "android::RefBase *", + "name" : "android::RefBase *", + "referenced_type" : "type-25", +- "self_type" : "type-68", ++ "self_type" : "type-67", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22169,8 +23581,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase **", + "name" : "android::RefBase **", +- "referenced_type" : "type-68", +- "self_type" : "type-3606", ++ "referenced_type" : "type-67", ++ "self_type" : "type-3599", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -22178,8 +23590,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase *const *", + "name" : "android::RefBase *const *", +- "referenced_type" : "type-3611", +- "self_type" : "type-3612", ++ "referenced_type" : "type-3604", ++ "self_type" : "type-3605", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -22187,8 +23599,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1100", +- "self_type" : "type-1099", ++ "referenced_type" : "type-1097", ++ "self_type" : "type-1096", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22196,8 +23608,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1160", +- "self_type" : "type-1159", ++ "referenced_type" : "type-1157", ++ "self_type" : "type-1156", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22205,8 +23617,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1221", +- "self_type" : "type-1220", ++ "referenced_type" : "type-1218", ++ "self_type" : "type-1217", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22214,8 +23626,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1293", +- "self_type" : "type-1292", ++ "referenced_type" : "type-1290", ++ "self_type" : "type-1289", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22223,8 +23635,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1348", +- "self_type" : "type-1347", ++ "referenced_type" : "type-1345", ++ "self_type" : "type-1344", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22232,8 +23644,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1455", +- "self_type" : "type-1454", ++ "referenced_type" : "type-1451", ++ "self_type" : "type-1450", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22241,8 +23653,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1523", +- "self_type" : "type-1522", ++ "referenced_type" : "type-1519", ++ "self_type" : "type-1518", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22250,8 +23662,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1690", +- "self_type" : "type-1689", ++ "referenced_type" : "type-1686", ++ "self_type" : "type-1685", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22259,8 +23671,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1702", +- "self_type" : "type-1701", ++ "referenced_type" : "type-1698", ++ "self_type" : "type-1697", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22268,8 +23680,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1729", +- "self_type" : "type-1728", ++ "referenced_type" : "type-1724", ++ "self_type" : "type-1723", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22277,8 +23689,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1792", +- "self_type" : "type-1791", ++ "referenced_type" : "type-1787", ++ "self_type" : "type-1786", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22286,8 +23698,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1864", +- "self_type" : "type-1863", ++ "referenced_type" : "type-1859", ++ "self_type" : "type-1858", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22295,8 +23707,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1935", +- "self_type" : "type-1934", ++ "referenced_type" : "type-1930", ++ "self_type" : "type-1929", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22304,8 +23716,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2022", +- "self_type" : "type-2021", ++ "referenced_type" : "type-2017", ++ "self_type" : "type-2016", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22313,8 +23725,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2080", +- "self_type" : "type-2079", ++ "referenced_type" : "type-2075", ++ "self_type" : "type-2074", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22322,8 +23734,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2139", +- "self_type" : "type-2138", ++ "referenced_type" : "type-2134", ++ "self_type" : "type-2133", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22331,8 +23743,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2210", +- "self_type" : "type-2209", ++ "referenced_type" : "type-2205", ++ "self_type" : "type-2204", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22340,8 +23752,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2258", +- "self_type" : "type-2257", ++ "referenced_type" : "type-2253", ++ "self_type" : "type-2252", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22349,8 +23761,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2308", +- "self_type" : "type-2307", ++ "referenced_type" : "type-2303", ++ "self_type" : "type-2302", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22358,8 +23770,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2326", +- "self_type" : "type-2325", ++ "referenced_type" : "type-2321", ++ "self_type" : "type-2320", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22367,8 +23779,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2402", +- "self_type" : "type-2401", ++ "referenced_type" : "type-2397", ++ "self_type" : "type-2396", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22376,8 +23788,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2501", +- "self_type" : "type-2500", ++ "referenced_type" : "type-2496", ++ "self_type" : "type-2495", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22385,8 +23797,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2523", +- "self_type" : "type-2522", ++ "referenced_type" : "type-2520", ++ "self_type" : "type-2519", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22394,8 +23806,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2536", +- "self_type" : "type-2535", ++ "referenced_type" : "type-2531", ++ "self_type" : "type-2530", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22403,8 +23815,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2544", +- "self_type" : "type-2543", ++ "referenced_type" : "type-2539", ++ "self_type" : "type-2538", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22412,8 +23824,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2654", +- "self_type" : "type-2653", ++ "referenced_type" : "type-2648", ++ "self_type" : "type-2647", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22421,8 +23833,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2722", +- "self_type" : "type-2721", ++ "referenced_type" : "type-2716", ++ "self_type" : "type-2715", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22439,8 +23851,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2821", +- "self_type" : "type-2820", ++ "referenced_type" : "type-2816", ++ "self_type" : "type-2815", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22448,8 +23860,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2834", +- "self_type" : "type-2833", ++ "referenced_type" : "type-2828", ++ "self_type" : "type-2827", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22457,8 +23869,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2872", +- "self_type" : "type-2871", ++ "referenced_type" : "type-2865", ++ "self_type" : "type-2864", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22466,8 +23878,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2938", +- "self_type" : "type-2937", ++ "referenced_type" : "type-2930", ++ "self_type" : "type-2929", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22475,8 +23887,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3008", +- "self_type" : "type-3007", ++ "referenced_type" : "type-3001", ++ "self_type" : "type-3000", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22484,8 +23896,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3079", +- "self_type" : "type-3078", ++ "referenced_type" : "type-3072", ++ "self_type" : "type-3071", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22493,8 +23905,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3159", +- "self_type" : "type-3158", ++ "referenced_type" : "type-3152", ++ "self_type" : "type-3151", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22502,8 +23914,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-321", +- "self_type" : "type-320", ++ "referenced_type" : "type-320", ++ "self_type" : "type-319", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22511,8 +23923,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3226", +- "self_type" : "type-3225", ++ "referenced_type" : "type-3219", ++ "self_type" : "type-3218", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22520,8 +23932,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3269", +- "self_type" : "type-3268", ++ "referenced_type" : "type-3262", ++ "self_type" : "type-3261", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22529,8 +23941,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3279", +- "self_type" : "type-3278", ++ "referenced_type" : "type-3272", ++ "self_type" : "type-3271", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22538,8 +23950,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3342", +- "self_type" : "type-3341", ++ "referenced_type" : "type-3335", ++ "self_type" : "type-3334", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22547,8 +23959,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3388", +- "self_type" : "type-3387", ++ "referenced_type" : "type-3381", ++ "self_type" : "type-3380", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22556,8 +23968,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3432", +- "self_type" : "type-3431", ++ "referenced_type" : "type-3425", ++ "self_type" : "type-3424", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22565,8 +23977,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3447", +- "self_type" : "type-3446", ++ "referenced_type" : "type-3440", ++ "self_type" : "type-3439", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22574,8 +23986,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3505", +- "self_type" : "type-3504", ++ "referenced_type" : "type-3498", ++ "self_type" : "type-3497", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22583,8 +23995,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3568", +- "self_type" : "type-3567", ++ "referenced_type" : "type-3561", ++ "self_type" : "type-3560", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22592,8 +24004,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3589", +- "self_type" : "type-3588", ++ "referenced_type" : "type-3582", ++ "self_type" : "type-3581", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22601,8 +24013,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3597", +- "self_type" : "type-3596", ++ "referenced_type" : "type-3590", ++ "self_type" : "type-3589", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22610,8 +24022,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3620", +- "self_type" : "type-3619", ++ "referenced_type" : "type-3613", ++ "self_type" : "type-3612", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22619,8 +24031,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3755", +- "self_type" : "type-3754", ++ "referenced_type" : "type-3748", ++ "self_type" : "type-3747", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22628,8 +24040,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3821", +- "self_type" : "type-3820", ++ "referenced_type" : "type-3814", ++ "self_type" : "type-3813", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22637,8 +24049,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3876", +- "self_type" : "type-3875", ++ "referenced_type" : "type-3869", ++ "self_type" : "type-3868", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22646,8 +24058,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3892", +- "self_type" : "type-3891", ++ "referenced_type" : "type-3885", ++ "self_type" : "type-3884", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22655,8 +24067,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-4002", +- "self_type" : "type-4001", ++ "referenced_type" : "type-3994", ++ "self_type" : "type-3993", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22664,8 +24076,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-4074", +- "self_type" : "type-4073", ++ "referenced_type" : "type-4066", ++ "self_type" : "type-4065", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22673,8 +24085,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-511", +- "self_type" : "type-510", ++ "referenced_type" : "type-509", ++ "self_type" : "type-508", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22691,8 +24103,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-612", +- "self_type" : "type-611", ++ "referenced_type" : "type-610", ++ "self_type" : "type-609", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22700,8 +24112,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-707", +- "self_type" : "type-706", ++ "referenced_type" : "type-705", ++ "self_type" : "type-704", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22709,8 +24121,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-719", +- "self_type" : "type-718", ++ "referenced_type" : "type-717", ++ "self_type" : "type-716", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22718,8 +24130,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-746", +- "self_type" : "type-745", ++ "referenced_type" : "type-743", ++ "self_type" : "type-742", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22727,8 +24139,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-81", +- "self_type" : "type-80", ++ "referenced_type" : "type-80", ++ "self_type" : "type-79", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22736,8 +24148,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-819", +- "self_type" : "type-818", ++ "referenced_type" : "type-816", ++ "self_type" : "type-815", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22745,8 +24157,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-915", +- "self_type" : "type-914", ++ "referenced_type" : "type-912", ++ "self_type" : "type-911", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22754,8 +24166,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-997", +- "self_type" : "type-996", ++ "referenced_type" : "type-994", ++ "self_type" : "type-993", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22773,7 +24185,7 @@ + "linker_set_key" : "android::RefBase::weakref_type **", + "name" : "android::RefBase::weakref_type **", + "referenced_type" : "type-35", +- "self_type" : "type-3605", ++ "self_type" : "type-3598", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -22781,8 +24193,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_type *const *", + "name" : "android::RefBase::weakref_type *const *", +- "referenced_type" : "type-3609", +- "self_type" : "type-3610", ++ "referenced_type" : "type-3602", ++ "self_type" : "type-3603", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -22799,8 +24211,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ScopedTrace *", + "name" : "android::ScopedTrace *", +- "referenced_type" : "type-1064", +- "self_type" : "type-1065", ++ "referenced_type" : "type-1061", ++ "self_type" : "type-1062", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Trace.h" + }, +@@ -22808,8 +24220,8 @@ + "alignment" : 4, + "linker_set_key" : "android::SortedVector > > *", + "name" : "android::SortedVector > > *", +- "referenced_type" : "type-426", +- "self_type" : "type-3826", ++ "referenced_type" : "type-424", ++ "self_type" : "type-3819", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -22817,8 +24229,8 @@ + "alignment" : 4, + "linker_set_key" : "android::SortedVector > *", + "name" : "android::SortedVector > *", +- "referenced_type" : "type-2342", +- "self_type" : "type-2407", ++ "referenced_type" : "type-2337", ++ "self_type" : "type-2402", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -22826,8 +24238,8 @@ + "alignment" : 4, + "linker_set_key" : "android::String16 *", + "name" : "android::String16 *", +- "referenced_type" : "type-342", +- "self_type" : "type-352", ++ "referenced_type" : "type-341", ++ "self_type" : "type-351", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String16.h" + }, +@@ -22835,8 +24247,8 @@ + "alignment" : 4, + "linker_set_key" : "android::String8 *", + "name" : "android::String8 *", +- "referenced_type" : "type-221", +- "self_type" : "type-227", ++ "referenced_type" : "type-220", ++ "self_type" : "type-226", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String8.h" + }, +@@ -22844,8 +24256,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Thread *", + "name" : "android::Thread *", +- "referenced_type" : "type-501", +- "self_type" : "type-500", ++ "referenced_type" : "type-499", ++ "self_type" : "type-498", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -22853,8 +24265,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-432", +- "self_type" : "type-3631", ++ "referenced_type" : "type-430", ++ "self_type" : "type-3624", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22862,8 +24274,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-431", +- "self_type" : "type-3627", ++ "referenced_type" : "type-429", ++ "self_type" : "type-3620", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22871,8 +24283,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-252", +- "self_type" : "type-253", ++ "referenced_type" : "type-251", ++ "self_type" : "type-252", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22880,8 +24292,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-430", +- "self_type" : "type-3623", ++ "referenced_type" : "type-428", ++ "self_type" : "type-3616", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22889,8 +24301,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-2339", +- "self_type" : "type-2338", ++ "referenced_type" : "type-2334", ++ "self_type" : "type-2333", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -22898,8 +24310,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-2410", +- "self_type" : "type-2412", ++ "referenced_type" : "type-2405", ++ "self_type" : "type-2407", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22907,8 +24319,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-3459", +- "self_type" : "type-3458", ++ "referenced_type" : "type-3452", ++ "self_type" : "type-3451", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -22916,8 +24328,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-3646", +- "self_type" : "type-3645", ++ "referenced_type" : "type-3639", ++ "self_type" : "type-3638", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -22925,8 +24337,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-3764", +- "self_type" : "type-3763", ++ "referenced_type" : "type-3757", ++ "self_type" : "type-3756", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -22934,8 +24346,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-3840", +- "self_type" : "type-3839", ++ "referenced_type" : "type-3833", ++ "self_type" : "type-3832", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -22943,8 +24355,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-428", +- "self_type" : "type-3829", ++ "referenced_type" : "type-426", ++ "self_type" : "type-3822", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22952,8 +24364,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector > *", + "name" : "android::Vector > *", +- "referenced_type" : "type-2518", +- "self_type" : "type-2519", ++ "referenced_type" : "type-2513", ++ "self_type" : "type-2514", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22961,8 +24373,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-2514", +- "self_type" : "type-2517", ++ "referenced_type" : "type-2509", ++ "self_type" : "type-2512", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22970,8 +24382,8 @@ + "alignment" : 4, + "linker_set_key" : "android::VirtualLightRefBase *", + "name" : "android::VirtualLightRefBase *", +- "referenced_type" : "type-182", +- "self_type" : "type-184", ++ "referenced_type" : "type-181", ++ "self_type" : "type-183", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/LightRefBase.h" + }, +@@ -22979,8 +24391,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1083", +- "self_type" : "type-1082", ++ "referenced_type" : "type-1080", ++ "self_type" : "type-1079", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22988,8 +24400,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1139", +- "self_type" : "type-1138", ++ "referenced_type" : "type-1136", ++ "self_type" : "type-1135", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22997,8 +24409,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1196", +- "self_type" : "type-1195", ++ "referenced_type" : "type-1193", ++ "self_type" : "type-1192", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23006,8 +24418,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1269", +- "self_type" : "type-1268", ++ "referenced_type" : "type-1266", ++ "self_type" : "type-1265", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23015,8 +24427,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1381", +- "self_type" : "type-1380", ++ "referenced_type" : "type-1378", ++ "self_type" : "type-1377", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23024,8 +24436,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1759", +- "self_type" : "type-1758", ++ "referenced_type" : "type-1753", ++ "self_type" : "type-1752", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23033,8 +24445,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1887", +- "self_type" : "type-1886", ++ "referenced_type" : "type-1882", ++ "self_type" : "type-1881", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23042,8 +24454,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1899", +- "self_type" : "type-1898", ++ "referenced_type" : "type-1894", ++ "self_type" : "type-1893", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23051,8 +24463,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2007", +- "self_type" : "type-2006", ++ "referenced_type" : "type-2002", ++ "self_type" : "type-2001", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23060,8 +24472,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2061", +- "self_type" : "type-2060", ++ "referenced_type" : "type-2056", ++ "self_type" : "type-2055", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23069,8 +24481,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2116", +- "self_type" : "type-2115", ++ "referenced_type" : "type-2111", ++ "self_type" : "type-2110", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23078,8 +24490,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2188", +- "self_type" : "type-2187", ++ "referenced_type" : "type-2183", ++ "self_type" : "type-2182", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23087,8 +24499,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2247", +- "self_type" : "type-2246", ++ "referenced_type" : "type-2242", ++ "self_type" : "type-2241", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23096,8 +24508,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2333", +- "self_type" : "type-2332", ++ "referenced_type" : "type-2328", ++ "self_type" : "type-2327", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, +@@ -23105,8 +24517,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2582", +- "self_type" : "type-2581", ++ "referenced_type" : "type-2577", ++ "self_type" : "type-2576", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23114,8 +24526,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2904", +- "self_type" : "type-2903", ++ "referenced_type" : "type-2897", ++ "self_type" : "type-2896", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23123,8 +24535,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3031", +- "self_type" : "type-3030", ++ "referenced_type" : "type-3024", ++ "self_type" : "type-3023", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23132,8 +24544,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3042", +- "self_type" : "type-3041", ++ "referenced_type" : "type-3035", ++ "self_type" : "type-3034", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23141,8 +24553,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3143", +- "self_type" : "type-3142", ++ "referenced_type" : "type-3136", ++ "self_type" : "type-3135", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23150,8 +24562,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3203", +- "self_type" : "type-3202", ++ "referenced_type" : "type-3196", ++ "self_type" : "type-3195", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23159,8 +24571,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3259", +- "self_type" : "type-3258", ++ "referenced_type" : "type-3252", ++ "self_type" : "type-3251", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23168,8 +24580,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3323", +- "self_type" : "type-3322", ++ "referenced_type" : "type-3316", ++ "self_type" : "type-3315", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23177,8 +24589,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3379", +- "self_type" : "type-3378", ++ "referenced_type" : "type-3372", ++ "self_type" : "type-3371", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23186,8 +24598,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-385", +- "self_type" : "type-384", ++ "referenced_type" : "type-384", ++ "self_type" : "type-383", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23195,8 +24607,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3926", +- "self_type" : "type-3925", ++ "referenced_type" : "type-3919", ++ "self_type" : "type-3918", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23204,8 +24616,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-782", +- "self_type" : "type-781", ++ "referenced_type" : "type-778", ++ "self_type" : "type-777", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23213,8 +24625,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-938", +- "self_type" : "type-937", ++ "referenced_type" : "type-935", ++ "self_type" : "type-934", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23222,8 +24634,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-955", +- "self_type" : "type-954", ++ "referenced_type" : "type-952", ++ "self_type" : "type-951", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23231,8 +24643,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder **", + "name" : "android::hardware::BHwBinder **", +- "referenced_type" : "type-2332", +- "self_type" : "type-3604", ++ "referenced_type" : "type-2327", ++ "self_type" : "type-3597", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -23240,8 +24652,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *const *", + "name" : "android::hardware::BHwBinder *const *", +- "referenced_type" : "type-3607", +- "self_type" : "type-3608", ++ "referenced_type" : "type-3600", ++ "self_type" : "type-3601", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -23249,8 +24661,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder::Extras *", + "name" : "android::hardware::BHwBinder::Extras *", +- "referenced_type" : "type-2364", +- "self_type" : "type-2363", ++ "referenced_type" : "type-2359", ++ "self_type" : "type-2358", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -23258,8 +24670,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder::Extras *", + "name" : "android::hardware::BHwBinder::Extras *", +- "referenced_type" : "type-3475", +- "self_type" : "type-3474", ++ "referenced_type" : "type-3468", ++ "self_type" : "type-3467", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -23267,8 +24679,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BpHwBinder *", + "name" : "android::hardware::BpHwBinder *", +- "referenced_type" : "type-2336", +- "self_type" : "type-2335", ++ "referenced_type" : "type-2331", ++ "self_type" : "type-2330", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, +@@ -23276,8 +24688,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BpHwBinder::Obituary *", + "name" : "android::hardware::BpHwBinder::Obituary *", +- "referenced_type" : "type-2374", +- "self_type" : "type-2389", ++ "referenced_type" : "type-2369", ++ "self_type" : "type-2384", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -23285,8 +24697,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager *", + "name" : "android::hardware::BpHwBinder::ObjectManager *", +- "referenced_type" : "type-2340", +- "self_type" : "type-2424", ++ "referenced_type" : "type-2335", ++ "self_type" : "type-2419", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -23294,8 +24706,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BpHwRefBase *", + "name" : "android::hardware::BpHwRefBase *", +- "referenced_type" : "type-2365", +- "self_type" : "type-2369", ++ "referenced_type" : "type-2360", ++ "self_type" : "type-2364", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -23303,8 +24715,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BufferedTextOutput *", + "name" : "android::hardware::BufferedTextOutput *", +- "referenced_type" : "type-2506", +- "self_type" : "type-2507", ++ "referenced_type" : "type-2501", ++ "self_type" : "type-2502", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -23312,8 +24724,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *", + "name" : "android::hardware::BufferedTextOutput::BufferState *", +- "referenced_type" : "type-2472", +- "self_type" : "type-2471", ++ "referenced_type" : "type-2467", ++ "self_type" : "type-2466", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23321,8 +24733,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *", + "name" : "android::hardware::BufferedTextOutput::BufferState *", +- "referenced_type" : "type-3545", +- "self_type" : "type-3544", ++ "referenced_type" : "type-3538", ++ "self_type" : "type-3537", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23330,8 +24742,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *", + "name" : "android::hardware::BufferedTextOutput::BufferState *", +- "referenced_type" : "type-3881", +- "self_type" : "type-3880", ++ "referenced_type" : "type-3874", ++ "self_type" : "type-3873", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -23339,8 +24751,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *", + "name" : "android::hardware::BufferedTextOutput::ThreadState *", +- "referenced_type" : "type-2509", +- "self_type" : "type-2508", ++ "referenced_type" : "type-2504", ++ "self_type" : "type-2503", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -23348,8 +24760,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *", + "name" : "android::hardware::BufferedTextOutput::ThreadState *", +- "referenced_type" : "type-3574", +- "self_type" : "type-3573", ++ "referenced_type" : "type-3567", ++ "self_type" : "type-3566", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -23366,8 +24778,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ConcurrentMap, bool> *", + "name" : "android::hardware::ConcurrentMap, bool> *", +- "referenced_type" : "type-41", +- "self_type" : "type-45", ++ "referenced_type" : "type-40", ++ "self_type" : "type-44", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -23375,8 +24787,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ConcurrentMap > *", + "name" : "android::hardware::ConcurrentMap > *", +- "referenced_type" : "type-378", +- "self_type" : "type-390", ++ "referenced_type" : "type-377", ++ "self_type" : "type-389", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -23384,8 +24796,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", +- "referenced_type" : "type-635", +- "self_type" : "type-650", ++ "referenced_type" : "type-633", ++ "self_type" : "type-648", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -23393,8 +24805,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", +- "referenced_type" : "type-398", +- "self_type" : "type-417", ++ "referenced_type" : "type-396", ++ "self_type" : "type-413", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -23402,8 +24814,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::GrantorDescriptor *", + "name" : "android::hardware::GrantorDescriptor *", +- "referenced_type" : "type-319", +- "self_type" : "type-318", ++ "referenced_type" : "type-318", ++ "self_type" : "type-317", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -23411,8 +24823,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::HexDump *", + "name" : "android::hardware::HexDump *", +- "referenced_type" : "type-2486", +- "self_type" : "type-2487", ++ "referenced_type" : "type-2481", ++ "self_type" : "type-2482", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -23420,8 +24832,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::HidlMemory *", + "name" : "android::hardware::HidlMemory *", +- "referenced_type" : "type-159", +- "self_type" : "type-158", ++ "referenced_type" : "type-158", ++ "self_type" : "type-157", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23429,8 +24841,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1087", +- "self_type" : "type-1086", ++ "referenced_type" : "type-1084", ++ "self_type" : "type-1083", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23438,8 +24850,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1144", +- "self_type" : "type-1143", ++ "referenced_type" : "type-1141", ++ "self_type" : "type-1140", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23447,8 +24859,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1201", +- "self_type" : "type-1200", ++ "referenced_type" : "type-1198", ++ "self_type" : "type-1197", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23456,8 +24868,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1275", +- "self_type" : "type-1274", ++ "referenced_type" : "type-1272", ++ "self_type" : "type-1271", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23465,8 +24877,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1408", +- "self_type" : "type-1407", ++ "referenced_type" : "type-1404", ++ "self_type" : "type-1403", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23474,8 +24886,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1497", +- "self_type" : "type-1496", ++ "referenced_type" : "type-1493", ++ "self_type" : "type-1492", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23483,8 +24895,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1562", +- "self_type" : "type-1561", ++ "referenced_type" : "type-1558", ++ "self_type" : "type-1557", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23492,8 +24904,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1722", +- "self_type" : "type-1721", ++ "referenced_type" : "type-1717", ++ "self_type" : "type-1716", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23501,8 +24913,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1854", +- "self_type" : "type-1853", ++ "referenced_type" : "type-1849", ++ "self_type" : "type-1848", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23510,8 +24922,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1892", +- "self_type" : "type-1891", ++ "referenced_type" : "type-1887", ++ "self_type" : "type-1886", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23519,8 +24931,17 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1907", +- "self_type" : "type-1906", ++ "referenced_type" : "type-1902", ++ "self_type" : "type-1901", ++ "size" : 4, ++ "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "android::hardware::IBinder *", ++ "name" : "android::hardware::IBinder *", ++ "referenced_type" : "type-2005", ++ "self_type" : "type-2004", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23528,8 +24949,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2010", +- "self_type" : "type-2009", ++ "referenced_type" : "type-2060", ++ "self_type" : "type-2059", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23537,8 +24958,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2065", +- "self_type" : "type-2064", ++ "referenced_type" : "type-2115", ++ "self_type" : "type-2114", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23546,8 +24967,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2120", +- "self_type" : "type-2119", ++ "referenced_type" : "type-2188", ++ "self_type" : "type-2187", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23555,8 +24976,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2193", +- "self_type" : "type-2192", ++ "referenced_type" : "type-2247", ++ "self_type" : "type-2246", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23564,8 +24985,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2252", +- "self_type" : "type-2251", ++ "referenced_type" : "type-2318", ++ "self_type" : "type-2317", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23574,7 +24995,7 @@ + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", + "referenced_type" : "type-2323", +- "self_type" : "type-2322", ++ "self_type" : "type-2324", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23582,8 +25003,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2328", +- "self_type" : "type-2329", ++ "referenced_type" : "type-2603", ++ "self_type" : "type-2602", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23591,8 +25012,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2609", +- "self_type" : "type-2608", ++ "referenced_type" : "type-2690", ++ "self_type" : "type-2689", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23600,8 +25021,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2696", +- "self_type" : "type-2695", ++ "referenced_type" : "type-2753", ++ "self_type" : "type-2752", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23609,8 +25030,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2759", +- "self_type" : "type-2758", ++ "referenced_type" : "type-2823", ++ "self_type" : "type-2822", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23618,17 +25039,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2829", +- "self_type" : "type-2828", +- "size" : 4, +- "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "android::hardware::IBinder *", +- "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2866", +- "self_type" : "type-2865", ++ "referenced_type" : "type-2859", ++ "self_type" : "type-2858", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23636,8 +25048,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2998", +- "self_type" : "type-2997", ++ "referenced_type" : "type-2991", ++ "self_type" : "type-2990", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23645,8 +25057,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3033", +- "self_type" : "type-3032", ++ "referenced_type" : "type-3026", ++ "self_type" : "type-3025", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23654,8 +25066,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3051", +- "self_type" : "type-3050", ++ "referenced_type" : "type-3044", ++ "self_type" : "type-3043", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23663,8 +25075,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3146", +- "self_type" : "type-3145", ++ "referenced_type" : "type-3139", ++ "self_type" : "type-3138", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23672,8 +25084,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3209", +- "self_type" : "type-3208", ++ "referenced_type" : "type-3202", ++ "self_type" : "type-3201", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23681,8 +25093,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3263", +- "self_type" : "type-3262", ++ "referenced_type" : "type-3256", ++ "self_type" : "type-3255", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23690,8 +25102,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3328", +- "self_type" : "type-3327", ++ "referenced_type" : "type-3321", ++ "self_type" : "type-3320", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23699,8 +25111,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3382", +- "self_type" : "type-3381", ++ "referenced_type" : "type-3375", ++ "self_type" : "type-3374", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23708,8 +25120,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3443", +- "self_type" : "type-3442", ++ "referenced_type" : "type-3436", ++ "self_type" : "type-3435", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23717,8 +25129,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3951", +- "self_type" : "type-3950", ++ "referenced_type" : "type-3943", ++ "self_type" : "type-3942", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23726,8 +25138,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-4046", +- "self_type" : "type-4045", ++ "referenced_type" : "type-4038", ++ "self_type" : "type-4037", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23735,8 +25147,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-573", +- "self_type" : "type-572", ++ "referenced_type" : "type-571", ++ "self_type" : "type-570", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23744,8 +25156,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-663", +- "self_type" : "type-662", ++ "referenced_type" : "type-66", ++ "self_type" : "type-65", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23753,8 +25165,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-67", +- "self_type" : "type-66", ++ "referenced_type" : "type-661", ++ "self_type" : "type-660", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23762,8 +25174,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-73", +- "self_type" : "type-72", ++ "referenced_type" : "type-72", ++ "self_type" : "type-71", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23771,8 +25183,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-739", +- "self_type" : "type-738", ++ "referenced_type" : "type-736", ++ "self_type" : "type-735", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23780,8 +25192,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-905", +- "self_type" : "type-904", ++ "referenced_type" : "type-902", ++ "self_type" : "type-901", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23789,8 +25201,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-943", +- "self_type" : "type-942", ++ "referenced_type" : "type-940", ++ "self_type" : "type-939", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23798,8 +25210,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-966", +- "self_type" : "type-965", ++ "referenced_type" : "type-963", ++ "self_type" : "type-962", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23807,8 +25219,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-1135", +- "self_type" : "type-1134", ++ "referenced_type" : "type-1132", ++ "self_type" : "type-1131", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23816,8 +25228,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-1137", +- "self_type" : "type-1136", ++ "referenced_type" : "type-1134", ++ "self_type" : "type-1133", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23825,8 +25237,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-1264", +- "self_type" : "type-1263", ++ "referenced_type" : "type-1261", ++ "self_type" : "type-1260", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23834,8 +25246,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-1266", +- "self_type" : "type-1265", ++ "referenced_type" : "type-1263", ++ "self_type" : "type-1262", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23843,8 +25255,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-1894", +- "self_type" : "type-1893", ++ "referenced_type" : "type-1889", ++ "self_type" : "type-1888", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23852,8 +25264,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-2057", +- "self_type" : "type-2056", ++ "referenced_type" : "type-2052", ++ "self_type" : "type-2051", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23861,8 +25273,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-2059", +- "self_type" : "type-2058", ++ "referenced_type" : "type-2054", ++ "self_type" : "type-2053", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23870,8 +25282,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-2183", +- "self_type" : "type-2182", ++ "referenced_type" : "type-2178", ++ "self_type" : "type-2177", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23879,8 +25291,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-2185", +- "self_type" : "type-2184", ++ "referenced_type" : "type-2180", ++ "self_type" : "type-2179", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23888,8 +25300,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-2301", +- "self_type" : "type-2300", ++ "referenced_type" : "type-2296", ++ "self_type" : "type-2295", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23897,8 +25309,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-2379", +- "self_type" : "type-2380", ++ "referenced_type" : "type-2374", ++ "self_type" : "type-2375", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23906,8 +25318,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-3036", +- "self_type" : "type-3035", ++ "referenced_type" : "type-3028", ++ "self_type" : "type-3027", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23915,8 +25327,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-3196", +- "self_type" : "type-3195", ++ "referenced_type" : "type-3188", ++ "self_type" : "type-3187", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23924,8 +25336,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-3201", +- "self_type" : "type-3200", ++ "referenced_type" : "type-3194", ++ "self_type" : "type-3193", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23933,8 +25345,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-3317", +- "self_type" : "type-3316", ++ "referenced_type" : "type-3310", ++ "self_type" : "type-3309", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23942,8 +25354,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-3321", +- "self_type" : "type-3320", ++ "referenced_type" : "type-3314", ++ "self_type" : "type-3313", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23951,8 +25363,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-3429", +- "self_type" : "type-3428", ++ "referenced_type" : "type-3422", ++ "self_type" : "type-3421", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23960,8 +25372,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-946", +- "self_type" : "type-945", ++ "referenced_type" : "type-943", ++ "self_type" : "type-942", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23969,8 +25381,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-1089", +- "self_type" : "type-1088", ++ "referenced_type" : "type-1086", ++ "self_type" : "type-1085", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23978,8 +25390,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-1146", +- "self_type" : "type-1145", ++ "referenced_type" : "type-1143", ++ "self_type" : "type-1142", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23987,8 +25399,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-1204", +- "self_type" : "type-1203", ++ "referenced_type" : "type-1201", ++ "self_type" : "type-1200", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23996,8 +25408,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-1278", +- "self_type" : "type-1277", ++ "referenced_type" : "type-1274", ++ "self_type" : "type-1273", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24005,8 +25417,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-1910", +- "self_type" : "type-1909", ++ "referenced_type" : "type-1905", ++ "self_type" : "type-1904", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24014,8 +25426,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-2012", +- "self_type" : "type-2011", ++ "referenced_type" : "type-2007", ++ "self_type" : "type-2006", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24023,8 +25435,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-2067", +- "self_type" : "type-2066", ++ "referenced_type" : "type-2062", ++ "self_type" : "type-2061", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24032,8 +25444,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-2123", +- "self_type" : "type-2122", ++ "referenced_type" : "type-2118", ++ "self_type" : "type-2117", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24041,8 +25453,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-2196", +- "self_type" : "type-2195", ++ "referenced_type" : "type-2190", ++ "self_type" : "type-2189", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24050,8 +25462,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-2254", +- "self_type" : "type-2253", ++ "referenced_type" : "type-2249", ++ "self_type" : "type-2248", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24059,8 +25471,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-2375", +- "self_type" : "type-2550", ++ "referenced_type" : "type-2370", ++ "self_type" : "type-2545", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24068,8 +25480,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-3054", +- "self_type" : "type-3053", ++ "referenced_type" : "type-3046", ++ "self_type" : "type-3045", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24077,8 +25489,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-3148", +- "self_type" : "type-3147", ++ "referenced_type" : "type-3141", ++ "self_type" : "type-3140", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24086,8 +25498,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-3213", +- "self_type" : "type-3212", ++ "referenced_type" : "type-3206", ++ "self_type" : "type-3205", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24095,8 +25507,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-3265", +- "self_type" : "type-3264", ++ "referenced_type" : "type-3258", ++ "self_type" : "type-3257", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24104,8 +25516,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-3330", +- "self_type" : "type-3329", ++ "referenced_type" : "type-3323", ++ "self_type" : "type-3322", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24113,8 +25525,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-3384", +- "self_type" : "type-3383", ++ "referenced_type" : "type-3377", ++ "self_type" : "type-3376", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24122,8 +25534,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-970", +- "self_type" : "type-969", ++ "referenced_type" : "type-967", ++ "self_type" : "type-966", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24131,8 +25543,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IPCThreadState *", + "name" : "android::hardware::IPCThreadState *", +- "referenced_type" : "type-2434", +- "self_type" : "type-3638", ++ "referenced_type" : "type-2429", ++ "self_type" : "type-3631", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -24140,8 +25552,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::LazyServiceRegistrar *", + "name" : "android::hardware::LazyServiceRegistrar *", +- "referenced_type" : "type-530", +- "self_type" : "type-532", ++ "referenced_type" : "type-528", ++ "self_type" : "type-530", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -24149,8 +25561,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1045", +- "self_type" : "type-1044", ++ "referenced_type" : "type-1042", ++ "self_type" : "type-1041", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24158,8 +25570,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1130", +- "self_type" : "type-1129", ++ "referenced_type" : "type-1127", ++ "self_type" : "type-1126", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -24167,8 +25579,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1191", +- "self_type" : "type-1190", ++ "referenced_type" : "type-1188", ++ "self_type" : "type-1187", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -24176,8 +25588,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1257", +- "self_type" : "type-1256", ++ "referenced_type" : "type-1254", ++ "self_type" : "type-1253", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -24185,8 +25597,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1311", +- "self_type" : "type-1310", ++ "referenced_type" : "type-1308", ++ "self_type" : "type-1307", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24194,8 +25606,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1374", +- "self_type" : "type-1373", ++ "referenced_type" : "type-1371", ++ "self_type" : "type-1370", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24203,8 +25615,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1971", +- "self_type" : "type-1970", ++ "referenced_type" : "type-1966", ++ "self_type" : "type-1965", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24212,8 +25624,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2052", +- "self_type" : "type-2051", ++ "referenced_type" : "type-2047", ++ "self_type" : "type-2046", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -24221,8 +25633,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2111", +- "self_type" : "type-2110", ++ "referenced_type" : "type-2106", ++ "self_type" : "type-2105", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -24230,8 +25642,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2176", +- "self_type" : "type-2175", ++ "referenced_type" : "type-2171", ++ "self_type" : "type-2170", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -24239,8 +25651,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2228", +- "self_type" : "type-2227", ++ "referenced_type" : "type-2223", ++ "self_type" : "type-2222", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24248,8 +25660,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2282", +- "self_type" : "type-2281", ++ "referenced_type" : "type-2277", ++ "self_type" : "type-2276", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -24257,8 +25669,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2348", +- "self_type" : "type-2347", ++ "referenced_type" : "type-2343", ++ "self_type" : "type-2342", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -24266,8 +25678,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2575", +- "self_type" : "type-2574", ++ "referenced_type" : "type-2570", ++ "self_type" : "type-2569", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24275,8 +25687,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3110", +- "self_type" : "type-3109", ++ "referenced_type" : "type-3103", ++ "self_type" : "type-3102", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24284,8 +25696,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3188", +- "self_type" : "type-3187", ++ "referenced_type" : "type-3181", ++ "self_type" : "type-3180", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -24293,8 +25705,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3254", +- "self_type" : "type-3253", ++ "referenced_type" : "type-3247", ++ "self_type" : "type-3246", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -24302,8 +25714,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3312", +- "self_type" : "type-3311", ++ "referenced_type" : "type-3305", ++ "self_type" : "type-3304", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -24311,8 +25723,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3357", +- "self_type" : "type-3356", ++ "referenced_type" : "type-3350", ++ "self_type" : "type-3349", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24320,8 +25732,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3413", +- "self_type" : "type-3412", ++ "referenced_type" : "type-3406", ++ "self_type" : "type-3405", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -24329,8 +25741,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-372", +- "self_type" : "type-371", ++ "referenced_type" : "type-371", ++ "self_type" : "type-370", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24338,8 +25750,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3919", +- "self_type" : "type-3918", ++ "referenced_type" : "type-3912", ++ "self_type" : "type-3911", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24347,8 +25759,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::PassthroughServiceManager *", + "name" : "android::hardware::PassthroughServiceManager *", +- "referenced_type" : "type-1750", +- "self_type" : "type-1749", ++ "referenced_type" : "type-1745", ++ "self_type" : "type-1744", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24356,8 +25768,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::PassthroughServiceManager *", + "name" : "android::hardware::PassthroughServiceManager *", +- "referenced_type" : "type-2897", +- "self_type" : "type-2896", ++ "referenced_type" : "type-2890", ++ "self_type" : "type-2889", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24365,8 +25777,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::PassthroughServiceManager *", + "name" : "android::hardware::PassthroughServiceManager *", +- "referenced_type" : "type-768", +- "self_type" : "type-767", ++ "referenced_type" : "type-765", ++ "self_type" : "type-764", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24374,8 +25786,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::PoolThread *", + "name" : "android::hardware::PoolThread *", +- "referenced_type" : "type-3825", +- "self_type" : "type-3824", ++ "referenced_type" : "type-3818", ++ "self_type" : "type-3817", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24383,8 +25795,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1091", +- "self_type" : "type-1090", ++ "referenced_type" : "type-1088", ++ "self_type" : "type-1087", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24392,8 +25804,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1148", +- "self_type" : "type-1147", ++ "referenced_type" : "type-1145", ++ "self_type" : "type-1144", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24401,8 +25813,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1206", +- "self_type" : "type-1205", ++ "referenced_type" : "type-1203", ++ "self_type" : "type-1202", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24410,8 +25822,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1280", +- "self_type" : "type-1279", ++ "referenced_type" : "type-1277", ++ "self_type" : "type-1276", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24419,8 +25831,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1447", +- "self_type" : "type-1446", ++ "referenced_type" : "type-1443", ++ "self_type" : "type-1442", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24428,8 +25840,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1857", +- "self_type" : "type-1856", ++ "referenced_type" : "type-1852", ++ "self_type" : "type-1851", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24437,8 +25849,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1912", +- "self_type" : "type-1911", ++ "referenced_type" : "type-1907", ++ "self_type" : "type-1906", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24446,8 +25858,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2014", +- "self_type" : "type-2013", ++ "referenced_type" : "type-2009", ++ "self_type" : "type-2008", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24455,8 +25867,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2069", +- "self_type" : "type-2068", ++ "referenced_type" : "type-2064", ++ "self_type" : "type-2063", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24464,8 +25876,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2125", +- "self_type" : "type-2124", ++ "referenced_type" : "type-2120", ++ "self_type" : "type-2119", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24473,8 +25885,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2198", +- "self_type" : "type-2197", ++ "referenced_type" : "type-2193", ++ "self_type" : "type-2192", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24482,8 +25894,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2256", +- "self_type" : "type-2255", ++ "referenced_type" : "type-2251", ++ "self_type" : "type-2250", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24491,8 +25903,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2439", +- "self_type" : "type-2443", ++ "referenced_type" : "type-2434", ++ "self_type" : "type-2438", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24500,8 +25912,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2647", +- "self_type" : "type-2646", ++ "referenced_type" : "type-2641", ++ "self_type" : "type-2640", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24509,8 +25921,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3001", +- "self_type" : "type-3000", ++ "referenced_type" : "type-2993", ++ "self_type" : "type-2992", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24518,8 +25930,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3056", +- "self_type" : "type-3055", ++ "referenced_type" : "type-3049", ++ "self_type" : "type-3048", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24527,8 +25939,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3150", +- "self_type" : "type-3149", ++ "referenced_type" : "type-3143", ++ "self_type" : "type-3142", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24536,8 +25948,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3215", +- "self_type" : "type-3214", ++ "referenced_type" : "type-3208", ++ "self_type" : "type-3207", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24545,8 +25957,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3267", +- "self_type" : "type-3266", ++ "referenced_type" : "type-3260", ++ "self_type" : "type-3259", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24554,8 +25966,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3332", +- "self_type" : "type-3331", ++ "referenced_type" : "type-3325", ++ "self_type" : "type-3324", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24563,8 +25975,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3386", +- "self_type" : "type-3385", ++ "referenced_type" : "type-3379", ++ "self_type" : "type-3378", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24572,8 +25984,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3990", +- "self_type" : "type-3989", ++ "referenced_type" : "type-3982", ++ "self_type" : "type-3981", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24581,8 +25993,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-493", +- "self_type" : "type-492", ++ "referenced_type" : "type-491", ++ "self_type" : "type-490", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24590,8 +26002,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-908", +- "self_type" : "type-907", ++ "referenced_type" : "type-905", ++ "self_type" : "type-904", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24599,8 +26011,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-973", +- "self_type" : "type-972", ++ "referenced_type" : "type-970", ++ "self_type" : "type-969", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24608,8 +26020,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState::handle_entry *", + "name" : "android::hardware::ProcessState::handle_entry *", +- "referenced_type" : "type-2416", +- "self_type" : "type-3809", ++ "referenced_type" : "type-2411", ++ "self_type" : "type-3802", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -24617,8 +26029,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return *", + "name" : "android::hardware::Return *", +- "referenced_type" : "type-807", +- "self_type" : "type-808", ++ "referenced_type" : "type-804", ++ "self_type" : "type-805", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24626,8 +26038,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-801", +- "self_type" : "type-802", ++ "referenced_type" : "type-798", ++ "self_type" : "type-799", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24635,8 +26047,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-986", +- "self_type" : "type-987", ++ "referenced_type" : "type-983", ++ "self_type" : "type-984", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24644,8 +26056,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-1093", +- "self_type" : "type-1094", ++ "referenced_type" : "type-1090", ++ "self_type" : "type-1091", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24653,8 +26065,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-1153", +- "self_type" : "type-1154", ++ "referenced_type" : "type-1150", ++ "self_type" : "type-1151", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24662,8 +26074,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-1213", +- "self_type" : "type-1214", ++ "referenced_type" : "type-1210", ++ "self_type" : "type-1211", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24671,8 +26083,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-1284", +- "self_type" : "type-1285", ++ "referenced_type" : "type-1281", ++ "self_type" : "type-1282", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24680,8 +26092,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return *", + "name" : "android::hardware::Return *", +- "referenced_type" : "type-309", +- "self_type" : "type-310", ++ "referenced_type" : "type-308", ++ "self_type" : "type-309", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24689,8 +26101,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return *", + "name" : "android::hardware::Return *", +- "referenced_type" : "type-102", +- "self_type" : "type-177", ++ "referenced_type" : "type-101", ++ "self_type" : "type-176", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24698,8 +26110,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Status *", + "name" : "android::hardware::Status *", +- "referenced_type" : "type-104", +- "self_type" : "type-166", ++ "referenced_type" : "type-103", ++ "self_type" : "type-165", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24707,8 +26119,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)", + "name" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)", +- "referenced_type" : "type-2480", +- "self_type" : "type-2481", ++ "referenced_type" : "type-2475", ++ "self_type" : "type-2476", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -24716,8 +26128,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput *", + "name" : "android::hardware::TextOutput *", +- "referenced_type" : "type-2474", +- "self_type" : "type-3886", ++ "referenced_type" : "type-2469", ++ "self_type" : "type-3879", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -24725,8 +26137,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput::Bundle *", + "name" : "android::hardware::TextOutput::Bundle *", +- "referenced_type" : "type-2475", +- "self_type" : "type-2477", ++ "referenced_type" : "type-2470", ++ "self_type" : "type-2472", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -24734,8 +26146,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TypeCode *", + "name" : "android::hardware::TypeCode *", +- "referenced_type" : "type-2482", +- "self_type" : "type-2483", ++ "referenced_type" : "type-2477", ++ "self_type" : "type-2478", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -24743,8 +26155,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::ClientCounterCallback *", + "name" : "android::hardware::details::ClientCounterCallback *", +- "referenced_type" : "type-1514", +- "self_type" : "type-1513", ++ "referenced_type" : "type-1510", ++ "self_type" : "type-1509", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24752,8 +26164,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::ClientCounterCallback *", + "name" : "android::hardware::details::ClientCounterCallback *", +- "referenced_type" : "type-2713", +- "self_type" : "type-2712", ++ "referenced_type" : "type-2707", ++ "self_type" : "type-2706", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24761,8 +26173,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::ClientCounterCallback *", + "name" : "android::hardware::details::ClientCounterCallback *", +- "referenced_type" : "type-4065", +- "self_type" : "type-4064", ++ "referenced_type" : "type-4057", ++ "self_type" : "type-4056", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24770,8 +26182,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::ClientCounterCallback *", + "name" : "android::hardware::details::ClientCounterCallback *", +- "referenced_type" : "type-599", +- "self_type" : "type-598", ++ "referenced_type" : "type-597", ++ "self_type" : "type-596", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24779,8 +26191,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::DoNotDestruct, android::hardware::details::SchedPrio> > *", + "name" : "android::hardware::details::DoNotDestruct, android::hardware::details::SchedPrio> > *", +- "referenced_type" : "type-46", +- "self_type" : "type-50", ++ "referenced_type" : "type-45", ++ "self_type" : "type-49", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -24788,8 +26200,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::DoNotDestruct, bool> > *", + "name" : "android::hardware::details::DoNotDestruct, bool> > *", +- "referenced_type" : "type-51", +- "self_type" : "type-53", ++ "referenced_type" : "type-50", ++ "self_type" : "type-52", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -24797,8 +26209,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::DoNotDestruct > > *", + "name" : "android::hardware::details::DoNotDestruct > > *", +- "referenced_type" : "type-412", +- "self_type" : "type-413", ++ "referenced_type" : "type-410", ++ "self_type" : "type-411", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -24806,8 +26218,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > > *", + "name" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > > *", +- "referenced_type" : "type-649", +- "self_type" : "type-652", ++ "referenced_type" : "type-647", ++ "self_type" : "type-649", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -24815,8 +26227,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > > *", + "name" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > > *", +- "referenced_type" : "type-414", +- "self_type" : "type-418", ++ "referenced_type" : "type-412", ++ "self_type" : "type-416", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -24824,8 +26236,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::HidlInstrumentor *", + "name" : "android::hardware::details::HidlInstrumentor *", +- "referenced_type" : "type-145", +- "self_type" : "type-194", ++ "referenced_type" : "type-144", ++ "self_type" : "type-193", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24833,8 +26245,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::TaskRunner *", + "name" : "android::hardware::details::TaskRunner *", +- "referenced_type" : "type-269", +- "self_type" : "type-301", ++ "referenced_type" : "type-268", ++ "self_type" : "type-300", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -24842,8 +26254,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::Waiter *", + "name" : "android::hardware::details::Waiter *", +- "referenced_type" : "type-1762", +- "self_type" : "type-1761", ++ "referenced_type" : "type-1757", ++ "self_type" : "type-1756", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24851,8 +26263,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::Waiter *", + "name" : "android::hardware::details::Waiter *", +- "referenced_type" : "type-2908", +- "self_type" : "type-2907", ++ "referenced_type" : "type-2901", ++ "self_type" : "type-2900", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24860,8 +26272,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::Waiter *", + "name" : "android::hardware::details::Waiter *", +- "referenced_type" : "type-785", +- "self_type" : "type-784", ++ "referenced_type" : "type-782", ++ "self_type" : "type-781", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24869,8 +26281,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer > *", + "name" : "android::hardware::details::hidl_pointer > *", +- "referenced_type" : "type-1009", +- "self_type" : "type-1073", ++ "referenced_type" : "type-1006", ++ "self_type" : "type-1070", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24878,8 +26290,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer *", + "name" : "android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-620", +- "self_type" : "type-1070", ++ "referenced_type" : "type-618", ++ "self_type" : "type-1067", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24887,8 +26299,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer *", + "name" : "android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-835", +- "self_type" : "type-850", ++ "referenced_type" : "type-832", ++ "self_type" : "type-847", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24896,8 +26308,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer *", + "name" : "android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-97", +- "self_type" : "type-149", ++ "referenced_type" : "type-96", ++ "self_type" : "type-148", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24906,7 +26318,7 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer *", + "name" : "android::hardware::details::hidl_pointer *", + "referenced_type" : "type-14", +- "self_type" : "type-574", ++ "self_type" : "type-572", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24914,8 +26326,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer *", + "name" : "android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-519", +- "self_type" : "type-817", ++ "referenced_type" : "type-517", ++ "self_type" : "type-814", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24923,8 +26335,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::return_status *", + "name" : "android::hardware::details::return_status *", +- "referenced_type" : "type-103", +- "self_type" : "type-172", ++ "referenced_type" : "type-102", ++ "self_type" : "type-171", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24932,8 +26344,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_array *", + "name" : "android::hardware::hidl_array *", +- "referenced_type" : "type-1012", +- "self_type" : "type-1011", ++ "referenced_type" : "type-1009", ++ "self_type" : "type-1008", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24941,8 +26353,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_binder_death_recipient *", + "name" : "android::hardware::hidl_binder_death_recipient *", +- "referenced_type" : "type-360", +- "self_type" : "type-363", ++ "referenced_type" : "type-359", ++ "self_type" : "type-362", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24950,8 +26362,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_death_recipient *", + "name" : "android::hardware::hidl_death_recipient *", +- "referenced_type" : "type-144", +- "self_type" : "type-143", ++ "referenced_type" : "type-143", ++ "self_type" : "type-142", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24959,8 +26371,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_handle *", + "name" : "android::hardware::hidl_handle *", +- "referenced_type" : "type-77", +- "self_type" : "type-78", ++ "referenced_type" : "type-76", ++ "self_type" : "type-77", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -24968,8 +26380,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_memory *", + "name" : "android::hardware::hidl_memory *", +- "referenced_type" : "type-121", +- "self_type" : "type-122", ++ "referenced_type" : "type-120", ++ "self_type" : "type-121", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -24977,8 +26389,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_string *", + "name" : "android::hardware::hidl_string *", +- "referenced_type" : "type-96", +- "self_type" : "type-108", ++ "referenced_type" : "type-95", ++ "self_type" : "type-107", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -24986,8 +26398,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec > *", + "name" : "android::hardware::hidl_vec > *", +- "referenced_type" : "type-1008", +- "self_type" : "type-1015", ++ "referenced_type" : "type-1005", ++ "self_type" : "type-1012", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -24995,8 +26407,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec *", + "name" : "android::hardware::hidl_vec *", +- "referenced_type" : "type-619", +- "self_type" : "type-1004", ++ "referenced_type" : "type-617", ++ "self_type" : "type-1001", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -25004,8 +26416,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec *", + "name" : "android::hardware::hidl_vec *", +- "referenced_type" : "type-834", +- "self_type" : "type-838", ++ "referenced_type" : "type-831", ++ "self_type" : "type-835", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -25013,8 +26425,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec::iter *", + "name" : "android::hardware::hidl_vec::iter *", +- "referenced_type" : "type-625", +- "self_type" : "type-627", ++ "referenced_type" : "type-622", ++ "self_type" : "type-625", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -25022,8 +26434,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec *", + "name" : "android::hardware::hidl_vec *", +- "referenced_type" : "type-518", +- "self_type" : "type-827", ++ "referenced_type" : "type-516", ++ "self_type" : "type-824", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -25031,8 +26443,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_version *", + "name" : "android::hardware::hidl_version *", +- "referenced_type" : "type-131", +- "self_type" : "type-134", ++ "referenced_type" : "type-130", ++ "self_type" : "type-133", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -25040,8 +26452,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::base::V1_0::BnHwBase *", + "name" : "android::hidl::base::V1_0::BnHwBase *", +- "referenced_type" : "type-355", +- "self_type" : "type-358", ++ "referenced_type" : "type-354", ++ "self_type" : "type-357", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -25049,8 +26461,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::base::V1_0::BpHwBase *", + "name" : "android::hidl::base::V1_0::BpHwBase *", +- "referenced_type" : "type-419", +- "self_type" : "type-960", ++ "referenced_type" : "type-417", ++ "self_type" : "type-957", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25058,8 +26470,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::base::V1_0::BsBase *", + "name" : "android::hidl::base::V1_0::BsBase *", +- "referenced_type" : "type-2248", +- "self_type" : "type-2250", ++ "referenced_type" : "type-2243", ++ "self_type" : "type-2245", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25076,8 +26488,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager *", + "name" : "android::hidl::manager::V1_0::BnHwServiceManager *", +- "referenced_type" : "type-871", +- "self_type" : "type-872", ++ "referenced_type" : "type-868", ++ "self_type" : "type-869", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h" + }, +@@ -25085,8 +26497,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification *", + "name" : "android::hidl::manager::V1_0::BnHwServiceNotification *", +- "referenced_type" : "type-862", +- "self_type" : "type-863", ++ "referenced_type" : "type-859", ++ "self_type" : "type-860", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -25094,8 +26506,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager *", + "name" : "android::hidl::manager::V1_0::BpHwServiceManager *", +- "referenced_type" : "type-873", +- "self_type" : "type-959", ++ "referenced_type" : "type-870", ++ "self_type" : "type-956", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25103,8 +26515,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification *", + "name" : "android::hidl::manager::V1_0::BpHwServiceNotification *", +- "referenced_type" : "type-864", +- "self_type" : "type-978", ++ "referenced_type" : "type-861", ++ "self_type" : "type-975", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25112,8 +26524,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager *", + "name" : "android::hidl::manager::V1_0::BsServiceManager *", +- "referenced_type" : "type-957", +- "self_type" : "type-958", ++ "referenced_type" : "type-954", ++ "self_type" : "type-955", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25121,8 +26533,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification *", + "name" : "android::hidl::manager::V1_0::BsServiceNotification *", +- "referenced_type" : "type-1084", +- "self_type" : "type-1085", ++ "referenced_type" : "type-1081", ++ "self_type" : "type-1082", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25130,8 +26542,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager *", + "name" : "android::hidl::manager::V1_0::IServiceManager *", +- "referenced_type" : "type-552", +- "self_type" : "type-576", ++ "referenced_type" : "type-548", ++ "self_type" : "type-574", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25139,8 +26551,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *", + "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *", +- "referenced_type" : "type-548", +- "self_type" : "type-837", ++ "referenced_type" : "type-546", ++ "self_type" : "type-834", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -25148,8 +26560,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *", + "name" : "android::hidl::manager::V1_0::IServiceNotification *", +- "referenced_type" : "type-541", +- "self_type" : "type-591", ++ "referenced_type" : "type-539", ++ "self_type" : "type-589", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25157,8 +26569,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager *", + "name" : "android::hidl::manager::V1_1::BnHwServiceManager *", +- "referenced_type" : "type-879", +- "self_type" : "type-880", ++ "referenced_type" : "type-876", ++ "self_type" : "type-877", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -25166,8 +26578,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager *", + "name" : "android::hidl::manager::V1_1::BpHwServiceManager *", +- "referenced_type" : "type-881", +- "self_type" : "type-1142", ++ "referenced_type" : "type-878", ++ "self_type" : "type-1139", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25175,8 +26587,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager *", + "name" : "android::hidl::manager::V1_1::BsServiceManager *", +- "referenced_type" : "type-1140", +- "self_type" : "type-1141", ++ "referenced_type" : "type-1137", ++ "self_type" : "type-1138", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25184,8 +26596,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager *", + "name" : "android::hidl::manager::V1_1::IServiceManager *", +- "referenced_type" : "type-562", +- "self_type" : "type-581", ++ "referenced_type" : "type-560", ++ "self_type" : "type-579", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25193,8 +26605,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback *", + "name" : "android::hidl::manager::V1_2::BnHwClientCallback *", +- "referenced_type" : "type-888", +- "self_type" : "type-889", ++ "referenced_type" : "type-884", ++ "self_type" : "type-886", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -25202,8 +26614,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager *", + "name" : "android::hidl::manager::V1_2::BnHwServiceManager *", +- "referenced_type" : "type-845", +- "self_type" : "type-896", ++ "referenced_type" : "type-842", ++ "self_type" : "type-893", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h" + }, +@@ -25211,8 +26623,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback *", + "name" : "android::hidl::manager::V1_2::BpHwClientCallback *", +- "referenced_type" : "type-890", +- "self_type" : "type-1199", ++ "referenced_type" : "type-887", ++ "self_type" : "type-1196", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25220,8 +26632,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager *", + "name" : "android::hidl::manager::V1_2::BpHwServiceManager *", +- "referenced_type" : "type-774", +- "self_type" : "type-778", ++ "referenced_type" : "type-770", ++ "self_type" : "type-775", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25229,8 +26641,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback *", + "name" : "android::hidl::manager::V1_2::BsClientCallback *", +- "referenced_type" : "type-1197", +- "self_type" : "type-1198", ++ "referenced_type" : "type-1194", ++ "self_type" : "type-1195", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25238,8 +26650,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager *", + "name" : "android::hidl::manager::V1_2::BsServiceManager *", +- "referenced_type" : "type-1271", +- "self_type" : "type-1273", ++ "referenced_type" : "type-1268", ++ "self_type" : "type-1269", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25247,8 +26659,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback *", + "name" : "android::hidl::manager::V1_2::IClientCallback *", +- "referenced_type" : "type-544", +- "self_type" : "type-596", ++ "referenced_type" : "type-542", ++ "self_type" : "type-594", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25256,8 +26668,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager *", + "name" : "android::hidl::manager::V1_2::IServiceManager *", +- "referenced_type" : "type-565", +- "self_type" : "type-586", ++ "referenced_type" : "type-563", ++ "self_type" : "type-584", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25265,8 +26677,8 @@ + "alignment" : 4, + "linker_set_key" : "android::key_value_pair_t > *", + "name" : "android::key_value_pair_t > *", +- "referenced_type" : "type-3807", +- "self_type" : "type-3811", ++ "referenced_type" : "type-3800", ++ "self_type" : "type-3803", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -25274,8 +26686,8 @@ + "alignment" : 4, + "linker_set_key" : "android::key_value_pair_t *", + "name" : "android::key_value_pair_t *", +- "referenced_type" : "type-2384", +- "self_type" : "type-2388", ++ "referenced_type" : "type-2379", ++ "self_type" : "type-2383", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -25283,8 +26695,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-499", +- "self_type" : "type-3823", ++ "referenced_type" : "type-497", ++ "self_type" : "type-3816", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25292,8 +26704,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-472", +- "self_type" : "type-503", ++ "referenced_type" : "type-470", ++ "self_type" : "type-501", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25301,8 +26713,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-2470", +- "self_type" : "type-2504", ++ "referenced_type" : "type-2465", ++ "self_type" : "type-2499", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -25310,8 +26722,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-157", +- "self_type" : "type-160", ++ "referenced_type" : "type-156", ++ "self_type" : "type-159", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25319,8 +26731,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-962", +- "self_type" : "type-964", ++ "referenced_type" : "type-959", ++ "self_type" : "type-961", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25328,8 +26740,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-71", +- "self_type" : "type-482", ++ "referenced_type" : "type-70", ++ "self_type" : "type-480", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25337,8 +26749,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-766", +- "self_type" : "type-788", ++ "referenced_type" : "type-763", ++ "self_type" : "type-785", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25346,8 +26758,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-491", +- "self_type" : "type-495", ++ "referenced_type" : "type-489", ++ "self_type" : "type-493", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25355,8 +26767,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-602", +- "self_type" : "type-605", ++ "referenced_type" : "type-600", ++ "self_type" : "type-602", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25364,8 +26776,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-789", +- "self_type" : "type-791", ++ "referenced_type" : "type-786", ++ "self_type" : "type-788", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25373,8 +26785,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-951", +- "self_type" : "type-981", ++ "referenced_type" : "type-948", ++ "self_type" : "type-978", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25382,8 +26794,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-142", +- "self_type" : "type-475", ++ "referenced_type" : "type-141", ++ "self_type" : "type-473", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25391,8 +26803,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-356", +- "self_type" : "type-480", ++ "referenced_type" : "type-355", ++ "self_type" : "type-478", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25400,8 +26812,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-575", +- "self_type" : "type-577", ++ "referenced_type" : "type-573", ++ "self_type" : "type-575", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25409,8 +26821,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-590", +- "self_type" : "type-592", ++ "referenced_type" : "type-588", ++ "self_type" : "type-590", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25418,8 +26830,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-580", +- "self_type" : "type-582", ++ "referenced_type" : "type-578", ++ "self_type" : "type-580", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25427,8 +26839,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-595", +- "self_type" : "type-597", ++ "referenced_type" : "type-593", ++ "self_type" : "type-595", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25436,8 +26848,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-585", +- "self_type" : "type-587", ++ "referenced_type" : "type-583", ++ "self_type" : "type-585", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25445,8 +26857,8 @@ + "alignment" : 4, + "linker_set_key" : "android::wp *", + "name" : "android::wp *", +- "referenced_type" : "type-383", +- "self_type" : "type-468", ++ "referenced_type" : "type-382", ++ "self_type" : "type-466", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25454,8 +26866,8 @@ + "alignment" : 4, + "linker_set_key" : "android::wp *", + "name" : "android::wp *", +- "referenced_type" : "type-944", +- "self_type" : "type-949", ++ "referenced_type" : "type-941", ++ "self_type" : "type-946", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25463,8 +26875,8 @@ + "alignment" : 4, + "linker_set_key" : "android::wp *", + "name" : "android::wp *", +- "referenced_type" : "type-2382", +- "self_type" : "type-2381", ++ "referenced_type" : "type-2377", ++ "self_type" : "type-2376", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25472,8 +26884,8 @@ + "alignment" : 4, + "linker_set_key" : "android::wp *", + "name" : "android::wp *", +- "referenced_type" : "type-361", +- "self_type" : "type-463", ++ "referenced_type" : "type-360", ++ "self_type" : "type-461", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25482,7 +26894,7 @@ + "linker_set_key" : "android::wp *", + "name" : "android::wp *", + "referenced_type" : "type-32", +- "self_type" : "type-454", ++ "self_type" : "type-453", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25490,8 +26902,8 @@ + "alignment" : 4, + "linker_set_key" : "android_flex_plane *", + "name" : "android_flex_plane *", +- "referenced_type" : "type-290", +- "self_type" : "type-294", ++ "referenced_type" : "type-289", ++ "self_type" : "type-293", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics.h" + }, +@@ -25499,8 +26911,8 @@ + "alignment" : 4, + "linker_set_key" : "bool (*)(const android::String16 &, const android::sp &, void *)", + "name" : "bool (*)(const android::String16 &, const android::sp &, void *)", +- "referenced_type" : "type-2430", +- "self_type" : "type-2432", ++ "referenced_type" : "type-2425", ++ "self_type" : "type-2427", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, +@@ -25508,8 +26920,8 @@ + "alignment" : 4, + "linker_set_key" : "bool *", + "name" : "bool *", +- "referenced_type" : "type-44", +- "self_type" : "type-3779", ++ "referenced_type" : "type-43", ++ "self_type" : "type-3772", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -25517,8 +26929,8 @@ + "alignment" : 4, + "linker_set_key" : "char *", + "name" : "char *", +- "referenced_type" : "type-48", +- "self_type" : "type-243", ++ "referenced_type" : "type-47", ++ "self_type" : "type-242", + "size" : 4, + "source_file" : "/system/core/liblog/include/log/log_read.h" + }, +@@ -25526,8 +26938,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::CallStack *", + "name" : "const android::CallStack *", +- "referenced_type" : "type-258", +- "self_type" : "type-259", ++ "referenced_type" : "type-257", ++ "self_type" : "type-258", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/CallStack.h" + }, +@@ -25535,8 +26947,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::KeyedVector > *", + "name" : "const android::KeyedVector > *", +- "referenced_type" : "type-3836", +- "self_type" : "type-3838", ++ "referenced_type" : "type-3829", ++ "self_type" : "type-3831", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -25544,8 +26956,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::KeyedVector *", + "name" : "const android::KeyedVector *", +- "referenced_type" : "type-2418", +- "self_type" : "type-2419", ++ "referenced_type" : "type-2413", ++ "self_type" : "type-2414", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -25553,8 +26965,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::NativeHandle *", + "name" : "const android::NativeHandle *", +- "referenced_type" : "type-333", +- "self_type" : "type-334", ++ "referenced_type" : "type-332", ++ "self_type" : "type-333", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/NativeHandle.h" + }, +@@ -25562,8 +26974,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::RefBase *", + "name" : "const android::RefBase *", +- "referenced_type" : "type-62", +- "self_type" : "type-65", ++ "referenced_type" : "type-61", ++ "self_type" : "type-64", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25571,8 +26983,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::SortedVector > > *", + "name" : "const android::SortedVector > > *", +- "referenced_type" : "type-3827", +- "self_type" : "type-3828", ++ "referenced_type" : "type-3820", ++ "self_type" : "type-3821", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -25580,8 +26992,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::SortedVector > *", + "name" : "const android::SortedVector > *", +- "referenced_type" : "type-2408", +- "self_type" : "type-2409", ++ "referenced_type" : "type-2403", ++ "self_type" : "type-2404", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -25589,8 +27001,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::String16 *", + "name" : "const android::String16 *", +- "referenced_type" : "type-348", +- "self_type" : "type-349", ++ "referenced_type" : "type-347", ++ "self_type" : "type-348", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String16.h" + }, +@@ -25598,8 +27010,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::String8 *", + "name" : "const android::String8 *", +- "referenced_type" : "type-223", +- "self_type" : "type-224", ++ "referenced_type" : "type-222", ++ "self_type" : "type-223", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String8.h" + }, +@@ -25607,8 +27019,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-3632", +- "self_type" : "type-3633", ++ "referenced_type" : "type-3625", ++ "self_type" : "type-3626", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25616,8 +27028,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-3628", +- "self_type" : "type-3629", ++ "referenced_type" : "type-3621", ++ "self_type" : "type-3622", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25625,8 +27037,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-254", +- "self_type" : "type-255", ++ "referenced_type" : "type-253", ++ "self_type" : "type-254", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25634,8 +27046,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-3624", +- "self_type" : "type-3625", ++ "referenced_type" : "type-3617", ++ "self_type" : "type-3618", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25643,8 +27055,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-2413", +- "self_type" : "type-2414", ++ "referenced_type" : "type-2408", ++ "self_type" : "type-2409", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25652,8 +27064,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-3831", +- "self_type" : "type-3832", ++ "referenced_type" : "type-3824", ++ "self_type" : "type-3825", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25661,8 +27073,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector > *", + "name" : "const android::Vector > *", +- "referenced_type" : "type-2520", +- "self_type" : "type-2521", ++ "referenced_type" : "type-2515", ++ "self_type" : "type-2516", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25670,8 +27082,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-2515", +- "self_type" : "type-2516", ++ "referenced_type" : "type-2510", ++ "self_type" : "type-2511", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25679,8 +27091,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::VectorImpl *", + "name" : "const android::VectorImpl *", +- "referenced_type" : "type-249", +- "self_type" : "type-250", ++ "referenced_type" : "type-248", ++ "self_type" : "type-249", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/VectorImpl.h" + }, +@@ -25688,8 +27100,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BHwBinder *", + "name" : "const android::hardware::BHwBinder *", +- "referenced_type" : "type-2361", +- "self_type" : "type-2362", ++ "referenced_type" : "type-2356", ++ "self_type" : "type-2357", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -25697,8 +27109,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BpHwBinder *", + "name" : "const android::hardware::BpHwBinder *", +- "referenced_type" : "type-2372", +- "self_type" : "type-2373", ++ "referenced_type" : "type-2367", ++ "self_type" : "type-2368", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -25706,8 +27118,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BpHwBinder::Obituary *", + "name" : "const android::hardware::BpHwBinder::Obituary *", +- "referenced_type" : "type-2391", +- "self_type" : "type-2392", ++ "referenced_type" : "type-2386", ++ "self_type" : "type-2387", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -25715,8 +27127,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager *", + "name" : "const android::hardware::BpHwBinder::ObjectManager *", +- "referenced_type" : "type-2425", +- "self_type" : "type-2426", ++ "referenced_type" : "type-2420", ++ "self_type" : "type-2421", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -25724,8 +27136,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BpHwRefBase *", + "name" : "const android::hardware::BpHwRefBase *", +- "referenced_type" : "type-2370", +- "self_type" : "type-2371", ++ "referenced_type" : "type-2365", ++ "self_type" : "type-2366", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -25733,8 +27145,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BufferedTextOutput *", + "name" : "const android::hardware::BufferedTextOutput *", +- "referenced_type" : "type-2510", +- "self_type" : "type-2511", ++ "referenced_type" : "type-2505", ++ "self_type" : "type-2506", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -25742,8 +27154,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::ConcurrentMap, android::hardware::details::SchedPrio> *", + "name" : "const android::hardware::ConcurrentMap, android::hardware::details::SchedPrio> *", +- "referenced_type" : "type-1051", +- "self_type" : "type-1052", ++ "referenced_type" : "type-1048", ++ "self_type" : "type-1049", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -25751,8 +27163,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::ConcurrentMap, bool> *", + "name" : "const android::hardware::ConcurrentMap, bool> *", +- "referenced_type" : "type-1053", +- "self_type" : "type-1054", ++ "referenced_type" : "type-1050", ++ "self_type" : "type-1051", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -25761,7 +27173,7 @@ + "linker_set_key" : "const android::hardware::ConcurrentMap > *", + "name" : "const android::hardware::ConcurrentMap > *", + "referenced_type" : "type-393", +- "self_type" : "type-394", ++ "self_type" : "type-395", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -25769,8 +27181,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", + "name" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", +- "referenced_type" : "type-644", +- "self_type" : "type-645", ++ "referenced_type" : "type-642", ++ "self_type" : "type-643", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -25778,8 +27190,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", + "name" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", +- "referenced_type" : "type-407", +- "self_type" : "type-408", ++ "referenced_type" : "type-404", ++ "self_type" : "type-406", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -25787,8 +27199,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::HexDump *", + "name" : "const android::hardware::HexDump *", +- "referenced_type" : "type-2489", +- "self_type" : "type-2490", ++ "referenced_type" : "type-2484", ++ "self_type" : "type-2485", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -25796,8 +27208,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IBinder *", + "name" : "const android::hardware::IBinder *", +- "referenced_type" : "type-1443", +- "self_type" : "type-1445", ++ "referenced_type" : "type-1439", ++ "self_type" : "type-1441", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25805,8 +27217,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IBinder *", + "name" : "const android::hardware::IBinder *", +- "referenced_type" : "type-2330", +- "self_type" : "type-2331", ++ "referenced_type" : "type-2325", ++ "self_type" : "type-2326", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, +@@ -25814,8 +27226,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IBinder *", + "name" : "const android::hardware::IBinder *", +- "referenced_type" : "type-2643", +- "self_type" : "type-2645", ++ "referenced_type" : "type-2637", ++ "self_type" : "type-2639", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25823,8 +27235,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IBinder *", + "name" : "const android::hardware::IBinder *", +- "referenced_type" : "type-3986", +- "self_type" : "type-3988", ++ "referenced_type" : "type-3978", ++ "self_type" : "type-3980", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25832,8 +27244,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IBinder *", + "name" : "const android::hardware::IBinder *", +- "referenced_type" : "type-488", +- "self_type" : "type-490", ++ "referenced_type" : "type-486", ++ "self_type" : "type-488", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25841,8 +27253,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IBinder::DeathRecipient *", + "name" : "const android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-2420", +- "self_type" : "type-2421", ++ "referenced_type" : "type-2415", ++ "self_type" : "type-2416", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25850,8 +27262,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IInterface *", + "name" : "const android::hardware::IInterface *", +- "referenced_type" : "type-2552", +- "self_type" : "type-2553", ++ "referenced_type" : "type-2547", ++ "self_type" : "type-2548", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25859,8 +27271,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IPCThreadState *", + "name" : "const android::hardware::IPCThreadState *", +- "referenced_type" : "type-3639", +- "self_type" : "type-3641", ++ "referenced_type" : "type-3632", ++ "self_type" : "type-3634", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -25868,8 +27280,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel *", + "name" : "const android::hardware::Parcel *", +- "referenced_type" : "type-2354", +- "self_type" : "type-3766", ++ "referenced_type" : "type-2349", ++ "self_type" : "type-3759", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -25877,8 +27289,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::ProcessState *", + "name" : "const android::hardware::ProcessState *", +- "referenced_type" : "type-3846", +- "self_type" : "type-3847", ++ "referenced_type" : "type-3839", ++ "self_type" : "type-3840", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25886,8 +27298,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::ProcessState::handle_entry *", + "name" : "const android::hardware::ProcessState::handle_entry *", +- "referenced_type" : "type-3812", +- "self_type" : "type-3813", ++ "referenced_type" : "type-3804", ++ "self_type" : "type-3806", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -25895,8 +27307,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return *", + "name" : "const android::hardware::Return *", +- "referenced_type" : "type-811", +- "self_type" : "type-812", ++ "referenced_type" : "type-808", ++ "self_type" : "type-809", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25904,8 +27316,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-805", +- "self_type" : "type-806", ++ "referenced_type" : "type-802", ++ "self_type" : "type-803", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25913,8 +27325,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-990", +- "self_type" : "type-991", ++ "referenced_type" : "type-987", ++ "self_type" : "type-988", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25922,8 +27334,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-1097", +- "self_type" : "type-1098", ++ "referenced_type" : "type-1094", ++ "self_type" : "type-1095", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25931,8 +27343,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-1157", +- "self_type" : "type-1158", ++ "referenced_type" : "type-1154", ++ "self_type" : "type-1155", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25940,8 +27352,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-1217", +- "self_type" : "type-1218", ++ "referenced_type" : "type-1214", ++ "self_type" : "type-1215", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25949,8 +27361,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-1288", +- "self_type" : "type-1289", ++ "referenced_type" : "type-1285", ++ "self_type" : "type-1286", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25958,8 +27370,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return *", + "name" : "const android::hardware::Return *", +- "referenced_type" : "type-506", +- "self_type" : "type-507", ++ "referenced_type" : "type-504", ++ "self_type" : "type-505", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25967,8 +27379,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Status *", + "name" : "const android::hardware::Status *", +- "referenced_type" : "type-167", +- "self_type" : "type-171", ++ "referenced_type" : "type-166", ++ "self_type" : "type-170", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25976,8 +27388,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::TypeCode *", + "name" : "const android::hardware::TypeCode *", +- "referenced_type" : "type-2484", +- "self_type" : "type-2485", ++ "referenced_type" : "type-2479", ++ "self_type" : "type-2480", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -25985,8 +27397,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::Waiter *", + "name" : "const android::hardware::details::Waiter *", +- "referenced_type" : "type-1771", +- "self_type" : "type-1773", ++ "referenced_type" : "type-1766", ++ "self_type" : "type-1768", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25994,8 +27406,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::Waiter *", + "name" : "const android::hardware::details::Waiter *", +- "referenced_type" : "type-2917", +- "self_type" : "type-2919", ++ "referenced_type" : "type-2909", ++ "self_type" : "type-2912", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26003,8 +27415,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::Waiter *", + "name" : "const android::hardware::details::Waiter *", +- "referenced_type" : "type-796", +- "self_type" : "type-798", ++ "referenced_type" : "type-793", ++ "self_type" : "type-795", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26012,8 +27424,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::hidl_pointer > *", + "name" : "const android::hardware::details::hidl_pointer > *", +- "referenced_type" : "type-1076", +- "self_type" : "type-1077", ++ "referenced_type" : "type-1072", ++ "self_type" : "type-1074", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26021,8 +27433,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::hidl_pointer *", + "name" : "const android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-654", +- "self_type" : "type-655", ++ "referenced_type" : "type-652", ++ "self_type" : "type-653", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26030,8 +27442,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::hidl_pointer *", + "name" : "const android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-853", +- "self_type" : "type-856", ++ "referenced_type" : "type-850", ++ "self_type" : "type-853", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26039,8 +27451,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::hidl_pointer *", + "name" : "const android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-152", +- "self_type" : "type-153", ++ "referenced_type" : "type-151", ++ "self_type" : "type-152", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26049,7 +27461,7 @@ + "linker_set_key" : "const android::hardware::details::hidl_pointer *", + "name" : "const android::hardware::details::hidl_pointer *", + "referenced_type" : "type-13", +- "self_type" : "type-109", ++ "self_type" : "type-108", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26057,8 +27469,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::hidl_pointer *", + "name" : "const android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-537", +- "self_type" : "type-539", ++ "referenced_type" : "type-535", ++ "self_type" : "type-536", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26066,8 +27478,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::return_status *", + "name" : "const android::hardware::details::return_status *", +- "referenced_type" : "type-174", +- "self_type" : "type-175", ++ "referenced_type" : "type-173", ++ "self_type" : "type-174", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -26075,8 +27487,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_array *", + "name" : "const android::hardware::hidl_array *", +- "referenced_type" : "type-2268", +- "self_type" : "type-2267", ++ "referenced_type" : "type-2263", ++ "self_type" : "type-2262", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26084,8 +27496,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_death_recipient *", + "name" : "const android::hardware::hidl_death_recipient *", +- "referenced_type" : "type-478", +- "self_type" : "type-479", ++ "referenced_type" : "type-476", ++ "self_type" : "type-477", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26093,8 +27505,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_handle *", + "name" : "const android::hardware::hidl_handle *", +- "referenced_type" : "type-79", +- "self_type" : "type-95", ++ "referenced_type" : "type-78", ++ "self_type" : "type-94", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26102,8 +27514,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_memory *", + "name" : "const android::hardware::hidl_memory *", +- "referenced_type" : "type-123", +- "self_type" : "type-127", ++ "referenced_type" : "type-122", ++ "self_type" : "type-126", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26111,8 +27523,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_string *", + "name" : "const android::hardware::hidl_string *", +- "referenced_type" : "type-110", +- "self_type" : "type-117", ++ "referenced_type" : "type-109", ++ "self_type" : "type-116", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26120,8 +27532,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec > *", + "name" : "const android::hardware::hidl_vec > *", +- "referenced_type" : "type-2270", +- "self_type" : "type-2271", ++ "referenced_type" : "type-2264", ++ "self_type" : "type-2265", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26129,8 +27541,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec *", + "name" : "const android::hardware::hidl_vec *", +- "referenced_type" : "type-622", +- "self_type" : "type-623", ++ "referenced_type" : "type-620", ++ "self_type" : "type-621", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26138,8 +27550,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec *", + "name" : "const android::hardware::hidl_vec *", +- "referenced_type" : "type-1022", +- "self_type" : "type-1023", ++ "referenced_type" : "type-1019", ++ "self_type" : "type-1020", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26147,8 +27559,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec::iter *", + "name" : "const android::hardware::hidl_vec::iter *", +- "referenced_type" : "type-629", +- "self_type" : "type-630", ++ "referenced_type" : "type-627", ++ "self_type" : "type-628", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26156,8 +27568,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec *", + "name" : "const android::hardware::hidl_vec *", +- "referenced_type" : "type-523", +- "self_type" : "type-524", ++ "referenced_type" : "type-521", ++ "self_type" : "type-522", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26165,8 +27577,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_version *", + "name" : "const android::hardware::hidl_version *", +- "referenced_type" : "type-135", +- "self_type" : "type-136", ++ "referenced_type" : "type-134", ++ "self_type" : "type-135", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26174,8 +27586,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase *", + "name" : "const android::hidl::base::V1_0::BpHwBase *", +- "referenced_type" : "type-423", +- "self_type" : "type-424", ++ "referenced_type" : "type-421", ++ "self_type" : "type-422", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, +@@ -26183,8 +27595,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::base::V1_0::IBase *", + "name" : "const android::hidl::base::V1_0::IBase *", +- "referenced_type" : "type-382", +- "self_type" : "type-381", ++ "referenced_type" : "type-381", ++ "self_type" : "type-380", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26192,8 +27604,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceManager *", + "name" : "const android::hidl::manager::V1_0::BpHwServiceManager *", +- "referenced_type" : "type-877", +- "self_type" : "type-878", ++ "referenced_type" : "type-874", ++ "self_type" : "type-875", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, +@@ -26201,8 +27613,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceNotification *", + "name" : "const android::hidl::manager::V1_0::BpHwServiceNotification *", +- "referenced_type" : "type-869", +- "self_type" : "type-870", ++ "referenced_type" : "type-866", ++ "self_type" : "type-867", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, +@@ -26210,8 +27622,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager *", + "name" : "const android::hidl::manager::V1_0::IServiceManager *", +- "referenced_type" : "type-551", +- "self_type" : "type-553", ++ "referenced_type" : "type-547", ++ "self_type" : "type-551", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -26219,8 +27631,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *", + "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *", +- "referenced_type" : "type-1021", +- "self_type" : "type-1020", ++ "referenced_type" : "type-1018", ++ "self_type" : "type-1017", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26228,8 +27640,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *", + "name" : "const android::hidl::manager::V1_0::IServiceNotification *", +- "referenced_type" : "type-540", +- "self_type" : "type-542", ++ "referenced_type" : "type-538", ++ "self_type" : "type-540", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, +@@ -26237,8 +27649,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_1::BpHwServiceManager *", + "name" : "const android::hidl::manager::V1_1::BpHwServiceManager *", +- "referenced_type" : "type-885", +- "self_type" : "type-887", ++ "referenced_type" : "type-882", ++ "self_type" : "type-883", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, +@@ -26246,8 +27658,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_1::IServiceManager *", + "name" : "const android::hidl::manager::V1_1::IServiceManager *", +- "referenced_type" : "type-561", +- "self_type" : "type-563", ++ "referenced_type" : "type-559", ++ "self_type" : "type-561", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, +@@ -26255,8 +27667,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_2::BpHwClientCallback *", + "name" : "const android::hidl::manager::V1_2::BpHwClientCallback *", +- "referenced_type" : "type-894", +- "self_type" : "type-895", ++ "referenced_type" : "type-891", ++ "self_type" : "type-892", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, +@@ -26264,8 +27676,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_2::BpHwServiceManager *", + "name" : "const android::hidl::manager::V1_2::BpHwServiceManager *", +- "referenced_type" : "type-898", +- "self_type" : "type-899", ++ "referenced_type" : "type-894", ++ "self_type" : "type-895", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, +@@ -26273,8 +27685,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_2::IClientCallback *", + "name" : "const android::hidl::manager::V1_2::IClientCallback *", +- "referenced_type" : "type-543", +- "self_type" : "type-545", ++ "referenced_type" : "type-541", ++ "self_type" : "type-543", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, +@@ -26282,8 +27694,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager *", + "name" : "const android::hidl::manager::V1_2::IServiceManager *", +- "referenced_type" : "type-564", +- "self_type" : "type-566", ++ "referenced_type" : "type-562", ++ "self_type" : "type-564", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, +@@ -26291,8 +27703,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::key_value_pair_t > *", + "name" : "const android::key_value_pair_t > *", +- "referenced_type" : "type-3806", +- "self_type" : "type-3814", ++ "referenced_type" : "type-3799", ++ "self_type" : "type-3807", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -26300,8 +27712,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::key_value_pair_t *", + "name" : "const android::key_value_pair_t *", +- "referenced_type" : "type-2383", +- "self_type" : "type-2390", ++ "referenced_type" : "type-2378", ++ "self_type" : "type-2385", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -26309,8 +27721,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-3830", +- "self_type" : "type-3837", ++ "referenced_type" : "type-3823", ++ "self_type" : "type-3830", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26318,8 +27730,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-3640", +- "self_type" : "type-3650", ++ "referenced_type" : "type-3633", ++ "self_type" : "type-3643", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26327,8 +27739,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-2498", +- "self_type" : "type-2505", ++ "referenced_type" : "type-2493", ++ "self_type" : "type-2500", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -26336,8 +27748,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-162", +- "self_type" : "type-163", ++ "referenced_type" : "type-161", ++ "self_type" : "type-162", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26345,8 +27757,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-2405", +- "self_type" : "type-2423", ++ "referenced_type" : "type-2400", ++ "self_type" : "type-2418", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26354,8 +27766,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-70", +- "self_type" : "type-487", ++ "referenced_type" : "type-69", ++ "self_type" : "type-484", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26363,8 +27775,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-2547", +- "self_type" : "type-2551", ++ "referenced_type" : "type-2542", ++ "self_type" : "type-2546", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26372,8 +27784,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-496", +- "self_type" : "type-498", ++ "referenced_type" : "type-494", ++ "self_type" : "type-495", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26381,8 +27793,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-606", +- "self_type" : "type-607", ++ "referenced_type" : "type-604", ++ "self_type" : "type-605", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26390,8 +27802,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-794", +- "self_type" : "type-795", ++ "referenced_type" : "type-790", ++ "self_type" : "type-792", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26399,8 +27811,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-950", +- "self_type" : "type-985", ++ "referenced_type" : "type-947", ++ "self_type" : "type-982", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26408,8 +27820,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-141", +- "self_type" : "type-164", ++ "referenced_type" : "type-140", ++ "self_type" : "type-163", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26417,8 +27829,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-459", +- "self_type" : "type-481", ++ "referenced_type" : "type-456", ++ "self_type" : "type-479", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26426,8 +27838,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-578", +- "self_type" : "type-579", ++ "referenced_type" : "type-576", ++ "self_type" : "type-577", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26435,8 +27847,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-593", +- "self_type" : "type-594", ++ "referenced_type" : "type-591", ++ "self_type" : "type-592", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26444,8 +27856,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-583", +- "self_type" : "type-584", ++ "referenced_type" : "type-581", ++ "self_type" : "type-582", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26453,8 +27865,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-600", +- "self_type" : "type-601", ++ "referenced_type" : "type-598", ++ "self_type" : "type-599", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26462,8 +27874,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-588", +- "self_type" : "type-589", ++ "referenced_type" : "type-586", ++ "self_type" : "type-587", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26471,8 +27883,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp *", + "name" : "const android::wp *", +- "referenced_type" : "type-469", +- "self_type" : "type-474", ++ "referenced_type" : "type-467", ++ "self_type" : "type-472", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26480,8 +27892,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp *", + "name" : "const android::wp *", +- "referenced_type" : "type-2359", +- "self_type" : "type-2411", ++ "referenced_type" : "type-2354", ++ "self_type" : "type-2406", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26489,8 +27901,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp *", + "name" : "const android::wp *", +- "referenced_type" : "type-3752", +- "self_type" : "type-3759", ++ "referenced_type" : "type-3745", ++ "self_type" : "type-3752", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26498,8 +27910,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp *", + "name" : "const android::wp *", +- "referenced_type" : "type-464", +- "self_type" : "type-467", ++ "referenced_type" : "type-462", ++ "self_type" : "type-464", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26507,8 +27919,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp *", + "name" : "const android::wp *", +- "referenced_type" : "type-64", +- "self_type" : "type-462", ++ "referenced_type" : "type-63", ++ "self_type" : "type-460", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26516,8 +27928,8 @@ + "alignment" : 4, + "linker_set_key" : "const binder_buffer_object *", + "name" : "const binder_buffer_object *", +- "referenced_type" : "type-3785", +- "self_type" : "type-3787", ++ "referenced_type" : "type-3778", ++ "self_type" : "type-3780", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26525,8 +27937,8 @@ + "alignment" : 4, + "linker_set_key" : "const char *", + "name" : "const char *", +- "referenced_type" : "type-100", +- "self_type" : "type-99", ++ "referenced_type" : "type-99", ++ "self_type" : "type-98", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26534,8 +27946,8 @@ + "alignment" : 4, + "linker_set_key" : "const char16_t *", + "name" : "const char16_t *", +- "referenced_type" : "type-344", +- "self_type" : "type-343", ++ "referenced_type" : "type-343", ++ "self_type" : "type-342", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String16.h" + }, +@@ -26543,8 +27955,8 @@ + "alignment" : 4, + "linker_set_key" : "const dirent *", + "name" : "const dirent *", +- "referenced_type" : "type-1290", +- "self_type" : "type-1328", ++ "referenced_type" : "type-1287", ++ "self_type" : "type-1325", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26552,8 +27964,8 @@ + "alignment" : 4, + "linker_set_key" : "const dirent *", + "name" : "const dirent *", +- "referenced_type" : "type-2207", +- "self_type" : "type-2245", ++ "referenced_type" : "type-2202", ++ "self_type" : "type-2240", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26561,8 +27973,8 @@ + "alignment" : 4, + "linker_set_key" : "const dirent *", + "name" : "const dirent *", +- "referenced_type" : "type-262", +- "self_type" : "type-273", ++ "referenced_type" : "type-261", ++ "self_type" : "type-272", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26570,8 +27982,8 @@ + "alignment" : 4, + "linker_set_key" : "const dirent *", + "name" : "const dirent *", +- "referenced_type" : "type-3210", +- "self_type" : "type-3219", ++ "referenced_type" : "type-3203", ++ "self_type" : "type-3212", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26579,8 +27991,8 @@ + "alignment" : 4, + "linker_set_key" : "const dirent *", + "name" : "const dirent *", +- "referenced_type" : "type-3325", +- "self_type" : "type-3361", ++ "referenced_type" : "type-3318", ++ "self_type" : "type-3354", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26588,8 +28000,8 @@ + "alignment" : 4, + "linker_set_key" : "const flat_binder_object *", + "name" : "const flat_binder_object *", +- "referenced_type" : "type-3770", +- "self_type" : "type-3782", ++ "referenced_type" : "type-3763", ++ "self_type" : "type-3775", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26598,7 +28010,7 @@ + "linker_set_key" : "const int *", + "name" : "const int *", + "referenced_type" : "type-624", +- "self_type" : "type-1019", ++ "self_type" : "type-1016", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26606,8 +28018,8 @@ + "alignment" : 4, + "linker_set_key" : "const log_msg *", + "name" : "const log_msg *", +- "referenced_type" : "type-239", +- "self_type" : "type-240", ++ "referenced_type" : "type-238", ++ "self_type" : "type-239", + "size" : 4, + "source_file" : "/system/core/liblog/include/log/log_read.h" + }, +@@ -26625,7 +28037,7 @@ + "linker_set_key" : "const native_handle **", + "name" : "const native_handle **", + "referenced_type" : "type-16", +- "self_type" : "type-3784", ++ "self_type" : "type-3777", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26633,8 +28045,8 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned char *", + "name" : "const unsigned char *", +- "referenced_type" : "type-604", +- "self_type" : "type-1030", ++ "referenced_type" : "type-603", ++ "self_type" : "type-1027", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26642,8 +28054,8 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned int *", + "name" : "const unsigned int *", +- "referenced_type" : "type-246", +- "self_type" : "type-3730", ++ "referenced_type" : "type-245", ++ "self_type" : "type-3723", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -26651,8 +28063,8 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned long long *", + "name" : "const unsigned long long *", +- "referenced_type" : "type-661", +- "self_type" : "type-2353", ++ "referenced_type" : "type-659", ++ "self_type" : "type-2348", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26660,8 +28072,8 @@ + "alignment" : 4, + "linker_set_key" : "const void *", + "name" : "const void *", +- "referenced_type" : "type-138", +- "self_type" : "type-139", ++ "referenced_type" : "type-137", ++ "self_type" : "type-138", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26669,8 +28081,8 @@ + "alignment" : 4, + "linker_set_key" : "const void **", + "name" : "const void **", +- "referenced_type" : "type-139", +- "self_type" : "type-3783", ++ "referenced_type" : "type-138", ++ "self_type" : "type-3776", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26679,7 +28091,7 @@ + "linker_set_key" : "double *", + "name" : "double *", + "referenced_type" : "type-4", +- "self_type" : "type-3778", ++ "self_type" : "type-3771", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26687,8 +28099,8 @@ + "alignment" : 4, + "linker_set_key" : "float *", + "name" : "float *", +- "referenced_type" : "type-298", +- "self_type" : "type-3777", ++ "referenced_type" : "type-297", ++ "self_type" : "type-3770", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26696,8 +28108,8 @@ + "alignment" : 4, + "linker_set_key" : "int (*)(void *)", + "name" : "int (*)(void *)", +- "referenced_type" : "type-303", +- "self_type" : "type-304", ++ "referenced_type" : "type-302", ++ "self_type" : "type-303", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h" + }, +@@ -26706,7 +28118,7 @@ + "linker_set_key" : "int *", + "name" : "int *", + "referenced_type" : "type-19", +- "self_type" : "type-521", ++ "self_type" : "type-519", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26714,8 +28126,8 @@ + "alignment" : 4, + "linker_set_key" : "log_msg *", + "name" : "log_msg *", +- "referenced_type" : "type-236", +- "self_type" : "type-242", ++ "referenced_type" : "type-235", ++ "self_type" : "type-241", + "size" : 4, + "source_file" : "/system/core/liblog/include/log/log_read.h" + }, +@@ -26724,7 +28136,7 @@ + "linker_set_key" : "long long *", + "name" : "long long *", + "referenced_type" : "type-447", +- "self_type" : "type-3776", ++ "self_type" : "type-3769", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26733,7 +28145,7 @@ + "linker_set_key" : "native_handle *", + "name" : "native_handle *", + "referenced_type" : "type-18", +- "self_type" : "type-91", ++ "self_type" : "type-90", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26742,7 +28154,7 @@ + "linker_set_key" : "short *", + "name" : "short *", + "referenced_type" : "type-2", +- "self_type" : "type-3774", ++ "self_type" : "type-3767", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26751,7 +28163,7 @@ + "linker_set_key" : "signed char *", + "name" : "signed char *", + "referenced_type" : "type-550", +- "self_type" : "type-3773", ++ "self_type" : "type-3766", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26759,8 +28171,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__1::basic_ostream &(*)(std::__1::basic_ostream &)", + "name" : "std::__1::basic_ostream &(*)(std::__1::basic_ostream &)", +- "referenced_type" : "type-2491", +- "self_type" : "type-2494", ++ "referenced_type" : "type-2486", ++ "self_type" : "type-2489", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -26768,8 +28180,8 @@ + "alignment" : 4, + "linker_set_key" : "std::unique_ptr > *", + "name" : "std::unique_ptr > *", +- "referenced_type" : "type-3781", +- "self_type" : "type-3780", ++ "referenced_type" : "type-3774", ++ "self_type" : "type-3773", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26777,8 +28189,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *)>, std::allocator > *)> > > *", + "name" : "std::vector > *)>, std::allocator > *)> > > *", +- "referenced_type" : "type-1251", +- "self_type" : "type-1250", ++ "referenced_type" : "type-1248", ++ "self_type" : "type-1247", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26786,8 +28198,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *)>, std::allocator > *)> > > *", + "name" : "std::vector > *)>, std::allocator > *)> > > *", +- "referenced_type" : "type-2170", +- "self_type" : "type-2169", ++ "referenced_type" : "type-2165", ++ "self_type" : "type-2164", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26795,8 +28207,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *)>, std::allocator > *)> > > *", + "name" : "std::vector > *)>, std::allocator > *)> > > *", +- "referenced_type" : "type-248", +- "self_type" : "type-247", ++ "referenced_type" : "type-247", ++ "self_type" : "type-246", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26804,8 +28216,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *)>, std::allocator > *)> > > *", + "name" : "std::vector > *)>, std::allocator > *)> > > *", +- "referenced_type" : "type-3205", +- "self_type" : "type-3204", ++ "referenced_type" : "type-3198", ++ "self_type" : "type-3197", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26813,8 +28225,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *)>, std::allocator > *)> > > *", + "name" : "std::vector > *)>, std::allocator > *)> > > *", +- "referenced_type" : "type-3282", +- "self_type" : "type-3281", ++ "referenced_type" : "type-3275", ++ "self_type" : "type-3274", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26822,8 +28234,8 @@ + "alignment" : 4, + "linker_set_key" : "unsigned char *", + "name" : "unsigned char *", +- "referenced_type" : "type-199", +- "self_type" : "type-291", ++ "referenced_type" : "type-198", ++ "self_type" : "type-290", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics.h" + }, +@@ -26832,7 +28244,7 @@ + "linker_set_key" : "unsigned int *", + "name" : "unsigned int *", + "referenced_type" : "type-1", +- "self_type" : "type-1041", ++ "self_type" : "type-1038", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -26841,7 +28253,7 @@ + "linker_set_key" : "unsigned long long *", + "name" : "unsigned long long *", + "referenced_type" : "type-21", +- "self_type" : "type-2350", ++ "self_type" : "type-2345", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26849,8 +28261,8 @@ + "alignment" : 4, + "linker_set_key" : "unsigned short *", + "name" : "unsigned short *", +- "referenced_type" : "type-132", +- "self_type" : "type-3775", ++ "referenced_type" : "type-131", ++ "self_type" : "type-3768", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26858,8 +28270,8 @@ + "alignment" : 4, + "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)", + "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)", +- "referenced_type" : "type-2352", +- "self_type" : "type-2351", ++ "referenced_type" : "type-2347", ++ "self_type" : "type-2346", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26867,8 +28279,8 @@ + "alignment" : 4, + "linker_set_key" : "void (*)(const void *, void *, void *)", + "name" : "void (*)(const void *, void *, void *)", +- "referenced_type" : "type-2346", +- "self_type" : "type-2345", ++ "referenced_type" : "type-2341", ++ "self_type" : "type-2340", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -26876,8 +28288,8 @@ + "alignment" : 4, + "linker_set_key" : "void (*)(void *, const char *)", + "name" : "void (*)(void *, const char *)", +- "referenced_type" : "type-2541", +- "self_type" : "type-2542", ++ "referenced_type" : "type-2536", ++ "self_type" : "type-2537", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h" + }, +@@ -26885,8 +28297,8 @@ + "alignment" : 4, + "linker_set_key" : "void *", + "name" : "void *", +- "referenced_type" : "type-106", +- "self_type" : "type-245", ++ "referenced_type" : "type-105", ++ "self_type" : "type-244", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/VectorImpl.h" + }, +@@ -26894,8 +28306,8 @@ + "alignment" : 4, + "linker_set_key" : "void **", + "name" : "void **", +- "referenced_type" : "type-245", +- "self_type" : "type-305", ++ "referenced_type" : "type-244", ++ "self_type" : "type-304", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h" + } +@@ -26907,8 +28319,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase *const", + "name" : "android::RefBase *const", +- "referenced_type" : "type-68", +- "self_type" : "type-3611", ++ "referenced_type" : "type-67", ++ "self_type" : "type-3604", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -26917,8 +28329,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1099", +- "self_type" : "type-1101", ++ "referenced_type" : "type-1096", ++ "self_type" : "type-1098", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26927,8 +28339,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1159", +- "self_type" : "type-1161", ++ "referenced_type" : "type-1156", ++ "self_type" : "type-1158", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26937,8 +28349,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1220", +- "self_type" : "type-1222", ++ "referenced_type" : "type-1217", ++ "self_type" : "type-1219", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26947,8 +28359,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1292", +- "self_type" : "type-1296", ++ "referenced_type" : "type-1289", ++ "self_type" : "type-1291", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26957,8 +28369,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1347", +- "self_type" : "type-1349", ++ "referenced_type" : "type-1344", ++ "self_type" : "type-1346", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26967,8 +28379,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1454", +- "self_type" : "type-1456", ++ "referenced_type" : "type-1450", ++ "self_type" : "type-1452", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26977,8 +28389,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1522", +- "self_type" : "type-1524", ++ "referenced_type" : "type-1518", ++ "self_type" : "type-1520", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26987,8 +28399,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1689", +- "self_type" : "type-1691", ++ "referenced_type" : "type-1685", ++ "self_type" : "type-1687", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26997,8 +28409,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1701", +- "self_type" : "type-1700", ++ "referenced_type" : "type-1697", ++ "self_type" : "type-1696", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27007,8 +28419,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1728", +- "self_type" : "type-1730", ++ "referenced_type" : "type-1723", ++ "self_type" : "type-1725", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27017,8 +28429,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1791", +- "self_type" : "type-1793", ++ "referenced_type" : "type-1786", ++ "self_type" : "type-1788", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27027,8 +28439,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1863", +- "self_type" : "type-1865", ++ "referenced_type" : "type-1858", ++ "self_type" : "type-1860", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27037,8 +28449,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1934", +- "self_type" : "type-1936", ++ "referenced_type" : "type-1929", ++ "self_type" : "type-1931", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27047,8 +28459,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2021", +- "self_type" : "type-2023", ++ "referenced_type" : "type-2016", ++ "self_type" : "type-2018", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27057,8 +28469,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2079", +- "self_type" : "type-2081", ++ "referenced_type" : "type-2074", ++ "self_type" : "type-2076", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27067,8 +28479,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2138", +- "self_type" : "type-2140", ++ "referenced_type" : "type-2133", ++ "self_type" : "type-2135", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27077,8 +28489,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2209", +- "self_type" : "type-2213", ++ "referenced_type" : "type-2204", ++ "self_type" : "type-2206", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27087,8 +28499,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2257", +- "self_type" : "type-2259", ++ "referenced_type" : "type-2252", ++ "self_type" : "type-2254", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27097,8 +28509,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2307", +- "self_type" : "type-2309", ++ "referenced_type" : "type-2302", ++ "self_type" : "type-2304", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27107,8 +28519,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2325", +- "self_type" : "type-2327", ++ "referenced_type" : "type-2320", ++ "self_type" : "type-2322", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27117,8 +28529,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2401", +- "self_type" : "type-2403", ++ "referenced_type" : "type-2396", ++ "self_type" : "type-2398", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27127,8 +28539,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2500", +- "self_type" : "type-2502", ++ "referenced_type" : "type-2495", ++ "self_type" : "type-2497", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27137,8 +28549,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2522", +- "self_type" : "type-2534", ++ "referenced_type" : "type-2519", ++ "self_type" : "type-2529", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27147,8 +28559,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2535", +- "self_type" : "type-2537", ++ "referenced_type" : "type-2530", ++ "self_type" : "type-2532", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27157,8 +28569,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2543", +- "self_type" : "type-2545", ++ "referenced_type" : "type-2538", ++ "self_type" : "type-2540", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27167,8 +28579,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2653", +- "self_type" : "type-2655", ++ "referenced_type" : "type-2647", ++ "self_type" : "type-2649", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27177,8 +28589,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2721", +- "self_type" : "type-2723", ++ "referenced_type" : "type-2715", ++ "self_type" : "type-2717", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27197,8 +28609,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2820", +- "self_type" : "type-2819", ++ "referenced_type" : "type-2815", ++ "self_type" : "type-2814", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27207,8 +28619,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2833", +- "self_type" : "type-2835", ++ "referenced_type" : "type-2827", ++ "self_type" : "type-2829", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27217,8 +28629,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2871", +- "self_type" : "type-2873", ++ "referenced_type" : "type-2864", ++ "self_type" : "type-2866", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27227,8 +28639,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2937", +- "self_type" : "type-2939", ++ "referenced_type" : "type-2929", ++ "self_type" : "type-2932", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27237,8 +28649,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3007", +- "self_type" : "type-3009", ++ "referenced_type" : "type-3000", ++ "self_type" : "type-3002", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27247,8 +28659,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3078", +- "self_type" : "type-3080", ++ "referenced_type" : "type-3071", ++ "self_type" : "type-3073", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27257,8 +28669,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3158", +- "self_type" : "type-3160", ++ "referenced_type" : "type-3151", ++ "self_type" : "type-3153", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27267,8 +28679,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-320", +- "self_type" : "type-322", ++ "referenced_type" : "type-319", ++ "self_type" : "type-321", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27277,8 +28689,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3225", +- "self_type" : "type-3227", ++ "referenced_type" : "type-3218", ++ "self_type" : "type-3220", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27287,8 +28699,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3268", +- "self_type" : "type-3272", ++ "referenced_type" : "type-3261", ++ "self_type" : "type-3265", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27297,8 +28709,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3278", +- "self_type" : "type-3280", ++ "referenced_type" : "type-3271", ++ "self_type" : "type-3273", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27307,8 +28719,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3341", +- "self_type" : "type-3343", ++ "referenced_type" : "type-3334", ++ "self_type" : "type-3336", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27317,8 +28729,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3387", +- "self_type" : "type-3389", ++ "referenced_type" : "type-3380", ++ "self_type" : "type-3382", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27327,8 +28739,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3431", +- "self_type" : "type-3433", ++ "referenced_type" : "type-3424", ++ "self_type" : "type-3426", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27337,8 +28749,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3446", +- "self_type" : "type-3448", ++ "referenced_type" : "type-3439", ++ "self_type" : "type-3441", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27347,8 +28759,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3504", +- "self_type" : "type-3507", ++ "referenced_type" : "type-3497", ++ "self_type" : "type-3499", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27357,8 +28769,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3567", +- "self_type" : "type-3569", ++ "referenced_type" : "type-3560", ++ "self_type" : "type-3562", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27367,8 +28779,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3588", +- "self_type" : "type-3590", ++ "referenced_type" : "type-3581", ++ "self_type" : "type-3583", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27377,8 +28789,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3596", +- "self_type" : "type-3598", ++ "referenced_type" : "type-3589", ++ "self_type" : "type-3591", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27387,8 +28799,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3619", +- "self_type" : "type-3621", ++ "referenced_type" : "type-3612", ++ "self_type" : "type-3614", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27397,8 +28809,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3754", +- "self_type" : "type-3756", ++ "referenced_type" : "type-3747", ++ "self_type" : "type-3749", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27407,8 +28819,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3820", +- "self_type" : "type-3822", ++ "referenced_type" : "type-3813", ++ "self_type" : "type-3815", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27417,8 +28829,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3875", +- "self_type" : "type-3877", ++ "referenced_type" : "type-3868", ++ "self_type" : "type-3870", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27427,8 +28839,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3891", +- "self_type" : "type-3893", ++ "referenced_type" : "type-3884", ++ "self_type" : "type-3886", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27437,8 +28849,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-4001", +- "self_type" : "type-4003", ++ "referenced_type" : "type-3993", ++ "self_type" : "type-3995", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27447,8 +28859,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-4073", +- "self_type" : "type-4075", ++ "referenced_type" : "type-4065", ++ "self_type" : "type-4067", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27457,8 +28869,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-510", +- "self_type" : "type-513", ++ "referenced_type" : "type-508", ++ "self_type" : "type-510", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27477,8 +28889,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-611", +- "self_type" : "type-613", ++ "referenced_type" : "type-609", ++ "self_type" : "type-611", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27487,8 +28899,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-706", +- "self_type" : "type-708", ++ "referenced_type" : "type-704", ++ "self_type" : "type-706", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27497,8 +28909,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-718", +- "self_type" : "type-717", ++ "referenced_type" : "type-716", ++ "self_type" : "type-715", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27507,8 +28919,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-745", +- "self_type" : "type-747", ++ "referenced_type" : "type-742", ++ "self_type" : "type-744", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27517,8 +28929,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-80", +- "self_type" : "type-82", ++ "referenced_type" : "type-79", ++ "self_type" : "type-81", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27527,8 +28939,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-818", +- "self_type" : "type-820", ++ "referenced_type" : "type-815", ++ "self_type" : "type-817", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27537,8 +28949,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-914", +- "self_type" : "type-916", ++ "referenced_type" : "type-911", ++ "self_type" : "type-913", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27547,8 +28959,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-996", +- "self_type" : "type-998", ++ "referenced_type" : "type-993", ++ "self_type" : "type-995", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27558,7 +28970,7 @@ + "linker_set_key" : "android::RefBase::weakref_type *const", + "name" : "android::RefBase::weakref_type *const", + "referenced_type" : "type-35", +- "self_type" : "type-3609", ++ "self_type" : "type-3602", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -27567,8 +28979,8 @@ + "is_const" : true, + "linker_set_key" : "android::hardware::BHwBinder *const", + "name" : "android::hardware::BHwBinder *const", +- "referenced_type" : "type-2332", +- "self_type" : "type-3607", ++ "referenced_type" : "type-2327", ++ "self_type" : "type-3600", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -27577,8 +28989,8 @@ + "is_const" : true, + "linker_set_key" : "android::hardware::IBinder *const", + "name" : "android::hardware::IBinder *const", +- "referenced_type" : "type-2329", +- "self_type" : "type-2366", ++ "referenced_type" : "type-2324", ++ "self_type" : "type-2361", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -27587,8 +28999,8 @@ + "is_const" : true, + "linker_set_key" : "char *const", + "name" : "char *const", +- "referenced_type" : "type-243", +- "self_type" : "type-3790", ++ "referenced_type" : "type-242", ++ "self_type" : "type-3783", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27597,8 +29009,8 @@ + "is_const" : true, + "linker_set_key" : "char const[10]", + "name" : "char const[10]", +- "referenced_type" : "type-3656", +- "self_type" : "type-3655", ++ "referenced_type" : "type-3649", ++ "self_type" : "type-3648", + "size" : 10, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27607,8 +29019,8 @@ + "is_const" : true, + "linker_set_key" : "char const[11]", + "name" : "char const[11]", +- "referenced_type" : "type-3679", +- "self_type" : "type-3678", ++ "referenced_type" : "type-3672", ++ "self_type" : "type-3671", + "size" : 11, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27617,8 +29029,8 @@ + "is_const" : true, + "linker_set_key" : "char const[12]", + "name" : "char const[12]", +- "referenced_type" : "type-3653", +- "self_type" : "type-3652", ++ "referenced_type" : "type-3646", ++ "self_type" : "type-3645", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27627,8 +29039,8 @@ + "is_const" : true, + "linker_set_key" : "char const[13]", + "name" : "char const[13]", +- "referenced_type" : "type-3649", +- "self_type" : "type-3648", ++ "referenced_type" : "type-3642", ++ "self_type" : "type-3641", + "size" : 13, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27637,8 +29049,8 @@ + "is_const" : true, + "linker_set_key" : "char const[14]", + "name" : "char const[14]", +- "referenced_type" : "type-3698", +- "self_type" : "type-3697", ++ "referenced_type" : "type-3691", ++ "self_type" : "type-3690", + "size" : 14, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27647,8 +29059,8 @@ + "is_const" : true, + "linker_set_key" : "char const[15]", + "name" : "char const[15]", +- "referenced_type" : "type-3796", +- "self_type" : "type-3795", ++ "referenced_type" : "type-3789", ++ "self_type" : "type-3788", + "size" : 15, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27657,8 +29069,8 @@ + "is_const" : true, + "linker_set_key" : "char const[16]", + "name" : "char const[16]", +- "referenced_type" : "type-47", +- "self_type" : "type-3681", ++ "referenced_type" : "type-46", ++ "self_type" : "type-3674", + "size" : 16, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27667,8 +29079,8 @@ + "is_const" : true, + "linker_set_key" : "char const[17]", + "name" : "char const[17]", +- "referenced_type" : "type-3701", +- "self_type" : "type-3700", ++ "referenced_type" : "type-3694", ++ "self_type" : "type-3693", + "size" : 17, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27677,8 +29089,8 @@ + "is_const" : true, + "linker_set_key" : "char const[18]", + "name" : "char const[18]", +- "referenced_type" : "type-3685", +- "self_type" : "type-3684", ++ "referenced_type" : "type-3678", ++ "self_type" : "type-3677", + "size" : 18, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27687,8 +29099,8 @@ + "is_const" : true, + "linker_set_key" : "char const[19]", + "name" : "char const[19]", +- "referenced_type" : "type-3717", +- "self_type" : "type-3716", ++ "referenced_type" : "type-3710", ++ "self_type" : "type-3709", + "size" : 19, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27697,8 +29109,8 @@ + "is_const" : true, + "linker_set_key" : "char const[20]", + "name" : "char const[20]", +- "referenced_type" : "type-3695", +- "self_type" : "type-3694", ++ "referenced_type" : "type-3688", ++ "self_type" : "type-3687", + "size" : 20, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27707,8 +29119,8 @@ + "is_const" : true, + "linker_set_key" : "char const[22]", + "name" : "char const[22]", +- "referenced_type" : "type-3720", +- "self_type" : "type-3719", ++ "referenced_type" : "type-3713", ++ "self_type" : "type-3712", + "size" : 22, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27717,8 +29129,8 @@ + "is_const" : true, + "linker_set_key" : "char const[25]", + "name" : "char const[25]", +- "referenced_type" : "type-3710", +- "self_type" : "type-3709", ++ "referenced_type" : "type-3703", ++ "self_type" : "type-3702", + "size" : 25, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27727,8 +29139,8 @@ + "is_const" : true, + "linker_set_key" : "char const[28]", + "name" : "char const[28]", +- "referenced_type" : "type-3733", +- "self_type" : "type-3732", ++ "referenced_type" : "type-3726", ++ "self_type" : "type-3725", + "size" : 28, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27737,8 +29149,8 @@ + "is_const" : true, + "linker_set_key" : "char const[29]", + "name" : "char const[29]", +- "referenced_type" : "type-3707", +- "self_type" : "type-3706", ++ "referenced_type" : "type-3700", ++ "self_type" : "type-3699", + "size" : 29, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27747,8 +29159,8 @@ + "is_const" : true, + "linker_set_key" : "char const[2]", + "name" : "char const[2]", +- "referenced_type" : "type-3660", +- "self_type" : "type-3659", ++ "referenced_type" : "type-3652", ++ "self_type" : "type-3651", + "size" : 2, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27757,8 +29169,8 @@ + "is_const" : true, + "linker_set_key" : "char const[31]", + "name" : "char const[31]", +- "referenced_type" : "type-3692", +- "self_type" : "type-3691", ++ "referenced_type" : "type-3684", ++ "self_type" : "type-3683", + "size" : 31, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27767,8 +29179,8 @@ + "is_const" : true, + "linker_set_key" : "char const[32]", + "name" : "char const[32]", +- "referenced_type" : "type-3724", +- "self_type" : "type-3723", ++ "referenced_type" : "type-3717", ++ "self_type" : "type-3716", + "size" : 32, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27777,8 +29189,8 @@ + "is_const" : true, + "linker_set_key" : "char const[35]", + "name" : "char const[35]", +- "referenced_type" : "type-3713", +- "self_type" : "type-3712", ++ "referenced_type" : "type-3706", ++ "self_type" : "type-3705", + "size" : 35, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27787,8 +29199,8 @@ + "is_const" : true, + "linker_set_key" : "char const[37]", + "name" : "char const[37]", +- "referenced_type" : "type-3704", +- "self_type" : "type-3703", ++ "referenced_type" : "type-3697", ++ "self_type" : "type-3696", + "size" : 37, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27797,8 +29209,8 @@ + "is_const" : true, + "linker_set_key" : "char const[3]", + "name" : "char const[3]", +- "referenced_type" : "type-3672", +- "self_type" : "type-3671", ++ "referenced_type" : "type-3665", ++ "self_type" : "type-3664", + "size" : 3, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27807,8 +29219,8 @@ + "is_const" : true, + "linker_set_key" : "char const[4]", + "name" : "char const[4]", +- "referenced_type" : "type-3793", +- "self_type" : "type-3792", ++ "referenced_type" : "type-3786", ++ "self_type" : "type-3785", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27817,8 +29229,8 @@ + "is_const" : true, + "linker_set_key" : "char const[5]", + "name" : "char const[5]", +- "referenced_type" : "type-3799", +- "self_type" : "type-3798", ++ "referenced_type" : "type-3792", ++ "self_type" : "type-3791", + "size" : 5, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27827,8 +29239,8 @@ + "is_const" : true, + "linker_set_key" : "char const[6]", + "name" : "char const[6]", +- "referenced_type" : "type-3664", +- "self_type" : "type-3663", ++ "referenced_type" : "type-3657", ++ "self_type" : "type-3656", + "size" : 6, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27837,8 +29249,8 @@ + "is_const" : true, + "linker_set_key" : "char const[7]", + "name" : "char const[7]", +- "referenced_type" : "type-3688", +- "self_type" : "type-3687", ++ "referenced_type" : "type-3681", ++ "self_type" : "type-3680", + "size" : 7, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27847,8 +29259,8 @@ + "is_const" : true, + "linker_set_key" : "char const[8]", + "name" : "char const[8]", +- "referenced_type" : "type-3676", +- "self_type" : "type-3675", ++ "referenced_type" : "type-3669", ++ "self_type" : "type-3668", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27857,8 +29269,8 @@ + "is_const" : true, + "linker_set_key" : "char const[9]", + "name" : "char const[9]", +- "referenced_type" : "type-3667", +- "self_type" : "type-3666", ++ "referenced_type" : "type-3660", ++ "self_type" : "type-3659", + "size" : 9, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27867,8 +29279,8 @@ + "is_const" : true, + "linker_set_key" : "const android::CallStack", + "name" : "const android::CallStack", +- "referenced_type" : "type-256", +- "self_type" : "type-258", ++ "referenced_type" : "type-255", ++ "self_type" : "type-257", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/CallStack.h" + }, +@@ -27877,8 +29289,8 @@ + "is_const" : true, + "linker_set_key" : "const android::KeyedVector >", + "name" : "const android::KeyedVector >", +- "referenced_type" : "type-433", +- "self_type" : "type-3836", ++ "referenced_type" : "type-431", ++ "self_type" : "type-3829", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -27887,8 +29299,8 @@ + "is_const" : true, + "linker_set_key" : "const android::KeyedVector", + "name" : "const android::KeyedVector", +- "referenced_type" : "type-2341", +- "self_type" : "type-2418", ++ "referenced_type" : "type-2336", ++ "self_type" : "type-2413", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -27897,8 +29309,8 @@ + "is_const" : true, + "linker_set_key" : "const android::NativeHandle", + "name" : "const android::NativeHandle", +- "referenced_type" : "type-315", +- "self_type" : "type-333", ++ "referenced_type" : "type-314", ++ "self_type" : "type-332", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/NativeHandle.h" + }, +@@ -27908,7 +29320,7 @@ + "linker_set_key" : "const android::RefBase", + "name" : "const android::RefBase", + "referenced_type" : "type-25", +- "self_type" : "type-62", ++ "self_type" : "type-61", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27917,8 +29329,8 @@ + "is_const" : true, + "linker_set_key" : "const android::SortedVector > >", + "name" : "const android::SortedVector > >", +- "referenced_type" : "type-426", +- "self_type" : "type-3827", ++ "referenced_type" : "type-424", ++ "self_type" : "type-3820", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -27927,8 +29339,8 @@ + "is_const" : true, + "linker_set_key" : "const android::SortedVector >", + "name" : "const android::SortedVector >", +- "referenced_type" : "type-2342", +- "self_type" : "type-2408", ++ "referenced_type" : "type-2337", ++ "self_type" : "type-2403", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -27937,8 +29349,8 @@ + "is_const" : true, + "linker_set_key" : "const android::String16", + "name" : "const android::String16", +- "referenced_type" : "type-342", +- "self_type" : "type-348", ++ "referenced_type" : "type-341", ++ "self_type" : "type-347", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String16.h" + }, +@@ -27947,8 +29359,8 @@ + "is_const" : true, + "linker_set_key" : "const android::String8", + "name" : "const android::String8", +- "referenced_type" : "type-221", +- "self_type" : "type-223", ++ "referenced_type" : "type-220", ++ "self_type" : "type-222", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String8.h" + }, +@@ -27957,8 +29369,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-432", +- "self_type" : "type-3632", ++ "referenced_type" : "type-430", ++ "self_type" : "type-3625", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -27967,8 +29379,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-431", +- "self_type" : "type-3628", ++ "referenced_type" : "type-429", ++ "self_type" : "type-3621", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -27977,8 +29389,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-252", +- "self_type" : "type-254", ++ "referenced_type" : "type-251", ++ "self_type" : "type-253", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -27987,8 +29399,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-430", +- "self_type" : "type-3624", ++ "referenced_type" : "type-428", ++ "self_type" : "type-3617", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -27997,8 +29409,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-2410", +- "self_type" : "type-2413", ++ "referenced_type" : "type-2405", ++ "self_type" : "type-2408", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -28007,8 +29419,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-428", +- "self_type" : "type-3831", ++ "referenced_type" : "type-426", ++ "self_type" : "type-3824", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -28017,8 +29429,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector >", + "name" : "const android::Vector >", +- "referenced_type" : "type-2518", +- "self_type" : "type-2520", ++ "referenced_type" : "type-2513", ++ "self_type" : "type-2515", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -28027,8 +29439,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-2514", +- "self_type" : "type-2515", ++ "referenced_type" : "type-2509", ++ "self_type" : "type-2510", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -28037,8 +29449,8 @@ + "is_const" : true, + "linker_set_key" : "const android::VectorImpl", + "name" : "const android::VectorImpl", +- "referenced_type" : "type-244", +- "self_type" : "type-249", ++ "referenced_type" : "type-243", ++ "self_type" : "type-248", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/VectorImpl.h" + }, +@@ -28047,8 +29459,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BHwBinder", + "name" : "const android::hardware::BHwBinder", +- "referenced_type" : "type-2333", +- "self_type" : "type-2361", ++ "referenced_type" : "type-2328", ++ "self_type" : "type-2356", + "size" : 28, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -28057,8 +29469,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BpHwBinder", + "name" : "const android::hardware::BpHwBinder", +- "referenced_type" : "type-2336", +- "self_type" : "type-2372", ++ "referenced_type" : "type-2331", ++ "self_type" : "type-2367", + "size" : 60, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -28067,8 +29479,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BpHwBinder::Obituary", + "name" : "const android::hardware::BpHwBinder::Obituary", +- "referenced_type" : "type-2374", +- "self_type" : "type-2391", ++ "referenced_type" : "type-2369", ++ "self_type" : "type-2386", + "size" : 16, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -28077,8 +29489,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager", + "name" : "const android::hardware::BpHwBinder::ObjectManager", +- "referenced_type" : "type-2340", +- "self_type" : "type-2425", ++ "referenced_type" : "type-2335", ++ "self_type" : "type-2420", + "size" : 20, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -28087,8 +29499,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t", + "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t", +- "referenced_type" : "type-2344", +- "self_type" : "type-2398", ++ "referenced_type" : "type-2339", ++ "self_type" : "type-2393", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -28097,8 +29509,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BpHwRefBase", + "name" : "const android::hardware::BpHwRefBase", +- "referenced_type" : "type-2365", +- "self_type" : "type-2370", ++ "referenced_type" : "type-2360", ++ "self_type" : "type-2365", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -28107,8 +29519,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BufferedTextOutput", + "name" : "const android::hardware::BufferedTextOutput", +- "referenced_type" : "type-2506", +- "self_type" : "type-2510", ++ "referenced_type" : "type-2501", ++ "self_type" : "type-2505", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -28118,7 +29530,7 @@ + "linker_set_key" : "const android::hardware::ConcurrentMap, android::hardware::details::SchedPrio>", + "name" : "const android::hardware::ConcurrentMap, android::hardware::details::SchedPrio>", + "referenced_type" : "type-29", +- "self_type" : "type-1051", ++ "self_type" : "type-1048", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -28127,8 +29539,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ConcurrentMap, bool>", + "name" : "const android::hardware::ConcurrentMap, bool>", +- "referenced_type" : "type-41", +- "self_type" : "type-1053", ++ "referenced_type" : "type-40", ++ "self_type" : "type-1050", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -28137,7 +29549,7 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ConcurrentMap >", + "name" : "const android::hardware::ConcurrentMap >", +- "referenced_type" : "type-378", ++ "referenced_type" : "type-377", + "self_type" : "type-393", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" +@@ -28147,8 +29559,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "name" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", +- "referenced_type" : "type-635", +- "self_type" : "type-644", ++ "referenced_type" : "type-633", ++ "self_type" : "type-642", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -28157,8 +29569,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "name" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", +- "referenced_type" : "type-398", +- "self_type" : "type-407", ++ "referenced_type" : "type-396", ++ "self_type" : "type-404", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -28167,8 +29579,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::HexDump", + "name" : "const android::hardware::HexDump", +- "referenced_type" : "type-2486", +- "self_type" : "type-2489", ++ "referenced_type" : "type-2481", ++ "self_type" : "type-2484", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -28177,8 +29589,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder", + "name" : "const android::hardware::IBinder", +- "referenced_type" : "type-1444", +- "self_type" : "type-1443", ++ "referenced_type" : "type-1440", ++ "self_type" : "type-1439", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28187,8 +29599,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder", + "name" : "const android::hardware::IBinder", +- "referenced_type" : "type-2328", +- "self_type" : "type-2330", ++ "referenced_type" : "type-2323", ++ "self_type" : "type-2325", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, +@@ -28197,8 +29609,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder", + "name" : "const android::hardware::IBinder", +- "referenced_type" : "type-2644", +- "self_type" : "type-2643", ++ "referenced_type" : "type-2638", ++ "self_type" : "type-2637", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28207,8 +29619,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder", + "name" : "const android::hardware::IBinder", +- "referenced_type" : "type-3987", +- "self_type" : "type-3986", ++ "referenced_type" : "type-3979", ++ "self_type" : "type-3978", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28217,8 +29629,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder", + "name" : "const android::hardware::IBinder", +- "referenced_type" : "type-489", +- "self_type" : "type-488", ++ "referenced_type" : "type-487", ++ "self_type" : "type-486", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28227,8 +29639,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder::DeathRecipient", + "name" : "const android::hardware::IBinder::DeathRecipient", +- "referenced_type" : "type-2379", +- "self_type" : "type-2420", ++ "referenced_type" : "type-2374", ++ "self_type" : "type-2415", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -28237,8 +29649,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IInterface", + "name" : "const android::hardware::IInterface", +- "referenced_type" : "type-2375", +- "self_type" : "type-2552", ++ "referenced_type" : "type-2370", ++ "self_type" : "type-2547", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28247,8 +29659,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IPCThreadState", + "name" : "const android::hardware::IPCThreadState", +- "referenced_type" : "type-2434", +- "self_type" : "type-3639", ++ "referenced_type" : "type-2429", ++ "self_type" : "type-3632", + "size" : 272, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -28257,8 +29669,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1039", +- "self_type" : "type-1038", ++ "referenced_type" : "type-1036", ++ "self_type" : "type-1035", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28267,8 +29679,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1127", +- "self_type" : "type-1126", ++ "referenced_type" : "type-1124", ++ "self_type" : "type-1123", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -28277,8 +29689,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1188", +- "self_type" : "type-1187", ++ "referenced_type" : "type-1185", ++ "self_type" : "type-1184", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -28287,8 +29699,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1254", +- "self_type" : "type-1253", ++ "referenced_type" : "type-1251", ++ "self_type" : "type-1250", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -28297,8 +29709,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1308", +- "self_type" : "type-1307", ++ "referenced_type" : "type-1305", ++ "self_type" : "type-1304", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28307,8 +29719,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1371", +- "self_type" : "type-1370", ++ "referenced_type" : "type-1368", ++ "self_type" : "type-1367", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28317,8 +29729,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1965", +- "self_type" : "type-1964", ++ "referenced_type" : "type-1960", ++ "self_type" : "type-1959", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28327,8 +29739,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2049", +- "self_type" : "type-2048", ++ "referenced_type" : "type-2044", ++ "self_type" : "type-2043", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -28337,8 +29749,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2108", +- "self_type" : "type-2107", ++ "referenced_type" : "type-2103", ++ "self_type" : "type-2102", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -28347,8 +29759,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2173", +- "self_type" : "type-2172", ++ "referenced_type" : "type-2168", ++ "self_type" : "type-2167", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -28357,8 +29769,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2225", +- "self_type" : "type-2224", ++ "referenced_type" : "type-2220", ++ "self_type" : "type-2219", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28367,8 +29779,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2279", +- "self_type" : "type-2278", ++ "referenced_type" : "type-2274", ++ "self_type" : "type-2273", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -28377,8 +29789,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2348", +- "self_type" : "type-2354", ++ "referenced_type" : "type-2343", ++ "self_type" : "type-2349", + "size" : 68, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -28387,8 +29799,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2572", +- "self_type" : "type-2571", ++ "referenced_type" : "type-2567", ++ "self_type" : "type-2566", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28397,8 +29809,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3104", +- "self_type" : "type-3103", ++ "referenced_type" : "type-3097", ++ "self_type" : "type-3096", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28407,8 +29819,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3184", +- "self_type" : "type-3183", ++ "referenced_type" : "type-3177", ++ "self_type" : "type-3176", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -28417,8 +29829,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3251", +- "self_type" : "type-3250", ++ "referenced_type" : "type-3244", ++ "self_type" : "type-3243", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -28427,8 +29839,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3309", +- "self_type" : "type-3308", ++ "referenced_type" : "type-3301", ++ "self_type" : "type-3300", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -28437,8 +29849,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3354", +- "self_type" : "type-3353", ++ "referenced_type" : "type-3347", ++ "self_type" : "type-3346", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28447,8 +29859,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3410", +- "self_type" : "type-3409", ++ "referenced_type" : "type-3399", ++ "self_type" : "type-3398", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -28457,8 +29869,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-369", +- "self_type" : "type-368", ++ "referenced_type" : "type-368", ++ "self_type" : "type-367", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28467,8 +29879,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3916", +- "self_type" : "type-3915", ++ "referenced_type" : "type-3909", ++ "self_type" : "type-3908", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28477,8 +29889,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ProcessState", + "name" : "const android::hardware::ProcessState", +- "referenced_type" : "type-2439", +- "self_type" : "type-3846", ++ "referenced_type" : "type-2434", ++ "self_type" : "type-3839", + "size" : 128, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28487,8 +29899,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ProcessState::handle_entry", + "name" : "const android::hardware::ProcessState::handle_entry", +- "referenced_type" : "type-2416", +- "self_type" : "type-3812", ++ "referenced_type" : "type-2411", ++ "self_type" : "type-3804", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -28497,8 +29909,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return", + "name" : "const android::hardware::Return", +- "referenced_type" : "type-807", +- "self_type" : "type-811", ++ "referenced_type" : "type-804", ++ "self_type" : "type-808", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28507,8 +29919,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-801", +- "self_type" : "type-805", ++ "referenced_type" : "type-798", ++ "self_type" : "type-802", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28517,8 +29929,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-986", +- "self_type" : "type-990", ++ "referenced_type" : "type-983", ++ "self_type" : "type-987", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28527,8 +29939,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-1093", +- "self_type" : "type-1097", ++ "referenced_type" : "type-1090", ++ "self_type" : "type-1094", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28537,8 +29949,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-1153", +- "self_type" : "type-1157", ++ "referenced_type" : "type-1150", ++ "self_type" : "type-1154", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28547,8 +29959,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-1213", +- "self_type" : "type-1217", ++ "referenced_type" : "type-1210", ++ "self_type" : "type-1214", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28557,8 +29969,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-1284", +- "self_type" : "type-1288", ++ "referenced_type" : "type-1281", ++ "self_type" : "type-1285", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28567,8 +29979,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return", + "name" : "const android::hardware::Return", +- "referenced_type" : "type-309", +- "self_type" : "type-506", ++ "referenced_type" : "type-308", ++ "self_type" : "type-504", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28577,8 +29989,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return", + "name" : "const android::hardware::Return", +- "referenced_type" : "type-102", +- "self_type" : "type-101", ++ "referenced_type" : "type-101", ++ "self_type" : "type-100", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28587,8 +29999,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Status", + "name" : "const android::hardware::Status", +- "referenced_type" : "type-104", +- "self_type" : "type-167", ++ "referenced_type" : "type-103", ++ "self_type" : "type-166", + "size" : 20, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28597,8 +30009,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::TypeCode", + "name" : "const android::hardware::TypeCode", +- "referenced_type" : "type-2482", +- "self_type" : "type-2484", ++ "referenced_type" : "type-2477", ++ "self_type" : "type-2479", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -28608,7 +30020,7 @@ + "linker_set_key" : "const android::hardware::details::SchedPrio", + "name" : "const android::hardware::details::SchedPrio", + "referenced_type" : "type-37", +- "self_type" : "type-1050", ++ "self_type" : "type-1047", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -28617,8 +30029,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::Waiter", + "name" : "const android::hardware::details::Waiter", +- "referenced_type" : "type-1772", +- "self_type" : "type-1771", ++ "referenced_type" : "type-1767", ++ "self_type" : "type-1766", + "size" : 52, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28627,8 +30039,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::Waiter", + "name" : "const android::hardware::details::Waiter", +- "referenced_type" : "type-2918", +- "self_type" : "type-2917", ++ "referenced_type" : "type-2910", ++ "self_type" : "type-2909", + "size" : 52, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28637,8 +30049,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::Waiter", + "name" : "const android::hardware::details::Waiter", +- "referenced_type" : "type-797", +- "self_type" : "type-796", ++ "referenced_type" : "type-794", ++ "self_type" : "type-793", + "size" : 52, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28647,8 +30059,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::hidl_pointer >", + "name" : "const android::hardware::details::hidl_pointer >", +- "referenced_type" : "type-1009", +- "self_type" : "type-1076", ++ "referenced_type" : "type-1006", ++ "self_type" : "type-1072", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28657,8 +30069,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::hidl_pointer", + "name" : "const android::hardware::details::hidl_pointer", +- "referenced_type" : "type-620", +- "self_type" : "type-654", ++ "referenced_type" : "type-618", ++ "self_type" : "type-652", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28667,8 +30079,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::hidl_pointer", + "name" : "const android::hardware::details::hidl_pointer", +- "referenced_type" : "type-835", +- "self_type" : "type-853", ++ "referenced_type" : "type-832", ++ "self_type" : "type-850", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28677,8 +30089,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::hidl_pointer", + "name" : "const android::hardware::details::hidl_pointer", +- "referenced_type" : "type-97", +- "self_type" : "type-152", ++ "referenced_type" : "type-96", ++ "self_type" : "type-151", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28697,8 +30109,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::hidl_pointer", + "name" : "const android::hardware::details::hidl_pointer", +- "referenced_type" : "type-519", +- "self_type" : "type-537", ++ "referenced_type" : "type-517", ++ "self_type" : "type-535", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28707,8 +30119,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::return_status", + "name" : "const android::hardware::details::return_status", +- "referenced_type" : "type-103", +- "self_type" : "type-174", ++ "referenced_type" : "type-102", ++ "self_type" : "type-173", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28717,8 +30129,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_array", + "name" : "const android::hardware::hidl_array", +- "referenced_type" : "type-1012", +- "self_type" : "type-2268", ++ "referenced_type" : "type-1009", ++ "self_type" : "type-2263", + "size" : 32, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28727,8 +30139,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_death_recipient", + "name" : "const android::hardware::hidl_death_recipient", +- "referenced_type" : "type-144", +- "self_type" : "type-478", ++ "referenced_type" : "type-143", ++ "self_type" : "type-476", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28737,8 +30149,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_handle", + "name" : "const android::hardware::hidl_handle", +- "referenced_type" : "type-77", +- "self_type" : "type-79", ++ "referenced_type" : "type-76", ++ "self_type" : "type-78", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28747,8 +30159,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_memory", + "name" : "const android::hardware::hidl_memory", +- "referenced_type" : "type-121", +- "self_type" : "type-123", ++ "referenced_type" : "type-120", ++ "self_type" : "type-122", + "size" : 40, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28757,8 +30169,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_string", + "name" : "const android::hardware::hidl_string", +- "referenced_type" : "type-96", +- "self_type" : "type-110", ++ "referenced_type" : "type-95", ++ "self_type" : "type-109", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28767,8 +30179,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_vec >", + "name" : "const android::hardware::hidl_vec >", +- "referenced_type" : "type-1008", +- "self_type" : "type-2270", ++ "referenced_type" : "type-1005", ++ "self_type" : "type-2264", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28777,8 +30189,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_vec", + "name" : "const android::hardware::hidl_vec", +- "referenced_type" : "type-619", +- "self_type" : "type-622", ++ "referenced_type" : "type-617", ++ "self_type" : "type-620", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28787,8 +30199,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_vec", + "name" : "const android::hardware::hidl_vec", +- "referenced_type" : "type-834", +- "self_type" : "type-1022", ++ "referenced_type" : "type-831", ++ "self_type" : "type-1019", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28797,8 +30209,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_vec::iter", + "name" : "const android::hardware::hidl_vec::iter", +- "referenced_type" : "type-625", +- "self_type" : "type-629", ++ "referenced_type" : "type-622", ++ "self_type" : "type-627", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28807,8 +30219,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_vec", + "name" : "const android::hardware::hidl_vec", +- "referenced_type" : "type-518", +- "self_type" : "type-523", ++ "referenced_type" : "type-516", ++ "self_type" : "type-521", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28817,8 +30229,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_version", + "name" : "const android::hardware::hidl_version", +- "referenced_type" : "type-131", +- "self_type" : "type-135", ++ "referenced_type" : "type-130", ++ "self_type" : "type-134", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28827,8 +30239,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase", + "name" : "const android::hidl::base::V1_0::BpHwBase", +- "referenced_type" : "type-419", +- "self_type" : "type-423", ++ "referenced_type" : "type-417", ++ "self_type" : "type-421", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, +@@ -28837,8 +30249,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::base::V1_0::DebugInfo::Architecture", + "name" : "const android::hidl::base::V1_0::DebugInfo::Architecture", +- "referenced_type" : "type-336", +- "self_type" : "type-338", ++ "referenced_type" : "type-335", ++ "self_type" : "type-337", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -28848,7 +30260,7 @@ + "linker_set_key" : "const android::hidl::base::V1_0::IBase", + "name" : "const android::hidl::base::V1_0::IBase", + "referenced_type" : "type-34", +- "self_type" : "type-382", ++ "self_type" : "type-381", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -28857,8 +30269,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::base::V1_0::IBase *const", + "name" : "const android::hidl::base::V1_0::IBase *const", +- "referenced_type" : "type-381", +- "self_type" : "type-396", ++ "referenced_type" : "type-380", ++ "self_type" : "type-390", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -28867,8 +30279,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceManager", + "name" : "const android::hidl::manager::V1_0::BpHwServiceManager", +- "referenced_type" : "type-873", +- "self_type" : "type-877", ++ "referenced_type" : "type-870", ++ "self_type" : "type-874", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, +@@ -28877,8 +30289,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceNotification", + "name" : "const android::hidl::manager::V1_0::BpHwServiceNotification", +- "referenced_type" : "type-864", +- "self_type" : "type-869", ++ "referenced_type" : "type-861", ++ "self_type" : "type-866", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, +@@ -28887,8 +30299,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager", + "name" : "const android::hidl::manager::V1_0::IServiceManager", +- "referenced_type" : "type-552", +- "self_type" : "type-551", ++ "referenced_type" : "type-548", ++ "self_type" : "type-547", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -28897,8 +30309,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo", + "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo", +- "referenced_type" : "type-548", +- "self_type" : "type-1021", ++ "referenced_type" : "type-546", ++ "self_type" : "type-1018", + "size" : 64, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28907,8 +30319,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::PidConstant", + "name" : "const android::hidl::manager::V1_0::IServiceManager::PidConstant", +- "referenced_type" : "type-547", +- "self_type" : "type-556", ++ "referenced_type" : "type-545", ++ "self_type" : "type-554", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -28917,8 +30329,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::Transport", + "name" : "const android::hidl::manager::V1_0::IServiceManager::Transport", +- "referenced_type" : "type-546", +- "self_type" : "type-554", ++ "referenced_type" : "type-544", ++ "self_type" : "type-552", + "size" : 1, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -28927,8 +30339,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification", + "name" : "const android::hidl::manager::V1_0::IServiceNotification", +- "referenced_type" : "type-541", +- "self_type" : "type-540", ++ "referenced_type" : "type-539", ++ "self_type" : "type-538", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, +@@ -28937,8 +30349,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_1::BpHwServiceManager", + "name" : "const android::hidl::manager::V1_1::BpHwServiceManager", +- "referenced_type" : "type-881", +- "self_type" : "type-885", ++ "referenced_type" : "type-878", ++ "self_type" : "type-882", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, +@@ -28947,8 +30359,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_1::IServiceManager", + "name" : "const android::hidl::manager::V1_1::IServiceManager", +- "referenced_type" : "type-562", +- "self_type" : "type-561", ++ "referenced_type" : "type-560", ++ "self_type" : "type-559", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, +@@ -28957,8 +30369,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_2::BpHwClientCallback", + "name" : "const android::hidl::manager::V1_2::BpHwClientCallback", +- "referenced_type" : "type-890", +- "self_type" : "type-894", ++ "referenced_type" : "type-887", ++ "self_type" : "type-891", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, +@@ -28967,8 +30379,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_2::BpHwServiceManager", + "name" : "const android::hidl::manager::V1_2::BpHwServiceManager", +- "referenced_type" : "type-774", +- "self_type" : "type-898", ++ "referenced_type" : "type-770", ++ "self_type" : "type-894", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, +@@ -28977,8 +30389,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_2::IClientCallback", + "name" : "const android::hidl::manager::V1_2::IClientCallback", +- "referenced_type" : "type-544", +- "self_type" : "type-543", ++ "referenced_type" : "type-542", ++ "self_type" : "type-541", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, +@@ -28987,8 +30399,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager", + "name" : "const android::hidl::manager::V1_2::IServiceManager", +- "referenced_type" : "type-565", +- "self_type" : "type-564", ++ "referenced_type" : "type-563", ++ "self_type" : "type-562", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, +@@ -28997,8 +30409,8 @@ + "is_const" : true, + "linker_set_key" : "const android::key_value_pair_t >", + "name" : "const android::key_value_pair_t >", +- "referenced_type" : "type-3807", +- "self_type" : "type-3806", ++ "referenced_type" : "type-3800", ++ "self_type" : "type-3799", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -29007,8 +30419,8 @@ + "is_const" : true, + "linker_set_key" : "const android::key_value_pair_t", + "name" : "const android::key_value_pair_t", +- "referenced_type" : "type-2384", +- "self_type" : "type-2383", ++ "referenced_type" : "type-2379", ++ "self_type" : "type-2378", + "size" : 16, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -29017,8 +30429,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-499", +- "self_type" : "type-3830", ++ "referenced_type" : "type-497", ++ "self_type" : "type-3823", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29027,8 +30439,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-472", +- "self_type" : "type-3640", ++ "referenced_type" : "type-470", ++ "self_type" : "type-3633", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29037,8 +30449,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-2470", +- "self_type" : "type-2498", ++ "referenced_type" : "type-2465", ++ "self_type" : "type-2493", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -29047,8 +30459,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-157", +- "self_type" : "type-162", ++ "referenced_type" : "type-156", ++ "self_type" : "type-161", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29056,16 +30468,16 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-2357", +- "self_type" : "type-2356", ++ "referenced_type" : "type-2352", ++ "self_type" : "type-2351", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-3468", +- "self_type" : "type-3467", ++ "referenced_type" : "type-3461", ++ "self_type" : "type-3460", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -29073,8 +30485,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-962", +- "self_type" : "type-2405", ++ "referenced_type" : "type-959", ++ "self_type" : "type-2400", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -29082,32 +30494,32 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-2525", +- "self_type" : "type-2524", ++ "referenced_type" : "type-2518", ++ "self_type" : "type-2517", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-2539", +- "self_type" : "type-2538", ++ "referenced_type" : "type-2534", ++ "self_type" : "type-2533", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-3584", +- "self_type" : "type-3583", ++ "referenced_type" : "type-3577", ++ "self_type" : "type-3576", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-3593", +- "self_type" : "type-3592", ++ "referenced_type" : "type-3586", ++ "self_type" : "type-3585", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -29115,8 +30527,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-71", +- "self_type" : "type-70", ++ "referenced_type" : "type-70", ++ "self_type" : "type-69", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29125,8 +30537,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-968", +- "self_type" : "type-2547", ++ "referenced_type" : "type-965", ++ "self_type" : "type-2542", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29135,8 +30547,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-766", +- "self_type" : "type-765", ++ "referenced_type" : "type-763", ++ "self_type" : "type-762", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29145,8 +30557,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-491", +- "self_type" : "type-496", ++ "referenced_type" : "type-489", ++ "self_type" : "type-494", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29155,8 +30567,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-602", +- "self_type" : "type-606", ++ "referenced_type" : "type-600", ++ "self_type" : "type-604", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29165,8 +30577,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-789", +- "self_type" : "type-794", ++ "referenced_type" : "type-786", ++ "self_type" : "type-790", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29175,8 +30587,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-951", +- "self_type" : "type-950", ++ "referenced_type" : "type-948", ++ "self_type" : "type-947", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -29185,8 +30597,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-142", +- "self_type" : "type-141", ++ "referenced_type" : "type-141", ++ "self_type" : "type-140", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29195,8 +30607,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-356", +- "self_type" : "type-459", ++ "referenced_type" : "type-355", ++ "self_type" : "type-456", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -29205,8 +30617,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-575", +- "self_type" : "type-578", ++ "referenced_type" : "type-573", ++ "self_type" : "type-576", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29215,8 +30627,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-590", +- "self_type" : "type-593", ++ "referenced_type" : "type-588", ++ "self_type" : "type-591", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29225,8 +30637,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-580", +- "self_type" : "type-583", ++ "referenced_type" : "type-578", ++ "self_type" : "type-581", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29235,8 +30647,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-595", +- "self_type" : "type-600", ++ "referenced_type" : "type-593", ++ "self_type" : "type-598", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29245,8 +30657,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-585", +- "self_type" : "type-588", ++ "referenced_type" : "type-583", ++ "self_type" : "type-586", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29255,8 +30667,8 @@ + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-383", +- "self_type" : "type-469", ++ "referenced_type" : "type-382", ++ "self_type" : "type-467", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -29265,8 +30677,8 @@ + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-944", +- "self_type" : "type-2359", ++ "referenced_type" : "type-941", ++ "self_type" : "type-2354", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -29274,8 +30686,8 @@ + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-1368", +- "self_type" : "type-1367", ++ "referenced_type" : "type-1365", ++ "self_type" : "type-1364", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -29283,8 +30695,8 @@ + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-2382", +- "self_type" : "type-3752", ++ "referenced_type" : "type-2377", ++ "self_type" : "type-3745", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -29292,24 +30704,24 @@ + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-2569", +- "self_type" : "type-2568", ++ "referenced_type" : "type-2564", ++ "self_type" : "type-2563", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-366", +- "self_type" : "type-365", ++ "referenced_type" : "type-365", ++ "self_type" : "type-364", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-3913", +- "self_type" : "type-3912", ++ "referenced_type" : "type-3906", ++ "self_type" : "type-3905", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -29317,8 +30729,8 @@ + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-361", +- "self_type" : "type-464", ++ "referenced_type" : "type-360", ++ "self_type" : "type-462", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -29328,7 +30740,7 @@ + "linker_set_key" : "const android::wp", + "name" : "const android::wp", + "referenced_type" : "type-32", +- "self_type" : "type-64", ++ "self_type" : "type-63", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -29337,8 +30749,8 @@ + "is_const" : true, + "linker_set_key" : "const binder_buffer_object", + "name" : "const binder_buffer_object", +- "referenced_type" : "type-3786", +- "self_type" : "type-3785", ++ "referenced_type" : "type-3779", ++ "self_type" : "type-3778", + "size" : 40, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -29347,8 +30759,8 @@ + "is_const" : true, + "linker_set_key" : "const bool", + "name" : "const bool", +- "referenced_type" : "type-44", +- "self_type" : "type-502", ++ "referenced_type" : "type-43", ++ "self_type" : "type-500", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -29357,8 +30769,8 @@ + "is_const" : true, + "linker_set_key" : "const char", + "name" : "const char", +- "referenced_type" : "type-48", +- "self_type" : "type-100", ++ "referenced_type" : "type-47", ++ "self_type" : "type-99", + "size" : 1, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -29367,8 +30779,8 @@ + "is_const" : true, + "linker_set_key" : "const char *const", + "name" : "const char *const", +- "referenced_type" : "type-99", +- "self_type" : "type-2478", ++ "referenced_type" : "type-98", ++ "self_type" : "type-2473", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -29377,8 +30789,8 @@ + "is_const" : true, + "linker_set_key" : "const char16_t", + "name" : "const char16_t", +- "referenced_type" : "type-345", +- "self_type" : "type-344", ++ "referenced_type" : "type-344", ++ "self_type" : "type-343", + "size" : 2, + "source_file" : "/system/core/libutils/include/utils/String16.h" + }, +@@ -29387,8 +30799,8 @@ + "is_const" : true, + "linker_set_key" : "const dirent", + "name" : "const dirent", +- "referenced_type" : "type-1291", +- "self_type" : "type-1290", ++ "referenced_type" : "type-1288", ++ "self_type" : "type-1287", + "size" : 280, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -29397,8 +30809,8 @@ + "is_const" : true, + "linker_set_key" : "const dirent", + "name" : "const dirent", +- "referenced_type" : "type-2208", +- "self_type" : "type-2207", ++ "referenced_type" : "type-2203", ++ "self_type" : "type-2202", + "size" : 280, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -29407,8 +30819,8 @@ + "is_const" : true, + "linker_set_key" : "const dirent", + "name" : "const dirent", +- "referenced_type" : "type-263", +- "self_type" : "type-262", ++ "referenced_type" : "type-262", ++ "self_type" : "type-261", + "size" : 280, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -29417,8 +30829,8 @@ + "is_const" : true, + "linker_set_key" : "const dirent", + "name" : "const dirent", +- "referenced_type" : "type-3211", +- "self_type" : "type-3210", ++ "referenced_type" : "type-3204", ++ "self_type" : "type-3203", + "size" : 280, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -29427,8 +30839,8 @@ + "is_const" : true, + "linker_set_key" : "const dirent", + "name" : "const dirent", +- "referenced_type" : "type-3326", +- "self_type" : "type-3325", ++ "referenced_type" : "type-3319", ++ "self_type" : "type-3318", + "size" : 280, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -29447,8 +30859,8 @@ + "is_const" : true, + "linker_set_key" : "const flat_binder_object", + "name" : "const flat_binder_object", +- "referenced_type" : "type-3771", +- "self_type" : "type-3770", ++ "referenced_type" : "type-3764", ++ "self_type" : "type-3763", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -29457,8 +30869,8 @@ + "is_const" : true, + "linker_set_key" : "const float", + "name" : "const float", +- "referenced_type" : "type-298", +- "self_type" : "type-665", ++ "referenced_type" : "type-297", ++ "self_type" : "type-663", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -29476,400 +30888,400 @@ + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1001", +- "self_type" : "type-1000", ++ "referenced_type" : "type-1100", ++ "self_type" : "type-1099", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1103", +- "self_type" : "type-1102", ++ "referenced_type" : "type-1160", ++ "self_type" : "type-1159", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1163", +- "self_type" : "type-1162", ++ "referenced_type" : "type-11", ++ "self_type" : "type-10", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-11", +- "self_type" : "type-10", ++ "referenced_type" : "type-1221", ++ "self_type" : "type-1220", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1224", +- "self_type" : "type-1223", ++ "referenced_type" : "type-128", ++ "self_type" : "type-127", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1298", +- "self_type" : "type-1297", ++ "referenced_type" : "type-1295", ++ "self_type" : "type-1294", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-129", +- "self_type" : "type-128", ++ "referenced_type" : "type-1348", ++ "self_type" : "type-1347", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1351", +- "self_type" : "type-1350", ++ "referenced_type" : "type-1454", ++ "self_type" : "type-1453", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1458", +- "self_type" : "type-1457", ++ "referenced_type" : "type-1523", ++ "self_type" : "type-1522", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1528", +- "self_type" : "type-1527", ++ "referenced_type" : "type-1690", ++ "self_type" : "type-1689", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1694", +- "self_type" : "type-1693", ++ "referenced_type" : "type-1728", ++ "self_type" : "type-1727", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1733", +- "self_type" : "type-1732", ++ "referenced_type" : "type-1793", ++ "self_type" : "type-1792", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1798", +- "self_type" : "type-1797", ++ "referenced_type" : "type-1819", ++ "self_type" : "type-1818", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1824", +- "self_type" : "type-1823", ++ "referenced_type" : "type-1862", ++ "self_type" : "type-1861", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1867", +- "self_type" : "type-1866", ++ "referenced_type" : "type-1934", ++ "self_type" : "type-1933", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1939", +- "self_type" : "type-1938", ++ "referenced_type" : "type-2020", ++ "self_type" : "type-2019", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2025", +- "self_type" : "type-2024", ++ "referenced_type" : "type-2078", ++ "self_type" : "type-2077", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2083", +- "self_type" : "type-2082", ++ "referenced_type" : "type-2137", ++ "self_type" : "type-2136", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2142", +- "self_type" : "type-2141", ++ "referenced_type" : "type-2210", ++ "self_type" : "type-2209", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2215", +- "self_type" : "type-2214", ++ "referenced_type" : "type-2256", ++ "self_type" : "type-2255", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2261", +- "self_type" : "type-2260", ++ "referenced_type" : "type-2307", ++ "self_type" : "type-2306", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2312", +- "self_type" : "type-2311", ++ "referenced_type" : "type-2544", ++ "self_type" : "type-2543", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2549", +- "self_type" : "type-2548", ++ "referenced_type" : "type-2651", ++ "self_type" : "type-2650", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2657", +- "self_type" : "type-2656", ++ "referenced_type" : "type-2720", ++ "self_type" : "type-2719", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2727", +- "self_type" : "type-2726", ++ "referenced_type" : "type-2831", ++ "self_type" : "type-2830", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2838", +- "self_type" : "type-2837", ++ "referenced_type" : "type-2869", ++ "self_type" : "type-2868", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2876", +- "self_type" : "type-2875", ++ "referenced_type" : "type-2927", ++ "self_type" : "type-2926", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2934", +- "self_type" : "type-2933", ++ "referenced_type" : "type-2935", ++ "self_type" : "type-2934", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2942", +- "self_type" : "type-2941", ++ "referenced_type" : "type-3004", ++ "self_type" : "type-3003", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3011", +- "self_type" : "type-3010", ++ "referenced_type" : "type-3076", ++ "self_type" : "type-3075", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3083", +- "self_type" : "type-3082", ++ "referenced_type" : "type-3155", ++ "self_type" : "type-3154", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3162", +- "self_type" : "type-3161", ++ "referenced_type" : "type-3222", ++ "self_type" : "type-3221", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3229", +- "self_type" : "type-3228", ++ "referenced_type" : "type-3277", ++ "self_type" : "type-3276", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3284", +- "self_type" : "type-3283", ++ "referenced_type" : "type-327", ++ "self_type" : "type-326", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-328", +- "self_type" : "type-327", ++ "referenced_type" : "type-3327", ++ "self_type" : "type-3326", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3334", +- "self_type" : "type-3333", ++ "referenced_type" : "type-3338", ++ "self_type" : "type-3337", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3345", +- "self_type" : "type-3344", ++ "referenced_type" : "type-3384", ++ "self_type" : "type-3383", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3391", +- "self_type" : "type-3390", ++ "referenced_type" : "type-3428", ++ "self_type" : "type-3427", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3435", +- "self_type" : "type-3434", ++ "referenced_type" : "type-3888", ++ "self_type" : "type-3887", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3895", +- "self_type" : "type-3894", ++ "referenced_type" : "type-3997", ++ "self_type" : "type-3996", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-4005", +- "self_type" : "type-4004", ++ "referenced_type" : "type-4070", ++ "self_type" : "type-4069", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-4078", +- "self_type" : "type-4077", ++ "referenced_type" : "type-514", ++ "self_type" : "type-513", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-516", +- "self_type" : "type-515", ++ "referenced_type" : "type-614", ++ "self_type" : "type-613", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-617", +- "self_type" : "type-616", ++ "referenced_type" : "type-709", ++ "self_type" : "type-708", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-711", +- "self_type" : "type-710", ++ "referenced_type" : "type-747", ++ "self_type" : "type-746", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-750", +- "self_type" : "type-749", ++ "referenced_type" : "type-822", ++ "self_type" : "type-821", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-825", +- "self_type" : "type-824", ++ "referenced_type" : "type-84", ++ "self_type" : "type-83", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-855", +- "self_type" : "type-854", ++ "referenced_type" : "type-852", ++ "self_type" : "type-851", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-85", +- "self_type" : "type-84", ++ "referenced_type" : "type-915", ++ "self_type" : "type-914", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-918", +- "self_type" : "type-917", ++ "referenced_type" : "type-998", ++ "self_type" : "type-997", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -29877,8 +31289,8 @@ + "is_const" : true, + "linker_set_key" : "const log_msg", + "name" : "const log_msg", +- "referenced_type" : "type-236", +- "self_type" : "type-239", ++ "referenced_type" : "type-235", ++ "self_type" : "type-238", + "size" : 5124, + "source_file" : "/system/core/liblog/include/log/log_read.h" + }, +@@ -29888,7 +31300,7 @@ + "linker_set_key" : "const long long", + "name" : "const long long", + "referenced_type" : "type-447", +- "self_type" : "type-653", ++ "self_type" : "type-651", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -29908,7 +31320,7 @@ + "linker_set_key" : "const short", + "name" : "const short", + "referenced_type" : "type-2", +- "self_type" : "type-609", ++ "self_type" : "type-607", + "size" : 2, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -29927,8 +31339,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1035", +- "self_type" : "type-1034", ++ "referenced_type" : "type-1032", ++ "self_type" : "type-1031", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29937,8 +31349,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1112", +- "self_type" : "type-1111", ++ "referenced_type" : "type-1107", ++ "self_type" : "type-1106", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29947,8 +31359,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1173", +- "self_type" : "type-1172", ++ "referenced_type" : "type-1170", ++ "self_type" : "type-1169", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29957,8 +31369,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1231", +- "self_type" : "type-1230", ++ "referenced_type" : "type-1228", ++ "self_type" : "type-1227", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29967,8 +31379,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1305", +- "self_type" : "type-1304", ++ "referenced_type" : "type-1302", ++ "self_type" : "type-1301", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29977,8 +31389,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1358", +- "self_type" : "type-1357", ++ "referenced_type" : "type-1355", ++ "self_type" : "type-1354", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29987,8 +31399,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1465", +- "self_type" : "type-1464", ++ "referenced_type" : "type-1461", ++ "self_type" : "type-1460", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29997,8 +31409,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1539", +- "self_type" : "type-1538", ++ "referenced_type" : "type-1535", ++ "self_type" : "type-1534", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30007,8 +31419,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1699", +- "self_type" : "type-1698", ++ "referenced_type" : "type-1695", ++ "self_type" : "type-1694", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30017,8 +31429,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1738", +- "self_type" : "type-1737", ++ "referenced_type" : "type-1733", ++ "self_type" : "type-1732", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30027,8 +31439,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1812", +- "self_type" : "type-1811", ++ "referenced_type" : "type-1807", ++ "self_type" : "type-1806", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30037,8 +31449,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1871", +- "self_type" : "type-1870", ++ "referenced_type" : "type-1866", ++ "self_type" : "type-1865", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30047,8 +31459,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1961", +- "self_type" : "type-1960", ++ "referenced_type" : "type-1956", ++ "self_type" : "type-1955", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30057,8 +31469,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2034", +- "self_type" : "type-2033", ++ "referenced_type" : "type-2027", ++ "self_type" : "type-2026", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30067,8 +31479,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2093", +- "self_type" : "type-2092", ++ "referenced_type" : "type-2088", ++ "self_type" : "type-2087", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30077,8 +31489,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2149", +- "self_type" : "type-2148", ++ "referenced_type" : "type-2144", ++ "self_type" : "type-2143", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30087,8 +31499,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2222", +- "self_type" : "type-2221", ++ "referenced_type" : "type-2217", ++ "self_type" : "type-2216", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30097,8 +31509,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2273", +- "self_type" : "type-2272", ++ "referenced_type" : "type-2268", ++ "self_type" : "type-2267", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30107,8 +31519,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2315", +- "self_type" : "type-2314", ++ "referenced_type" : "type-2310", ++ "self_type" : "type-2309", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30127,8 +31539,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2560", +- "self_type" : "type-2559", ++ "referenced_type" : "type-2555", ++ "self_type" : "type-2554", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30137,8 +31549,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2664", +- "self_type" : "type-2663", ++ "referenced_type" : "type-2658", ++ "self_type" : "type-2657", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30147,8 +31559,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2737", +- "self_type" : "type-2736", ++ "referenced_type" : "type-2731", ++ "self_type" : "type-2730", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30157,8 +31569,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2806", +- "self_type" : "type-2805", ++ "referenced_type" : "type-2800", ++ "self_type" : "type-2799", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30167,8 +31579,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2842", +- "self_type" : "type-2841", ++ "referenced_type" : "type-2835", ++ "self_type" : "type-2834", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30177,8 +31589,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2881", +- "self_type" : "type-2880", ++ "referenced_type" : "type-2874", ++ "self_type" : "type-2873", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30187,8 +31599,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2958", +- "self_type" : "type-2957", ++ "referenced_type" : "type-2950", ++ "self_type" : "type-2949", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30197,8 +31609,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3015", +- "self_type" : "type-3014", ++ "referenced_type" : "type-3008", ++ "self_type" : "type-3007", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30207,8 +31619,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3102", +- "self_type" : "type-3101", ++ "referenced_type" : "type-3095", ++ "self_type" : "type-3094", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30217,8 +31629,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3169", +- "self_type" : "type-3168", ++ "referenced_type" : "type-3162", ++ "self_type" : "type-3161", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30227,8 +31639,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3236", +- "self_type" : "type-3235", ++ "referenced_type" : "type-3229", ++ "self_type" : "type-3228", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30237,8 +31649,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3291", +- "self_type" : "type-3290", ++ "referenced_type" : "type-3284", ++ "self_type" : "type-3283", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30247,8 +31659,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3352", +- "self_type" : "type-3351", ++ "referenced_type" : "type-3345", ++ "self_type" : "type-3344", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30257,8 +31669,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3401", +- "self_type" : "type-3400", ++ "referenced_type" : "type-3394", ++ "self_type" : "type-3393", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30267,8 +31679,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-341", +- "self_type" : "type-340", ++ "referenced_type" : "type-340", ++ "self_type" : "type-339", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30277,8 +31689,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3438", +- "self_type" : "type-3437", ++ "referenced_type" : "type-3431", ++ "self_type" : "type-3430", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30287,8 +31699,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3902", +- "self_type" : "type-3901", ++ "referenced_type" : "type-3895", ++ "self_type" : "type-3894", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30297,8 +31709,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-4013", +- "self_type" : "type-4012", ++ "referenced_type" : "type-4005", ++ "self_type" : "type-4004", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30307,8 +31719,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-528", +- "self_type" : "type-527", ++ "referenced_type" : "type-526", ++ "self_type" : "type-525", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30317,8 +31729,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-634", +- "self_type" : "type-633", ++ "referenced_type" : "type-632", ++ "self_type" : "type-631", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30327,8 +31739,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-716", +- "self_type" : "type-715", ++ "referenced_type" : "type-714", ++ "self_type" : "type-713", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30337,8 +31749,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-755", +- "self_type" : "type-754", ++ "referenced_type" : "type-752", ++ "self_type" : "type-751", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30347,8 +31759,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-842", +- "self_type" : "type-841", ++ "referenced_type" : "type-839", ++ "self_type" : "type-838", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30357,8 +31769,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-90", +- "self_type" : "type-89", ++ "referenced_type" : "type-89", ++ "self_type" : "type-88", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30367,8 +31779,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-922", +- "self_type" : "type-921", ++ "referenced_type" : "type-919", ++ "self_type" : "type-918", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30377,8 +31789,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1069", +- "self_type" : "type-1068", ++ "referenced_type" : "type-1066", ++ "self_type" : "type-1065", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30387,8 +31799,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1125", +- "self_type" : "type-1124", ++ "referenced_type" : "type-1122", ++ "self_type" : "type-1121", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30397,8 +31809,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1186", +- "self_type" : "type-1185", ++ "referenced_type" : "type-1183", ++ "self_type" : "type-1182", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30407,8 +31819,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1249", +- "self_type" : "type-1248", ++ "referenced_type" : "type-1246", ++ "self_type" : "type-1245", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30417,8 +31829,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1324", +- "self_type" : "type-1323", ++ "referenced_type" : "type-1321", ++ "self_type" : "type-1320", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30427,8 +31839,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1486", +- "self_type" : "type-1485", ++ "referenced_type" : "type-1482", ++ "self_type" : "type-1481", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30437,8 +31849,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1714", +- "self_type" : "type-1713", ++ "referenced_type" : "type-1709", ++ "self_type" : "type-1708", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30447,8 +31859,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1829", +- "self_type" : "type-1828", ++ "referenced_type" : "type-1824", ++ "self_type" : "type-1823", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30457,8 +31869,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1881", +- "self_type" : "type-1880", ++ "referenced_type" : "type-1876", ++ "self_type" : "type-1875", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30467,8 +31879,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1993", +- "self_type" : "type-1992", ++ "referenced_type" : "type-1988", ++ "self_type" : "type-1987", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30477,8 +31889,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2047", +- "self_type" : "type-2046", ++ "referenced_type" : "type-2042", ++ "self_type" : "type-2041", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30487,8 +31899,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2106", +- "self_type" : "type-2105", ++ "referenced_type" : "type-2101", ++ "self_type" : "type-2100", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30497,8 +31909,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2168", +- "self_type" : "type-2167", ++ "referenced_type" : "type-2163", ++ "self_type" : "type-2162", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30507,8 +31919,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2241", +- "self_type" : "type-2240", ++ "referenced_type" : "type-2236", ++ "self_type" : "type-2235", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30517,8 +31929,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2295", +- "self_type" : "type-2294", ++ "referenced_type" : "type-2290", ++ "self_type" : "type-2289", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30527,8 +31939,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2685", +- "self_type" : "type-2684", ++ "referenced_type" : "type-2679", ++ "self_type" : "type-2678", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30537,8 +31949,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2859", +- "self_type" : "type-2858", ++ "referenced_type" : "type-2852", ++ "self_type" : "type-2851", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30547,8 +31959,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2972", +- "self_type" : "type-2971", ++ "referenced_type" : "type-2965", ++ "self_type" : "type-2964", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30557,8 +31969,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3025", +- "self_type" : "type-3024", ++ "referenced_type" : "type-3017", ++ "self_type" : "type-3016", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30567,8 +31979,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3129", +- "self_type" : "type-3128", ++ "referenced_type" : "type-3122", ++ "self_type" : "type-3121", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30577,8 +31989,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3182", +- "self_type" : "type-3181", ++ "referenced_type" : "type-3175", ++ "self_type" : "type-3174", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30587,8 +31999,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3249", +- "self_type" : "type-3248", ++ "referenced_type" : "type-3242", ++ "self_type" : "type-3241", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30597,8 +32009,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3306", +- "self_type" : "type-3305", ++ "referenced_type" : "type-3299", ++ "self_type" : "type-3298", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30607,8 +32019,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3374", +- "self_type" : "type-3373", ++ "referenced_type" : "type-3367", ++ "self_type" : "type-3366", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30617,8 +32029,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3424", +- "self_type" : "type-3423", ++ "referenced_type" : "type-3417", ++ "self_type" : "type-3416", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30627,8 +32039,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-4035", +- "self_type" : "type-4034", ++ "referenced_type" : "type-4027", ++ "self_type" : "type-4026", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30637,8 +32049,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-560", +- "self_type" : "type-559", ++ "referenced_type" : "type-558", ++ "self_type" : "type-557", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30647,8 +32059,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-57", +- "self_type" : "type-56", ++ "referenced_type" : "type-56", ++ "self_type" : "type-55", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30657,8 +32069,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-731", +- "self_type" : "type-730", ++ "referenced_type" : "type-728", ++ "self_type" : "type-727", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30667,8 +32079,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-860", +- "self_type" : "type-859", ++ "referenced_type" : "type-857", ++ "self_type" : "type-856", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30677,8 +32089,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-932", +- "self_type" : "type-931", ++ "referenced_type" : "type-929", ++ "self_type" : "type-928", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30687,8 +32099,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1067", +- "self_type" : "type-1066", ++ "referenced_type" : "type-1064", ++ "self_type" : "type-1063", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30697,8 +32109,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1123", +- "self_type" : "type-1122", ++ "referenced_type" : "type-1120", ++ "self_type" : "type-1119", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30707,8 +32119,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1184", +- "self_type" : "type-1183", ++ "referenced_type" : "type-1181", ++ "self_type" : "type-1180", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30717,8 +32129,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1247", +- "self_type" : "type-1246", ++ "referenced_type" : "type-1244", ++ "self_type" : "type-1243", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30727,8 +32139,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1322", +- "self_type" : "type-1321", ++ "referenced_type" : "type-1319", ++ "self_type" : "type-1318", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30737,8 +32149,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1484", +- "self_type" : "type-1483", ++ "referenced_type" : "type-1480", ++ "self_type" : "type-1479", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30747,8 +32159,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1712", +- "self_type" : "type-1711", ++ "referenced_type" : "type-1707", ++ "self_type" : "type-1706", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30757,8 +32169,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1827", +- "self_type" : "type-1826", ++ "referenced_type" : "type-1822", ++ "self_type" : "type-1821", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30767,8 +32179,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1879", +- "self_type" : "type-1878", ++ "referenced_type" : "type-1873", ++ "self_type" : "type-1872", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30777,8 +32189,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1991", +- "self_type" : "type-1990", ++ "referenced_type" : "type-1986", ++ "self_type" : "type-1985", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30787,8 +32199,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2045", +- "self_type" : "type-2044", ++ "referenced_type" : "type-2040", ++ "self_type" : "type-2039", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30797,8 +32209,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2104", +- "self_type" : "type-2103", ++ "referenced_type" : "type-2099", ++ "self_type" : "type-2098", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30807,8 +32219,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2166", +- "self_type" : "type-2165", ++ "referenced_type" : "type-2161", ++ "self_type" : "type-2160", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30817,8 +32229,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2239", +- "self_type" : "type-2238", ++ "referenced_type" : "type-2234", ++ "self_type" : "type-2233", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30827,8 +32239,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2293", +- "self_type" : "type-2292", ++ "referenced_type" : "type-2288", ++ "self_type" : "type-2287", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30837,8 +32249,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2683", +- "self_type" : "type-2682", ++ "referenced_type" : "type-2677", ++ "self_type" : "type-2676", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30847,8 +32259,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2857", +- "self_type" : "type-2856", ++ "referenced_type" : "type-2849", ++ "self_type" : "type-2848", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30857,8 +32269,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2970", +- "self_type" : "type-2969", ++ "referenced_type" : "type-2963", ++ "self_type" : "type-2962", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30867,8 +32279,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3022", +- "self_type" : "type-3021", ++ "referenced_type" : "type-3015", ++ "self_type" : "type-3014", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30877,8 +32289,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3127", +- "self_type" : "type-3126", ++ "referenced_type" : "type-3120", ++ "self_type" : "type-3119", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30887,8 +32299,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3180", +- "self_type" : "type-3179", ++ "referenced_type" : "type-3173", ++ "self_type" : "type-3172", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30897,8 +32309,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3247", +- "self_type" : "type-3246", ++ "referenced_type" : "type-3240", ++ "self_type" : "type-3239", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30907,8 +32319,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3304", +- "self_type" : "type-3303", ++ "referenced_type" : "type-3297", ++ "self_type" : "type-3296", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30917,8 +32329,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3372", +- "self_type" : "type-3371", ++ "referenced_type" : "type-3365", ++ "self_type" : "type-3364", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30927,8 +32339,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3422", +- "self_type" : "type-3421", ++ "referenced_type" : "type-3415", ++ "self_type" : "type-3414", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30937,8 +32349,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-4033", +- "self_type" : "type-4032", ++ "referenced_type" : "type-4025", ++ "self_type" : "type-4024", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30947,8 +32359,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-558", +- "self_type" : "type-557", ++ "referenced_type" : "type-54", ++ "self_type" : "type-53", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30957,8 +32369,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-55", +- "self_type" : "type-54", ++ "referenced_type" : "type-556", ++ "self_type" : "type-555", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30967,8 +32379,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-729", +- "self_type" : "type-728", ++ "referenced_type" : "type-726", ++ "self_type" : "type-725", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30977,8 +32389,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-858", +- "self_type" : "type-857", ++ "referenced_type" : "type-855", ++ "self_type" : "type-854", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30987,8 +32399,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-930", +- "self_type" : "type-929", ++ "referenced_type" : "type-926", ++ "self_type" : "type-925", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30997,8 +32409,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1047", +- "self_type" : "type-1046", ++ "referenced_type" : "type-1044", ++ "self_type" : "type-1043", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31007,8 +32419,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1110", +- "self_type" : "type-1109", ++ "referenced_type" : "type-1109", ++ "self_type" : "type-1108", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31017,8 +32429,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1114", +- "self_type" : "type-1113", ++ "referenced_type" : "type-1111", ++ "self_type" : "type-1110", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31027,8 +32439,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-114", +- "self_type" : "type-113", ++ "referenced_type" : "type-113", ++ "self_type" : "type-112", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31037,8 +32449,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1175", +- "self_type" : "type-1174", ++ "referenced_type" : "type-1172", ++ "self_type" : "type-1171", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31047,8 +32459,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1234", +- "self_type" : "type-1233", ++ "referenced_type" : "type-1231", ++ "self_type" : "type-1230", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31057,8 +32469,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1313", +- "self_type" : "type-1312", ++ "referenced_type" : "type-1310", ++ "self_type" : "type-1309", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31067,8 +32479,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1399", +- "self_type" : "type-1398", ++ "referenced_type" : "type-1395", ++ "self_type" : "type-1394", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31077,8 +32489,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1468", +- "self_type" : "type-1467", ++ "referenced_type" : "type-1464", ++ "self_type" : "type-1463", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -31087,8 +32499,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1547", +- "self_type" : "type-1546", ++ "referenced_type" : "type-1543", ++ "self_type" : "type-1542", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31097,8 +32509,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1775", +- "self_type" : "type-1774", ++ "referenced_type" : "type-1770", ++ "self_type" : "type-1769", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31107,8 +32519,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1816", +- "self_type" : "type-1815", ++ "referenced_type" : "type-1811", ++ "self_type" : "type-1810", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -31117,8 +32529,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1973", +- "self_type" : "type-1972", ++ "referenced_type" : "type-1968", ++ "self_type" : "type-1967", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31127,8 +32539,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2032", +- "self_type" : "type-2031", ++ "referenced_type" : "type-2029", ++ "self_type" : "type-2028", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31137,8 +32549,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2036", +- "self_type" : "type-2035", ++ "referenced_type" : "type-2031", ++ "self_type" : "type-2030", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31147,8 +32559,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-207", +- "self_type" : "type-206", ++ "referenced_type" : "type-206", ++ "self_type" : "type-205", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31157,8 +32569,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2095", +- "self_type" : "type-2094", ++ "referenced_type" : "type-2090", ++ "self_type" : "type-2089", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31167,8 +32579,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2152", +- "self_type" : "type-2151", ++ "referenced_type" : "type-2147", ++ "self_type" : "type-2146", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31177,8 +32589,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2230", +- "self_type" : "type-2229", ++ "referenced_type" : "type-2225", ++ "self_type" : "type-2224", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31187,8 +32599,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2276", +- "self_type" : "type-2275", ++ "referenced_type" : "type-2271", ++ "self_type" : "type-2270", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -31197,8 +32609,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2600", +- "self_type" : "type-2599", ++ "referenced_type" : "type-2594", ++ "self_type" : "type-2593", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31207,8 +32619,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2667", +- "self_type" : "type-2666", ++ "referenced_type" : "type-2661", ++ "self_type" : "type-2660", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -31217,8 +32629,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2745", +- "self_type" : "type-2744", ++ "referenced_type" : "type-2739", ++ "self_type" : "type-2738", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31227,8 +32639,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2815", +- "self_type" : "type-2814", ++ "referenced_type" : "type-2808", ++ "self_type" : "type-2807", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31237,8 +32649,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2879", +- "self_type" : "type-2878", ++ "referenced_type" : "type-2872", ++ "self_type" : "type-2871", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31247,8 +32659,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2962", +- "self_type" : "type-2961", ++ "referenced_type" : "type-2955", ++ "self_type" : "type-2954", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -31257,8 +32669,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3112", +- "self_type" : "type-3111", ++ "referenced_type" : "type-3105", ++ "self_type" : "type-3104", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31267,8 +32679,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3152", +- "self_type" : "type-3151", ++ "referenced_type" : "type-3145", ++ "self_type" : "type-3144", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31277,8 +32689,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3171", +- "self_type" : "type-3170", ++ "referenced_type" : "type-3164", ++ "self_type" : "type-3163", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31287,8 +32699,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3190", +- "self_type" : "type-3189", ++ "referenced_type" : "type-3183", ++ "self_type" : "type-3182", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31297,8 +32709,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3238", +- "self_type" : "type-3237", ++ "referenced_type" : "type-3231", ++ "self_type" : "type-3230", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31307,8 +32719,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3293", +- "self_type" : "type-3292", ++ "referenced_type" : "type-3286", ++ "self_type" : "type-3285", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31317,8 +32729,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3302", +- "self_type" : "type-3301", ++ "referenced_type" : "type-3295", ++ "self_type" : "type-3294", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31327,8 +32739,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3359", +- "self_type" : "type-3358", ++ "referenced_type" : "type-3352", ++ "self_type" : "type-3351", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31337,8 +32749,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3403", +- "self_type" : "type-3402", ++ "referenced_type" : "type-3396", ++ "self_type" : "type-3395", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -31347,8 +32759,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3943", +- "self_type" : "type-3942", ++ "referenced_type" : "type-3935", ++ "self_type" : "type-3934", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31357,8 +32769,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-4017", +- "self_type" : "type-4016", ++ "referenced_type" : "type-4009", ++ "self_type" : "type-4008", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -31367,8 +32779,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-410", +- "self_type" : "type-409", ++ "referenced_type" : "type-408", ++ "self_type" : "type-407", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31377,8 +32789,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-534", +- "self_type" : "type-533", ++ "referenced_type" : "type-532", ++ "self_type" : "type-531", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -31387,8 +32799,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-647", +- "self_type" : "type-646", ++ "referenced_type" : "type-645", ++ "self_type" : "type-644", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31397,8 +32809,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-800", +- "self_type" : "type-799", ++ "referenced_type" : "type-797", ++ "self_type" : "type-796", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31407,8 +32819,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-847", +- "self_type" : "type-846", ++ "referenced_type" : "type-844", ++ "self_type" : "type-843", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -31417,8 +32829,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-1542", +- "self_type" : "type-1541", ++ "referenced_type" : "type-1538", ++ "self_type" : "type-1537", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31427,8 +32839,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-2740", +- "self_type" : "type-2739", ++ "referenced_type" : "type-2734", ++ "self_type" : "type-2733", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31437,8 +32849,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-2810", +- "self_type" : "type-2809", ++ "referenced_type" : "type-2804", ++ "self_type" : "type-2803", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31447,8 +32859,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-642", +- "self_type" : "type-641", ++ "referenced_type" : "type-640", ++ "self_type" : "type-639", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31457,8 +32869,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-1395", +- "self_type" : "type-1394", ++ "referenced_type" : "type-1391", ++ "self_type" : "type-1390", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31467,8 +32879,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-2596", +- "self_type" : "type-2595", ++ "referenced_type" : "type-2590", ++ "self_type" : "type-2589", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31477,8 +32889,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-3939", +- "self_type" : "type-3938", ++ "referenced_type" : "type-3931", ++ "self_type" : "type-3930", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31487,8 +32899,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-405", +- "self_type" : "type-404", ++ "referenced_type" : "type-403", ++ "self_type" : "type-402", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31497,8 +32909,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-1338", +- "self_type" : "type-1337", ++ "referenced_type" : "type-1335", ++ "self_type" : "type-1334", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -31507,8 +32919,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-1378", +- "self_type" : "type-1377", ++ "referenced_type" : "type-1375", ++ "self_type" : "type-1374", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -31517,8 +32929,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-2306", +- "self_type" : "type-2305", ++ "referenced_type" : "type-2301", ++ "self_type" : "type-2300", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -31527,8 +32939,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-2579", +- "self_type" : "type-2578", ++ "referenced_type" : "type-2574", ++ "self_type" : "type-2573", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -31537,8 +32949,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-307", +- "self_type" : "type-306", ++ "referenced_type" : "type-306", ++ "self_type" : "type-305", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -31547,8 +32959,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-3643", +- "self_type" : "type-3642", ++ "referenced_type" : "type-3636", ++ "self_type" : "type-3635", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -31557,8 +32969,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-3762", +- "self_type" : "type-3761", ++ "referenced_type" : "type-3755", ++ "self_type" : "type-3754", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -31567,8 +32979,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-377", +- "self_type" : "type-376", ++ "referenced_type" : "type-376", ++ "self_type" : "type-375", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -31577,8 +32989,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-3923", +- "self_type" : "type-3922", ++ "referenced_type" : "type-3916", ++ "self_type" : "type-3915", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -31587,8 +32999,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1017", +- "self_type" : "type-1016", ++ "referenced_type" : "type-1014", ++ "self_type" : "type-1013", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31597,8 +33009,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1108", +- "self_type" : "type-1107", ++ "referenced_type" : "type-1105", ++ "self_type" : "type-1104", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31607,8 +33019,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1168", +- "self_type" : "type-1167", ++ "referenced_type" : "type-1165", ++ "self_type" : "type-1164", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31617,8 +33029,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1229", +- "self_type" : "type-1228", ++ "referenced_type" : "type-1226", ++ "self_type" : "type-1225", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31627,8 +33039,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1303", +- "self_type" : "type-1302", ++ "referenced_type" : "type-1300", ++ "self_type" : "type-1299", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31637,8 +33049,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1951", +- "self_type" : "type-1950", ++ "referenced_type" : "type-1946", ++ "self_type" : "type-1945", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31647,8 +33059,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-2030", +- "self_type" : "type-2029", ++ "referenced_type" : "type-2025", ++ "self_type" : "type-2024", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31657,8 +33069,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-2088", +- "self_type" : "type-2087", ++ "referenced_type" : "type-2083", ++ "self_type" : "type-2082", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31667,8 +33079,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-2147", +- "self_type" : "type-2146", ++ "referenced_type" : "type-2142", ++ "self_type" : "type-2141", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31677,8 +33089,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-2220", +- "self_type" : "type-2219", ++ "referenced_type" : "type-2215", ++ "self_type" : "type-2214", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31687,8 +33099,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-2266", +- "self_type" : "type-2265", ++ "referenced_type" : "type-2261", ++ "self_type" : "type-2260", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31697,8 +33109,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-3093", +- "self_type" : "type-3092", ++ "referenced_type" : "type-3086", ++ "self_type" : "type-3085", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31707,8 +33119,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-3167", +- "self_type" : "type-3166", ++ "referenced_type" : "type-3160", ++ "self_type" : "type-3159", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31717,8 +33129,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-3234", +- "self_type" : "type-3233", ++ "referenced_type" : "type-3227", ++ "self_type" : "type-3226", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31727,8 +33139,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-3289", +- "self_type" : "type-3288", ++ "referenced_type" : "type-3282", ++ "self_type" : "type-3281", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31737,8 +33149,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-3350", +- "self_type" : "type-3349", ++ "referenced_type" : "type-3343", ++ "self_type" : "type-3342", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31747,8 +33159,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-3396", +- "self_type" : "type-3395", ++ "referenced_type" : "type-3389", ++ "self_type" : "type-3388", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31757,8 +33169,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1006", +- "self_type" : "type-1005", ++ "referenced_type" : "type-1003", ++ "self_type" : "type-1002", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31767,8 +33179,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1106", +- "self_type" : "type-1105", ++ "referenced_type" : "type-1103", ++ "self_type" : "type-1102", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31777,8 +33189,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1166", +- "self_type" : "type-1165", ++ "referenced_type" : "type-1163", ++ "self_type" : "type-1162", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31787,8 +33199,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1227", +- "self_type" : "type-1226", ++ "referenced_type" : "type-1224", ++ "self_type" : "type-1223", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31797,8 +33209,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1301", +- "self_type" : "type-1300", ++ "referenced_type" : "type-1298", ++ "self_type" : "type-1297", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31807,8 +33219,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1944", +- "self_type" : "type-1943", ++ "referenced_type" : "type-1939", ++ "self_type" : "type-1938", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31817,8 +33229,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-2028", +- "self_type" : "type-2027", ++ "referenced_type" : "type-2023", ++ "self_type" : "type-2022", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31827,8 +33239,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-2086", +- "self_type" : "type-2085", ++ "referenced_type" : "type-2081", ++ "self_type" : "type-2080", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31837,8 +33249,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-2145", +- "self_type" : "type-2144", ++ "referenced_type" : "type-2140", ++ "self_type" : "type-2139", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31847,8 +33259,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-2218", +- "self_type" : "type-2217", ++ "referenced_type" : "type-2213", ++ "self_type" : "type-2212", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31857,8 +33269,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-2264", +- "self_type" : "type-2263", ++ "referenced_type" : "type-2259", ++ "self_type" : "type-2258", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31867,8 +33279,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-3087", +- "self_type" : "type-3086", ++ "referenced_type" : "type-3080", ++ "self_type" : "type-3079", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31877,8 +33289,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-3165", +- "self_type" : "type-3164", ++ "referenced_type" : "type-3158", ++ "self_type" : "type-3157", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31887,8 +33299,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-3232", +- "self_type" : "type-3231", ++ "referenced_type" : "type-3225", ++ "self_type" : "type-3224", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31897,8 +33309,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-3287", +- "self_type" : "type-3286", ++ "referenced_type" : "type-3280", ++ "self_type" : "type-3279", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31907,8 +33319,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-3348", +- "self_type" : "type-3347", ++ "referenced_type" : "type-3341", ++ "self_type" : "type-3340", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31917,8 +33329,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-3394", +- "self_type" : "type-3393", ++ "referenced_type" : "type-3387", ++ "self_type" : "type-3386", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31927,8 +33339,8 @@ + "is_const" : true, + "linker_set_key" : "const std::unique_ptr >", + "name" : "const std::unique_ptr >", +- "referenced_type" : "type-3768", +- "self_type" : "type-3767", ++ "referenced_type" : "type-3761", ++ "self_type" : "type-3760", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -31937,8 +33349,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-1805", +- "self_type" : "type-1804", ++ "referenced_type" : "type-1800", ++ "self_type" : "type-1799", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31947,8 +33359,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-2950", +- "self_type" : "type-2949", ++ "referenced_type" : "type-2943", ++ "self_type" : "type-2942", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31957,8 +33369,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-832", +- "self_type" : "type-831", ++ "referenced_type" : "type-829", ++ "self_type" : "type-828", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31967,8 +33379,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1081", +- "self_type" : "type-1080", ++ "referenced_type" : "type-1078", ++ "self_type" : "type-1077", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31977,8 +33389,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1133", +- "self_type" : "type-1132", ++ "referenced_type" : "type-1130", ++ "self_type" : "type-1129", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31987,8 +33399,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1152", +- "self_type" : "type-1151", ++ "referenced_type" : "type-1149", ++ "self_type" : "type-1148", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31997,8 +33409,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1171", +- "self_type" : "type-1170", ++ "referenced_type" : "type-1168", ++ "self_type" : "type-1167", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32007,8 +33419,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1194", +- "self_type" : "type-1193", ++ "referenced_type" : "type-1191", ++ "self_type" : "type-1190", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32017,8 +33429,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1261", +- "self_type" : "type-1260", ++ "referenced_type" : "type-1258", ++ "self_type" : "type-1257", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32027,8 +33439,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1327", +- "self_type" : "type-1326", ++ "referenced_type" : "type-1324", ++ "self_type" : "type-1323", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32037,8 +33449,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1385", +- "self_type" : "type-1384", ++ "referenced_type" : "type-1382", ++ "self_type" : "type-1381", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32047,8 +33459,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1493", +- "self_type" : "type-1492", ++ "referenced_type" : "type-1489", ++ "self_type" : "type-1488", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32057,8 +33469,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1557", +- "self_type" : "type-1556", ++ "referenced_type" : "type-1553", ++ "self_type" : "type-1552", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32067,8 +33479,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-156", +- "self_type" : "type-155", ++ "referenced_type" : "type-155", ++ "self_type" : "type-154", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32077,8 +33489,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1717", +- "self_type" : "type-1716", ++ "referenced_type" : "type-1712", ++ "self_type" : "type-1711", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32087,8 +33499,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1742", +- "self_type" : "type-1741", ++ "referenced_type" : "type-1737", ++ "self_type" : "type-1736", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32097,8 +33509,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1851", +- "self_type" : "type-1850", ++ "referenced_type" : "type-1846", ++ "self_type" : "type-1845", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32107,8 +33519,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1885", +- "self_type" : "type-1884", ++ "referenced_type" : "type-1879", ++ "self_type" : "type-1878", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32117,8 +33529,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1890", +- "self_type" : "type-1889", ++ "referenced_type" : "type-1885", ++ "self_type" : "type-1884", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32127,8 +33539,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2005", +- "self_type" : "type-2004", ++ "referenced_type" : "type-2000", ++ "self_type" : "type-1999", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32137,8 +33549,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2055", +- "self_type" : "type-2054", ++ "referenced_type" : "type-2050", ++ "self_type" : "type-2049", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32147,8 +33559,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2073", +- "self_type" : "type-2072", ++ "referenced_type" : "type-2068", ++ "self_type" : "type-2067", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32157,8 +33569,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2091", +- "self_type" : "type-2090", ++ "referenced_type" : "type-2086", ++ "self_type" : "type-2085", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32167,8 +33579,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2114", +- "self_type" : "type-2113", ++ "referenced_type" : "type-2109", ++ "self_type" : "type-2108", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32177,8 +33589,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-217", +- "self_type" : "type-216", ++ "referenced_type" : "type-216", ++ "self_type" : "type-215", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32187,8 +33599,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2180", +- "self_type" : "type-2179", ++ "referenced_type" : "type-2175", ++ "self_type" : "type-2174", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32197,8 +33609,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-220", +- "self_type" : "type-219", ++ "referenced_type" : "type-219", ++ "self_type" : "type-218", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32207,8 +33619,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2244", +- "self_type" : "type-2243", ++ "referenced_type" : "type-2239", ++ "self_type" : "type-2238", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32217,8 +33629,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2299", +- "self_type" : "type-2298", ++ "referenced_type" : "type-2294", ++ "self_type" : "type-2293", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32227,8 +33639,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2320", +- "self_type" : "type-2319", ++ "referenced_type" : "type-2314", ++ "self_type" : "type-2313", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32237,8 +33649,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2586", +- "self_type" : "type-2585", ++ "referenced_type" : "type-2581", ++ "self_type" : "type-2580", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32247,8 +33659,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2692", +- "self_type" : "type-2691", ++ "referenced_type" : "type-2686", ++ "self_type" : "type-2685", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32257,8 +33669,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2755", +- "self_type" : "type-2754", ++ "referenced_type" : "type-2749", ++ "self_type" : "type-2748", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32267,8 +33679,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2826", +- "self_type" : "type-2825", ++ "referenced_type" : "type-2820", ++ "self_type" : "type-2819", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32277,8 +33689,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2862", +- "self_type" : "type-2861", ++ "referenced_type" : "type-2855", ++ "self_type" : "type-2854", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32287,8 +33699,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2885", +- "self_type" : "type-2884", ++ "referenced_type" : "type-2878", ++ "self_type" : "type-2877", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32297,8 +33709,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2995", +- "self_type" : "type-2994", ++ "referenced_type" : "type-2987", ++ "self_type" : "type-2986", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32307,8 +33719,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3006", +- "self_type" : "type-3005", ++ "referenced_type" : "type-2999", ++ "self_type" : "type-2998", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32317,8 +33729,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3028", +- "self_type" : "type-3027", ++ "referenced_type" : "type-3021", ++ "self_type" : "type-3020", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32327,8 +33739,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3141", +- "self_type" : "type-3140", ++ "referenced_type" : "type-3134", ++ "self_type" : "type-3133", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32337,8 +33749,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3193", +- "self_type" : "type-3192", ++ "referenced_type" : "type-3186", ++ "self_type" : "type-3185", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32347,8 +33759,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3199", +- "self_type" : "type-3198", ++ "referenced_type" : "type-3192", ++ "self_type" : "type-3191", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32357,8 +33769,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3218", +- "self_type" : "type-3217", ++ "referenced_type" : "type-3211", ++ "self_type" : "type-3210", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32367,8 +33779,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3257", +- "self_type" : "type-3256", ++ "referenced_type" : "type-3250", ++ "self_type" : "type-3249", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32377,8 +33789,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3315", +- "self_type" : "type-3314", ++ "referenced_type" : "type-3308", ++ "self_type" : "type-3307", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32387,8 +33799,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3370", +- "self_type" : "type-3369", ++ "referenced_type" : "type-3363", ++ "self_type" : "type-3362", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32397,8 +33809,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3377", +- "self_type" : "type-3376", ++ "referenced_type" : "type-3370", ++ "self_type" : "type-3369", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32407,8 +33819,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3407", +- "self_type" : "type-3406", ++ "referenced_type" : "type-3403", ++ "self_type" : "type-3402", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32417,8 +33829,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3427", +- "self_type" : "type-3426", ++ "referenced_type" : "type-3420", ++ "self_type" : "type-3419", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32427,8 +33839,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3441", +- "self_type" : "type-3440", ++ "referenced_type" : "type-3434", ++ "self_type" : "type-3433", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32437,8 +33849,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-389", +- "self_type" : "type-388", ++ "referenced_type" : "type-388", ++ "self_type" : "type-387", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32447,8 +33859,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3929", +- "self_type" : "type-3928", ++ "referenced_type" : "type-3922", ++ "self_type" : "type-3921", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32457,8 +33869,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-4043", +- "self_type" : "type-4042", ++ "referenced_type" : "type-4035", ++ "self_type" : "type-4034", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32467,8 +33879,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-569", +- "self_type" : "type-568", ++ "referenced_type" : "type-567", ++ "self_type" : "type-566", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32477,8 +33889,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-60", +- "self_type" : "type-59", ++ "referenced_type" : "type-59", ++ "self_type" : "type-58", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32487,8 +33899,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-658", +- "self_type" : "type-657", ++ "referenced_type" : "type-656", ++ "self_type" : "type-655", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32497,8 +33909,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-734", +- "self_type" : "type-733", ++ "referenced_type" : "type-731", ++ "self_type" : "type-730", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32507,8 +33919,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-759", +- "self_type" : "type-758", ++ "referenced_type" : "type-756", ++ "self_type" : "type-755", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32517,8 +33929,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-902", +- "self_type" : "type-901", ++ "referenced_type" : "type-899", ++ "self_type" : "type-898", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32527,8 +33939,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-936", +- "self_type" : "type-935", ++ "referenced_type" : "type-932", ++ "self_type" : "type-931", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32537,8 +33949,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-941", +- "self_type" : "type-940", ++ "referenced_type" : "type-938", ++ "self_type" : "type-937", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32547,8 +33959,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-94", +- "self_type" : "type-93", ++ "referenced_type" : "type-93", ++ "self_type" : "type-92", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32557,8 +33969,8 @@ + "is_const" : true, + "linker_set_key" : "const unsigned char", + "name" : "const unsigned char", +- "referenced_type" : "type-199", +- "self_type" : "type-604", ++ "referenced_type" : "type-198", ++ "self_type" : "type-603", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -32567,8 +33979,8 @@ + "is_const" : true, + "linker_set_key" : "const unsigned char *const", + "name" : "const unsigned char *const", +- "referenced_type" : "type-1030", +- "self_type" : "type-3727", ++ "referenced_type" : "type-1027", ++ "self_type" : "type-3720", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -32578,7 +33990,7 @@ + "linker_set_key" : "const unsigned int", + "name" : "const unsigned int", + "referenced_type" : "type-1", +- "self_type" : "type-246", ++ "self_type" : "type-245", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -32587,8 +33999,8 @@ + "is_const" : true, + "linker_set_key" : "const unsigned int *const", + "name" : "const unsigned int *const", +- "referenced_type" : "type-3730", +- "self_type" : "type-3729", ++ "referenced_type" : "type-3723", ++ "self_type" : "type-3722", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -32598,7 +34010,7 @@ + "linker_set_key" : "const unsigned long long", + "name" : "const unsigned long long", + "referenced_type" : "type-21", +- "self_type" : "type-661", ++ "self_type" : "type-659", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -32607,8 +34019,8 @@ + "is_const" : true, + "linker_set_key" : "const unsigned short", + "name" : "const unsigned short", +- "referenced_type" : "type-132", +- "self_type" : "type-614", ++ "referenced_type" : "type-131", ++ "self_type" : "type-612", + "size" : 2, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -32616,8 +34028,8 @@ + "is_const" : true, + "linker_set_key" : "const void", + "name" : "const void", +- "referenced_type" : "type-106", +- "self_type" : "type-138", ++ "referenced_type" : "type-105", ++ "self_type" : "type-137", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -32625,8 +34037,8 @@ + "is_const" : true, + "linker_set_key" : "const void *const", + "name" : "const void *const", +- "referenced_type" : "type-139", +- "self_type" : "type-2386", ++ "referenced_type" : "type-138", ++ "self_type" : "type-2381", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -32635,8 +34047,8 @@ + "is_const" : true, + "linker_set_key" : "void *const", + "name" : "void *const", +- "referenced_type" : "type-245", +- "self_type" : "type-3669", ++ "referenced_type" : "type-244", ++ "self_type" : "type-3662", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -32645,8 +34057,8 @@ + "is_volatile" : true, + "linker_set_key" : "volatile bool", + "name" : "volatile bool", +- "referenced_type" : "type-44", +- "self_type" : "type-457", ++ "referenced_type" : "type-43", ++ "self_type" : "type-455", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/Thread.h" + }, +@@ -32656,7 +34068,7 @@ + "linker_set_key" : "volatile int", + "name" : "volatile int", + "referenced_type" : "type-19", +- "self_type" : "type-2337", ++ "self_type" : "type-2332", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + } +@@ -32677,20 +34089,20 @@ + "access" : "private", + "field_name" : "d_", + "field_offset" : 32, +- "referenced_type" : "type-2504" ++ "referenced_type" : "type-2499" + }, + { + "access" : "private", + "field_name" : "s_", + "field_offset" : 64, +- "referenced_type" : "type-2505" ++ "referenced_type" : "type-2500" + } + ], + "linker_set_key" : "Renamer", + "name" : "Renamer", + "record_kind" : "class", +- "referenced_type" : "type-2503", +- "self_type" : "type-2503", ++ "referenced_type" : "type-2498", ++ "self_type" : "type-2498", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/RefBase.h", + "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jE7Renamer", +@@ -32723,14 +34135,14 @@ + { + "access" : "private", + "field_name" : "mFrameLines", +- "referenced_type" : "type-252" ++ "referenced_type" : "type-251" + } + ], + "linker_set_key" : "android::CallStack", + "name" : "android::CallStack", + "record_kind" : "class", +- "referenced_type" : "type-256", +- "self_type" : "type-256", ++ "referenced_type" : "type-255", ++ "self_type" : "type-255", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/CallStack.h", + "unique_id" : "_ZTSN7android9CallStackE" +@@ -32739,8 +34151,8 @@ + "alignment" : 1, + "linker_set_key" : "android::CallStack::StackDeleter", + "name" : "android::CallStack::StackDeleter", +- "referenced_type" : "type-260", +- "self_type" : "type-260", ++ "referenced_type" : "type-259", ++ "self_type" : "type-259", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/CallStack.h", + "unique_id" : "_ZTSN7android9CallStack12StackDeleterE" +@@ -32749,8 +34161,8 @@ + "alignment" : 1, + "linker_set_key" : "android::CompileTimeAssert", + "name" : "android::CompileTimeAssert", +- "referenced_type" : "type-3804", +- "self_type" : "type-3804", ++ "referenced_type" : "type-3797", ++ "self_type" : "type-3797", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/Debug.h", + "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE" +@@ -32762,14 +34174,14 @@ + { + "access" : "private", + "field_name" : "mCond", +- "referenced_type" : "type-443" ++ "referenced_type" : "type-441" + } + ], + "linker_set_key" : "android::Condition", + "name" : "android::Condition", + "record_kind" : "class", +- "referenced_type" : "type-442", +- "self_type" : "type-442", ++ "referenced_type" : "type-440", ++ "self_type" : "type-440", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Condition.h", + "unique_id" : "_ZTSN7android9ConditionE" +@@ -32781,17 +34193,17 @@ + { + "access" : "private", + "field_name" : "mVector", +- "referenced_type" : "type-426" ++ "referenced_type" : "type-424" + } + ], + "linker_set_key" : "android::KeyedVector >", + "name" : "android::KeyedVector >", + "record_kind" : "class", +- "referenced_type" : "type-433", +- "self_type" : "type-433", ++ "referenced_type" : "type-431", ++ "self_type" : "type-431", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h", +- "template_args" : [ "type-342", "type-71" ], ++ "template_args" : [ "type-341", "type-70" ], + "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE" + }, + { +@@ -32801,17 +34213,17 @@ + { + "access" : "private", + "field_name" : "mVector", +- "referenced_type" : "type-2342" ++ "referenced_type" : "type-2337" + } + ], + "linker_set_key" : "android::KeyedVector", + "name" : "android::KeyedVector", + "record_kind" : "class", +- "referenced_type" : "type-2341", +- "self_type" : "type-2341", ++ "referenced_type" : "type-2336", ++ "self_type" : "type-2336", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h", +- "template_args" : [ "type-139", "type-2344" ], ++ "template_args" : [ "type-138", "type-2339" ], + "unique_id" : "_ZTSN7android11KeyedVectorIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { +@@ -32821,17 +34233,17 @@ + { + "access" : "private", + "field_name" : "mCount", +- "referenced_type" : "type-314" ++ "referenced_type" : "type-313" + } + ], + "linker_set_key" : "android::LightRefBase", + "name" : "android::LightRefBase", + "record_kind" : "class", +- "referenced_type" : "type-313", +- "self_type" : "type-313", ++ "referenced_type" : "type-312", ++ "self_type" : "type-312", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/LightRefBase.h", +- "template_args" : [ "type-315" ], ++ "template_args" : [ "type-314" ], + "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE" + }, + { +@@ -32841,17 +34253,17 @@ + { + "access" : "private", + "field_name" : "mCount", +- "referenced_type" : "type-181" ++ "referenced_type" : "type-180" + } + ], + "linker_set_key" : "android::LightRefBase", + "name" : "android::LightRefBase", + "record_kind" : "class", +- "referenced_type" : "type-180", +- "self_type" : "type-180", ++ "referenced_type" : "type-179", ++ "self_type" : "type-179", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/LightRefBase.h", +- "template_args" : [ "type-182" ], ++ "template_args" : [ "type-181" ], + "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE" + }, + { +@@ -32861,14 +34273,14 @@ + { + "access" : "private", + "field_name" : "mMutex", +- "referenced_type" : "type-437" ++ "referenced_type" : "type-434" + } + ], + "linker_set_key" : "android::Mutex", + "name" : "android::Mutex", + "record_kind" : "class", +- "referenced_type" : "type-436", +- "self_type" : "type-436", ++ "referenced_type" : "type-433", ++ "self_type" : "type-433", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Mutex.h", + "unique_id" : "_ZTSN7android5MutexE" +@@ -32880,14 +34292,14 @@ + { + "access" : "private", + "field_name" : "mLock", +- "referenced_type" : "type-440" ++ "referenced_type" : "type-438" + } + ], + "linker_set_key" : "android::Mutex::Autolock", + "name" : "android::Mutex::Autolock", + "record_kind" : "class", +- "referenced_type" : "type-439", +- "self_type" : "type-439", ++ "referenced_type" : "type-437", ++ "self_type" : "type-437", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Mutex.h", + "unique_id" : "_ZTSN7android5Mutex8AutolockE" +@@ -32897,7 +34309,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-313" ++ "referenced_type" : "type-312" + } + ], + "fields" : +@@ -32906,20 +34318,20 @@ + "access" : "private", + "field_name" : "mHandle", + "field_offset" : 32, +- "referenced_type" : "type-91" ++ "referenced_type" : "type-90" + }, + { + "access" : "private", + "field_name" : "mOwnsHandle", + "field_offset" : 64, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::NativeHandle", + "name" : "android::NativeHandle", + "record_kind" : "class", +- "referenced_type" : "type-315", +- "self_type" : "type-315", ++ "referenced_type" : "type-314", ++ "self_type" : "type-314", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/NativeHandle.h", + "unique_id" : "_ZTSN7android12NativeHandleE" +@@ -32931,14 +34343,14 @@ + { + "access" : "private", + "field_name" : "mRWLock", +- "referenced_type" : "type-449" ++ "referenced_type" : "type-445" + } + ], + "linker_set_key" : "android::RWLock", + "name" : "android::RWLock", + "record_kind" : "class", +- "referenced_type" : "type-448", +- "self_type" : "type-448", ++ "referenced_type" : "type-444", ++ "self_type" : "type-444", + "size" : 40, + "source_file" : "/system/core/libutils/include/utils/RWLock.h", + "unique_id" : "_ZTSN7android6RWLockE" +@@ -32950,14 +34362,14 @@ + { + "access" : "private", + "field_name" : "mLock", +- "referenced_type" : "type-452" ++ "referenced_type" : "type-450" + } + ], + "linker_set_key" : "android::RWLock::AutoRLock", + "name" : "android::RWLock::AutoRLock", + "record_kind" : "class", +- "referenced_type" : "type-451", +- "self_type" : "type-451", ++ "referenced_type" : "type-449", ++ "self_type" : "type-449", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RWLock.h", + "unique_id" : "_ZTSN7android6RWLock9AutoRLockE" +@@ -32969,14 +34381,14 @@ + { + "access" : "private", + "field_name" : "mLock", +- "referenced_type" : "type-452" ++ "referenced_type" : "type-450" + } + ], + "linker_set_key" : "android::RWLock::AutoWLock", + "name" : "android::RWLock::AutoWLock", + "record_kind" : "class", +- "referenced_type" : "type-455", +- "self_type" : "type-455", ++ "referenced_type" : "type-452", ++ "self_type" : "type-452", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RWLock.h", + "unique_id" : "_ZTSN7android6RWLock9AutoWLockE" +@@ -33047,8 +34459,8 @@ + "linker_set_key" : "android::ReferenceMover", + "name" : "android::ReferenceMover", + "record_kind" : "class", +- "referenced_type" : "type-75", +- "self_type" : "type-75", ++ "referenced_type" : "type-74", ++ "self_type" : "type-74", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/RefBase.h", + "unique_id" : "_ZTSN7android14ReferenceMoverE" +@@ -33091,8 +34503,8 @@ + "linker_set_key" : "android::ScopedTrace", + "name" : "android::ScopedTrace", + "record_kind" : "class", +- "referenced_type" : "type-1064", +- "self_type" : "type-1064", ++ "referenced_type" : "type-1061", ++ "self_type" : "type-1061", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Trace.h", + "unique_id" : "_ZTSN7android11ScopedTraceE" +@@ -33103,17 +34515,17 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-251" ++ "referenced_type" : "type-250" + } + ], + "linker_set_key" : "android::SortedVector > >", + "name" : "android::SortedVector > >", + "record_kind" : "class", +- "referenced_type" : "type-426", +- "self_type" : "type-426", ++ "referenced_type" : "type-424", ++ "self_type" : "type-424", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h", +- "template_args" : [ "type-427" ], ++ "template_args" : [ "type-425" ], + "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE", + "vtable_components" : + [ +@@ -33161,17 +34573,17 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-251" ++ "referenced_type" : "type-250" + } + ], + "linker_set_key" : "android::SortedVector >", + "name" : "android::SortedVector >", + "record_kind" : "class", +- "referenced_type" : "type-2342", +- "self_type" : "type-2342", ++ "referenced_type" : "type-2337", ++ "self_type" : "type-2337", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h", +- "template_args" : [ "type-2343" ], ++ "template_args" : [ "type-2338" ], + "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE", + "vtable_components" : + [ +@@ -33218,14 +34630,14 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-244" ++ "referenced_type" : "type-243" + } + ], + "linker_set_key" : "android::SortedVectorImpl", + "name" : "android::SortedVectorImpl", + "record_kind" : "class", +- "referenced_type" : "type-251", +- "self_type" : "type-251", ++ "referenced_type" : "type-250", ++ "self_type" : "type-250", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/VectorImpl.h", + "unique_id" : "_ZTSN7android16SortedVectorImplE", +@@ -33283,14 +34695,14 @@ + { + "access" : "private", + "field_name" : "mString", +- "referenced_type" : "type-343" ++ "referenced_type" : "type-342" + } + ], + "linker_set_key" : "android::String16", + "name" : "android::String16", + "record_kind" : "class", +- "referenced_type" : "type-342", +- "self_type" : "type-342", ++ "referenced_type" : "type-341", ++ "self_type" : "type-341", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String16.h", + "unique_id" : "_ZTSN7android8String16E" +@@ -33302,14 +34714,14 @@ + { + "access" : "private", + "field_name" : "mString", +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], + "linker_set_key" : "android::String8", + "name" : "android::String8", + "record_kind" : "class", +- "referenced_type" : "type-221", +- "self_type" : "type-221", ++ "referenced_type" : "type-220", ++ "self_type" : "type-220", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String8.h", + "unique_id" : "_ZTSN7android7String8E" +@@ -33329,25 +34741,25 @@ + "access" : "private", + "field_name" : "mCanCallJava", + "field_offset" : 32, +- "referenced_type" : "type-502" ++ "referenced_type" : "type-500" + }, + { + "access" : "private", + "field_name" : "mThread", + "field_offset" : 64, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "access" : "private", + "field_name" : "mLock", + "field_offset" : 96, +- "referenced_type" : "type-436" ++ "referenced_type" : "type-433" + }, + { + "access" : "private", + "field_name" : "mThreadExitedCondition", + "field_offset" : 128, +- "referenced_type" : "type-442" ++ "referenced_type" : "type-440" + }, + { + "access" : "private", +@@ -33359,19 +34771,19 @@ + "access" : "private", + "field_name" : "mExitPending", + "field_offset" : 192, +- "referenced_type" : "type-457" ++ "referenced_type" : "type-455" + }, + { + "access" : "private", + "field_name" : "mRunning", + "field_offset" : 200, +- "referenced_type" : "type-457" ++ "referenced_type" : "type-455" + }, + { + "access" : "private", + "field_name" : "mHoldSelf", + "field_offset" : 224, +- "referenced_type" : "type-499" ++ "referenced_type" : "type-497" + }, + { + "access" : "private", +@@ -33383,8 +34795,8 @@ + "linker_set_key" : "android::Thread", + "name" : "android::Thread", + "record_kind" : "class", +- "referenced_type" : "type-501", +- "self_type" : "type-501", ++ "referenced_type" : "type-499", ++ "self_type" : "type-499", + "size" : 44, + "source_file" : "/system/core/libutils/include/utils/Thread.h", + "unique_id" : "_ZTSN7android6ThreadE", +@@ -33474,17 +34886,17 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-244" ++ "referenced_type" : "type-243" + } + ], + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-432", +- "self_type" : "type-432", ++ "referenced_type" : "type-430", ++ "self_type" : "type-430", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", +- "template_args" : [ "type-68" ], ++ "template_args" : [ "type-67" ], + "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE", + "vtable_components" : + [ +@@ -33529,14 +34941,14 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-244" ++ "referenced_type" : "type-243" + } + ], + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-431", +- "self_type" : "type-431", ++ "referenced_type" : "type-429", ++ "self_type" : "type-429", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", + "template_args" : [ "type-35" ], +@@ -33584,17 +34996,17 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-244" ++ "referenced_type" : "type-243" + } + ], + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-252", +- "self_type" : "type-252", ++ "referenced_type" : "type-251", ++ "self_type" : "type-251", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", +- "template_args" : [ "type-221" ], ++ "template_args" : [ "type-220" ], + "unique_id" : "_ZTSN7android6VectorINS_7String8EEE", + "vtable_components" : + [ +@@ -33639,17 +35051,17 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-244" ++ "referenced_type" : "type-243" + } + ], + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-430", +- "self_type" : "type-430", ++ "referenced_type" : "type-428", ++ "self_type" : "type-428", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", +- "template_args" : [ "type-384" ], ++ "template_args" : [ "type-383" ], + "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE", + "vtable_components" : + [ +@@ -33694,17 +35106,17 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-244" ++ "referenced_type" : "type-243" + } + ], + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-2410", +- "self_type" : "type-2410", ++ "referenced_type" : "type-2405", ++ "self_type" : "type-2405", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", +- "template_args" : [ "type-2374" ], ++ "template_args" : [ "type-2369" ], + "unique_id" : "_ZTSN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE", + "vtable_components" : + [ +@@ -33749,17 +35161,17 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-244" ++ "referenced_type" : "type-243" + } + ], + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-428", +- "self_type" : "type-428", ++ "referenced_type" : "type-426", ++ "self_type" : "type-426", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", +- "template_args" : [ "type-429" ], ++ "template_args" : [ "type-427" ], + "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE", + "vtable_components" : + [ +@@ -33804,17 +35216,17 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-244" ++ "referenced_type" : "type-243" + } + ], + "linker_set_key" : "android::Vector >", + "name" : "android::Vector >", + "record_kind" : "class", +- "referenced_type" : "type-2518", +- "self_type" : "type-2518", ++ "referenced_type" : "type-2513", ++ "self_type" : "type-2513", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", +- "template_args" : [ "type-2470" ], ++ "template_args" : [ "type-2465" ], + "unique_id" : "_ZTSN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE", + "vtable_components" : + [ +@@ -33859,14 +35271,14 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-244" ++ "referenced_type" : "type-243" + } + ], + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-2514", +- "self_type" : "type-2514", ++ "referenced_type" : "type-2509", ++ "self_type" : "type-2509", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", + "template_args" : [ "type-19" ], +@@ -33916,7 +35328,7 @@ + "access" : "private", + "field_name" : "mStorage", + "field_offset" : 32, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "access" : "private", +@@ -33928,20 +35340,20 @@ + "access" : "private", + "field_name" : "mFlags", + "field_offset" : 96, +- "referenced_type" : "type-246" ++ "referenced_type" : "type-245" + }, + { + "access" : "private", + "field_name" : "mItemSize", + "field_offset" : 128, +- "referenced_type" : "type-246" ++ "referenced_type" : "type-245" + } + ], + "linker_set_key" : "android::VectorImpl", + "name" : "android::VectorImpl", + "record_kind" : "class", +- "referenced_type" : "type-244", +- "self_type" : "type-244", ++ "referenced_type" : "type-243", ++ "self_type" : "type-243", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/VectorImpl.h", + "unique_id" : "_ZTSN7android10VectorImplE", +@@ -33993,14 +35405,14 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-180" ++ "referenced_type" : "type-179" + } + ], + "linker_set_key" : "android::VirtualLightRefBase", + "name" : "android::VirtualLightRefBase", + "record_kind" : "class", +- "referenced_type" : "type-182", +- "self_type" : "type-182", ++ "referenced_type" : "type-181", ++ "self_type" : "type-181", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/LightRefBase.h", + "unique_id" : "_ZTSN7android19VirtualLightRefBaseE", +@@ -34027,22 +35439,22 @@ + "alignment" : 1, + "linker_set_key" : "android::aggregate_traits >", + "name" : "android::aggregate_traits >", +- "referenced_type" : "type-3871", +- "self_type" : "type-3871", ++ "referenced_type" : "type-3864", ++ "self_type" : "type-3864", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-342", "type-71" ], ++ "template_args" : [ "type-341", "type-70" ], + "unique_id" : "_ZTSN7android16aggregate_traitsINS_8String16ENS_2spINS_8hardware7IBinderEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::aggregate_traits", + "name" : "android::aggregate_traits", +- "referenced_type" : "type-2468", +- "self_type" : "type-2468", ++ "referenced_type" : "type-2463", ++ "self_type" : "type-2463", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-139", "type-2344" ], ++ "template_args" : [ "type-138", "type-2339" ], + "unique_id" : "_ZTSN7android16aggregate_traitsIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { +@@ -34050,7 +35462,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2328" ++ "referenced_type" : "type-2323" + } + ], + "fields" : +@@ -34071,20 +35483,20 @@ + "access" : "private", + "field_name" : "mExtras", + "field_offset" : 96, +- "referenced_type" : "type-2334" ++ "referenced_type" : "type-2329" + }, + { + "access" : "private", + "field_name" : "mReserved0", + "field_offset" : 128, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], + "linker_set_key" : "android::hardware::BHwBinder", + "name" : "android::hardware::BHwBinder", + "record_kind" : "class", +- "referenced_type" : "type-2333", +- "self_type" : "type-2333", ++ "referenced_type" : "type-2328", ++ "self_type" : "type-2328", + "size" : 28, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h", + "unique_id" : "_ZTSN7android8hardware9BHwBinderE", +@@ -34190,7 +35602,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2328" ++ "referenced_type" : "type-2323" + } + ], + "fields" : +@@ -34205,50 +35617,50 @@ + "access" : "private", + "field_name" : "mLock", + "field_offset" : 64, +- "referenced_type" : "type-436" ++ "referenced_type" : "type-433" + }, + { + "access" : "private", + "field_name" : "mAlive", + "field_offset" : 96, +- "referenced_type" : "type-2337" ++ "referenced_type" : "type-2332" + }, + { + "access" : "private", + "field_name" : "mObitsSent", + "field_offset" : 128, +- "referenced_type" : "type-2337" ++ "referenced_type" : "type-2332" + }, + { + "access" : "private", + "field_name" : "mObituaries", + "field_offset" : 160, +- "referenced_type" : "type-2338" ++ "referenced_type" : "type-2333" + }, + { + "access" : "private", + "field_name" : "mObjects", + "field_offset" : 192, +- "referenced_type" : "type-2340" ++ "referenced_type" : "type-2335" + }, + { + "access" : "private", + "field_name" : "mConstantData", + "field_offset" : 352, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "access" : "private", + "field_name" : "mDescriptorCache", + "field_offset" : 384, +- "referenced_type" : "type-342" ++ "referenced_type" : "type-341" + } + ], + "linker_set_key" : "android::hardware::BpHwBinder", + "name" : "android::hardware::BpHwBinder", + "record_kind" : "class", +- "referenced_type" : "type-2336", +- "self_type" : "type-2336", ++ "referenced_type" : "type-2331", ++ "self_type" : "type-2331", + "size" : 60, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h", + "unique_id" : "_ZTSN7android8hardware10BpHwBinderE", +@@ -34365,12 +35777,12 @@ + [ + { + "field_name" : "recipient", +- "referenced_type" : "type-944" ++ "referenced_type" : "type-941" + }, + { + "field_name" : "cookie", + "field_offset" : 64, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "field_name" : "flags", +@@ -34380,8 +35792,8 @@ + ], + "linker_set_key" : "android::hardware::BpHwBinder::Obituary", + "name" : "android::hardware::BpHwBinder::Obituary", +- "referenced_type" : "type-2374", +- "self_type" : "type-2374", ++ "referenced_type" : "type-2369", ++ "self_type" : "type-2369", + "size" : 16, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h", + "unique_id" : "_ZTSN7android8hardware10BpHwBinder8ObituaryE" +@@ -34393,14 +35805,14 @@ + { + "access" : "private", + "field_name" : "mObjects", +- "referenced_type" : "type-2341" ++ "referenced_type" : "type-2336" + } + ], + "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager", + "name" : "android::hardware::BpHwBinder::ObjectManager", + "record_kind" : "class", +- "referenced_type" : "type-2340", +- "self_type" : "type-2340", ++ "referenced_type" : "type-2335", ++ "self_type" : "type-2335", + "size" : 20, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h", + "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManagerE" +@@ -34412,23 +35824,23 @@ + [ + { + "field_name" : "object", +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "field_name" : "cleanupCookie", + "field_offset" : 32, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "field_name" : "func", + "field_offset" : 64, +- "referenced_type" : "type-2345" ++ "referenced_type" : "type-2340" + } + ], + "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager::entry_t", + "name" : "android::hardware::BpHwBinder::ObjectManager::entry_t", +- "referenced_type" : "type-2344", +- "self_type" : "type-2344", ++ "referenced_type" : "type-2339", ++ "self_type" : "type-2339", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h", + "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManager7entry_tE" +@@ -34448,7 +35860,7 @@ + "access" : "private", + "field_name" : "mRemote", + "field_offset" : 32, +- "referenced_type" : "type-2366" ++ "referenced_type" : "type-2361" + }, + { + "access" : "private", +@@ -34460,14 +35872,14 @@ + "access" : "private", + "field_name" : "mState", + "field_offset" : 96, +- "referenced_type" : "type-2368" ++ "referenced_type" : "type-2363" + } + ], + "linker_set_key" : "android::hardware::BpHwRefBase", + "name" : "android::hardware::BpHwRefBase", + "record_kind" : "class", +- "referenced_type" : "type-2365", +- "self_type" : "type-2365", ++ "referenced_type" : "type-2360", ++ "self_type" : "type-2360", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h", + "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE", +@@ -34555,7 +35967,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2474" ++ "referenced_type" : "type-2469" + } + ], + "fields" : +@@ -34582,20 +35994,20 @@ + "access" : "private", + "field_name" : "mLock", + "field_offset" : 128, +- "referenced_type" : "type-436" ++ "referenced_type" : "type-433" + }, + { + "access" : "private", + "field_name" : "mGlobalState", + "field_offset" : 160, +- "referenced_type" : "type-2471" ++ "referenced_type" : "type-2466" + } + ], + "linker_set_key" : "android::hardware::BufferedTextOutput", + "name" : "android::hardware::BufferedTextOutput", + "record_kind" : "class", +- "referenced_type" : "type-2506", +- "self_type" : "type-2506", ++ "referenced_type" : "type-2501", ++ "self_type" : "type-2501", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h", + "unique_id" : "_ZTSN7android8hardware18BufferedTextOutputE", +@@ -34667,23 +36079,23 @@ + { + "access" : "private", + "field_name" : "mMutex", +- "referenced_type" : "type-42" ++ "referenced_type" : "type-41" + }, + { + "access" : "private", + "field_name" : "mMap", + "field_offset" : 32, +- "referenced_type" : "type-43" ++ "referenced_type" : "type-42" + } + ], + "linker_set_key" : "android::hardware::ConcurrentMap, bool>", + "name" : "android::hardware::ConcurrentMap, bool>", + "record_kind" : "class", +- "referenced_type" : "type-41", +- "self_type" : "type-41", ++ "referenced_type" : "type-40", ++ "self_type" : "type-40", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-32", "type-44" ], ++ "template_args" : [ "type-32", "type-43" ], + "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEE" + }, + { +@@ -34693,23 +36105,23 @@ + { + "access" : "private", + "field_name" : "mMutex", +- "referenced_type" : "type-379" ++ "referenced_type" : "type-378" + }, + { + "access" : "private", + "field_name" : "mMap", + "field_offset" : 32, +- "referenced_type" : "type-380" ++ "referenced_type" : "type-379" + } + ], + "linker_set_key" : "android::hardware::ConcurrentMap >", + "name" : "android::hardware::ConcurrentMap >", + "record_kind" : "class", +- "referenced_type" : "type-378", +- "self_type" : "type-378", ++ "referenced_type" : "type-377", ++ "self_type" : "type-377", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-381", "type-383" ], ++ "template_args" : [ "type-380", "type-382" ], + "unique_id" : "_ZTSN7android8hardware13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEE" + }, + { +@@ -34719,23 +36131,23 @@ + { + "access" : "private", + "field_name" : "mMutex", +- "referenced_type" : "type-636" ++ "referenced_type" : "type-634" + }, + { + "access" : "private", + "field_name" : "mMap", + "field_offset" : 32, +- "referenced_type" : "type-637" ++ "referenced_type" : "type-635" + } + ], + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "record_kind" : "class", +- "referenced_type" : "type-635", +- "self_type" : "type-635", ++ "referenced_type" : "type-633", ++ "self_type" : "type-633", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-638", "type-639" ], ++ "template_args" : [ "type-636", "type-637" ], + "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEE" + }, + { +@@ -34745,23 +36157,23 @@ + { + "access" : "private", + "field_name" : "mMutex", +- "referenced_type" : "type-399" ++ "referenced_type" : "type-397" + }, + { + "access" : "private", + "field_name" : "mMap", + "field_offset" : 32, +- "referenced_type" : "type-400" ++ "referenced_type" : "type-398" + } + ], + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "record_kind" : "class", +- "referenced_type" : "type-398", +- "self_type" : "type-398", ++ "referenced_type" : "type-396", ++ "self_type" : "type-396", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-401", "type-402" ], ++ "template_args" : [ "type-399", "type-400" ], + "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS0_7IBinderEEEPvEEEEE" + }, + { +@@ -34790,8 +36202,8 @@ + ], + "linker_set_key" : "android::hardware::GrantorDescriptor", + "name" : "android::hardware::GrantorDescriptor", +- "referenced_type" : "type-319", +- "self_type" : "type-319", ++ "referenced_type" : "type-318", ++ "self_type" : "type-318", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h", + "unique_id" : "_ZTSN7android8hardware17GrantorDescriptorE" +@@ -34803,7 +36215,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { + "access" : "private", +@@ -34833,14 +36245,14 @@ + "access" : "private", + "field_name" : "mCArrayStyle", + "field_offset" : 160, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::HexDump", + "name" : "android::hardware::HexDump", + "record_kind" : "class", +- "referenced_type" : "type-2486", +- "self_type" : "type-2486", ++ "referenced_type" : "type-2481", ++ "self_type" : "type-2481", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h", + "unique_id" : "_ZTSN7android8hardware7HexDumpE" +@@ -34851,7 +36263,7 @@ + [ + { + "is_virtual" : true, +- "referenced_type" : "type-121" ++ "referenced_type" : "type-120" + }, + { + "is_virtual" : true, +@@ -34861,8 +36273,8 @@ + "linker_set_key" : "android::hardware::HidlMemory", + "name" : "android::hardware::HidlMemory", + "record_kind" : "class", +- "referenced_type" : "type-159", +- "self_type" : "type-159", ++ "referenced_type" : "type-158", ++ "self_type" : "type-158", + "size" : 56, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "unique_id" : "_ZTSN7android8hardware10HidlMemoryE", +@@ -34949,8 +36361,8 @@ + "linker_set_key" : "android::hardware::IBinder", + "name" : "android::hardware::IBinder", + "record_kind" : "class", +- "referenced_type" : "type-2328", +- "self_type" : "type-2328", ++ "referenced_type" : "type-2323", ++ "self_type" : "type-2323", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h", + "unique_id" : "_ZTSN7android8hardware7IBinderE", +@@ -35066,8 +36478,8 @@ + "linker_set_key" : "android::hardware::IBinder::DeathRecipient", + "name" : "android::hardware::IBinder::DeathRecipient", + "record_kind" : "class", +- "referenced_type" : "type-2379", +- "self_type" : "type-2379", ++ "referenced_type" : "type-2374", ++ "self_type" : "type-2374", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h", + "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE", +@@ -35154,8 +36566,8 @@ + "linker_set_key" : "android::hardware::IInterface", + "name" : "android::hardware::IInterface", + "record_kind" : "class", +- "referenced_type" : "type-2375", +- "self_type" : "type-2375", ++ "referenced_type" : "type-2370", ++ "self_type" : "type-2370", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h", + "unique_id" : "_ZTSN7android8hardware10IInterfaceE", +@@ -35237,43 +36649,43 @@ + { + "access" : "private", + "field_name" : "mProcess", +- "referenced_type" : "type-496" ++ "referenced_type" : "type-494" + }, + { + "access" : "private", + "field_name" : "mPendingStrongDerefs", + "field_offset" : 32, +- "referenced_type" : "type-430" ++ "referenced_type" : "type-428" + }, + { + "access" : "private", + "field_name" : "mPendingWeakDerefs", + "field_offset" : 192, +- "referenced_type" : "type-431" ++ "referenced_type" : "type-429" + }, + { + "access" : "private", + "field_name" : "mPostWriteStrongDerefs", + "field_offset" : 352, +- "referenced_type" : "type-432" ++ "referenced_type" : "type-430" + }, + { + "access" : "private", + "field_name" : "mPostWriteWeakDerefs", + "field_offset" : 512, +- "referenced_type" : "type-431" ++ "referenced_type" : "type-429" + }, + { + "access" : "private", + "field_name" : "mIn", + "field_offset" : 672, +- "referenced_type" : "type-2348" ++ "referenced_type" : "type-2343" + }, + { + "access" : "private", + "field_name" : "mOut", + "field_offset" : 1216, +- "referenced_type" : "type-2348" ++ "referenced_type" : "type-2343" + }, + { + "access" : "private", +@@ -35291,7 +36703,7 @@ + "access" : "private", + "field_name" : "mCallingSid", + "field_offset" : 1824, +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { + "access" : "private", +@@ -35315,44 +36727,44 @@ + "access" : "private", + "field_name" : "mContextObject", + "field_offset" : 1952, +- "referenced_type" : "type-472" ++ "referenced_type" : "type-470" + }, + { + "access" : "private", + "field_name" : "mIsLooper", + "field_offset" : 1984, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "access" : "private", + "field_name" : "mIsPollingThread", + "field_offset" : 1992, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "access" : "private", + "field_name" : "mPostCommandTasks", + "field_offset" : 2016, +- "referenced_type" : "type-2436" ++ "referenced_type" : "type-2431" + }, + { + "access" : "private", + "field_name" : "mIPCThreadStateBase", + "field_offset" : 2112, +- "referenced_type" : "type-2437" ++ "referenced_type" : "type-2432" + }, + { + "access" : "private", + "field_name" : "mCallRestriction", + "field_offset" : 2144, +- "referenced_type" : "type-2433" ++ "referenced_type" : "type-2428" + } + ], + "linker_set_key" : "android::hardware::IPCThreadState", + "name" : "android::hardware::IPCThreadState", + "record_kind" : "class", +- "referenced_type" : "type-2434", +- "self_type" : "type-2434", ++ "referenced_type" : "type-2429", ++ "self_type" : "type-2429", + "size" : 272, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h", + "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE" +@@ -35364,14 +36776,14 @@ + { + "access" : "private", + "field_name" : "mImpl", +- "referenced_type" : "type-531" ++ "referenced_type" : "type-529" + } + ], + "linker_set_key" : "android::hardware::LazyServiceRegistrar", + "name" : "android::hardware::LazyServiceRegistrar", + "record_kind" : "class", +- "referenced_type" : "type-530", +- "self_type" : "type-530", ++ "referenced_type" : "type-528", ++ "self_type" : "type-528", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h", + "unique_id" : "_ZTSN7android8hardware20LazyServiceRegistrarE" +@@ -35383,13 +36795,13 @@ + { + "access" : "private", + "field_name" : "mGrantors", +- "referenced_type" : "type-330" ++ "referenced_type" : "type-329" + }, + { + "access" : "private", + "field_name" : "mHandle", + "field_offset" : 128, +- "referenced_type" : "type-324" ++ "referenced_type" : "type-323" + }, + { + "access" : "private", +@@ -35406,11 +36818,11 @@ + ], + "linker_set_key" : "android::hardware::MQDescriptor", + "name" : "android::hardware::MQDescriptor", +- "referenced_type" : "type-1032", +- "self_type" : "type-1032", ++ "referenced_type" : "type-1029", ++ "self_type" : "type-1029", + "size" : 32, + "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h", +- "template_args" : [ "type-48" ], ++ "template_args" : [ "type-47" ], + "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EEE" + }, + { +@@ -35426,7 +36838,7 @@ + "access" : "private", + "field_name" : "mBufCache", + "field_offset" : 32, +- "referenced_type" : "type-2349" ++ "referenced_type" : "type-2344" + }, + { + "access" : "private", +@@ -35438,7 +36850,7 @@ + "access" : "private", + "field_name" : "mData", + "field_offset" : 160, +- "referenced_type" : "type-291" ++ "referenced_type" : "type-290" + }, + { + "access" : "private", +@@ -35462,7 +36874,7 @@ + "access" : "private", + "field_name" : "mObjects", + "field_offset" : 288, +- "referenced_type" : "type-2350" ++ "referenced_type" : "type-2345" + }, + { + "access" : "private", +@@ -35492,38 +36904,38 @@ + "access" : "private", + "field_name" : "mFdsKnown", + "field_offset" : 448, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "access" : "private", + "field_name" : "mHasFds", + "field_offset" : 456, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "access" : "private", + "field_name" : "mAllowFds", + "field_offset" : 464, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "access" : "private", + "field_name" : "mOwner", + "field_offset" : 480, +- "referenced_type" : "type-2351" ++ "referenced_type" : "type-2346" + }, + { + "access" : "private", + "field_name" : "mOwnerCookie", + "field_offset" : 512, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], + "linker_set_key" : "android::hardware::Parcel", + "name" : "android::hardware::Parcel", + "record_kind" : "class", +- "referenced_type" : "type-2348", +- "self_type" : "type-2348", ++ "referenced_type" : "type-2343", ++ "self_type" : "type-2343", + "size" : 68, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", + "unique_id" : "_ZTSN7android8hardware6ParcelE" +@@ -35550,8 +36962,8 @@ + ], + "linker_set_key" : "android::hardware::Parcel::BufferInfo", + "name" : "android::hardware::Parcel::BufferInfo", +- "referenced_type" : "type-2376", +- "self_type" : "type-2376", ++ "referenced_type" : "type-2371", ++ "self_type" : "type-2371", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", + "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE" +@@ -35577,19 +36989,19 @@ + "access" : "private", + "field_name" : "mVMStart", + "field_offset" : 64, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "access" : "private", + "field_name" : "mThreadCountLock", + "field_offset" : 96, +- "referenced_type" : "type-2440" ++ "referenced_type" : "type-2435" + }, + { + "access" : "private", + "field_name" : "mThreadCountDecrement", + "field_offset" : 128, +- "referenced_type" : "type-2441" ++ "referenced_type" : "type-2436" + }, + { + "access" : "private", +@@ -35613,80 +37025,80 @@ + "access" : "private", + "field_name" : "mLock", + "field_offset" : 320, +- "referenced_type" : "type-436" ++ "referenced_type" : "type-433" + }, + { + "access" : "private", + "field_name" : "mHandleToObject", + "field_offset" : 352, +- "referenced_type" : "type-428" ++ "referenced_type" : "type-426" + }, + { + "access" : "private", + "field_name" : "mManagesContexts", + "field_offset" : 512, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "access" : "private", + "field_name" : "mBinderContextCheckFunc", + "field_offset" : 544, +- "referenced_type" : "type-2432" ++ "referenced_type" : "type-2427" + }, + { + "access" : "private", + "field_name" : "mBinderContextUserData", + "field_offset" : 576, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "access" : "private", + "field_name" : "mContexts", + "field_offset" : 608, +- "referenced_type" : "type-433" ++ "referenced_type" : "type-431" + }, + { + "access" : "private", + "field_name" : "mRootDir", + "field_offset" : 768, +- "referenced_type" : "type-221" ++ "referenced_type" : "type-220" + }, + { + "access" : "private", + "field_name" : "mThreadPoolStarted", + "field_offset" : 800, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "access" : "private", + "field_name" : "mSpawnThreadOnStart", + "field_offset" : 808, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "access" : "private", + "field_name" : "mThreadPoolSeq", + "field_offset" : 832, +- "referenced_type" : "type-2337" ++ "referenced_type" : "type-2332" + }, + { + "access" : "private", + "field_name" : "mMmapSize", + "field_offset" : 864, +- "referenced_type" : "type-246" ++ "referenced_type" : "type-245" + }, + { + "access" : "private", + "field_name" : "mCallRestriction", + "field_offset" : 896, +- "referenced_type" : "type-2433" ++ "referenced_type" : "type-2428" + } + ], + "linker_set_key" : "android::hardware::ProcessState", + "name" : "android::hardware::ProcessState", + "record_kind" : "class", +- "referenced_type" : "type-2439", +- "self_type" : "type-2439", ++ "referenced_type" : "type-2434", ++ "self_type" : "type-2434", + "size" : 128, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h", + "unique_id" : "_ZTSN7android8hardware12ProcessStateE", +@@ -35764,7 +37176,7 @@ + [ + { + "field_name" : "binder", +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + }, + { + "field_name" : "refs", +@@ -35774,8 +37186,8 @@ + ], + "linker_set_key" : "android::hardware::ProcessState::handle_entry", + "name" : "android::hardware::ProcessState::handle_entry", +- "referenced_type" : "type-2416", +- "self_type" : "type-2416", ++ "referenced_type" : "type-2411", ++ "self_type" : "type-2411", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h", + "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE" +@@ -35785,7 +37197,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-103" ++ "referenced_type" : "type-102" + } + ], + "fields" : +@@ -35794,17 +37206,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 168, +- "referenced_type" : "type-546" ++ "referenced_type" : "type-544" + } + ], + "linker_set_key" : "android::hardware::Return", + "name" : "android::hardware::Return", + "record_kind" : "class", +- "referenced_type" : "type-807", +- "self_type" : "type-807", ++ "referenced_type" : "type-804", ++ "self_type" : "type-804", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-546" ], ++ "template_args" : [ "type-544" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_4hidl7manager4V1_015IServiceManager9TransportEEE" + }, + { +@@ -35812,7 +37224,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-103" ++ "referenced_type" : "type-102" + } + ], + "fields" : +@@ -35821,17 +37233,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 192, +- "referenced_type" : "type-356" ++ "referenced_type" : "type-355" + } + ], + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-801", +- "self_type" : "type-801", ++ "referenced_type" : "type-798", ++ "self_type" : "type-798", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-356" ], ++ "template_args" : [ "type-355" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl4base4V1_05IBaseEEEEE" + }, + { +@@ -35839,7 +37251,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-103" ++ "referenced_type" : "type-102" + } + ], + "fields" : +@@ -35848,17 +37260,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 192, +- "referenced_type" : "type-575" ++ "referenced_type" : "type-573" + } + ], + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-986", +- "self_type" : "type-986", ++ "referenced_type" : "type-983", ++ "self_type" : "type-983", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-575" ], ++ "template_args" : [ "type-573" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEE" + }, + { +@@ -35866,7 +37278,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-103" ++ "referenced_type" : "type-102" + } + ], + "fields" : +@@ -35875,17 +37287,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 192, +- "referenced_type" : "type-590" ++ "referenced_type" : "type-588" + } + ], + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-1093", +- "self_type" : "type-1093", ++ "referenced_type" : "type-1090", ++ "self_type" : "type-1090", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-590" ], ++ "template_args" : [ "type-588" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEE" + }, + { +@@ -35893,7 +37305,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-103" ++ "referenced_type" : "type-102" + } + ], + "fields" : +@@ -35902,17 +37314,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 192, +- "referenced_type" : "type-580" ++ "referenced_type" : "type-578" + } + ], + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-1153", +- "self_type" : "type-1153", ++ "referenced_type" : "type-1150", ++ "self_type" : "type-1150", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-580" ], ++ "template_args" : [ "type-578" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEE" + }, + { +@@ -35920,7 +37332,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-103" ++ "referenced_type" : "type-102" + } + ], + "fields" : +@@ -35929,17 +37341,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 192, +- "referenced_type" : "type-595" ++ "referenced_type" : "type-593" + } + ], + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-1213", +- "self_type" : "type-1213", ++ "referenced_type" : "type-1210", ++ "self_type" : "type-1210", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-595" ], ++ "template_args" : [ "type-593" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEE" + }, + { +@@ -35947,7 +37359,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-103" ++ "referenced_type" : "type-102" + } + ], + "fields" : +@@ -35956,17 +37368,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 192, +- "referenced_type" : "type-585" ++ "referenced_type" : "type-583" + } + ], + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-1284", +- "self_type" : "type-1284", ++ "referenced_type" : "type-1281", ++ "self_type" : "type-1281", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-585" ], ++ "template_args" : [ "type-583" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEE" + }, + { +@@ -35974,7 +37386,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-103" ++ "referenced_type" : "type-102" + } + ], + "fields" : +@@ -35983,17 +37395,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 168, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::Return", + "name" : "android::hardware::Return", + "record_kind" : "class", +- "referenced_type" : "type-309", +- "self_type" : "type-309", ++ "referenced_type" : "type-308", ++ "self_type" : "type-308", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-44" ], ++ "template_args" : [ "type-43" ], + "unique_id" : "_ZTSN7android8hardware6ReturnIbEE" + }, + { +@@ -36001,17 +37413,17 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-103" ++ "referenced_type" : "type-102" + } + ], + "linker_set_key" : "android::hardware::Return", + "name" : "android::hardware::Return", + "record_kind" : "class", +- "referenced_type" : "type-102", +- "self_type" : "type-102", ++ "referenced_type" : "type-101", ++ "self_type" : "type-101", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-106" ], ++ "template_args" : [ "type-105" ], + "unique_id" : "_ZTSN7android8hardware6ReturnIvEE" + }, + { +@@ -36033,14 +37445,14 @@ + "access" : "private", + "field_name" : "mMessage", + "field_offset" : 64, +- "referenced_type" : "type-105" ++ "referenced_type" : "type-104" + } + ], + "linker_set_key" : "android::hardware::Status", + "name" : "android::hardware::Status", + "record_kind" : "class", +- "referenced_type" : "type-104", +- "self_type" : "type-104", ++ "referenced_type" : "type-103", ++ "self_type" : "type-103", + "size" : 20, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", + "unique_id" : "_ZTSN7android8hardware6StatusE" +@@ -36050,8 +37462,8 @@ + "linker_set_key" : "android::hardware::TextOutput", + "name" : "android::hardware::TextOutput", + "record_kind" : "class", +- "referenced_type" : "type-2474", +- "self_type" : "type-2474", ++ "referenced_type" : "type-2469", ++ "self_type" : "type-2469", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h", + "unique_id" : "_ZTSN7android8hardware10TextOutputE", +@@ -36097,14 +37509,14 @@ + { + "access" : "private", + "field_name" : "mTO", +- "referenced_type" : "type-2476" ++ "referenced_type" : "type-2471" + } + ], + "linker_set_key" : "android::hardware::TextOutput::Bundle", + "name" : "android::hardware::TextOutput::Bundle", + "record_kind" : "class", +- "referenced_type" : "type-2475", +- "self_type" : "type-2475", ++ "referenced_type" : "type-2470", ++ "self_type" : "type-2470", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h", + "unique_id" : "_ZTSN7android8hardware10TextOutput6BundleE" +@@ -36122,8 +37534,8 @@ + "linker_set_key" : "android::hardware::TypeCode", + "name" : "android::hardware::TypeCode", + "record_kind" : "class", +- "referenced_type" : "type-2482", +- "self_type" : "type-2482", ++ "referenced_type" : "type-2477", ++ "self_type" : "type-2477", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h", + "unique_id" : "_ZTSN7android8hardware8TypeCodeE" +@@ -36135,14 +37547,14 @@ + { + "access" : "private", + "field_name" : "buffer", +- "referenced_type" : "type-47" ++ "referenced_type" : "type-46" + } + ], + "linker_set_key" : "android::hardware::details::DoNotDestruct, android::hardware::details::SchedPrio> >", + "name" : "android::hardware::details::DoNotDestruct, android::hardware::details::SchedPrio> >", + "record_kind" : "class", +- "referenced_type" : "type-46", +- "self_type" : "type-46", ++ "referenced_type" : "type-45", ++ "self_type" : "type-45", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", + "template_args" : [ "type-29" ], +@@ -36155,17 +37567,17 @@ + { + "access" : "private", + "field_name" : "buffer", +- "referenced_type" : "type-47" ++ "referenced_type" : "type-46" + } + ], + "linker_set_key" : "android::hardware::details::DoNotDestruct, bool> >", + "name" : "android::hardware::details::DoNotDestruct, bool> >", + "record_kind" : "class", +- "referenced_type" : "type-51", +- "self_type" : "type-51", ++ "referenced_type" : "type-50", ++ "self_type" : "type-50", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-41" ], ++ "template_args" : [ "type-40" ], + "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEEEE" + }, + { +@@ -36175,17 +37587,17 @@ + { + "access" : "private", + "field_name" : "buffer", +- "referenced_type" : "type-47" ++ "referenced_type" : "type-46" + } + ], + "linker_set_key" : "android::hardware::details::DoNotDestruct > >", + "name" : "android::hardware::details::DoNotDestruct > >", + "record_kind" : "class", +- "referenced_type" : "type-412", +- "self_type" : "type-412", ++ "referenced_type" : "type-410", ++ "self_type" : "type-410", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-378" ], ++ "template_args" : [ "type-377" ], + "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEEEE" + }, + { +@@ -36195,17 +37607,17 @@ + { + "access" : "private", + "field_name" : "buffer", +- "referenced_type" : "type-47" ++ "referenced_type" : "type-46" + } + ], + "linker_set_key" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > >", + "name" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > >", + "record_kind" : "class", +- "referenced_type" : "type-649", +- "self_type" : "type-649", ++ "referenced_type" : "type-647", ++ "self_type" : "type-647", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-635" ], ++ "template_args" : [ "type-633" ], + "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEEEE" + }, + { +@@ -36215,17 +37627,17 @@ + { + "access" : "private", + "field_name" : "buffer", +- "referenced_type" : "type-47" ++ "referenced_type" : "type-46" + } + ], + "linker_set_key" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > >", + "name" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > >", + "record_kind" : "class", +- "referenced_type" : "type-414", +- "self_type" : "type-414", ++ "referenced_type" : "type-412", ++ "self_type" : "type-412", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-398" ], ++ "template_args" : [ "type-396" ], + "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS0_7IBinderEEEPvEEEEEEE" + }, + { +@@ -36236,31 +37648,31 @@ + "access" : "protected", + "field_name" : "mInstrumentationCallbacks", + "field_offset" : 32, +- "referenced_type" : "type-146" ++ "referenced_type" : "type-145" + }, + { + "access" : "protected", + "field_name" : "mEnableInstrumentation", + "field_offset" : 128, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "access" : "protected", + "field_name" : "mInstrumentationLibPackage", + "field_offset" : 160, +- "referenced_type" : "type-147" ++ "referenced_type" : "type-146" + }, + { + "access" : "protected", + "field_name" : "mInterfaceName", + "field_offset" : 256, +- "referenced_type" : "type-148" ++ "referenced_type" : "type-147" + } + ], + "linker_set_key" : "android::hardware::details::HidlInstrumentor", + "name" : "android::hardware::details::HidlInstrumentor", +- "referenced_type" : "type-145", +- "self_type" : "type-145", ++ "referenced_type" : "type-144", ++ "self_type" : "type-144", + "size" : 44, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE", +@@ -36312,14 +37724,14 @@ + { + "access" : "private", + "field_name" : "mQueue", +- "referenced_type" : "type-270" ++ "referenced_type" : "type-269" + } + ], + "linker_set_key" : "android::hardware::details::TaskRunner", + "name" : "android::hardware::details::TaskRunner", + "record_kind" : "class", +- "referenced_type" : "type-269", +- "self_type" : "type-269", ++ "referenced_type" : "type-268", ++ "self_type" : "type-268", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h", + "unique_id" : "_ZTSN7android8hardware7details10TaskRunnerE" +@@ -36328,8 +37740,8 @@ + "alignment" : 1, + "linker_set_key" : "android::hardware::details::bnhw_tag", + "name" : "android::hardware::details::bnhw_tag", +- "referenced_type" : "type-234", +- "self_type" : "type-234", ++ "referenced_type" : "type-233", ++ "self_type" : "type-233", + "size" : 1, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE" +@@ -36338,8 +37750,8 @@ + "alignment" : 1, + "linker_set_key" : "android::hardware::details::bphw_tag", + "name" : "android::hardware::details::bphw_tag", +- "referenced_type" : "type-284", +- "self_type" : "type-284", ++ "referenced_type" : "type-283", ++ "self_type" : "type-283", + "size" : 1, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE" +@@ -36348,8 +37760,8 @@ + "alignment" : 1, + "linker_set_key" : "android::hardware::details::bs_tag", + "name" : "android::hardware::details::bs_tag", +- "referenced_type" : "type-295", +- "self_type" : "type-295", ++ "referenced_type" : "type-294", ++ "self_type" : "type-294", + "size" : 1, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details6bs_tagE" +@@ -36361,7 +37773,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-318" ++ "referenced_type" : "type-317" + }, + { + "field_name" : "_pad", +@@ -36372,8 +37784,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-317", +- "self_type" : "type-317", ++ "referenced_type" : "type-316", ++ "self_type" : "type-316", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E" +@@ -36385,7 +37797,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-837" ++ "referenced_type" : "type-834" + }, + { + "field_name" : "_pad", +@@ -36396,8 +37808,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-836", +- "self_type" : "type-836", ++ "referenced_type" : "type-833", ++ "self_type" : "type-833", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEUt_E" +@@ -36408,16 +37820,16 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-317" ++ "referenced_type" : "type-316" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer", + "name" : "android::hardware::details::hidl_pointer", +- "referenced_type" : "type-316", +- "self_type" : "type-316", ++ "referenced_type" : "type-315", ++ "self_type" : "type-315", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", +- "template_args" : [ "type-319" ], ++ "template_args" : [ "type-318" ], + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEE" + }, + { +@@ -36426,16 +37838,16 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-1010" ++ "referenced_type" : "type-1007" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer >", + "name" : "android::hardware::details::hidl_pointer >", +- "referenced_type" : "type-1009", +- "self_type" : "type-1009", ++ "referenced_type" : "type-1006", ++ "self_type" : "type-1006", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", +- "template_args" : [ "type-1012" ], ++ "template_args" : [ "type-1009" ], + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEE" + }, + { +@@ -36444,16 +37856,16 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-621" ++ "referenced_type" : "type-619" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer", + "name" : "android::hardware::details::hidl_pointer", +- "referenced_type" : "type-620", +- "self_type" : "type-620", ++ "referenced_type" : "type-618", ++ "self_type" : "type-618", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", +- "template_args" : [ "type-96" ], ++ "template_args" : [ "type-95" ], + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEE" + }, + { +@@ -36462,16 +37874,16 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-836" ++ "referenced_type" : "type-833" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer", + "name" : "android::hardware::details::hidl_pointer", +- "referenced_type" : "type-835", +- "self_type" : "type-835", ++ "referenced_type" : "type-832", ++ "self_type" : "type-832", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", +- "template_args" : [ "type-548" ], ++ "template_args" : [ "type-546" ], + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE" + }, + { +@@ -36480,16 +37892,16 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-1026" ++ "referenced_type" : "type-1023" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer", + "name" : "android::hardware::details::hidl_pointer", +- "referenced_type" : "type-1025", +- "self_type" : "type-1025", ++ "referenced_type" : "type-1022", ++ "self_type" : "type-1022", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", +- "template_args" : [ "type-48" ], ++ "template_args" : [ "type-47" ], + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEE" + }, + { +@@ -36499,7 +37911,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-243" ++ "referenced_type" : "type-242" + }, + { + "field_name" : "_pad", +@@ -36510,8 +37922,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-1026", +- "self_type" : "type-1026", ++ "referenced_type" : "type-1023", ++ "self_type" : "type-1023", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEUt_E" +@@ -36522,16 +37934,16 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-98" ++ "referenced_type" : "type-97" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer", + "name" : "android::hardware::details::hidl_pointer", +- "referenced_type" : "type-97", +- "self_type" : "type-97", ++ "referenced_type" : "type-96", ++ "self_type" : "type-96", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", +- "template_args" : [ "type-100" ], ++ "template_args" : [ "type-99" ], + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE" + }, + { +@@ -36541,7 +37953,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { + "field_name" : "_pad", +@@ -36552,8 +37964,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-98", +- "self_type" : "type-98", ++ "referenced_type" : "type-97", ++ "self_type" : "type-97", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEUt_E" +@@ -36607,7 +38019,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-1011" ++ "referenced_type" : "type-1008" + }, + { + "field_name" : "_pad", +@@ -36618,8 +38030,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-1010", +- "self_type" : "type-1010", ++ "referenced_type" : "type-1007", ++ "self_type" : "type-1007", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEUt_E" +@@ -36631,7 +38043,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { + "field_name" : "_pad", +@@ -36642,8 +38054,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-621", +- "self_type" : "type-621", ++ "referenced_type" : "type-619", ++ "self_type" : "type-619", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEUt_E" +@@ -36654,13 +38066,13 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-520" ++ "referenced_type" : "type-518" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer", + "name" : "android::hardware::details::hidl_pointer", +- "referenced_type" : "type-519", +- "self_type" : "type-519", ++ "referenced_type" : "type-517", ++ "self_type" : "type-517", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "template_args" : [ "type-19" ], +@@ -36673,7 +38085,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-521" ++ "referenced_type" : "type-519" + }, + { + "field_name" : "_pad", +@@ -36684,8 +38096,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-520", +- "self_type" : "type-520", ++ "referenced_type" : "type-518", ++ "self_type" : "type-518", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEUt_E" +@@ -36696,13 +38108,13 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-325" ++ "referenced_type" : "type-324" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer", + "name" : "android::hardware::details::hidl_pointer", +- "referenced_type" : "type-324", +- "self_type" : "type-324", ++ "referenced_type" : "type-323", ++ "self_type" : "type-323", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "template_args" : [ "type-18" ], +@@ -36715,7 +38127,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-91" ++ "referenced_type" : "type-90" + }, + { + "field_name" : "_pad", +@@ -36726,8 +38138,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-325", +- "self_type" : "type-325", ++ "referenced_type" : "type-324", ++ "self_type" : "type-324", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E" +@@ -36736,8 +38148,8 @@ + "alignment" : 1, + "linker_set_key" : "android::hardware::details::i_tag", + "name" : "android::hardware::details::i_tag", +- "referenced_type" : "type-133", +- "self_type" : "type-133", ++ "referenced_type" : "type-132", ++ "self_type" : "type-132", + "size" : 1, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details5i_tagE" +@@ -36749,20 +38161,20 @@ + { + "access" : "private", + "field_name" : "mStatus", +- "referenced_type" : "type-104" ++ "referenced_type" : "type-103" + }, + { + "access" : "private", + "field_name" : "mCheckedStatus", + "field_offset" : 160, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::details::return_status", + "name" : "android::hardware::details::return_status", + "record_kind" : "class", +- "referenced_type" : "type-103", +- "self_type" : "type-103", ++ "referenced_type" : "type-102", ++ "self_type" : "type-102", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", + "unique_id" : "_ZTSN7android8hardware7details13return_statusE" +@@ -36771,11 +38183,11 @@ + "alignment" : 1, + "linker_set_key" : "android::hardware::details::std_array", + "name" : "android::hardware::details::std_array", +- "referenced_type" : "type-1029", +- "self_type" : "type-1029", ++ "referenced_type" : "type-1025", ++ "self_type" : "type-1025", + "size" : 1, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", +- "template_args" : [ "type-199" ], ++ "template_args" : [ "type-198" ], + "unique_id" : "_ZTSN7android8hardware7details9std_arrayIhLj32EJEEE" + }, + { +@@ -36785,16 +38197,16 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-1013" ++ "referenced_type" : "type-1010" + } + ], + "linker_set_key" : "android::hardware::hidl_array", + "name" : "android::hardware::hidl_array", +- "referenced_type" : "type-1012", +- "self_type" : "type-1012", ++ "referenced_type" : "type-1009", ++ "self_type" : "type-1009", + "size" : 32, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", +- "template_args" : [ "type-199" ], ++ "template_args" : [ "type-198" ], + "unique_id" : "_ZTSN7android8hardware10hidl_arrayIhLj32EJEEE" + }, + { +@@ -36802,7 +38214,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-362" ++ "referenced_type" : "type-361" + } + ], + "fields" : +@@ -36811,7 +38223,7 @@ + "access" : "private", + "field_name" : "mRecipient", + "field_offset" : 32, +- "referenced_type" : "type-361" ++ "referenced_type" : "type-360" + }, + { + "access" : "private", +@@ -36828,8 +38240,8 @@ + ], + "linker_set_key" : "android::hardware::hidl_binder_death_recipient", + "name" : "android::hardware::hidl_binder_death_recipient", +- "referenced_type" : "type-360", +- "self_type" : "type-360", ++ "referenced_type" : "type-359", ++ "self_type" : "type-359", + "size" : 40, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h", + "unique_id" : "_ZTSN7android8hardware27hidl_binder_death_recipientE", +@@ -36914,8 +38326,8 @@ + ], + "linker_set_key" : "android::hardware::hidl_death_recipient", + "name" : "android::hardware::hidl_death_recipient", +- "referenced_type" : "type-144", +- "self_type" : "type-144", ++ "referenced_type" : "type-143", ++ "self_type" : "type-143", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE", +@@ -37003,13 +38415,13 @@ + "access" : "private", + "field_name" : "mOwnsHandle", + "field_offset" : 64, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::hidl_handle", + "name" : "android::hardware::hidl_handle", +- "referenced_type" : "type-77", +- "self_type" : "type-77", ++ "referenced_type" : "type-76", ++ "self_type" : "type-76", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "unique_id" : "_ZTSN7android8hardware11hidl_handleE" +@@ -37021,7 +38433,7 @@ + { + "access" : "private", + "field_name" : "mHandle", +- "referenced_type" : "type-77" ++ "referenced_type" : "type-76" + }, + { + "access" : "private", +@@ -37033,13 +38445,13 @@ + "access" : "private", + "field_name" : "mName", + "field_offset" : 192, +- "referenced_type" : "type-96" ++ "referenced_type" : "type-95" + } + ], + "linker_set_key" : "android::hardware::hidl_memory", + "name" : "android::hardware::hidl_memory", +- "referenced_type" : "type-121", +- "self_type" : "type-121", ++ "referenced_type" : "type-120", ++ "self_type" : "type-120", + "size" : 40, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "unique_id" : "_ZTSN7android8hardware11hidl_memoryE" +@@ -37051,7 +38463,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-97" ++ "referenced_type" : "type-96" + }, + { + "access" : "private", +@@ -37063,13 +38475,13 @@ + "access" : "private", + "field_name" : "mOwnsBuffer", + "field_offset" : 96, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::hidl_string", + "name" : "android::hardware::hidl_string", +- "referenced_type" : "type-96", +- "self_type" : "type-96", ++ "referenced_type" : "type-95", ++ "self_type" : "type-95", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "unique_id" : "_ZTSN7android8hardware11hidl_stringE" +@@ -37081,7 +38493,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-316" ++ "referenced_type" : "type-315" + }, + { + "access" : "private", +@@ -37093,16 +38505,16 @@ + "access" : "private", + "field_name" : "mOwnsBuffer", + "field_offset" : 96, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::hidl_vec", + "name" : "android::hardware::hidl_vec", +- "referenced_type" : "type-330", +- "self_type" : "type-330", ++ "referenced_type" : "type-329", ++ "self_type" : "type-329", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", +- "template_args" : [ "type-319" ], ++ "template_args" : [ "type-318" ], + "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_17GrantorDescriptorEEE" + }, + { +@@ -37112,7 +38524,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-1009" ++ "referenced_type" : "type-1006" + }, + { + "access" : "private", +@@ -37124,16 +38536,16 @@ + "access" : "private", + "field_name" : "mOwnsBuffer", + "field_offset" : 96, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::hidl_vec >", + "name" : "android::hardware::hidl_vec >", +- "referenced_type" : "type-1008", +- "self_type" : "type-1008", ++ "referenced_type" : "type-1005", ++ "self_type" : "type-1005", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", +- "template_args" : [ "type-1012" ], ++ "template_args" : [ "type-1009" ], + "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEE" + }, + { +@@ -37143,7 +38555,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-620" ++ "referenced_type" : "type-618" + }, + { + "access" : "private", +@@ -37155,16 +38567,16 @@ + "access" : "private", + "field_name" : "mOwnsBuffer", + "field_offset" : 96, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::hidl_vec", + "name" : "android::hardware::hidl_vec", +- "referenced_type" : "type-619", +- "self_type" : "type-619", ++ "referenced_type" : "type-617", ++ "self_type" : "type-617", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", +- "template_args" : [ "type-96" ], ++ "template_args" : [ "type-95" ], + "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEEE" + }, + { +@@ -37174,7 +38586,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-835" ++ "referenced_type" : "type-832" + }, + { + "access" : "private", +@@ -37186,16 +38598,16 @@ + "access" : "private", + "field_name" : "mOwnsBuffer", + "field_offset" : 96, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::hidl_vec", + "name" : "android::hardware::hidl_vec", +- "referenced_type" : "type-834", +- "self_type" : "type-834", ++ "referenced_type" : "type-831", ++ "self_type" : "type-831", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", +- "template_args" : [ "type-548" ], ++ "template_args" : [ "type-546" ], + "unique_id" : "_ZTSN7android8hardware8hidl_vecINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE" + }, + { +@@ -37205,7 +38617,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-1025" ++ "referenced_type" : "type-1022" + }, + { + "access" : "private", +@@ -37217,16 +38629,16 @@ + "access" : "private", + "field_name" : "mOwnsBuffer", + "field_offset" : 96, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::hidl_vec", + "name" : "android::hardware::hidl_vec", +- "referenced_type" : "type-1024", +- "self_type" : "type-1024", ++ "referenced_type" : "type-1021", ++ "self_type" : "type-1021", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", +- "template_args" : [ "type-48" ], ++ "template_args" : [ "type-47" ], + "unique_id" : "_ZTSN7android8hardware8hidl_vecIcEE" + }, + { +@@ -37234,7 +38646,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-626" ++ "referenced_type" : "type-623" + } + ], + "fields" : +@@ -37242,14 +38654,14 @@ + { + "access" : "private", + "field_name" : "mPtr", +- "referenced_type" : "type-117" ++ "referenced_type" : "type-116" + } + ], + "linker_set_key" : "android::hardware::hidl_vec::iter", + "name" : "android::hardware::hidl_vec::iter", + "record_kind" : "class", +- "referenced_type" : "type-625", +- "self_type" : "type-625", ++ "referenced_type" : "type-622", ++ "self_type" : "type-622", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEE4iterILb1EEE" +@@ -37261,7 +38673,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-519" ++ "referenced_type" : "type-517" + }, + { + "access" : "private", +@@ -37273,13 +38685,13 @@ + "access" : "private", + "field_name" : "mOwnsBuffer", + "field_offset" : 96, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::hidl_vec", + "name" : "android::hardware::hidl_vec", +- "referenced_type" : "type-518", +- "self_type" : "type-518", ++ "referenced_type" : "type-516", ++ "self_type" : "type-516", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "template_args" : [ "type-19" ], +@@ -37292,19 +38704,19 @@ + { + "access" : "private", + "field_name" : "mMajor", +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + }, + { + "access" : "private", + "field_name" : "mMinor", + "field_offset" : 16, +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + } + ], + "linker_set_key" : "android::hardware::hidl_version", + "name" : "android::hardware::hidl_version", +- "referenced_type" : "type-131", +- "self_type" : "type-131", ++ "referenced_type" : "type-130", ++ "self_type" : "type-130", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "unique_id" : "_ZTSN7android8hardware12hidl_versionE" +@@ -37314,10 +38726,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-357" ++ "referenced_type" : "type-356" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -37326,13 +38738,13 @@ + "access" : "private", + "field_name" : "_hidl_mImpl", + "field_offset" : 512, +- "referenced_type" : "type-356" ++ "referenced_type" : "type-355" + } + ], + "linker_set_key" : "android::hidl::base::V1_0::BnHwBase", + "name" : "android::hidl::base::V1_0::BnHwBase", +- "referenced_type" : "type-355", +- "self_type" : "type-355", ++ "referenced_type" : "type-354", ++ "self_type" : "type-354", + "size" : 76, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h", + "unique_id" : "_ZTSN7android4hidl4base4V1_08BnHwBaseE", +@@ -37454,10 +38866,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-422" ++ "referenced_type" : "type-420" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -37466,19 +38878,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 544, +- "referenced_type" : "type-420" ++ "referenced_type" : "type-418" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 576, +- "referenced_type" : "type-421" ++ "referenced_type" : "type-419" + } + ], + "linker_set_key" : "android::hidl::base::V1_0::BpHwBase", + "name" : "android::hidl::base::V1_0::BpHwBase", +- "referenced_type" : "type-419", +- "self_type" : "type-419", ++ "referenced_type" : "type-417", ++ "self_type" : "type-417", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h", + "unique_id" : "_ZTSN7android4hidl4base4V1_08BpHwBaseE", +@@ -37664,7 +39076,7 @@ + "referenced_type" : "type-34" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -37673,19 +39085,19 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 384, +- "referenced_type" : "type-459" ++ "referenced_type" : "type-456" + }, + { + "access" : "private", + "field_name" : "mOnewayQueue", + "field_offset" : 416, +- "referenced_type" : "type-269" ++ "referenced_type" : "type-268" + } + ], + "linker_set_key" : "android::hidl::base::V1_0::BsBase", + "name" : "android::hidl::base::V1_0::BsBase", +- "referenced_type" : "type-2248", +- "self_type" : "type-2248", ++ "referenced_type" : "type-2243", ++ "self_type" : "type-2243", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h", + "unique_id" : "_ZTSN7android4hidl4base4V1_06BsBaseE", +@@ -37821,13 +39233,13 @@ + { + "field_name" : "arch", + "field_offset" : 128, +- "referenced_type" : "type-336" ++ "referenced_type" : "type-335" + } + ], + "linker_set_key" : "android::hidl::base::V1_0::DebugInfo", + "name" : "android::hidl::base::V1_0::DebugInfo", +- "referenced_type" : "type-335", +- "self_type" : "type-335", ++ "referenced_type" : "type-334", ++ "self_type" : "type-334", + "size" : 24, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h", + "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfoE" +@@ -37953,7 +39365,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-355" ++ "referenced_type" : "type-354" + } + ], + "fields" : +@@ -37962,13 +39374,13 @@ + "access" : "private", + "field_name" : "_hidl_mImpl", + "field_offset" : 544, +- "referenced_type" : "type-575" ++ "referenced_type" : "type-573" + } + ], + "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager", + "name" : "android::hidl::manager::V1_0::BnHwServiceManager", +- "referenced_type" : "type-871", +- "self_type" : "type-871", ++ "referenced_type" : "type-868", ++ "self_type" : "type-868", + "size" : 80, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_018BnHwServiceManagerE", +@@ -38090,7 +39502,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-355" ++ "referenced_type" : "type-354" + } + ], + "fields" : +@@ -38099,13 +39511,13 @@ + "access" : "private", + "field_name" : "_hidl_mImpl", + "field_offset" : 544, +- "referenced_type" : "type-590" ++ "referenced_type" : "type-588" + } + ], + "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification", + "name" : "android::hidl::manager::V1_0::BnHwServiceNotification", +- "referenced_type" : "type-862", +- "self_type" : "type-862", ++ "referenced_type" : "type-859", ++ "self_type" : "type-859", + "size" : 80, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_023BnHwServiceNotificationE", +@@ -38227,10 +39639,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-876" ++ "referenced_type" : "type-873" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -38239,19 +39651,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 544, +- "referenced_type" : "type-874" ++ "referenced_type" : "type-871" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 576, +- "referenced_type" : "type-875" ++ "referenced_type" : "type-872" + } + ], + "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager", + "name" : "android::hidl::manager::V1_0::BpHwServiceManager", +- "referenced_type" : "type-873", +- "self_type" : "type-873", ++ "referenced_type" : "type-870", ++ "self_type" : "type-870", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_018BpHwServiceManagerE", +@@ -38458,10 +39870,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-867" ++ "referenced_type" : "type-864" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -38470,19 +39882,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 544, +- "referenced_type" : "type-865" ++ "referenced_type" : "type-862" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 576, +- "referenced_type" : "type-866" ++ "referenced_type" : "type-863" + } + ], + "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification", + "name" : "android::hidl::manager::V1_0::BpHwServiceNotification", +- "referenced_type" : "type-864", +- "self_type" : "type-864", ++ "referenced_type" : "type-861", ++ "self_type" : "type-861", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_023BpHwServiceNotificationE", +@@ -38668,10 +40080,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-552" ++ "referenced_type" : "type-548" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -38680,19 +40092,19 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 384, +- "referenced_type" : "type-578" ++ "referenced_type" : "type-576" + }, + { + "access" : "private", + "field_name" : "mOnewayQueue", + "field_offset" : 416, +- "referenced_type" : "type-269" ++ "referenced_type" : "type-268" + } + ], + "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager", + "name" : "android::hidl::manager::V1_0::BsServiceManager", +- "referenced_type" : "type-957", +- "self_type" : "type-957", ++ "referenced_type" : "type-954", ++ "self_type" : "type-954", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_016BsServiceManagerE", +@@ -38841,10 +40253,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-541" ++ "referenced_type" : "type-539" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -38853,19 +40265,19 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 384, +- "referenced_type" : "type-593" ++ "referenced_type" : "type-591" + }, + { + "access" : "private", + "field_name" : "mOnewayQueue", + "field_offset" : 416, +- "referenced_type" : "type-269" ++ "referenced_type" : "type-268" + } + ], + "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification", + "name" : "android::hidl::manager::V1_0::BsServiceNotification", +- "referenced_type" : "type-1084", +- "self_type" : "type-1084", ++ "referenced_type" : "type-1081", ++ "self_type" : "type-1081", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_021BsServiceNotificationE", +@@ -38998,8 +40410,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager", + "name" : "android::hidl::manager::V1_0::IServiceManager", +- "referenced_type" : "type-552", +- "self_type" : "type-552", ++ "referenced_type" : "type-548", ++ "self_type" : "type-548", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManagerE", +@@ -39141,12 +40553,12 @@ + [ + { + "field_name" : "interfaceName", +- "referenced_type" : "type-96" ++ "referenced_type" : "type-95" + }, + { + "field_name" : "instanceName", + "field_offset" : 128, +- "referenced_type" : "type-96" ++ "referenced_type" : "type-95" + }, + { + "field_name" : "pid", +@@ -39156,18 +40568,18 @@ + { + "field_name" : "clientPids", + "field_offset" : 320, +- "referenced_type" : "type-518" ++ "referenced_type" : "type-516" + }, + { + "field_name" : "arch", + "field_offset" : 448, +- "referenced_type" : "type-336" ++ "referenced_type" : "type-335" + } + ], + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo", + "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo", +- "referenced_type" : "type-548", +- "self_type" : "type-548", ++ "referenced_type" : "type-546", ++ "self_type" : "type-546", + "size" : 64, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoE" +@@ -39182,8 +40594,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification", + "name" : "android::hidl::manager::V1_0::IServiceNotification", +- "referenced_type" : "type-541", +- "self_type" : "type-541", ++ "referenced_type" : "type-539", ++ "self_type" : "type-539", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_020IServiceNotificationE", +@@ -39296,7 +40708,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-355" ++ "referenced_type" : "type-354" + } + ], + "fields" : +@@ -39305,13 +40717,13 @@ + "access" : "private", + "field_name" : "_hidl_mImpl", + "field_offset" : 544, +- "referenced_type" : "type-580" ++ "referenced_type" : "type-578" + } + ], + "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager", + "name" : "android::hidl::manager::V1_1::BnHwServiceManager", +- "referenced_type" : "type-879", +- "self_type" : "type-879", ++ "referenced_type" : "type-876", ++ "self_type" : "type-876", + "size" : 80, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_118BnHwServiceManagerE", +@@ -39433,10 +40845,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-884" ++ "referenced_type" : "type-881" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -39445,19 +40857,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 544, +- "referenced_type" : "type-882" ++ "referenced_type" : "type-879" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 576, +- "referenced_type" : "type-883" ++ "referenced_type" : "type-880" + } + ], + "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager", + "name" : "android::hidl::manager::V1_1::BpHwServiceManager", +- "referenced_type" : "type-881", +- "self_type" : "type-881", ++ "referenced_type" : "type-878", ++ "self_type" : "type-878", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_118BpHwServiceManagerE", +@@ -39667,10 +41079,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-562" ++ "referenced_type" : "type-560" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -39679,19 +41091,19 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 384, +- "referenced_type" : "type-583" ++ "referenced_type" : "type-581" + }, + { + "access" : "private", + "field_name" : "mOnewayQueue", + "field_offset" : 416, +- "referenced_type" : "type-269" ++ "referenced_type" : "type-268" + } + ], + "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager", + "name" : "android::hidl::manager::V1_1::BsServiceManager", +- "referenced_type" : "type-1140", +- "self_type" : "type-1140", ++ "referenced_type" : "type-1137", ++ "self_type" : "type-1137", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_116BsServiceManagerE", +@@ -39843,13 +41255,13 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-552" ++ "referenced_type" : "type-548" + } + ], + "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager", + "name" : "android::hidl::manager::V1_1::IServiceManager", +- "referenced_type" : "type-562", +- "self_type" : "type-562", ++ "referenced_type" : "type-560", ++ "self_type" : "type-560", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_115IServiceManagerE", +@@ -39994,7 +41406,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-355" ++ "referenced_type" : "type-354" + } + ], + "fields" : +@@ -40003,13 +41415,13 @@ + "access" : "private", + "field_name" : "_hidl_mImpl", + "field_offset" : 544, +- "referenced_type" : "type-595" ++ "referenced_type" : "type-593" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback", + "name" : "android::hidl::manager::V1_2::BnHwClientCallback", +- "referenced_type" : "type-888", +- "self_type" : "type-888", ++ "referenced_type" : "type-884", ++ "self_type" : "type-884", + "size" : 80, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_218BnHwClientCallbackE", +@@ -40131,7 +41543,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-355" ++ "referenced_type" : "type-354" + } + ], + "fields" : +@@ -40140,13 +41552,13 @@ + "access" : "private", + "field_name" : "_hidl_mImpl", + "field_offset" : 544, +- "referenced_type" : "type-585" ++ "referenced_type" : "type-583" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager", + "name" : "android::hidl::manager::V1_2::BnHwServiceManager", +- "referenced_type" : "type-845", +- "self_type" : "type-845", ++ "referenced_type" : "type-842", ++ "self_type" : "type-842", + "size" : 80, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_218BnHwServiceManagerE", +@@ -40268,10 +41680,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-893" ++ "referenced_type" : "type-890" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -40280,19 +41692,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 544, +- "referenced_type" : "type-891" ++ "referenced_type" : "type-888" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 576, +- "referenced_type" : "type-892" ++ "referenced_type" : "type-889" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback", + "name" : "android::hidl::manager::V1_2::BpHwClientCallback", +- "referenced_type" : "type-890", +- "self_type" : "type-890", ++ "referenced_type" : "type-887", ++ "self_type" : "type-887", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_218BpHwClientCallbackE", +@@ -40478,10 +41890,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-777" ++ "referenced_type" : "type-773" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -40490,19 +41902,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 544, +- "referenced_type" : "type-775" ++ "referenced_type" : "type-771" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 576, +- "referenced_type" : "type-776" ++ "referenced_type" : "type-772" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager", + "name" : "android::hidl::manager::V1_2::BpHwServiceManager", +- "referenced_type" : "type-774", +- "self_type" : "type-774", ++ "referenced_type" : "type-770", ++ "self_type" : "type-770", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_218BpHwServiceManagerE", +@@ -40727,10 +42139,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-544" ++ "referenced_type" : "type-542" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -40739,19 +42151,19 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 384, +- "referenced_type" : "type-600" ++ "referenced_type" : "type-598" + }, + { + "access" : "private", + "field_name" : "mOnewayQueue", + "field_offset" : 416, +- "referenced_type" : "type-269" ++ "referenced_type" : "type-268" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback", + "name" : "android::hidl::manager::V1_2::BsClientCallback", +- "referenced_type" : "type-1197", +- "self_type" : "type-1197", ++ "referenced_type" : "type-1194", ++ "self_type" : "type-1194", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_216BsClientCallbackE", +@@ -40879,10 +42291,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-565" ++ "referenced_type" : "type-563" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -40891,19 +42303,19 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 384, +- "referenced_type" : "type-588" ++ "referenced_type" : "type-586" + }, + { + "access" : "private", + "field_name" : "mOnewayQueue", + "field_offset" : 416, +- "referenced_type" : "type-269" ++ "referenced_type" : "type-268" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager", + "name" : "android::hidl::manager::V1_2::BsServiceManager", +- "referenced_type" : "type-1271", +- "self_type" : "type-1271", ++ "referenced_type" : "type-1268", ++ "self_type" : "type-1268", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_216BsServiceManagerE", +@@ -41075,8 +42487,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback", + "name" : "android::hidl::manager::V1_2::IClientCallback", +- "referenced_type" : "type-544", +- "self_type" : "type-544", ++ "referenced_type" : "type-542", ++ "self_type" : "type-542", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_215IClientCallbackE", +@@ -41189,13 +42601,13 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-562" ++ "referenced_type" : "type-560" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager", + "name" : "android::hidl::manager::V1_2::IServiceManager", +- "referenced_type" : "type-565", +- "self_type" : "type-565", ++ "referenced_type" : "type-563", ++ "self_type" : "type-563", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_215IServiceManagerE", +@@ -41361,21 +42773,21 @@ + [ + { + "field_name" : "key", +- "referenced_type" : "type-342" ++ "referenced_type" : "type-341" + }, + { + "field_name" : "value", + "field_offset" : 32, +- "referenced_type" : "type-71" ++ "referenced_type" : "type-70" + } + ], + "linker_set_key" : "android::key_value_pair_t >", + "name" : "android::key_value_pair_t >", +- "referenced_type" : "type-3807", +- "self_type" : "type-3807", ++ "referenced_type" : "type-3800", ++ "self_type" : "type-3800", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-342", "type-71" ], ++ "template_args" : [ "type-341", "type-70" ], + "unique_id" : "_ZTSN7android16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEE" + }, + { +@@ -41384,21 +42796,21 @@ + [ + { + "field_name" : "key", +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { + "field_name" : "value", + "field_offset" : 32, +- "referenced_type" : "type-2344" ++ "referenced_type" : "type-2339" + } + ], + "linker_set_key" : "android::key_value_pair_t", + "name" : "android::key_value_pair_t", +- "referenced_type" : "type-2384", +- "self_type" : "type-2384", ++ "referenced_type" : "type-2379", ++ "self_type" : "type-2379", + "size" : 16, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-139", "type-2344" ], ++ "template_args" : [ "type-138", "type-2339" ], + "unique_id" : "_ZTSN7android16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { +@@ -41408,17 +42820,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-500" ++ "referenced_type" : "type-498" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-499", +- "self_type" : "type-499", ++ "referenced_type" : "type-497", ++ "self_type" : "type-497", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-501" ], ++ "template_args" : [ "type-499" ], + "unique_id" : "_ZTSN7android2spINS_6ThreadEEE" + }, + { +@@ -41428,17 +42840,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-384" ++ "referenced_type" : "type-383" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-472", +- "self_type" : "type-472", ++ "referenced_type" : "type-470", ++ "self_type" : "type-470", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-473" ], ++ "template_args" : [ "type-471" ], + "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE" + }, + { +@@ -41448,17 +42860,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-2471" ++ "referenced_type" : "type-2466" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-2470", +- "self_type" : "type-2470", ++ "referenced_type" : "type-2465", ++ "self_type" : "type-2465", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-2473" ], ++ "template_args" : [ "type-2468" ], + "unique_id" : "_ZTSN7android2spINS_8hardware18BufferedTextOutput11BufferStateEEE" + }, + { +@@ -41468,17 +42880,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-158" ++ "referenced_type" : "type-157" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-157", +- "self_type" : "type-157", ++ "referenced_type" : "type-156", ++ "self_type" : "type-156", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-159" ], ++ "template_args" : [ "type-158" ], + "unique_id" : "_ZTSN7android2spINS_8hardware10HidlMemoryEEE" + }, + { +@@ -41488,17 +42900,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-945" ++ "referenced_type" : "type-942" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-962", +- "self_type" : "type-962", ++ "referenced_type" : "type-959", ++ "self_type" : "type-959", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-963" ], ++ "template_args" : [ "type-960" ], + "unique_id" : "_ZTSN7android2spINS_8hardware7IBinder14DeathRecipientEEE" + }, + { +@@ -41508,17 +42920,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-72" ++ "referenced_type" : "type-71" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-71", +- "self_type" : "type-71", ++ "referenced_type" : "type-70", ++ "self_type" : "type-70", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-74" ], ++ "template_args" : [ "type-73" ], + "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE" + }, + { +@@ -41528,17 +42940,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-969" ++ "referenced_type" : "type-966" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-968", +- "self_type" : "type-968", ++ "referenced_type" : "type-965", ++ "self_type" : "type-965", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-971" ], ++ "template_args" : [ "type-968" ], + "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE" + }, + { +@@ -41548,17 +42960,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-767" ++ "referenced_type" : "type-764" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-766", +- "self_type" : "type-766", ++ "referenced_type" : "type-763", ++ "self_type" : "type-763", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-769" ], ++ "template_args" : [ "type-766" ], + "unique_id" : "_ZTSN7android2spINS_8hardware25PassthroughServiceManagerEEE" + }, + { +@@ -41568,17 +42980,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-492" ++ "referenced_type" : "type-490" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-491", +- "self_type" : "type-491", ++ "referenced_type" : "type-489", ++ "self_type" : "type-489", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-494" ], ++ "template_args" : [ "type-492" ], + "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE" + }, + { +@@ -41588,17 +43000,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-598" ++ "referenced_type" : "type-596" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-602", +- "self_type" : "type-602", ++ "referenced_type" : "type-600", ++ "self_type" : "type-600", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-603" ], ++ "template_args" : [ "type-601" ], + "unique_id" : "_ZTSN7android2spINS_8hardware7details21ClientCounterCallbackEEE" + }, + { +@@ -41608,17 +43020,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-784" ++ "referenced_type" : "type-781" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-789", +- "self_type" : "type-789", ++ "referenced_type" : "type-786", ++ "self_type" : "type-786", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-790" ], ++ "template_args" : [ "type-787" ], + "unique_id" : "_ZTSN7android2spINS_8hardware7details6WaiterEEE" + }, + { +@@ -41628,17 +43040,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-363" ++ "referenced_type" : "type-362" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-951", +- "self_type" : "type-951", ++ "referenced_type" : "type-948", ++ "self_type" : "type-948", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-360" ], ++ "template_args" : [ "type-359" ], + "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE" + }, + { +@@ -41648,17 +43060,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-143" ++ "referenced_type" : "type-142" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-142", +- "self_type" : "type-142", ++ "referenced_type" : "type-141", ++ "self_type" : "type-141", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-144" ], ++ "template_args" : [ "type-143" ], + "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE" + }, + { +@@ -41674,8 +43086,8 @@ + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-356", +- "self_type" : "type-356", ++ "referenced_type" : "type-355", ++ "self_type" : "type-355", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", + "template_args" : [ "type-34" ], +@@ -41688,17 +43100,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-575", +- "self_type" : "type-575", ++ "referenced_type" : "type-573", ++ "self_type" : "type-573", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-552" ], ++ "template_args" : [ "type-548" ], + "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE" + }, + { +@@ -41708,17 +43120,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-590", +- "self_type" : "type-590", ++ "referenced_type" : "type-588", ++ "self_type" : "type-588", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-541" ], ++ "template_args" : [ "type-539" ], + "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE" + }, + { +@@ -41728,17 +43140,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-580", +- "self_type" : "type-580", ++ "referenced_type" : "type-578", ++ "self_type" : "type-578", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-562" ], ++ "template_args" : [ "type-560" ], + "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE" + }, + { +@@ -41748,17 +43160,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-595", +- "self_type" : "type-595", ++ "referenced_type" : "type-593", ++ "self_type" : "type-593", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-544" ], ++ "template_args" : [ "type-542" ], + "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IClientCallbackEEE" + }, + { +@@ -41768,36 +43180,36 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-585", +- "self_type" : "type-585", ++ "referenced_type" : "type-583", ++ "self_type" : "type-583", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-565" ], ++ "template_args" : [ "type-563" ], + "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3747", +- "self_type" : "type-3747", ++ "referenced_type" : "type-3740", ++ "self_type" : "type-3740", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-68" ], ++ "template_args" : [ "type-67" ], + "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBaseEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3746", +- "self_type" : "type-3746", ++ "referenced_type" : "type-3739", ++ "self_type" : "type-3739", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-35" ], +@@ -41807,118 +43219,118 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3865", +- "self_type" : "type-3865", ++ "referenced_type" : "type-3858", ++ "self_type" : "type-3858", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-342" ], ++ "template_args" : [ "type-341" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_8String16EEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3745", +- "self_type" : "type-3745", ++ "referenced_type" : "type-3738", ++ "self_type" : "type-3738", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2332" ], ++ "template_args" : [ "type-2327" ], + "unique_id" : "_ZTSN7android13trait_pointerIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-2463", +- "self_type" : "type-2463", ++ "referenced_type" : "type-2458", ++ "self_type" : "type-2458", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2374" ], ++ "template_args" : [ "type-2369" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-2462", +- "self_type" : "type-2462", ++ "referenced_type" : "type-2457", ++ "self_type" : "type-2457", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2344" ], ++ "template_args" : [ "type-2339" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3863", +- "self_type" : "type-3863", ++ "referenced_type" : "type-3856", ++ "self_type" : "type-3856", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2416" ], ++ "template_args" : [ "type-2411" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer > >", + "name" : "android::trait_pointer > >", +- "referenced_type" : "type-3864", +- "self_type" : "type-3864", ++ "referenced_type" : "type-3857", ++ "self_type" : "type-3857", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3807" ], ++ "template_args" : [ "type-3800" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer >", + "name" : "android::trait_pointer >", +- "referenced_type" : "type-2460", +- "self_type" : "type-2460", ++ "referenced_type" : "type-2455", ++ "self_type" : "type-2455", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2384" ], ++ "template_args" : [ "type-2379" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer >", + "name" : "android::trait_pointer >", +- "referenced_type" : "type-2530", +- "self_type" : "type-2530", ++ "referenced_type" : "type-2525", ++ "self_type" : "type-2525", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2470" ], ++ "template_args" : [ "type-2465" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer >", + "name" : "android::trait_pointer >", +- "referenced_type" : "type-3866", +- "self_type" : "type-3866", ++ "referenced_type" : "type-3859", ++ "self_type" : "type-3859", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-71" ], ++ "template_args" : [ "type-70" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware7IBinderEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-2461", +- "self_type" : "type-2461", ++ "referenced_type" : "type-2456", ++ "self_type" : "type-2456", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-139" ], ++ "template_args" : [ "type-138" ], + "unique_id" : "_ZTSN7android13trait_pointerIPKvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3884", +- "self_type" : "type-3884", ++ "referenced_type" : "type-3877", ++ "self_type" : "type-3877", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-19" ], +@@ -41928,19 +43340,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-3741", +- "self_type" : "type-3741", ++ "referenced_type" : "type-3734", ++ "self_type" : "type-3734", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-68" ], ++ "template_args" : [ "type-67" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBaseEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-3740", +- "self_type" : "type-3740", ++ "referenced_type" : "type-3733", ++ "self_type" : "type-3733", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-35" ], +@@ -41950,140 +43362,140 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-3857", +- "self_type" : "type-3857", ++ "referenced_type" : "type-3850", ++ "self_type" : "type-3850", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-342" ], ++ "template_args" : [ "type-341" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8String16EEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-3737", +- "self_type" : "type-3737", ++ "referenced_type" : "type-3730", ++ "self_type" : "type-3730", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2332" ], ++ "template_args" : [ "type-2327" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-2455", +- "self_type" : "type-2455", ++ "referenced_type" : "type-2450", ++ "self_type" : "type-2450", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2374" ], ++ "template_args" : [ "type-2369" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-2453", +- "self_type" : "type-2453", ++ "referenced_type" : "type-2448", ++ "self_type" : "type-2448", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2344" ], ++ "template_args" : [ "type-2339" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-3856", +- "self_type" : "type-3856", ++ "referenced_type" : "type-3849", ++ "self_type" : "type-3849", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2416" ], ++ "template_args" : [ "type-2411" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy > >", + "name" : "android::trait_trivial_copy > >", +- "referenced_type" : "type-3859", +- "self_type" : "type-3859", ++ "referenced_type" : "type-3852", ++ "self_type" : "type-3852", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3807" ], ++ "template_args" : [ "type-3800" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy >", + "name" : "android::trait_trivial_copy >", +- "referenced_type" : "type-2454", +- "self_type" : "type-2454", ++ "referenced_type" : "type-2449", ++ "self_type" : "type-2449", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2384" ], ++ "template_args" : [ "type-2379" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy >", + "name" : "android::trait_trivial_copy >", +- "referenced_type" : "type-2528", +- "self_type" : "type-2528", ++ "referenced_type" : "type-2523", ++ "self_type" : "type-2523", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2470" ], ++ "template_args" : [ "type-2465" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy >", + "name" : "android::trait_trivial_copy >", +- "referenced_type" : "type-3858", +- "self_type" : "type-3858", ++ "referenced_type" : "type-3851", ++ "self_type" : "type-3851", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-71" ], ++ "template_args" : [ "type-70" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware7IBinderEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-191", +- "self_type" : "type-191", ++ "referenced_type" : "type-190", ++ "self_type" : "type-190", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-44" ], ++ "template_args" : [ "type-43" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-196", +- "self_type" : "type-196", ++ "referenced_type" : "type-195", ++ "self_type" : "type-195", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-48" ], ++ "template_args" : [ "type-47" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-2452", +- "self_type" : "type-2452", ++ "referenced_type" : "type-2447", ++ "self_type" : "type-2447", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-139" ], ++ "template_args" : [ "type-138" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIPKvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-529", +- "self_type" : "type-529", ++ "referenced_type" : "type-527", ++ "self_type" : "type-527", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-4" ], +@@ -42093,19 +43505,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-512", +- "self_type" : "type-512", ++ "referenced_type" : "type-511", ++ "self_type" : "type-511", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-298" ], ++ "template_args" : [ "type-297" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-326", +- "self_type" : "type-326", ++ "referenced_type" : "type-325", ++ "self_type" : "type-325", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-19" ], +@@ -42115,8 +43527,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-466", +- "self_type" : "type-466", ++ "referenced_type" : "type-465", ++ "self_type" : "type-465", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-447" ], +@@ -42126,19 +43538,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-395", +- "self_type" : "type-395", ++ "referenced_type" : "type-394", ++ "self_type" : "type-394", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-111" ], ++ "template_args" : [ "type-110" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-205", +- "self_type" : "type-205", ++ "referenced_type" : "type-204", ++ "self_type" : "type-204", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-2" ], +@@ -42148,19 +43560,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-201", +- "self_type" : "type-201", ++ "referenced_type" : "type-200", ++ "self_type" : "type-200", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-199" ], ++ "template_args" : [ "type-198" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-354", +- "self_type" : "type-354", ++ "referenced_type" : "type-353", ++ "self_type" : "type-353", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-1" ], +@@ -42170,8 +43582,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-504", +- "self_type" : "type-504", ++ "referenced_type" : "type-502", ++ "self_type" : "type-502", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-21" ], +@@ -42181,52 +43593,52 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-434", +- "self_type" : "type-434", ++ "referenced_type" : "type-432", ++ "self_type" : "type-432", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-416" ], ++ "template_args" : [ "type-415" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyImEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-211", +- "self_type" : "type-211", ++ "referenced_type" : "type-210", ++ "self_type" : "type-210", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-132" ], ++ "template_args" : [ "type-131" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyItEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-187", +- "self_type" : "type-187", ++ "referenced_type" : "type-186", ++ "self_type" : "type-186", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-106" ], ++ "template_args" : [ "type-105" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-3683", +- "self_type" : "type-3683", ++ "referenced_type" : "type-3676", ++ "self_type" : "type-3676", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-68" ], ++ "template_args" : [ "type-67" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBaseEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-3673", +- "self_type" : "type-3673", ++ "referenced_type" : "type-3666", ++ "self_type" : "type-3666", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-35" ], +@@ -42236,140 +43648,140 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-3850", +- "self_type" : "type-3850", ++ "referenced_type" : "type-3843", ++ "self_type" : "type-3843", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-342" ], ++ "template_args" : [ "type-341" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8String16EEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-3662", +- "self_type" : "type-3662", ++ "referenced_type" : "type-3655", ++ "self_type" : "type-3655", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2332" ], ++ "template_args" : [ "type-2327" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-2447", +- "self_type" : "type-2447", ++ "referenced_type" : "type-2442", ++ "self_type" : "type-2442", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2374" ], ++ "template_args" : [ "type-2369" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-2446", +- "self_type" : "type-2446", ++ "referenced_type" : "type-2441", ++ "self_type" : "type-2441", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2344" ], ++ "template_args" : [ "type-2339" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-3848", +- "self_type" : "type-3848", ++ "referenced_type" : "type-3841", ++ "self_type" : "type-3841", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2416" ], ++ "template_args" : [ "type-2411" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor > >", + "name" : "android::trait_trivial_ctor > >", +- "referenced_type" : "type-3849", +- "self_type" : "type-3849", ++ "referenced_type" : "type-3842", ++ "self_type" : "type-3842", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3807" ], ++ "template_args" : [ "type-3800" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor >", + "name" : "android::trait_trivial_ctor >", +- "referenced_type" : "type-2444", +- "self_type" : "type-2444", ++ "referenced_type" : "type-2439", ++ "self_type" : "type-2439", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2384" ], ++ "template_args" : [ "type-2379" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor >", + "name" : "android::trait_trivial_ctor >", +- "referenced_type" : "type-2469", +- "self_type" : "type-2469", ++ "referenced_type" : "type-2464", ++ "self_type" : "type-2464", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2470" ], ++ "template_args" : [ "type-2465" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor >", + "name" : "android::trait_trivial_ctor >", +- "referenced_type" : "type-3851", +- "self_type" : "type-3851", ++ "referenced_type" : "type-3844", ++ "self_type" : "type-3844", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-71" ], ++ "template_args" : [ "type-70" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware7IBinderEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-189", +- "self_type" : "type-189", ++ "referenced_type" : "type-188", ++ "self_type" : "type-188", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-44" ], ++ "template_args" : [ "type-43" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-193", +- "self_type" : "type-193", ++ "referenced_type" : "type-192", ++ "self_type" : "type-192", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-48" ], ++ "template_args" : [ "type-47" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-2445", +- "self_type" : "type-2445", ++ "referenced_type" : "type-2440", ++ "self_type" : "type-2440", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-139" ], ++ "template_args" : [ "type-138" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIPKvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-522", +- "self_type" : "type-522", ++ "referenced_type" : "type-520", ++ "self_type" : "type-520", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-4" ], +@@ -42379,19 +43791,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-508", +- "self_type" : "type-508", ++ "referenced_type" : "type-506", ++ "self_type" : "type-506", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-298" ], ++ "template_args" : [ "type-297" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-213", +- "self_type" : "type-213", ++ "referenced_type" : "type-212", ++ "self_type" : "type-212", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-19" ], +@@ -42412,19 +43824,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-364", +- "self_type" : "type-364", ++ "referenced_type" : "type-363", ++ "self_type" : "type-363", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-111" ], ++ "template_args" : [ "type-110" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-203", +- "self_type" : "type-203", ++ "referenced_type" : "type-202", ++ "self_type" : "type-202", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-2" ], +@@ -42434,19 +43846,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-198", +- "self_type" : "type-198", ++ "referenced_type" : "type-197", ++ "self_type" : "type-197", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-199" ], ++ "template_args" : [ "type-198" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-337", +- "self_type" : "type-337", ++ "referenced_type" : "type-336", ++ "self_type" : "type-336", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-1" ], +@@ -42456,8 +43868,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-486", +- "self_type" : "type-486", ++ "referenced_type" : "type-485", ++ "self_type" : "type-485", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-21" ], +@@ -42467,52 +43879,52 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-415", +- "self_type" : "type-415", ++ "referenced_type" : "type-414", ++ "self_type" : "type-414", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-416" ], ++ "template_args" : [ "type-415" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorImEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-209", +- "self_type" : "type-209", ++ "referenced_type" : "type-208", ++ "self_type" : "type-208", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-132" ], ++ "template_args" : [ "type-131" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-185", +- "self_type" : "type-185", ++ "referenced_type" : "type-184", ++ "self_type" : "type-184", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-106" ], ++ "template_args" : [ "type-105" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-3735", +- "self_type" : "type-3735", ++ "referenced_type" : "type-3728", ++ "self_type" : "type-3728", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-68" ], ++ "template_args" : [ "type-67" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBaseEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-3726", +- "self_type" : "type-3726", ++ "referenced_type" : "type-3719", ++ "self_type" : "type-3719", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-35" ], +@@ -42522,140 +43934,140 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-3853", +- "self_type" : "type-3853", ++ "referenced_type" : "type-3846", ++ "self_type" : "type-3846", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-342" ], ++ "template_args" : [ "type-341" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8String16EEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-3715", +- "self_type" : "type-3715", ++ "referenced_type" : "type-3708", ++ "self_type" : "type-3708", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2332" ], ++ "template_args" : [ "type-2327" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-2451", +- "self_type" : "type-2451", ++ "referenced_type" : "type-2446", ++ "self_type" : "type-2446", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2374" ], ++ "template_args" : [ "type-2369" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-2449", +- "self_type" : "type-2449", ++ "referenced_type" : "type-2444", ++ "self_type" : "type-2444", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2344" ], ++ "template_args" : [ "type-2339" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-3852", +- "self_type" : "type-3852", ++ "referenced_type" : "type-3845", ++ "self_type" : "type-3845", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2416" ], ++ "template_args" : [ "type-2411" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor > >", + "name" : "android::trait_trivial_dtor > >", +- "referenced_type" : "type-3855", +- "self_type" : "type-3855", ++ "referenced_type" : "type-3848", ++ "self_type" : "type-3848", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3807" ], ++ "template_args" : [ "type-3800" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor >", + "name" : "android::trait_trivial_dtor >", +- "referenced_type" : "type-2450", +- "self_type" : "type-2450", ++ "referenced_type" : "type-2445", ++ "self_type" : "type-2445", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2384" ], ++ "template_args" : [ "type-2379" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor >", + "name" : "android::trait_trivial_dtor >", +- "referenced_type" : "type-2527", +- "self_type" : "type-2527", ++ "referenced_type" : "type-2522", ++ "self_type" : "type-2522", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2470" ], ++ "template_args" : [ "type-2465" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor >", + "name" : "android::trait_trivial_dtor >", +- "referenced_type" : "type-3854", +- "self_type" : "type-3854", ++ "referenced_type" : "type-3847", ++ "self_type" : "type-3847", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-71" ], ++ "template_args" : [ "type-70" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware7IBinderEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-190", +- "self_type" : "type-190", ++ "referenced_type" : "type-189", ++ "self_type" : "type-189", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-44" ], ++ "template_args" : [ "type-43" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-195", +- "self_type" : "type-195", ++ "referenced_type" : "type-194", ++ "self_type" : "type-194", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-48" ], ++ "template_args" : [ "type-47" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-2448", +- "self_type" : "type-2448", ++ "referenced_type" : "type-2443", ++ "self_type" : "type-2443", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-139" ], ++ "template_args" : [ "type-138" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIPKvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-526", +- "self_type" : "type-526", ++ "referenced_type" : "type-524", ++ "self_type" : "type-524", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-4" ], +@@ -42665,19 +44077,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-509", +- "self_type" : "type-509", ++ "referenced_type" : "type-507", ++ "self_type" : "type-507", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-298" ], ++ "template_args" : [ "type-297" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-323", +- "self_type" : "type-323", ++ "referenced_type" : "type-322", ++ "self_type" : "type-322", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-19" ], +@@ -42687,8 +44099,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-458", +- "self_type" : "type-458", ++ "referenced_type" : "type-457", ++ "self_type" : "type-457", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-447" ], +@@ -42698,19 +44110,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-375", +- "self_type" : "type-375", ++ "referenced_type" : "type-374", ++ "self_type" : "type-374", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-111" ], ++ "template_args" : [ "type-110" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-204", +- "self_type" : "type-204", ++ "referenced_type" : "type-203", ++ "self_type" : "type-203", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-2" ], +@@ -42720,19 +44132,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-200", +- "self_type" : "type-200", ++ "referenced_type" : "type-199", ++ "self_type" : "type-199", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-199" ], ++ "template_args" : [ "type-198" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-346", +- "self_type" : "type-346", ++ "referenced_type" : "type-345", ++ "self_type" : "type-345", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-1" ], +@@ -42742,8 +44154,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-497", +- "self_type" : "type-497", ++ "referenced_type" : "type-496", ++ "self_type" : "type-496", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-21" ], +@@ -42753,52 +44165,52 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-425", +- "self_type" : "type-425", ++ "referenced_type" : "type-423", ++ "self_type" : "type-423", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-416" ], ++ "template_args" : [ "type-415" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorImEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-210", +- "self_type" : "type-210", ++ "referenced_type" : "type-209", ++ "self_type" : "type-209", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-132" ], ++ "template_args" : [ "type-131" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-186", +- "self_type" : "type-186", ++ "referenced_type" : "type-185", ++ "self_type" : "type-185", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-106" ], ++ "template_args" : [ "type-105" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-3744", +- "self_type" : "type-3744", ++ "referenced_type" : "type-3737", ++ "self_type" : "type-3737", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-68" ], ++ "template_args" : [ "type-67" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBaseEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-3743", +- "self_type" : "type-3743", ++ "referenced_type" : "type-3736", ++ "self_type" : "type-3736", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-35" ], +@@ -42808,151 +44220,151 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-353", +- "self_type" : "type-353", ++ "referenced_type" : "type-352", ++ "self_type" : "type-352", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/String16.h", +- "template_args" : [ "type-342" ], ++ "template_args" : [ "type-341" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-228", +- "self_type" : "type-228", ++ "referenced_type" : "type-227", ++ "self_type" : "type-227", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/String8.h", +- "template_args" : [ "type-221" ], ++ "template_args" : [ "type-220" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-3742", +- "self_type" : "type-3742", ++ "referenced_type" : "type-3735", ++ "self_type" : "type-3735", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2332" ], ++ "template_args" : [ "type-2327" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-2459", +- "self_type" : "type-2459", ++ "referenced_type" : "type-2454", ++ "self_type" : "type-2454", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2374" ], ++ "template_args" : [ "type-2369" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-2457", +- "self_type" : "type-2457", ++ "referenced_type" : "type-2452", ++ "self_type" : "type-2452", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2344" ], ++ "template_args" : [ "type-2339" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-3860", +- "self_type" : "type-3860", ++ "referenced_type" : "type-3853", ++ "self_type" : "type-3853", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2416" ], ++ "template_args" : [ "type-2411" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move > >", + "name" : "android::trait_trivial_move > >", +- "referenced_type" : "type-3862", +- "self_type" : "type-3862", ++ "referenced_type" : "type-3855", ++ "self_type" : "type-3855", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3807" ], ++ "template_args" : [ "type-3800" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move >", + "name" : "android::trait_trivial_move >", +- "referenced_type" : "type-2458", +- "self_type" : "type-2458", ++ "referenced_type" : "type-2453", ++ "self_type" : "type-2453", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2384" ], ++ "template_args" : [ "type-2379" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move >", + "name" : "android::trait_trivial_move >", +- "referenced_type" : "type-2529", +- "self_type" : "type-2529", ++ "referenced_type" : "type-2524", ++ "self_type" : "type-2524", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2470" ], ++ "template_args" : [ "type-2465" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move >", + "name" : "android::trait_trivial_move >", +- "referenced_type" : "type-3861", +- "self_type" : "type-3861", ++ "referenced_type" : "type-3854", ++ "self_type" : "type-3854", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-71" ], ++ "template_args" : [ "type-70" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware7IBinderEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-192", +- "self_type" : "type-192", ++ "referenced_type" : "type-191", ++ "self_type" : "type-191", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-44" ], ++ "template_args" : [ "type-43" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-197", +- "self_type" : "type-197", ++ "referenced_type" : "type-196", ++ "self_type" : "type-196", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-48" ], ++ "template_args" : [ "type-47" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-2456", +- "self_type" : "type-2456", ++ "referenced_type" : "type-2451", ++ "self_type" : "type-2451", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-139" ], ++ "template_args" : [ "type-138" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIPKvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-536", +- "self_type" : "type-536", ++ "referenced_type" : "type-534", ++ "self_type" : "type-534", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-4" ], +@@ -42962,19 +44374,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-514", +- "self_type" : "type-514", ++ "referenced_type" : "type-512", ++ "self_type" : "type-512", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-298" ], ++ "template_args" : [ "type-297" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-331", +- "self_type" : "type-331", ++ "referenced_type" : "type-330", ++ "self_type" : "type-330", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-19" ], +@@ -42984,8 +44396,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-477", +- "self_type" : "type-477", ++ "referenced_type" : "type-475", ++ "self_type" : "type-475", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-447" ], +@@ -42995,19 +44407,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-406", +- "self_type" : "type-406", ++ "referenced_type" : "type-405", ++ "self_type" : "type-405", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-111" ], ++ "template_args" : [ "type-110" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-208", +- "self_type" : "type-208", ++ "referenced_type" : "type-207", ++ "self_type" : "type-207", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-2" ], +@@ -43017,19 +44429,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-202", +- "self_type" : "type-202", ++ "referenced_type" : "type-201", ++ "self_type" : "type-201", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-199" ], ++ "template_args" : [ "type-198" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-359", +- "self_type" : "type-359", ++ "referenced_type" : "type-358", ++ "self_type" : "type-358", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-1" ], +@@ -43039,8 +44451,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-505", +- "self_type" : "type-505", ++ "referenced_type" : "type-503", ++ "self_type" : "type-503", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-21" ], +@@ -43054,48 +44466,48 @@ + "self_type" : "type-435", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-416" ], ++ "template_args" : [ "type-415" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveImEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-212", +- "self_type" : "type-212", ++ "referenced_type" : "type-211", ++ "self_type" : "type-211", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-132" ], ++ "template_args" : [ "type-131" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveItEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-188", +- "self_type" : "type-188", ++ "referenced_type" : "type-187", ++ "self_type" : "type-187", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-106" ], ++ "template_args" : [ "type-105" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3750", +- "self_type" : "type-3750", ++ "referenced_type" : "type-3743", ++ "self_type" : "type-3743", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-68" ], ++ "template_args" : [ "type-67" ], + "unique_id" : "_ZTSN7android6traitsIPNS_7RefBaseEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3749", +- "self_type" : "type-3749", ++ "referenced_type" : "type-3742", ++ "self_type" : "type-3742", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-35" ], +@@ -43105,118 +44517,118 @@ + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3869", +- "self_type" : "type-3869", ++ "referenced_type" : "type-3862", ++ "self_type" : "type-3862", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-342" ], ++ "template_args" : [ "type-341" ], + "unique_id" : "_ZTSN7android6traitsINS_8String16EEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3748", +- "self_type" : "type-3748", ++ "referenced_type" : "type-3741", ++ "self_type" : "type-3741", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2332" ], ++ "template_args" : [ "type-2327" ], + "unique_id" : "_ZTSN7android6traitsIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-2467", +- "self_type" : "type-2467", ++ "referenced_type" : "type-2462", ++ "self_type" : "type-2462", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2374" ], ++ "template_args" : [ "type-2369" ], + "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-2466", +- "self_type" : "type-2466", ++ "referenced_type" : "type-2461", ++ "self_type" : "type-2461", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2344" ], ++ "template_args" : [ "type-2339" ], + "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3867", +- "self_type" : "type-3867", ++ "referenced_type" : "type-3860", ++ "self_type" : "type-3860", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2416" ], ++ "template_args" : [ "type-2411" ], + "unique_id" : "_ZTSN7android6traitsINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits > >", + "name" : "android::traits > >", +- "referenced_type" : "type-3868", +- "self_type" : "type-3868", ++ "referenced_type" : "type-3861", ++ "self_type" : "type-3861", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3807" ], ++ "template_args" : [ "type-3800" ], + "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits >", + "name" : "android::traits >", +- "referenced_type" : "type-2464", +- "self_type" : "type-2464", ++ "referenced_type" : "type-2459", ++ "self_type" : "type-2459", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2384" ], ++ "template_args" : [ "type-2379" ], + "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits >", + "name" : "android::traits >", +- "referenced_type" : "type-2531", +- "self_type" : "type-2531", ++ "referenced_type" : "type-2526", ++ "self_type" : "type-2526", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2470" ], ++ "template_args" : [ "type-2465" ], + "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits >", + "name" : "android::traits >", +- "referenced_type" : "type-3870", +- "self_type" : "type-3870", ++ "referenced_type" : "type-3863", ++ "self_type" : "type-3863", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-71" ], ++ "template_args" : [ "type-70" ], + "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware7IBinderEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-2465", +- "self_type" : "type-2465", ++ "referenced_type" : "type-2460", ++ "self_type" : "type-2460", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-139" ], ++ "template_args" : [ "type-138" ], + "unique_id" : "_ZTSN7android6traitsIPKvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3885", +- "self_type" : "type-3885", ++ "referenced_type" : "type-3878", ++ "self_type" : "type-3878", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-19" ], +@@ -43227,16 +44639,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3618" ++ "referenced_type" : "type-3611" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-3617", +- "self_type" : "type-3617", ++ "referenced_type" : "type-3610", ++ "self_type" : "type-3610", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-68" ], ++ "template_args" : [ "type-67" ], + "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBaseEEE" + }, + { +@@ -43244,13 +44656,13 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3616" ++ "referenced_type" : "type-3609" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-3615", +- "self_type" : "type-3615", ++ "referenced_type" : "type-3608", ++ "self_type" : "type-3608", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-35" ], +@@ -43261,16 +44673,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3614" ++ "referenced_type" : "type-3607" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-3613", +- "self_type" : "type-3613", ++ "referenced_type" : "type-3606", ++ "self_type" : "type-3606", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2332" ], ++ "template_args" : [ "type-2327" ], + "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_8hardware9BHwBinderEEE" + }, + { +@@ -43278,16 +44690,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2396" ++ "referenced_type" : "type-2391" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-2395", +- "self_type" : "type-2395", ++ "referenced_type" : "type-2390", ++ "self_type" : "type-2390", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2374" ], ++ "template_args" : [ "type-2369" ], + "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { +@@ -43295,16 +44707,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3816" ++ "referenced_type" : "type-3809" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-3815", +- "self_type" : "type-3815", ++ "referenced_type" : "type-3808", ++ "self_type" : "type-3808", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2416" ], ++ "template_args" : [ "type-2411" ], + "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware12ProcessState12handle_entryEEE" + }, + { +@@ -43312,16 +44724,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3818" ++ "referenced_type" : "type-3811" + } + ], + "linker_set_key" : "android::use_trivial_move > >", + "name" : "android::use_trivial_move > >", +- "referenced_type" : "type-3817", +- "self_type" : "type-3817", ++ "referenced_type" : "type-3810", ++ "self_type" : "type-3810", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3807" ], ++ "template_args" : [ "type-3800" ], + "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { +@@ -43329,16 +44741,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2394" ++ "referenced_type" : "type-2389" + } + ], + "linker_set_key" : "android::use_trivial_move >", + "name" : "android::use_trivial_move >", +- "referenced_type" : "type-2393", +- "self_type" : "type-2393", ++ "referenced_type" : "type-2388", ++ "self_type" : "type-2388", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2384" ], ++ "template_args" : [ "type-2379" ], + "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { +@@ -43346,16 +44758,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2533" ++ "referenced_type" : "type-2528" + } + ], + "linker_set_key" : "android::use_trivial_move >", + "name" : "android::use_trivial_move >", +- "referenced_type" : "type-2532", +- "self_type" : "type-2532", ++ "referenced_type" : "type-2527", ++ "self_type" : "type-2527", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2470" ], ++ "template_args" : [ "type-2465" ], + "unique_id" : "_ZTSN7android16use_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { +@@ -43363,13 +44775,13 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3873" ++ "referenced_type" : "type-3866" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-3872", +- "self_type" : "type-3872", ++ "referenced_type" : "type-3865", ++ "self_type" : "type-3865", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-19" ], +@@ -43382,7 +44794,7 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-384" ++ "referenced_type" : "type-383" + }, + { + "access" : "private", +@@ -43394,11 +44806,11 @@ + "linker_set_key" : "android::wp", + "name" : "android::wp", + "record_kind" : "class", +- "referenced_type" : "type-383", +- "self_type" : "type-383", ++ "referenced_type" : "type-382", ++ "self_type" : "type-382", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h", +- "template_args" : [ "type-386" ], ++ "template_args" : [ "type-385" ], + "unique_id" : "_ZTSN7android2wpINS_8hardware9BHwBinderEEE" + }, + { +@@ -43408,7 +44820,7 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-945" ++ "referenced_type" : "type-942" + }, + { + "access" : "private", +@@ -43420,11 +44832,11 @@ + "linker_set_key" : "android::wp", + "name" : "android::wp", + "record_kind" : "class", +- "referenced_type" : "type-944", +- "self_type" : "type-944", ++ "referenced_type" : "type-941", ++ "self_type" : "type-941", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h", +- "template_args" : [ "type-948" ], ++ "template_args" : [ "type-945" ], + "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinder14DeathRecipientEEE" + }, + { +@@ -43434,7 +44846,7 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + }, + { + "access" : "private", +@@ -43446,11 +44858,11 @@ + "linker_set_key" : "android::wp", + "name" : "android::wp", + "record_kind" : "class", +- "referenced_type" : "type-2382", +- "self_type" : "type-2382", ++ "referenced_type" : "type-2377", ++ "self_type" : "type-2377", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h", +- "template_args" : [ "type-2328" ], ++ "template_args" : [ "type-2323" ], + "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinderEEE" + }, + { +@@ -43460,7 +44872,7 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-143" ++ "referenced_type" : "type-142" + }, + { + "access" : "private", +@@ -43472,11 +44884,11 @@ + "linker_set_key" : "android::wp", + "name" : "android::wp", + "record_kind" : "class", +- "referenced_type" : "type-361", +- "self_type" : "type-361", ++ "referenced_type" : "type-360", ++ "self_type" : "type-360", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h", +- "template_args" : [ "type-144" ], ++ "template_args" : [ "type-143" ], + "unique_id" : "_ZTSN7android2wpINS_8hardware20hidl_death_recipientEEE" + }, + { +@@ -43511,18 +44923,18 @@ + [ + { + "field_name" : "maxContentLightLevel", +- "referenced_type" : "type-298" ++ "referenced_type" : "type-297" + }, + { + "field_name" : "maxFrameAverageLightLevel", + "field_offset" : 32, +- "referenced_type" : "type-298" ++ "referenced_type" : "type-297" + } + ], + "linker_set_key" : "android_cta861_3_metadata", + "name" : "android_cta861_3_metadata", +- "referenced_type" : "type-302", +- "self_type" : "type-302", ++ "referenced_type" : "type-301", ++ "self_type" : "type-301", + "size" : 8, + "source_file" : "/system/core/libsystem/include/system/graphics.h", + "unique_id" : "android_cta861_3_metadata" +@@ -43538,18 +44950,18 @@ + { + "field_name" : "reserved", + "field_offset" : 32, +- "referenced_type" : "type-288" ++ "referenced_type" : "type-287" + }, + { + "field_name" : "xyzc_points", + "field_offset" : 288, +- "referenced_type" : "type-297" ++ "referenced_type" : "type-296" + } + ], + "linker_set_key" : "android_depth_points", + "name" : "android_depth_points", +- "referenced_type" : "type-296", +- "self_type" : "type-296", ++ "referenced_type" : "type-295", ++ "self_type" : "type-295", + "size" : 36, + "source_file" : "/system/core/libsystem/include/system/graphics.h", + "unique_id" : "android_depth_points" +@@ -43560,7 +44972,7 @@ + [ + { + "field_name" : "format", +- "referenced_type" : "type-292" ++ "referenced_type" : "type-291" + }, + { + "field_name" : "num_planes", +@@ -43570,13 +44982,13 @@ + { + "field_name" : "planes", + "field_offset" : 64, +- "referenced_type" : "type-294" ++ "referenced_type" : "type-293" + } + ], + "linker_set_key" : "android_flex_layout", + "name" : "android_flex_layout", +- "referenced_type" : "type-293", +- "self_type" : "type-293", ++ "referenced_type" : "type-292", ++ "self_type" : "type-292", + "size" : 12, + "source_file" : "/system/core/libsystem/include/system/graphics.h", + "unique_id" : "android_flex_layout" +@@ -43587,12 +44999,12 @@ + [ + { + "field_name" : "top_left", +- "referenced_type" : "type-291" ++ "referenced_type" : "type-290" + }, + { + "field_name" : "component", + "field_offset" : 32, +- "referenced_type" : "type-289" ++ "referenced_type" : "type-288" + }, + { + "field_name" : "bits_per_component", +@@ -43627,8 +45039,8 @@ + ], + "linker_set_key" : "android_flex_plane", + "name" : "android_flex_plane", +- "referenced_type" : "type-290", +- "self_type" : "type-290", ++ "referenced_type" : "type-289", ++ "self_type" : "type-289", + "size" : 32, + "source_file" : "/system/core/libsystem/include/system/graphics.h", + "unique_id" : "android_flex_plane" +@@ -43639,38 +45051,38 @@ + [ + { + "field_name" : "displayPrimaryRed", +- "referenced_type" : "type-299" ++ "referenced_type" : "type-298" + }, + { + "field_name" : "displayPrimaryGreen", + "field_offset" : 64, +- "referenced_type" : "type-299" ++ "referenced_type" : "type-298" + }, + { + "field_name" : "displayPrimaryBlue", + "field_offset" : 128, +- "referenced_type" : "type-299" ++ "referenced_type" : "type-298" + }, + { + "field_name" : "whitePoint", + "field_offset" : 192, +- "referenced_type" : "type-299" ++ "referenced_type" : "type-298" + }, + { + "field_name" : "maxLuminance", + "field_offset" : 256, +- "referenced_type" : "type-298" ++ "referenced_type" : "type-297" + }, + { + "field_name" : "minLuminance", + "field_offset" : 288, +- "referenced_type" : "type-298" ++ "referenced_type" : "type-297" + } + ], + "linker_set_key" : "android_smpte2086_metadata", + "name" : "android_smpte2086_metadata", +- "referenced_type" : "type-300", +- "self_type" : "type-300", ++ "referenced_type" : "type-299", ++ "self_type" : "type-299", + "size" : 40, + "source_file" : "/system/core/libsystem/include/system/graphics.h", + "unique_id" : "android_smpte2086_metadata" +@@ -43681,18 +45093,18 @@ + [ + { + "field_name" : "x", +- "referenced_type" : "type-298" ++ "referenced_type" : "type-297" + }, + { + "field_name" : "y", + "field_offset" : 32, +- "referenced_type" : "type-298" ++ "referenced_type" : "type-297" + } + ], + "linker_set_key" : "android_xy_color", + "name" : "android_xy_color", +- "referenced_type" : "type-299", +- "self_type" : "type-299", ++ "referenced_type" : "type-298", ++ "self_type" : "type-298", + "size" : 8, + "source_file" : "/system/core/libsystem/include/system/graphics.h", + "unique_id" : "android_xy_color" +@@ -43703,17 +45115,17 @@ + [ + { + "field_name" : "y", +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "field_name" : "cb", + "field_offset" : 32, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "field_name" : "cr", + "field_offset" : 64, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "field_name" : "ystride", +@@ -43733,13 +45145,13 @@ + { + "field_name" : "reserved", + "field_offset" : 192, +- "referenced_type" : "type-288" ++ "referenced_type" : "type-287" + } + ], + "linker_set_key" : "android_ycbcr", + "name" : "android_ycbcr", +- "referenced_type" : "type-287", +- "self_type" : "type-287", ++ "referenced_type" : "type-286", ++ "self_type" : "type-286", + "size" : 56, + "source_file" : "/system/core/libsystem/include/system/graphics.h", + "unique_id" : "android_ycbcr" +@@ -43749,13 +45161,13 @@ + "fields" : + [ + { +- "referenced_type" : "type-237" ++ "referenced_type" : "type-236" + } + ], + "linker_set_key" : "log_msg", + "name" : "log_msg", +- "referenced_type" : "type-236", +- "self_type" : "type-236", ++ "referenced_type" : "type-235", ++ "self_type" : "type-235", + "size" : 5124, + "source_file" : "/system/core/liblog/include/log/log_read.h", + "unique_id" : "log_msg" +@@ -43766,35 +45178,35 @@ + [ + { + "field_name" : "buf", +- "referenced_type" : "type-238" ++ "referenced_type" : "type-237" + }, + { + "field_name" : "entry", +- "referenced_type" : "type-235" ++ "referenced_type" : "type-234" + }, + { + "field_name" : "entry_v4", +- "referenced_type" : "type-235" ++ "referenced_type" : "type-234" + }, + { + "field_name" : "entry_v3", +- "referenced_type" : "type-233" ++ "referenced_type" : "type-232" + }, + { + "field_name" : "entry_v2", +- "referenced_type" : "type-232" ++ "referenced_type" : "type-231" + }, + { + "field_name" : "entry_v1", +- "referenced_type" : "type-230" ++ "referenced_type" : "type-229" + } + ], + "is_anonymous" : true, + "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3", + "name" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3", + "record_kind" : "union", +- "referenced_type" : "type-237", +- "self_type" : "type-237", ++ "referenced_type" : "type-236", ++ "self_type" : "type-236", + "size" : 5124, + "source_file" : "/system/core/liblog/include/log/log_read.h", + "unique_id" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3)" +@@ -43815,8 +45227,8 @@ + ], + "linker_set_key" : "log_time", + "name" : "log_time", +- "referenced_type" : "type-229", +- "self_type" : "type-229", ++ "referenced_type" : "type-228", ++ "self_type" : "type-228", + "size" : 8, + "source_file" : "/system/core/liblog/include_vndk/log/log_time.h", + "unique_id" : "_ZTS8log_time" +@@ -43827,12 +45239,12 @@ + [ + { + "field_name" : "len", +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + }, + { + "field_name" : "__pad", + "field_offset" : 16, +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + }, + { + "field_name" : "pid", +@@ -43857,13 +45269,13 @@ + { + "field_name" : "msg", + "field_offset" : 160, +- "referenced_type" : "type-231" ++ "referenced_type" : "type-230" + } + ], + "linker_set_key" : "logger_entry", + "name" : "logger_entry", +- "referenced_type" : "type-230", +- "self_type" : "type-230", ++ "referenced_type" : "type-229", ++ "self_type" : "type-229", + "size" : 20, + "source_file" : "/system/core/liblog/include/log/log_read.h", + "unique_id" : "logger_entry" +@@ -43874,12 +45286,12 @@ + [ + { + "field_name" : "len", +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + }, + { + "field_name" : "hdr_size", + "field_offset" : 16, +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + }, + { + "field_name" : "pid", +@@ -43909,13 +45321,13 @@ + { + "field_name" : "msg", + "field_offset" : 192, +- "referenced_type" : "type-231" ++ "referenced_type" : "type-230" + } + ], + "linker_set_key" : "logger_entry_v2", + "name" : "logger_entry_v2", +- "referenced_type" : "type-232", +- "self_type" : "type-232", ++ "referenced_type" : "type-231", ++ "self_type" : "type-231", + "size" : 24, + "source_file" : "/system/core/liblog/include/log/log_read.h", + "unique_id" : "logger_entry_v2" +@@ -43926,12 +45338,12 @@ + [ + { + "field_name" : "len", +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + }, + { + "field_name" : "hdr_size", + "field_offset" : 16, +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + }, + { + "field_name" : "pid", +@@ -43961,13 +45373,13 @@ + { + "field_name" : "msg", + "field_offset" : 192, +- "referenced_type" : "type-231" ++ "referenced_type" : "type-230" + } + ], + "linker_set_key" : "logger_entry_v3", + "name" : "logger_entry_v3", +- "referenced_type" : "type-233", +- "self_type" : "type-233", ++ "referenced_type" : "type-232", ++ "self_type" : "type-232", + "size" : 24, + "source_file" : "/system/core/liblog/include/log/log_read.h", + "unique_id" : "logger_entry_v3" +@@ -43978,12 +45390,12 @@ + [ + { + "field_name" : "len", +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + }, + { + "field_name" : "hdr_size", + "field_offset" : 16, +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + }, + { + "field_name" : "pid", +@@ -44018,13 +45430,13 @@ + { + "field_name" : "msg", + "field_offset" : 224, +- "referenced_type" : "type-231" ++ "referenced_type" : "type-230" + } + ], + "linker_set_key" : "logger_entry_v4", + "name" : "logger_entry_v4", +- "referenced_type" : "type-235", +- "self_type" : "type-235", ++ "referenced_type" : "type-234", ++ "self_type" : "type-234", + "size" : 28, + "source_file" : "/system/core/liblog/include/log/log_read.h", + "unique_id" : "logger_entry_v4" +@@ -44067,7 +45479,7 @@ + [ + { + "field_name" : "lock", +- "referenced_type" : "type-2513" ++ "referenced_type" : "type-2508" + }, + { + "field_name" : "has_tls", +@@ -44082,8 +45494,8 @@ + ], + "linker_set_key" : "thread_store_t", + "name" : "thread_store_t", +- "referenced_type" : "type-2512", +- "self_type" : "type-2512", ++ "referenced_type" : "type-2507", ++ "self_type" : "type-2507", + "size" : 12, + "source_file" : "/system/core/libcutils/include/cutils/threads.h", + "unique_id" : "thread_store_t" +@@ -44095,8 +45507,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return &&", + "name" : "android::hardware::Return &&", +- "referenced_type" : "type-807", +- "self_type" : "type-809", ++ "referenced_type" : "type-804", ++ "self_type" : "type-806", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44104,8 +45516,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-801", +- "self_type" : "type-803", ++ "referenced_type" : "type-798", ++ "self_type" : "type-800", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44113,8 +45525,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-986", +- "self_type" : "type-988", ++ "referenced_type" : "type-983", ++ "self_type" : "type-985", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44122,8 +45534,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-1093", +- "self_type" : "type-1095", ++ "referenced_type" : "type-1090", ++ "self_type" : "type-1092", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44131,8 +45543,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-1153", +- "self_type" : "type-1155", ++ "referenced_type" : "type-1150", ++ "self_type" : "type-1152", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44140,8 +45552,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-1213", +- "self_type" : "type-1215", ++ "referenced_type" : "type-1210", ++ "self_type" : "type-1212", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44149,8 +45561,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-1284", +- "self_type" : "type-1286", ++ "referenced_type" : "type-1281", ++ "self_type" : "type-1283", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44158,8 +45570,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return &&", + "name" : "android::hardware::Return &&", +- "referenced_type" : "type-309", +- "self_type" : "type-311", ++ "referenced_type" : "type-308", ++ "self_type" : "type-310", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44167,8 +45579,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return &&", + "name" : "android::hardware::Return &&", +- "referenced_type" : "type-102", +- "self_type" : "type-178", ++ "referenced_type" : "type-101", ++ "self_type" : "type-177", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44176,8 +45588,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Status &&", + "name" : "android::hardware::Status &&", +- "referenced_type" : "type-104", +- "self_type" : "type-169", ++ "referenced_type" : "type-103", ++ "self_type" : "type-168", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44186,7 +45598,7 @@ + "linker_set_key" : "android::hardware::details::SchedPrio &&", + "name" : "android::hardware::details::SchedPrio &&", + "referenced_type" : "type-37", +- "self_type" : "type-40", ++ "self_type" : "type-39", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44194,8 +45606,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer &&", + "name" : "android::hardware::details::hidl_pointer &&", +- "referenced_type" : "type-97", +- "self_type" : "type-151", ++ "referenced_type" : "type-96", ++ "self_type" : "type-150", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -44203,8 +45615,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::return_status &&", + "name" : "android::hardware::details::return_status &&", +- "referenced_type" : "type-103", +- "self_type" : "type-173", ++ "referenced_type" : "type-102", ++ "self_type" : "type-172", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44212,7 +45624,7 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_handle &&", + "name" : "android::hardware::hidl_handle &&", +- "referenced_type" : "type-77", ++ "referenced_type" : "type-76", + "self_type" : "type-86", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" +@@ -44221,8 +45633,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_memory &&", + "name" : "android::hardware::hidl_memory &&", +- "referenced_type" : "type-121", +- "self_type" : "type-126", ++ "referenced_type" : "type-120", ++ "self_type" : "type-125", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -44230,8 +45642,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_string &&", + "name" : "android::hardware::hidl_string &&", +- "referenced_type" : "type-96", +- "self_type" : "type-116", ++ "referenced_type" : "type-95", ++ "self_type" : "type-115", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -44239,8 +45651,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec &&", + "name" : "android::hardware::hidl_vec &&", +- "referenced_type" : "type-518", +- "self_type" : "type-828", ++ "referenced_type" : "type-516", ++ "self_type" : "type-825", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -44248,8 +45660,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-472", +- "self_type" : "type-484", ++ "referenced_type" : "type-470", ++ "self_type" : "type-482", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44257,8 +45669,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-157", +- "self_type" : "type-161", ++ "referenced_type" : "type-156", ++ "self_type" : "type-160", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44266,8 +45678,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-962", +- "self_type" : "type-2422", ++ "referenced_type" : "type-959", ++ "self_type" : "type-2417", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44275,8 +45687,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-71", +- "self_type" : "type-483", ++ "referenced_type" : "type-70", ++ "self_type" : "type-481", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44284,8 +45696,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-951", +- "self_type" : "type-983", ++ "referenced_type" : "type-948", ++ "self_type" : "type-979", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44293,8 +45705,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-142", +- "self_type" : "type-476", ++ "referenced_type" : "type-141", ++ "self_type" : "type-474", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44302,8 +45714,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-356", +- "self_type" : "type-571", ++ "referenced_type" : "type-355", ++ "self_type" : "type-569", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44311,8 +45723,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-575", +- "self_type" : "type-975", ++ "referenced_type" : "type-573", ++ "self_type" : "type-972", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44320,8 +45732,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-590", +- "self_type" : "type-980", ++ "referenced_type" : "type-588", ++ "self_type" : "type-977", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44329,8 +45741,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-580", +- "self_type" : "type-763", ++ "referenced_type" : "type-578", ++ "self_type" : "type-760", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44338,8 +45750,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-595", +- "self_type" : "type-1209", ++ "referenced_type" : "type-593", ++ "self_type" : "type-1206", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44347,8 +45759,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-585", +- "self_type" : "type-911", ++ "referenced_type" : "type-583", ++ "self_type" : "type-907", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44356,35 +45768,17 @@ + "alignment" : 4, + "linker_set_key" : "android::wp &&", + "name" : "android::wp &&", +- "referenced_type" : "type-383", ++ "referenced_type" : "type-382", + "self_type" : "type-392", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +- { +- "alignment" : 4, +- "linker_set_key" : "android::wp &&", +- "name" : "android::wp &&", +- "referenced_type" : "type-32", +- "self_type" : "type-39", +- "size" : 4, +- "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "const android::hidl::base::V1_0::IBase *&&", +- "name" : "const android::hidl::base::V1_0::IBase *&&", +- "referenced_type" : "type-381", +- "self_type" : "type-391", +- "size" : 4, +- "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" +- }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1056", +- "self_type" : "type-1055", ++ "referenced_type" : "type-1053", ++ "self_type" : "type-1052", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44392,8 +45786,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1117", +- "self_type" : "type-1116", ++ "referenced_type" : "type-1114", ++ "self_type" : "type-1113", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44401,8 +45795,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1178", +- "self_type" : "type-1177", ++ "referenced_type" : "type-1175", ++ "self_type" : "type-1174", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44410,8 +45804,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1238", +- "self_type" : "type-1237", ++ "referenced_type" : "type-1235", ++ "self_type" : "type-1234", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44419,8 +45813,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1316", +- "self_type" : "type-1315", ++ "referenced_type" : "type-1313", ++ "self_type" : "type-1312", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44428,8 +45822,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1981", +- "self_type" : "type-1980", ++ "referenced_type" : "type-1976", ++ "self_type" : "type-1975", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44437,8 +45831,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-2039", +- "self_type" : "type-2038", ++ "referenced_type" : "type-2034", ++ "self_type" : "type-2033", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44446,8 +45840,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-2098", +- "self_type" : "type-2097", ++ "referenced_type" : "type-2093", ++ "self_type" : "type-2092", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44455,8 +45849,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-2156", +- "self_type" : "type-2155", ++ "referenced_type" : "type-2151", ++ "self_type" : "type-2150", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44464,8 +45858,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-2233", +- "self_type" : "type-2232", ++ "referenced_type" : "type-2228", ++ "self_type" : "type-2227", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44473,8 +45867,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-2286", +- "self_type" : "type-2285", ++ "referenced_type" : "type-2280", ++ "self_type" : "type-2279", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44482,8 +45876,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-3120", +- "self_type" : "type-3119", ++ "referenced_type" : "type-3113", ++ "self_type" : "type-3112", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44491,8 +45885,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-3174", +- "self_type" : "type-3173", ++ "referenced_type" : "type-3167", ++ "self_type" : "type-3166", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44500,8 +45894,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-3241", +- "self_type" : "type-3240", ++ "referenced_type" : "type-3234", ++ "self_type" : "type-3233", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44509,8 +45903,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-3296", +- "self_type" : "type-3295", ++ "referenced_type" : "type-3289", ++ "self_type" : "type-3288", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44518,8 +45912,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-3363", +- "self_type" : "type-3362", ++ "referenced_type" : "type-3356", ++ "self_type" : "type-3355", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44527,8 +45921,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-3416", +- "self_type" : "type-3415", ++ "referenced_type" : "type-3409", ++ "self_type" : "type-3408", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44536,8 +45930,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1061", +- "self_type" : "type-1060", ++ "referenced_type" : "type-1058", ++ "self_type" : "type-1057", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44545,8 +45939,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1121", +- "self_type" : "type-1120", ++ "referenced_type" : "type-1118", ++ "self_type" : "type-1117", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44554,8 +45948,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1182", +- "self_type" : "type-1181", ++ "referenced_type" : "type-1179", ++ "self_type" : "type-1178", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44563,8 +45957,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1243", +- "self_type" : "type-1242", ++ "referenced_type" : "type-1240", ++ "self_type" : "type-1239", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44572,8 +45966,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1320", +- "self_type" : "type-1319", ++ "referenced_type" : "type-1317", ++ "self_type" : "type-1316", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44581,8 +45975,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1986", +- "self_type" : "type-1985", ++ "referenced_type" : "type-1981", ++ "self_type" : "type-1980", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44590,8 +45984,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2043", +- "self_type" : "type-2042", ++ "referenced_type" : "type-2038", ++ "self_type" : "type-2037", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44599,8 +45993,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2102", +- "self_type" : "type-2101", ++ "referenced_type" : "type-2097", ++ "self_type" : "type-2096", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44608,8 +46002,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2161", +- "self_type" : "type-2160", ++ "referenced_type" : "type-2156", ++ "self_type" : "type-2155", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44617,8 +46011,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2237", +- "self_type" : "type-2236", ++ "referenced_type" : "type-2232", ++ "self_type" : "type-2231", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44626,8 +46020,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2290", +- "self_type" : "type-2289", ++ "referenced_type" : "type-2285", ++ "self_type" : "type-2284", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44635,8 +46029,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3124", +- "self_type" : "type-3123", ++ "referenced_type" : "type-3117", ++ "self_type" : "type-3116", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44644,8 +46038,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3178", +- "self_type" : "type-3177", ++ "referenced_type" : "type-3171", ++ "self_type" : "type-3170", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44653,8 +46047,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3245", +- "self_type" : "type-3244", ++ "referenced_type" : "type-3238", ++ "self_type" : "type-3237", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44662,8 +46056,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3300", +- "self_type" : "type-3299", ++ "referenced_type" : "type-3293", ++ "self_type" : "type-3292", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44671,8 +46065,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3367", +- "self_type" : "type-3366", ++ "referenced_type" : "type-3360", ++ "self_type" : "type-3359", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44680,8 +46074,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3420", +- "self_type" : "type-3419", ++ "referenced_type" : "type-3413", ++ "self_type" : "type-3412", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44689,8 +46083,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1058", +- "self_type" : "type-1057", ++ "referenced_type" : "type-1055", ++ "self_type" : "type-1054", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44698,8 +46092,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1119", +- "self_type" : "type-1118", ++ "referenced_type" : "type-1116", ++ "self_type" : "type-1115", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44707,8 +46101,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1180", +- "self_type" : "type-1179", ++ "referenced_type" : "type-1177", ++ "self_type" : "type-1176", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44716,8 +46110,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1241", +- "self_type" : "type-1240", ++ "referenced_type" : "type-1237", ++ "self_type" : "type-1236", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44725,8 +46119,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1318", +- "self_type" : "type-1317", ++ "referenced_type" : "type-1315", ++ "self_type" : "type-1314", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44734,8 +46128,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1983", +- "self_type" : "type-1982", ++ "referenced_type" : "type-1978", ++ "self_type" : "type-1977", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44743,8 +46137,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2041", +- "self_type" : "type-2040", ++ "referenced_type" : "type-2036", ++ "self_type" : "type-2035", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44752,8 +46146,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2100", +- "self_type" : "type-2099", ++ "referenced_type" : "type-2095", ++ "self_type" : "type-2094", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44761,8 +46155,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2159", +- "self_type" : "type-2158", ++ "referenced_type" : "type-2153", ++ "self_type" : "type-2152", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44770,8 +46164,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2235", +- "self_type" : "type-2234", ++ "referenced_type" : "type-2230", ++ "self_type" : "type-2229", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44779,8 +46173,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2288", +- "self_type" : "type-2287", ++ "referenced_type" : "type-2283", ++ "self_type" : "type-2282", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44788,8 +46182,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3122", +- "self_type" : "type-3121", ++ "referenced_type" : "type-3115", ++ "self_type" : "type-3114", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44797,8 +46191,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3176", +- "self_type" : "type-3175", ++ "referenced_type" : "type-3169", ++ "self_type" : "type-3168", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44806,8 +46200,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3243", +- "self_type" : "type-3242", ++ "referenced_type" : "type-3236", ++ "self_type" : "type-3235", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44815,8 +46209,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3298", +- "self_type" : "type-3297", ++ "referenced_type" : "type-3291", ++ "self_type" : "type-3290", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44824,8 +46218,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3365", +- "self_type" : "type-3364", ++ "referenced_type" : "type-3358", ++ "self_type" : "type-3357", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44833,8 +46227,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3418", +- "self_type" : "type-3417", ++ "referenced_type" : "type-3411", ++ "self_type" : "type-3410", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + } +diff --git a/29/64/arm_armv7-a-neon/source-based/libhwbinder_noltopgo.so.lsdump b/29/64/arm_armv7-a-neon/source-based/libhwbinder_noltopgo.so.lsdump +index 3935bba..8dc4f1f 100644 +--- a/29/64/arm_armv7-a-neon/source-based/libhwbinder_noltopgo.so.lsdump ++++ b/29/64/arm_armv7-a-neon/source-based/libhwbinder_noltopgo.so.lsdump +@@ -895,30 +895,6 @@ + { + "name" : "_ZN7android8hardware6Parcel12restartWriteEj" + }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIdEEiT_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIfEEiT_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIiEEiT_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIjEEiT_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIxEEiT_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIyEEiT_" +- }, + { + "name" : "_ZN7android8hardware6Parcel12writeCStringEPKc" + }, +@@ -5234,114 +5210,6 @@ + "return_type" : "type-10", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIdEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-71" +- }, +- { +- "referenced_type" : "type-97" +- } +- ], +- "return_type" : "type-10", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-97" ] +- }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIfEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-71" +- }, +- { +- "referenced_type" : "type-95" +- } +- ], +- "return_type" : "type-10", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-95" ] +- }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIiEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-71" +- }, +- { +- "referenced_type" : "type-10" +- } +- ], +- "return_type" : "type-10", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-10" ] +- }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIjEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-71" +- }, +- { +- "referenced_type" : "type-4" +- } +- ], +- "return_type" : "type-10", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-4" ] +- }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIxEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-71" +- }, +- { +- "referenced_type" : "type-93" +- } +- ], +- "return_type" : "type-10", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-93" ] +- }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIyEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-71" +- }, +- { +- "referenced_type" : "type-68" +- } +- ], +- "return_type" : "type-10", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-68" ] +- }, + { + "function_name" : "android::hardware::Parcel::writeCString", + "linker_set_key" : "_ZN7android8hardware6Parcel12writeCStringEPKc", +diff --git a/29/64/arm_armv7-a-neon/source-based/libprotobuf-cpp-full.so.lsdump b/29/64/arm_armv7-a-neon/source-based/libprotobuf-cpp-full.so.lsdump +index a41efb9..db5250a 100644 +--- a/29/64/arm_armv7-a-neon/source-based/libprotobuf-cpp-full.so.lsdump ++++ b/29/64/arm_armv7-a-neon/source-based/libprotobuf-cpp-full.so.lsdump +@@ -3342,6 +3342,10 @@ + "binding" : "weak", + "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexINSt3__14pairIPKviEEE13FindExtensionERKNS3_12basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEEi" + }, ++ { ++ "binding" : "weak", ++ "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexINSt3__14pairIPKviEEE18ValidateSymbolNameERKNS3_12basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE" ++ }, + { + "binding" : "weak", + "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexINSt3__14pairIPKviEEE19AddNestedExtensionsERKNS0_15DescriptorProtoES7_" +@@ -3370,6 +3374,10 @@ + "binding" : "weak", + "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexIPKNS0_19FileDescriptorProtoEE12AddExtensionERKNS0_20FieldDescriptorProtoES5_" + }, ++ { ++ "binding" : "weak", ++ "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexIPKNS0_19FileDescriptorProtoEE18ValidateSymbolNameERKNSt3__112basic_stringIcNS7_11char_traitsIcEENS7_9allocatorIcEEEE" ++ }, + { + "binding" : "weak", + "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexIPKNS0_19FileDescriptorProtoEE19AddNestedExtensionsERKNS0_15DescriptorProtoES5_" +@@ -15598,8 +15606,8 @@ + ], + "linker_set_key" : "google::protobuf::util::converter::JsonStreamParser::NumberResult::Type", + "name" : "google::protobuf::util::converter::JsonStreamParser::NumberResult::Type", +- "referenced_type" : "type-19293", +- "self_type" : "type-19293", ++ "referenced_type" : "type-15538", ++ "self_type" : "type-15538", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h", + "underlying_type" : "type-4", +@@ -15637,8 +15645,8 @@ + ], + "linker_set_key" : "google::protobuf::util::converter::JsonStreamParser::ParseType", + "name" : "google::protobuf::util::converter::JsonStreamParser::ParseType", +- "referenced_type" : "type-19291", +- "self_type" : "type-19291", ++ "referenced_type" : "type-15536", ++ "self_type" : "type-15536", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h", + "underlying_type" : "type-4", +@@ -15704,8 +15712,8 @@ + ], + "linker_set_key" : "google::protobuf::util::converter::JsonStreamParser::TokenType", + "name" : "google::protobuf::util::converter::JsonStreamParser::TokenType", +- "referenced_type" : "type-19290", +- "self_type" : "type-19290", ++ "referenced_type" : "type-15535", ++ "self_type" : "type-15535", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h", + "underlying_type" : "type-4", +@@ -15730,8 +15738,8 @@ + ], + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Item::ItemType", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Item::ItemType", +- "referenced_type" : "type-19455", +- "self_type" : "type-19455", ++ "referenced_type" : "type-15699", ++ "self_type" : "type-15699", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h", + "underlying_type" : "type-4", +@@ -16006,7 +16014,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -16018,9 +16026,9 @@ + "referenced_type" : "type-15297" + } + ], +- "referenced_type" : "type-19321", ++ "referenced_type" : "type-15566", + "return_type" : "type-76", +- "self_type" : "type-19321", ++ "self_type" : "type-15566", + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, + { +@@ -16030,15 +16038,15 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-15001" + } + ], +- "referenced_type" : "type-19454", ++ "referenced_type" : "type-15698", + "return_type" : "type-76", +- "self_type" : "type-19454", ++ "self_type" : "type-15698", + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, + { +@@ -16048,15 +16056,15 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-27" + } + ], +- "referenced_type" : "type-19440", ++ "referenced_type" : "type-15684", + "return_type" : "type-76", +- "self_type" : "type-19440", ++ "self_type" : "type-15684", + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, + { +@@ -28574,6 +28582,23 @@ + "return_type" : "type-4556", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, ++ { ++ "access" : "private", ++ "function_name" : "google::protobuf::SimpleDescriptorDatabase::DescriptorIndex >::ValidateSymbolName", ++ "linker_set_key" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexINSt3__14pairIPKviEEE18ValidateSymbolNameERKNS3_12basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3892" ++ }, ++ { ++ "referenced_type" : "type-3880" ++ } ++ ], ++ "return_type" : "type-12", ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" ++ }, + { + "function_name" : "google::protobuf::SimpleDescriptorDatabase::DescriptorIndex >::AddNestedExtensions", + "linker_set_key" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexINSt3__14pairIPKviEEE19AddNestedExtensionsERKNS0_15DescriptorProtoES7_", +@@ -28706,6 +28731,23 @@ + "return_type" : "type-12", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, ++ { ++ "access" : "private", ++ "function_name" : "google::protobuf::SimpleDescriptorDatabase::DescriptorIndex::ValidateSymbolName", ++ "linker_set_key" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexIPKNS0_19FileDescriptorProtoEE18ValidateSymbolNameERKNSt3__112basic_stringIcNS7_11char_traitsIcEENS7_9allocatorIcEEEE", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3891" ++ }, ++ { ++ "referenced_type" : "type-3880" ++ } ++ ], ++ "return_type" : "type-12", ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" ++ }, + { + "function_name" : "google::protobuf::SimpleDescriptorDatabase::DescriptorIndex::AddNestedExtensions", + "linker_set_key" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexIPKNS0_19FileDescriptorProtoEE19AddNestedExtensionsERKNS0_15DescriptorProtoES5_", +@@ -36131,7 +36173,7 @@ + "referenced_type" : "type-6362" + } + ], +- "return_type" : "type-17340", ++ "return_type" : "type-18113", + "source_file" : "/external/protobuf/src/google/protobuf/util/field_mask_util.h" + }, + { +@@ -38515,7 +38557,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-27" +@@ -38535,7 +38577,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-2337" +@@ -38552,7 +38594,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-2293" +@@ -38569,7 +38611,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-2337" +@@ -38589,7 +38631,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-27" +@@ -38608,13 +38650,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-19462", ++ "return_type" : "type-15706", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38625,7 +38667,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-27" +@@ -38645,7 +38687,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-27" +@@ -38661,7 +38703,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19460" ++ "referenced_type" : "type-15704" + }, + { + "referenced_type" : "type-2293" +@@ -38677,7 +38719,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19460" ++ "referenced_type" : "type-15704" + }, + { + "referenced_type" : "type-1" +@@ -38693,7 +38735,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19460" ++ "referenced_type" : "type-15704" + }, + { + "referenced_type" : "type-1" +@@ -38709,10 +38751,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19460" ++ "referenced_type" : "type-15704" + } + ], +- "return_type" : "type-19460", ++ "return_type" : "type-15704", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38722,7 +38764,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19460" ++ "referenced_type" : "type-15704" + }, + { + "referenced_type" : "type-15301" +@@ -38731,7 +38773,7 @@ + "referenced_type" : "type-2421" + }, + { +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + } + ], + "return_type" : "type-81", +@@ -38744,10 +38786,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19460" ++ "referenced_type" : "type-15704" + }, + { +- "referenced_type" : "type-19460" ++ "referenced_type" : "type-15704" + }, + { + "referenced_type" : "type-2293" +@@ -38769,7 +38811,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19460" ++ "referenced_type" : "type-15704" + }, + { + "referenced_type" : "type-15301" +@@ -38778,7 +38820,7 @@ + "referenced_type" : "type-2421" + }, + { +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + } + ], + "return_type" : "type-81", +@@ -38791,10 +38833,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19460" ++ "referenced_type" : "type-15704" + }, + { +- "referenced_type" : "type-19460" ++ "referenced_type" : "type-15704" + }, + { + "referenced_type" : "type-2293" +@@ -38817,7 +38859,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-2337" +@@ -38826,7 +38868,7 @@ + "referenced_type" : "type-2421" + } + ], +- "return_type" : "type-19462", ++ "return_type" : "type-15706", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38836,7 +38878,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-27" +@@ -38845,7 +38887,7 @@ + "referenced_type" : "type-15001" + } + ], +- "return_type" : "type-19462", ++ "return_type" : "type-15706", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38856,7 +38898,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-2337" +@@ -38865,7 +38907,7 @@ + "referenced_type" : "type-2421" + } + ], +- "return_type" : "type-19462", ++ "return_type" : "type-15706", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38876,7 +38918,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + } + ], + "return_type" : "type-81", +@@ -38890,7 +38932,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-2337" +@@ -38902,7 +38944,7 @@ + "referenced_type" : "type-15001" + } + ], +- "return_type" : "type-19462", ++ "return_type" : "type-15706", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38913,7 +38955,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-27" +@@ -38929,10 +38971,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + } + ], +- "return_type" : "type-19462", ++ "return_type" : "type-15706", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38943,7 +38985,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-2337" +@@ -38959,10 +39001,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + } + ], +- "return_type" : "type-19462", ++ "return_type" : "type-15706", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38972,13 +39014,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-19462", ++ "return_type" : "type-15706", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38989,7 +39031,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-15301" +@@ -39014,7 +39056,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-15276" +@@ -39040,7 +39082,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-15301" +@@ -39065,7 +39107,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "referenced_type" : "type-15276" +@@ -39090,7 +39132,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + } + ], + "return_type" : "type-81", +@@ -39103,7 +39145,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + } + ], + "return_type" : "type-81", +@@ -39116,7 +39158,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + } + ], + "return_type" : "type-81", +@@ -39300,7 +39342,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + }, + { + "referenced_type" : "type-27" +@@ -39309,7 +39351,7 @@ + "referenced_type" : "type-12" + } + ], +- "return_type" : "type-19152", ++ "return_type" : "type-15397", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39319,13 +39361,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-19152", ++ "return_type" : "type-15397", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39335,7 +39377,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + }, + { + "referenced_type" : "type-27" +@@ -39344,7 +39386,7 @@ + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-19152", ++ "return_type" : "type-15397", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39354,7 +39396,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + }, + { + "referenced_type" : "type-27" +@@ -39363,7 +39405,7 @@ + "referenced_type" : "type-96" + } + ], +- "return_type" : "type-19152", ++ "return_type" : "type-15397", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39373,7 +39415,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + }, + { + "referenced_type" : "type-27" +@@ -39382,7 +39424,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19152", ++ "return_type" : "type-15397", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39392,7 +39434,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + }, + { + "referenced_type" : "type-27" +@@ -39401,7 +39443,7 @@ + "referenced_type" : "type-89" + } + ], +- "return_type" : "type-19152", ++ "return_type" : "type-15397", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39411,13 +39453,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-19152", ++ "return_type" : "type-15397", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39428,7 +39470,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + }, + { + "referenced_type" : "type-27" +@@ -39444,7 +39486,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + }, + { + "referenced_type" : "type-27" +@@ -39453,7 +39495,7 @@ + "referenced_type" : "type-98" + } + ], +- "return_type" : "type-19152", ++ "return_type" : "type-15397", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39463,7 +39505,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + }, + { + "referenced_type" : "type-27" +@@ -39472,7 +39514,7 @@ + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-19152", ++ "return_type" : "type-15397", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39482,7 +39524,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + }, + { + "referenced_type" : "type-27" +@@ -39491,7 +39533,7 @@ + "referenced_type" : "type-4" + } + ], +- "return_type" : "type-19152", ++ "return_type" : "type-15397", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39501,7 +39543,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + }, + { + "referenced_type" : "type-27" +@@ -39510,7 +39552,7 @@ + "referenced_type" : "type-91" + } + ], +- "return_type" : "type-19152", ++ "return_type" : "type-15397", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39520,10 +39562,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + } + ], +- "return_type" : "type-19152", ++ "return_type" : "type-15397", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39533,10 +39575,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + } + ], +- "return_type" : "type-19152", ++ "return_type" : "type-15397", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39546,13 +39588,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-19152", ++ "return_type" : "type-15397", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39562,7 +39604,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + } + ], + "return_type" : "type-81", +@@ -39575,7 +39617,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + } + ], + "return_type" : "type-81", +@@ -39588,7 +39630,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19152" ++ "referenced_type" : "type-15397" + } + ], + "return_type" : "type-81", +@@ -39602,7 +39644,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + }, + { + "referenced_type" : "type-27" +@@ -39619,10 +39661,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + }, + { +- "referenced_type" : "type-19290" ++ "referenced_type" : "type-15535" + } + ], + "return_type" : "type-76", +@@ -39636,7 +39678,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-76", +@@ -39650,10 +39692,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + }, + { +- "referenced_type" : "type-19290" ++ "referenced_type" : "type-15535" + } + ], + "return_type" : "type-76", +@@ -39666,7 +39708,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-76", +@@ -39680,7 +39722,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-76", +@@ -39694,7 +39736,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-76", +@@ -39708,10 +39750,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + }, + { +- "referenced_type" : "type-19290" ++ "referenced_type" : "type-15535" + } + ], + "return_type" : "type-76", +@@ -39725,10 +39767,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + }, + { +- "referenced_type" : "type-19290" ++ "referenced_type" : "type-15535" + } + ], + "return_type" : "type-76", +@@ -39742,7 +39784,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + }, + { + "referenced_type" : "type-27" +@@ -39759,7 +39801,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + }, + { + "referenced_type" : "type-27" +@@ -39776,10 +39818,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + }, + { +- "referenced_type" : "type-19290" ++ "referenced_type" : "type-15535" + } + ], + "return_type" : "type-76", +@@ -39793,7 +39835,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-81", +@@ -39807,10 +39849,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + }, + { +- "referenced_type" : "type-19290" ++ "referenced_type" : "type-15535" + } + ], + "return_type" : "type-76", +@@ -39824,10 +39866,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], +- "return_type" : "type-19290", ++ "return_type" : "type-15535", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h" + }, + { +@@ -39838,7 +39880,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-76", +@@ -39852,7 +39894,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-76", +@@ -39866,10 +39908,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + }, + { +- "referenced_type" : "type-19295" ++ "referenced_type" : "type-15540" + } + ], + "return_type" : "type-76", +@@ -39883,7 +39925,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-76", +@@ -39897,7 +39939,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-76", +@@ -39910,7 +39952,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + }, + { + "referenced_type" : "type-27" +@@ -39927,7 +39969,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-81", +@@ -39941,7 +39983,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-76", +@@ -39955,7 +39997,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-76", +@@ -39969,7 +40011,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-76", +@@ -39983,7 +40025,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-76", +@@ -39996,7 +40038,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + }, + { + "referenced_type" : "type-15297" +@@ -40012,7 +40054,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + }, + { + "referenced_type" : "type-15297" +@@ -40028,7 +40070,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-81", +@@ -40041,7 +40083,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-81", +@@ -40054,7 +40096,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19289" ++ "referenced_type" : "type-15534" + } + ], + "return_type" : "type-81", +@@ -40108,7 +40150,7 @@ + "referenced_type" : "type-15347" + } + ], +- "return_type" : "type-17347", ++ "return_type" : "type-18121", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/field_mask_utility.h" + }, + { +@@ -40181,7 +40223,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40203,7 +40245,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40225,7 +40267,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40247,7 +40289,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40269,7 +40311,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40291,7 +40333,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40313,7 +40355,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40335,7 +40377,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40357,7 +40399,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40379,7 +40421,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40401,7 +40443,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40430,7 +40472,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40452,7 +40494,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40474,10 +40516,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19340" ++ "referenced_type" : "type-15584" + } + ], +- "return_type" : "type-19431", ++ "return_type" : "type-15675", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h" + }, + { +@@ -40494,7 +40536,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40516,7 +40558,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40538,7 +40580,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -40561,7 +40603,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19430" ++ "referenced_type" : "type-15674" + }, + { + "referenced_type" : "type-612" +@@ -40583,7 +40625,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19430" ++ "referenced_type" : "type-15674" + }, + { + "referenced_type" : "type-612" +@@ -40606,7 +40648,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19430" ++ "referenced_type" : "type-15674" + }, + { + "referenced_type" : "type-612" +@@ -40628,7 +40670,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19430" ++ "referenced_type" : "type-15674" + }, + { + "referenced_type" : "type-612" +@@ -40650,7 +40692,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19430" ++ "referenced_type" : "type-15674" + } + ], + "return_type" : "type-81", +@@ -40663,7 +40705,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19430" ++ "referenced_type" : "type-15674" + } + ], + "return_type" : "type-81", +@@ -40676,7 +40718,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19430" ++ "referenced_type" : "type-15674" + } + ], + "return_type" : "type-81", +@@ -40689,13 +40731,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-19441", ++ "return_type" : "type-15685", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, + { +@@ -40706,7 +40748,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-27" +@@ -40723,7 +40765,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-2337" +@@ -40740,7 +40782,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + } + ], + "return_type" : "type-81", +@@ -40753,7 +40795,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-15001" +@@ -40776,7 +40818,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-27" +@@ -40785,7 +40827,7 @@ + "referenced_type" : "type-15001" + } + ], +- "return_type" : "type-19441", ++ "return_type" : "type-15685", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, + { +@@ -40795,7 +40837,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-15001" +@@ -40811,7 +40853,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-15001" +@@ -40827,10 +40869,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19476" ++ "referenced_type" : "type-15720" + } + ], +- "return_type" : "type-19452", ++ "return_type" : "type-15696", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, + { +@@ -40848,7 +40890,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-2337" +@@ -40864,7 +40906,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-15001" +@@ -40880,7 +40922,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-15001" +@@ -40897,7 +40939,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + } + ], + "return_type" : "type-81", +@@ -40910,7 +40952,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19444" ++ "referenced_type" : "type-15688" + }, + { + "referenced_type" : "type-27" +@@ -40926,13 +40968,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19444" ++ "referenced_type" : "type-15688" + }, + { +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { +- "referenced_type" : "type-19455" ++ "referenced_type" : "type-15699" + }, + { + "referenced_type" : "type-12" +@@ -40951,13 +40993,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19444" ++ "referenced_type" : "type-15688" + }, + { +- "referenced_type" : "type-19444" ++ "referenced_type" : "type-15688" + }, + { +- "referenced_type" : "type-19455" ++ "referenced_type" : "type-15699" + }, + { + "referenced_type" : "type-12" +@@ -40976,13 +41018,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19444" ++ "referenced_type" : "type-15688" + }, + { +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { +- "referenced_type" : "type-19455" ++ "referenced_type" : "type-15699" + }, + { + "referenced_type" : "type-12" +@@ -41001,13 +41043,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19444" ++ "referenced_type" : "type-15688" + }, + { +- "referenced_type" : "type-19444" ++ "referenced_type" : "type-15688" + }, + { +- "referenced_type" : "type-19455" ++ "referenced_type" : "type-15699" + }, + { + "referenced_type" : "type-12" +@@ -41027,13 +41069,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-19455" ++ "referenced_type" : "type-15699" + }, + { + "referenced_type" : "type-12" +@@ -41053,7 +41095,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-2337" +@@ -41070,7 +41112,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-2337" +@@ -41086,10 +41128,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + } + ], +- "return_type" : "type-19441", ++ "return_type" : "type-15685", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, + { +@@ -41100,7 +41142,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-2337" +@@ -41116,7 +41158,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19447" ++ "referenced_type" : "type-15691" + }, + { + "referenced_type" : "type-27" +@@ -41132,7 +41174,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19447" ++ "referenced_type" : "type-15691" + }, + { + "referenced_type" : "type-27" +@@ -41151,7 +41193,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19447" ++ "referenced_type" : "type-15691" + } + ], + "return_type" : "type-81", +@@ -41165,7 +41207,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19447" ++ "referenced_type" : "type-15691" + }, + { + "referenced_type" : "type-15001" +@@ -41182,7 +41224,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19447" ++ "referenced_type" : "type-15691" + } + ], + "return_type" : "type-81", +@@ -41195,7 +41237,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19447" ++ "referenced_type" : "type-15691" + } + ], + "return_type" : "type-12", +@@ -41208,7 +41250,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19447" ++ "referenced_type" : "type-15691" + }, + { + "referenced_type" : "type-27" +@@ -41224,10 +41266,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19447" ++ "referenced_type" : "type-15691" + }, + { +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + } + ], + "return_type" : "type-81", +@@ -41240,10 +41282,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19447" ++ "referenced_type" : "type-15691" + }, + { +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + } + ], + "return_type" : "type-81", +@@ -41256,7 +41298,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19447" ++ "referenced_type" : "type-15691" + } + ], + "return_type" : "type-81", +@@ -41269,7 +41311,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19447" ++ "referenced_type" : "type-15691" + } + ], + "return_type" : "type-81", +@@ -41282,10 +41324,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + } + ], +- "return_type" : "type-19441", ++ "return_type" : "type-15685", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, + { +@@ -41295,13 +41337,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-19441", ++ "return_type" : "type-15685", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, + { +@@ -41312,7 +41354,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-15301" +@@ -41337,7 +41379,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-15276" +@@ -41353,7 +41395,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-19640" ++ "referenced_type" : "type-15884" + } + ], + "return_type" : "type-81", +@@ -41367,7 +41409,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-15301" +@@ -41392,7 +41434,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "referenced_type" : "type-15276" +@@ -41408,7 +41450,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-19640" ++ "referenced_type" : "type-15884" + } + ], + "return_type" : "type-81", +@@ -41421,7 +41463,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + } + ], + "return_type" : "type-81", +@@ -41434,7 +41476,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + } + ], + "return_type" : "type-81", +@@ -41447,7 +41489,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + } + ], + "return_type" : "type-81", +@@ -42224,7 +42266,7 @@ + "referenced_type" : "type-24467" + } + ], +- "return_type" : "type-19430", ++ "return_type" : "type-15674", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/type_info_test_helper.h" + }, + { +@@ -42246,10 +42288,10 @@ + "referenced_type" : "type-15333" + }, + { +- "referenced_type" : "type-19640" ++ "referenced_type" : "type-15884" + } + ], +- "return_type" : "type-19441", ++ "return_type" : "type-15685", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/type_info_test_helper.h" + }, + { +@@ -64029,10 +64071,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19636" ++ "referenced_type" : "type-15880" + } + ], +- "return_type" : "type-21874", ++ "return_type" : "type-18122", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -64043,7 +64085,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2293" +@@ -64069,7 +64111,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2293" +@@ -64091,7 +64133,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-27" +@@ -64111,7 +64153,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2293" +@@ -64131,7 +64173,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -64160,7 +64202,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" +@@ -64180,13 +64222,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2421" + } + ], +- "return_type" : "type-21876", ++ "return_type" : "type-18124", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h" + }, + { +@@ -64197,7 +64239,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2293" +@@ -64220,13 +64262,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2337" + } + ], +- "return_type" : "type-19338", ++ "return_type" : "type-15582", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h" + }, + { +@@ -64237,7 +64279,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-27" +@@ -64257,7 +64299,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2337" +@@ -64274,7 +64316,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19322" ++ "referenced_type" : "type-15567" + }, + { + "referenced_type" : "type-2293" +@@ -64541,7 +64583,7 @@ + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-17348", ++ "return_type" : "type-18125", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, + { +@@ -69861,10 +69903,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19636" ++ "referenced_type" : "type-15880" + } + ], +- "return_type" : "type-21877", ++ "return_type" : "type-18126", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -71630,14 +71672,14 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf4util9converter23ProtoStreamObjectSource10renderers_E", + "name" : "google::protobuf::util::converter::ProtoStreamObjectSource::renderers_", +- "referenced_type" : "type-19341", ++ "referenced_type" : "type-15585", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h" + }, + { + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf4util9converter23ProtoStreamObjectWriter10renderers_E", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter::renderers_", +- "referenced_type" : "type-19483", ++ "referenced_type" : "type-15727", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, + { +@@ -72457,7 +72499,7 @@ + { + "linker_set_key" : "_ZZN6google8protobuf4util9converter23ProtoStreamObjectWriter7Options8DefaultsEvE8defaults", + "name" : "defaults", +- "referenced_type" : "type-19457", ++ "referenced_type" : "type-15701", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + } + ], +@@ -72533,71 +72575,71 @@ + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-16498", +- "self_type" : "type-16500", ++ "referenced_type" : "type-17268", ++ "self_type" : "type-17270", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-16814", +- "self_type" : "type-16813", ++ "referenced_type" : "type-17584", ++ "self_type" : "type-17583", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-17065", +- "self_type" : "type-17067", ++ "referenced_type" : "type-17835", ++ "self_type" : "type-17837", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-17184", +- "self_type" : "type-17186", ++ "referenced_type" : "type-17954", ++ "self_type" : "type-17956", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-17451", +- "self_type" : "type-17453", ++ "referenced_type" : "type-18229", ++ "self_type" : "type-18231", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-18901", +- "self_type" : "type-18903", ++ "referenced_type" : "type-19679", ++ "self_type" : "type-19681", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-21030", +- "self_type" : "type-21032", ++ "referenced_type" : "type-21038", ++ "self_type" : "type-21040", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-21346", +- "self_type" : "type-21345", ++ "referenced_type" : "type-21354", ++ "self_type" : "type-21353", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-21597", +- "self_type" : "type-21599", ++ "referenced_type" : "type-21605", ++ "self_type" : "type-21607", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-21716", +- "self_type" : "type-21718", ++ "referenced_type" : "type-21724", ++ "self_type" : "type-21726", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { +@@ -72806,71 +72848,71 @@ + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-16501", +- "self_type" : "type-16503", ++ "referenced_type" : "type-17271", ++ "self_type" : "type-17273", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-16816", +- "self_type" : "type-16818", ++ "referenced_type" : "type-17586", ++ "self_type" : "type-17588", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-17068", +- "self_type" : "type-17070", ++ "referenced_type" : "type-17838", ++ "self_type" : "type-17840", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-17187", +- "self_type" : "type-17189", ++ "referenced_type" : "type-17957", ++ "self_type" : "type-17959", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-17454", +- "self_type" : "type-17456", ++ "referenced_type" : "type-18232", ++ "self_type" : "type-18234", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-18904", +- "self_type" : "type-18906", ++ "referenced_type" : "type-19682", ++ "self_type" : "type-19684", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-21033", +- "self_type" : "type-21035", ++ "referenced_type" : "type-21041", ++ "self_type" : "type-21043", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-21348", +- "self_type" : "type-21350", ++ "referenced_type" : "type-21356", ++ "self_type" : "type-21358", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-21600", +- "self_type" : "type-21602", ++ "referenced_type" : "type-21608", ++ "self_type" : "type-21610", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-21719", +- "self_type" : "type-21721", ++ "referenced_type" : "type-21727", ++ "self_type" : "type-21729", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { +@@ -73355,8 +73397,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-15941", +- "self_type" : "type-15944", ++ "referenced_type" : "type-15427", ++ "self_type" : "type-15430", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73364,8 +73406,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-17010", +- "self_type" : "type-17013", ++ "referenced_type" : "type-15757", ++ "self_type" : "type-15760", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73373,8 +73415,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-18569", +- "self_type" : "type-18572", ++ "referenced_type" : "type-15928", ++ "self_type" : "type-15931", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73382,8 +73424,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-18653", +- "self_type" : "type-18656", ++ "referenced_type" : "type-16094", ++ "self_type" : "type-16097", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73391,8 +73433,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-18843", +- "self_type" : "type-18846", ++ "referenced_type" : "type-16712", ++ "self_type" : "type-16715", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73400,8 +73442,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-18940", +- "self_type" : "type-18944", ++ "referenced_type" : "type-17780", ++ "self_type" : "type-17783", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73418,8 +73460,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-19182", +- "self_type" : "type-19185", ++ "referenced_type" : "type-19347", ++ "self_type" : "type-19350", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73427,8 +73469,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-19513", +- "self_type" : "type-19516", ++ "referenced_type" : "type-19431", ++ "self_type" : "type-19434", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73436,8 +73478,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-19684", +- "self_type" : "type-19687", ++ "referenced_type" : "type-19621", ++ "self_type" : "type-19624", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73445,8 +73487,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-19850", +- "self_type" : "type-19853", ++ "referenced_type" : "type-19718", ++ "self_type" : "type-19722", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73454,8 +73496,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-20473", +- "self_type" : "type-20476", ++ "referenced_type" : "type-20480", ++ "self_type" : "type-20483", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73463,8 +73505,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-21542", +- "self_type" : "type-21545", ++ "referenced_type" : "type-21550", ++ "self_type" : "type-21553", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73877,8 +73919,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-15945", +- "self_type" : "type-15948", ++ "referenced_type" : "type-15431", ++ "self_type" : "type-15436", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73886,8 +73928,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-17014", +- "self_type" : "type-17017", ++ "referenced_type" : "type-15761", ++ "self_type" : "type-15764", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73895,8 +73937,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-18573", +- "self_type" : "type-18576", ++ "referenced_type" : "type-15932", ++ "self_type" : "type-15935", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73904,8 +73946,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-18657", +- "self_type" : "type-18660", ++ "referenced_type" : "type-16098", ++ "self_type" : "type-16102", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73913,8 +73955,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-18847", +- "self_type" : "type-18850", ++ "referenced_type" : "type-16716", ++ "self_type" : "type-16719", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73922,8 +73964,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-18945", +- "self_type" : "type-18948", ++ "referenced_type" : "type-17784", ++ "self_type" : "type-17787", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73940,8 +73982,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-19186", +- "self_type" : "type-19191", ++ "referenced_type" : "type-19351", ++ "self_type" : "type-19354", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73949,8 +73991,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-19517", +- "self_type" : "type-19520", ++ "referenced_type" : "type-19435", ++ "self_type" : "type-19438", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73958,8 +74000,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-19688", +- "self_type" : "type-19691", ++ "referenced_type" : "type-19625", ++ "self_type" : "type-19628", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73967,8 +74009,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-19854", +- "self_type" : "type-19858", ++ "referenced_type" : "type-19723", ++ "self_type" : "type-19726", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73976,8 +74018,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-20477", +- "self_type" : "type-20480", ++ "referenced_type" : "type-20484", ++ "self_type" : "type-20487", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73985,8 +74027,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-21546", +- "self_type" : "type-21549", ++ "referenced_type" : "type-21554", ++ "self_type" : "type-21557", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74471,8 +74513,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-15937", +- "self_type" : "type-15940", ++ "referenced_type" : "type-15423", ++ "self_type" : "type-15426", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74480,8 +74522,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-17006", +- "self_type" : "type-17009", ++ "referenced_type" : "type-15753", ++ "self_type" : "type-15756", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74489,8 +74531,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-18565", +- "self_type" : "type-18568", ++ "referenced_type" : "type-15924", ++ "self_type" : "type-15927", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74498,8 +74540,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-18649", +- "self_type" : "type-18652", ++ "referenced_type" : "type-16088", ++ "self_type" : "type-16093", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74507,8 +74549,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-18839", +- "self_type" : "type-18842", ++ "referenced_type" : "type-16708", ++ "self_type" : "type-16711", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74516,8 +74558,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-18935", +- "self_type" : "type-18939", ++ "referenced_type" : "type-17776", ++ "self_type" : "type-17779", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74525,8 +74567,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-19178", +- "self_type" : "type-19181", ++ "referenced_type" : "type-1932", ++ "self_type" : "type-1963", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74534,8 +74576,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-1932", +- "self_type" : "type-1963", ++ "referenced_type" : "type-19343", ++ "self_type" : "type-19346", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74543,8 +74585,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-19509", +- "self_type" : "type-19512", ++ "referenced_type" : "type-19427", ++ "self_type" : "type-19430", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74552,8 +74594,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-19680", +- "self_type" : "type-19683", ++ "referenced_type" : "type-19617", ++ "self_type" : "type-19620", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74561,8 +74603,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-19844", +- "self_type" : "type-19849", ++ "referenced_type" : "type-19713", ++ "self_type" : "type-19717", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74570,8 +74612,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-20469", +- "self_type" : "type-20472", ++ "referenced_type" : "type-20476", ++ "self_type" : "type-20479", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74579,8 +74621,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-21538", +- "self_type" : "type-21541", ++ "referenced_type" : "type-21546", ++ "self_type" : "type-21549", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75002,8 +75044,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-15957", +- "self_type" : "type-15966", ++ "referenced_type" : "type-15445", ++ "self_type" : "type-15457", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75011,8 +75053,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-17026", +- "self_type" : "type-17036", ++ "referenced_type" : "type-15773", ++ "self_type" : "type-15784", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75020,8 +75062,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-18586", +- "self_type" : "type-18595", ++ "referenced_type" : "type-15945", ++ "self_type" : "type-15954", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75029,8 +75071,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-18671", +- "self_type" : "type-18680", ++ "referenced_type" : "type-16113", ++ "self_type" : "type-16124", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75038,8 +75080,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-18862", +- "self_type" : "type-18871", ++ "referenced_type" : "type-16728", ++ "self_type" : "type-16737", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75047,8 +75089,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-18959", +- "self_type" : "type-18969", ++ "referenced_type" : "type-17796", ++ "self_type" : "type-17806", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75056,8 +75098,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-19200", +- "self_type" : "type-19212", ++ "referenced_type" : "type-19364", ++ "self_type" : "type-19373", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75074,8 +75116,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-19529", +- "self_type" : "type-19540", ++ "referenced_type" : "type-19449", ++ "self_type" : "type-19458", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75083,8 +75125,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-19701", +- "self_type" : "type-19710", ++ "referenced_type" : "type-19640", ++ "self_type" : "type-19649", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75092,8 +75134,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-19869", +- "self_type" : "type-19880", ++ "referenced_type" : "type-19737", ++ "self_type" : "type-19747", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75101,8 +75143,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-20489", +- "self_type" : "type-20498", ++ "referenced_type" : "type-20496", ++ "self_type" : "type-20505", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75110,8 +75152,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-21558", +- "self_type" : "type-21568", ++ "referenced_type" : "type-21566", ++ "self_type" : "type-21576", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -76046,80 +76088,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-15701", +- "self_type" : "type-15703", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "const google::protobuf::MapKey &", +- "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-15871", +- "self_type" : "type-15873", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "const google::protobuf::MapKey &", +- "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-15974", +- "self_type" : "type-15976", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "const google::protobuf::MapKey &", +- "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-16113", +- "self_type" : "type-16115", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "const google::protobuf::MapKey &", +- "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-16262", +- "self_type" : "type-16264", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "const google::protobuf::MapKey &", +- "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-16355", +- "self_type" : "type-16357", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "const google::protobuf::MapKey &", +- "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-16455", +- "self_type" : "type-16457", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "const google::protobuf::MapKey &", +- "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-16637", +- "self_type" : "type-16639", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "const google::protobuf::MapKey &", +- "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-16717", +- "self_type" : "type-16719", ++ "referenced_type" : "type-15462", ++ "self_type" : "type-15464", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76127,8 +76097,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-16775", +- "self_type" : "type-16777", ++ "referenced_type" : "type-15612", ++ "self_type" : "type-15614", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76136,26 +76106,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-17247", +- "self_type" : "type-17249", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "const google::protobuf::MapKey &", +- "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-17354", +- "self_type" : "type-17356", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "const google::protobuf::MapKey &", +- "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-17696", +- "self_type" : "type-17698", ++ "referenced_type" : "type-15799", ++ "self_type" : "type-15801", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76163,8 +76115,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-17854", +- "self_type" : "type-17856", ++ "referenced_type" : "type-15970", ++ "self_type" : "type-15972", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76172,8 +76124,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-17942", +- "self_type" : "type-17944", ++ "referenced_type" : "type-16129", ++ "self_type" : "type-16131", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76181,8 +76133,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-18031", +- "self_type" : "type-18033", ++ "referenced_type" : "type-16474", ++ "self_type" : "type-16476", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76190,8 +76142,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-18115", +- "self_type" : "type-18117", ++ "referenced_type" : "type-16644", ++ "self_type" : "type-16646", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76199,8 +76151,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-18182", +- "self_type" : "type-18184", ++ "referenced_type" : "type-16745", ++ "self_type" : "type-16747", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76208,8 +76160,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-18344", +- "self_type" : "type-18346", ++ "referenced_type" : "type-16883", ++ "self_type" : "type-16885", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76217,8 +76169,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-18469", +- "self_type" : "type-18471", ++ "referenced_type" : "type-17032", ++ "self_type" : "type-17034", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76226,8 +76178,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-18604", +- "self_type" : "type-18606", ++ "referenced_type" : "type-17125", ++ "self_type" : "type-17127", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76235,8 +76187,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-18695", +- "self_type" : "type-18697", ++ "referenced_type" : "type-17225", ++ "self_type" : "type-17227", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76244,8 +76196,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-18974", +- "self_type" : "type-18976", ++ "referenced_type" : "type-17407", ++ "self_type" : "type-17409", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76253,8 +76205,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-19217", +- "self_type" : "type-19219", ++ "referenced_type" : "type-17487", ++ "self_type" : "type-17489", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76262,8 +76214,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-19368", +- "self_type" : "type-19370", ++ "referenced_type" : "type-17545", ++ "self_type" : "type-17547", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76271,8 +76223,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-19555", +- "self_type" : "type-19557", ++ "referenced_type" : "type-18017", ++ "self_type" : "type-18019", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76280,8 +76232,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-19726", +- "self_type" : "type-19728", ++ "referenced_type" : "type-18132", ++ "self_type" : "type-18134", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76289,8 +76241,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-19885", +- "self_type" : "type-19887", ++ "referenced_type" : "type-18474", ++ "self_type" : "type-18476", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76298,8 +76250,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-20234", +- "self_type" : "type-20236", ++ "referenced_type" : "type-18632", ++ "self_type" : "type-18634", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76307,8 +76259,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-20405", +- "self_type" : "type-20407", ++ "referenced_type" : "type-18720", ++ "self_type" : "type-18722", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76316,8 +76268,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-20506", +- "self_type" : "type-20508", ++ "referenced_type" : "type-18809", ++ "self_type" : "type-18811", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76325,8 +76277,98 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-20644", +- "self_type" : "type-20646", ++ "referenced_type" : "type-18893", ++ "self_type" : "type-18895", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/message.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "const google::protobuf::MapKey &", ++ "name" : "const google::protobuf::MapKey &", ++ "referenced_type" : "type-18960", ++ "self_type" : "type-18962", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/message.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "const google::protobuf::MapKey &", ++ "name" : "const google::protobuf::MapKey &", ++ "referenced_type" : "type-19122", ++ "self_type" : "type-19124", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/message.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "const google::protobuf::MapKey &", ++ "name" : "const google::protobuf::MapKey &", ++ "referenced_type" : "type-19247", ++ "self_type" : "type-19249", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/message.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "const google::protobuf::MapKey &", ++ "name" : "const google::protobuf::MapKey &", ++ "referenced_type" : "type-19382", ++ "self_type" : "type-19384", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/message.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "const google::protobuf::MapKey &", ++ "name" : "const google::protobuf::MapKey &", ++ "referenced_type" : "type-19473", ++ "self_type" : "type-19475", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/message.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "const google::protobuf::MapKey &", ++ "name" : "const google::protobuf::MapKey &", ++ "referenced_type" : "type-19752", ++ "self_type" : "type-19754", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/message.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "const google::protobuf::MapKey &", ++ "name" : "const google::protobuf::MapKey &", ++ "referenced_type" : "type-20238", ++ "self_type" : "type-20240", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/message.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "const google::protobuf::MapKey &", ++ "name" : "const google::protobuf::MapKey &", ++ "referenced_type" : "type-20409", ++ "self_type" : "type-20411", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/message.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "const google::protobuf::MapKey &", ++ "name" : "const google::protobuf::MapKey &", ++ "referenced_type" : "type-20513", ++ "self_type" : "type-20515", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/message.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "const google::protobuf::MapKey &", ++ "name" : "const google::protobuf::MapKey &", ++ "referenced_type" : "type-20652", ++ "self_type" : "type-20654", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76343,8 +76385,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-20793", +- "self_type" : "type-20795", ++ "referenced_type" : "type-20801", ++ "self_type" : "type-20803", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76352,8 +76394,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-20886", +- "self_type" : "type-20888", ++ "referenced_type" : "type-20894", ++ "self_type" : "type-20896", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76361,8 +76403,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-20987", +- "self_type" : "type-20989", ++ "referenced_type" : "type-20995", ++ "self_type" : "type-20997", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76370,8 +76412,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-21169", +- "self_type" : "type-21171", ++ "referenced_type" : "type-21177", ++ "self_type" : "type-21179", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76379,8 +76421,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-21249", +- "self_type" : "type-21251", ++ "referenced_type" : "type-21257", ++ "self_type" : "type-21259", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76388,8 +76430,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-21307", +- "self_type" : "type-21309", ++ "referenced_type" : "type-21315", ++ "self_type" : "type-21317", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76397,8 +76439,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-21779", +- "self_type" : "type-21781", ++ "referenced_type" : "type-21787", ++ "self_type" : "type-21789", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77513,8 +77555,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-17547", +- "self_type" : "type-17546", ++ "referenced_type" : "type-1790", ++ "self_type" : "type-1789", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77522,8 +77564,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-1790", +- "self_type" : "type-1789", ++ "referenced_type" : "type-18325", ++ "self_type" : "type-18324", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77531,8 +77573,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-18252", +- "self_type" : "type-18251", ++ "referenced_type" : "type-19030", ++ "self_type" : "type-19029", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77540,8 +77582,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-18772", +- "self_type" : "type-18771", ++ "referenced_type" : "type-19550", ++ "self_type" : "type-19549", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77549,8 +77591,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-18860", +- "self_type" : "type-18859", ++ "referenced_type" : "type-19638", ++ "self_type" : "type-19637", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77855,8 +77897,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-15935", +- "self_type" : "type-15934", ++ "referenced_type" : "type-15412", ++ "self_type" : "type-15419", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77864,8 +77906,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-17000", +- "self_type" : "type-17005", ++ "referenced_type" : "type-15748", ++ "self_type" : "type-15752", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77873,8 +77915,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-18560", +- "self_type" : "type-18564", ++ "referenced_type" : "type-15917", ++ "self_type" : "type-15921", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77882,8 +77924,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-18642", +- "self_type" : "type-18648", ++ "referenced_type" : "type-16079", ++ "self_type" : "type-16085", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77891,8 +77933,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-18833", +- "self_type" : "type-18838", ++ "referenced_type" : "type-16706", ++ "self_type" : "type-16705", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77900,8 +77942,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-18927", +- "self_type" : "type-18933", ++ "referenced_type" : "type-17770", ++ "self_type" : "type-17775", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77909,8 +77951,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-19167", +- "self_type" : "type-19174", ++ "referenced_type" : "type-19338", ++ "self_type" : "type-19342", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77918,8 +77960,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-1944", +- "self_type" : "type-1955", ++ "referenced_type" : "type-19420", ++ "self_type" : "type-19426", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77927,8 +77969,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-19504", +- "self_type" : "type-19508", ++ "referenced_type" : "type-1944", ++ "self_type" : "type-1955", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77936,8 +77978,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-19673", +- "self_type" : "type-19677", ++ "referenced_type" : "type-19611", ++ "self_type" : "type-19616", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77945,8 +77987,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-19835", +- "self_type" : "type-19841", ++ "referenced_type" : "type-19705", ++ "self_type" : "type-19711", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77954,8 +77996,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-20467", +- "self_type" : "type-20466", ++ "referenced_type" : "type-20474", ++ "self_type" : "type-20473", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77963,8 +78005,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-21532", +- "self_type" : "type-21537", ++ "referenced_type" : "type-21540", ++ "self_type" : "type-21545", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78377,8 +78419,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-15953", +- "self_type" : "type-15956", ++ "referenced_type" : "type-15441", ++ "self_type" : "type-15444", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78386,8 +78428,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-17022", +- "self_type" : "type-17025", ++ "referenced_type" : "type-15769", ++ "self_type" : "type-15772", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78395,8 +78437,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-18582", +- "self_type" : "type-18585", ++ "referenced_type" : "type-15941", ++ "self_type" : "type-15944", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78404,8 +78446,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-18665", +- "self_type" : "type-18668", ++ "referenced_type" : "type-16108", ++ "self_type" : "type-16111", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78413,8 +78455,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-18855", +- "self_type" : "type-18858", ++ "referenced_type" : "type-16724", ++ "self_type" : "type-16727", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78422,8 +78464,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-18954", +- "self_type" : "type-18958", ++ "referenced_type" : "type-17792", ++ "self_type" : "type-17795", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78440,8 +78482,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-19196", +- "self_type" : "type-19199", ++ "referenced_type" : "type-19360", ++ "self_type" : "type-19363", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78449,8 +78491,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-19525", +- "self_type" : "type-19528", ++ "referenced_type" : "type-19443", ++ "self_type" : "type-19446", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78458,8 +78500,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-19697", +- "self_type" : "type-19700", ++ "referenced_type" : "type-19633", ++ "self_type" : "type-19636", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78467,8 +78509,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-19864", +- "self_type" : "type-19867", ++ "referenced_type" : "type-19732", ++ "self_type" : "type-19736", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78476,8 +78518,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-20485", +- "self_type" : "type-20488", ++ "referenced_type" : "type-20492", ++ "self_type" : "type-20495", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78485,8 +78527,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-21554", +- "self_type" : "type-21557", ++ "referenced_type" : "type-21562", ++ "self_type" : "type-21565", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -79160,8 +79202,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-15725", +- "self_type" : "type-15724", ++ "referenced_type" : "type-15518", ++ "self_type" : "type-15517", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79169,8 +79211,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-15898", +- "self_type" : "type-15897", ++ "referenced_type" : "type-15661", ++ "self_type" : "type-15660", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79178,8 +79220,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16178", +- "self_type" : "type-16177", ++ "referenced_type" : "type-15865", ++ "self_type" : "type-15864", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79187,8 +79229,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16281", +- "self_type" : "type-16280", ++ "referenced_type" : "type-16034", ++ "self_type" : "type-16033", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79196,8 +79238,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16421", +- "self_type" : "type-16420", ++ "referenced_type" : "type-16190", ++ "self_type" : "type-16189", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79205,8 +79247,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16478", +- "self_type" : "type-16477", ++ "referenced_type" : "type-16498", ++ "self_type" : "type-16497", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79214,8 +79256,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16658", +- "self_type" : "type-16657", ++ "referenced_type" : "type-16671", ++ "self_type" : "type-16670", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79223,8 +79265,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16796", +- "self_type" : "type-16795", ++ "referenced_type" : "type-16948", ++ "self_type" : "type-16947", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79232,8 +79274,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17301", +- "self_type" : "type-17300", ++ "referenced_type" : "type-17051", ++ "self_type" : "type-17050", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79241,8 +79283,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17375", +- "self_type" : "type-17374", ++ "referenced_type" : "type-17191", ++ "self_type" : "type-17190", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79250,8 +79292,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17421", +- "self_type" : "type-17420", ++ "referenced_type" : "type-17248", ++ "self_type" : "type-17247", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79259,8 +79301,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17778", +- "self_type" : "type-17777", ++ "referenced_type" : "type-17428", ++ "self_type" : "type-17427", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79268,8 +79310,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17879", +- "self_type" : "type-17878", ++ "referenced_type" : "type-17566", ++ "self_type" : "type-17565", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79277,8 +79319,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17971", +- "self_type" : "type-17970", ++ "referenced_type" : "type-18071", ++ "self_type" : "type-18070", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79286,8 +79328,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18082", +- "self_type" : "type-18081", ++ "referenced_type" : "type-18153", ++ "self_type" : "type-18152", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79295,8 +79337,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18134", +- "self_type" : "type-18133", ++ "referenced_type" : "type-18199", ++ "self_type" : "type-18198", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79304,8 +79346,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18221", +- "self_type" : "type-18220", ++ "referenced_type" : "type-18556", ++ "self_type" : "type-18555", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79313,8 +79355,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18394", +- "self_type" : "type-18393", ++ "referenced_type" : "type-18657", ++ "self_type" : "type-18656", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79322,8 +79364,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18521", +- "self_type" : "type-18520", ++ "referenced_type" : "type-18749", ++ "self_type" : "type-18748", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79331,8 +79373,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18753", +- "self_type" : "type-18752", ++ "referenced_type" : "type-18860", ++ "self_type" : "type-18859", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79340,8 +79382,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18884", +- "self_type" : "type-18883", ++ "referenced_type" : "type-18912", ++ "self_type" : "type-18911", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79349,8 +79391,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19033", +- "self_type" : "type-19032", ++ "referenced_type" : "type-18999", ++ "self_type" : "type-18998", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79358,8 +79400,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19273", +- "self_type" : "type-19272", ++ "referenced_type" : "type-19172", ++ "self_type" : "type-19171", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79367,8 +79409,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19417", +- "self_type" : "type-19416", ++ "referenced_type" : "type-19299", ++ "self_type" : "type-19298", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79376,8 +79418,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19621", +- "self_type" : "type-19620", ++ "referenced_type" : "type-19531", ++ "self_type" : "type-19530", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79385,8 +79427,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19790", +- "self_type" : "type-19789", ++ "referenced_type" : "type-19662", ++ "self_type" : "type-19661", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79394,8 +79436,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19946", +- "self_type" : "type-19945", ++ "referenced_type" : "type-19811", ++ "self_type" : "type-19810", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79403,8 +79445,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-20259", +- "self_type" : "type-20258", ++ "referenced_type" : "type-20263", ++ "self_type" : "type-20262", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79412,8 +79454,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-20432", +- "self_type" : "type-20431", ++ "referenced_type" : "type-20436", ++ "self_type" : "type-20435", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79421,8 +79463,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-20709", +- "self_type" : "type-20708", ++ "referenced_type" : "type-20717", ++ "self_type" : "type-20716", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79430,8 +79472,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-20812", +- "self_type" : "type-20811", ++ "referenced_type" : "type-20820", ++ "self_type" : "type-20819", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79439,8 +79481,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-20952", +- "self_type" : "type-20951", ++ "referenced_type" : "type-20960", ++ "self_type" : "type-20959", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79448,8 +79490,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-21010", +- "self_type" : "type-21009", ++ "referenced_type" : "type-21018", ++ "self_type" : "type-21017", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79466,8 +79508,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-21190", +- "self_type" : "type-21189", ++ "referenced_type" : "type-21198", ++ "self_type" : "type-21197", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79475,8 +79517,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-21328", +- "self_type" : "type-21327", ++ "referenced_type" : "type-21336", ++ "self_type" : "type-21335", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79484,8 +79526,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-21833", +- "self_type" : "type-21832", ++ "referenced_type" : "type-21841", ++ "self_type" : "type-21840", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80492,8 +80534,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16174", +- "self_type" : "type-16173", ++ "referenced_type" : "type-15514", ++ "self_type" : "type-15513", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80501,8 +80543,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17297", +- "self_type" : "type-17296", ++ "referenced_type" : "type-15657", ++ "self_type" : "type-15656", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80510,8 +80552,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17773", +- "self_type" : "type-17772", ++ "referenced_type" : "type-15861", ++ "self_type" : "type-15860", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80519,8 +80561,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18078", +- "self_type" : "type-18077", ++ "referenced_type" : "type-16029", ++ "self_type" : "type-16028", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80528,8 +80570,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18389", +- "self_type" : "type-18388", ++ "referenced_type" : "type-16186", ++ "self_type" : "type-16185", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80537,8 +80579,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18517", +- "self_type" : "type-18516", ++ "referenced_type" : "type-16944", ++ "self_type" : "type-16943", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80546,8 +80588,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18749", +- "self_type" : "type-18748", ++ "referenced_type" : "type-18067", ++ "self_type" : "type-18066", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80555,8 +80597,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19029", +- "self_type" : "type-19028", ++ "referenced_type" : "type-18551", ++ "self_type" : "type-18550", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80564,8 +80606,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19269", +- "self_type" : "type-19268", ++ "referenced_type" : "type-18856", ++ "self_type" : "type-18855", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80573,8 +80615,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19413", +- "self_type" : "type-19412", ++ "referenced_type" : "type-19167", ++ "self_type" : "type-19166", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80582,8 +80624,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19617", +- "self_type" : "type-19616", ++ "referenced_type" : "type-19295", ++ "self_type" : "type-19294", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80591,8 +80633,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19785", +- "self_type" : "type-19784", ++ "referenced_type" : "type-19527", ++ "self_type" : "type-19526", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80600,8 +80642,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19942", +- "self_type" : "type-19941", ++ "referenced_type" : "type-19807", ++ "self_type" : "type-19806", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80609,8 +80651,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-20705", +- "self_type" : "type-20704", ++ "referenced_type" : "type-20713", ++ "self_type" : "type-20712", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80618,8 +80660,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-21829", +- "self_type" : "type-21828", ++ "referenced_type" : "type-21837", ++ "self_type" : "type-21836", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81131,8 +81173,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16170", +- "self_type" : "type-16169", ++ "referenced_type" : "type-15509", ++ "self_type" : "type-15508", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81140,8 +81182,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17293", +- "self_type" : "type-17292", ++ "referenced_type" : "type-15653", ++ "self_type" : "type-15652", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81149,8 +81191,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17769", +- "self_type" : "type-17768", ++ "referenced_type" : "type-15857", ++ "self_type" : "type-15856", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81158,8 +81200,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18073", +- "self_type" : "type-18072", ++ "referenced_type" : "type-16025", ++ "self_type" : "type-16024", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81167,8 +81209,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18385", +- "self_type" : "type-18384", ++ "referenced_type" : "type-16182", ++ "self_type" : "type-16181", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81176,8 +81218,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18513", +- "self_type" : "type-18512", ++ "referenced_type" : "type-16940", ++ "self_type" : "type-16939", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81185,8 +81227,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18745", +- "self_type" : "type-18744", ++ "referenced_type" : "type-18063", ++ "self_type" : "type-18062", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81194,8 +81236,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19025", +- "self_type" : "type-19024", ++ "referenced_type" : "type-18547", ++ "self_type" : "type-18546", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81203,8 +81245,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19264", +- "self_type" : "type-19263", ++ "referenced_type" : "type-18851", ++ "self_type" : "type-18850", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81212,8 +81254,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19409", +- "self_type" : "type-19408", ++ "referenced_type" : "type-19163", ++ "self_type" : "type-19162", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81221,8 +81263,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19613", +- "self_type" : "type-19612", ++ "referenced_type" : "type-19291", ++ "self_type" : "type-19290", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81230,8 +81272,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19781", +- "self_type" : "type-19780", ++ "referenced_type" : "type-19523", ++ "self_type" : "type-19522", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81239,8 +81281,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19938", +- "self_type" : "type-19937", ++ "referenced_type" : "type-19803", ++ "self_type" : "type-19802", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81248,8 +81290,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-20701", +- "self_type" : "type-20700", ++ "referenced_type" : "type-20709", ++ "self_type" : "type-20708", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81257,8 +81299,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-21825", +- "self_type" : "type-21824", ++ "referenced_type" : "type-21833", ++ "self_type" : "type-21832", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81671,8 +81713,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18729", +- "self_type" : "type-18728", ++ "referenced_type" : "type-15493", ++ "self_type" : "type-15492", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81680,8 +81722,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19009", +- "self_type" : "type-19008", ++ "referenced_type" : "type-15839", ++ "self_type" : "type-15838", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81689,8 +81731,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19248", +- "self_type" : "type-19247", ++ "referenced_type" : "type-16008", ++ "self_type" : "type-16007", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81698,8 +81740,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19595", +- "self_type" : "type-19594", ++ "referenced_type" : "type-16165", ++ "self_type" : "type-16164", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81707,8 +81749,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19764", +- "self_type" : "type-19763", ++ "referenced_type" : "type-19507", ++ "self_type" : "type-19506", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81716,8 +81758,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19921", +- "self_type" : "type-19920", ++ "referenced_type" : "type-19787", ++ "self_type" : "type-19786", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82013,8 +82055,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16158", +- "self_type" : "type-16157", ++ "referenced_type" : "type-15497", ++ "self_type" : "type-15496", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82022,8 +82064,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17281", +- "self_type" : "type-17280", ++ "referenced_type" : "type-15641", ++ "self_type" : "type-15640", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82031,8 +82073,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17756", +- "self_type" : "type-17755", ++ "referenced_type" : "type-15843", ++ "self_type" : "type-15842", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82040,8 +82082,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18061", +- "self_type" : "type-18060", ++ "referenced_type" : "type-16012", ++ "self_type" : "type-16011", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82049,8 +82091,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18373", +- "self_type" : "type-18372", ++ "referenced_type" : "type-16169", ++ "self_type" : "type-16168", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82058,8 +82100,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18501", +- "self_type" : "type-18500", ++ "referenced_type" : "type-16928", ++ "self_type" : "type-16927", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82067,8 +82109,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18733", +- "self_type" : "type-18732", ++ "referenced_type" : "type-18051", ++ "self_type" : "type-18050", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82076,8 +82118,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19013", +- "self_type" : "type-19012", ++ "referenced_type" : "type-18534", ++ "self_type" : "type-18533", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82085,8 +82127,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19252", +- "self_type" : "type-19251", ++ "referenced_type" : "type-18839", ++ "self_type" : "type-18838", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82094,8 +82136,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19397", +- "self_type" : "type-19396", ++ "referenced_type" : "type-19151", ++ "self_type" : "type-19150", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82103,8 +82145,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19599", +- "self_type" : "type-19598", ++ "referenced_type" : "type-19279", ++ "self_type" : "type-19278", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82112,8 +82154,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19768", +- "self_type" : "type-19767", ++ "referenced_type" : "type-19511", ++ "self_type" : "type-19510", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82121,8 +82163,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19925", +- "self_type" : "type-19924", ++ "referenced_type" : "type-19791", ++ "self_type" : "type-19790", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82130,8 +82172,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-20689", +- "self_type" : "type-20688", ++ "referenced_type" : "type-20697", ++ "self_type" : "type-20696", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82139,8 +82181,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-21813", +- "self_type" : "type-21812", ++ "referenced_type" : "type-21821", ++ "self_type" : "type-21820", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82652,8 +82694,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16162", +- "self_type" : "type-16161", ++ "referenced_type" : "type-15501", ++ "self_type" : "type-15500", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82661,8 +82703,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17285", +- "self_type" : "type-17284", ++ "referenced_type" : "type-15645", ++ "self_type" : "type-15644", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82670,8 +82712,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17760", +- "self_type" : "type-17759", ++ "referenced_type" : "type-15849", ++ "self_type" : "type-15848", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82679,8 +82721,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18065", +- "self_type" : "type-18064", ++ "referenced_type" : "type-16016", ++ "self_type" : "type-16015", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82688,8 +82730,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18377", +- "self_type" : "type-18376", ++ "referenced_type" : "type-16173", ++ "self_type" : "type-16172", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82697,8 +82739,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18505", +- "self_type" : "type-18504", ++ "referenced_type" : "type-16932", ++ "self_type" : "type-16931", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82706,8 +82748,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18737", +- "self_type" : "type-18736", ++ "referenced_type" : "type-18055", ++ "self_type" : "type-18054", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82715,8 +82757,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19017", +- "self_type" : "type-19016", ++ "referenced_type" : "type-18538", ++ "self_type" : "type-18537", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82724,8 +82766,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19256", +- "self_type" : "type-19255", ++ "referenced_type" : "type-18843", ++ "self_type" : "type-18842", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82733,8 +82775,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19401", +- "self_type" : "type-19400", ++ "referenced_type" : "type-19155", ++ "self_type" : "type-19154", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82742,8 +82784,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19605", +- "self_type" : "type-19604", ++ "referenced_type" : "type-19283", ++ "self_type" : "type-19282", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82751,8 +82793,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19772", +- "self_type" : "type-19771", ++ "referenced_type" : "type-19515", ++ "self_type" : "type-19514", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82760,8 +82802,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19929", +- "self_type" : "type-19928", ++ "referenced_type" : "type-19795", ++ "self_type" : "type-19794", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82769,8 +82811,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-20693", +- "self_type" : "type-20692", ++ "referenced_type" : "type-20701", ++ "self_type" : "type-20700", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82778,8 +82820,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-21817", +- "self_type" : "type-21816", ++ "referenced_type" : "type-21825", ++ "self_type" : "type-21824", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83291,8 +83333,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16166", +- "self_type" : "type-16165", ++ "referenced_type" : "type-15505", ++ "self_type" : "type-15504", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83300,8 +83342,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17289", +- "self_type" : "type-17288", ++ "referenced_type" : "type-15649", ++ "self_type" : "type-15648", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83309,8 +83351,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17765", +- "self_type" : "type-17764", ++ "referenced_type" : "type-15853", ++ "self_type" : "type-15852", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83318,8 +83360,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18069", +- "self_type" : "type-18068", ++ "referenced_type" : "type-16021", ++ "self_type" : "type-16020", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83327,8 +83369,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18381", +- "self_type" : "type-18380", ++ "referenced_type" : "type-16177", ++ "self_type" : "type-16176", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83336,8 +83378,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18509", +- "self_type" : "type-18508", ++ "referenced_type" : "type-16936", ++ "self_type" : "type-16935", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83345,8 +83387,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18741", +- "self_type" : "type-18740", ++ "referenced_type" : "type-18059", ++ "self_type" : "type-18058", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83354,8 +83396,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19021", +- "self_type" : "type-19020", ++ "referenced_type" : "type-18543", ++ "self_type" : "type-18542", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83363,8 +83405,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19260", +- "self_type" : "type-19259", ++ "referenced_type" : "type-18847", ++ "self_type" : "type-18846", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83372,8 +83414,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19405", +- "self_type" : "type-19404", ++ "referenced_type" : "type-19159", ++ "self_type" : "type-19158", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83381,8 +83423,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19609", +- "self_type" : "type-19608", ++ "referenced_type" : "type-19287", ++ "self_type" : "type-19286", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83390,8 +83432,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19777", +- "self_type" : "type-19776", ++ "referenced_type" : "type-19519", ++ "self_type" : "type-19518", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83399,8 +83441,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19933", +- "self_type" : "type-19932", ++ "referenced_type" : "type-19799", ++ "self_type" : "type-19798", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83408,8 +83450,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-20697", +- "self_type" : "type-20696", ++ "referenced_type" : "type-20705", ++ "self_type" : "type-20704", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83417,8 +83459,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-21821", +- "self_type" : "type-21820", ++ "referenced_type" : "type-21829", ++ "self_type" : "type-21828", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -84191,8 +84233,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-15710", +- "self_type" : "type-15709", ++ "referenced_type" : "type-15470", ++ "self_type" : "type-15469", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84200,8 +84242,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-15879", +- "self_type" : "type-15878", ++ "referenced_type" : "type-15620", ++ "self_type" : "type-15619", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84209,8 +84251,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-15987", +- "self_type" : "type-15986", ++ "referenced_type" : "type-15808", ++ "self_type" : "type-15807", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84218,8 +84260,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-16121", +- "self_type" : "type-16120", ++ "referenced_type" : "type-15978", ++ "self_type" : "type-15977", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84227,8 +84269,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-16270", +- "self_type" : "type-16269", ++ "referenced_type" : "type-16138", ++ "self_type" : "type-16137", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84236,8 +84278,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-16363", +- "self_type" : "type-16362", ++ "referenced_type" : "type-16483", ++ "self_type" : "type-16482", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84245,8 +84287,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-16463", +- "self_type" : "type-16462", ++ "referenced_type" : "type-16652", ++ "self_type" : "type-16651", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84254,8 +84296,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-16645", +- "self_type" : "type-16644", ++ "referenced_type" : "type-16758", ++ "self_type" : "type-16757", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84263,8 +84305,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-16725", +- "self_type" : "type-16724", ++ "referenced_type" : "type-16891", ++ "self_type" : "type-16890", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84272,8 +84314,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-16783", +- "self_type" : "type-16782", ++ "referenced_type" : "type-17040", ++ "self_type" : "type-17039", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84281,8 +84323,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-16857", +- "self_type" : "type-16856", ++ "referenced_type" : "type-17133", ++ "self_type" : "type-17132", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84290,8 +84332,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-17255", +- "self_type" : "type-17254", ++ "referenced_type" : "type-17233", ++ "self_type" : "type-17232", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84299,8 +84341,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-17362", +- "self_type" : "type-17361", ++ "referenced_type" : "type-17415", ++ "self_type" : "type-17414", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84308,8 +84350,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-17862", +- "self_type" : "type-17861", ++ "referenced_type" : "type-17495", ++ "self_type" : "type-17494", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84317,8 +84359,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-17950", +- "self_type" : "type-17949", ++ "referenced_type" : "type-17553", ++ "self_type" : "type-17552", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84326,8 +84368,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-18040", +- "self_type" : "type-18039", ++ "referenced_type" : "type-17627", ++ "self_type" : "type-17626", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84335,8 +84377,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-18123", +- "self_type" : "type-18122", ++ "referenced_type" : "type-18025", ++ "self_type" : "type-18024", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84344,8 +84386,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-18190", +- "self_type" : "type-18189", ++ "referenced_type" : "type-18140", ++ "self_type" : "type-18139", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84353,8 +84395,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-18352", +- "self_type" : "type-18351", ++ "referenced_type" : "type-18640", ++ "self_type" : "type-18639", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84362,8 +84404,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-18477", +- "self_type" : "type-18476", ++ "referenced_type" : "type-18728", ++ "self_type" : "type-18727", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84371,8 +84413,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-18619", +- "self_type" : "type-18618", ++ "referenced_type" : "type-18818", ++ "self_type" : "type-18817", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84380,8 +84422,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-18703", +- "self_type" : "type-18702", ++ "referenced_type" : "type-18901", ++ "self_type" : "type-18900", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84389,8 +84431,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-18983", +- "self_type" : "type-18982", ++ "referenced_type" : "type-18968", ++ "self_type" : "type-18967", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84398,8 +84440,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-19225", +- "self_type" : "type-19224", ++ "referenced_type" : "type-19130", ++ "self_type" : "type-19129", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84407,8 +84449,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-19376", +- "self_type" : "type-19375", ++ "referenced_type" : "type-19255", ++ "self_type" : "type-19254", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84416,8 +84458,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-19564", +- "self_type" : "type-19563", ++ "referenced_type" : "type-19397", ++ "self_type" : "type-19396", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84425,8 +84467,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-19734", +- "self_type" : "type-19733", ++ "referenced_type" : "type-19481", ++ "self_type" : "type-19480", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84434,8 +84476,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-19894", +- "self_type" : "type-19893", ++ "referenced_type" : "type-19761", ++ "self_type" : "type-19760", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84443,8 +84485,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-20243", +- "self_type" : "type-20242", ++ "referenced_type" : "type-20247", ++ "self_type" : "type-20246", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84452,8 +84494,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-20413", +- "self_type" : "type-20412", ++ "referenced_type" : "type-20417", ++ "self_type" : "type-20416", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84461,8 +84503,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-20519", +- "self_type" : "type-20518", ++ "referenced_type" : "type-20526", ++ "self_type" : "type-20525", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84470,8 +84512,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-20652", +- "self_type" : "type-20651", ++ "referenced_type" : "type-20660", ++ "self_type" : "type-20659", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84479,8 +84521,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-20801", +- "self_type" : "type-20800", ++ "referenced_type" : "type-20809", ++ "self_type" : "type-20808", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84497,8 +84539,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-20894", +- "self_type" : "type-20893", ++ "referenced_type" : "type-20902", ++ "self_type" : "type-20901", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84506,8 +84548,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-20995", +- "self_type" : "type-20994", ++ "referenced_type" : "type-21003", ++ "self_type" : "type-21002", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84515,8 +84557,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-21177", +- "self_type" : "type-21176", ++ "referenced_type" : "type-21185", ++ "self_type" : "type-21184", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84524,8 +84566,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-21257", +- "self_type" : "type-21256", ++ "referenced_type" : "type-21265", ++ "self_type" : "type-21264", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84533,8 +84575,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-21315", +- "self_type" : "type-21314", ++ "referenced_type" : "type-21323", ++ "self_type" : "type-21322", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84542,8 +84584,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-21389", +- "self_type" : "type-21388", ++ "referenced_type" : "type-21397", ++ "self_type" : "type-21396", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84551,8 +84593,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-21787", +- "self_type" : "type-21786", ++ "referenced_type" : "type-21795", ++ "self_type" : "type-21794", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85649,8 +85691,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", +- "referenced_type" : "type-15982", +- "self_type" : "type-15981", ++ "referenced_type" : "type-16753", ++ "self_type" : "type-16752", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85658,8 +85700,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", +- "referenced_type" : "type-18614", +- "self_type" : "type-18613", ++ "referenced_type" : "type-19392", ++ "self_type" : "type-19391", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85667,8 +85709,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", +- "referenced_type" : "type-20514", +- "self_type" : "type-20513", ++ "referenced_type" : "type-20521", ++ "self_type" : "type-20520", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85847,8 +85889,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-15949", +- "self_type" : "type-15952", ++ "referenced_type" : "type-15437", ++ "self_type" : "type-15440", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85856,8 +85898,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-17018", +- "self_type" : "type-17021", ++ "referenced_type" : "type-15765", ++ "self_type" : "type-15768", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85865,8 +85907,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-18577", +- "self_type" : "type-18581", ++ "referenced_type" : "type-15936", ++ "self_type" : "type-15939", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85874,8 +85916,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-18661", +- "self_type" : "type-18664", ++ "referenced_type" : "type-16103", ++ "self_type" : "type-16107", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85883,8 +85925,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-18851", +- "self_type" : "type-18854", ++ "referenced_type" : "type-16720", ++ "self_type" : "type-16723", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85892,8 +85934,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-18949", +- "self_type" : "type-18953", ++ "referenced_type" : "type-17788", ++ "self_type" : "type-17791", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85910,8 +85952,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-19192", +- "self_type" : "type-19195", ++ "referenced_type" : "type-19355", ++ "self_type" : "type-19359", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85919,8 +85961,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-19521", +- "self_type" : "type-19524", ++ "referenced_type" : "type-19439", ++ "self_type" : "type-19442", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85928,8 +85970,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-19692", +- "self_type" : "type-19695", ++ "referenced_type" : "type-19629", ++ "self_type" : "type-19632", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85937,8 +85979,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-19859", +- "self_type" : "type-19863", ++ "referenced_type" : "type-19727", ++ "self_type" : "type-19731", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85946,8 +85988,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-20481", +- "self_type" : "type-20484", ++ "referenced_type" : "type-20488", ++ "self_type" : "type-20491", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85955,8 +85997,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-21550", +- "self_type" : "type-21553", ++ "referenced_type" : "type-21558", ++ "self_type" : "type-21561", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86603,8 +86645,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::hash_set, std::equal_to > &", + "name" : "const google::protobuf::hash_set, std::equal_to > &", +- "referenced_type" : "type-19812", +- "self_type" : "type-19813", ++ "referenced_type" : "type-16056", ++ "self_type" : "type-16057", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -86900,8 +86942,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::StatusOr &", + "name" : "const google::protobuf::util::StatusOr &", +- "referenced_type" : "type-19958", +- "self_type" : "type-19959", ++ "referenced_type" : "type-16202", ++ "self_type" : "type-16203", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -86910,7 +86952,7 @@ + "linker_set_key" : "const google::protobuf::util::StatusOr &", + "name" : "const google::protobuf::util::StatusOr &", + "referenced_type" : "type-15278", +- "self_type" : "type-19953", ++ "self_type" : "type-16197", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -86936,8 +86978,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::converter::ProtoStreamObjectWriter::Options &", + "name" : "const google::protobuf::util::converter::ProtoStreamObjectWriter::Options &", +- "referenced_type" : "type-19456", +- "self_type" : "type-19640", ++ "referenced_type" : "type-15700", ++ "self_type" : "type-15884", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, +@@ -87002,71 +87044,71 @@ + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-16495", +- "self_type" : "type-16497", ++ "referenced_type" : "type-17265", ++ "self_type" : "type-17267", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-16887", +- "self_type" : "type-16889", ++ "referenced_type" : "type-17657", ++ "self_type" : "type-17659", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-17062", +- "self_type" : "type-17064", ++ "referenced_type" : "type-17832", ++ "self_type" : "type-17834", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-17181", +- "self_type" : "type-17183", ++ "referenced_type" : "type-17951", ++ "self_type" : "type-17953", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-17448", +- "self_type" : "type-17450", ++ "referenced_type" : "type-18226", ++ "self_type" : "type-18228", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-18898", +- "self_type" : "type-18900", ++ "referenced_type" : "type-19676", ++ "self_type" : "type-19678", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-21027", +- "self_type" : "type-21029", ++ "referenced_type" : "type-21035", ++ "self_type" : "type-21037", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-21419", +- "self_type" : "type-21421", ++ "referenced_type" : "type-21427", ++ "self_type" : "type-21429", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-21594", +- "self_type" : "type-21596", ++ "referenced_type" : "type-21602", ++ "self_type" : "type-21604", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-21713", +- "self_type" : "type-21715", ++ "referenced_type" : "type-21721", ++ "self_type" : "type-21723", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { +@@ -87245,8 +87287,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> > &", + "name" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> > &", +- "referenced_type" : "type-16978", +- "self_type" : "type-16980", ++ "referenced_type" : "type-17748", ++ "self_type" : "type-17750", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87254,8 +87296,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> > &", + "name" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> > &", +- "referenced_type" : "type-21510", +- "self_type" : "type-21512", ++ "referenced_type" : "type-21518", ++ "self_type" : "type-21520", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87317,8 +87359,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", + "name" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", +- "referenced_type" : "type-17564", +- "self_type" : "type-17566", ++ "referenced_type" : "type-18342", ++ "self_type" : "type-18344", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87362,8 +87404,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> > &", + "name" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> > &", +- "referenced_type" : "type-16988", +- "self_type" : "type-16990", ++ "referenced_type" : "type-17758", ++ "self_type" : "type-17760", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87371,8 +87413,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> > &", + "name" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> > &", +- "referenced_type" : "type-21520", +- "self_type" : "type-21522", ++ "referenced_type" : "type-21528", ++ "self_type" : "type-21530", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87443,8 +87485,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", + "name" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", +- "referenced_type" : "type-17574", +- "self_type" : "type-17576", ++ "referenced_type" : "type-18352", ++ "self_type" : "type-18354", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87452,8 +87494,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", + "name" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", +- "referenced_type" : "type-18827", +- "self_type" : "type-18829", ++ "referenced_type" : "type-19605", ++ "self_type" : "type-19607", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87515,8 +87557,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-16062", +- "self_type" : "type-16064", ++ "referenced_type" : "type-16833", ++ "self_type" : "type-16835", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87524,8 +87566,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-20594", +- "self_type" : "type-20596", ++ "referenced_type" : "type-20601", ++ "self_type" : "type-20603", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87587,8 +87629,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator &)> > &", + "name" : "const std::allocator &)> > &", +- "referenced_type" : "type-17142", +- "self_type" : "type-17144", ++ "referenced_type" : "type-17912", ++ "self_type" : "type-17914", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87596,8 +87638,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator &)> > &", + "name" : "const std::allocator &)> > &", +- "referenced_type" : "type-21674", +- "self_type" : "type-21676", ++ "referenced_type" : "type-21682", ++ "self_type" : "type-21684", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87650,8 +87692,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-16551", +- "self_type" : "type-16553", ++ "referenced_type" : "type-17321", ++ "self_type" : "type-17323", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87659,8 +87701,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-21083", +- "self_type" : "type-21085", ++ "referenced_type" : "type-21091", ++ "self_type" : "type-21093", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87722,8 +87764,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-17148", +- "self_type" : "type-17150", ++ "referenced_type" : "type-17918", ++ "self_type" : "type-17920", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87731,8 +87773,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-21680", +- "self_type" : "type-21682", ++ "referenced_type" : "type-21688", ++ "self_type" : "type-21690", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87776,8 +87818,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > &", + "name" : "const std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > &", +- "referenced_type" : "type-19487", +- "self_type" : "type-19489", ++ "referenced_type" : "type-15731", ++ "self_type" : "type-15733", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87803,8 +87845,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > &", + "name" : "const std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > &", +- "referenced_type" : "type-19345", +- "self_type" : "type-19347", ++ "referenced_type" : "type-15589", ++ "self_type" : "type-15591", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87839,8 +87881,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> > &", + "name" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> > &", +- "referenced_type" : "type-16070", +- "self_type" : "type-16072", ++ "referenced_type" : "type-16841", ++ "self_type" : "type-16843", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87848,8 +87890,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> > &", + "name" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> > &", +- "referenced_type" : "type-20602", +- "self_type" : "type-20604", ++ "referenced_type" : "type-20609", ++ "self_type" : "type-20611", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87920,8 +87962,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> > &", + "name" : "const std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> > &", +- "referenced_type" : "type-18440", +- "self_type" : "type-18442", ++ "referenced_type" : "type-19218", ++ "self_type" : "type-19220", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87956,8 +87998,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, int> > &", + "name" : "const std::allocator, std::allocator >, int> > &", +- "referenced_type" : "type-19043", +- "self_type" : "type-19045", ++ "referenced_type" : "type-19821", ++ "self_type" : "type-19823", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -88010,8 +88052,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, google::protobuf::internal::ExtensionInfo> > &", + "name" : "const std::allocator, google::protobuf::internal::ExtensionInfo> > &", +- "referenced_type" : "type-17470", +- "self_type" : "type-17475", ++ "referenced_type" : "type-18248", ++ "self_type" : "type-18253", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -88991,8 +89033,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15396", +- "self_type" : "type-15398", ++ "referenced_type" : "type-15374", ++ "self_type" : "type-15376", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89000,8 +89042,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15408", +- "self_type" : "type-15410", ++ "referenced_type" : "type-1547", ++ "self_type" : "type-1549", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89009,8 +89051,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15444", +- "self_type" : "type-15446", ++ "referenced_type" : "type-155", ++ "self_type" : "type-159", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89018,8 +89060,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1547", +- "self_type" : "type-1549", ++ "referenced_type" : "type-15549", ++ "self_type" : "type-15551", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89027,8 +89069,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15477", +- "self_type" : "type-15479", ++ "referenced_type" : "type-15554", ++ "self_type" : "type-15556", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89036,8 +89078,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-155", +- "self_type" : "type-159", ++ "referenced_type" : "type-15582", ++ "self_type" : "type-15584", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89045,8 +89087,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15510", +- "self_type" : "type-15512", ++ "referenced_type" : "type-15715", ++ "self_type" : "type-15726", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89054,10 +89096,10 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15568", +- "self_type" : "type-15579", ++ "referenced_type" : "type-15718", ++ "self_type" : "type-15720", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, +@@ -89072,8 +89114,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15818", +- "self_type" : "type-15820", ++ "referenced_type" : "type-15890", ++ "self_type" : "type-15894", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89081,8 +89123,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15831", +- "self_type" : "type-15833", ++ "referenced_type" : "type-15904", ++ "self_type" : "type-15906", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89090,8 +89132,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15895", +- "self_type" : "type-15909", ++ "referenced_type" : "type-16064", ++ "self_type" : "type-16066", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89099,8 +89141,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15927", +- "self_type" : "type-15929", ++ "referenced_type" : "type-16160", ++ "self_type" : "type-16179", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89108,8 +89150,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15932", +- "self_type" : "type-16001", ++ "referenced_type" : "type-16250", ++ "self_type" : "type-16252", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89117,8 +89159,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16020", +- "self_type" : "type-16035", ++ "referenced_type" : "type-16283", ++ "self_type" : "type-16285", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89126,17 +89168,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16039", +- "self_type" : "type-16051", ++ "referenced_type" : "type-16341", ++ "self_type" : "type-16352", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16181", +- "self_type" : "type-16186", ++ "referenced_type" : "type-16591", ++ "self_type" : "type-16593", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89144,8 +89186,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16232", +- "self_type" : "type-16234", ++ "referenced_type" : "type-16604", ++ "self_type" : "type-16606", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89153,8 +89195,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16259", +- "self_type" : "type-16261", ++ "referenced_type" : "type-16668", ++ "self_type" : "type-16682", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89162,8 +89204,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16329", +- "self_type" : "type-16331", ++ "referenced_type" : "type-16698", ++ "self_type" : "type-16700", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89171,8 +89213,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16332", +- "self_type" : "type-16334", ++ "referenced_type" : "type-16703", ++ "self_type" : "type-16772", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89180,8 +89222,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16407", +- "self_type" : "type-16415", ++ "referenced_type" : "type-16791", ++ "self_type" : "type-16806", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89189,8 +89231,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16436", +- "self_type" : "type-16438", ++ "referenced_type" : "type-16810", ++ "self_type" : "type-16822", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89198,8 +89240,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16534", +- "self_type" : "type-16536", ++ "referenced_type" : "type-16951", ++ "self_type" : "type-16956", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89207,8 +89249,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16578", +- "self_type" : "type-16580", ++ "referenced_type" : "type-170", ++ "self_type" : "type-172", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89216,8 +89258,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16614", +- "self_type" : "type-16616", ++ "referenced_type" : "type-17002", ++ "self_type" : "type-17004", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89225,8 +89267,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16635", +- "self_type" : "type-16672", ++ "referenced_type" : "type-17029", ++ "self_type" : "type-17031", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89234,8 +89276,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16679", +- "self_type" : "type-16681", ++ "referenced_type" : "type-17099", ++ "self_type" : "type-17101", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89243,8 +89285,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16686", +- "self_type" : "type-16689", ++ "referenced_type" : "type-17102", ++ "self_type" : "type-17104", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89252,8 +89294,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16745", +- "self_type" : "type-16747", ++ "referenced_type" : "type-17177", ++ "self_type" : "type-17185", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89261,8 +89303,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16810", +- "self_type" : "type-16812", ++ "referenced_type" : "type-17206", ++ "self_type" : "type-17208", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89270,8 +89312,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16825", +- "self_type" : "type-16827", ++ "referenced_type" : "type-17304", ++ "self_type" : "type-17306", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89279,8 +89321,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16848", +- "self_type" : "type-16891", ++ "referenced_type" : "type-17348", ++ "self_type" : "type-17350", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89288,8 +89330,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16896", +- "self_type" : "type-16898", ++ "referenced_type" : "type-17384", ++ "self_type" : "type-17386", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89297,8 +89339,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-170", +- "self_type" : "type-172", ++ "referenced_type" : "type-17405", ++ "self_type" : "type-17442", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89306,8 +89348,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17120", +- "self_type" : "type-17119", ++ "referenced_type" : "type-17449", ++ "self_type" : "type-17451", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89315,8 +89357,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17230", +- "self_type" : "type-17232", ++ "referenced_type" : "type-17456", ++ "self_type" : "type-17459", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89324,8 +89366,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17240", +- "self_type" : "type-17307", ++ "referenced_type" : "type-17515", ++ "self_type" : "type-17517", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89333,8 +89375,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17313", +- "self_type" : "type-17315", ++ "referenced_type" : "type-17580", ++ "self_type" : "type-17582", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89342,8 +89384,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17325", +- "self_type" : "type-17327", ++ "referenced_type" : "type-17595", ++ "self_type" : "type-17597", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89351,8 +89393,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17385", +- "self_type" : "type-17387", ++ "referenced_type" : "type-17618", ++ "self_type" : "type-17661", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89360,8 +89402,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17398", +- "self_type" : "type-17459", ++ "referenced_type" : "type-17666", ++ "self_type" : "type-17668", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89369,8 +89411,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17640", +- "self_type" : "type-17642", ++ "referenced_type" : "type-1785", ++ "self_type" : "type-1787", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89378,8 +89420,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17654", +- "self_type" : "type-17656", ++ "referenced_type" : "type-17890", ++ "self_type" : "type-17889", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89387,8 +89429,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17822", +- "self_type" : "type-17824", ++ "referenced_type" : "type-180", ++ "self_type" : "type-182", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89396,8 +89438,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1785", +- "self_type" : "type-1787", ++ "referenced_type" : "type-18000", ++ "self_type" : "type-18002", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89405,8 +89447,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17910", +- "self_type" : "type-17912", ++ "referenced_type" : "type-18010", ++ "self_type" : "type-18077", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89414,8 +89456,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17986", +- "self_type" : "type-17989", ++ "referenced_type" : "type-18083", ++ "self_type" : "type-18085", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89423,8 +89465,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-180", +- "self_type" : "type-182", ++ "referenced_type" : "type-18095", ++ "self_type" : "type-18097", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89432,8 +89474,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18095", +- "self_type" : "type-18097", ++ "referenced_type" : "type-18163", ++ "self_type" : "type-18165", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89441,8 +89483,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18150", +- "self_type" : "type-18152", ++ "referenced_type" : "type-18176", ++ "self_type" : "type-18237", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89450,8 +89492,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18179", +- "self_type" : "type-18181", ++ "referenced_type" : "type-18418", ++ "self_type" : "type-18420", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89459,8 +89501,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18256", +- "self_type" : "type-18258", ++ "referenced_type" : "type-18432", ++ "self_type" : "type-18434", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89468,17 +89510,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18270", +- "self_type" : "type-18272", ++ "referenced_type" : "type-1860", ++ "self_type" : "type-1880", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18292", +- "self_type" : "type-18294", ++ "referenced_type" : "type-18600", ++ "self_type" : "type-18602", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89486,8 +89528,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18300", +- "self_type" : "type-18302", ++ "referenced_type" : "type-18688", ++ "self_type" : "type-18690", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89495,8 +89537,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18311", +- "self_type" : "type-18313", ++ "referenced_type" : "type-18764", ++ "self_type" : "type-18767", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89504,8 +89546,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18318", +- "self_type" : "type-18468", ++ "referenced_type" : "type-18873", ++ "self_type" : "type-18875", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89513,8 +89555,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18432", +- "self_type" : "type-18434", ++ "referenced_type" : "type-18928", ++ "self_type" : "type-18930", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89522,8 +89564,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18447", +- "self_type" : "type-18467", ++ "referenced_type" : "type-18957", ++ "self_type" : "type-18959", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89531,8 +89573,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18558", +- "self_type" : "type-18628", ++ "referenced_type" : "type-19034", ++ "self_type" : "type-19036", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89540,8 +89582,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18599", +- "self_type" : "type-18723", ++ "referenced_type" : "type-19048", ++ "self_type" : "type-19050", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89549,17 +89591,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1860", +- "self_type" : "type-1880", ++ "referenced_type" : "type-19070", ++ "self_type" : "type-19072", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18639", +- "self_type" : "type-18638", ++ "referenced_type" : "type-19078", ++ "self_type" : "type-19080", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89567,8 +89609,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18774", +- "self_type" : "type-18776", ++ "referenced_type" : "type-19089", ++ "self_type" : "type-19091", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89576,8 +89618,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18811", +- "self_type" : "type-18821", ++ "referenced_type" : "type-19096", ++ "self_type" : "type-19246", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89585,8 +89627,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18917", +- "self_type" : "type-18919", ++ "referenced_type" : "type-19210", ++ "self_type" : "type-19212", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89594,8 +89636,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19102", +- "self_type" : "type-19104", ++ "referenced_type" : "type-19225", ++ "self_type" : "type-19245", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89603,8 +89645,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19116", +- "self_type" : "type-19118", ++ "referenced_type" : "type-193", ++ "self_type" : "type-195", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89612,8 +89654,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19124", +- "self_type" : "type-19126", ++ "referenced_type" : "type-19336", ++ "self_type" : "type-19406", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89621,8 +89663,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19129", +- "self_type" : "type-19131", ++ "referenced_type" : "type-19377", ++ "self_type" : "type-19501", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89630,8 +89672,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-193", +- "self_type" : "type-195", ++ "referenced_type" : "type-19417", ++ "self_type" : "type-19416", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89639,8 +89681,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19304", +- "self_type" : "type-19306", ++ "referenced_type" : "type-19552", ++ "self_type" : "type-19554", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89648,8 +89690,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19309", +- "self_type" : "type-19311", ++ "referenced_type" : "type-19589", ++ "self_type" : "type-19599", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89657,8 +89699,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19338", +- "self_type" : "type-19340", ++ "referenced_type" : "type-19695", ++ "self_type" : "type-19697", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89666,8 +89708,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19471", +- "self_type" : "type-19482", ++ "referenced_type" : "type-19880", ++ "self_type" : "type-19882", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89675,8 +89717,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19474", +- "self_type" : "type-19476", ++ "referenced_type" : "type-19894", ++ "self_type" : "type-19896", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89684,8 +89726,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19646", +- "self_type" : "type-19650", ++ "referenced_type" : "type-19902", ++ "self_type" : "type-19904", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89693,8 +89735,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19660", +- "self_type" : "type-19662", ++ "referenced_type" : "type-19929", ++ "self_type" : "type-19931", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89702,8 +89744,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19820", +- "self_type" : "type-19822", ++ "referenced_type" : "type-19941", ++ "self_type" : "type-19943", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89711,8 +89753,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19916", +- "self_type" : "type-19935", ++ "referenced_type" : "type-19977", ++ "self_type" : "type-19979", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89720,8 +89762,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20006", +- "self_type" : "type-20008", ++ "referenced_type" : "type-20010", ++ "self_type" : "type-20012", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89729,8 +89771,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20043", +- "self_type" : "type-20045", ++ "referenced_type" : "type-20047", ++ "self_type" : "type-20049", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89738,8 +89780,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20101", +- "self_type" : "type-20112", ++ "referenced_type" : "type-20105", ++ "self_type" : "type-20116", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, +@@ -89747,8 +89789,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20352", +- "self_type" : "type-20354", ++ "referenced_type" : "type-20356", ++ "self_type" : "type-20358", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89756,8 +89798,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20365", +- "self_type" : "type-20367", ++ "referenced_type" : "type-20369", ++ "self_type" : "type-20371", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89765,8 +89807,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20429", +- "self_type" : "type-20443", ++ "referenced_type" : "type-20433", ++ "self_type" : "type-20447", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89774,8 +89816,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20459", +- "self_type" : "type-20461", ++ "referenced_type" : "type-20466", ++ "self_type" : "type-20468", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89783,8 +89825,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20464", +- "self_type" : "type-20533", ++ "referenced_type" : "type-20471", ++ "self_type" : "type-20540", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89792,8 +89834,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20552", +- "self_type" : "type-20567", ++ "referenced_type" : "type-20559", ++ "self_type" : "type-20574", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89801,8 +89843,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20571", +- "self_type" : "type-20583", ++ "referenced_type" : "type-20578", ++ "self_type" : "type-20590", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89819,8 +89861,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20712", +- "self_type" : "type-20717", ++ "referenced_type" : "type-20720", ++ "self_type" : "type-20725", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89828,8 +89870,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20763", +- "self_type" : "type-20765", ++ "referenced_type" : "type-20771", ++ "self_type" : "type-20773", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89837,8 +89879,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20790", +- "self_type" : "type-20792", ++ "referenced_type" : "type-20798", ++ "self_type" : "type-20800", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89846,8 +89888,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20860", +- "self_type" : "type-20862", ++ "referenced_type" : "type-20868", ++ "self_type" : "type-20870", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89855,8 +89897,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20863", +- "self_type" : "type-20865", ++ "referenced_type" : "type-20871", ++ "self_type" : "type-20873", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89864,8 +89906,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20938", +- "self_type" : "type-20946", ++ "referenced_type" : "type-20946", ++ "self_type" : "type-20954", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89873,8 +89915,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20967", +- "self_type" : "type-20969", ++ "referenced_type" : "type-20975", ++ "self_type" : "type-20977", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89882,8 +89924,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21066", +- "self_type" : "type-21068", ++ "referenced_type" : "type-21074", ++ "self_type" : "type-21076", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89891,8 +89933,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21110", +- "self_type" : "type-21112", ++ "referenced_type" : "type-21118", ++ "self_type" : "type-21120", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89900,8 +89942,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21146", +- "self_type" : "type-21148", ++ "referenced_type" : "type-21154", ++ "self_type" : "type-21156", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89909,8 +89951,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21167", +- "self_type" : "type-21204", ++ "referenced_type" : "type-21175", ++ "self_type" : "type-21212", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89918,8 +89960,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21211", +- "self_type" : "type-21213", ++ "referenced_type" : "type-21219", ++ "self_type" : "type-21221", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89927,8 +89969,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21218", +- "self_type" : "type-21221", ++ "referenced_type" : "type-21226", ++ "self_type" : "type-21229", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89936,8 +89978,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21277", +- "self_type" : "type-21279", ++ "referenced_type" : "type-21285", ++ "self_type" : "type-21287", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89945,8 +89987,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21342", +- "self_type" : "type-21344", ++ "referenced_type" : "type-21350", ++ "self_type" : "type-21352", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89954,8 +89996,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21357", +- "self_type" : "type-21359", ++ "referenced_type" : "type-21365", ++ "self_type" : "type-21367", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89963,8 +90005,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21380", +- "self_type" : "type-21423", ++ "referenced_type" : "type-21388", ++ "self_type" : "type-21431", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89972,8 +90014,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21428", +- "self_type" : "type-21430", ++ "referenced_type" : "type-21436", ++ "self_type" : "type-21438", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89981,8 +90023,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21652", +- "self_type" : "type-21651", ++ "referenced_type" : "type-21660", ++ "self_type" : "type-21659", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89990,8 +90032,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21762", +- "self_type" : "type-21764", ++ "referenced_type" : "type-21770", ++ "self_type" : "type-21772", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89999,8 +90041,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21772", +- "self_type" : "type-21839", ++ "referenced_type" : "type-21780", ++ "self_type" : "type-21847", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90008,8 +90050,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21845", +- "self_type" : "type-21847", ++ "referenced_type" : "type-21853", ++ "self_type" : "type-21855", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90017,8 +90059,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21857", +- "self_type" : "type-21859", ++ "referenced_type" : "type-21865", ++ "self_type" : "type-21867", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92924,8 +92966,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-16548", +- "self_type" : "type-16550", ++ "referenced_type" : "type-17318", ++ "self_type" : "type-17320", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -92933,8 +92975,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-17145", +- "self_type" : "type-17147", ++ "referenced_type" : "type-17915", ++ "self_type" : "type-17917", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -92942,8 +92984,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-21080", +- "self_type" : "type-21082", ++ "referenced_type" : "type-21088", ++ "self_type" : "type-21090", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -92951,8 +92993,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-21677", +- "self_type" : "type-21679", ++ "referenced_type" : "type-21685", ++ "self_type" : "type-21687", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93050,8 +93092,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-16909", +- "self_type" : "type-16911", ++ "referenced_type" : "type-17679", ++ "self_type" : "type-17681", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -93059,8 +93101,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-21441", +- "self_type" : "type-21443", ++ "referenced_type" : "type-21449", ++ "self_type" : "type-21451", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -93158,8 +93200,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-16067", +- "self_type" : "type-16069", ++ "referenced_type" : "type-15586", ++ "self_type" : "type-15588", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93167,17 +93209,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-17491", +- "self_type" : "type-17493", ++ "referenced_type" : "type-15728", ++ "self_type" : "type-15730", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/arena.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-18437", +- "self_type" : "type-18439", ++ "referenced_type" : "type-16838", ++ "self_type" : "type-16840", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93185,17 +93227,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-19040", +- "self_type" : "type-19042", ++ "referenced_type" : "type-18269", ++ "self_type" : "type-18271", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-19342", +- "self_type" : "type-19344", ++ "referenced_type" : "type-19215", ++ "self_type" : "type-19217", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93203,8 +93245,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-19484", +- "self_type" : "type-19486", ++ "referenced_type" : "type-19818", ++ "self_type" : "type-19820", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93212,8 +93254,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-20599", +- "self_type" : "type-20601", ++ "referenced_type" : "type-20606", ++ "self_type" : "type-20608", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93392,8 +93434,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to > &", + "name" : "const std::equal_to > &", +- "referenced_type" : "type-17467", +- "self_type" : "type-17469", ++ "referenced_type" : "type-18245", ++ "self_type" : "type-18247", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93473,8 +93515,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator > > &", + "name" : "const std::map, std::allocator > > &", +- "referenced_type" : "type-17798", +- "self_type" : "type-17800", ++ "referenced_type" : "type-18576", ++ "self_type" : "type-18578", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93527,8 +93569,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > > &", + "name" : "const std::map >, std::less, std::allocator > > > > &", +- "referenced_type" : "type-17810", +- "self_type" : "type-17812", ++ "referenced_type" : "type-18588", ++ "self_type" : "type-18590", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93581,8 +93623,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > > &", + "name" : "const std::map >, std::less, std::allocator > > > > &", +- "referenced_type" : "type-17804", +- "self_type" : "type-17806", ++ "referenced_type" : "type-18582", ++ "self_type" : "type-18584", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93617,8 +93659,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator > > &", + "name" : "const std::map, std::allocator > > &", +- "referenced_type" : "type-19966", +- "self_type" : "type-19968", ++ "referenced_type" : "type-16210", ++ "self_type" : "type-16212", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93653,8 +93695,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > &", + "name" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > &", +- "referenced_type" : "type-16301", +- "self_type" : "type-16303", ++ "referenced_type" : "type-17071", ++ "self_type" : "type-17073", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93662,8 +93704,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > &", + "name" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > &", +- "referenced_type" : "type-20832", +- "self_type" : "type-20834", ++ "referenced_type" : "type-20840", ++ "self_type" : "type-20842", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93734,8 +93776,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > > &", + "name" : "const std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > > &", +- "referenced_type" : "type-18277", +- "self_type" : "type-18279", ++ "referenced_type" : "type-19055", ++ "self_type" : "type-19057", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -93770,8 +93812,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > &", + "name" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > &", +- "referenced_type" : "type-16313", +- "self_type" : "type-16315", ++ "referenced_type" : "type-17083", ++ "self_type" : "type-17085", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93779,8 +93821,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > &", + "name" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > &", +- "referenced_type" : "type-20844", +- "self_type" : "type-20846", ++ "referenced_type" : "type-20852", ++ "self_type" : "type-20854", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93851,8 +93893,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::pair, std::less >, std::allocator, std::pair > > > &", + "name" : "const std::map, std::pair, std::less >, std::allocator, std::pair > > > &", +- "referenced_type" : "type-18551", +- "self_type" : "type-18553", ++ "referenced_type" : "type-19329", ++ "self_type" : "type-19331", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93887,8 +93929,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > &", + "name" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > &", +- "referenced_type" : "type-16304", +- "self_type" : "type-16306", ++ "referenced_type" : "type-17074", ++ "self_type" : "type-17076", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93896,8 +93938,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > &", + "name" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > &", +- "referenced_type" : "type-20835", +- "self_type" : "type-20837", ++ "referenced_type" : "type-20843", ++ "self_type" : "type-20845", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93959,8 +94001,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > &", + "name" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > &", +- "referenced_type" : "type-16316", +- "self_type" : "type-16318", ++ "referenced_type" : "type-17086", ++ "self_type" : "type-17088", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93968,8 +94010,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > &", + "name" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > &", +- "referenced_type" : "type-20847", +- "self_type" : "type-20849", ++ "referenced_type" : "type-20855", ++ "self_type" : "type-20857", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94031,8 +94073,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-16025", +- "self_type" : "type-16027", ++ "referenced_type" : "type-16796", ++ "self_type" : "type-16798", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94040,8 +94082,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-20557", +- "self_type" : "type-20559", ++ "referenced_type" : "type-20564", ++ "self_type" : "type-20566", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94103,8 +94145,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &)> &", + "name" : "const std::pair &)> &", +- "referenced_type" : "type-17123", +- "self_type" : "type-17125", ++ "referenced_type" : "type-17893", ++ "self_type" : "type-17895", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94112,8 +94154,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &)> &", + "name" : "const std::pair &)> &", +- "referenced_type" : "type-21655", +- "self_type" : "type-21657", ++ "referenced_type" : "type-21663", ++ "self_type" : "type-21665", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94166,8 +94208,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-16018", +- "self_type" : "type-16022", ++ "referenced_type" : "type-16789", ++ "self_type" : "type-16793", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94175,8 +94217,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-20550", +- "self_type" : "type-20554", ++ "referenced_type" : "type-20557", ++ "self_type" : "type-20561", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94238,8 +94280,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-17127", +- "self_type" : "type-17129", ++ "referenced_type" : "type-17897", ++ "self_type" : "type-17899", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94247,8 +94289,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-21659", +- "self_type" : "type-21661", ++ "referenced_type" : "type-21667", ++ "self_type" : "type-21669", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94310,8 +94352,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-18554", +- "self_type" : "type-18556", ++ "referenced_type" : "type-19332", ++ "self_type" : "type-19334", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94364,8 +94406,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-17395", +- "self_type" : "type-17405", ++ "referenced_type" : "type-18173", ++ "self_type" : "type-18183", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -94427,8 +94469,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-19975", +- "self_type" : "type-19977", ++ "referenced_type" : "type-16219", ++ "self_type" : "type-16221", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94463,8 +94505,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *> &", + "name" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *> &", +- "referenced_type" : "type-16205", +- "self_type" : "type-16207", ++ "referenced_type" : "type-16975", ++ "self_type" : "type-16977", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94472,8 +94514,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *> &", + "name" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *> &", +- "referenced_type" : "type-20736", +- "self_type" : "type-20738", ++ "referenced_type" : "type-20744", ++ "self_type" : "type-20746", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94535,8 +94577,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int> &", + "name" : "const std::pair, std::allocator >, int> &", +- "referenced_type" : "type-19091", +- "self_type" : "type-19093", ++ "referenced_type" : "type-19869", ++ "self_type" : "type-19871", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94571,8 +94613,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, std::pair > &", + "name" : "const std::pair, std::allocator >, std::pair > &", +- "referenced_type" : "type-16217", +- "self_type" : "type-16219", ++ "referenced_type" : "type-16987", ++ "self_type" : "type-16989", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94580,8 +94622,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, std::pair > &", + "name" : "const std::pair, std::allocator >, std::pair > &", +- "referenced_type" : "type-20748", +- "self_type" : "type-20750", ++ "referenced_type" : "type-20756", ++ "self_type" : "type-20758", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94643,8 +94685,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, const google::protobuf::FieldDescriptor *> &", + "name" : "const std::pair, const google::protobuf::FieldDescriptor *> &", +- "referenced_type" : "type-16031", +- "self_type" : "type-16033", ++ "referenced_type" : "type-16802", ++ "self_type" : "type-16804", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94652,8 +94694,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, const google::protobuf::FieldDescriptor *> &", + "name" : "const std::pair, const google::protobuf::FieldDescriptor *> &", +- "referenced_type" : "type-20563", +- "self_type" : "type-20565", ++ "referenced_type" : "type-20570", ++ "self_type" : "type-20572", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94733,8 +94775,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, google::protobuf::internal::ExtensionInfo> &", + "name" : "const std::pair, google::protobuf::internal::ExtensionInfo> &", +- "referenced_type" : "type-18029", +- "self_type" : "type-18034", ++ "referenced_type" : "type-18807", ++ "self_type" : "type-18812", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94805,8 +94847,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> &", + "name" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> &", +- "referenced_type" : "type-16211", +- "self_type" : "type-16213", ++ "referenced_type" : "type-16981", ++ "self_type" : "type-16983", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94814,8 +94856,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> &", + "name" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> &", +- "referenced_type" : "type-20742", +- "self_type" : "type-20744", ++ "referenced_type" : "type-20750", ++ "self_type" : "type-20752", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94877,8 +94919,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int>, std::pair > &", + "name" : "const std::pair, std::allocator >, int>, std::pair > &", +- "referenced_type" : "type-16223", +- "self_type" : "type-16225", ++ "referenced_type" : "type-16993", ++ "self_type" : "type-16995", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94886,8 +94928,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int>, std::pair > &", + "name" : "const std::pair, std::allocator >, int>, std::pair > &", +- "referenced_type" : "type-20754", +- "self_type" : "type-20756", ++ "referenced_type" : "type-20762", ++ "self_type" : "type-20764", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94949,8 +94991,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-16311", +- "self_type" : "type-16310", ++ "referenced_type" : "type-17081", ++ "self_type" : "type-17080", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94958,8 +95000,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-20842", +- "self_type" : "type-20841", ++ "referenced_type" : "type-20850", ++ "self_type" : "type-20849", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -95021,8 +95063,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int> &", + "name" : "const std::pair, std::allocator >, int> &", +- "referenced_type" : "type-16307", +- "self_type" : "type-16309", ++ "referenced_type" : "type-17077", ++ "self_type" : "type-17079", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -95030,8 +95072,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int> &", + "name" : "const std::pair, std::allocator >, int> &", +- "referenced_type" : "type-20838", +- "self_type" : "type-20840", ++ "referenced_type" : "type-20846", ++ "self_type" : "type-20848", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -95093,8 +95135,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > &", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > &", +- "referenced_type" : "type-16951", +- "self_type" : "type-16954", ++ "referenced_type" : "type-17721", ++ "self_type" : "type-17724", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -95102,8 +95144,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > &", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > &", +- "referenced_type" : "type-21483", +- "self_type" : "type-21486", ++ "referenced_type" : "type-21491", ++ "self_type" : "type-21494", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -95165,8 +95207,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > &", + "name" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > &", +- "referenced_type" : "type-17528", +- "self_type" : "type-17531", ++ "referenced_type" : "type-18306", ++ "self_type" : "type-18309", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -95246,8 +95288,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-16873", +- "self_type" : "type-16875", ++ "referenced_type" : "type-17643", ++ "self_type" : "type-17645", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -95255,8 +95297,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-21405", +- "self_type" : "type-21407", ++ "referenced_type" : "type-21413", ++ "self_type" : "type-21415", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -95327,8 +95369,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-16250", +- "self_type" : "type-16252", ++ "referenced_type" : "type-17020", ++ "self_type" : "type-17022", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -95336,8 +95378,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-20781", +- "self_type" : "type-20783", ++ "referenced_type" : "type-20789", ++ "self_type" : "type-20791", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -95435,8 +95477,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-16087", +- "self_type" : "type-16090", ++ "referenced_type" : "type-16857", ++ "self_type" : "type-16860", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -95444,8 +95486,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-18284", +- "self_type" : "type-18286", ++ "referenced_type" : "type-19062", ++ "self_type" : "type-19064", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -95453,8 +95495,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-20618", +- "self_type" : "type-20621", ++ "referenced_type" : "type-20626", ++ "self_type" : "type-20629", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -95732,8 +95774,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-15482", +- "self_type" : "type-15487", ++ "referenced_type" : "type-15525", ++ "self_type" : "type-15527", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95741,8 +95783,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-16007", +- "self_type" : "type-16009", ++ "referenced_type" : "type-15544", ++ "self_type" : "type-15546", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95750,8 +95792,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-16295", +- "self_type" : "type-16297", ++ "referenced_type" : "type-15558", ++ "self_type" : "type-15560", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95759,8 +95801,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-1631", +- "self_type" : "type-1633", ++ "referenced_type" : "type-15895", ++ "self_type" : "type-15897", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95768,17 +95810,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-16341", +- "self_type" : "type-16343", ++ "referenced_type" : "type-16052", ++ "self_type" : "type-16054", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-16446", +- "self_type" : "type-16449", ++ "referenced_type" : "type-16207", ++ "self_type" : "type-16209", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95786,8 +95828,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-16633", +- "self_type" : "type-16632", ++ "referenced_type" : "type-16255", ++ "self_type" : "type-16260", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95795,8 +95837,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-17112", +- "self_type" : "type-17114", ++ "referenced_type" : "type-1631", ++ "self_type" : "type-1633", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95804,8 +95846,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-17308", +- "self_type" : "type-17310", ++ "referenced_type" : "type-16778", ++ "self_type" : "type-16780", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95813,8 +95855,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-17645", +- "self_type" : "type-17648", ++ "referenced_type" : "type-17065", ++ "self_type" : "type-17067", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95822,17 +95864,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-17792", +- "self_type" : "type-17794", ++ "referenced_type" : "type-17111", ++ "self_type" : "type-17113", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-18295", +- "self_type" : "type-18297", ++ "referenced_type" : "type-17216", ++ "self_type" : "type-17219", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95840,8 +95882,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-18425", +- "self_type" : "type-18427", ++ "referenced_type" : "type-17403", ++ "self_type" : "type-17402", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95849,8 +95891,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-18545", +- "self_type" : "type-18547", ++ "referenced_type" : "type-17882", ++ "self_type" : "type-17884", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95858,8 +95900,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-18763", +- "self_type" : "type-18765", ++ "referenced_type" : "type-18078", ++ "self_type" : "type-18080", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95867,8 +95909,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-18907", +- "self_type" : "type-18909", ++ "referenced_type" : "type-18423", ++ "self_type" : "type-18426", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95876,17 +95918,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-18915", +- "self_type" : "type-18914", ++ "referenced_type" : "type-18570", ++ "self_type" : "type-18572", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-19110", +- "self_type" : "type-19112", ++ "referenced_type" : "type-19073", ++ "self_type" : "type-19075", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95894,8 +95936,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-19280", +- "self_type" : "type-19282", ++ "referenced_type" : "type-19203", ++ "self_type" : "type-19205", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95903,8 +95945,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-19299", +- "self_type" : "type-19301", ++ "referenced_type" : "type-19323", ++ "self_type" : "type-19325", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95912,8 +95954,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-19313", +- "self_type" : "type-19315", ++ "referenced_type" : "type-19541", ++ "self_type" : "type-19543", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95921,8 +95963,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-19651", +- "self_type" : "type-19653", ++ "referenced_type" : "type-19685", ++ "self_type" : "type-19687", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95930,26 +95972,26 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-198", +- "self_type" : "type-200", ++ "referenced_type" : "type-19693", ++ "self_type" : "type-19692", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-19808", +- "self_type" : "type-19810", ++ "referenced_type" : "type-198", ++ "self_type" : "type-200", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-19963", +- "self_type" : "type-19965", ++ "referenced_type" : "type-19888", ++ "self_type" : "type-19890", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95957,8 +95999,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-20011", +- "self_type" : "type-20016", ++ "referenced_type" : "type-20015", ++ "self_type" : "type-20020", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95966,8 +96008,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-20539", +- "self_type" : "type-20541", ++ "referenced_type" : "type-20546", ++ "self_type" : "type-20548", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95975,8 +96017,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-20826", +- "self_type" : "type-20828", ++ "referenced_type" : "type-20834", ++ "self_type" : "type-20836", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95984,8 +96026,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-20872", +- "self_type" : "type-20874", ++ "referenced_type" : "type-20880", ++ "self_type" : "type-20882", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, +@@ -95993,8 +96035,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-20977", +- "self_type" : "type-20980", ++ "referenced_type" : "type-20985", ++ "self_type" : "type-20988", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96011,8 +96053,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-21165", +- "self_type" : "type-21164", ++ "referenced_type" : "type-21173", ++ "self_type" : "type-21172", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96020,8 +96062,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-21644", +- "self_type" : "type-21646", ++ "referenced_type" : "type-21652", ++ "self_type" : "type-21654", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96029,8 +96071,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-21840", +- "self_type" : "type-21842", ++ "referenced_type" : "type-21848", ++ "self_type" : "type-21850", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -97505,8 +97547,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::TextFormat::Printer::TextGenerator &", + "name" : "google::protobuf::TextFormat::Printer::TextGenerator &", +- "referenced_type" : "type-17709", +- "self_type" : "type-17708", ++ "referenced_type" : "type-18487", ++ "self_type" : "type-18486", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, +@@ -97640,8 +97682,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > > &", + "name" : "google::protobuf::hash_map, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > > &", +- "referenced_type" : "type-19477", +- "self_type" : "type-19654", ++ "referenced_type" : "type-15721", ++ "self_type" : "type-15898", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -97649,8 +97691,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > > &", + "name" : "google::protobuf::hash_map, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > > &", +- "referenced_type" : "type-19317", +- "self_type" : "type-19316", ++ "referenced_type" : "type-15562", ++ "self_type" : "type-15561", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -97784,8 +97826,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::StatusOr &", + "name" : "google::protobuf::util::StatusOr &", +- "referenced_type" : "type-19955", +- "self_type" : "type-19957", ++ "referenced_type" : "type-16199", ++ "self_type" : "type-16201", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -97794,7 +97836,7 @@ + "linker_set_key" : "google::protobuf::util::StatusOr &", + "name" : "google::protobuf::util::StatusOr &", + "referenced_type" : "type-15277", +- "self_type" : "type-19954", ++ "self_type" : "type-16198", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -97811,8 +97853,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::JsonObjectWriter::Element *const &", + "name" : "google::protobuf::util::converter::JsonObjectWriter::Element *const &", +- "referenced_type" : "type-19136", +- "self_type" : "type-19142", ++ "referenced_type" : "type-15381", ++ "self_type" : "type-15387", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -97821,7 +97863,7 @@ + "linker_set_key" : "google::protobuf::util::converter::LocationTrackerInterface &", + "name" : "google::protobuf::util::converter::LocationTrackerInterface &", + "referenced_type" : "type-15337", +- "self_type" : "type-19554", ++ "self_type" : "type-15798", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -97829,8 +97871,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Item *const &", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Item *const &", +- "referenced_type" : "type-19570", +- "self_type" : "type-19572", ++ "referenced_type" : "type-15814", ++ "self_type" : "type-15816", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -97838,8 +97880,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoWriter::ProtoElement &", + "name" : "google::protobuf::util::converter::ProtoWriter::ProtoElement &", +- "referenced_type" : "type-19461", +- "self_type" : "type-19543", ++ "referenced_type" : "type-15705", ++ "self_type" : "type-15787", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -97847,8 +97889,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoWriter::ProtoElement *const &", + "name" : "google::protobuf::util::converter::ProtoWriter::ProtoElement *const &", +- "referenced_type" : "type-19739", +- "self_type" : "type-19740", ++ "referenced_type" : "type-15983", ++ "self_type" : "type-15984", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -97856,8 +97898,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::StructuredObjectWriter::BaseElement *const &", + "name" : "google::protobuf::util::converter::StructuredObjectWriter::BaseElement *const &", +- "referenced_type" : "type-19568", +- "self_type" : "type-19569", ++ "referenced_type" : "type-15812", ++ "self_type" : "type-15813", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -97919,37 +97961,37 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-15843", +- "self_type" : "type-15842", ++ "referenced_type" : "type-164", ++ "self_type" : "type-163", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/int128.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/status.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-16101", +- "self_type" : "type-16100", ++ "referenced_type" : "type-16616", ++ "self_type" : "type-16615", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/status.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/int128.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-16290", +- "self_type" : "type-16289", ++ "referenced_type" : "type-16871", ++ "self_type" : "type-16870", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/status.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-164", +- "self_type" : "type-163", ++ "referenced_type" : "type-17060", ++ "self_type" : "type-17059", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/status.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" + }, + { + "alignment" : 4, +@@ -97964,8 +98006,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-20377", +- "self_type" : "type-20376", ++ "referenced_type" : "type-20381", ++ "self_type" : "type-20380", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/int128.h" + }, +@@ -97973,8 +98015,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-20632", +- "self_type" : "type-20631", ++ "referenced_type" : "type-20640", ++ "self_type" : "type-20639", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/status.h" + }, +@@ -97982,8 +98024,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-20821", +- "self_type" : "type-20820", ++ "referenced_type" : "type-20829", ++ "self_type" : "type-20828", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" + }, +@@ -98243,17 +98285,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &", + "name" : "std::basic_string, std::allocator > &", +- "referenced_type" : "type-17538", +- "self_type" : "type-17537", ++ "referenced_type" : "type-15575", ++ "self_type" : "type-15574", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/map.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/status_macros.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &", + "name" : "std::basic_string, std::allocator > &", +- "referenced_type" : "type-18825", +- "self_type" : "type-18824", ++ "referenced_type" : "type-18316", ++ "self_type" : "type-18315", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -98261,10 +98303,10 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &", + "name" : "std::basic_string, std::allocator > &", +- "referenced_type" : "type-19331", +- "self_type" : "type-19330", ++ "referenced_type" : "type-19603", ++ "self_type" : "type-19602", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/status_macros.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "alignment" : 4, +@@ -98351,8 +98393,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *const &", + "name" : "std::basic_string, std::allocator > *const &", +- "referenced_type" : "type-16129", +- "self_type" : "type-16130", ++ "referenced_type" : "type-16899", ++ "self_type" : "type-16900", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -98360,8 +98402,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *const &", + "name" : "std::basic_string, std::allocator > *const &", +- "referenced_type" : "type-18707", +- "self_type" : "type-18708", ++ "referenced_type" : "type-19485", ++ "self_type" : "type-19486", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -98369,8 +98411,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *const &", + "name" : "std::basic_string, std::allocator > *const &", +- "referenced_type" : "type-20660", +- "self_type" : "type-20661", ++ "referenced_type" : "type-20668", ++ "self_type" : "type-20669", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -98450,8 +98492,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > &", + "name" : "std::map, std::allocator > > &", +- "referenced_type" : "type-18624", +- "self_type" : "type-18623", ++ "referenced_type" : "type-19402", ++ "self_type" : "type-19401", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -98486,8 +98528,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > &", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > &", +- "referenced_type" : "type-16017", +- "self_type" : "type-16016", ++ "referenced_type" : "type-16788", ++ "self_type" : "type-16787", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -98495,8 +98537,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > &", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > &", +- "referenced_type" : "type-20549", +- "self_type" : "type-20548", ++ "referenced_type" : "type-20556", ++ "self_type" : "type-20555", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -98550,7 +98592,7 @@ + "linker_set_key" : "unsigned int &", + "name" : "unsigned int &", + "referenced_type" : "type-4", +- "self_type" : "type-19329", ++ "self_type" : "type-15573", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/status_macros.h" + }, +@@ -98903,8 +98945,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-15375", +- "self_type" : "type-15377", ++ "referenced_type" : "type-15410", ++ "self_type" : "type-15416", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -98912,8 +98954,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-15399", +- "self_type" : "type-15401", ++ "referenced_type" : "type-15734", ++ "self_type" : "type-15738", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -98921,8 +98963,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-17908", +- "self_type" : "type-17907", ++ "referenced_type" : "type-18686", ++ "self_type" : "type-18685", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -98930,26 +98972,26 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-18339", +- "self_type" : "type-18341", ++ "referenced_type" : "type-1888", ++ "self_type" : "type-1887", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-1888", +- "self_type" : "type-1887", ++ "referenced_type" : "type-19117", ++ "self_type" : "type-19119", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-19165", +- "self_type" : "type-19171", ++ "referenced_type" : "type-19908", ++ "self_type" : "type-19910", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -98957,8 +98999,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-19490", +- "self_type" : "type-19494", ++ "referenced_type" : "type-19932", ++ "self_type" : "type-19934", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -99236,8 +99278,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DynamicMessage::TypeInfo *", + "name" : "const google::protobuf::DynamicMessage::TypeInfo *", +- "referenced_type" : "type-16543", +- "self_type" : "type-16542", ++ "referenced_type" : "type-17313", ++ "self_type" : "type-17312", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -99245,8 +99287,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DynamicMessage::TypeInfo *", + "name" : "const google::protobuf::DynamicMessage::TypeInfo *", +- "referenced_type" : "type-21075", +- "self_type" : "type-21074", ++ "referenced_type" : "type-21083", ++ "self_type" : "type-21082", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -99389,8 +99431,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-15941", +- "self_type" : "type-15943", ++ "referenced_type" : "type-15427", ++ "self_type" : "type-15429", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99398,8 +99440,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-17010", +- "self_type" : "type-17012", ++ "referenced_type" : "type-15757", ++ "self_type" : "type-15759", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99407,8 +99449,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-18569", +- "self_type" : "type-18571", ++ "referenced_type" : "type-15928", ++ "self_type" : "type-15930", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99416,8 +99458,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-18653", +- "self_type" : "type-18655", ++ "referenced_type" : "type-16094", ++ "self_type" : "type-16096", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99425,8 +99467,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-18843", +- "self_type" : "type-18845", ++ "referenced_type" : "type-16712", ++ "self_type" : "type-16714", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99434,8 +99476,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-18940", +- "self_type" : "type-18942", ++ "referenced_type" : "type-17780", ++ "self_type" : "type-17782", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99452,8 +99494,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-19182", +- "self_type" : "type-19184", ++ "referenced_type" : "type-19347", ++ "self_type" : "type-19349", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99461,8 +99503,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-19513", +- "self_type" : "type-19515", ++ "referenced_type" : "type-19431", ++ "self_type" : "type-19433", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99470,8 +99512,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-19684", +- "self_type" : "type-19686", ++ "referenced_type" : "type-19621", ++ "self_type" : "type-19623", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99479,8 +99521,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-19850", +- "self_type" : "type-19852", ++ "referenced_type" : "type-19718", ++ "self_type" : "type-19720", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99488,8 +99530,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-20473", +- "self_type" : "type-20475", ++ "referenced_type" : "type-20480", ++ "self_type" : "type-20482", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99497,8 +99539,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-21542", +- "self_type" : "type-21544", ++ "referenced_type" : "type-21550", ++ "self_type" : "type-21552", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99893,8 +99935,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-15945", +- "self_type" : "type-15947", ++ "referenced_type" : "type-15431", ++ "self_type" : "type-15435", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99902,8 +99944,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-17014", +- "self_type" : "type-17016", ++ "referenced_type" : "type-15761", ++ "self_type" : "type-15763", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99911,8 +99953,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-18573", +- "self_type" : "type-18575", ++ "referenced_type" : "type-15932", ++ "self_type" : "type-15934", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99920,8 +99962,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-18657", +- "self_type" : "type-18659", ++ "referenced_type" : "type-16098", ++ "self_type" : "type-16101", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99929,8 +99971,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-18847", +- "self_type" : "type-18849", ++ "referenced_type" : "type-16716", ++ "self_type" : "type-16718", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99938,8 +99980,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-18945", +- "self_type" : "type-18947", ++ "referenced_type" : "type-17784", ++ "self_type" : "type-17786", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99956,8 +99998,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-19186", +- "self_type" : "type-19190", ++ "referenced_type" : "type-19351", ++ "self_type" : "type-19353", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99965,8 +100007,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-19517", +- "self_type" : "type-19519", ++ "referenced_type" : "type-19435", ++ "self_type" : "type-19437", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99974,8 +100016,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-19688", +- "self_type" : "type-19690", ++ "referenced_type" : "type-19625", ++ "self_type" : "type-19627", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99983,8 +100025,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-19854", +- "self_type" : "type-19857", ++ "referenced_type" : "type-19723", ++ "self_type" : "type-19725", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99992,8 +100034,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-20477", +- "self_type" : "type-20479", ++ "referenced_type" : "type-20484", ++ "self_type" : "type-20486", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100001,8 +100043,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-21546", +- "self_type" : "type-21548", ++ "referenced_type" : "type-21554", ++ "self_type" : "type-21556", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100352,8 +100394,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldDescriptor *", + "name" : "const google::protobuf::FieldDescriptor *", +- "referenced_type" : "type-17446", +- "self_type" : "type-17445", ++ "referenced_type" : "type-18224", ++ "self_type" : "type-18223", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -100505,8 +100547,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-15937", +- "self_type" : "type-15939", ++ "referenced_type" : "type-15423", ++ "self_type" : "type-15425", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100514,8 +100556,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-17006", +- "self_type" : "type-17008", ++ "referenced_type" : "type-15753", ++ "self_type" : "type-15755", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100523,8 +100565,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-18565", +- "self_type" : "type-18567", ++ "referenced_type" : "type-15924", ++ "self_type" : "type-15926", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100532,8 +100574,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-18649", +- "self_type" : "type-18651", ++ "referenced_type" : "type-16088", ++ "self_type" : "type-16092", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100541,8 +100583,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-18839", +- "self_type" : "type-18841", ++ "referenced_type" : "type-16708", ++ "self_type" : "type-16710", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100550,8 +100592,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-18935", +- "self_type" : "type-18938", ++ "referenced_type" : "type-17776", ++ "self_type" : "type-17778", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100559,8 +100601,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-19178", +- "self_type" : "type-19180", ++ "referenced_type" : "type-1932", ++ "self_type" : "type-1931", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100568,8 +100610,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-1932", +- "self_type" : "type-1931", ++ "referenced_type" : "type-19343", ++ "self_type" : "type-19345", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100577,8 +100619,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-19509", +- "self_type" : "type-19511", ++ "referenced_type" : "type-19427", ++ "self_type" : "type-19429", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100586,8 +100628,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-19680", +- "self_type" : "type-19682", ++ "referenced_type" : "type-19617", ++ "self_type" : "type-19619", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100595,8 +100637,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-19844", +- "self_type" : "type-19848", ++ "referenced_type" : "type-19713", ++ "self_type" : "type-19716", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100604,8 +100646,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-20469", +- "self_type" : "type-20471", ++ "referenced_type" : "type-20476", ++ "self_type" : "type-20478", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100613,8 +100655,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-21538", +- "self_type" : "type-21540", ++ "referenced_type" : "type-21546", ++ "self_type" : "type-21548", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101324,8 +101366,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-15610", +- "self_type" : "type-15609", ++ "referenced_type" : "type-15448", ++ "self_type" : "type-15450", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101333,8 +101375,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-15844", +- "self_type" : "type-15846", ++ "referenced_type" : "type-15604", ++ "self_type" : "type-15606", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101342,8 +101384,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-15960", +- "self_type" : "type-15962", ++ "referenced_type" : "type-15778", ++ "self_type" : "type-15780", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101351,8 +101393,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-16084", +- "self_type" : "type-16086", ++ "referenced_type" : "type-15948", ++ "self_type" : "type-15950", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101360,8 +101402,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-16237", +- "self_type" : "type-16239", ++ "referenced_type" : "type-16116", ++ "self_type" : "type-16118", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101369,8 +101411,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-16348", +- "self_type" : "type-16350", ++ "referenced_type" : "type-16383", ++ "self_type" : "type-16382", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101378,8 +101420,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-16450", +- "self_type" : "type-16452", ++ "referenced_type" : "type-16617", ++ "self_type" : "type-16619", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101387,8 +101429,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-16573", +- "self_type" : "type-16575", ++ "referenced_type" : "type-16731", ++ "self_type" : "type-16733", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101396,8 +101438,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-16627", +- "self_type" : "type-16629", ++ "referenced_type" : "type-16854", ++ "self_type" : "type-16856", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101405,8 +101447,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-16692", +- "self_type" : "type-16694", ++ "referenced_type" : "type-17007", ++ "self_type" : "type-17009", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101414,8 +101456,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-16766", +- "self_type" : "type-16769", ++ "referenced_type" : "type-17118", ++ "self_type" : "type-17120", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101423,8 +101465,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-16842", +- "self_type" : "type-16844", ++ "referenced_type" : "type-17220", ++ "self_type" : "type-17222", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101432,8 +101474,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-17029", +- "self_type" : "type-17032", ++ "referenced_type" : "type-17343", ++ "self_type" : "type-17345", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101441,8 +101483,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-17164", +- "self_type" : "type-17166", ++ "referenced_type" : "type-17397", ++ "self_type" : "type-17399", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101450,8 +101492,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-17242", +- "self_type" : "type-17244", ++ "referenced_type" : "type-17462", ++ "self_type" : "type-17464", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101459,8 +101501,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-17349", +- "self_type" : "type-17351", ++ "referenced_type" : "type-17536", ++ "self_type" : "type-17539", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101468,8 +101510,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-17592", +- "self_type" : "type-17594", ++ "referenced_type" : "type-17612", ++ "self_type" : "type-17614", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101477,8 +101519,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-17670", +- "self_type" : "type-17673", ++ "referenced_type" : "type-17799", ++ "self_type" : "type-17802", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101486,8 +101528,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-17839", +- "self_type" : "type-17841", ++ "referenced_type" : "type-17934", ++ "self_type" : "type-17936", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101495,8 +101537,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-17930", +- "self_type" : "type-17932", ++ "referenced_type" : "type-18012", ++ "self_type" : "type-18014", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101504,8 +101546,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-18022", +- "self_type" : "type-18024", ++ "referenced_type" : "type-18127", ++ "self_type" : "type-18129", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101513,8 +101555,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-18109", +- "self_type" : "type-18111", ++ "referenced_type" : "type-18370", ++ "self_type" : "type-18372", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101522,8 +101564,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-18174", +- "self_type" : "type-18176", ++ "referenced_type" : "type-18448", ++ "self_type" : "type-18451", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101531,8 +101573,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-18324", +- "self_type" : "type-18326", ++ "referenced_type" : "type-18617", ++ "self_type" : "type-18619", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101540,8 +101582,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-18454", +- "self_type" : "type-18456", ++ "referenced_type" : "type-18708", ++ "self_type" : "type-18710", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101549,8 +101591,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-18589", +- "self_type" : "type-18591", ++ "referenced_type" : "type-18800", ++ "self_type" : "type-18802", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101558,8 +101600,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-18674", +- "self_type" : "type-18676", ++ "referenced_type" : "type-18887", ++ "self_type" : "type-18889", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101567,8 +101609,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-18865", +- "self_type" : "type-18867", ++ "referenced_type" : "type-18952", ++ "self_type" : "type-18954", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101576,8 +101618,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-18962", +- "self_type" : "type-18965", ++ "referenced_type" : "type-19102", ++ "self_type" : "type-19104", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101585,8 +101627,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-19203", +- "self_type" : "type-19205", ++ "referenced_type" : "type-19232", ++ "self_type" : "type-19234", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101594,8 +101636,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-19360", +- "self_type" : "type-19362", ++ "referenced_type" : "type-19367", ++ "self_type" : "type-19369", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101612,8 +101654,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-19534", +- "self_type" : "type-19536", ++ "referenced_type" : "type-19452", ++ "self_type" : "type-19454", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101621,8 +101663,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-19704", +- "self_type" : "type-19706", ++ "referenced_type" : "type-19643", ++ "self_type" : "type-19645", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101630,8 +101672,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-19872", +- "self_type" : "type-19874", ++ "referenced_type" : "type-19740", ++ "self_type" : "type-19743", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101639,8 +101681,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-20143", +- "self_type" : "type-20142", ++ "referenced_type" : "type-20147", ++ "self_type" : "type-20146", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101648,8 +101690,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-20378", +- "self_type" : "type-20380", ++ "referenced_type" : "type-20382", ++ "self_type" : "type-20384", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101657,8 +101699,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-20492", +- "self_type" : "type-20494", ++ "referenced_type" : "type-20499", ++ "self_type" : "type-20501", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101666,8 +101708,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-20615", +- "self_type" : "type-20617", ++ "referenced_type" : "type-20623", ++ "self_type" : "type-20625", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101675,8 +101717,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-20768", +- "self_type" : "type-20770", ++ "referenced_type" : "type-20776", ++ "self_type" : "type-20778", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101684,8 +101726,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-20879", +- "self_type" : "type-20881", ++ "referenced_type" : "type-20887", ++ "self_type" : "type-20889", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101693,8 +101735,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-20982", +- "self_type" : "type-20984", ++ "referenced_type" : "type-20990", ++ "self_type" : "type-20992", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101702,8 +101744,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-21105", +- "self_type" : "type-21107", ++ "referenced_type" : "type-21113", ++ "self_type" : "type-21115", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101711,8 +101753,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-21159", +- "self_type" : "type-21161", ++ "referenced_type" : "type-21167", ++ "self_type" : "type-21169", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101720,8 +101762,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-21224", +- "self_type" : "type-21226", ++ "referenced_type" : "type-21232", ++ "self_type" : "type-21234", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101729,8 +101771,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-21298", +- "self_type" : "type-21301", ++ "referenced_type" : "type-21306", ++ "self_type" : "type-21309", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101738,8 +101780,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-21374", +- "self_type" : "type-21376", ++ "referenced_type" : "type-21382", ++ "self_type" : "type-21384", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101747,8 +101789,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-21561", +- "self_type" : "type-21564", ++ "referenced_type" : "type-21569", ++ "self_type" : "type-21572", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101756,8 +101798,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-21696", +- "self_type" : "type-21698", ++ "referenced_type" : "type-21704", ++ "self_type" : "type-21706", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101765,8 +101807,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-21774", +- "self_type" : "type-21776", ++ "referenced_type" : "type-21782", ++ "self_type" : "type-21784", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102989,8 +103031,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-15957", +- "self_type" : "type-15959", ++ "referenced_type" : "type-15445", ++ "self_type" : "type-15447", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102998,8 +103040,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-17026", +- "self_type" : "type-17028", ++ "referenced_type" : "type-15773", ++ "self_type" : "type-15775", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103007,8 +103049,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-18586", +- "self_type" : "type-18588", ++ "referenced_type" : "type-15945", ++ "self_type" : "type-15947", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103016,8 +103058,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-18671", +- "self_type" : "type-18673", ++ "referenced_type" : "type-16113", ++ "self_type" : "type-16115", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103025,8 +103067,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-18862", +- "self_type" : "type-18864", ++ "referenced_type" : "type-16728", ++ "self_type" : "type-16730", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103034,8 +103076,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-18959", +- "self_type" : "type-18961", ++ "referenced_type" : "type-17796", ++ "self_type" : "type-17798", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103043,8 +103085,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-19200", +- "self_type" : "type-19202", ++ "referenced_type" : "type-19364", ++ "self_type" : "type-19366", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103061,8 +103103,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-19529", +- "self_type" : "type-19531", ++ "referenced_type" : "type-19449", ++ "self_type" : "type-19451", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103070,8 +103112,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-19701", +- "self_type" : "type-19703", ++ "referenced_type" : "type-19640", ++ "self_type" : "type-19642", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103079,8 +103121,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-19869", +- "self_type" : "type-19871", ++ "referenced_type" : "type-19737", ++ "self_type" : "type-19739", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103088,8 +103130,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-20489", +- "self_type" : "type-20491", ++ "referenced_type" : "type-20496", ++ "self_type" : "type-20498", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103097,8 +103139,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-21558", +- "self_type" : "type-21560", ++ "referenced_type" : "type-21566", ++ "self_type" : "type-21568", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103763,8 +103805,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-15935", +- "self_type" : "type-16002", ++ "referenced_type" : "type-15412", ++ "self_type" : "type-15414", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103772,8 +103814,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-17000", +- "self_type" : "type-17002", ++ "referenced_type" : "type-15748", ++ "self_type" : "type-15750", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103781,8 +103823,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-18560", +- "self_type" : "type-18562", ++ "referenced_type" : "type-15917", ++ "self_type" : "type-15919", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103790,8 +103832,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-18642", +- "self_type" : "type-18644", ++ "referenced_type" : "type-16079", ++ "self_type" : "type-16081", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103799,8 +103841,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-18833", +- "self_type" : "type-18835", ++ "referenced_type" : "type-16706", ++ "self_type" : "type-16773", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103808,8 +103850,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-18927", +- "self_type" : "type-18929", ++ "referenced_type" : "type-17770", ++ "self_type" : "type-17772", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103817,8 +103859,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-19167", +- "self_type" : "type-19169", ++ "referenced_type" : "type-19338", ++ "self_type" : "type-19340", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103826,8 +103868,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-1944", +- "self_type" : "type-1943", ++ "referenced_type" : "type-19420", ++ "self_type" : "type-19422", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103835,8 +103877,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-19504", +- "self_type" : "type-19506", ++ "referenced_type" : "type-1944", ++ "self_type" : "type-1943", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103844,8 +103886,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-19673", +- "self_type" : "type-19675", ++ "referenced_type" : "type-19611", ++ "self_type" : "type-19613", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103853,8 +103895,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-19835", +- "self_type" : "type-19837", ++ "referenced_type" : "type-19705", ++ "self_type" : "type-19707", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103862,8 +103904,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-20467", +- "self_type" : "type-20534", ++ "referenced_type" : "type-20474", ++ "self_type" : "type-20541", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103871,8 +103913,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-21532", +- "self_type" : "type-21534", ++ "referenced_type" : "type-21540", ++ "self_type" : "type-21542", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104267,8 +104309,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-15953", +- "self_type" : "type-15955", ++ "referenced_type" : "type-15441", ++ "self_type" : "type-15443", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104276,8 +104318,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-17022", +- "self_type" : "type-17024", ++ "referenced_type" : "type-15769", ++ "self_type" : "type-15771", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104285,8 +104327,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-18582", +- "self_type" : "type-18584", ++ "referenced_type" : "type-15941", ++ "self_type" : "type-15943", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104294,8 +104336,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-18665", +- "self_type" : "type-18667", ++ "referenced_type" : "type-16108", ++ "self_type" : "type-16110", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104303,8 +104345,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-18855", +- "self_type" : "type-18857", ++ "referenced_type" : "type-16724", ++ "self_type" : "type-16726", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104312,8 +104354,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-18954", +- "self_type" : "type-18956", ++ "referenced_type" : "type-17792", ++ "self_type" : "type-17794", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104330,8 +104372,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-19196", +- "self_type" : "type-19198", ++ "referenced_type" : "type-19360", ++ "self_type" : "type-19362", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104339,8 +104381,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-19525", +- "self_type" : "type-19527", ++ "referenced_type" : "type-19443", ++ "self_type" : "type-19445", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104348,8 +104390,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-19697", +- "self_type" : "type-19699", ++ "referenced_type" : "type-19633", ++ "self_type" : "type-19635", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104357,8 +104399,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-19864", +- "self_type" : "type-19866", ++ "referenced_type" : "type-19732", ++ "self_type" : "type-19734", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104366,8 +104408,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-20485", +- "self_type" : "type-20487", ++ "referenced_type" : "type-20492", ++ "self_type" : "type-20494", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104375,8 +104417,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-21554", +- "self_type" : "type-21556", ++ "referenced_type" : "type-21562", ++ "self_type" : "type-21564", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -105032,8 +105074,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-15725", +- "self_type" : "type-15727", ++ "referenced_type" : "type-15518", ++ "self_type" : "type-15520", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105041,8 +105083,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-15898", +- "self_type" : "type-15900", ++ "referenced_type" : "type-15661", ++ "self_type" : "type-15663", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105050,8 +105092,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16178", +- "self_type" : "type-16180", ++ "referenced_type" : "type-15865", ++ "self_type" : "type-15867", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105059,8 +105101,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16281", +- "self_type" : "type-16283", ++ "referenced_type" : "type-16034", ++ "self_type" : "type-16036", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105068,8 +105110,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16421", +- "self_type" : "type-16423", ++ "referenced_type" : "type-16190", ++ "self_type" : "type-16192", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105077,8 +105119,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16478", +- "self_type" : "type-16480", ++ "referenced_type" : "type-16498", ++ "self_type" : "type-16500", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105086,8 +105128,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16658", +- "self_type" : "type-16660", ++ "referenced_type" : "type-16671", ++ "self_type" : "type-16673", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105095,8 +105137,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16796", +- "self_type" : "type-16798", ++ "referenced_type" : "type-16948", ++ "self_type" : "type-16950", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105104,8 +105146,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17301", +- "self_type" : "type-17303", ++ "referenced_type" : "type-17051", ++ "self_type" : "type-17053", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105113,8 +105155,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17375", +- "self_type" : "type-17377", ++ "referenced_type" : "type-17191", ++ "self_type" : "type-17193", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105122,8 +105164,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17421", +- "self_type" : "type-17423", ++ "referenced_type" : "type-17248", ++ "self_type" : "type-17250", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105131,8 +105173,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17778", +- "self_type" : "type-17780", ++ "referenced_type" : "type-17428", ++ "self_type" : "type-17430", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105140,8 +105182,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17879", +- "self_type" : "type-17881", ++ "referenced_type" : "type-17566", ++ "self_type" : "type-17568", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105149,8 +105191,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17971", +- "self_type" : "type-17973", ++ "referenced_type" : "type-18071", ++ "self_type" : "type-18073", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105158,8 +105200,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18082", +- "self_type" : "type-18084", ++ "referenced_type" : "type-18153", ++ "self_type" : "type-18155", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105167,8 +105209,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18134", +- "self_type" : "type-18136", ++ "referenced_type" : "type-18199", ++ "self_type" : "type-18201", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105176,8 +105218,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18221", +- "self_type" : "type-18225", ++ "referenced_type" : "type-18556", ++ "self_type" : "type-18558", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105185,8 +105227,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18394", +- "self_type" : "type-18396", ++ "referenced_type" : "type-18657", ++ "self_type" : "type-18659", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105194,8 +105236,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18521", +- "self_type" : "type-18523", ++ "referenced_type" : "type-18749", ++ "self_type" : "type-18751", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105203,8 +105245,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18753", +- "self_type" : "type-18755", ++ "referenced_type" : "type-18860", ++ "self_type" : "type-18862", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105212,8 +105254,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18884", +- "self_type" : "type-18886", ++ "referenced_type" : "type-18912", ++ "self_type" : "type-18914", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105221,8 +105263,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19033", +- "self_type" : "type-19035", ++ "referenced_type" : "type-18999", ++ "self_type" : "type-19003", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105230,8 +105272,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19273", +- "self_type" : "type-19275", ++ "referenced_type" : "type-19172", ++ "self_type" : "type-19174", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105239,8 +105281,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19417", +- "self_type" : "type-19419", ++ "referenced_type" : "type-19299", ++ "self_type" : "type-19301", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105248,8 +105290,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19621", +- "self_type" : "type-19623", ++ "referenced_type" : "type-19531", ++ "self_type" : "type-19533", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105257,8 +105299,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19790", +- "self_type" : "type-19792", ++ "referenced_type" : "type-19662", ++ "self_type" : "type-19664", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105266,8 +105308,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19946", +- "self_type" : "type-19948", ++ "referenced_type" : "type-19811", ++ "self_type" : "type-19813", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105275,8 +105317,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-20259", +- "self_type" : "type-20261", ++ "referenced_type" : "type-20263", ++ "self_type" : "type-20265", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105284,8 +105326,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-20432", +- "self_type" : "type-20434", ++ "referenced_type" : "type-20436", ++ "self_type" : "type-20438", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105293,8 +105335,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-20709", +- "self_type" : "type-20711", ++ "referenced_type" : "type-20717", ++ "self_type" : "type-20719", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105302,8 +105344,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-20812", +- "self_type" : "type-20814", ++ "referenced_type" : "type-20820", ++ "self_type" : "type-20822", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105311,8 +105353,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-20952", +- "self_type" : "type-20954", ++ "referenced_type" : "type-20960", ++ "self_type" : "type-20962", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105320,8 +105362,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-21010", +- "self_type" : "type-21012", ++ "referenced_type" : "type-21018", ++ "self_type" : "type-21020", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105338,8 +105380,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-21190", +- "self_type" : "type-21192", ++ "referenced_type" : "type-21198", ++ "self_type" : "type-21200", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105347,8 +105389,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-21328", +- "self_type" : "type-21330", ++ "referenced_type" : "type-21336", ++ "self_type" : "type-21338", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105356,8 +105398,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-21833", +- "self_type" : "type-21835", ++ "referenced_type" : "type-21841", ++ "self_type" : "type-21843", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106364,8 +106406,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16174", +- "self_type" : "type-16176", ++ "referenced_type" : "type-15514", ++ "self_type" : "type-15516", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106373,8 +106415,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17297", +- "self_type" : "type-17299", ++ "referenced_type" : "type-15657", ++ "self_type" : "type-15659", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106382,8 +106424,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17773", +- "self_type" : "type-17776", ++ "referenced_type" : "type-15861", ++ "self_type" : "type-15863", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106391,8 +106433,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18078", +- "self_type" : "type-18080", ++ "referenced_type" : "type-16029", ++ "self_type" : "type-16032", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106400,8 +106442,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18389", +- "self_type" : "type-18392", ++ "referenced_type" : "type-16186", ++ "self_type" : "type-16188", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106409,8 +106451,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18517", +- "self_type" : "type-18519", ++ "referenced_type" : "type-16944", ++ "self_type" : "type-16946", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106418,8 +106460,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18749", +- "self_type" : "type-18751", ++ "referenced_type" : "type-18067", ++ "self_type" : "type-18069", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106427,8 +106469,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19029", +- "self_type" : "type-19031", ++ "referenced_type" : "type-18551", ++ "self_type" : "type-18554", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106436,8 +106478,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19269", +- "self_type" : "type-19271", ++ "referenced_type" : "type-18856", ++ "self_type" : "type-18858", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106445,8 +106487,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19413", +- "self_type" : "type-19415", ++ "referenced_type" : "type-19167", ++ "self_type" : "type-19170", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106454,8 +106496,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19617", +- "self_type" : "type-19619", ++ "referenced_type" : "type-19295", ++ "self_type" : "type-19297", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106463,8 +106505,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19785", +- "self_type" : "type-19788", ++ "referenced_type" : "type-19527", ++ "self_type" : "type-19529", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106472,8 +106514,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19942", +- "self_type" : "type-19944", ++ "referenced_type" : "type-19807", ++ "self_type" : "type-19809", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106481,8 +106523,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-20705", +- "self_type" : "type-20707", ++ "referenced_type" : "type-20713", ++ "self_type" : "type-20715", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106490,8 +106532,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-21829", +- "self_type" : "type-21831", ++ "referenced_type" : "type-21837", ++ "self_type" : "type-21839", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107003,8 +107045,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16170", +- "self_type" : "type-16172", ++ "referenced_type" : "type-15509", ++ "self_type" : "type-15512", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107012,8 +107054,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17293", +- "self_type" : "type-17295", ++ "referenced_type" : "type-15653", ++ "self_type" : "type-15655", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107021,8 +107063,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17769", +- "self_type" : "type-17771", ++ "referenced_type" : "type-15857", ++ "self_type" : "type-15859", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107030,8 +107072,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18073", +- "self_type" : "type-18076", ++ "referenced_type" : "type-16025", ++ "self_type" : "type-16027", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107039,8 +107081,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18385", +- "self_type" : "type-18387", ++ "referenced_type" : "type-16182", ++ "self_type" : "type-16184", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107048,8 +107090,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18513", +- "self_type" : "type-18515", ++ "referenced_type" : "type-16940", ++ "self_type" : "type-16942", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107057,8 +107099,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18745", +- "self_type" : "type-18747", ++ "referenced_type" : "type-18063", ++ "self_type" : "type-18065", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107066,8 +107108,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19025", +- "self_type" : "type-19027", ++ "referenced_type" : "type-18547", ++ "self_type" : "type-18549", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107075,8 +107117,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19264", +- "self_type" : "type-19267", ++ "referenced_type" : "type-18851", ++ "self_type" : "type-18854", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107084,8 +107126,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19409", +- "self_type" : "type-19411", ++ "referenced_type" : "type-19163", ++ "self_type" : "type-19165", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107093,8 +107135,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19613", +- "self_type" : "type-19615", ++ "referenced_type" : "type-19291", ++ "self_type" : "type-19293", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107102,8 +107144,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19781", +- "self_type" : "type-19783", ++ "referenced_type" : "type-19523", ++ "self_type" : "type-19525", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107111,8 +107153,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19938", +- "self_type" : "type-19940", ++ "referenced_type" : "type-19803", ++ "self_type" : "type-19805", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107120,8 +107162,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-20701", +- "self_type" : "type-20703", ++ "referenced_type" : "type-20709", ++ "self_type" : "type-20711", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107129,8 +107171,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-21825", +- "self_type" : "type-21827", ++ "referenced_type" : "type-21833", ++ "self_type" : "type-21835", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107543,8 +107585,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18729", +- "self_type" : "type-18731", ++ "referenced_type" : "type-15493", ++ "self_type" : "type-15495", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107552,8 +107594,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19009", +- "self_type" : "type-19011", ++ "referenced_type" : "type-15839", ++ "self_type" : "type-15841", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107561,8 +107603,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19248", +- "self_type" : "type-19250", ++ "referenced_type" : "type-16008", ++ "self_type" : "type-16010", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107570,8 +107612,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19595", +- "self_type" : "type-19597", ++ "referenced_type" : "type-16165", ++ "self_type" : "type-16167", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107579,8 +107621,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19764", +- "self_type" : "type-19766", ++ "referenced_type" : "type-19507", ++ "self_type" : "type-19509", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107588,8 +107630,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19921", +- "self_type" : "type-19923", ++ "referenced_type" : "type-19787", ++ "self_type" : "type-19789", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107885,8 +107927,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16158", +- "self_type" : "type-16160", ++ "referenced_type" : "type-15497", ++ "self_type" : "type-15499", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107894,8 +107936,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17281", +- "self_type" : "type-17283", ++ "referenced_type" : "type-15641", ++ "self_type" : "type-15643", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107903,8 +107945,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17756", +- "self_type" : "type-17758", ++ "referenced_type" : "type-15843", ++ "self_type" : "type-15845", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107912,8 +107954,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18061", +- "self_type" : "type-18063", ++ "referenced_type" : "type-16012", ++ "self_type" : "type-16014", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107921,8 +107963,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18373", +- "self_type" : "type-18375", ++ "referenced_type" : "type-16169", ++ "self_type" : "type-16171", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107930,8 +107972,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18501", +- "self_type" : "type-18503", ++ "referenced_type" : "type-16928", ++ "self_type" : "type-16930", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107939,8 +107981,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18733", +- "self_type" : "type-18735", ++ "referenced_type" : "type-18051", ++ "self_type" : "type-18053", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107948,8 +107990,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19013", +- "self_type" : "type-19015", ++ "referenced_type" : "type-18534", ++ "self_type" : "type-18536", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107957,8 +107999,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19252", +- "self_type" : "type-19254", ++ "referenced_type" : "type-18839", ++ "self_type" : "type-18841", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107966,8 +108008,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19397", +- "self_type" : "type-19399", ++ "referenced_type" : "type-19151", ++ "self_type" : "type-19153", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107975,8 +108017,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19599", +- "self_type" : "type-19601", ++ "referenced_type" : "type-19279", ++ "self_type" : "type-19281", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107984,8 +108026,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19768", +- "self_type" : "type-19770", ++ "referenced_type" : "type-19511", ++ "self_type" : "type-19513", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107993,8 +108035,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19925", +- "self_type" : "type-19927", ++ "referenced_type" : "type-19791", ++ "self_type" : "type-19793", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108002,8 +108044,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-20689", +- "self_type" : "type-20691", ++ "referenced_type" : "type-20697", ++ "self_type" : "type-20699", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108011,8 +108053,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-21813", +- "self_type" : "type-21815", ++ "referenced_type" : "type-21821", ++ "self_type" : "type-21823", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108524,8 +108566,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16162", +- "self_type" : "type-16164", ++ "referenced_type" : "type-15501", ++ "self_type" : "type-15503", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108533,8 +108575,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17285", +- "self_type" : "type-17287", ++ "referenced_type" : "type-15645", ++ "self_type" : "type-15647", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108542,8 +108584,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17760", +- "self_type" : "type-17763", ++ "referenced_type" : "type-15849", ++ "self_type" : "type-15851", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108551,8 +108593,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18065", +- "self_type" : "type-18067", ++ "referenced_type" : "type-16016", ++ "self_type" : "type-16018", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108560,8 +108602,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18377", +- "self_type" : "type-18379", ++ "referenced_type" : "type-16173", ++ "self_type" : "type-16175", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108569,8 +108611,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18505", +- "self_type" : "type-18507", ++ "referenced_type" : "type-16932", ++ "self_type" : "type-16934", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108578,8 +108620,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18737", +- "self_type" : "type-18739", ++ "referenced_type" : "type-18055", ++ "self_type" : "type-18057", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108587,8 +108629,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19017", +- "self_type" : "type-19019", ++ "referenced_type" : "type-18538", ++ "self_type" : "type-18541", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108596,8 +108638,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19256", +- "self_type" : "type-19258", ++ "referenced_type" : "type-18843", ++ "self_type" : "type-18845", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108605,8 +108647,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19401", +- "self_type" : "type-19403", ++ "referenced_type" : "type-19155", ++ "self_type" : "type-19157", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108614,8 +108656,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19605", +- "self_type" : "type-19607", ++ "referenced_type" : "type-19283", ++ "self_type" : "type-19285", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108623,8 +108665,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19772", +- "self_type" : "type-19774", ++ "referenced_type" : "type-19515", ++ "self_type" : "type-19517", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108632,8 +108674,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19929", +- "self_type" : "type-19931", ++ "referenced_type" : "type-19795", ++ "self_type" : "type-19797", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108641,8 +108683,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-20693", +- "self_type" : "type-20695", ++ "referenced_type" : "type-20701", ++ "self_type" : "type-20703", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108650,8 +108692,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-21817", +- "self_type" : "type-21819", ++ "referenced_type" : "type-21825", ++ "self_type" : "type-21827", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109163,8 +109205,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16166", +- "self_type" : "type-16168", ++ "referenced_type" : "type-15505", ++ "self_type" : "type-15507", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109172,8 +109214,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17289", +- "self_type" : "type-17291", ++ "referenced_type" : "type-15649", ++ "self_type" : "type-15651", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109181,8 +109223,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17765", +- "self_type" : "type-17767", ++ "referenced_type" : "type-15853", ++ "self_type" : "type-15855", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109190,8 +109232,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18069", +- "self_type" : "type-18071", ++ "referenced_type" : "type-16021", ++ "self_type" : "type-16023", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109199,8 +109241,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18381", +- "self_type" : "type-18383", ++ "referenced_type" : "type-16177", ++ "self_type" : "type-16180", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109208,8 +109250,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18509", +- "self_type" : "type-18511", ++ "referenced_type" : "type-16936", ++ "self_type" : "type-16938", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109217,8 +109259,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18741", +- "self_type" : "type-18743", ++ "referenced_type" : "type-18059", ++ "self_type" : "type-18061", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109226,8 +109268,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19021", +- "self_type" : "type-19023", ++ "referenced_type" : "type-18543", ++ "self_type" : "type-18545", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109235,8 +109277,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19260", +- "self_type" : "type-19262", ++ "referenced_type" : "type-18847", ++ "self_type" : "type-18849", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109244,8 +109286,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19405", +- "self_type" : "type-19407", ++ "referenced_type" : "type-19159", ++ "self_type" : "type-19161", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109253,8 +109295,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19609", +- "self_type" : "type-19611", ++ "referenced_type" : "type-19287", ++ "self_type" : "type-19289", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109262,8 +109304,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19777", +- "self_type" : "type-19779", ++ "referenced_type" : "type-19519", ++ "self_type" : "type-19521", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109271,8 +109313,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19933", +- "self_type" : "type-19936", ++ "referenced_type" : "type-19799", ++ "self_type" : "type-19801", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109280,8 +109322,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-20697", +- "self_type" : "type-20699", ++ "referenced_type" : "type-20705", ++ "self_type" : "type-20707", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109289,8 +109331,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-21821", +- "self_type" : "type-21823", ++ "referenced_type" : "type-21829", ++ "self_type" : "type-21831", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110117,8 +110159,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-15728", +- "self_type" : "type-15731", ++ "referenced_type" : "type-15521", ++ "self_type" : "type-15523", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110126,8 +110168,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-15901", +- "self_type" : "type-15903", ++ "referenced_type" : "type-15664", ++ "self_type" : "type-15666", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110135,8 +110177,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16183", +- "self_type" : "type-16185", ++ "referenced_type" : "type-15868", ++ "self_type" : "type-15870", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110144,8 +110186,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16284", +- "self_type" : "type-16286", ++ "referenced_type" : "type-16037", ++ "self_type" : "type-16039", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110153,8 +110195,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16424", +- "self_type" : "type-16426", ++ "referenced_type" : "type-16193", ++ "self_type" : "type-16195", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110162,8 +110204,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16481", +- "self_type" : "type-16483", ++ "referenced_type" : "type-16501", ++ "self_type" : "type-16504", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110171,8 +110213,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16593", +- "self_type" : "type-16595", ++ "referenced_type" : "type-16674", ++ "self_type" : "type-16676", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110180,8 +110222,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16661", +- "self_type" : "type-16663", ++ "referenced_type" : "type-16953", ++ "self_type" : "type-16955", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110189,8 +110231,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16714", +- "self_type" : "type-16716", ++ "referenced_type" : "type-17054", ++ "self_type" : "type-17056", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110198,8 +110240,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16799", +- "self_type" : "type-16801", ++ "referenced_type" : "type-17194", ++ "self_type" : "type-17196", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110207,8 +110249,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16867", +- "self_type" : "type-16869", ++ "referenced_type" : "type-17251", ++ "self_type" : "type-17253", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110216,8 +110258,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17106", +- "self_type" : "type-17108", ++ "referenced_type" : "type-17363", ++ "self_type" : "type-17365", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110225,8 +110267,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17304", +- "self_type" : "type-17306", ++ "referenced_type" : "type-17431", ++ "self_type" : "type-17433", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110234,8 +110276,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17378", +- "self_type" : "type-17380", ++ "referenced_type" : "type-17484", ++ "self_type" : "type-17486", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110243,8 +110285,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17424", +- "self_type" : "type-17426", ++ "referenced_type" : "type-17569", ++ "self_type" : "type-17571", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110252,8 +110294,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17781", +- "self_type" : "type-17783", ++ "referenced_type" : "type-17637", ++ "self_type" : "type-17639", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110261,8 +110303,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17882", +- "self_type" : "type-17884", ++ "referenced_type" : "type-17876", ++ "self_type" : "type-17878", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110270,8 +110312,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17974", +- "self_type" : "type-17976", ++ "referenced_type" : "type-18074", ++ "self_type" : "type-18076", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110279,8 +110321,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18085", +- "self_type" : "type-18087", ++ "referenced_type" : "type-18156", ++ "self_type" : "type-18158", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110288,8 +110330,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18137", +- "self_type" : "type-18139", ++ "referenced_type" : "type-18202", ++ "self_type" : "type-18204", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110297,8 +110339,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18226", +- "self_type" : "type-18228", ++ "referenced_type" : "type-18559", ++ "self_type" : "type-18561", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110306,8 +110348,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18397", +- "self_type" : "type-18399", ++ "referenced_type" : "type-18660", ++ "self_type" : "type-18662", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110315,8 +110357,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18524", +- "self_type" : "type-18526", ++ "referenced_type" : "type-18752", ++ "self_type" : "type-18754", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110324,8 +110366,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18756", +- "self_type" : "type-18758", ++ "referenced_type" : "type-18863", ++ "self_type" : "type-18865", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110333,8 +110375,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18888", +- "self_type" : "type-18890", ++ "referenced_type" : "type-18915", ++ "self_type" : "type-18917", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110342,8 +110384,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19036", +- "self_type" : "type-19038", ++ "referenced_type" : "type-19004", ++ "self_type" : "type-19006", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110351,8 +110393,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19276", +- "self_type" : "type-19278", ++ "referenced_type" : "type-19175", ++ "self_type" : "type-19177", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110360,8 +110402,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19420", +- "self_type" : "type-19422", ++ "referenced_type" : "type-19302", ++ "self_type" : "type-19304", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110369,8 +110411,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19624", +- "self_type" : "type-19626", ++ "referenced_type" : "type-19534", ++ "self_type" : "type-19536", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110378,8 +110420,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19793", +- "self_type" : "type-19795", ++ "referenced_type" : "type-19666", ++ "self_type" : "type-19668", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110387,8 +110429,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19949", +- "self_type" : "type-19951", ++ "referenced_type" : "type-19814", ++ "self_type" : "type-19816", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110396,8 +110438,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20262", +- "self_type" : "type-20265", ++ "referenced_type" : "type-20266", ++ "self_type" : "type-20269", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110405,8 +110447,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20435", +- "self_type" : "type-20437", ++ "referenced_type" : "type-20439", ++ "self_type" : "type-20441", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110414,8 +110456,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20714", +- "self_type" : "type-20716", ++ "referenced_type" : "type-20722", ++ "self_type" : "type-20724", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110423,8 +110465,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20815", +- "self_type" : "type-20817", ++ "referenced_type" : "type-20823", ++ "self_type" : "type-20825", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110432,8 +110474,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20955", +- "self_type" : "type-20957", ++ "referenced_type" : "type-20963", ++ "self_type" : "type-20965", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110441,8 +110483,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21013", +- "self_type" : "type-21015", ++ "referenced_type" : "type-21021", ++ "self_type" : "type-21023", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110459,8 +110501,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21125", +- "self_type" : "type-21127", ++ "referenced_type" : "type-21133", ++ "self_type" : "type-21135", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110468,8 +110510,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21193", +- "self_type" : "type-21195", ++ "referenced_type" : "type-21201", ++ "self_type" : "type-21203", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110477,8 +110519,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21246", +- "self_type" : "type-21248", ++ "referenced_type" : "type-21254", ++ "self_type" : "type-21256", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110486,8 +110528,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21331", +- "self_type" : "type-21333", ++ "referenced_type" : "type-21339", ++ "self_type" : "type-21341", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110495,8 +110537,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21399", +- "self_type" : "type-21401", ++ "referenced_type" : "type-21407", ++ "self_type" : "type-21409", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110504,8 +110546,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21638", +- "self_type" : "type-21640", ++ "referenced_type" : "type-21646", ++ "self_type" : "type-21648", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110513,8 +110555,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21836", +- "self_type" : "type-21838", ++ "referenced_type" : "type-21844", ++ "self_type" : "type-21846", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111755,8 +111797,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-15949", +- "self_type" : "type-15951", ++ "referenced_type" : "type-15437", ++ "self_type" : "type-15439", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111764,8 +111806,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-17018", +- "self_type" : "type-17020", ++ "referenced_type" : "type-15765", ++ "self_type" : "type-15767", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111773,8 +111815,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-18577", +- "self_type" : "type-18579", ++ "referenced_type" : "type-15936", ++ "self_type" : "type-15938", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111782,8 +111824,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-18661", +- "self_type" : "type-18663", ++ "referenced_type" : "type-16103", ++ "self_type" : "type-16105", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111791,8 +111833,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-18851", +- "self_type" : "type-18853", ++ "referenced_type" : "type-16720", ++ "self_type" : "type-16722", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111800,8 +111842,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-18949", +- "self_type" : "type-18951", ++ "referenced_type" : "type-17788", ++ "self_type" : "type-17790", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111818,8 +111860,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-19192", +- "self_type" : "type-19194", ++ "referenced_type" : "type-19355", ++ "self_type" : "type-19357", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111827,8 +111869,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-19521", +- "self_type" : "type-19523", ++ "referenced_type" : "type-19439", ++ "self_type" : "type-19441", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111836,8 +111878,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-19692", +- "self_type" : "type-19694", ++ "referenced_type" : "type-19629", ++ "self_type" : "type-19631", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111845,8 +111887,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-19859", +- "self_type" : "type-19861", ++ "referenced_type" : "type-19727", ++ "self_type" : "type-19729", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111854,8 +111896,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-20481", +- "self_type" : "type-20483", ++ "referenced_type" : "type-20488", ++ "self_type" : "type-20490", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111863,8 +111905,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-21550", +- "self_type" : "type-21552", ++ "referenced_type" : "type-21558", ++ "self_type" : "type-21560", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112232,8 +112274,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-15963", +- "self_type" : "type-15965", ++ "referenced_type" : "type-15452", ++ "self_type" : "type-15454", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112241,8 +112283,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-17033", +- "self_type" : "type-17035", ++ "referenced_type" : "type-15781", ++ "self_type" : "type-15783", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112250,8 +112292,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-18592", +- "self_type" : "type-18594", ++ "referenced_type" : "type-15951", ++ "self_type" : "type-15953", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112259,8 +112301,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-18677", +- "self_type" : "type-18679", ++ "referenced_type" : "type-16121", ++ "self_type" : "type-16123", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112268,8 +112310,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-18868", +- "self_type" : "type-18870", ++ "referenced_type" : "type-16734", ++ "self_type" : "type-16736", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112277,8 +112319,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-18966", +- "self_type" : "type-18968", ++ "referenced_type" : "type-17803", ++ "self_type" : "type-17805", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112286,8 +112328,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-19207", +- "self_type" : "type-19209", ++ "referenced_type" : "type-19370", ++ "self_type" : "type-19372", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112304,8 +112346,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-19537", +- "self_type" : "type-19539", ++ "referenced_type" : "type-19455", ++ "self_type" : "type-19457", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112313,8 +112355,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-19707", +- "self_type" : "type-19709", ++ "referenced_type" : "type-19646", ++ "self_type" : "type-19648", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112322,8 +112364,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-19877", +- "self_type" : "type-19879", ++ "referenced_type" : "type-19744", ++ "self_type" : "type-19746", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112331,8 +112373,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-20495", +- "self_type" : "type-20497", ++ "referenced_type" : "type-20502", ++ "self_type" : "type-20504", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112340,8 +112382,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-21565", +- "self_type" : "type-21567", ++ "referenced_type" : "type-21573", ++ "self_type" : "type-21575", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112880,8 +112922,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::hash *", + "name" : "const google::protobuf::hash *", +- "referenced_type" : "type-19663", +- "self_type" : "type-19664", ++ "referenced_type" : "type-15907", ++ "self_type" : "type-15908", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -112979,8 +113021,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", + "name" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", +- "referenced_type" : "type-18895", +- "self_type" : "type-18897", ++ "referenced_type" : "type-19673", ++ "self_type" : "type-19675", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, +@@ -113402,8 +113444,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19884", +- "self_type" : "type-19892", ++ "referenced_type" : "type-16128", ++ "self_type" : "type-16136", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113420,8 +113462,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr > *", + "name" : "const google::protobuf::internal::scoped_ptr > *", +- "referenced_type" : "type-19638", +- "self_type" : "type-19643", ++ "referenced_type" : "type-15882", ++ "self_type" : "type-15887", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113456,8 +113498,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19862", +- "self_type" : "type-19868", ++ "referenced_type" : "type-16106", ++ "self_type" : "type-16112", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113483,8 +113525,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19549", +- "self_type" : "type-19553", ++ "referenced_type" : "type-15793", ++ "self_type" : "type-15797", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113519,8 +113561,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19172", +- "self_type" : "type-19177", ++ "referenced_type" : "type-15417", ++ "self_type" : "type-15422", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113528,8 +113570,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19560", +- "self_type" : "type-19571", ++ "referenced_type" : "type-15804", ++ "self_type" : "type-15815", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113537,8 +113579,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19628", +- "self_type" : "type-19629", ++ "referenced_type" : "type-15872", ++ "self_type" : "type-15873", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113546,8 +113588,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19631", +- "self_type" : "type-19632", ++ "referenced_type" : "type-15875", ++ "self_type" : "type-15876", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113555,8 +113597,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19586", +- "self_type" : "type-19593", ++ "referenced_type" : "type-15830", ++ "self_type" : "type-15837", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113564,8 +113606,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19544", +- "self_type" : "type-19545", ++ "referenced_type" : "type-15788", ++ "self_type" : "type-15789", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113573,8 +113615,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19159", +- "self_type" : "type-19160", ++ "referenced_type" : "type-15404", ++ "self_type" : "type-15405", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113834,8 +113876,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::FieldContext *", + "name" : "const google::protobuf::util::FieldContext *", +- "referenced_type" : "type-18631", +- "self_type" : "type-18633", ++ "referenced_type" : "type-19409", ++ "self_type" : "type-19411", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/field_comparator.h" + }, +@@ -113906,8 +113948,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::StatusOr *", + "name" : "const google::protobuf::util::StatusOr *", +- "referenced_type" : "type-19958", +- "self_type" : "type-19960", ++ "referenced_type" : "type-16202", ++ "self_type" : "type-16204", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -114005,8 +114047,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::converter::ObjectLocationTracker *", + "name" : "const google::protobuf::util::converter::ObjectLocationTracker *", +- "referenced_type" : "type-19648", +- "self_type" : "type-19649", ++ "referenced_type" : "type-15892", ++ "self_type" : "type-15893", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/object_location_tracker.h" + }, +@@ -114014,8 +114056,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::converter::ObjectSource *", + "name" : "const google::protobuf::util::converter::ObjectSource *", +- "referenced_type" : "type-19428", +- "self_type" : "type-19429", ++ "referenced_type" : "type-15672", ++ "self_type" : "type-15673", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/object_source.h" + }, +@@ -114032,8 +114074,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::converter::ProtoStreamObjectSource *", + "name" : "const google::protobuf::util::converter::ProtoStreamObjectSource *", +- "referenced_type" : "type-19323", +- "self_type" : "type-19322", ++ "referenced_type" : "type-15568", ++ "self_type" : "type-15567", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -114041,8 +114083,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::converter::ProtoStreamObjectWriter::Item *", + "name" : "const google::protobuf::util::converter::ProtoStreamObjectWriter::Item *", +- "referenced_type" : "type-19641", +- "self_type" : "type-19642", ++ "referenced_type" : "type-15885", ++ "self_type" : "type-15886", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, +@@ -114050,8 +114092,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::converter::ProtoWriter::ProtoElement *", + "name" : "const google::protobuf::util::converter::ProtoWriter::ProtoElement *", +- "referenced_type" : "type-19635", +- "self_type" : "type-19636", ++ "referenced_type" : "type-15879", ++ "self_type" : "type-15880", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, +@@ -114059,8 +114101,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::converter::StructuredObjectWriter::BaseElement *", + "name" : "const google::protobuf::util::converter::StructuredObjectWriter::BaseElement *", +- "referenced_type" : "type-19145", +- "self_type" : "type-19146", ++ "referenced_type" : "type-15390", ++ "self_type" : "type-15391", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/structured_objectwriter.h" + }, +@@ -114104,8 +114146,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node *", + "name" : "const std::__tree_node *", +- "referenced_type" : "type-16940", +- "self_type" : "type-16942", ++ "referenced_type" : "type-17710", ++ "self_type" : "type-17712", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114113,8 +114155,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node *", + "name" : "const std::__tree_node *", +- "referenced_type" : "type-21472", +- "self_type" : "type-21474", ++ "referenced_type" : "type-21480", ++ "self_type" : "type-21482", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114167,8 +114209,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node *>, void *> *", + "name" : "const std::__tree_node *>, void *> *", +- "referenced_type" : "type-16930", +- "self_type" : "type-16932", ++ "referenced_type" : "type-17700", ++ "self_type" : "type-17702", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114176,8 +114218,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node *>, void *> *", + "name" : "const std::__tree_node *>, void *> *", +- "referenced_type" : "type-21462", +- "self_type" : "type-21464", ++ "referenced_type" : "type-21470", ++ "self_type" : "type-21472", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114239,8 +114281,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", + "name" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", +- "referenced_type" : "type-17514", +- "self_type" : "type-17516", ++ "referenced_type" : "type-18292", ++ "self_type" : "type-18294", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114293,8 +114335,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node, std::allocator > *, void *> *", + "name" : "const std::__tree_node, std::allocator > *, void *> *", +- "referenced_type" : "type-17522", +- "self_type" : "type-17524", ++ "referenced_type" : "type-18300", ++ "self_type" : "type-18302", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114842,8 +114884,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-15510", +- "self_type" : "type-15565", ++ "referenced_type" : "type-15374", ++ "self_type" : "type-15406", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114851,8 +114893,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-15818", +- "self_type" : "type-15837", ++ "referenced_type" : "type-15582", ++ "self_type" : "type-15598", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114860,8 +114902,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-15932", +- "self_type" : "type-15931", ++ "referenced_type" : "type-15718", ++ "self_type" : "type-15747", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114869,8 +114911,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16039", +- "self_type" : "type-16075", ++ "referenced_type" : "type-15904", ++ "self_type" : "type-15914", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114878,17 +114920,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16232", +- "self_type" : "type-16235", ++ "referenced_type" : "type-16064", ++ "self_type" : "type-16073", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16329", +- "self_type" : "type-16340", ++ "referenced_type" : "type-16283", ++ "self_type" : "type-16338", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114896,8 +114938,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16436", +- "self_type" : "type-16442", ++ "referenced_type" : "type-16591", ++ "self_type" : "type-16610", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114905,8 +114947,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16534", +- "self_type" : "type-16570", ++ "referenced_type" : "type-16703", ++ "self_type" : "type-16702", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114914,17 +114956,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16614", +- "self_type" : "type-16622", ++ "referenced_type" : "type-16810", ++ "self_type" : "type-16845", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16679", +- "self_type" : "type-16684", ++ "referenced_type" : "type-17002", ++ "self_type" : "type-17005", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114932,8 +114974,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16745", +- "self_type" : "type-16757", ++ "referenced_type" : "type-17099", ++ "self_type" : "type-17110", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114941,35 +114983,35 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16825", +- "self_type" : "type-16828", ++ "referenced_type" : "type-17206", ++ "self_type" : "type-17212", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16848", +- "self_type" : "type-16847", ++ "referenced_type" : "type-17304", ++ "self_type" : "type-17340", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16896", +- "self_type" : "type-16999", ++ "referenced_type" : "type-17384", ++ "self_type" : "type-17392", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-17120", +- "self_type" : "type-17160", ++ "referenced_type" : "type-17449", ++ "self_type" : "type-17454", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114977,26 +115019,26 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-17230", +- "self_type" : "type-17238", ++ "referenced_type" : "type-17515", ++ "self_type" : "type-17527", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-17325", +- "self_type" : "type-17333", ++ "referenced_type" : "type-17595", ++ "self_type" : "type-17598", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-17385", +- "self_type" : "type-17657", ++ "referenced_type" : "type-17618", ++ "self_type" : "type-17617", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115004,44 +115046,44 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-17398", +- "self_type" : "type-17543", ++ "referenced_type" : "type-17666", ++ "self_type" : "type-17769", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/map.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-17654", +- "self_type" : "type-17658", ++ "referenced_type" : "type-1785", ++ "self_type" : "type-1857", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-17822", +- "self_type" : "type-17832", ++ "referenced_type" : "type-17890", ++ "self_type" : "type-17930", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-1785", +- "self_type" : "type-1857", ++ "referenced_type" : "type-18000", ++ "self_type" : "type-18008", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-17910", +- "self_type" : "type-17922", ++ "referenced_type" : "type-18095", ++ "self_type" : "type-18103", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115049,8 +115091,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-17986", +- "self_type" : "type-18013", ++ "referenced_type" : "type-18163", ++ "self_type" : "type-18435", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115058,26 +115100,26 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18095", +- "self_type" : "type-18103", ++ "referenced_type" : "type-18176", ++ "self_type" : "type-18321", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18150", +- "self_type" : "type-18167", ++ "referenced_type" : "type-18432", ++ "self_type" : "type-18436", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18179", +- "self_type" : "type-18205", ++ "referenced_type" : "type-18600", ++ "self_type" : "type-18610", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115085,17 +115127,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18311", +- "self_type" : "type-18314", ++ "referenced_type" : "type-18688", ++ "self_type" : "type-18700", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18318", +- "self_type" : "type-18317", ++ "referenced_type" : "type-18764", ++ "self_type" : "type-18791", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115103,26 +115145,26 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18432", +- "self_type" : "type-18446", ++ "referenced_type" : "type-18873", ++ "self_type" : "type-18881", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18558", +- "self_type" : "type-18557", ++ "referenced_type" : "type-18928", ++ "self_type" : "type-18945", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18599", +- "self_type" : "type-18598", ++ "referenced_type" : "type-18957", ++ "self_type" : "type-18983", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115130,8 +115172,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18639", +- "self_type" : "type-18641", ++ "referenced_type" : "type-19089", ++ "self_type" : "type-19092", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115139,35 +115181,35 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18774", +- "self_type" : "type-18826", ++ "referenced_type" : "type-19096", ++ "self_type" : "type-19095", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/map.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18811", +- "self_type" : "type-18913", ++ "referenced_type" : "type-19210", ++ "self_type" : "type-19224", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18917", +- "self_type" : "type-18923", ++ "referenced_type" : "type-19336", ++ "self_type" : "type-19335", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-19129", +- "self_type" : "type-19161", ++ "referenced_type" : "type-19377", ++ "self_type" : "type-19376", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115175,35 +115217,35 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-19338", +- "self_type" : "type-19354", ++ "referenced_type" : "type-19417", ++ "self_type" : "type-19419", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-19474", +- "self_type" : "type-19503", ++ "referenced_type" : "type-19552", ++ "self_type" : "type-19604", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-19660", +- "self_type" : "type-19670", ++ "referenced_type" : "type-19589", ++ "self_type" : "type-19691", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-19820", +- "self_type" : "type-19829", ++ "referenced_type" : "type-19695", ++ "self_type" : "type-19701", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115211,8 +115253,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-20043", +- "self_type" : "type-20098", ++ "referenced_type" : "type-20047", ++ "self_type" : "type-20102", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115220,8 +115262,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-20352", +- "self_type" : "type-20371", ++ "referenced_type" : "type-20356", ++ "self_type" : "type-20375", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115229,8 +115271,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-20464", +- "self_type" : "type-20463", ++ "referenced_type" : "type-20471", ++ "self_type" : "type-20470", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115238,8 +115280,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-20571", +- "self_type" : "type-20606", ++ "referenced_type" : "type-20578", ++ "self_type" : "type-20614", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115247,8 +115289,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-20763", +- "self_type" : "type-20766", ++ "referenced_type" : "type-20771", ++ "self_type" : "type-20774", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115256,8 +115298,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-20860", +- "self_type" : "type-20871", ++ "referenced_type" : "type-20868", ++ "self_type" : "type-20879", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115265,8 +115307,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-20967", +- "self_type" : "type-20973", ++ "referenced_type" : "type-20975", ++ "self_type" : "type-20981", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115274,8 +115316,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21066", +- "self_type" : "type-21102", ++ "referenced_type" : "type-21074", ++ "self_type" : "type-21110", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115283,8 +115325,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21146", +- "self_type" : "type-21154", ++ "referenced_type" : "type-21154", ++ "self_type" : "type-21162", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115292,8 +115334,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21211", +- "self_type" : "type-21216", ++ "referenced_type" : "type-21219", ++ "self_type" : "type-21224", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115301,8 +115343,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21277", +- "self_type" : "type-21289", ++ "referenced_type" : "type-21285", ++ "self_type" : "type-21297", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115310,8 +115352,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21357", +- "self_type" : "type-21360", ++ "referenced_type" : "type-21365", ++ "self_type" : "type-21368", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -115319,8 +115361,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21380", +- "self_type" : "type-21379", ++ "referenced_type" : "type-21388", ++ "self_type" : "type-21387", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115328,8 +115370,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21428", +- "self_type" : "type-21531", ++ "referenced_type" : "type-21436", ++ "self_type" : "type-21539", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115337,8 +115379,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21652", +- "self_type" : "type-21692", ++ "referenced_type" : "type-21660", ++ "self_type" : "type-21700", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115346,8 +115388,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21762", +- "self_type" : "type-21770", ++ "referenced_type" : "type-21770", ++ "self_type" : "type-21778", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115355,8 +115397,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21857", +- "self_type" : "type-21865", ++ "referenced_type" : "type-21865", ++ "self_type" : "type-21873", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -117200,8 +117242,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-15565", +- "self_type" : "type-15617", ++ "referenced_type" : "type-15406", ++ "self_type" : "type-15418", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117209,8 +117251,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-15837", +- "self_type" : "type-15841", ++ "referenced_type" : "type-15598", ++ "self_type" : "type-15602", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117218,8 +117260,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-15931", +- "self_type" : "type-15930", ++ "referenced_type" : "type-15747", ++ "self_type" : "type-15751", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117227,8 +117269,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-16075", +- "self_type" : "type-16076", ++ "referenced_type" : "type-15914", ++ "self_type" : "type-15920", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117236,8 +117278,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-16235", +- "self_type" : "type-16236", ++ "referenced_type" : "type-16073", ++ "self_type" : "type-16084", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117245,8 +117287,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-16340", +- "self_type" : "type-16347", ++ "referenced_type" : "type-16338", ++ "self_type" : "type-16390", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117254,8 +117296,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-16442", +- "self_type" : "type-16448", ++ "referenced_type" : "type-16610", ++ "self_type" : "type-16614", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117263,8 +117305,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-16570", +- "self_type" : "type-16571", ++ "referenced_type" : "type-16702", ++ "self_type" : "type-16701", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117272,8 +117314,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-16622", +- "self_type" : "type-16626", ++ "referenced_type" : "type-16845", ++ "self_type" : "type-16846", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117281,8 +117323,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-16684", +- "self_type" : "type-16688", ++ "referenced_type" : "type-17005", ++ "self_type" : "type-17006", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117290,8 +117332,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-16757", +- "self_type" : "type-16762", ++ "referenced_type" : "type-17110", ++ "self_type" : "type-17117", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117299,8 +117341,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-16828", +- "self_type" : "type-16841", ++ "referenced_type" : "type-17212", ++ "self_type" : "type-17218", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117308,8 +117350,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-16999", +- "self_type" : "type-17004", ++ "referenced_type" : "type-17340", ++ "self_type" : "type-17341", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117317,8 +117359,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-17160", +- "self_type" : "type-17161", ++ "referenced_type" : "type-17392", ++ "self_type" : "type-17396", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117326,8 +117368,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-17238", +- "self_type" : "type-17239", ++ "referenced_type" : "type-17454", ++ "self_type" : "type-17458", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117335,8 +117377,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-17333", +- "self_type" : "type-17337", ++ "referenced_type" : "type-17527", ++ "self_type" : "type-17532", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117344,8 +117386,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-17543", +- "self_type" : "type-17588", ++ "referenced_type" : "type-17598", ++ "self_type" : "type-17611", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117353,8 +117395,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-17658", +- "self_type" : "type-17661", ++ "referenced_type" : "type-17769", ++ "self_type" : "type-17774", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117362,8 +117404,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-17832", +- "self_type" : "type-17838", ++ "referenced_type" : "type-17930", ++ "self_type" : "type-17931", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117371,8 +117413,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-17922", +- "self_type" : "type-17928", ++ "referenced_type" : "type-18008", ++ "self_type" : "type-18009", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117380,8 +117422,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-18013", +- "self_type" : "type-18018", ++ "referenced_type" : "type-18103", ++ "self_type" : "type-18107", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117389,8 +117431,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-18103", +- "self_type" : "type-18108", ++ "referenced_type" : "type-18321", ++ "self_type" : "type-18366", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117398,8 +117440,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-18167", +- "self_type" : "type-18173", ++ "referenced_type" : "type-18436", ++ "self_type" : "type-18439", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117407,8 +117449,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-18314", +- "self_type" : "type-18320", ++ "referenced_type" : "type-1857", ++ "self_type" : "type-1950", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117416,8 +117458,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-18446", +- "self_type" : "type-18449", ++ "referenced_type" : "type-18610", ++ "self_type" : "type-18616", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117425,8 +117467,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-18557", +- "self_type" : "type-18563", ++ "referenced_type" : "type-18700", ++ "self_type" : "type-18706", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117434,8 +117476,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-1857", +- "self_type" : "type-1950", ++ "referenced_type" : "type-18791", ++ "self_type" : "type-18796", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117443,8 +117485,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-18641", +- "self_type" : "type-18647", ++ "referenced_type" : "type-18881", ++ "self_type" : "type-18886", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117452,8 +117494,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-18826", +- "self_type" : "type-18837", ++ "referenced_type" : "type-18945", ++ "self_type" : "type-18951", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117461,8 +117503,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-18923", +- "self_type" : "type-18932", ++ "referenced_type" : "type-19092", ++ "self_type" : "type-19098", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117470,8 +117512,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-19161", +- "self_type" : "type-19173", ++ "referenced_type" : "type-19224", ++ "self_type" : "type-19227", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117479,8 +117521,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-19354", +- "self_type" : "type-19358", ++ "referenced_type" : "type-19335", ++ "self_type" : "type-19341", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117488,8 +117530,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-19503", +- "self_type" : "type-19507", ++ "referenced_type" : "type-19419", ++ "self_type" : "type-19425", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117497,8 +117539,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-19670", +- "self_type" : "type-19676", ++ "referenced_type" : "type-19604", ++ "self_type" : "type-19615", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117506,8 +117548,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-19829", +- "self_type" : "type-19840", ++ "referenced_type" : "type-19701", ++ "self_type" : "type-19710", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117515,8 +117557,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-20098", +- "self_type" : "type-20150", ++ "referenced_type" : "type-20102", ++ "self_type" : "type-20154", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117524,8 +117566,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-20371", +- "self_type" : "type-20375", ++ "referenced_type" : "type-20375", ++ "self_type" : "type-20379", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117533,8 +117575,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-20463", +- "self_type" : "type-20462", ++ "referenced_type" : "type-20470", ++ "self_type" : "type-20469", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117542,8 +117584,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-20606", +- "self_type" : "type-20607", ++ "referenced_type" : "type-20614", ++ "self_type" : "type-20615", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117551,8 +117593,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-20766", +- "self_type" : "type-20767", ++ "referenced_type" : "type-20774", ++ "self_type" : "type-20775", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117560,8 +117602,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-20871", +- "self_type" : "type-20878", ++ "referenced_type" : "type-20879", ++ "self_type" : "type-20886", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117569,8 +117611,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-20973", +- "self_type" : "type-20979", ++ "referenced_type" : "type-20981", ++ "self_type" : "type-20987", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117578,8 +117620,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-21102", +- "self_type" : "type-21103", ++ "referenced_type" : "type-21110", ++ "self_type" : "type-21111", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117587,8 +117629,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-21154", +- "self_type" : "type-21158", ++ "referenced_type" : "type-21162", ++ "self_type" : "type-21166", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117596,8 +117638,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-21216", +- "self_type" : "type-21220", ++ "referenced_type" : "type-21224", ++ "self_type" : "type-21228", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117605,8 +117647,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-21289", +- "self_type" : "type-21294", ++ "referenced_type" : "type-21297", ++ "self_type" : "type-21302", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117614,8 +117656,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-21360", +- "self_type" : "type-21373", ++ "referenced_type" : "type-21368", ++ "self_type" : "type-21381", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117623,8 +117665,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-21531", +- "self_type" : "type-21536", ++ "referenced_type" : "type-21539", ++ "self_type" : "type-21544", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117632,8 +117674,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-21692", +- "self_type" : "type-21693", ++ "referenced_type" : "type-21700", ++ "self_type" : "type-21701", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117641,8 +117683,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-21770", +- "self_type" : "type-21771", ++ "referenced_type" : "type-21778", ++ "self_type" : "type-21779", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117650,8 +117692,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-21865", +- "self_type" : "type-21869", ++ "referenced_type" : "type-21873", ++ "self_type" : "type-21877", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118829,8 +118871,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair *", + "name" : "const std::pair *", +- "referenced_type" : "type-18549", +- "self_type" : "type-18548", ++ "referenced_type" : "type-19327", ++ "self_type" : "type-19326", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -118865,8 +118907,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", +- "referenced_type" : "type-16951", +- "self_type" : "type-16953", ++ "referenced_type" : "type-17721", ++ "self_type" : "type-17723", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -118874,8 +118916,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", +- "referenced_type" : "type-21483", +- "self_type" : "type-21485", ++ "referenced_type" : "type-21491", ++ "self_type" : "type-21493", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -118937,8 +118979,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", + "name" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", +- "referenced_type" : "type-17528", +- "self_type" : "type-17530", ++ "referenced_type" : "type-18306", ++ "self_type" : "type-18308", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -119495,8 +119537,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-15389", +- "self_type" : "type-15391", ++ "referenced_type" : "type-15400", ++ "self_type" : "type-15402", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119504,8 +119546,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-15560", +- "self_type" : "type-15562", ++ "referenced_type" : "type-15595", ++ "self_type" : "type-15597", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119513,8 +119555,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-15834", +- "self_type" : "type-15836", ++ "referenced_type" : "type-15609", ++ "self_type" : "type-15611", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119522,8 +119564,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-15971", +- "self_type" : "type-15973", ++ "referenced_type" : "type-15790", ++ "self_type" : "type-15792", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119531,8 +119573,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16103", +- "self_type" : "type-16105", ++ "referenced_type" : "type-15960", ++ "self_type" : "type-15962", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119540,8 +119582,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16253", +- "self_type" : "type-16255", ++ "referenced_type" : "type-16069", ++ "self_type" : "type-16072", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119549,8 +119591,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16337", +- "self_type" : "type-16339", ++ "referenced_type" : "type-16333", ++ "self_type" : "type-16335", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119558,8 +119600,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16439", +- "self_type" : "type-16441", ++ "referenced_type" : "type-16607", ++ "self_type" : "type-16609", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119567,8 +119609,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16565", +- "self_type" : "type-16567", ++ "referenced_type" : "type-16742", ++ "self_type" : "type-16744", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119576,8 +119618,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16617", +- "self_type" : "type-16619", ++ "referenced_type" : "type-16873", ++ "self_type" : "type-16875", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119585,8 +119627,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16700", +- "self_type" : "type-16702", ++ "referenced_type" : "type-17023", ++ "self_type" : "type-17025", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119594,8 +119636,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16749", +- "self_type" : "type-16748", ++ "referenced_type" : "type-17107", ++ "self_type" : "type-17109", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119603,8 +119645,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16753", +- "self_type" : "type-16755", ++ "referenced_type" : "type-17209", ++ "self_type" : "type-17211", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119612,8 +119654,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16831", +- "self_type" : "type-16833", ++ "referenced_type" : "type-17335", ++ "self_type" : "type-17337", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119621,8 +119663,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16899", +- "self_type" : "type-16901", ++ "referenced_type" : "type-17387", ++ "self_type" : "type-17389", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119630,8 +119672,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16936", +- "self_type" : "type-16950", ++ "referenced_type" : "type-17470", ++ "self_type" : "type-17472", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119639,8 +119681,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-17153", +- "self_type" : "type-17155", ++ "referenced_type" : "type-17519", ++ "self_type" : "type-17518", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119648,8 +119690,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-17235", +- "self_type" : "type-17237", ++ "referenced_type" : "type-17523", ++ "self_type" : "type-17525", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119657,8 +119699,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-17328", +- "self_type" : "type-17330", ++ "referenced_type" : "type-17601", ++ "self_type" : "type-17603", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119666,8 +119708,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-17485", +- "self_type" : "type-17487", ++ "referenced_type" : "type-17669", ++ "self_type" : "type-17671", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119675,8 +119717,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-17590", +- "self_type" : "type-17597", ++ "referenced_type" : "type-17706", ++ "self_type" : "type-17720", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119684,8 +119726,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-17685", +- "self_type" : "type-17687", ++ "referenced_type" : "type-17923", ++ "self_type" : "type-17925", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119693,8 +119735,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-17827", +- "self_type" : "type-17830", ++ "referenced_type" : "type-18005", ++ "self_type" : "type-18007", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119702,8 +119744,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-17917", +- "self_type" : "type-17919", ++ "referenced_type" : "type-18098", ++ "self_type" : "type-18100", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119711,8 +119753,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18007", +- "self_type" : "type-18009", ++ "referenced_type" : "type-18263", ++ "self_type" : "type-18265", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119720,8 +119762,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18100", +- "self_type" : "type-18102", ++ "referenced_type" : "type-18368", ++ "self_type" : "type-18375", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119729,8 +119771,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18155", +- "self_type" : "type-18157", ++ "referenced_type" : "type-18463", ++ "self_type" : "type-18465", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119738,8 +119780,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18281", +- "self_type" : "type-18291", ++ "referenced_type" : "type-1851", ++ "self_type" : "type-1854", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119747,8 +119789,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18333", +- "self_type" : "type-18335", ++ "referenced_type" : "type-18605", ++ "self_type" : "type-18608", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119756,8 +119798,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18459", +- "self_type" : "type-18461", ++ "referenced_type" : "type-18695", ++ "self_type" : "type-18697", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119765,8 +119807,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-1851", +- "self_type" : "type-1854", ++ "referenced_type" : "type-18785", ++ "self_type" : "type-18787", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119774,8 +119816,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18537", +- "self_type" : "type-18544", ++ "referenced_type" : "type-18878", ++ "self_type" : "type-18880", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119783,8 +119825,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18601", +- "self_type" : "type-18603", ++ "referenced_type" : "type-18933", ++ "self_type" : "type-18935", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119792,8 +119834,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18683", +- "self_type" : "type-18685", ++ "referenced_type" : "type-19059", ++ "self_type" : "type-19069", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119801,8 +119843,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18808", +- "self_type" : "type-18810", ++ "referenced_type" : "type-19111", ++ "self_type" : "type-19113", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119810,8 +119852,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18877", +- "self_type" : "type-18887", ++ "referenced_type" : "type-19237", ++ "self_type" : "type-19239", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119819,8 +119861,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18920", +- "self_type" : "type-18922", ++ "referenced_type" : "type-19315", ++ "self_type" : "type-19322", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119828,8 +119870,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-19155", +- "self_type" : "type-19157", ++ "referenced_type" : "type-19379", ++ "self_type" : "type-19381", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119837,8 +119879,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-19351", +- "self_type" : "type-19353", ++ "referenced_type" : "type-19461", ++ "self_type" : "type-19463", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119846,8 +119888,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-19365", +- "self_type" : "type-19367", ++ "referenced_type" : "type-19586", ++ "self_type" : "type-19588", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119855,8 +119897,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-19546", +- "self_type" : "type-19548", ++ "referenced_type" : "type-19655", ++ "self_type" : "type-19665", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119864,8 +119906,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-19716", +- "self_type" : "type-19718", ++ "referenced_type" : "type-19698", ++ "self_type" : "type-19700", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119873,8 +119915,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-19825", +- "self_type" : "type-19828", ++ "referenced_type" : "type-19922", ++ "self_type" : "type-19924", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119882,8 +119924,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-20093", +- "self_type" : "type-20095", ++ "referenced_type" : "type-20097", ++ "self_type" : "type-20099", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119891,8 +119933,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-20368", +- "self_type" : "type-20370", ++ "referenced_type" : "type-20372", ++ "self_type" : "type-20374", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119900,8 +119942,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-20503", +- "self_type" : "type-20505", ++ "referenced_type" : "type-20510", ++ "self_type" : "type-20512", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119909,8 +119951,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-20634", +- "self_type" : "type-20636", ++ "referenced_type" : "type-20642", ++ "self_type" : "type-20644", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119918,8 +119960,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-20784", +- "self_type" : "type-20786", ++ "referenced_type" : "type-20792", ++ "self_type" : "type-20794", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119927,8 +119969,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-20868", +- "self_type" : "type-20870", ++ "referenced_type" : "type-20876", ++ "self_type" : "type-20878", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119936,8 +119978,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-20970", +- "self_type" : "type-20972", ++ "referenced_type" : "type-20978", ++ "self_type" : "type-20980", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119945,8 +119987,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21097", +- "self_type" : "type-21099", ++ "referenced_type" : "type-21105", ++ "self_type" : "type-21107", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119954,8 +119996,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21149", +- "self_type" : "type-21151", ++ "referenced_type" : "type-21157", ++ "self_type" : "type-21159", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119963,8 +120005,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21232", +- "self_type" : "type-21234", ++ "referenced_type" : "type-21240", ++ "self_type" : "type-21242", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119972,8 +120014,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21281", +- "self_type" : "type-21280", ++ "referenced_type" : "type-21289", ++ "self_type" : "type-21288", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119981,8 +120023,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21285", +- "self_type" : "type-21287", ++ "referenced_type" : "type-21293", ++ "self_type" : "type-21295", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119990,8 +120032,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21363", +- "self_type" : "type-21365", ++ "referenced_type" : "type-21371", ++ "self_type" : "type-21373", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119999,8 +120041,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21431", +- "self_type" : "type-21433", ++ "referenced_type" : "type-21439", ++ "self_type" : "type-21441", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120008,8 +120050,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21468", +- "self_type" : "type-21482", ++ "referenced_type" : "type-21476", ++ "self_type" : "type-21490", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120017,8 +120059,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21685", +- "self_type" : "type-21687", ++ "referenced_type" : "type-21693", ++ "self_type" : "type-21695", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120026,8 +120068,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21767", +- "self_type" : "type-21769", ++ "referenced_type" : "type-21775", ++ "self_type" : "type-21777", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120035,8 +120077,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21860", +- "self_type" : "type-21862", ++ "referenced_type" : "type-21868", ++ "self_type" : "type-21870", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121601,8 +121643,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *", + "name" : "const std::vector > *", +- "referenced_type" : "type-17808", +- "self_type" : "type-17807", ++ "referenced_type" : "type-18586", ++ "self_type" : "type-18585", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -121655,8 +121697,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *", + "name" : "const std::vector > *", +- "referenced_type" : "type-17802", +- "self_type" : "type-17801", ++ "referenced_type" : "type-18580", ++ "self_type" : "type-18579", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -122213,8 +122255,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-15584", +- "self_type" : "type-15583", ++ "referenced_type" : "type-15459", ++ "self_type" : "type-15458", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122222,8 +122264,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-15848", +- "self_type" : "type-15847", ++ "referenced_type" : "type-15608", ++ "self_type" : "type-15607", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122231,8 +122273,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-15968", +- "self_type" : "type-15967", ++ "referenced_type" : "type-15786", ++ "self_type" : "type-15785", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122240,8 +122282,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-16352", +- "self_type" : "type-16351", ++ "referenced_type" : "type-15956", ++ "self_type" : "type-15955", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122249,8 +122291,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-16454", +- "self_type" : "type-16453", ++ "referenced_type" : "type-16126", ++ "self_type" : "type-16125", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122258,8 +122300,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-16577", +- "self_type" : "type-16576", ++ "referenced_type" : "type-16357", ++ "self_type" : "type-16356", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122267,8 +122309,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-16631", +- "self_type" : "type-16630", ++ "referenced_type" : "type-16621", ++ "self_type" : "type-16620", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122276,8 +122318,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-16697", +- "self_type" : "type-16696", ++ "referenced_type" : "type-16739", ++ "self_type" : "type-16738", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122285,8 +122327,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-16771", +- "self_type" : "type-16770", ++ "referenced_type" : "type-17122", ++ "self_type" : "type-17121", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122294,8 +122336,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-16846", +- "self_type" : "type-16845", ++ "referenced_type" : "type-17224", ++ "self_type" : "type-17223", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122303,8 +122345,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-17038", +- "self_type" : "type-17037", ++ "referenced_type" : "type-17347", ++ "self_type" : "type-17346", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122312,8 +122354,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-17168", +- "self_type" : "type-17167", ++ "referenced_type" : "type-17401", ++ "self_type" : "type-17400", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122321,8 +122363,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-17246", +- "self_type" : "type-17245", ++ "referenced_type" : "type-17467", ++ "self_type" : "type-17466", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122330,8 +122372,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-17353", +- "self_type" : "type-17352", ++ "referenced_type" : "type-17541", ++ "self_type" : "type-17540", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122339,8 +122381,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-17596", +- "self_type" : "type-17595", ++ "referenced_type" : "type-17616", ++ "self_type" : "type-17615", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122348,8 +122390,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-17677", +- "self_type" : "type-17676", ++ "referenced_type" : "type-17808", ++ "self_type" : "type-17807", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122357,8 +122399,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-17843", +- "self_type" : "type-17842", ++ "referenced_type" : "type-17938", ++ "self_type" : "type-17937", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122366,8 +122408,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-17935", +- "self_type" : "type-17934", ++ "referenced_type" : "type-18016", ++ "self_type" : "type-18015", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122375,8 +122417,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-18026", +- "self_type" : "type-18025", ++ "referenced_type" : "type-18131", ++ "self_type" : "type-18130", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122384,8 +122426,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-18113", +- "self_type" : "type-18112", ++ "referenced_type" : "type-18374", ++ "self_type" : "type-18373", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122393,8 +122435,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-18178", +- "self_type" : "type-18177", ++ "referenced_type" : "type-18455", ++ "self_type" : "type-18454", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122402,8 +122444,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-18458", +- "self_type" : "type-18457", ++ "referenced_type" : "type-18621", ++ "self_type" : "type-18620", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122411,8 +122453,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-18597", +- "self_type" : "type-18596", ++ "referenced_type" : "type-18713", ++ "self_type" : "type-18712", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122420,8 +122462,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-18682", +- "self_type" : "type-18681", ++ "referenced_type" : "type-18804", ++ "self_type" : "type-18803", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122429,8 +122471,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-18873", +- "self_type" : "type-18872", ++ "referenced_type" : "type-18891", ++ "self_type" : "type-18890", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122447,8 +122489,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-18971", +- "self_type" : "type-18970", ++ "referenced_type" : "type-18956", ++ "self_type" : "type-18955", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122456,8 +122498,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-19214", +- "self_type" : "type-19213", ++ "referenced_type" : "type-19236", ++ "self_type" : "type-19235", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122465,8 +122507,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-19364", +- "self_type" : "type-19363", ++ "referenced_type" : "type-19375", ++ "self_type" : "type-19374", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122474,8 +122516,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-19542", +- "self_type" : "type-19541", ++ "referenced_type" : "type-19460", ++ "self_type" : "type-19459", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122483,8 +122525,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-19712", +- "self_type" : "type-19711", ++ "referenced_type" : "type-19651", ++ "self_type" : "type-19650", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122492,8 +122534,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-19882", +- "self_type" : "type-19881", ++ "referenced_type" : "type-19749", ++ "self_type" : "type-19748", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122501,8 +122543,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-20117", +- "self_type" : "type-20116", ++ "referenced_type" : "type-20121", ++ "self_type" : "type-20120", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122510,8 +122552,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-20382", +- "self_type" : "type-20381", ++ "referenced_type" : "type-20386", ++ "self_type" : "type-20385", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122519,8 +122561,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-20500", +- "self_type" : "type-20499", ++ "referenced_type" : "type-20507", ++ "self_type" : "type-20506", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122528,8 +122570,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-20883", +- "self_type" : "type-20882", ++ "referenced_type" : "type-20891", ++ "self_type" : "type-20890", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122537,8 +122579,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-20986", +- "self_type" : "type-20985", ++ "referenced_type" : "type-20994", ++ "self_type" : "type-20993", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122546,8 +122588,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-21109", +- "self_type" : "type-21108", ++ "referenced_type" : "type-21117", ++ "self_type" : "type-21116", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122555,8 +122597,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-21163", +- "self_type" : "type-21162", ++ "referenced_type" : "type-21171", ++ "self_type" : "type-21170", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122564,8 +122606,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-21229", +- "self_type" : "type-21228", ++ "referenced_type" : "type-21237", ++ "self_type" : "type-21236", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122573,8 +122615,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-21303", +- "self_type" : "type-21302", ++ "referenced_type" : "type-21311", ++ "self_type" : "type-21310", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122582,8 +122624,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-21378", +- "self_type" : "type-21377", ++ "referenced_type" : "type-21386", ++ "self_type" : "type-21385", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122591,8 +122633,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-21570", +- "self_type" : "type-21569", ++ "referenced_type" : "type-21578", ++ "self_type" : "type-21577", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122600,8 +122642,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-21700", +- "self_type" : "type-21699", ++ "referenced_type" : "type-21708", ++ "self_type" : "type-21707", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122609,8 +122651,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-21778", +- "self_type" : "type-21777", ++ "referenced_type" : "type-21786", ++ "self_type" : "type-21785", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -124058,8 +124100,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-15497", +- "self_type" : "type-15496", ++ "referenced_type" : "type-15434", ++ "self_type" : "type-15433", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124067,8 +124109,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-15808", +- "self_type" : "type-15807", ++ "referenced_type" : "type-15579", ++ "self_type" : "type-15578", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124076,8 +124118,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-15992", +- "self_type" : "type-15991", ++ "referenced_type" : "type-15746", ++ "self_type" : "type-15745", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124085,8 +124127,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16045", +- "self_type" : "type-16044", ++ "referenced_type" : "type-15923", ++ "self_type" : "type-15922", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124094,8 +124136,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16229", +- "self_type" : "type-16228", ++ "referenced_type" : "type-16083", ++ "self_type" : "type-16082", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124103,8 +124145,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16326", +- "self_type" : "type-16325", ++ "referenced_type" : "type-16270", ++ "self_type" : "type-16269", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124112,8 +124154,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16432", +- "self_type" : "type-16431", ++ "referenced_type" : "type-16581", ++ "self_type" : "type-16580", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124121,8 +124163,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16526", +- "self_type" : "type-16525", ++ "referenced_type" : "type-16763", ++ "self_type" : "type-16762", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124130,8 +124172,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16611", +- "self_type" : "type-16610", ++ "referenced_type" : "type-16816", ++ "self_type" : "type-16815", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124139,8 +124181,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16678", +- "self_type" : "type-16677", ++ "referenced_type" : "type-16999", ++ "self_type" : "type-16998", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124148,8 +124190,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16740", +- "self_type" : "type-16739", ++ "referenced_type" : "type-17096", ++ "self_type" : "type-17095", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124157,8 +124199,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16820", +- "self_type" : "type-16819", ++ "referenced_type" : "type-17202", ++ "self_type" : "type-17201", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124166,8 +124208,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16903", +- "self_type" : "type-16902", ++ "referenced_type" : "type-17296", ++ "self_type" : "type-17295", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124175,8 +124217,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-17134", +- "self_type" : "type-17133", ++ "referenced_type" : "type-1735", ++ "self_type" : "type-1734", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124184,8 +124226,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-17229", +- "self_type" : "type-17228", ++ "referenced_type" : "type-17381", ++ "self_type" : "type-17380", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124193,8 +124235,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-17322", +- "self_type" : "type-17321", ++ "referenced_type" : "type-17448", ++ "self_type" : "type-17447", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124202,8 +124244,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-1735", +- "self_type" : "type-1734", ++ "referenced_type" : "type-17510", ++ "self_type" : "type-17509", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124211,8 +124253,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-17473", +- "self_type" : "type-17472", ++ "referenced_type" : "type-17590", ++ "self_type" : "type-17589", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124220,8 +124262,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-17653", +- "self_type" : "type-17652", ++ "referenced_type" : "type-17673", ++ "self_type" : "type-17672", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124229,8 +124271,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-17818", +- "self_type" : "type-17817", ++ "referenced_type" : "type-17904", ++ "self_type" : "type-17903", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124238,8 +124280,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-17900", +- "self_type" : "type-17899", ++ "referenced_type" : "type-17999", ++ "self_type" : "type-17998", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124247,8 +124289,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-17994", +- "self_type" : "type-17993", ++ "referenced_type" : "type-18092", ++ "self_type" : "type-18091", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124256,8 +124298,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-18089", +- "self_type" : "type-18088", ++ "referenced_type" : "type-18251", ++ "self_type" : "type-18250", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124265,8 +124307,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-18147", +- "self_type" : "type-18146", ++ "referenced_type" : "type-18431", ++ "self_type" : "type-18430", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124274,8 +124316,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-18310", +- "self_type" : "type-18309", ++ "referenced_type" : "type-18596", ++ "self_type" : "type-18595", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124283,8 +124325,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-18431", +- "self_type" : "type-18430", ++ "referenced_type" : "type-18678", ++ "self_type" : "type-18677", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124292,8 +124334,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-18612", +- "self_type" : "type-18611", ++ "referenced_type" : "type-18772", ++ "self_type" : "type-18771", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124301,8 +124343,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-18687", +- "self_type" : "type-18686", ++ "referenced_type" : "type-18867", ++ "self_type" : "type-18866", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124310,8 +124352,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-18778", +- "self_type" : "type-18777", ++ "referenced_type" : "type-18925", ++ "self_type" : "type-18924", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124319,8 +124361,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-18931", +- "self_type" : "type-18930", ++ "referenced_type" : "type-19088", ++ "self_type" : "type-19087", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124328,8 +124370,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-19189", +- "self_type" : "type-19188", ++ "referenced_type" : "type-19209", ++ "self_type" : "type-19208", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124337,8 +124379,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-19335", +- "self_type" : "type-19334", ++ "referenced_type" : "type-19390", ++ "self_type" : "type-19389", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124346,8 +124388,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-19502", +- "self_type" : "type-19501", ++ "referenced_type" : "type-19465", ++ "self_type" : "type-19464", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124355,8 +124397,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-19679", +- "self_type" : "type-19678", ++ "referenced_type" : "type-19556", ++ "self_type" : "type-19555", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124364,8 +124406,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-19839", +- "self_type" : "type-19838", ++ "referenced_type" : "type-19709", ++ "self_type" : "type-19708", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124373,8 +124415,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-20030", +- "self_type" : "type-20029", ++ "referenced_type" : "type-20034", ++ "self_type" : "type-20033", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124382,8 +124424,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-20342", +- "self_type" : "type-20341", ++ "referenced_type" : "type-20346", ++ "self_type" : "type-20345", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124391,8 +124433,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-20524", +- "self_type" : "type-20523", ++ "referenced_type" : "type-20531", ++ "self_type" : "type-20530", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124400,8 +124442,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-20577", +- "self_type" : "type-20576", ++ "referenced_type" : "type-20584", ++ "self_type" : "type-20583", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124409,8 +124451,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-20760", +- "self_type" : "type-20759", ++ "referenced_type" : "type-20768", ++ "self_type" : "type-20767", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124418,8 +124460,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-20857", +- "self_type" : "type-20856", ++ "referenced_type" : "type-20865", ++ "self_type" : "type-20864", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124427,8 +124469,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-20963", +- "self_type" : "type-20962", ++ "referenced_type" : "type-20971", ++ "self_type" : "type-20970", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124436,8 +124478,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-21058", +- "self_type" : "type-21057", ++ "referenced_type" : "type-21066", ++ "self_type" : "type-21065", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124445,8 +124487,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-21143", +- "self_type" : "type-21142", ++ "referenced_type" : "type-21151", ++ "self_type" : "type-21150", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124454,8 +124496,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-21210", +- "self_type" : "type-21209", ++ "referenced_type" : "type-21218", ++ "self_type" : "type-21217", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124463,8 +124505,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-21272", +- "self_type" : "type-21271", ++ "referenced_type" : "type-21280", ++ "self_type" : "type-21279", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124472,8 +124514,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-21352", +- "self_type" : "type-21351", ++ "referenced_type" : "type-21360", ++ "self_type" : "type-21359", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124481,8 +124523,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-21435", +- "self_type" : "type-21434", ++ "referenced_type" : "type-21443", ++ "self_type" : "type-21442", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124490,8 +124532,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-21666", +- "self_type" : "type-21665", ++ "referenced_type" : "type-21674", ++ "self_type" : "type-21673", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124499,8 +124541,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-21761", +- "self_type" : "type-21760", ++ "referenced_type" : "type-21769", ++ "self_type" : "type-21768", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124508,8 +124550,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-21854", +- "self_type" : "type-21853", ++ "referenced_type" : "type-21862", ++ "self_type" : "type-21861", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125768,8 +125810,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-16060", +- "self_type" : "type-16059", ++ "referenced_type" : "type-16831", ++ "self_type" : "type-16830", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125777,8 +125819,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-16528", +- "self_type" : "type-16527", ++ "referenced_type" : "type-17298", ++ "self_type" : "type-17297", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125786,8 +125828,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-17668", +- "self_type" : "type-17667", ++ "referenced_type" : "type-18446", ++ "self_type" : "type-18445", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125795,8 +125837,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-20592", +- "self_type" : "type-20591", ++ "referenced_type" : "type-20599", ++ "self_type" : "type-20598", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125804,8 +125846,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-21060", +- "self_type" : "type-21059", ++ "referenced_type" : "type-21068", ++ "self_type" : "type-21067", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -126308,8 +126350,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-16517", +- "self_type" : "type-16516", ++ "referenced_type" : "type-17287", ++ "self_type" : "type-17286", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126317,8 +126359,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-16835", +- "self_type" : "type-16834", ++ "referenced_type" : "type-17605", ++ "self_type" : "type-17604", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126326,8 +126368,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-17157", +- "self_type" : "type-17156", ++ "referenced_type" : "type-17927", ++ "self_type" : "type-17926", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126335,8 +126377,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-17497", +- "self_type" : "type-17496", ++ "referenced_type" : "type-18275", ++ "self_type" : "type-18274", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126344,8 +126386,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-18814", +- "self_type" : "type-18813", ++ "referenced_type" : "type-19592", ++ "self_type" : "type-19591", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126353,8 +126395,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-21049", +- "self_type" : "type-21048", ++ "referenced_type" : "type-21057", ++ "self_type" : "type-21056", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126362,8 +126404,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-21367", +- "self_type" : "type-21366", ++ "referenced_type" : "type-21375", ++ "self_type" : "type-21374", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126371,8 +126413,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-21689", +- "self_type" : "type-21688", ++ "referenced_type" : "type-21697", ++ "self_type" : "type-21696", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -127208,8 +127250,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-15705", +- "self_type" : "type-15704", ++ "referenced_type" : "type-15466", ++ "self_type" : "type-15465", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127217,8 +127259,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-15875", +- "self_type" : "type-15874", ++ "referenced_type" : "type-15616", ++ "self_type" : "type-15615", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127226,8 +127268,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-15978", +- "self_type" : "type-15977", ++ "referenced_type" : "type-15803", ++ "self_type" : "type-15802", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127235,8 +127277,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-16117", +- "self_type" : "type-16116", ++ "referenced_type" : "type-15974", ++ "self_type" : "type-15973", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127244,8 +127286,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-16266", +- "self_type" : "type-16265", ++ "referenced_type" : "type-16133", ++ "self_type" : "type-16132", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127253,8 +127295,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-16359", +- "self_type" : "type-16358", ++ "referenced_type" : "type-16478", ++ "self_type" : "type-16477", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127262,8 +127304,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-16459", +- "self_type" : "type-16458", ++ "referenced_type" : "type-16648", ++ "self_type" : "type-16647", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127271,8 +127313,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-16641", +- "self_type" : "type-16640", ++ "referenced_type" : "type-16749", ++ "self_type" : "type-16748", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127280,8 +127322,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-16721", +- "self_type" : "type-16720", ++ "referenced_type" : "type-16887", ++ "self_type" : "type-16886", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127289,8 +127331,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-16779", +- "self_type" : "type-16778", ++ "referenced_type" : "type-17036", ++ "self_type" : "type-17035", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127298,8 +127340,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-17251", +- "self_type" : "type-17250", ++ "referenced_type" : "type-17129", ++ "self_type" : "type-17128", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127307,8 +127349,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-17358", +- "self_type" : "type-17357", ++ "referenced_type" : "type-17229", ++ "self_type" : "type-17228", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127316,8 +127358,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-17700", +- "self_type" : "type-17699", ++ "referenced_type" : "type-17411", ++ "self_type" : "type-17410", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127325,8 +127367,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-17858", +- "self_type" : "type-17857", ++ "referenced_type" : "type-17491", ++ "self_type" : "type-17490", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127334,8 +127376,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-17946", +- "self_type" : "type-17945", ++ "referenced_type" : "type-17549", ++ "self_type" : "type-17548", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127343,8 +127385,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-18036", +- "self_type" : "type-18035", ++ "referenced_type" : "type-18021", ++ "self_type" : "type-18020", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127352,8 +127394,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-18119", +- "self_type" : "type-18118", ++ "referenced_type" : "type-18136", ++ "self_type" : "type-18135", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127361,8 +127403,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-18186", +- "self_type" : "type-18185", ++ "referenced_type" : "type-18478", ++ "self_type" : "type-18477", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127370,8 +127412,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-18348", +- "self_type" : "type-18347", ++ "referenced_type" : "type-18636", ++ "self_type" : "type-18635", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127379,8 +127421,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-18473", +- "self_type" : "type-18472", ++ "referenced_type" : "type-18724", ++ "self_type" : "type-18723", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127388,8 +127430,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-18608", +- "self_type" : "type-18607", ++ "referenced_type" : "type-18814", ++ "self_type" : "type-18813", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127397,8 +127439,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-18699", +- "self_type" : "type-18698", ++ "referenced_type" : "type-18897", ++ "self_type" : "type-18896", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127406,8 +127448,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-18978", +- "self_type" : "type-18977", ++ "referenced_type" : "type-18964", ++ "self_type" : "type-18963", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127415,8 +127457,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-19221", +- "self_type" : "type-19220", ++ "referenced_type" : "type-19126", ++ "self_type" : "type-19125", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127424,8 +127466,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-19372", +- "self_type" : "type-19371", ++ "referenced_type" : "type-19251", ++ "self_type" : "type-19250", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127433,8 +127475,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-19559", +- "self_type" : "type-19558", ++ "referenced_type" : "type-19386", ++ "self_type" : "type-19385", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127442,8 +127484,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-19730", +- "self_type" : "type-19729", ++ "referenced_type" : "type-19477", ++ "self_type" : "type-19476", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127451,8 +127493,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-19889", +- "self_type" : "type-19888", ++ "referenced_type" : "type-19756", ++ "self_type" : "type-19755", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127460,8 +127502,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-20238", +- "self_type" : "type-20237", ++ "referenced_type" : "type-20242", ++ "self_type" : "type-20241", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127469,8 +127511,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-20409", +- "self_type" : "type-20408", ++ "referenced_type" : "type-20413", ++ "self_type" : "type-20412", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127478,8 +127520,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-20510", +- "self_type" : "type-20509", ++ "referenced_type" : "type-20517", ++ "self_type" : "type-20516", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127487,8 +127529,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-20648", +- "self_type" : "type-20647", ++ "referenced_type" : "type-20656", ++ "self_type" : "type-20655", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127496,8 +127538,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-20797", +- "self_type" : "type-20796", ++ "referenced_type" : "type-2080", ++ "self_type" : "type-2079", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127505,8 +127547,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-2080", +- "self_type" : "type-2079", ++ "referenced_type" : "type-20805", ++ "self_type" : "type-20804", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127514,8 +127556,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-20890", +- "self_type" : "type-20889", ++ "referenced_type" : "type-20898", ++ "self_type" : "type-20897", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127523,8 +127565,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-20991", +- "self_type" : "type-20990", ++ "referenced_type" : "type-20999", ++ "self_type" : "type-20998", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127532,8 +127574,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-21173", +- "self_type" : "type-21172", ++ "referenced_type" : "type-21181", ++ "self_type" : "type-21180", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127541,8 +127583,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-21253", +- "self_type" : "type-21252", ++ "referenced_type" : "type-21261", ++ "self_type" : "type-21260", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127550,8 +127592,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-21311", +- "self_type" : "type-21310", ++ "referenced_type" : "type-21319", ++ "self_type" : "type-21318", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127559,8 +127601,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-21783", +- "self_type" : "type-21782", ++ "referenced_type" : "type-21791", ++ "self_type" : "type-21790", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128648,8 +128690,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-16872", +- "self_type" : "type-16871", ++ "referenced_type" : "type-17642", ++ "self_type" : "type-17641", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128657,8 +128699,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-17332", +- "self_type" : "type-17331", ++ "referenced_type" : "type-18102", ++ "self_type" : "type-18101", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128666,8 +128708,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-18463", +- "self_type" : "type-18462", ++ "referenced_type" : "type-19241", ++ "self_type" : "type-19240", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128675,8 +128717,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-18792", +- "self_type" : "type-18791", ++ "referenced_type" : "type-19570", ++ "self_type" : "type-19569", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128684,8 +128726,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-21404", +- "self_type" : "type-21403", ++ "referenced_type" : "type-21412", ++ "self_type" : "type-21411", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128693,8 +128735,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-21864", +- "self_type" : "type-21863", ++ "referenced_type" : "type-21872", ++ "self_type" : "type-21871", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -129017,8 +129059,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-15379", +- "self_type" : "type-15378", ++ "referenced_type" : "type-15421", ++ "self_type" : "type-15420", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129026,8 +129068,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-15403", +- "self_type" : "type-15402", ++ "referenced_type" : "type-15744", ++ "self_type" : "type-15743", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129035,8 +129077,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-17914", +- "self_type" : "type-17913", ++ "referenced_type" : "type-18692", ++ "self_type" : "type-18691", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129044,8 +129086,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-18343", +- "self_type" : "type-18342", ++ "referenced_type" : "type-19121", ++ "self_type" : "type-19120", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129053,8 +129095,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-19176", +- "self_type" : "type-19175", ++ "referenced_type" : "type-19912", ++ "self_type" : "type-19911", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129062,8 +129104,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-19500", +- "self_type" : "type-19499", ++ "referenced_type" : "type-19936", ++ "self_type" : "type-19935", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129710,8 +129752,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-15721", +- "self_type" : "type-15720", ++ "referenced_type" : "type-15489", ++ "self_type" : "type-15488", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129719,8 +129761,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-15892", +- "self_type" : "type-15891", ++ "referenced_type" : "type-15637", ++ "self_type" : "type-15636", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129728,8 +129770,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16154", +- "self_type" : "type-16153", ++ "referenced_type" : "type-15834", ++ "self_type" : "type-15833", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129737,8 +129779,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16277", +- "self_type" : "type-16276", ++ "referenced_type" : "type-16004", ++ "self_type" : "type-16003", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129746,8 +129788,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16417", +- "self_type" : "type-16416", ++ "referenced_type" : "type-16159", ++ "self_type" : "type-16158", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129755,8 +129797,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16474", +- "self_type" : "type-16473", ++ "referenced_type" : "type-16494", ++ "self_type" : "type-16493", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129764,8 +129806,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16654", +- "self_type" : "type-16653", ++ "referenced_type" : "type-16665", ++ "self_type" : "type-16664", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129773,8 +129815,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16792", +- "self_type" : "type-16791", ++ "referenced_type" : "type-16924", ++ "self_type" : "type-16923", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129782,8 +129824,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17277", +- "self_type" : "type-17276", ++ "referenced_type" : "type-17047", ++ "self_type" : "type-17046", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129791,8 +129833,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17371", +- "self_type" : "type-17370", ++ "referenced_type" : "type-17187", ++ "self_type" : "type-17186", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129800,8 +129842,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17417", +- "self_type" : "type-17416", ++ "referenced_type" : "type-17244", ++ "self_type" : "type-17243", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129809,8 +129851,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17751", +- "self_type" : "type-17750", ++ "referenced_type" : "type-17424", ++ "self_type" : "type-17423", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129818,8 +129860,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17874", +- "self_type" : "type-17873", ++ "referenced_type" : "type-17562", ++ "self_type" : "type-17561", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129827,8 +129869,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17967", +- "self_type" : "type-17966", ++ "referenced_type" : "type-18047", ++ "self_type" : "type-18046", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129836,8 +129878,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18057", +- "self_type" : "type-18056", ++ "referenced_type" : "type-18149", ++ "self_type" : "type-18148", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129845,8 +129887,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18130", +- "self_type" : "type-18129", ++ "referenced_type" : "type-18195", ++ "self_type" : "type-18194", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129854,8 +129896,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18216", +- "self_type" : "type-18215", ++ "referenced_type" : "type-18529", ++ "self_type" : "type-18528", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129863,8 +129905,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18369", +- "self_type" : "type-18368", ++ "referenced_type" : "type-18652", ++ "self_type" : "type-18651", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129872,8 +129914,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18497", +- "self_type" : "type-18496", ++ "referenced_type" : "type-18745", ++ "self_type" : "type-18744", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129881,8 +129923,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18725", +- "self_type" : "type-18724", ++ "referenced_type" : "type-18835", ++ "self_type" : "type-18834", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129890,8 +129932,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18880", +- "self_type" : "type-18879", ++ "referenced_type" : "type-18908", ++ "self_type" : "type-18907", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129899,8 +129941,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19005", +- "self_type" : "type-19004", ++ "referenced_type" : "type-18994", ++ "self_type" : "type-18993", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129908,8 +129950,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19244", +- "self_type" : "type-19243", ++ "referenced_type" : "type-19147", ++ "self_type" : "type-19146", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129917,8 +129959,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19393", +- "self_type" : "type-19392", ++ "referenced_type" : "type-19275", ++ "self_type" : "type-19274", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129926,8 +129968,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19590", +- "self_type" : "type-19589", ++ "referenced_type" : "type-19503", ++ "self_type" : "type-19502", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129935,8 +129977,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19760", +- "self_type" : "type-19759", ++ "referenced_type" : "type-19658", ++ "self_type" : "type-19657", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129944,8 +129986,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19915", +- "self_type" : "type-19914", ++ "referenced_type" : "type-19783", ++ "self_type" : "type-19782", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129953,8 +129995,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20255", +- "self_type" : "type-20254", ++ "referenced_type" : "type-20259", ++ "self_type" : "type-20258", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129962,8 +130004,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20426", +- "self_type" : "type-20425", ++ "referenced_type" : "type-20430", ++ "self_type" : "type-20429", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129971,8 +130013,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20685", +- "self_type" : "type-20684", ++ "referenced_type" : "type-20693", ++ "self_type" : "type-20692", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129980,8 +130022,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20808", +- "self_type" : "type-20807", ++ "referenced_type" : "type-20816", ++ "self_type" : "type-20815", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129989,8 +130031,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20948", +- "self_type" : "type-20947", ++ "referenced_type" : "type-20956", ++ "self_type" : "type-20955", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129998,8 +130040,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-21006", +- "self_type" : "type-21005", ++ "referenced_type" : "type-21014", ++ "self_type" : "type-21013", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130016,8 +130058,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-21186", +- "self_type" : "type-21185", ++ "referenced_type" : "type-21194", ++ "self_type" : "type-21193", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130025,8 +130067,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-21324", +- "self_type" : "type-21323", ++ "referenced_type" : "type-21332", ++ "self_type" : "type-21331", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130034,8 +130076,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-21809", +- "self_type" : "type-21808", ++ "referenced_type" : "type-21817", ++ "self_type" : "type-21816", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131051,8 +131093,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16152", +- "self_type" : "type-16151", ++ "referenced_type" : "type-15487", ++ "self_type" : "type-15486", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131060,8 +131102,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17275", +- "self_type" : "type-17274", ++ "referenced_type" : "type-15635", ++ "self_type" : "type-15634", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131069,8 +131111,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17749", +- "self_type" : "type-17748", ++ "referenced_type" : "type-15832", ++ "self_type" : "type-15831", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131078,8 +131120,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18055", +- "self_type" : "type-18054", ++ "referenced_type" : "type-16000", ++ "self_type" : "type-15999", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131087,8 +131129,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18367", +- "self_type" : "type-18366", ++ "referenced_type" : "type-16157", ++ "self_type" : "type-16156", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131096,8 +131138,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18495", +- "self_type" : "type-18494", ++ "referenced_type" : "type-16922", ++ "self_type" : "type-16921", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131105,8 +131147,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18722", +- "self_type" : "type-18721", ++ "referenced_type" : "type-18045", ++ "self_type" : "type-18044", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131114,8 +131156,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19003", +- "self_type" : "type-19002", ++ "referenced_type" : "type-18527", ++ "self_type" : "type-18526", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131123,8 +131165,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19242", +- "self_type" : "type-19241", ++ "referenced_type" : "type-18833", ++ "self_type" : "type-18832", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131132,8 +131174,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19391", +- "self_type" : "type-19390", ++ "referenced_type" : "type-19145", ++ "self_type" : "type-19144", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131141,8 +131183,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19588", +- "self_type" : "type-19587", ++ "referenced_type" : "type-19273", ++ "self_type" : "type-19272", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131150,8 +131192,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19756", +- "self_type" : "type-19755", ++ "referenced_type" : "type-19500", ++ "self_type" : "type-19499", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131159,8 +131201,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19913", +- "self_type" : "type-19912", ++ "referenced_type" : "type-19781", ++ "self_type" : "type-19780", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131168,8 +131210,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20683", +- "self_type" : "type-20682", ++ "referenced_type" : "type-20691", ++ "self_type" : "type-20690", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131177,8 +131219,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-21807", +- "self_type" : "type-21806", ++ "referenced_type" : "type-21815", ++ "self_type" : "type-21814", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131699,8 +131741,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16150", +- "self_type" : "type-16149", ++ "referenced_type" : "type-15485", ++ "self_type" : "type-15484", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131708,8 +131750,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17273", +- "self_type" : "type-17272", ++ "referenced_type" : "type-15633", ++ "self_type" : "type-15632", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131717,8 +131759,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17747", +- "self_type" : "type-17746", ++ "referenced_type" : "type-15829", ++ "self_type" : "type-15828", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131726,8 +131768,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18053", +- "self_type" : "type-18052", ++ "referenced_type" : "type-15998", ++ "self_type" : "type-15997", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131735,8 +131777,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18365", +- "self_type" : "type-18364", ++ "referenced_type" : "type-16155", ++ "self_type" : "type-16154", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131744,8 +131786,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18493", +- "self_type" : "type-18492", ++ "referenced_type" : "type-16920", ++ "self_type" : "type-16919", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131753,8 +131795,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18720", +- "self_type" : "type-18719", ++ "referenced_type" : "type-18043", ++ "self_type" : "type-18042", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131762,8 +131804,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19001", +- "self_type" : "type-19000", ++ "referenced_type" : "type-18525", ++ "self_type" : "type-18524", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131771,8 +131813,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19240", +- "self_type" : "type-19239", ++ "referenced_type" : "type-18831", ++ "self_type" : "type-18830", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131780,8 +131822,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19389", +- "self_type" : "type-19388", ++ "referenced_type" : "type-19143", ++ "self_type" : "type-19142", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131789,8 +131831,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19585", +- "self_type" : "type-19584", ++ "referenced_type" : "type-19271", ++ "self_type" : "type-19270", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131798,8 +131840,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19754", +- "self_type" : "type-19753", ++ "referenced_type" : "type-19498", ++ "self_type" : "type-19497", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131807,8 +131849,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19911", +- "self_type" : "type-19910", ++ "referenced_type" : "type-19779", ++ "self_type" : "type-19778", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131816,8 +131858,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20681", +- "self_type" : "type-20680", ++ "referenced_type" : "type-20689", ++ "self_type" : "type-20688", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131825,8 +131867,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-21805", +- "self_type" : "type-21804", ++ "referenced_type" : "type-21813", ++ "self_type" : "type-21812", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132248,8 +132290,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18712", +- "self_type" : "type-18711", ++ "referenced_type" : "type-15477", ++ "self_type" : "type-15476", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132257,8 +132299,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18993", +- "self_type" : "type-18992", ++ "referenced_type" : "type-15821", ++ "self_type" : "type-15820", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132266,8 +132308,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19232", +- "self_type" : "type-19231", ++ "referenced_type" : "type-15989", ++ "self_type" : "type-15988", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132275,8 +132317,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19577", +- "self_type" : "type-19576", ++ "referenced_type" : "type-16147", ++ "self_type" : "type-16146", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132284,8 +132326,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19745", +- "self_type" : "type-19744", ++ "referenced_type" : "type-19490", ++ "self_type" : "type-19489", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132293,8 +132335,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19903", +- "self_type" : "type-19902", ++ "referenced_type" : "type-19771", ++ "self_type" : "type-19770", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132599,8 +132641,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16144", +- "self_type" : "type-16143", ++ "referenced_type" : "type-15479", ++ "self_type" : "type-15478", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132608,8 +132650,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17267", +- "self_type" : "type-17266", ++ "referenced_type" : "type-15627", ++ "self_type" : "type-15626", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132617,8 +132659,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17740", +- "self_type" : "type-17739", ++ "referenced_type" : "type-15823", ++ "self_type" : "type-15822", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132626,8 +132668,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18047", +- "self_type" : "type-18046", ++ "referenced_type" : "type-15992", ++ "self_type" : "type-15991", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132635,8 +132677,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18359", +- "self_type" : "type-18358", ++ "referenced_type" : "type-16149", ++ "self_type" : "type-16148", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132644,8 +132686,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18487", +- "self_type" : "type-18486", ++ "referenced_type" : "type-16914", ++ "self_type" : "type-16913", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132653,8 +132695,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18714", +- "self_type" : "type-18713", ++ "referenced_type" : "type-18037", ++ "self_type" : "type-18036", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132662,8 +132704,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18995", +- "self_type" : "type-18994", ++ "referenced_type" : "type-18518", ++ "self_type" : "type-18517", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132671,8 +132713,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19234", +- "self_type" : "type-19233", ++ "referenced_type" : "type-18825", ++ "self_type" : "type-18824", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132680,8 +132722,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19383", +- "self_type" : "type-19382", ++ "referenced_type" : "type-19137", ++ "self_type" : "type-19136", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132689,8 +132731,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19579", +- "self_type" : "type-19578", ++ "referenced_type" : "type-19265", ++ "self_type" : "type-19264", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132698,8 +132740,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19748", +- "self_type" : "type-19747", ++ "referenced_type" : "type-19492", ++ "self_type" : "type-19491", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132707,8 +132749,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19905", +- "self_type" : "type-19904", ++ "referenced_type" : "type-19773", ++ "self_type" : "type-19772", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132716,8 +132758,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20675", +- "self_type" : "type-20674", ++ "referenced_type" : "type-20683", ++ "self_type" : "type-20682", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132725,8 +132767,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-21799", +- "self_type" : "type-21798", ++ "referenced_type" : "type-21807", ++ "self_type" : "type-21806", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133247,8 +133289,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16146", +- "self_type" : "type-16145", ++ "referenced_type" : "type-15481", ++ "self_type" : "type-15480", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133256,8 +133298,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17269", +- "self_type" : "type-17268", ++ "referenced_type" : "type-15629", ++ "self_type" : "type-15628", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133265,8 +133307,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17742", +- "self_type" : "type-17741", ++ "referenced_type" : "type-15825", ++ "self_type" : "type-15824", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133274,8 +133316,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18049", +- "self_type" : "type-18048", ++ "referenced_type" : "type-15994", ++ "self_type" : "type-15993", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133283,8 +133325,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18361", +- "self_type" : "type-18360", ++ "referenced_type" : "type-16151", ++ "self_type" : "type-16150", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133292,8 +133334,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18489", +- "self_type" : "type-18488", ++ "referenced_type" : "type-16916", ++ "self_type" : "type-16915", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133301,8 +133343,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18716", +- "self_type" : "type-18715", ++ "referenced_type" : "type-18039", ++ "self_type" : "type-18038", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133310,8 +133352,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18997", +- "self_type" : "type-18996", ++ "referenced_type" : "type-18520", ++ "self_type" : "type-18519", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133319,8 +133361,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19236", +- "self_type" : "type-19235", ++ "referenced_type" : "type-18827", ++ "self_type" : "type-18826", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133328,8 +133370,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19385", +- "self_type" : "type-19384", ++ "referenced_type" : "type-19139", ++ "self_type" : "type-19138", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133337,8 +133379,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19581", +- "self_type" : "type-19580", ++ "referenced_type" : "type-19267", ++ "self_type" : "type-19266", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133346,8 +133388,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19750", +- "self_type" : "type-19749", ++ "referenced_type" : "type-19494", ++ "self_type" : "type-19493", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133355,8 +133397,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19907", +- "self_type" : "type-19906", ++ "referenced_type" : "type-19775", ++ "self_type" : "type-19774", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133364,8 +133406,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20677", +- "self_type" : "type-20676", ++ "referenced_type" : "type-20685", ++ "self_type" : "type-20684", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133373,8 +133415,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-21801", +- "self_type" : "type-21800", ++ "referenced_type" : "type-21809", ++ "self_type" : "type-21808", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133895,8 +133937,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16148", +- "self_type" : "type-16147", ++ "referenced_type" : "type-15483", ++ "self_type" : "type-15482", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133904,8 +133946,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17271", +- "self_type" : "type-17270", ++ "referenced_type" : "type-15631", ++ "self_type" : "type-15630", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133913,8 +133955,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17745", +- "self_type" : "type-17744", ++ "referenced_type" : "type-15827", ++ "self_type" : "type-15826", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133922,8 +133964,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18051", +- "self_type" : "type-18050", ++ "referenced_type" : "type-15996", ++ "self_type" : "type-15995", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133931,8 +133973,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18363", +- "self_type" : "type-18362", ++ "referenced_type" : "type-16153", ++ "self_type" : "type-16152", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133940,8 +133982,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18491", +- "self_type" : "type-18490", ++ "referenced_type" : "type-16918", ++ "self_type" : "type-16917", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133949,8 +133991,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18718", +- "self_type" : "type-18717", ++ "referenced_type" : "type-18041", ++ "self_type" : "type-18040", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133958,8 +134000,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18999", +- "self_type" : "type-18998", ++ "referenced_type" : "type-18523", ++ "self_type" : "type-18522", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133967,8 +134009,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19238", +- "self_type" : "type-19237", ++ "referenced_type" : "type-18829", ++ "self_type" : "type-18828", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133976,8 +134018,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19387", +- "self_type" : "type-19386", ++ "referenced_type" : "type-19141", ++ "self_type" : "type-19140", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133985,8 +134027,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19583", +- "self_type" : "type-19582", ++ "referenced_type" : "type-19269", ++ "self_type" : "type-19268", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133994,8 +134036,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19752", +- "self_type" : "type-19751", ++ "referenced_type" : "type-19496", ++ "self_type" : "type-19495", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134003,8 +134045,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19909", +- "self_type" : "type-19908", ++ "referenced_type" : "type-19777", ++ "self_type" : "type-19776", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134012,8 +134054,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20679", +- "self_type" : "type-20678", ++ "referenced_type" : "type-20687", ++ "self_type" : "type-20686", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134021,8 +134063,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-21803", +- "self_type" : "type-21802", ++ "referenced_type" : "type-21811", ++ "self_type" : "type-21810", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134804,8 +134846,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-15713", +- "self_type" : "type-15712", ++ "referenced_type" : "type-15473", ++ "self_type" : "type-15472", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134813,8 +134855,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-15882", +- "self_type" : "type-15881", ++ "referenced_type" : "type-15623", ++ "self_type" : "type-15622", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134822,8 +134864,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-15990", +- "self_type" : "type-15989", ++ "referenced_type" : "type-15811", ++ "self_type" : "type-15810", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134831,8 +134873,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16124", +- "self_type" : "type-16123", ++ "referenced_type" : "type-15982", ++ "self_type" : "type-15981", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134840,8 +134882,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16273", +- "self_type" : "type-16272", ++ "referenced_type" : "type-16141", ++ "self_type" : "type-16140", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134849,8 +134891,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16366", +- "self_type" : "type-16365", ++ "referenced_type" : "type-16486", ++ "self_type" : "type-16485", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134858,8 +134900,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16466", +- "self_type" : "type-16465", ++ "referenced_type" : "type-16655", ++ "self_type" : "type-16654", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134867,8 +134909,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16648", +- "self_type" : "type-16647", ++ "referenced_type" : "type-16761", ++ "self_type" : "type-16760", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134876,8 +134918,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16728", +- "self_type" : "type-16727", ++ "referenced_type" : "type-16894", ++ "self_type" : "type-16893", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134885,8 +134927,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16786", +- "self_type" : "type-16785", ++ "referenced_type" : "type-17043", ++ "self_type" : "type-17042", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134894,8 +134936,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16860", +- "self_type" : "type-16859", ++ "referenced_type" : "type-17136", ++ "self_type" : "type-17135", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134903,8 +134945,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17258", +- "self_type" : "type-17257", ++ "referenced_type" : "type-17236", ++ "self_type" : "type-17235", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134912,8 +134954,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17365", +- "self_type" : "type-17364", ++ "referenced_type" : "type-17418", ++ "self_type" : "type-17417", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134921,8 +134963,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17865", +- "self_type" : "type-17864", ++ "referenced_type" : "type-17498", ++ "self_type" : "type-17497", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134930,8 +134972,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17953", +- "self_type" : "type-17952", ++ "referenced_type" : "type-17556", ++ "self_type" : "type-17555", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134939,8 +134981,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18043", +- "self_type" : "type-18042", ++ "referenced_type" : "type-17630", ++ "self_type" : "type-17629", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134948,8 +134990,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18126", +- "self_type" : "type-18125", ++ "referenced_type" : "type-18028", ++ "self_type" : "type-18027", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134957,8 +134999,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18193", +- "self_type" : "type-18192", ++ "referenced_type" : "type-18143", ++ "self_type" : "type-18142", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134966,8 +135008,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18355", +- "self_type" : "type-18354", ++ "referenced_type" : "type-18643", ++ "self_type" : "type-18642", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134975,8 +135017,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18480", +- "self_type" : "type-18479", ++ "referenced_type" : "type-18731", ++ "self_type" : "type-18730", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134984,8 +135026,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18622", +- "self_type" : "type-18621", ++ "referenced_type" : "type-18821", ++ "self_type" : "type-18820", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134993,8 +135035,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18706", +- "self_type" : "type-18705", ++ "referenced_type" : "type-18904", ++ "self_type" : "type-18903", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135002,8 +135044,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18986", +- "self_type" : "type-18985", ++ "referenced_type" : "type-18971", ++ "self_type" : "type-18970", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135011,8 +135053,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19228", +- "self_type" : "type-19227", ++ "referenced_type" : "type-19133", ++ "self_type" : "type-19132", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135020,8 +135062,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19379", +- "self_type" : "type-19378", ++ "referenced_type" : "type-19258", ++ "self_type" : "type-19257", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135029,8 +135071,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19567", +- "self_type" : "type-19566", ++ "referenced_type" : "type-19400", ++ "self_type" : "type-19399", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135038,8 +135080,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19738", +- "self_type" : "type-19737", ++ "referenced_type" : "type-19484", ++ "self_type" : "type-19483", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135047,8 +135089,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19897", +- "self_type" : "type-19896", ++ "referenced_type" : "type-19764", ++ "self_type" : "type-19763", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135056,8 +135098,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20246", +- "self_type" : "type-20245", ++ "referenced_type" : "type-20250", ++ "self_type" : "type-20249", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135065,8 +135107,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20416", +- "self_type" : "type-20415", ++ "referenced_type" : "type-20420", ++ "self_type" : "type-20419", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135074,8 +135116,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20522", +- "self_type" : "type-20521", ++ "referenced_type" : "type-20529", ++ "self_type" : "type-20528", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135083,8 +135125,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20655", +- "self_type" : "type-20654", ++ "referenced_type" : "type-20663", ++ "self_type" : "type-20662", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135092,8 +135134,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20804", +- "self_type" : "type-20803", ++ "referenced_type" : "type-20812", ++ "self_type" : "type-20811", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135110,8 +135152,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20897", +- "self_type" : "type-20896", ++ "referenced_type" : "type-20905", ++ "self_type" : "type-20904", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135119,8 +135161,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20998", +- "self_type" : "type-20997", ++ "referenced_type" : "type-21006", ++ "self_type" : "type-21005", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135128,8 +135170,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21180", +- "self_type" : "type-21179", ++ "referenced_type" : "type-21188", ++ "self_type" : "type-21187", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135137,8 +135179,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21260", +- "self_type" : "type-21259", ++ "referenced_type" : "type-21268", ++ "self_type" : "type-21267", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135146,8 +135188,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21318", +- "self_type" : "type-21317", ++ "referenced_type" : "type-21326", ++ "self_type" : "type-21325", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135155,8 +135197,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21392", +- "self_type" : "type-21391", ++ "referenced_type" : "type-21400", ++ "self_type" : "type-21399", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135164,8 +135206,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21790", +- "self_type" : "type-21789", ++ "referenced_type" : "type-21798", ++ "self_type" : "type-21797", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -136487,8 +136529,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-15723", +- "self_type" : "type-15722", ++ "referenced_type" : "type-15491", ++ "self_type" : "type-15490", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136496,8 +136538,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-15894", +- "self_type" : "type-15893", ++ "referenced_type" : "type-15639", ++ "self_type" : "type-15638", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136505,8 +136547,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16156", +- "self_type" : "type-16155", ++ "referenced_type" : "type-15836", ++ "self_type" : "type-15835", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136514,8 +136556,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16279", +- "self_type" : "type-16278", ++ "referenced_type" : "type-16006", ++ "self_type" : "type-16005", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136523,8 +136565,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16419", +- "self_type" : "type-16418", ++ "referenced_type" : "type-16163", ++ "self_type" : "type-16162", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136532,8 +136574,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16476", +- "self_type" : "type-16475", ++ "referenced_type" : "type-16496", ++ "self_type" : "type-16495", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136541,8 +136583,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16591", +- "self_type" : "type-16590", ++ "referenced_type" : "type-16667", ++ "self_type" : "type-16666", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136550,8 +136592,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16656", +- "self_type" : "type-16655", ++ "referenced_type" : "type-16926", ++ "self_type" : "type-16925", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136559,8 +136601,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16794", +- "self_type" : "type-16793", ++ "referenced_type" : "type-17049", ++ "self_type" : "type-17048", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136568,8 +136610,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16866", +- "self_type" : "type-16865", ++ "referenced_type" : "type-17189", ++ "self_type" : "type-17188", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136577,8 +136619,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17105", +- "self_type" : "type-17104", ++ "referenced_type" : "type-17246", ++ "self_type" : "type-17245", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136586,8 +136628,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17279", +- "self_type" : "type-17278", ++ "referenced_type" : "type-17361", ++ "self_type" : "type-17360", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136595,8 +136637,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17373", +- "self_type" : "type-17372", ++ "referenced_type" : "type-17426", ++ "self_type" : "type-17425", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136604,8 +136646,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17419", +- "self_type" : "type-17418", ++ "referenced_type" : "type-17564", ++ "self_type" : "type-17563", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136613,8 +136655,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17753", +- "self_type" : "type-17752", ++ "referenced_type" : "type-17636", ++ "self_type" : "type-17635", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136622,8 +136664,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17876", +- "self_type" : "type-17875", ++ "referenced_type" : "type-17875", ++ "self_type" : "type-17874", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136631,8 +136673,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17969", +- "self_type" : "type-17968", ++ "referenced_type" : "type-18049", ++ "self_type" : "type-18048", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136640,8 +136682,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18059", +- "self_type" : "type-18058", ++ "referenced_type" : "type-18151", ++ "self_type" : "type-18150", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136649,8 +136691,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18132", +- "self_type" : "type-18131", ++ "referenced_type" : "type-18197", ++ "self_type" : "type-18196", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136658,8 +136700,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18218", +- "self_type" : "type-18217", ++ "referenced_type" : "type-18531", ++ "self_type" : "type-18530", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136667,8 +136709,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18371", +- "self_type" : "type-18370", ++ "referenced_type" : "type-18654", ++ "self_type" : "type-18653", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136676,8 +136718,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18499", +- "self_type" : "type-18498", ++ "referenced_type" : "type-18747", ++ "self_type" : "type-18746", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136685,8 +136727,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18727", +- "self_type" : "type-18726", ++ "referenced_type" : "type-18837", ++ "self_type" : "type-18836", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136694,8 +136736,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18882", +- "self_type" : "type-18881", ++ "referenced_type" : "type-18910", ++ "self_type" : "type-18909", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136703,8 +136745,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19007", +- "self_type" : "type-19006", ++ "referenced_type" : "type-18996", ++ "self_type" : "type-18995", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136712,8 +136754,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19246", +- "self_type" : "type-19245", ++ "referenced_type" : "type-19149", ++ "self_type" : "type-19148", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136721,8 +136763,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19395", +- "self_type" : "type-19394", ++ "referenced_type" : "type-19277", ++ "self_type" : "type-19276", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136730,8 +136772,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19592", +- "self_type" : "type-19591", ++ "referenced_type" : "type-19505", ++ "self_type" : "type-19504", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136739,8 +136781,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19762", +- "self_type" : "type-19761", ++ "referenced_type" : "type-19660", ++ "self_type" : "type-19659", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136748,8 +136790,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19919", +- "self_type" : "type-19918", ++ "referenced_type" : "type-19785", ++ "self_type" : "type-19784", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136757,8 +136799,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20257", +- "self_type" : "type-20256", ++ "referenced_type" : "type-20261", ++ "self_type" : "type-20260", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136766,8 +136808,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20428", +- "self_type" : "type-20427", ++ "referenced_type" : "type-20432", ++ "self_type" : "type-20431", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136775,8 +136817,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20687", +- "self_type" : "type-20686", ++ "referenced_type" : "type-20695", ++ "self_type" : "type-20694", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136784,8 +136826,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20810", +- "self_type" : "type-20809", ++ "referenced_type" : "type-20818", ++ "self_type" : "type-20817", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136793,8 +136835,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20950", +- "self_type" : "type-20949", ++ "referenced_type" : "type-20958", ++ "self_type" : "type-20957", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136802,8 +136844,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21008", +- "self_type" : "type-21007", ++ "referenced_type" : "type-21016", ++ "self_type" : "type-21015", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136820,8 +136862,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21123", +- "self_type" : "type-21122", ++ "referenced_type" : "type-21131", ++ "self_type" : "type-21130", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136829,8 +136871,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21188", +- "self_type" : "type-21187", ++ "referenced_type" : "type-21196", ++ "self_type" : "type-21195", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136838,8 +136880,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21326", +- "self_type" : "type-21325", ++ "referenced_type" : "type-21334", ++ "self_type" : "type-21333", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136847,8 +136889,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21398", +- "self_type" : "type-21397", ++ "referenced_type" : "type-21406", ++ "self_type" : "type-21405", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136856,8 +136898,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21637", +- "self_type" : "type-21636", ++ "referenced_type" : "type-21645", ++ "self_type" : "type-21644", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136865,8 +136907,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21811", +- "self_type" : "type-21810", ++ "referenced_type" : "type-21819", ++ "self_type" : "type-21818", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137990,8 +138032,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField, std::allocator > > *", + "name" : "google::protobuf::RepeatedPtrField, std::allocator > > *", +- "referenced_type" : "type-15985", +- "self_type" : "type-15984", ++ "referenced_type" : "type-16756", ++ "self_type" : "type-16755", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -137999,8 +138041,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField, std::allocator > > *", + "name" : "google::protobuf::RepeatedPtrField, std::allocator > > *", +- "referenced_type" : "type-18617", +- "self_type" : "type-18616", ++ "referenced_type" : "type-19395", ++ "self_type" : "type-19394", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -138008,8 +138050,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField, std::allocator > > *", + "name" : "google::protobuf::RepeatedPtrField, std::allocator > > *", +- "referenced_type" : "type-20517", +- "self_type" : "type-20516", ++ "referenced_type" : "type-20524", ++ "self_type" : "type-20523", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -138359,8 +138401,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-15393", +- "self_type" : "type-15392", ++ "referenced_type" : "type-1544", ++ "self_type" : "type-1543", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138368,8 +138410,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-1544", +- "self_type" : "type-1543", ++ "referenced_type" : "type-15581", ++ "self_type" : "type-15580", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138377,8 +138419,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-15441", +- "self_type" : "type-15440", ++ "referenced_type" : "type-15668", ++ "self_type" : "type-15667", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138395,8 +138437,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-16082", +- "self_type" : "type-16081", ++ "referenced_type" : "type-15737", ++ "self_type" : "type-15736", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138404,8 +138446,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-16674", +- "self_type" : "type-16673", ++ "referenced_type" : "type-15916", ++ "self_type" : "type-15915", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138413,8 +138455,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-17138", +- "self_type" : "type-17137", ++ "referenced_type" : "type-16078", ++ "self_type" : "type-16077", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138422,8 +138464,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-17675", +- "self_type" : "type-17674", ++ "referenced_type" : "type-16852", ++ "self_type" : "type-16851", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138431,8 +138473,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-17985", +- "self_type" : "type-17984", ++ "referenced_type" : "type-17444", ++ "self_type" : "type-17443", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138440,8 +138482,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-18094", +- "self_type" : "type-18093", ++ "referenced_type" : "type-17908", ++ "self_type" : "type-17907", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138449,8 +138491,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-18316", +- "self_type" : "type-18315", ++ "referenced_type" : "type-18453", ++ "self_type" : "type-18452", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138458,8 +138500,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-18424", +- "self_type" : "type-18423", ++ "referenced_type" : "type-18763", ++ "self_type" : "type-18762", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138467,8 +138509,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-19099", +- "self_type" : "type-19098", ++ "referenced_type" : "type-18872", ++ "self_type" : "type-18871", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138476,8 +138518,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-19337", +- "self_type" : "type-19336", ++ "referenced_type" : "type-19094", ++ "self_type" : "type-19093", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138485,8 +138527,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-19424", +- "self_type" : "type-19423", ++ "referenced_type" : "type-19202", ++ "self_type" : "type-19201", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138494,8 +138536,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-19493", +- "self_type" : "type-19492", ++ "referenced_type" : "type-19877", ++ "self_type" : "type-19876", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138503,8 +138545,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-19672", +- "self_type" : "type-19671", ++ "referenced_type" : "type-19926", ++ "self_type" : "type-19925", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138512,8 +138554,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-19834", +- "self_type" : "type-19833", ++ "referenced_type" : "type-19974", ++ "self_type" : "type-19973", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138521,8 +138563,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-20613", +- "self_type" : "type-20612", ++ "referenced_type" : "type-20621", ++ "self_type" : "type-20620", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138530,8 +138572,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-21206", +- "self_type" : "type-21205", ++ "referenced_type" : "type-21214", ++ "self_type" : "type-21213", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138539,8 +138581,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-21670", +- "self_type" : "type-21669", ++ "referenced_type" : "type-21678", ++ "self_type" : "type-21677", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -139304,8 +139346,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::TextFormat::Parser::ParserImpl *", + "name" : "google::protobuf::TextFormat::Parser::ParserImpl *", +- "referenced_type" : "type-17714", +- "self_type" : "type-17713", ++ "referenced_type" : "type-18492", ++ "self_type" : "type-18491", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, +@@ -139691,8 +139733,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-16519", +- "self_type" : "type-16518", ++ "referenced_type" : "type-17289", ++ "self_type" : "type-17288", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139700,8 +139742,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-16837", +- "self_type" : "type-16836", ++ "referenced_type" : "type-17607", ++ "self_type" : "type-17606", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139709,8 +139751,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-17159", +- "self_type" : "type-17158", ++ "referenced_type" : "type-17929", ++ "self_type" : "type-17928", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139718,8 +139760,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-17499", +- "self_type" : "type-17498", ++ "referenced_type" : "type-18277", ++ "self_type" : "type-18276", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139727,8 +139769,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-18816", +- "self_type" : "type-18815", ++ "referenced_type" : "type-19594", ++ "self_type" : "type-19593", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139736,8 +139778,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-21051", +- "self_type" : "type-21050", ++ "referenced_type" : "type-21059", ++ "self_type" : "type-21058", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139745,8 +139787,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-21369", +- "self_type" : "type-21368", ++ "referenced_type" : "type-21377", ++ "self_type" : "type-21376", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139754,8 +139796,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-21691", +- "self_type" : "type-21690", ++ "referenced_type" : "type-21699", ++ "self_type" : "type-21698", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139934,8 +139976,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > > *", + "name" : "google::protobuf::hash_map, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > > *", +- "referenced_type" : "type-19477", +- "self_type" : "type-19483", ++ "referenced_type" : "type-15721", ++ "self_type" : "type-15727", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -139979,8 +140021,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > > *", + "name" : "google::protobuf::hash_map, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > > *", +- "referenced_type" : "type-19317", +- "self_type" : "type-19341", ++ "referenced_type" : "type-15562", ++ "self_type" : "type-15585", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -140078,8 +140120,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_set, std::equal_to > *", + "name" : "google::protobuf::hash_set, std::equal_to > *", +- "referenced_type" : "type-19464", +- "self_type" : "type-19665", ++ "referenced_type" : "type-15708", ++ "self_type" : "type-15909", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -140285,8 +140327,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::FunctionResultCallback_1_1 *", + "name" : "google::protobuf::internal::FunctionResultCallback_1_1 *", +- "referenced_type" : "type-19438", +- "self_type" : "type-19473", ++ "referenced_type" : "type-15682", ++ "self_type" : "type-15717", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -140699,8 +140741,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-15707", +- "self_type" : "type-15706", ++ "referenced_type" : "type-15468", ++ "self_type" : "type-15467", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140708,8 +140750,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-15877", +- "self_type" : "type-15876", ++ "referenced_type" : "type-15618", ++ "self_type" : "type-15617", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140717,8 +140759,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-15980", +- "self_type" : "type-15979", ++ "referenced_type" : "type-15806", ++ "self_type" : "type-15805", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140726,8 +140768,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-16119", +- "self_type" : "type-16118", ++ "referenced_type" : "type-15976", ++ "self_type" : "type-15975", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140735,8 +140777,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-16268", +- "self_type" : "type-16267", ++ "referenced_type" : "type-16135", ++ "self_type" : "type-16134", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140744,8 +140786,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-16361", +- "self_type" : "type-16360", ++ "referenced_type" : "type-16480", ++ "self_type" : "type-16479", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140753,8 +140795,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-16461", +- "self_type" : "type-16460", ++ "referenced_type" : "type-16650", ++ "self_type" : "type-16649", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140762,8 +140804,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-16643", +- "self_type" : "type-16642", ++ "referenced_type" : "type-16751", ++ "self_type" : "type-16750", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140771,8 +140813,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-16723", +- "self_type" : "type-16722", ++ "referenced_type" : "type-16889", ++ "self_type" : "type-16888", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140780,8 +140822,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-16781", +- "self_type" : "type-16780", ++ "referenced_type" : "type-17038", ++ "self_type" : "type-17037", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140789,8 +140831,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-17253", +- "self_type" : "type-17252", ++ "referenced_type" : "type-17131", ++ "self_type" : "type-17130", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140798,8 +140840,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-17360", +- "self_type" : "type-17359", ++ "referenced_type" : "type-17231", ++ "self_type" : "type-17230", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140807,8 +140849,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-17704", +- "self_type" : "type-17703", ++ "referenced_type" : "type-17413", ++ "self_type" : "type-17412", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140816,8 +140858,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-17860", +- "self_type" : "type-17859", ++ "referenced_type" : "type-17493", ++ "self_type" : "type-17492", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140825,8 +140867,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-17948", +- "self_type" : "type-17947", ++ "referenced_type" : "type-17551", ++ "self_type" : "type-17550", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140834,8 +140876,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-18038", +- "self_type" : "type-18037", ++ "referenced_type" : "type-18023", ++ "self_type" : "type-18022", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140843,8 +140885,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-18121", +- "self_type" : "type-18120", ++ "referenced_type" : "type-18138", ++ "self_type" : "type-18137", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140852,8 +140894,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-18188", +- "self_type" : "type-18187", ++ "referenced_type" : "type-18482", ++ "self_type" : "type-18481", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140861,8 +140903,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-18350", +- "self_type" : "type-18349", ++ "referenced_type" : "type-18638", ++ "self_type" : "type-18637", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140870,8 +140912,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-18475", +- "self_type" : "type-18474", ++ "referenced_type" : "type-18726", ++ "self_type" : "type-18725", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140879,8 +140921,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-18610", +- "self_type" : "type-18609", ++ "referenced_type" : "type-18816", ++ "self_type" : "type-18815", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140888,8 +140930,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-18701", +- "self_type" : "type-18700", ++ "referenced_type" : "type-18899", ++ "self_type" : "type-18898", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140897,8 +140939,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-18980", +- "self_type" : "type-18979", ++ "referenced_type" : "type-18966", ++ "self_type" : "type-18965", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140906,8 +140948,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-19223", +- "self_type" : "type-19222", ++ "referenced_type" : "type-19128", ++ "self_type" : "type-19127", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140915,8 +140957,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-19374", +- "self_type" : "type-19373", ++ "referenced_type" : "type-19253", ++ "self_type" : "type-19252", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140924,8 +140966,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-19562", +- "self_type" : "type-19561", ++ "referenced_type" : "type-19388", ++ "self_type" : "type-19387", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140933,8 +140975,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-19732", +- "self_type" : "type-19731", ++ "referenced_type" : "type-19479", ++ "self_type" : "type-19478", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140942,8 +140984,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-19891", +- "self_type" : "type-19890", ++ "referenced_type" : "type-19758", ++ "self_type" : "type-19757", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140951,8 +140993,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-20240", +- "self_type" : "type-20239", ++ "referenced_type" : "type-20244", ++ "self_type" : "type-20243", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140960,8 +141002,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-20411", +- "self_type" : "type-20410", ++ "referenced_type" : "type-20415", ++ "self_type" : "type-20414", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140969,8 +141011,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-20512", +- "self_type" : "type-20511", ++ "referenced_type" : "type-20519", ++ "self_type" : "type-20518", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140978,8 +141020,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-20650", +- "self_type" : "type-20649", ++ "referenced_type" : "type-20658", ++ "self_type" : "type-20657", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140987,8 +141029,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-20799", +- "self_type" : "type-20798", ++ "referenced_type" : "type-20807", ++ "self_type" : "type-20806", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141005,8 +141047,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-20892", +- "self_type" : "type-20891", ++ "referenced_type" : "type-20900", ++ "self_type" : "type-20899", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141014,8 +141056,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-20993", +- "self_type" : "type-20992", ++ "referenced_type" : "type-21001", ++ "self_type" : "type-21000", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141023,8 +141065,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-21175", +- "self_type" : "type-21174", ++ "referenced_type" : "type-21183", ++ "self_type" : "type-21182", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141032,8 +141074,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-21255", +- "self_type" : "type-21254", ++ "referenced_type" : "type-21263", ++ "self_type" : "type-21262", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141041,8 +141083,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-21313", +- "self_type" : "type-21312", ++ "referenced_type" : "type-21321", ++ "self_type" : "type-21320", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141050,8 +141092,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-21785", +- "self_type" : "type-21784", ++ "referenced_type" : "type-21793", ++ "self_type" : "type-21792", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -142049,8 +142091,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MessageSetFieldSkipper *", + "name" : "google::protobuf::internal::MessageSetFieldSkipper *", +- "referenced_type" : "type-16712", +- "self_type" : "type-16711", ++ "referenced_type" : "type-17482", ++ "self_type" : "type-17481", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -142058,8 +142100,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MessageSetFieldSkipper *", + "name" : "google::protobuf::internal::MessageSetFieldSkipper *", +- "referenced_type" : "type-21244", +- "self_type" : "type-21243", ++ "referenced_type" : "type-21252", ++ "self_type" : "type-21251", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -143039,8 +143081,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15382", +- "self_type" : "type-15381", ++ "referenced_type" : "type-15456", ++ "self_type" : "type-15455", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143048,8 +143090,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15395", +- "self_type" : "type-15394", ++ "referenced_type" : "type-1546", ++ "self_type" : "type-1545", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143057,8 +143099,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15407", +- "self_type" : "type-15406", ++ "referenced_type" : "type-15461", ++ "self_type" : "type-15460", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143066,8 +143108,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15435", +- "self_type" : "type-15434", ++ "referenced_type" : "type-15548", ++ "self_type" : "type-15547", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143075,8 +143117,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15443", +- "self_type" : "type-15442", ++ "referenced_type" : "type-15553", ++ "self_type" : "type-15552", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143084,8 +143126,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-1546", +- "self_type" : "type-1545", ++ "referenced_type" : "type-15593", ++ "self_type" : "type-15592", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143093,8 +143135,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15476", +- "self_type" : "type-15475", ++ "referenced_type" : "type-15670", ++ "self_type" : "type-15669", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143102,8 +143144,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15505", +- "self_type" : "type-15504", ++ "referenced_type" : "type-1580", ++ "self_type" : "type-1579", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143111,8 +143153,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15641", +- "self_type" : "type-15640", ++ "referenced_type" : "type-15847", ++ "self_type" : "type-15846", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143120,8 +143162,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-1580", +- "self_type" : "type-1579", ++ "referenced_type" : "type-15901", ++ "self_type" : "type-15900", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143129,8 +143171,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15806", +- "self_type" : "type-15805", ++ "referenced_type" : "type-16043", ++ "self_type" : "type-16042", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143138,8 +143180,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15810", +- "self_type" : "type-15809", ++ "referenced_type" : "type-16060", ++ "self_type" : "type-16059", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143147,8 +143189,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15853", +- "self_type" : "type-15852", ++ "referenced_type" : "type-16091", ++ "self_type" : "type-16090", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143156,8 +143198,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15926", +- "self_type" : "type-15925", ++ "referenced_type" : "type-16145", ++ "self_type" : "type-16144", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143165,8 +143207,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15970", +- "self_type" : "type-15969", ++ "referenced_type" : "type-16249", ++ "self_type" : "type-16248", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143174,8 +143216,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16000", +- "self_type" : "type-15999", ++ "referenced_type" : "type-16278", ++ "self_type" : "type-16277", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143183,8 +143225,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16110", +- "self_type" : "type-16109", ++ "referenced_type" : "type-16414", ++ "self_type" : "type-16413", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143192,8 +143234,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16112", +- "self_type" : "type-16111", ++ "referenced_type" : "type-16579", ++ "self_type" : "type-16578", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143201,8 +143243,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16231", +- "self_type" : "type-16230", ++ "referenced_type" : "type-16583", ++ "self_type" : "type-16582", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143210,8 +143252,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16241", +- "self_type" : "type-16240", ++ "referenced_type" : "type-166", ++ "self_type" : "type-165", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143219,8 +143261,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16322", +- "self_type" : "type-16321", ++ "referenced_type" : "type-16626", ++ "self_type" : "type-16625", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143228,8 +143270,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16328", +- "self_type" : "type-16327", ++ "referenced_type" : "type-16697", ++ "self_type" : "type-16696", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143237,8 +143279,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16354", +- "self_type" : "type-16353", ++ "referenced_type" : "type-16741", ++ "self_type" : "type-16740", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143246,8 +143288,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16435", +- "self_type" : "type-16434", ++ "referenced_type" : "type-16771", ++ "self_type" : "type-16770", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143255,8 +143297,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16561", +- "self_type" : "type-16560", ++ "referenced_type" : "type-16880", ++ "self_type" : "type-16879", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143264,8 +143306,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16569", +- "self_type" : "type-16568", ++ "referenced_type" : "type-16882", ++ "self_type" : "type-16881", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143273,8 +143315,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-166", +- "self_type" : "type-165", ++ "referenced_type" : "type-17001", ++ "self_type" : "type-17000", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143282,8 +143324,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16613", +- "self_type" : "type-16612", ++ "referenced_type" : "type-17011", ++ "self_type" : "type-17010", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143291,8 +143333,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16671", +- "self_type" : "type-16670", ++ "referenced_type" : "type-17092", ++ "self_type" : "type-17091", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143300,8 +143342,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16683", +- "self_type" : "type-16682", ++ "referenced_type" : "type-17098", ++ "self_type" : "type-17097", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143309,8 +143351,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16743", +- "self_type" : "type-16742", ++ "referenced_type" : "type-17124", ++ "self_type" : "type-17123", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143318,8 +143360,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16774", +- "self_type" : "type-16773", ++ "referenced_type" : "type-17205", ++ "self_type" : "type-17204", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143327,8 +143369,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16824", +- "self_type" : "type-16823", ++ "referenced_type" : "type-17331", ++ "self_type" : "type-17330", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143336,8 +143378,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16862", +- "self_type" : "type-16861", ++ "referenced_type" : "type-17339", ++ "self_type" : "type-17338", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143345,8 +143387,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16893", +- "self_type" : "type-16892", ++ "referenced_type" : "type-17383", ++ "self_type" : "type-17382", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143354,8 +143396,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16915", +- "self_type" : "type-16914", ++ "referenced_type" : "type-17441", ++ "self_type" : "type-17440", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143363,8 +143405,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17141", +- "self_type" : "type-17140", ++ "referenced_type" : "type-17453", ++ "self_type" : "type-17452", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143372,8 +143414,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17234", +- "self_type" : "type-17233", ++ "referenced_type" : "type-17513", ++ "self_type" : "type-17512", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143381,8 +143423,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17312", +- "self_type" : "type-17311", ++ "referenced_type" : "type-17544", ++ "self_type" : "type-17543", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143390,8 +143432,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17324", +- "self_type" : "type-17323", ++ "referenced_type" : "type-17594", ++ "self_type" : "type-17593", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143399,8 +143441,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17389", +- "self_type" : "type-17388", ++ "referenced_type" : "type-17632", ++ "self_type" : "type-17631", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143408,8 +143450,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17481", +- "self_type" : "type-17480", ++ "referenced_type" : "type-1764", ++ "self_type" : "type-1763", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143417,8 +143459,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17638", +- "self_type" : "type-17637", ++ "referenced_type" : "type-17663", ++ "self_type" : "type-17662", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143426,8 +143468,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-1764", +- "self_type" : "type-1763", ++ "referenced_type" : "type-17685", ++ "self_type" : "type-17684", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143435,8 +143477,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17691", +- "self_type" : "type-17690", ++ "referenced_type" : "type-177", ++ "self_type" : "type-176", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143444,8 +143486,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-177", +- "self_type" : "type-176", ++ "referenced_type" : "type-17911", ++ "self_type" : "type-17910", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143453,8 +143495,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17820", +- "self_type" : "type-17819", ++ "referenced_type" : "type-18004", ++ "self_type" : "type-18003", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143462,8 +143504,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17906", +- "self_type" : "type-17905", ++ "referenced_type" : "type-18082", ++ "self_type" : "type-18081", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143471,8 +143513,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18004", +- "self_type" : "type-18003", ++ "referenced_type" : "type-18094", ++ "self_type" : "type-18093", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143480,8 +143522,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18099", +- "self_type" : "type-18098", ++ "referenced_type" : "type-18167", ++ "self_type" : "type-18166", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143489,8 +143531,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18149", +- "self_type" : "type-18148", ++ "referenced_type" : "type-18259", ++ "self_type" : "type-18258", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143498,8 +143540,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18154", +- "self_type" : "type-18153", ++ "referenced_type" : "type-18416", ++ "self_type" : "type-18415", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143507,8 +143549,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18172", +- "self_type" : "type-18171", ++ "referenced_type" : "type-18469", ++ "self_type" : "type-18468", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143516,8 +143558,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18255", +- "self_type" : "type-18254", ++ "referenced_type" : "type-18598", ++ "self_type" : "type-18597", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143525,8 +143567,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18269", +- "self_type" : "type-18268", ++ "referenced_type" : "type-18684", ++ "self_type" : "type-18683", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143534,8 +143576,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18290", +- "self_type" : "type-18289", ++ "referenced_type" : "type-18782", ++ "self_type" : "type-18781", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143543,8 +143585,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18299", +- "self_type" : "type-18298", ++ "referenced_type" : "type-18877", ++ "self_type" : "type-18876", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143552,8 +143594,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18330", +- "self_type" : "type-18329", ++ "referenced_type" : "type-18927", ++ "self_type" : "type-18926", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143561,8 +143603,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18445", +- "self_type" : "type-18444", ++ "referenced_type" : "type-18932", ++ "self_type" : "type-18931", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143570,8 +143612,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18453", +- "self_type" : "type-18452", ++ "referenced_type" : "type-18950", ++ "self_type" : "type-18949", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143579,8 +143621,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18626", +- "self_type" : "type-18625", ++ "referenced_type" : "type-190", ++ "self_type" : "type-189", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143588,8 +143630,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18670", +- "self_type" : "type-18669", ++ "referenced_type" : "type-19033", ++ "self_type" : "type-19032", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143597,8 +143639,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18694", +- "self_type" : "type-18693", ++ "referenced_type" : "type-19047", ++ "self_type" : "type-19046", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143606,8 +143648,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18780", +- "self_type" : "type-18779", ++ "referenced_type" : "type-19068", ++ "self_type" : "type-19067", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143615,8 +143657,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18991", +- "self_type" : "type-18990", ++ "referenced_type" : "type-19077", ++ "self_type" : "type-19076", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143624,8 +143666,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-190", +- "self_type" : "type-189", ++ "referenced_type" : "type-19108", ++ "self_type" : "type-19107", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143633,8 +143675,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19101", +- "self_type" : "type-19100", ++ "referenced_type" : "type-19223", ++ "self_type" : "type-19222", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143642,8 +143684,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19114", +- "self_type" : "type-19113", ++ "referenced_type" : "type-19231", ++ "self_type" : "type-19230", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143651,8 +143693,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19123", +- "self_type" : "type-19122", ++ "referenced_type" : "type-19404", ++ "self_type" : "type-19403", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143660,8 +143702,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19211", +- "self_type" : "type-19210", ++ "referenced_type" : "type-19448", ++ "self_type" : "type-19447", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143669,8 +143711,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19216", +- "self_type" : "type-19215", ++ "referenced_type" : "type-19472", ++ "self_type" : "type-19471", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143678,8 +143720,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19303", +- "self_type" : "type-19302", ++ "referenced_type" : "type-19558", ++ "self_type" : "type-19557", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143687,8 +143729,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19308", +- "self_type" : "type-19307", ++ "referenced_type" : "type-19769", ++ "self_type" : "type-19768", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143696,8 +143738,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19349", +- "self_type" : "type-19348", ++ "referenced_type" : "type-19879", ++ "self_type" : "type-19878", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143705,8 +143747,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19426", +- "self_type" : "type-19425", ++ "referenced_type" : "type-1989", ++ "self_type" : "type-1988", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143714,8 +143756,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19603", +- "self_type" : "type-19602", ++ "referenced_type" : "type-19892", ++ "self_type" : "type-19891", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143723,8 +143765,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19657", +- "self_type" : "type-19656", ++ "referenced_type" : "type-19901", ++ "self_type" : "type-19900", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143732,8 +143774,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19799", +- "self_type" : "type-19798", ++ "referenced_type" : "type-19915", ++ "self_type" : "type-19914", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143741,8 +143783,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19816", +- "self_type" : "type-19815", ++ "referenced_type" : "type-19928", ++ "self_type" : "type-19927", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143750,8 +143792,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19847", +- "self_type" : "type-19846", ++ "referenced_type" : "type-19940", ++ "self_type" : "type-19939", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143759,8 +143801,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-1989", +- "self_type" : "type-1988", ++ "referenced_type" : "type-19968", ++ "self_type" : "type-19967", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143768,8 +143810,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19901", +- "self_type" : "type-19900", ++ "referenced_type" : "type-19976", ++ "self_type" : "type-19975", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143777,8 +143819,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20005", +- "self_type" : "type-20004", ++ "referenced_type" : "type-20009", ++ "self_type" : "type-20008", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143786,8 +143828,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20038", +- "self_type" : "type-20037", ++ "referenced_type" : "type-20042", ++ "self_type" : "type-20041", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143795,8 +143837,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20174", +- "self_type" : "type-20173", ++ "referenced_type" : "type-20178", ++ "self_type" : "type-20177", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143804,8 +143846,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20340", +- "self_type" : "type-20339", ++ "referenced_type" : "type-20344", ++ "self_type" : "type-20343", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143813,8 +143855,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20344", +- "self_type" : "type-20343", ++ "referenced_type" : "type-20348", ++ "self_type" : "type-20347", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143822,8 +143864,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20387", +- "self_type" : "type-20386", ++ "referenced_type" : "type-20391", ++ "self_type" : "type-20390", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143831,8 +143873,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20458", +- "self_type" : "type-20457", ++ "referenced_type" : "type-20465", ++ "self_type" : "type-20464", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143849,8 +143891,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20502", +- "self_type" : "type-20501", ++ "referenced_type" : "type-20509", ++ "self_type" : "type-20508", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143858,8 +143900,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20532", +- "self_type" : "type-20531", ++ "referenced_type" : "type-20539", ++ "self_type" : "type-20538", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143867,8 +143909,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20641", +- "self_type" : "type-20640", ++ "referenced_type" : "type-20649", ++ "self_type" : "type-20648", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143876,8 +143918,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20643", +- "self_type" : "type-20642", ++ "referenced_type" : "type-20651", ++ "self_type" : "type-20650", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143885,8 +143927,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20762", +- "self_type" : "type-20761", ++ "referenced_type" : "type-20770", ++ "self_type" : "type-20769", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143894,8 +143936,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20772", +- "self_type" : "type-20771", ++ "referenced_type" : "type-20780", ++ "self_type" : "type-20779", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143903,8 +143945,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20853", +- "self_type" : "type-20852", ++ "referenced_type" : "type-20861", ++ "self_type" : "type-20860", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143912,8 +143954,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20859", +- "self_type" : "type-20858", ++ "referenced_type" : "type-20867", ++ "self_type" : "type-20866", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143921,8 +143963,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20885", +- "self_type" : "type-20884", ++ "referenced_type" : "type-20893", ++ "self_type" : "type-20892", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143930,8 +143972,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20966", +- "self_type" : "type-20965", ++ "referenced_type" : "type-20974", ++ "self_type" : "type-20973", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143939,8 +143981,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21093", +- "self_type" : "type-21092", ++ "referenced_type" : "type-21101", ++ "self_type" : "type-21100", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143948,8 +143990,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21101", +- "self_type" : "type-21100", ++ "referenced_type" : "type-21109", ++ "self_type" : "type-21108", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143957,8 +143999,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21145", +- "self_type" : "type-21144", ++ "referenced_type" : "type-21153", ++ "self_type" : "type-21152", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143966,8 +144008,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21203", +- "self_type" : "type-21202", ++ "referenced_type" : "type-21211", ++ "self_type" : "type-21210", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143975,8 +144017,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21215", +- "self_type" : "type-21214", ++ "referenced_type" : "type-21223", ++ "self_type" : "type-21222", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143984,8 +144026,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21275", +- "self_type" : "type-21274", ++ "referenced_type" : "type-21283", ++ "self_type" : "type-21282", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143993,8 +144035,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21306", +- "self_type" : "type-21305", ++ "referenced_type" : "type-21314", ++ "self_type" : "type-21313", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144002,8 +144044,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21356", +- "self_type" : "type-21355", ++ "referenced_type" : "type-21364", ++ "self_type" : "type-21363", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144011,8 +144053,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21394", +- "self_type" : "type-21393", ++ "referenced_type" : "type-21402", ++ "self_type" : "type-21401", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144020,8 +144062,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21425", +- "self_type" : "type-21424", ++ "referenced_type" : "type-21433", ++ "self_type" : "type-21432", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144029,8 +144071,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21447", +- "self_type" : "type-21446", ++ "referenced_type" : "type-21455", ++ "self_type" : "type-21454", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144038,8 +144080,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21673", +- "self_type" : "type-21672", ++ "referenced_type" : "type-21681", ++ "self_type" : "type-21680", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144047,8 +144089,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21766", +- "self_type" : "type-21765", ++ "referenced_type" : "type-21774", ++ "self_type" : "type-21773", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144056,8 +144098,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21844", +- "self_type" : "type-21843", ++ "referenced_type" : "type-21852", ++ "self_type" : "type-21851", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144065,8 +144107,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21856", +- "self_type" : "type-21855", ++ "referenced_type" : "type-21864", ++ "self_type" : "type-21863", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -147350,8 +147392,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19875", +- "self_type" : "type-19883", ++ "referenced_type" : "type-16119", ++ "self_type" : "type-16127", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147368,8 +147410,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr > *", + "name" : "google::protobuf::internal::scoped_ptr > *", +- "referenced_type" : "type-19633", +- "self_type" : "type-19634", ++ "referenced_type" : "type-15877", ++ "self_type" : "type-15878", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147404,8 +147446,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19842", +- "self_type" : "type-19856", ++ "referenced_type" : "type-16086", ++ "self_type" : "type-16100", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147431,8 +147473,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19469", +- "self_type" : "type-19724", ++ "referenced_type" : "type-15713", ++ "self_type" : "type-15968", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147467,8 +147509,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19150", +- "self_type" : "type-19170", ++ "referenced_type" : "type-15395", ++ "self_type" : "type-15415", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147476,8 +147518,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19470", +- "self_type" : "type-19746", ++ "referenced_type" : "type-15714", ++ "self_type" : "type-15990", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147485,8 +147527,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19446", +- "self_type" : "type-19627", ++ "referenced_type" : "type-15690", ++ "self_type" : "type-15871", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147494,8 +147536,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19443", +- "self_type" : "type-19630", ++ "referenced_type" : "type-15687", ++ "self_type" : "type-15874", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147503,8 +147545,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19449", +- "self_type" : "type-19575", ++ "referenced_type" : "type-15693", ++ "self_type" : "type-15819", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147512,8 +147554,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19459", +- "self_type" : "type-19715", ++ "referenced_type" : "type-15703", ++ "self_type" : "type-15959", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147521,8 +147563,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19140", +- "self_type" : "type-19154", ++ "referenced_type" : "type-15385", ++ "self_type" : "type-15399", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -148034,8 +148076,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-15737", +- "self_type" : "type-15736", ++ "referenced_type" : "type-15378", ++ "self_type" : "type-15377", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148043,8 +148085,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-15802", +- "self_type" : "type-15801", ++ "referenced_type" : "type-16510", ++ "self_type" : "type-16509", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148052,8 +148094,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-16292", +- "self_type" : "type-16291", ++ "referenced_type" : "type-16575", ++ "self_type" : "type-16574", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148061,8 +148103,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-16428", +- "self_type" : "type-16427", ++ "referenced_type" : "type-17062", ++ "self_type" : "type-17061", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148070,8 +148112,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-16488", +- "self_type" : "type-16487", ++ "referenced_type" : "type-17198", ++ "self_type" : "type-17197", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148079,8 +148121,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-16601", +- "self_type" : "type-16600", ++ "referenced_type" : "type-17258", ++ "self_type" : "type-17257", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148088,8 +148130,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-16667", +- "self_type" : "type-16666", ++ "referenced_type" : "type-17371", ++ "self_type" : "type-17370", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148097,8 +148139,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-16805", +- "self_type" : "type-16804", ++ "referenced_type" : "type-17437", ++ "self_type" : "type-17436", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148106,8 +148148,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-16884", +- "self_type" : "type-16883", ++ "referenced_type" : "type-17575", ++ "self_type" : "type-17574", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148115,8 +148157,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-17053", +- "self_type" : "type-17052", ++ "referenced_type" : "type-17654", ++ "self_type" : "type-17653", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148124,8 +148166,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-17382", +- "self_type" : "type-17381", ++ "referenced_type" : "type-17823", ++ "self_type" : "type-17822", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148133,8 +148175,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-17428", +- "self_type" : "type-17427", ++ "referenced_type" : "type-18160", ++ "self_type" : "type-18159", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148142,8 +148184,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-17888", +- "self_type" : "type-17887", ++ "referenced_type" : "type-18206", ++ "self_type" : "type-18205", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148151,8 +148193,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-17902", +- "self_type" : "type-17901", ++ "referenced_type" : "type-18666", ++ "self_type" : "type-18665", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148160,8 +148202,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-17979", +- "self_type" : "type-17978", ++ "referenced_type" : "type-18680", ++ "self_type" : "type-18679", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148169,8 +148211,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-18248", +- "self_type" : "type-18247", ++ "referenced_type" : "type-18757", ++ "self_type" : "type-18756", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148178,26 +148220,26 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-18528", +- "self_type" : "type-18527", ++ "referenced_type" : "type-19026", ++ "self_type" : "type-19025", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-18892", +- "self_type" : "type-18891", ++ "referenced_type" : "type-19306", ++ "self_type" : "type-19305", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" + }, + { + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-19133", +- "self_type" : "type-19132", ++ "referenced_type" : "type-19670", ++ "self_type" : "type-19669", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148205,8 +148247,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-20271", +- "self_type" : "type-20270", ++ "referenced_type" : "type-20275", ++ "self_type" : "type-20274", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148214,8 +148256,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-20336", +- "self_type" : "type-20335", ++ "referenced_type" : "type-20340", ++ "self_type" : "type-20339", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148223,8 +148265,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-20823", +- "self_type" : "type-20822", ++ "referenced_type" : "type-20831", ++ "self_type" : "type-20830", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148232,8 +148274,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-20959", +- "self_type" : "type-20958", ++ "referenced_type" : "type-20967", ++ "self_type" : "type-20966", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148241,8 +148283,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-21020", +- "self_type" : "type-21019", ++ "referenced_type" : "type-21028", ++ "self_type" : "type-21027", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148250,8 +148292,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-21133", +- "self_type" : "type-21132", ++ "referenced_type" : "type-21141", ++ "self_type" : "type-21140", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148268,8 +148310,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-21199", +- "self_type" : "type-21198", ++ "referenced_type" : "type-21207", ++ "self_type" : "type-21206", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148277,8 +148319,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-21337", +- "self_type" : "type-21336", ++ "referenced_type" : "type-21345", ++ "self_type" : "type-21344", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148286,8 +148328,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-21416", +- "self_type" : "type-21415", ++ "referenced_type" : "type-21424", ++ "self_type" : "type-21423", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148295,8 +148337,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-21585", +- "self_type" : "type-21584", ++ "referenced_type" : "type-21593", ++ "self_type" : "type-21592", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149231,8 +149273,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-15739", +- "self_type" : "type-15738", ++ "referenced_type" : "type-15380", ++ "self_type" : "type-15379", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149240,8 +149282,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-15804", +- "self_type" : "type-15803", ++ "referenced_type" : "type-16512", ++ "self_type" : "type-16511", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149249,8 +149291,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-16294", +- "self_type" : "type-16293", ++ "referenced_type" : "type-16577", ++ "self_type" : "type-16576", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149258,8 +149300,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-16320", +- "self_type" : "type-16319", ++ "referenced_type" : "type-17064", ++ "self_type" : "type-17063", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149267,8 +149309,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-16490", +- "self_type" : "type-16489", ++ "referenced_type" : "type-17090", ++ "self_type" : "type-17089", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149276,8 +149318,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-16603", +- "self_type" : "type-16602", ++ "referenced_type" : "type-17260", ++ "self_type" : "type-17259", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149285,8 +149327,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-16669", +- "self_type" : "type-16668", ++ "referenced_type" : "type-17373", ++ "self_type" : "type-17372", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149294,8 +149336,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-16807", +- "self_type" : "type-16806", ++ "referenced_type" : "type-17439", ++ "self_type" : "type-17438", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149303,8 +149345,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-16886", +- "self_type" : "type-16885", ++ "referenced_type" : "type-17577", ++ "self_type" : "type-17576", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149312,8 +149354,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-17055", +- "self_type" : "type-17054", ++ "referenced_type" : "type-17656", ++ "self_type" : "type-17655", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149321,8 +149363,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-17384", +- "self_type" : "type-17383", ++ "referenced_type" : "type-17825", ++ "self_type" : "type-17824", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149330,8 +149372,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-17430", +- "self_type" : "type-17429", ++ "referenced_type" : "type-18162", ++ "self_type" : "type-18161", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149339,8 +149381,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-17890", +- "self_type" : "type-17889", ++ "referenced_type" : "type-18208", ++ "self_type" : "type-18207", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149348,8 +149390,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-17921", +- "self_type" : "type-17920", ++ "referenced_type" : "type-18668", ++ "self_type" : "type-18667", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149357,8 +149399,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-17981", +- "self_type" : "type-17980", ++ "referenced_type" : "type-18699", ++ "self_type" : "type-18698", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149366,8 +149408,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-18250", +- "self_type" : "type-18249", ++ "referenced_type" : "type-18759", ++ "self_type" : "type-18758", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149375,8 +149417,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-18543", +- "self_type" : "type-18542", ++ "referenced_type" : "type-19028", ++ "self_type" : "type-19027", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149384,8 +149426,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-18894", +- "self_type" : "type-18893", ++ "referenced_type" : "type-19321", ++ "self_type" : "type-19320", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149393,8 +149435,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-19135", +- "self_type" : "type-19134", ++ "referenced_type" : "type-19672", ++ "self_type" : "type-19671", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149402,8 +149444,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-20273", +- "self_type" : "type-20272", ++ "referenced_type" : "type-20277", ++ "self_type" : "type-20276", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149411,8 +149453,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-20338", +- "self_type" : "type-20337", ++ "referenced_type" : "type-20342", ++ "self_type" : "type-20341", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149420,8 +149462,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-20825", +- "self_type" : "type-20824", ++ "referenced_type" : "type-20833", ++ "self_type" : "type-20832", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149429,8 +149471,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-20851", +- "self_type" : "type-20850", ++ "referenced_type" : "type-20859", ++ "self_type" : "type-20858", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149438,8 +149480,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-21022", +- "self_type" : "type-21021", ++ "referenced_type" : "type-21030", ++ "self_type" : "type-21029", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149447,8 +149489,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-21135", +- "self_type" : "type-21134", ++ "referenced_type" : "type-21143", ++ "self_type" : "type-21142", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149456,8 +149498,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-21201", +- "self_type" : "type-21200", ++ "referenced_type" : "type-21209", ++ "self_type" : "type-21208", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149474,8 +149516,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-21339", +- "self_type" : "type-21338", ++ "referenced_type" : "type-21347", ++ "self_type" : "type-21346", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149483,8 +149525,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-21418", +- "self_type" : "type-21417", ++ "referenced_type" : "type-21426", ++ "self_type" : "type-21425", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149492,8 +149534,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-21587", +- "self_type" : "type-21586", ++ "referenced_type" : "type-21595", ++ "self_type" : "type-21594", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -150410,8 +150452,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::Status (*)(const google::protobuf::util::converter::ProtoStreamObjectSource *, const google::protobuf::Type &, google::protobuf::StringPiece, google::protobuf::util::converter::ObjectWriter *)", + "name" : "google::protobuf::util::Status (*)(const google::protobuf::util::converter::ProtoStreamObjectSource *, const google::protobuf::Type &, google::protobuf::StringPiece, google::protobuf::util::converter::ObjectWriter *)", +- "referenced_type" : "type-19321", +- "self_type" : "type-19320", ++ "referenced_type" : "type-15566", ++ "self_type" : "type-15565", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -150419,8 +150461,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::Status (*)(google::protobuf::util::converter::ProtoStreamObjectWriter *, const google::protobuf::util::converter::DataPiece &)", + "name" : "google::protobuf::util::Status (*)(google::protobuf::util::converter::ProtoStreamObjectWriter *, const google::protobuf::util::converter::DataPiece &)", +- "referenced_type" : "type-19454", +- "self_type" : "type-19453", ++ "referenced_type" : "type-15698", ++ "self_type" : "type-15697", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -150428,8 +150470,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::Status (*)(google::protobuf::util::converter::ProtoStreamObjectWriter *, google::protobuf::StringPiece)", + "name" : "google::protobuf::util::Status (*)(google::protobuf::util::converter::ProtoStreamObjectWriter *, google::protobuf::StringPiece)", +- "referenced_type" : "type-19440", +- "self_type" : "type-19439", ++ "referenced_type" : "type-15684", ++ "self_type" : "type-15683", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -150437,8 +150479,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::Status (**)(const google::protobuf::util::converter::ProtoStreamObjectSource *, const google::protobuf::Type &, google::protobuf::StringPiece, google::protobuf::util::converter::ObjectWriter *)", + "name" : "google::protobuf::util::Status (**)(const google::protobuf::util::converter::ProtoStreamObjectSource *, const google::protobuf::Type &, google::protobuf::StringPiece, google::protobuf::util::converter::ObjectWriter *)", +- "referenced_type" : "type-19320", +- "self_type" : "type-19431", ++ "referenced_type" : "type-15565", ++ "self_type" : "type-15675", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h" + }, +@@ -150446,8 +150488,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::Status (**)(google::protobuf::util::converter::ProtoStreamObjectWriter *, const google::protobuf::util::converter::DataPiece &)", + "name" : "google::protobuf::util::Status (**)(google::protobuf::util::converter::ProtoStreamObjectWriter *, const google::protobuf::util::converter::DataPiece &)", +- "referenced_type" : "type-19453", +- "self_type" : "type-19452", ++ "referenced_type" : "type-15697", ++ "self_type" : "type-15696", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, +@@ -150473,8 +150515,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::StatusOr *", + "name" : "google::protobuf::util::StatusOr *", +- "referenced_type" : "type-19955", +- "self_type" : "type-19956", ++ "referenced_type" : "type-16199", ++ "self_type" : "type-16200", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -150483,7 +150525,7 @@ + "linker_set_key" : "google::protobuf::util::StatusOr *", + "name" : "google::protobuf::util::StatusOr *", + "referenced_type" : "type-15277", +- "self_type" : "type-19952", ++ "self_type" : "type-16196", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -150608,8 +150650,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::JsonObjectWriter *", + "name" : "google::protobuf::util::converter::JsonObjectWriter *", +- "referenced_type" : "type-19149", +- "self_type" : "type-19152", ++ "referenced_type" : "type-15394", ++ "self_type" : "type-15397", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, +@@ -150617,8 +150659,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::JsonObjectWriter::ByteSinkWrapper *", + "name" : "google::protobuf::util::converter::JsonObjectWriter::ByteSinkWrapper *", +- "referenced_type" : "type-19151", +- "self_type" : "type-19153", ++ "referenced_type" : "type-15396", ++ "self_type" : "type-15398", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, +@@ -150626,8 +150668,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::JsonObjectWriter::Element *", + "name" : "google::protobuf::util::converter::JsonObjectWriter::Element *", +- "referenced_type" : "type-19138", +- "self_type" : "type-19137", ++ "referenced_type" : "type-15383", ++ "self_type" : "type-15382", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -150635,8 +150677,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::JsonStreamParser *", + "name" : "google::protobuf::util::converter::JsonStreamParser *", +- "referenced_type" : "type-19283", +- "self_type" : "type-19289", ++ "referenced_type" : "type-15528", ++ "self_type" : "type-15534", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h" + }, +@@ -150644,8 +150686,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::JsonStreamParser::NumberResult *", + "name" : "google::protobuf::util::converter::JsonStreamParser::NumberResult *", +- "referenced_type" : "type-19292", +- "self_type" : "type-19295", ++ "referenced_type" : "type-15537", ++ "self_type" : "type-15540", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h" + }, +@@ -150671,8 +150713,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ObjectLocationTracker *", + "name" : "google::protobuf::util::converter::ObjectLocationTracker *", +- "referenced_type" : "type-19644", +- "self_type" : "type-19645", ++ "referenced_type" : "type-15888", ++ "self_type" : "type-15889", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/object_location_tracker.h" + }, +@@ -150680,8 +150722,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ObjectSource *", + "name" : "google::protobuf::util::converter::ObjectSource *", +- "referenced_type" : "type-19326", +- "self_type" : "type-19427", ++ "referenced_type" : "type-15570", ++ "self_type" : "type-15671", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/object_source.h" + }, +@@ -150698,8 +150740,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectSource *", + "name" : "google::protobuf::util::converter::ProtoStreamObjectSource *", +- "referenced_type" : "type-19324", +- "self_type" : "type-19430", ++ "referenced_type" : "type-15569", ++ "self_type" : "type-15674", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h" + }, +@@ -150707,8 +150749,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectWriter *", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter *", +- "referenced_type" : "type-19442", +- "self_type" : "type-19441", ++ "referenced_type" : "type-15686", ++ "self_type" : "type-15685", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -150716,8 +150758,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectWriter::AnyWriter *", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter::AnyWriter *", +- "referenced_type" : "type-19448", +- "self_type" : "type-19447", ++ "referenced_type" : "type-15692", ++ "self_type" : "type-15691", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -150725,8 +150767,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Item *", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Item *", +- "referenced_type" : "type-19445", +- "self_type" : "type-19444", ++ "referenced_type" : "type-15689", ++ "self_type" : "type-15688", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -150734,8 +150776,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Options *", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Options *", +- "referenced_type" : "type-19457", +- "self_type" : "type-19639", ++ "referenced_type" : "type-15701", ++ "self_type" : "type-15883", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, +@@ -150743,8 +150785,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoWriter *", + "name" : "google::protobuf::util::converter::ProtoWriter *", +- "referenced_type" : "type-19458", +- "self_type" : "type-19462", ++ "referenced_type" : "type-15702", ++ "self_type" : "type-15706", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, +@@ -150752,8 +150794,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoWriter::ProtoElement *", + "name" : "google::protobuf::util::converter::ProtoWriter::ProtoElement *", +- "referenced_type" : "type-19461", +- "self_type" : "type-19460", ++ "referenced_type" : "type-15705", ++ "self_type" : "type-15704", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -150761,8 +150803,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::StructuredObjectWriter *", + "name" : "google::protobuf::util::converter::StructuredObjectWriter *", +- "referenced_type" : "type-19143", +- "self_type" : "type-19144", ++ "referenced_type" : "type-15388", ++ "self_type" : "type-15389", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/structured_objectwriter.h" + }, +@@ -150770,8 +150812,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::StructuredObjectWriter::BaseElement *", + "name" : "google::protobuf::util::converter::StructuredObjectWriter::BaseElement *", +- "referenced_type" : "type-19139", +- "self_type" : "type-19141", ++ "referenced_type" : "type-15384", ++ "self_type" : "type-15386", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -150851,8 +150893,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node *", + "name" : "std::__tree_node *", +- "referenced_type" : "type-16939", +- "self_type" : "type-16938", ++ "referenced_type" : "type-17709", ++ "self_type" : "type-17708", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -150860,8 +150902,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node *", + "name" : "std::__tree_node *", +- "referenced_type" : "type-21471", +- "self_type" : "type-21470", ++ "referenced_type" : "type-21479", ++ "self_type" : "type-21478", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -150914,8 +150956,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node *>, void *> *", + "name" : "std::__tree_node *>, void *> *", +- "referenced_type" : "type-16929", +- "self_type" : "type-16928", ++ "referenced_type" : "type-17699", ++ "self_type" : "type-17698", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -150923,8 +150965,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node *>, void *> *", + "name" : "std::__tree_node *>, void *> *", +- "referenced_type" : "type-21461", +- "self_type" : "type-21460", ++ "referenced_type" : "type-21469", ++ "self_type" : "type-21468", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -150995,8 +151037,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", + "name" : "std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", +- "referenced_type" : "type-17512", +- "self_type" : "type-17511", ++ "referenced_type" : "type-18290", ++ "self_type" : "type-18289", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -151004,8 +151046,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", + "name" : "std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", +- "referenced_type" : "type-18818", +- "self_type" : "type-18817", ++ "referenced_type" : "type-19596", ++ "self_type" : "type-19595", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -151085,8 +151127,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node, std::allocator > *, void *> *", + "name" : "std::__tree_node, std::allocator > *, void *> *", +- "referenced_type" : "type-17521", +- "self_type" : "type-17520", ++ "referenced_type" : "type-18299", ++ "self_type" : "type-18298", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -151094,8 +151136,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node, std::allocator > *, void *> *", + "name" : "std::__tree_node, std::allocator > *, void *> *", +- "referenced_type" : "type-18820", +- "self_type" : "type-18819", ++ "referenced_type" : "type-19598", ++ "self_type" : "type-19597", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -151256,8 +151298,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-15420", +- "self_type" : "type-15419", ++ "referenced_type" : "type-15677", ++ "self_type" : "type-15676", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151265,8 +151307,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-16004", +- "self_type" : "type-16003", ++ "referenced_type" : "type-15740", ++ "self_type" : "type-15739", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151274,17 +151316,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-17172", +- "self_type" : "type-17171", ++ "referenced_type" : "type-15911", ++ "self_type" : "type-15910", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-17733", +- "self_type" : "type-17732", ++ "referenced_type" : "type-16002", ++ "self_type" : "type-16001", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151292,8 +151334,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-18000", +- "self_type" : "type-17999", ++ "referenced_type" : "type-16775", ++ "self_type" : "type-16774", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151301,17 +151343,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-18141", +- "self_type" : "type-18140", ++ "referenced_type" : "type-17942", ++ "self_type" : "type-17941", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-18420", +- "self_type" : "type-18419", ++ "referenced_type" : "type-18511", ++ "self_type" : "type-18510", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151319,8 +151361,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-19433", +- "self_type" : "type-19432", ++ "referenced_type" : "type-18778", ++ "self_type" : "type-18777", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151328,8 +151370,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-19496", +- "self_type" : "type-19495", ++ "referenced_type" : "type-18919", ++ "self_type" : "type-18918", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151337,8 +151379,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-19667", +- "self_type" : "type-19666", ++ "referenced_type" : "type-19198", ++ "self_type" : "type-19197", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151346,8 +151388,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-19758", +- "self_type" : "type-19757", ++ "referenced_type" : "type-19953", ++ "self_type" : "type-19952", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151355,8 +151397,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-20536", +- "self_type" : "type-20535", ++ "referenced_type" : "type-20543", ++ "self_type" : "type-20542", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151364,8 +151406,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-21704", +- "self_type" : "type-21703", ++ "referenced_type" : "type-21712", ++ "self_type" : "type-21711", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -151814,8 +151856,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-15426", +- "self_type" : "type-15425", ++ "referenced_type" : "type-15679", ++ "self_type" : "type-15678", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151823,8 +151865,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-16006", +- "self_type" : "type-16005", ++ "referenced_type" : "type-15742", ++ "self_type" : "type-15741", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151832,17 +151874,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-17174", +- "self_type" : "type-17173", ++ "referenced_type" : "type-15913", ++ "self_type" : "type-15912", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-17735", +- "self_type" : "type-17734", ++ "referenced_type" : "type-16045", ++ "self_type" : "type-16044", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151850,8 +151892,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-18002", +- "self_type" : "type-18001", ++ "referenced_type" : "type-16777", ++ "self_type" : "type-16776", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151859,17 +151901,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-18143", +- "self_type" : "type-18142", ++ "referenced_type" : "type-17944", ++ "self_type" : "type-17943", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-18422", +- "self_type" : "type-18421", ++ "referenced_type" : "type-18513", ++ "self_type" : "type-18512", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151877,8 +151919,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-19435", +- "self_type" : "type-19434", ++ "referenced_type" : "type-18780", ++ "self_type" : "type-18779", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151886,8 +151928,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-19498", +- "self_type" : "type-19497", ++ "referenced_type" : "type-18921", ++ "self_type" : "type-18920", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151895,8 +151937,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-19669", +- "self_type" : "type-19668", ++ "referenced_type" : "type-19200", ++ "self_type" : "type-19199", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151904,8 +151946,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-19801", +- "self_type" : "type-19800", ++ "referenced_type" : "type-19959", ++ "self_type" : "type-19958", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151913,8 +151955,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-20538", +- "self_type" : "type-20537", ++ "referenced_type" : "type-20545", ++ "self_type" : "type-20544", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151922,8 +151964,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-21706", +- "self_type" : "type-21705", ++ "referenced_type" : "type-21714", ++ "self_type" : "type-21713", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -152912,17 +152954,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-15405", +- "self_type" : "type-15404", ++ "referenced_type" : "type-15373", ++ "self_type" : "type-15372", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-15448", +- "self_type" : "type-15447", ++ "referenced_type" : "type-1551", ++ "self_type" : "type-1550", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -152930,26 +152972,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-15468", +- "self_type" : "type-15467", ++ "referenced_type" : "type-15543", ++ "self_type" : "type-15542", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > *", +- "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-15481", +- "self_type" : "type-15480", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-15500", +- "self_type" : "type-15499", ++ "referenced_type" : "type-15577", ++ "self_type" : "type-15576", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152957,10 +152990,10 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-1551", +- "self_type" : "type-1550", ++ "referenced_type" : "type-15681", ++ "self_type" : "type-15680", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, +@@ -152975,10 +153008,10 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-15812", +- "self_type" : "type-15811", ++ "referenced_type" : "type-15777", ++ "self_type" : "type-15776", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "alignment" : 4, +@@ -152993,8 +153026,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-15995", +- "self_type" : "type-15994", ++ "referenced_type" : "type-15903", ++ "self_type" : "type-15902", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153002,8 +153035,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16043", +- "self_type" : "type-16042", ++ "referenced_type" : "type-16063", ++ "self_type" : "type-16062", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153011,8 +153044,35 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16227", +- "self_type" : "type-16226", ++ "referenced_type" : "type-16218", ++ "self_type" : "type-16217", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > *", ++ "name" : "std::basic_string, std::allocator > *", ++ "referenced_type" : "type-16241", ++ "self_type" : "type-16240", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > *", ++ "name" : "std::basic_string, std::allocator > *", ++ "referenced_type" : "type-16254", ++ "self_type" : "type-16253", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > *", ++ "name" : "std::basic_string, std::allocator > *", ++ "referenced_type" : "type-16273", ++ "self_type" : "type-16272", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153020,17 +153080,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16288", +- "self_type" : "type-16287", ++ "referenced_type" : "type-16585", ++ "self_type" : "type-16584", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16324", +- "self_type" : "type-16323", ++ "referenced_type" : "type-16766", ++ "self_type" : "type-16765", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153038,17 +153098,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16336", +- "self_type" : "type-16335", ++ "referenced_type" : "type-16814", ++ "self_type" : "type-16813", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16430", +- "self_type" : "type-16429", ++ "referenced_type" : "type-16997", ++ "self_type" : "type-16996", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153056,8 +153116,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16505", +- "self_type" : "type-16504", ++ "referenced_type" : "type-17058", ++ "self_type" : "type-17057", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > *", ++ "name" : "std::basic_string, std::allocator > *", ++ "referenced_type" : "type-17094", ++ "self_type" : "type-17093", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153065,17 +153134,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16597", +- "self_type" : "type-16596", ++ "referenced_type" : "type-17106", ++ "self_type" : "type-17105", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16609", +- "self_type" : "type-16608", ++ "referenced_type" : "type-17200", ++ "self_type" : "type-17199", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153083,8 +153152,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16676", +- "self_type" : "type-16675", ++ "referenced_type" : "type-17275", ++ "self_type" : "type-17274", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153092,8 +153161,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16705", +- "self_type" : "type-16704", ++ "referenced_type" : "type-17367", ++ "self_type" : "type-17366", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -153101,8 +153170,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16738", +- "self_type" : "type-16737", ++ "referenced_type" : "type-17379", ++ "self_type" : "type-17378", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153110,8 +153179,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16822", +- "self_type" : "type-16821", ++ "referenced_type" : "type-17446", ++ "self_type" : "type-17445", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153119,8 +153188,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16851", +- "self_type" : "type-16850", ++ "referenced_type" : "type-17475", ++ "self_type" : "type-17474", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > *", ++ "name" : "std::basic_string, std::allocator > *", ++ "referenced_type" : "type-17508", ++ "self_type" : "type-17507", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153128,8 +153206,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16895", +- "self_type" : "type-16894", ++ "referenced_type" : "type-1753", ++ "self_type" : "type-1752", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153137,8 +153215,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-17136", +- "self_type" : "type-17135", ++ "referenced_type" : "type-17592", ++ "self_type" : "type-17591", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153146,8 +153224,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-17227", +- "self_type" : "type-17226", ++ "referenced_type" : "type-17621", ++ "self_type" : "type-17620", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153155,8 +153233,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-17320", +- "self_type" : "type-17319", ++ "referenced_type" : "type-17665", ++ "self_type" : "type-17664", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153164,8 +153242,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-17437", +- "self_type" : "type-17436", ++ "referenced_type" : "type-17906", ++ "self_type" : "type-17905", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153173,8 +153251,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-1753", +- "self_type" : "type-1752", ++ "referenced_type" : "type-17997", ++ "self_type" : "type-17996", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153182,17 +153260,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-17644", +- "self_type" : "type-17643", ++ "referenced_type" : "type-18090", ++ "self_type" : "type-18089", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-17651", +- "self_type" : "type-17650", ++ "referenced_type" : "type-18215", ++ "self_type" : "type-18214", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153200,17 +153278,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-17788", +- "self_type" : "type-17787", ++ "referenced_type" : "type-18422", ++ "self_type" : "type-18421", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-17816", +- "self_type" : "type-17815", ++ "referenced_type" : "type-18429", ++ "self_type" : "type-18428", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153218,26 +153296,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-17904", +- "self_type" : "type-17903", ++ "referenced_type" : "type-185", ++ "self_type" : "type-184", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-17983", +- "self_type" : "type-17982", ++ "referenced_type" : "type-18566", ++ "self_type" : "type-18565", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18012", +- "self_type" : "type-18011", ++ "referenced_type" : "type-18594", ++ "self_type" : "type-18593", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153245,8 +153323,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18091", +- "self_type" : "type-18090", ++ "referenced_type" : "type-18682", ++ "self_type" : "type-18681", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153254,8 +153332,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18145", +- "self_type" : "type-18144", ++ "referenced_type" : "type-18761", ++ "self_type" : "type-18760", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153263,26 +153341,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18224", +- "self_type" : "type-18223", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message_lite.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > *", +- "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18304", +- "self_type" : "type-18303", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > *", +- "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18308", +- "self_type" : "type-18307", ++ "referenced_type" : "type-18790", ++ "self_type" : "type-18789", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153290,8 +153350,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18429", +- "self_type" : "type-18428", ++ "referenced_type" : "type-18869", ++ "self_type" : "type-18868", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153299,17 +153359,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-185", +- "self_type" : "type-184", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > *", +- "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18690", +- "self_type" : "type-18689", ++ "referenced_type" : "type-18923", ++ "self_type" : "type-18922", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153317,26 +153368,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18768", +- "self_type" : "type-18767", ++ "referenced_type" : "type-19002", ++ "self_type" : "type-19001", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/message_lite.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18770", +- "self_type" : "type-18769", ++ "referenced_type" : "type-19082", ++ "self_type" : "type-19081", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18783", +- "self_type" : "type-18782", ++ "referenced_type" : "type-19086", ++ "self_type" : "type-19085", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153344,8 +153395,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18911", +- "self_type" : "type-18910", ++ "referenced_type" : "type-19207", ++ "self_type" : "type-19206", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153353,26 +153404,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19109", +- "self_type" : "type-19108", ++ "referenced_type" : "type-19468", ++ "self_type" : "type-19467", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19120", +- "self_type" : "type-19119", ++ "referenced_type" : "type-19546", ++ "self_type" : "type-19545", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19128", +- "self_type" : "type-19127", ++ "referenced_type" : "type-19548", ++ "self_type" : "type-19547", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153380,17 +153431,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19298", +- "self_type" : "type-19297", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > *", +- "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19333", +- "self_type" : "type-19332", ++ "referenced_type" : "type-19561", ++ "self_type" : "type-19560", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153398,8 +153440,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19437", +- "self_type" : "type-19436", ++ "referenced_type" : "type-19689", ++ "self_type" : "type-19688", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153407,44 +153449,44 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19533", +- "self_type" : "type-19532", ++ "referenced_type" : "type-197", ++ "self_type" : "type-196", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19659", +- "self_type" : "type-19658", ++ "referenced_type" : "type-19887", ++ "self_type" : "type-19886", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-197", +- "self_type" : "type-196", ++ "referenced_type" : "type-19898", ++ "self_type" : "type-19897", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19819", +- "self_type" : "type-19818", ++ "referenced_type" : "type-19938", ++ "self_type" : "type-19937", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19974", +- "self_type" : "type-19973", ++ "referenced_type" : "type-19981", ++ "self_type" : "type-19980", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -153452,8 +153494,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19997", +- "self_type" : "type-19996", ++ "referenced_type" : "type-20001", ++ "self_type" : "type-20000", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -153461,8 +153503,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20010", +- "self_type" : "type-20009", ++ "referenced_type" : "type-20014", ++ "self_type" : "type-20013", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -153470,8 +153512,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20033", +- "self_type" : "type-20032", ++ "referenced_type" : "type-20037", ++ "self_type" : "type-20036", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153479,8 +153521,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20346", +- "self_type" : "type-20345", ++ "referenced_type" : "type-20350", ++ "self_type" : "type-20349", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153488,8 +153530,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20527", +- "self_type" : "type-20526", ++ "referenced_type" : "type-20534", ++ "self_type" : "type-20533", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153497,8 +153539,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20575", +- "self_type" : "type-20574", ++ "referenced_type" : "type-20582", ++ "self_type" : "type-20581", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153506,8 +153548,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20758", +- "self_type" : "type-20757", ++ "referenced_type" : "type-20766", ++ "self_type" : "type-20765", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153515,8 +153557,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20819", +- "self_type" : "type-20818", ++ "referenced_type" : "type-20827", ++ "self_type" : "type-20826", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" + }, +@@ -153524,8 +153566,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20855", +- "self_type" : "type-20854", ++ "referenced_type" : "type-20863", ++ "self_type" : "type-20862", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153533,8 +153575,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20867", +- "self_type" : "type-20866", ++ "referenced_type" : "type-20875", ++ "self_type" : "type-20874", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, +@@ -153542,8 +153584,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20961", +- "self_type" : "type-20960", ++ "referenced_type" : "type-20969", ++ "self_type" : "type-20968", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153551,8 +153593,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21037", +- "self_type" : "type-21036", ++ "referenced_type" : "type-21045", ++ "self_type" : "type-21044", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153560,8 +153602,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21129", +- "self_type" : "type-21128", ++ "referenced_type" : "type-21137", ++ "self_type" : "type-21136", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -153569,8 +153611,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21141", +- "self_type" : "type-21140", ++ "referenced_type" : "type-21149", ++ "self_type" : "type-21148", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153578,8 +153620,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21208", +- "self_type" : "type-21207", ++ "referenced_type" : "type-21216", ++ "self_type" : "type-21215", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153587,8 +153629,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21237", +- "self_type" : "type-21236", ++ "referenced_type" : "type-21245", ++ "self_type" : "type-21244", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -153596,8 +153638,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21270", +- "self_type" : "type-21269", ++ "referenced_type" : "type-21278", ++ "self_type" : "type-21277", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153605,8 +153647,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21354", +- "self_type" : "type-21353", ++ "referenced_type" : "type-21362", ++ "self_type" : "type-21361", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153614,8 +153656,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21383", +- "self_type" : "type-21382", ++ "referenced_type" : "type-21391", ++ "self_type" : "type-21390", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153623,8 +153665,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21427", +- "self_type" : "type-21426", ++ "referenced_type" : "type-21435", ++ "self_type" : "type-21434", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153632,8 +153674,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21668", +- "self_type" : "type-21667", ++ "referenced_type" : "type-21676", ++ "self_type" : "type-21675", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153641,8 +153683,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21759", +- "self_type" : "type-21758", ++ "referenced_type" : "type-21767", ++ "self_type" : "type-21766", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153650,8 +153692,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21852", +- "self_type" : "type-21851", ++ "referenced_type" : "type-21860", ++ "self_type" : "type-21859", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -156117,7 +156159,7 @@ + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", + "referenced_type" : "type-14963", +- "self_type" : "type-15384", ++ "self_type" : "type-15524", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -156134,8 +156176,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-15499", +- "self_type" : "type-15566", ++ "referenced_type" : "type-15372", ++ "self_type" : "type-15407", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156143,8 +156185,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-15811", +- "self_type" : "type-15838", ++ "referenced_type" : "type-15576", ++ "self_type" : "type-15599", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156152,8 +156194,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-15994", +- "self_type" : "type-15993", ++ "referenced_type" : "type-15680", ++ "self_type" : "type-15794", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156161,8 +156203,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16042", +- "self_type" : "type-16106", ++ "referenced_type" : "type-15902", ++ "self_type" : "type-15964", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156170,8 +156212,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16226", +- "self_type" : "type-16256", ++ "referenced_type" : "type-16062", ++ "self_type" : "type-16074", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156179,8 +156221,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16323", +- "self_type" : "type-16344", ++ "referenced_type" : "type-16272", ++ "self_type" : "type-16339", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156188,8 +156230,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16429", +- "self_type" : "type-16443", ++ "referenced_type" : "type-16584", ++ "self_type" : "type-16611", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156197,8 +156239,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16504", +- "self_type" : "type-16585", ++ "referenced_type" : "type-16765", ++ "self_type" : "type-16764", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156206,8 +156248,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16608", +- "self_type" : "type-16623", ++ "referenced_type" : "type-16813", ++ "self_type" : "type-16876", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156215,8 +156257,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16675", +- "self_type" : "type-16729", ++ "referenced_type" : "type-16996", ++ "self_type" : "type-17026", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156224,8 +156266,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16737", +- "self_type" : "type-16758", ++ "referenced_type" : "type-17093", ++ "self_type" : "type-17114", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156233,8 +156275,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16821", +- "self_type" : "type-16838", ++ "referenced_type" : "type-17199", ++ "self_type" : "type-17213", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156242,8 +156284,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16850", +- "self_type" : "type-16855", ++ "referenced_type" : "type-17274", ++ "self_type" : "type-17355", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156251,26 +156293,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16894", +- "self_type" : "type-17056", ++ "referenced_type" : "type-17378", ++ "self_type" : "type-17393", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-17135", +- "self_type" : "type-17180", ++ "referenced_type" : "type-17445", ++ "self_type" : "type-17499", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-17226", +- "self_type" : "type-17261", ++ "referenced_type" : "type-17507", ++ "self_type" : "type-17528", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156278,8 +156320,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-17319", +- "self_type" : "type-17334", ++ "referenced_type" : "type-1752", ++ "self_type" : "type-1858", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156287,8 +156329,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-17436", +- "self_type" : "type-17585", ++ "referenced_type" : "type-17591", ++ "self_type" : "type-17608", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156296,8 +156338,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-1752", +- "self_type" : "type-1858", ++ "referenced_type" : "type-17620", ++ "self_type" : "type-17625", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156305,8 +156347,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-17650", +- "self_type" : "type-17725", ++ "referenced_type" : "type-17664", ++ "self_type" : "type-17826", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -156314,17 +156356,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-17815", +- "self_type" : "type-17833", ++ "referenced_type" : "type-17905", ++ "self_type" : "type-17950", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-17903", +- "self_type" : "type-17923", ++ "referenced_type" : "type-17996", ++ "self_type" : "type-18031", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156332,8 +156374,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-17982", +- "self_type" : "type-18014", ++ "referenced_type" : "type-18089", ++ "self_type" : "type-18104", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156341,26 +156383,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-18011", +- "self_type" : "type-18010", ++ "referenced_type" : "type-18214", ++ "self_type" : "type-18363", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-18090", +- "self_type" : "type-18104", ++ "referenced_type" : "type-18428", ++ "self_type" : "type-18503", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-18144", +- "self_type" : "type-18168", ++ "referenced_type" : "type-18593", ++ "self_type" : "type-18611", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156368,8 +156410,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-18307", +- "self_type" : "type-18336", ++ "referenced_type" : "type-18681", ++ "self_type" : "type-18701", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156377,8 +156419,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-18428", +- "self_type" : "type-18464", ++ "referenced_type" : "type-18760", ++ "self_type" : "type-18792", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156386,17 +156428,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-18689", +- "self_type" : "type-18688", ++ "referenced_type" : "type-18789", ++ "self_type" : "type-18788", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-18769", +- "self_type" : "type-18830", ++ "referenced_type" : "type-18868", ++ "self_type" : "type-18882", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156404,17 +156446,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-18782", +- "self_type" : "type-19279", ++ "referenced_type" : "type-18922", ++ "self_type" : "type-18946", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-18910", +- "self_type" : "type-18924", ++ "referenced_type" : "type-19085", ++ "self_type" : "type-19114", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156422,8 +156464,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-19127", +- "self_type" : "type-19162", ++ "referenced_type" : "type-19206", ++ "self_type" : "type-19242", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156431,8 +156473,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-19332", +- "self_type" : "type-19355", ++ "referenced_type" : "type-19467", ++ "self_type" : "type-19466", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156440,8 +156482,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-19436", +- "self_type" : "type-19550", ++ "referenced_type" : "type-19547", ++ "self_type" : "type-19608", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156449,17 +156491,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-19658", +- "self_type" : "type-19720", ++ "referenced_type" : "type-19560", ++ "self_type" : "type-19917", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-19818", +- "self_type" : "type-19830", ++ "referenced_type" : "type-19688", ++ "self_type" : "type-19702", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156467,8 +156509,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-20032", +- "self_type" : "type-20099", ++ "referenced_type" : "type-20036", ++ "self_type" : "type-20103", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156476,8 +156518,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-20345", +- "self_type" : "type-20372", ++ "referenced_type" : "type-20349", ++ "self_type" : "type-20376", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156485,8 +156527,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-20526", +- "self_type" : "type-20525", ++ "referenced_type" : "type-20533", ++ "self_type" : "type-20532", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156494,8 +156536,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-20574", +- "self_type" : "type-20637", ++ "referenced_type" : "type-20581", ++ "self_type" : "type-20645", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156503,8 +156545,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-20757", +- "self_type" : "type-20787", ++ "referenced_type" : "type-20765", ++ "self_type" : "type-20795", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156512,8 +156554,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-20854", +- "self_type" : "type-20875", ++ "referenced_type" : "type-20862", ++ "self_type" : "type-20883", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156521,8 +156563,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-20960", +- "self_type" : "type-20974", ++ "referenced_type" : "type-20968", ++ "self_type" : "type-20982", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156530,8 +156572,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21036", +- "self_type" : "type-21117", ++ "referenced_type" : "type-21044", ++ "self_type" : "type-21125", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156539,8 +156581,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21140", +- "self_type" : "type-21155", ++ "referenced_type" : "type-21148", ++ "self_type" : "type-21163", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156548,8 +156590,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21207", +- "self_type" : "type-21261", ++ "referenced_type" : "type-21215", ++ "self_type" : "type-21269", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156557,8 +156599,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21269", +- "self_type" : "type-21290", ++ "referenced_type" : "type-21277", ++ "self_type" : "type-21298", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156566,8 +156608,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21353", +- "self_type" : "type-21370", ++ "referenced_type" : "type-21361", ++ "self_type" : "type-21378", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156575,8 +156617,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21382", +- "self_type" : "type-21387", ++ "referenced_type" : "type-21390", ++ "self_type" : "type-21395", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156584,8 +156626,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21426", +- "self_type" : "type-21588", ++ "referenced_type" : "type-21434", ++ "self_type" : "type-21596", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -156593,8 +156635,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21667", +- "self_type" : "type-21712", ++ "referenced_type" : "type-21675", ++ "self_type" : "type-21720", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -156602,8 +156644,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21758", +- "self_type" : "type-21793", ++ "referenced_type" : "type-21766", ++ "self_type" : "type-21801", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156611,8 +156653,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21851", +- "self_type" : "type-21866", ++ "referenced_type" : "type-21859", ++ "self_type" : "type-21874", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157934,8 +157976,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > *", + "name" : "std::map, std::allocator > > *", +- "referenced_type" : "type-17730", +- "self_type" : "type-17729", ++ "referenced_type" : "type-18508", ++ "self_type" : "type-18507", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -157970,8 +158012,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > *", + "name" : "std::map, std::allocator > > *", +- "referenced_type" : "type-19971", +- "self_type" : "type-19970", ++ "referenced_type" : "type-16215", ++ "self_type" : "type-16214", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158024,8 +158066,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > *", + "name" : "std::map, std::allocator > > *", +- "referenced_type" : "type-17635", +- "self_type" : "type-17634", ++ "referenced_type" : "type-18413", ++ "self_type" : "type-18412", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -158096,8 +158138,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *", + "name" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *", +- "referenced_type" : "type-16204", +- "self_type" : "type-16203", ++ "referenced_type" : "type-16974", ++ "self_type" : "type-16973", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158105,8 +158147,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *", + "name" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *", +- "referenced_type" : "type-20735", +- "self_type" : "type-20734", ++ "referenced_type" : "type-20743", ++ "self_type" : "type-20742", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158168,8 +158210,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *", + "name" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *", +- "referenced_type" : "type-16215", +- "self_type" : "type-16214", ++ "referenced_type" : "type-16985", ++ "self_type" : "type-16984", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158177,8 +158219,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *", + "name" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *", +- "referenced_type" : "type-20746", +- "self_type" : "type-20745", ++ "referenced_type" : "type-20754", ++ "self_type" : "type-20753", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158240,8 +158282,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *", +- "referenced_type" : "type-16029", +- "self_type" : "type-16028", ++ "referenced_type" : "type-16800", ++ "self_type" : "type-16799", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158249,8 +158291,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *", +- "referenced_type" : "type-20561", +- "self_type" : "type-20560", ++ "referenced_type" : "type-20568", ++ "self_type" : "type-20567", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158312,8 +158354,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *", + "name" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *", +- "referenced_type" : "type-16209", +- "self_type" : "type-16208", ++ "referenced_type" : "type-16979", ++ "self_type" : "type-16978", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158321,8 +158363,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *", + "name" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *", +- "referenced_type" : "type-20740", +- "self_type" : "type-20739", ++ "referenced_type" : "type-20748", ++ "self_type" : "type-20747", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158384,8 +158426,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *", + "name" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *", +- "referenced_type" : "type-16221", +- "self_type" : "type-16220", ++ "referenced_type" : "type-16991", ++ "self_type" : "type-16990", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158393,8 +158435,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *", + "name" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *", +- "referenced_type" : "type-20752", +- "self_type" : "type-20751", ++ "referenced_type" : "type-20760", ++ "self_type" : "type-20759", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158456,8 +158498,8 @@ + "alignment" : 4, + "linker_set_key" : "std::pair *", + "name" : "std::pair *", +- "referenced_type" : "type-16049", +- "self_type" : "type-16048", ++ "referenced_type" : "type-16820", ++ "self_type" : "type-16819", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -158465,8 +158507,8 @@ + "alignment" : 4, + "linker_set_key" : "std::pair *", + "name" : "std::pair *", +- "referenced_type" : "type-20581", +- "self_type" : "type-20580", ++ "referenced_type" : "type-20588", ++ "self_type" : "type-20587", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -158537,8 +158579,8 @@ + "alignment" : 4, + "linker_set_key" : "std::pair *", + "name" : "std::pair *", +- "referenced_type" : "type-18288", +- "self_type" : "type-18287", ++ "referenced_type" : "type-19066", ++ "self_type" : "type-19065", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -158573,8 +158615,8 @@ + "alignment" : 4, + "linker_set_key" : "std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", + "name" : "std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", +- "referenced_type" : "type-16949", +- "self_type" : "type-16948", ++ "referenced_type" : "type-17719", ++ "self_type" : "type-17718", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -158582,8 +158624,8 @@ + "alignment" : 4, + "linker_set_key" : "std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", + "name" : "std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", +- "referenced_type" : "type-21481", +- "self_type" : "type-21480", ++ "referenced_type" : "type-21489", ++ "self_type" : "type-21488", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -158654,8 +158696,8 @@ + "alignment" : 4, + "linker_set_key" : "std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", + "name" : "std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", +- "referenced_type" : "type-17527", +- "self_type" : "type-17526", ++ "referenced_type" : "type-18305", ++ "self_type" : "type-18304", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -158663,8 +158705,8 @@ + "alignment" : 4, + "linker_set_key" : "std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", + "name" : "std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", +- "referenced_type" : "type-18823", +- "self_type" : "type-18822", ++ "referenced_type" : "type-19601", ++ "self_type" : "type-19600", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -158744,8 +158786,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16093", +- "self_type" : "type-16092", ++ "referenced_type" : "type-16863", ++ "self_type" : "type-16862", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -158753,8 +158795,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16709", +- "self_type" : "type-16708", ++ "referenced_type" : "type-17479", ++ "self_type" : "type-17478", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -158762,8 +158804,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16877", +- "self_type" : "type-16876", ++ "referenced_type" : "type-17647", ++ "self_type" : "type-17646", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -158771,8 +158813,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20624", +- "self_type" : "type-20623", ++ "referenced_type" : "type-20632", ++ "self_type" : "type-20631", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -158780,8 +158822,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21241", +- "self_type" : "type-21240", ++ "referenced_type" : "type-21249", ++ "self_type" : "type-21248", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -158789,8 +158831,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21409", +- "self_type" : "type-21408", ++ "referenced_type" : "type-21417", ++ "self_type" : "type-21416", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -158951,8 +158993,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16299", +- "self_type" : "type-16298", ++ "referenced_type" : "type-17069", ++ "self_type" : "type-17068", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -158960,8 +159002,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20830", +- "self_type" : "type-20829", ++ "referenced_type" : "type-20838", ++ "self_type" : "type-20837", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159023,8 +159065,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16201", +- "self_type" : "type-16200", ++ "referenced_type" : "type-16971", ++ "self_type" : "type-16970", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159032,8 +159074,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20732", +- "self_type" : "type-20731", ++ "referenced_type" : "type-20740", ++ "self_type" : "type-20739", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159095,8 +159137,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16197", +- "self_type" : "type-16196", ++ "referenced_type" : "type-16967", ++ "self_type" : "type-16966", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159104,8 +159146,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20728", +- "self_type" : "type-20727", ++ "referenced_type" : "type-20736", ++ "self_type" : "type-20735", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159176,8 +159218,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-17728", +- "self_type" : "type-17727", ++ "referenced_type" : "type-18506", ++ "self_type" : "type-18505", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159554,8 +159596,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-15495", +- "self_type" : "type-15494", ++ "referenced_type" : "type-15409", ++ "self_type" : "type-15408", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159563,8 +159605,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-15840", +- "self_type" : "type-15839", ++ "referenced_type" : "type-15601", ++ "self_type" : "type-15600", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159572,8 +159614,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16108", +- "self_type" : "type-16107", ++ "referenced_type" : "type-15796", ++ "self_type" : "type-15795", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159581,8 +159623,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16258", +- "self_type" : "type-16257", ++ "referenced_type" : "type-15966", ++ "self_type" : "type-15965", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159590,8 +159632,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16346", +- "self_type" : "type-16345", ++ "referenced_type" : "type-16076", ++ "self_type" : "type-16075", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159599,8 +159641,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16445", +- "self_type" : "type-16444", ++ "referenced_type" : "type-16268", ++ "self_type" : "type-16267", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159617,8 +159659,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16587", +- "self_type" : "type-16586", ++ "referenced_type" : "type-16613", ++ "self_type" : "type-16612", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159626,8 +159668,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16625", +- "self_type" : "type-16624", ++ "referenced_type" : "type-16878", ++ "self_type" : "type-16877", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159635,8 +159677,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16732", +- "self_type" : "type-16731", ++ "referenced_type" : "type-17028", ++ "self_type" : "type-17027", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159644,8 +159686,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16760", +- "self_type" : "type-16759", ++ "referenced_type" : "type-17116", ++ "self_type" : "type-17115", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159653,8 +159695,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16840", +- "self_type" : "type-16839", ++ "referenced_type" : "type-17215", ++ "self_type" : "type-17214", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159662,8 +159704,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-17041", +- "self_type" : "type-17040", ++ "referenced_type" : "type-17357", ++ "self_type" : "type-17356", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159671,8 +159713,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-17177", +- "self_type" : "type-17176", ++ "referenced_type" : "type-17395", ++ "self_type" : "type-17394", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159680,8 +159722,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-17263", +- "self_type" : "type-17262", ++ "referenced_type" : "type-17502", ++ "self_type" : "type-17501", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159689,8 +159731,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-17336", +- "self_type" : "type-17335", ++ "referenced_type" : "type-17530", ++ "self_type" : "type-17529", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159698,8 +159740,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-17587", +- "self_type" : "type-17586", ++ "referenced_type" : "type-17610", ++ "self_type" : "type-17609", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159707,8 +159749,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-17737", +- "self_type" : "type-17736", ++ "referenced_type" : "type-17811", ++ "self_type" : "type-17810", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159716,8 +159758,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-17836", +- "self_type" : "type-17835", ++ "referenced_type" : "type-17947", ++ "self_type" : "type-17946", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159725,8 +159767,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-17925", +- "self_type" : "type-17924", ++ "referenced_type" : "type-18033", ++ "self_type" : "type-18032", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159734,8 +159776,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-17991", +- "self_type" : "type-17990", ++ "referenced_type" : "type-18106", ++ "self_type" : "type-18105", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159743,8 +159785,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-18106", +- "self_type" : "type-18105", ++ "referenced_type" : "type-18365", ++ "self_type" : "type-18364", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159752,8 +159794,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-18170", +- "self_type" : "type-18169", ++ "referenced_type" : "type-18515", ++ "self_type" : "type-18514", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159761,8 +159803,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-18338", +- "self_type" : "type-18337", ++ "referenced_type" : "type-18614", ++ "self_type" : "type-18613", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159770,8 +159812,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-18466", +- "self_type" : "type-18465", ++ "referenced_type" : "type-18703", ++ "self_type" : "type-18702", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159779,8 +159821,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-18692", +- "self_type" : "type-18691", ++ "referenced_type" : "type-18769", ++ "self_type" : "type-18768", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159788,8 +159830,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-18832", +- "self_type" : "type-18831", ++ "referenced_type" : "type-18884", ++ "self_type" : "type-18883", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159797,8 +159839,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-18926", +- "self_type" : "type-18925", ++ "referenced_type" : "type-18948", ++ "self_type" : "type-18947", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159806,8 +159848,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-19164", +- "self_type" : "type-19163", ++ "referenced_type" : "type-19116", ++ "self_type" : "type-19115", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159815,8 +159857,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-19357", +- "self_type" : "type-19356", ++ "referenced_type" : "type-19244", ++ "self_type" : "type-19243", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159824,8 +159866,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-19552", +- "self_type" : "type-19551", ++ "referenced_type" : "type-19470", ++ "self_type" : "type-19469", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159833,8 +159875,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-19722", +- "self_type" : "type-19721", ++ "referenced_type" : "type-19610", ++ "self_type" : "type-19609", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159842,8 +159884,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-19832", +- "self_type" : "type-19831", ++ "referenced_type" : "type-19704", ++ "self_type" : "type-19703", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159851,8 +159893,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20024", +- "self_type" : "type-20023", ++ "referenced_type" : "type-20028", ++ "self_type" : "type-20027", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159860,8 +159902,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20374", +- "self_type" : "type-20373", ++ "referenced_type" : "type-20378", ++ "self_type" : "type-20377", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159869,8 +159911,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20639", +- "self_type" : "type-20638", ++ "referenced_type" : "type-20647", ++ "self_type" : "type-20646", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159878,8 +159920,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20789", +- "self_type" : "type-20788", ++ "referenced_type" : "type-20797", ++ "self_type" : "type-20796", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159887,8 +159929,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20877", +- "self_type" : "type-20876", ++ "referenced_type" : "type-20885", ++ "self_type" : "type-20884", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159896,8 +159938,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20976", +- "self_type" : "type-20975", ++ "referenced_type" : "type-20984", ++ "self_type" : "type-20983", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159905,8 +159947,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21119", +- "self_type" : "type-21118", ++ "referenced_type" : "type-21127", ++ "self_type" : "type-21126", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159914,8 +159956,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21157", +- "self_type" : "type-21156", ++ "referenced_type" : "type-21165", ++ "self_type" : "type-21164", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159923,8 +159965,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21264", +- "self_type" : "type-21263", ++ "referenced_type" : "type-21272", ++ "self_type" : "type-21271", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159932,8 +159974,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21292", +- "self_type" : "type-21291", ++ "referenced_type" : "type-21300", ++ "self_type" : "type-21299", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159941,8 +159983,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21372", +- "self_type" : "type-21371", ++ "referenced_type" : "type-21380", ++ "self_type" : "type-21379", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159950,8 +159992,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21573", +- "self_type" : "type-21572", ++ "referenced_type" : "type-21581", ++ "self_type" : "type-21580", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159959,8 +160001,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21709", +- "self_type" : "type-21708", ++ "referenced_type" : "type-21717", ++ "self_type" : "type-21716", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159968,8 +160010,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21795", +- "self_type" : "type-21794", ++ "referenced_type" : "type-21803", ++ "self_type" : "type-21802", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159977,8 +160019,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21868", +- "self_type" : "type-21867", ++ "referenced_type" : "type-21876", ++ "self_type" : "type-21875", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -161120,8 +161162,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16080", +- "self_type" : "type-16079", ++ "referenced_type" : "type-16850", ++ "self_type" : "type-16849", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -161129,8 +161171,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16243", +- "self_type" : "type-16242", ++ "referenced_type" : "type-17013", ++ "self_type" : "type-17012", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -161138,8 +161180,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-18328", +- "self_type" : "type-18327", ++ "referenced_type" : "type-19106", ++ "self_type" : "type-19105", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -161147,8 +161189,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20611", +- "self_type" : "type-20610", ++ "referenced_type" : "type-20619", ++ "self_type" : "type-20618", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -161156,8 +161198,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20774", +- "self_type" : "type-20773", ++ "referenced_type" : "type-20782", ++ "self_type" : "type-20781", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -161300,8 +161342,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator > *, std::allocator, std::allocator > *> > *", + "name" : "std::vector, std::allocator > *, std::allocator, std::allocator > *> > *", +- "referenced_type" : "type-16199", +- "self_type" : "type-16198", ++ "referenced_type" : "type-16969", ++ "self_type" : "type-16968", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -161309,8 +161351,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator > *, std::allocator, std::allocator > *> > *", + "name" : "std::vector, std::allocator > *, std::allocator, std::allocator > *> > *", +- "referenced_type" : "type-20730", +- "self_type" : "type-20729", ++ "referenced_type" : "type-20738", ++ "self_type" : "type-20737", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -161435,8 +161477,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-16599", +- "self_type" : "type-16598", ++ "referenced_type" : "type-17369", ++ "self_type" : "type-17368", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -161444,8 +161486,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-17170", +- "self_type" : "type-17169", ++ "referenced_type" : "type-17940", ++ "self_type" : "type-17939", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -161453,8 +161495,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-17260", +- "self_type" : "type-17259", ++ "referenced_type" : "type-18030", ++ "self_type" : "type-18029", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_ops.h" + }, +@@ -161462,8 +161504,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-18306", +- "self_type" : "type-18305", ++ "referenced_type" : "type-19084", ++ "self_type" : "type-19083", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" + }, +@@ -161471,8 +161513,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-18534", +- "self_type" : "type-18533", ++ "referenced_type" : "type-19312", ++ "self_type" : "type-19311", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/parser.h" + }, +@@ -161480,8 +161522,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-21131", +- "self_type" : "type-21130", ++ "referenced_type" : "type-21139", ++ "self_type" : "type-21138", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -161489,8 +161531,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-21702", +- "self_type" : "type-21701", ++ "referenced_type" : "type-21710", ++ "self_type" : "type-21709", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -161498,8 +161540,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-21792", +- "self_type" : "type-21791", ++ "referenced_type" : "type-21800", ++ "self_type" : "type-21799", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_ops.h" + }, +@@ -162048,80 +162090,80 @@ + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-16499", +- "self_type" : "type-16498", ++ "referenced_type" : "type-17269", ++ "self_type" : "type-17268", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-16815", +- "self_type" : "type-16814", ++ "referenced_type" : "type-17585", ++ "self_type" : "type-17584", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-17066", +- "self_type" : "type-17065", ++ "referenced_type" : "type-17836", ++ "self_type" : "type-17835", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-17185", +- "self_type" : "type-17184", ++ "referenced_type" : "type-17955", ++ "self_type" : "type-17954", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-17452", +- "self_type" : "type-17451", ++ "referenced_type" : "type-18230", ++ "self_type" : "type-18229", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-18902", +- "self_type" : "type-18901", ++ "referenced_type" : "type-19680", ++ "self_type" : "type-19679", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-21031", +- "self_type" : "type-21030", ++ "referenced_type" : "type-21039", ++ "self_type" : "type-21038", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-21347", +- "self_type" : "type-21346", ++ "referenced_type" : "type-21355", ++ "self_type" : "type-21354", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-21598", +- "self_type" : "type-21597", ++ "referenced_type" : "type-21606", ++ "self_type" : "type-21605", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-21717", +- "self_type" : "type-21716", ++ "referenced_type" : "type-21725", ++ "self_type" : "type-21724", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { +@@ -162360,80 +162402,80 @@ + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-16502", +- "self_type" : "type-16501", ++ "referenced_type" : "type-17272", ++ "self_type" : "type-17271", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-16817", +- "self_type" : "type-16816", ++ "referenced_type" : "type-17587", ++ "self_type" : "type-17586", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-17069", +- "self_type" : "type-17068", ++ "referenced_type" : "type-17839", ++ "self_type" : "type-17838", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-17188", +- "self_type" : "type-17187", ++ "referenced_type" : "type-17958", ++ "self_type" : "type-17957", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-17455", +- "self_type" : "type-17454", ++ "referenced_type" : "type-18233", ++ "self_type" : "type-18232", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-18905", +- "self_type" : "type-18904", ++ "referenced_type" : "type-19683", ++ "self_type" : "type-19682", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-21034", +- "self_type" : "type-21033", ++ "referenced_type" : "type-21042", ++ "self_type" : "type-21041", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-21349", +- "self_type" : "type-21348", ++ "referenced_type" : "type-21357", ++ "self_type" : "type-21356", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-21601", +- "self_type" : "type-21600", ++ "referenced_type" : "type-21609", ++ "self_type" : "type-21608", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-21720", +- "self_type" : "type-21719", ++ "referenced_type" : "type-21728", ++ "self_type" : "type-21727", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { +@@ -162876,32 +162918,24 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-15376", +- "self_type" : "type-15375", +- "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" +- }, +- { +- "is_const" : true, +- "linker_set_key" : "const google::protobuf::DescriptorPool", +- "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-15400", +- "self_type" : "type-15399", ++ "referenced_type" : "type-15411", ++ "self_type" : "type-15410", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-17909", +- "self_type" : "type-17908", ++ "referenced_type" : "type-15735", ++ "self_type" : "type-15734", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-18340", +- "self_type" : "type-18339", ++ "referenced_type" : "type-18687", ++ "self_type" : "type-18686", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { +@@ -162918,16 +162952,24 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-19166", +- "self_type" : "type-19165", ++ "referenced_type" : "type-19118", ++ "self_type" : "type-19117", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-19491", +- "self_type" : "type-19490", ++ "referenced_type" : "type-19909", ++ "self_type" : "type-19908", ++ "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" ++ }, ++ { ++ "is_const" : true, ++ "linker_set_key" : "const google::protobuf::DescriptorPool", ++ "name" : "const google::protobuf::DescriptorPool", ++ "referenced_type" : "type-19933", ++ "self_type" : "type-19932", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { +@@ -163237,8 +163279,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::DynamicMessage::TypeInfo", + "name" : "const google::protobuf::DynamicMessage::TypeInfo", +- "referenced_type" : "type-16544", +- "self_type" : "type-16543", ++ "referenced_type" : "type-17314", ++ "self_type" : "type-17313", + "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -163247,8 +163289,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::DynamicMessage::TypeInfo", + "name" : "const google::protobuf::DynamicMessage::TypeInfo", +- "referenced_type" : "type-21076", +- "self_type" : "type-21075", ++ "referenced_type" : "type-21084", ++ "self_type" : "type-21083", + "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -163424,106 +163466,106 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-15942", +- "self_type" : "type-15941", ++ "referenced_type" : "type-15428", ++ "self_type" : "type-15427", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +- "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-1608", +- "self_type" : "type-1903", +- "size" : 52, ++ "referenced_type" : "type-15758", ++ "self_type" : "type-15757", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-17011", +- "self_type" : "type-17010", ++ "referenced_type" : "type-15929", ++ "self_type" : "type-15928", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { ++ "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-18570", +- "self_type" : "type-18569", ++ "referenced_type" : "type-1608", ++ "self_type" : "type-1903", ++ "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-18654", +- "self_type" : "type-18653", ++ "referenced_type" : "type-16095", ++ "self_type" : "type-16094", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-18844", +- "self_type" : "type-18843", ++ "referenced_type" : "type-16713", ++ "self_type" : "type-16712", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-18941", +- "self_type" : "type-18940", ++ "referenced_type" : "type-17781", ++ "self_type" : "type-17780", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-19183", +- "self_type" : "type-19182", ++ "referenced_type" : "type-19348", ++ "self_type" : "type-19347", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-19514", +- "self_type" : "type-19513", ++ "referenced_type" : "type-19432", ++ "self_type" : "type-19431", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-19685", +- "self_type" : "type-19684", ++ "referenced_type" : "type-19622", ++ "self_type" : "type-19621", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-19851", +- "self_type" : "type-19850", ++ "referenced_type" : "type-19719", ++ "self_type" : "type-19718", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-20474", +- "self_type" : "type-20473", ++ "referenced_type" : "type-20481", ++ "self_type" : "type-20480", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-21543", +- "self_type" : "type-21542", ++ "referenced_type" : "type-21551", ++ "self_type" : "type-21550", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -163910,106 +163952,106 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-15946", +- "self_type" : "type-15945", ++ "referenced_type" : "type-15432", ++ "self_type" : "type-15431", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +- "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-1606", +- "self_type" : "type-1909", +- "size" : 52, ++ "referenced_type" : "type-15762", ++ "self_type" : "type-15761", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-17015", +- "self_type" : "type-17014", ++ "referenced_type" : "type-15933", ++ "self_type" : "type-15932", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { ++ "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-18574", +- "self_type" : "type-18573", ++ "referenced_type" : "type-1606", ++ "self_type" : "type-1909", ++ "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-18658", +- "self_type" : "type-18657", ++ "referenced_type" : "type-16099", ++ "self_type" : "type-16098", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-18848", +- "self_type" : "type-18847", ++ "referenced_type" : "type-16717", ++ "self_type" : "type-16716", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-18946", +- "self_type" : "type-18945", ++ "referenced_type" : "type-17785", ++ "self_type" : "type-17784", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-19187", +- "self_type" : "type-19186", ++ "referenced_type" : "type-19352", ++ "self_type" : "type-19351", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-19518", +- "self_type" : "type-19517", ++ "referenced_type" : "type-19436", ++ "self_type" : "type-19435", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-19689", +- "self_type" : "type-19688", ++ "referenced_type" : "type-19626", ++ "self_type" : "type-19625", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-19855", +- "self_type" : "type-19854", ++ "referenced_type" : "type-19724", ++ "self_type" : "type-19723", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-20478", +- "self_type" : "type-20477", ++ "referenced_type" : "type-20485", ++ "self_type" : "type-20484", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-21547", +- "self_type" : "type-21546", ++ "referenced_type" : "type-21555", ++ "self_type" : "type-21554", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -164342,8 +164384,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldDescriptor", + "name" : "const google::protobuf::FieldDescriptor", +- "referenced_type" : "type-17447", +- "self_type" : "type-17446", ++ "referenced_type" : "type-18225", ++ "self_type" : "type-18224", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -164556,106 +164598,106 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-15938", +- "self_type" : "type-15937", ++ "referenced_type" : "type-15424", ++ "self_type" : "type-15423", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +- "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-1595", +- "self_type" : "type-1932", +- "size" : 60, ++ "referenced_type" : "type-15754", ++ "self_type" : "type-15753", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-17007", +- "self_type" : "type-17006", ++ "referenced_type" : "type-15925", ++ "self_type" : "type-15924", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { ++ "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-18566", +- "self_type" : "type-18565", ++ "referenced_type" : "type-1595", ++ "self_type" : "type-1932", ++ "size" : 60, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-18650", +- "self_type" : "type-18649", ++ "referenced_type" : "type-16089", ++ "self_type" : "type-16088", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-18840", +- "self_type" : "type-18839", ++ "referenced_type" : "type-16709", ++ "self_type" : "type-16708", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-18936", +- "self_type" : "type-18935", ++ "referenced_type" : "type-17777", ++ "self_type" : "type-17776", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-19179", +- "self_type" : "type-19178", ++ "referenced_type" : "type-19344", ++ "self_type" : "type-19343", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-19510", +- "self_type" : "type-19509", ++ "referenced_type" : "type-19428", ++ "self_type" : "type-19427", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-19681", +- "self_type" : "type-19680", ++ "referenced_type" : "type-19618", ++ "self_type" : "type-19617", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-19845", +- "self_type" : "type-19844", ++ "referenced_type" : "type-19714", ++ "self_type" : "type-19713", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-20470", +- "self_type" : "type-20469", ++ "referenced_type" : "type-20477", ++ "self_type" : "type-20476", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-21539", +- "self_type" : "type-21538", ++ "referenced_type" : "type-21547", ++ "self_type" : "type-21546", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -165366,250 +165408,250 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-15611", +- "self_type" : "type-15610", ++ "referenced_type" : "type-15449", ++ "self_type" : "type-15448", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-15845", +- "self_type" : "type-15844", ++ "referenced_type" : "type-15605", ++ "self_type" : "type-15604", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-15961", +- "self_type" : "type-15960", ++ "referenced_type" : "type-15779", ++ "self_type" : "type-15778", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +- "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-16085", +- "self_type" : "type-16084", +- "size" : 92, ++ "referenced_type" : "type-15949", ++ "self_type" : "type-15948", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-16238", +- "self_type" : "type-16237", ++ "referenced_type" : "type-16117", ++ "self_type" : "type-16116", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-16349", +- "self_type" : "type-16348", ++ "referenced_type" : "type-16384", ++ "self_type" : "type-16383", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-16451", +- "self_type" : "type-16450", ++ "referenced_type" : "type-16618", ++ "self_type" : "type-16617", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-16574", +- "self_type" : "type-16573", ++ "referenced_type" : "type-16732", ++ "self_type" : "type-16731", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { ++ "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-16628", +- "self_type" : "type-16627", ++ "referenced_type" : "type-16855", ++ "self_type" : "type-16854", ++ "size" : 92, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-16693", +- "self_type" : "type-16692", ++ "referenced_type" : "type-17008", ++ "self_type" : "type-17007", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-16767", +- "self_type" : "type-16766", ++ "referenced_type" : "type-17119", ++ "self_type" : "type-17118", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-16843", +- "self_type" : "type-16842", ++ "referenced_type" : "type-17221", ++ "self_type" : "type-17220", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-17030", +- "self_type" : "type-17029", ++ "referenced_type" : "type-17344", ++ "self_type" : "type-17343", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-17165", +- "self_type" : "type-17164", ++ "referenced_type" : "type-17398", ++ "self_type" : "type-17397", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-17243", +- "self_type" : "type-17242", ++ "referenced_type" : "type-17463", ++ "self_type" : "type-17462", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-17350", +- "self_type" : "type-17349", ++ "referenced_type" : "type-17537", ++ "self_type" : "type-17536", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-17593", +- "self_type" : "type-17592", ++ "referenced_type" : "type-17613", ++ "self_type" : "type-17612", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-17671", +- "self_type" : "type-17670", ++ "referenced_type" : "type-17800", ++ "self_type" : "type-17799", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-17840", +- "self_type" : "type-17839", ++ "referenced_type" : "type-17935", ++ "self_type" : "type-17934", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-17931", +- "self_type" : "type-17930", ++ "referenced_type" : "type-18013", ++ "self_type" : "type-18012", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-18023", +- "self_type" : "type-18022", ++ "referenced_type" : "type-18128", ++ "self_type" : "type-18127", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-18110", +- "self_type" : "type-18109", ++ "referenced_type" : "type-18371", ++ "self_type" : "type-18370", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-18175", +- "self_type" : "type-18174", ++ "referenced_type" : "type-18449", ++ "self_type" : "type-18448", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-18325", +- "self_type" : "type-18324", ++ "referenced_type" : "type-18618", ++ "self_type" : "type-18617", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-18455", +- "self_type" : "type-18454", ++ "referenced_type" : "type-18709", ++ "self_type" : "type-18708", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-18590", +- "self_type" : "type-18589", ++ "referenced_type" : "type-18801", ++ "self_type" : "type-18800", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-18675", +- "self_type" : "type-18674", ++ "referenced_type" : "type-18888", ++ "self_type" : "type-18887", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-18866", +- "self_type" : "type-18865", ++ "referenced_type" : "type-18953", ++ "self_type" : "type-18952", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-18963", +- "self_type" : "type-18962", ++ "referenced_type" : "type-19103", ++ "self_type" : "type-19102", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-19204", +- "self_type" : "type-19203", ++ "referenced_type" : "type-19233", ++ "self_type" : "type-19232", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-19361", +- "self_type" : "type-19360", ++ "referenced_type" : "type-19368", ++ "self_type" : "type-19367", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -165624,48 +165666,48 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-19535", +- "self_type" : "type-19534", ++ "referenced_type" : "type-19453", ++ "self_type" : "type-19452", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-19705", +- "self_type" : "type-19704", ++ "referenced_type" : "type-19644", ++ "self_type" : "type-19643", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-19873", +- "self_type" : "type-19872", ++ "referenced_type" : "type-19741", ++ "self_type" : "type-19740", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-20144", +- "self_type" : "type-20143", ++ "referenced_type" : "type-20148", ++ "self_type" : "type-20147", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-20379", +- "self_type" : "type-20378", ++ "referenced_type" : "type-20383", ++ "self_type" : "type-20382", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-20493", +- "self_type" : "type-20492", ++ "referenced_type" : "type-20500", ++ "self_type" : "type-20499", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -165673,8 +165715,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-20616", +- "self_type" : "type-20615", ++ "referenced_type" : "type-20624", ++ "self_type" : "type-20623", + "size" : 92, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -165682,88 +165724,88 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-20769", +- "self_type" : "type-20768", ++ "referenced_type" : "type-20777", ++ "self_type" : "type-20776", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-20880", +- "self_type" : "type-20879", ++ "referenced_type" : "type-20888", ++ "self_type" : "type-20887", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-20983", +- "self_type" : "type-20982", ++ "referenced_type" : "type-20991", ++ "self_type" : "type-20990", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-21106", +- "self_type" : "type-21105", ++ "referenced_type" : "type-21114", ++ "self_type" : "type-21113", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-21160", +- "self_type" : "type-21159", ++ "referenced_type" : "type-21168", ++ "self_type" : "type-21167", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-21225", +- "self_type" : "type-21224", ++ "referenced_type" : "type-21233", ++ "self_type" : "type-21232", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-21299", +- "self_type" : "type-21298", ++ "referenced_type" : "type-21307", ++ "self_type" : "type-21306", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-21375", +- "self_type" : "type-21374", ++ "referenced_type" : "type-21383", ++ "self_type" : "type-21382", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-21562", +- "self_type" : "type-21561", ++ "referenced_type" : "type-21570", ++ "self_type" : "type-21569", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-21697", +- "self_type" : "type-21696", ++ "referenced_type" : "type-21705", ++ "self_type" : "type-21704", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-21775", +- "self_type" : "type-21774", ++ "referenced_type" : "type-21783", ++ "self_type" : "type-21782", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -166860,106 +166902,106 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-15958", +- "self_type" : "type-15957", ++ "referenced_type" : "type-15446", ++ "self_type" : "type-15445", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +- "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-1626", +- "self_type" : "type-1937", +- "size" : 80, ++ "referenced_type" : "type-15774", ++ "self_type" : "type-15773", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-17027", +- "self_type" : "type-17026", ++ "referenced_type" : "type-15946", ++ "self_type" : "type-15945", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-18587", +- "self_type" : "type-18586", ++ "referenced_type" : "type-16114", ++ "self_type" : "type-16113", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { ++ "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-18672", +- "self_type" : "type-18671", ++ "referenced_type" : "type-1626", ++ "self_type" : "type-1937", ++ "size" : 80, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-18863", +- "self_type" : "type-18862", ++ "referenced_type" : "type-16729", ++ "self_type" : "type-16728", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-18960", +- "self_type" : "type-18959", ++ "referenced_type" : "type-17797", ++ "self_type" : "type-17796", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-19201", +- "self_type" : "type-19200", ++ "referenced_type" : "type-19365", ++ "self_type" : "type-19364", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-19530", +- "self_type" : "type-19529", ++ "referenced_type" : "type-19450", ++ "self_type" : "type-19449", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-19702", +- "self_type" : "type-19701", ++ "referenced_type" : "type-19641", ++ "self_type" : "type-19640", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-19870", +- "self_type" : "type-19869", ++ "referenced_type" : "type-19738", ++ "self_type" : "type-19737", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-20490", +- "self_type" : "type-20489", ++ "referenced_type" : "type-20497", ++ "self_type" : "type-20496", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-21559", +- "self_type" : "type-21558", ++ "referenced_type" : "type-21567", ++ "self_type" : "type-21566", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -167932,256 +167974,256 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-15702", +- "self_type" : "type-15701", ++ "referenced_type" : "type-15463", ++ "self_type" : "type-15462", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-15872", +- "self_type" : "type-15871", ++ "referenced_type" : "type-15613", ++ "self_type" : "type-15612", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-15975", +- "self_type" : "type-15974", ++ "referenced_type" : "type-15800", ++ "self_type" : "type-15799", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-16114", +- "self_type" : "type-16113", ++ "referenced_type" : "type-15971", ++ "self_type" : "type-15970", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-16263", +- "self_type" : "type-16262", ++ "referenced_type" : "type-16130", ++ "self_type" : "type-16129", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-16356", +- "self_type" : "type-16355", ++ "referenced_type" : "type-16475", ++ "self_type" : "type-16474", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-16456", +- "self_type" : "type-16455", ++ "referenced_type" : "type-16645", ++ "self_type" : "type-16644", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-16638", +- "self_type" : "type-16637", ++ "referenced_type" : "type-16746", ++ "self_type" : "type-16745", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-16718", +- "self_type" : "type-16717", ++ "referenced_type" : "type-16884", ++ "self_type" : "type-16883", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-16776", +- "self_type" : "type-16775", ++ "referenced_type" : "type-17033", ++ "self_type" : "type-17032", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-17248", +- "self_type" : "type-17247", ++ "referenced_type" : "type-17126", ++ "self_type" : "type-17125", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-17355", +- "self_type" : "type-17354", ++ "referenced_type" : "type-17226", ++ "self_type" : "type-17225", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-17697", +- "self_type" : "type-17696", ++ "referenced_type" : "type-17408", ++ "self_type" : "type-17407", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-17855", +- "self_type" : "type-17854", ++ "referenced_type" : "type-17488", ++ "self_type" : "type-17487", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-17943", +- "self_type" : "type-17942", ++ "referenced_type" : "type-17546", ++ "self_type" : "type-17545", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-18032", +- "self_type" : "type-18031", ++ "referenced_type" : "type-18018", ++ "self_type" : "type-18017", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-18116", +- "self_type" : "type-18115", ++ "referenced_type" : "type-18133", ++ "self_type" : "type-18132", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-18183", +- "self_type" : "type-18182", ++ "referenced_type" : "type-18475", ++ "self_type" : "type-18474", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-18345", +- "self_type" : "type-18344", ++ "referenced_type" : "type-18633", ++ "self_type" : "type-18632", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-18470", +- "self_type" : "type-18469", ++ "referenced_type" : "type-18721", ++ "self_type" : "type-18720", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-18605", +- "self_type" : "type-18604", ++ "referenced_type" : "type-18810", ++ "self_type" : "type-18809", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-18696", +- "self_type" : "type-18695", ++ "referenced_type" : "type-18894", ++ "self_type" : "type-18893", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-18975", +- "self_type" : "type-18974", ++ "referenced_type" : "type-18961", ++ "self_type" : "type-18960", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-19218", +- "self_type" : "type-19217", ++ "referenced_type" : "type-19123", ++ "self_type" : "type-19122", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-19369", +- "self_type" : "type-19368", ++ "referenced_type" : "type-19248", ++ "self_type" : "type-19247", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-19556", +- "self_type" : "type-19555", ++ "referenced_type" : "type-19383", ++ "self_type" : "type-19382", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-19727", +- "self_type" : "type-19726", ++ "referenced_type" : "type-19474", ++ "self_type" : "type-19473", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-19886", +- "self_type" : "type-19885", ++ "referenced_type" : "type-19753", ++ "self_type" : "type-19752", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-20235", +- "self_type" : "type-20234", ++ "referenced_type" : "type-20239", ++ "self_type" : "type-20238", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-20406", +- "self_type" : "type-20405", ++ "referenced_type" : "type-20410", ++ "self_type" : "type-20409", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-20507", +- "self_type" : "type-20506", ++ "referenced_type" : "type-20514", ++ "self_type" : "type-20513", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-20645", +- "self_type" : "type-20644", ++ "referenced_type" : "type-20653", ++ "self_type" : "type-20652", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { +@@ -168196,56 +168238,56 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-20794", +- "self_type" : "type-20793", ++ "referenced_type" : "type-20802", ++ "self_type" : "type-20801", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-20887", +- "self_type" : "type-20886", ++ "referenced_type" : "type-20895", ++ "self_type" : "type-20894", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-20988", +- "self_type" : "type-20987", ++ "referenced_type" : "type-20996", ++ "self_type" : "type-20995", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-21170", +- "self_type" : "type-21169", ++ "referenced_type" : "type-21178", ++ "self_type" : "type-21177", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-21250", +- "self_type" : "type-21249", ++ "referenced_type" : "type-21258", ++ "self_type" : "type-21257", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-21308", +- "self_type" : "type-21307", ++ "referenced_type" : "type-21316", ++ "self_type" : "type-21315", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-21780", +- "self_type" : "type-21779", ++ "referenced_type" : "type-21788", ++ "self_type" : "type-21787", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { +@@ -169254,32 +169296,32 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-17548", +- "self_type" : "type-17547", ++ "referenced_type" : "type-18326", ++ "self_type" : "type-18325", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-18253", +- "self_type" : "type-18252", ++ "referenced_type" : "type-19031", ++ "self_type" : "type-19030", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-18773", +- "self_type" : "type-18772", ++ "referenced_type" : "type-19551", ++ "self_type" : "type-19550", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-18861", +- "self_type" : "type-18860", ++ "referenced_type" : "type-19639", ++ "self_type" : "type-19638", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -169546,106 +169588,106 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-15936", +- "self_type" : "type-15935", ++ "referenced_type" : "type-15413", ++ "self_type" : "type-15412", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +- "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-1614", +- "self_type" : "type-1944", +- "size" : 52, ++ "referenced_type" : "type-15749", ++ "self_type" : "type-15748", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-17001", +- "self_type" : "type-17000", ++ "referenced_type" : "type-15918", ++ "self_type" : "type-15917", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-18561", +- "self_type" : "type-18560", ++ "referenced_type" : "type-16080", ++ "self_type" : "type-16079", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { ++ "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-18643", +- "self_type" : "type-18642", ++ "referenced_type" : "type-1614", ++ "self_type" : "type-1944", ++ "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-18834", +- "self_type" : "type-18833", ++ "referenced_type" : "type-16707", ++ "self_type" : "type-16706", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-18928", +- "self_type" : "type-18927", ++ "referenced_type" : "type-17771", ++ "self_type" : "type-17770", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-19168", +- "self_type" : "type-19167", ++ "referenced_type" : "type-19339", ++ "self_type" : "type-19338", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-19505", +- "self_type" : "type-19504", ++ "referenced_type" : "type-19421", ++ "self_type" : "type-19420", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-19674", +- "self_type" : "type-19673", ++ "referenced_type" : "type-19612", ++ "self_type" : "type-19611", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-19836", +- "self_type" : "type-19835", ++ "referenced_type" : "type-19706", ++ "self_type" : "type-19705", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-20468", +- "self_type" : "type-20467", ++ "referenced_type" : "type-20475", ++ "self_type" : "type-20474", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-21533", +- "self_type" : "type-21532", ++ "referenced_type" : "type-21541", ++ "self_type" : "type-21540", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -170032,106 +170074,106 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-15954", +- "self_type" : "type-15953", ++ "referenced_type" : "type-15442", ++ "self_type" : "type-15441", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +- "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-1622", +- "self_type" : "type-1919", +- "size" : 52, ++ "referenced_type" : "type-15770", ++ "self_type" : "type-15769", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-17023", +- "self_type" : "type-17022", ++ "referenced_type" : "type-15942", ++ "self_type" : "type-15941", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-18583", +- "self_type" : "type-18582", ++ "referenced_type" : "type-16109", ++ "self_type" : "type-16108", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { ++ "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-18666", +- "self_type" : "type-18665", ++ "referenced_type" : "type-1622", ++ "self_type" : "type-1919", ++ "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-18856", +- "self_type" : "type-18855", ++ "referenced_type" : "type-16725", ++ "self_type" : "type-16724", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-18955", +- "self_type" : "type-18954", ++ "referenced_type" : "type-17793", ++ "self_type" : "type-17792", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-19197", +- "self_type" : "type-19196", ++ "referenced_type" : "type-19361", ++ "self_type" : "type-19360", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-19526", +- "self_type" : "type-19525", ++ "referenced_type" : "type-19444", ++ "self_type" : "type-19443", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-19698", +- "self_type" : "type-19697", ++ "referenced_type" : "type-19634", ++ "self_type" : "type-19633", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-19865", +- "self_type" : "type-19864", ++ "referenced_type" : "type-19733", ++ "self_type" : "type-19732", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-20486", +- "self_type" : "type-20485", ++ "referenced_type" : "type-20493", ++ "self_type" : "type-20492", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-21555", +- "self_type" : "type-21554", ++ "referenced_type" : "type-21563", ++ "self_type" : "type-21562", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -170774,264 +170816,264 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-15726", +- "self_type" : "type-15725", ++ "referenced_type" : "type-15519", ++ "self_type" : "type-15518", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-15899", +- "self_type" : "type-15898", ++ "referenced_type" : "type-15662", ++ "self_type" : "type-15661", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16179", +- "self_type" : "type-16178", ++ "referenced_type" : "type-15866", ++ "self_type" : "type-15865", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16282", +- "self_type" : "type-16281", ++ "referenced_type" : "type-16035", ++ "self_type" : "type-16034", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16422", +- "self_type" : "type-16421", ++ "referenced_type" : "type-16191", ++ "self_type" : "type-16190", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16479", +- "self_type" : "type-16478", ++ "referenced_type" : "type-16499", ++ "self_type" : "type-16498", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16659", +- "self_type" : "type-16658", ++ "referenced_type" : "type-16672", ++ "self_type" : "type-16671", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16797", +- "self_type" : "type-16796", ++ "referenced_type" : "type-16949", ++ "self_type" : "type-16948", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17302", +- "self_type" : "type-17301", ++ "referenced_type" : "type-17052", ++ "self_type" : "type-17051", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17376", +- "self_type" : "type-17375", ++ "referenced_type" : "type-17192", ++ "self_type" : "type-17191", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17422", +- "self_type" : "type-17421", ++ "referenced_type" : "type-17249", ++ "self_type" : "type-17248", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17779", +- "self_type" : "type-17778", ++ "referenced_type" : "type-17429", ++ "self_type" : "type-17428", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17880", +- "self_type" : "type-17879", ++ "referenced_type" : "type-17567", ++ "self_type" : "type-17566", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17972", +- "self_type" : "type-17971", ++ "referenced_type" : "type-18072", ++ "self_type" : "type-18071", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18083", +- "self_type" : "type-18082", ++ "referenced_type" : "type-18154", ++ "self_type" : "type-18153", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18135", +- "self_type" : "type-18134", ++ "referenced_type" : "type-18200", ++ "self_type" : "type-18199", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18222", +- "self_type" : "type-18221", ++ "referenced_type" : "type-18557", ++ "self_type" : "type-18556", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18395", +- "self_type" : "type-18394", ++ "referenced_type" : "type-18658", ++ "self_type" : "type-18657", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18522", +- "self_type" : "type-18521", ++ "referenced_type" : "type-18750", ++ "self_type" : "type-18749", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18754", +- "self_type" : "type-18753", ++ "referenced_type" : "type-18861", ++ "self_type" : "type-18860", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18885", +- "self_type" : "type-18884", ++ "referenced_type" : "type-18913", ++ "self_type" : "type-18912", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19034", +- "self_type" : "type-19033", ++ "referenced_type" : "type-19000", ++ "self_type" : "type-18999", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19274", +- "self_type" : "type-19273", ++ "referenced_type" : "type-19173", ++ "self_type" : "type-19172", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19418", +- "self_type" : "type-19417", ++ "referenced_type" : "type-19300", ++ "self_type" : "type-19299", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19622", +- "self_type" : "type-19621", ++ "referenced_type" : "type-19532", ++ "self_type" : "type-19531", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19791", +- "self_type" : "type-19790", ++ "referenced_type" : "type-19663", ++ "self_type" : "type-19662", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19947", +- "self_type" : "type-19946", ++ "referenced_type" : "type-19812", ++ "self_type" : "type-19811", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-20260", +- "self_type" : "type-20259", ++ "referenced_type" : "type-20264", ++ "self_type" : "type-20263", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-20433", +- "self_type" : "type-20432", ++ "referenced_type" : "type-20437", ++ "self_type" : "type-20436", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-20710", +- "self_type" : "type-20709", ++ "referenced_type" : "type-20718", ++ "self_type" : "type-20717", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-20813", +- "self_type" : "type-20812", ++ "referenced_type" : "type-20821", ++ "self_type" : "type-20820", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-20953", +- "self_type" : "type-20952", ++ "referenced_type" : "type-20961", ++ "self_type" : "type-20960", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-21011", +- "self_type" : "type-21010", ++ "referenced_type" : "type-21019", ++ "self_type" : "type-21018", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -171046,24 +171088,24 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-21191", +- "self_type" : "type-21190", ++ "referenced_type" : "type-21199", ++ "self_type" : "type-21198", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-21329", +- "self_type" : "type-21328", ++ "referenced_type" : "type-21337", ++ "self_type" : "type-21336", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-21834", +- "self_type" : "type-21833", ++ "referenced_type" : "type-21842", ++ "self_type" : "type-21841", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -171960,120 +172002,120 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16175", +- "self_type" : "type-16174", ++ "referenced_type" : "type-15515", ++ "self_type" : "type-15514", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17298", +- "self_type" : "type-17297", ++ "referenced_type" : "type-15658", ++ "self_type" : "type-15657", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17774", +- "self_type" : "type-17773", ++ "referenced_type" : "type-15862", ++ "self_type" : "type-15861", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18079", +- "self_type" : "type-18078", ++ "referenced_type" : "type-16030", ++ "self_type" : "type-16029", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18390", +- "self_type" : "type-18389", ++ "referenced_type" : "type-16187", ++ "self_type" : "type-16186", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18518", +- "self_type" : "type-18517", ++ "referenced_type" : "type-16945", ++ "self_type" : "type-16944", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18750", +- "self_type" : "type-18749", ++ "referenced_type" : "type-18068", ++ "self_type" : "type-18067", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19030", +- "self_type" : "type-19029", ++ "referenced_type" : "type-18552", ++ "self_type" : "type-18551", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19270", +- "self_type" : "type-19269", ++ "referenced_type" : "type-18857", ++ "self_type" : "type-18856", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19414", +- "self_type" : "type-19413", ++ "referenced_type" : "type-19168", ++ "self_type" : "type-19167", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19618", +- "self_type" : "type-19617", ++ "referenced_type" : "type-19296", ++ "self_type" : "type-19295", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19786", +- "self_type" : "type-19785", ++ "referenced_type" : "type-19528", ++ "self_type" : "type-19527", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19943", +- "self_type" : "type-19942", ++ "referenced_type" : "type-19808", ++ "self_type" : "type-19807", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-20706", +- "self_type" : "type-20705", ++ "referenced_type" : "type-20714", ++ "self_type" : "type-20713", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-21830", +- "self_type" : "type-21829", ++ "referenced_type" : "type-21838", ++ "self_type" : "type-21837", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -172530,120 +172572,120 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16171", +- "self_type" : "type-16170", ++ "referenced_type" : "type-15510", ++ "self_type" : "type-15509", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17294", +- "self_type" : "type-17293", ++ "referenced_type" : "type-15654", ++ "self_type" : "type-15653", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17770", +- "self_type" : "type-17769", ++ "referenced_type" : "type-15858", ++ "self_type" : "type-15857", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18074", +- "self_type" : "type-18073", ++ "referenced_type" : "type-16026", ++ "self_type" : "type-16025", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18386", +- "self_type" : "type-18385", ++ "referenced_type" : "type-16183", ++ "self_type" : "type-16182", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18514", +- "self_type" : "type-18513", ++ "referenced_type" : "type-16941", ++ "self_type" : "type-16940", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18746", +- "self_type" : "type-18745", ++ "referenced_type" : "type-18064", ++ "self_type" : "type-18063", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19026", +- "self_type" : "type-19025", ++ "referenced_type" : "type-18548", ++ "self_type" : "type-18547", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19265", +- "self_type" : "type-19264", ++ "referenced_type" : "type-18852", ++ "self_type" : "type-18851", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19410", +- "self_type" : "type-19409", ++ "referenced_type" : "type-19164", ++ "self_type" : "type-19163", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19614", +- "self_type" : "type-19613", ++ "referenced_type" : "type-19292", ++ "self_type" : "type-19291", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19782", +- "self_type" : "type-19781", ++ "referenced_type" : "type-19524", ++ "self_type" : "type-19523", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19939", +- "self_type" : "type-19938", ++ "referenced_type" : "type-19804", ++ "self_type" : "type-19803", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-20702", +- "self_type" : "type-20701", ++ "referenced_type" : "type-20710", ++ "self_type" : "type-20709", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-21826", +- "self_type" : "type-21825", ++ "referenced_type" : "type-21834", ++ "self_type" : "type-21833", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -173012,48 +173054,48 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18730", +- "self_type" : "type-18729", ++ "referenced_type" : "type-15494", ++ "self_type" : "type-15493", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19010", +- "self_type" : "type-19009", ++ "referenced_type" : "type-15840", ++ "self_type" : "type-15839", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19249", +- "self_type" : "type-19248", ++ "referenced_type" : "type-16009", ++ "self_type" : "type-16008", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19596", +- "self_type" : "type-19595", ++ "referenced_type" : "type-16166", ++ "self_type" : "type-16165", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19765", +- "self_type" : "type-19764", ++ "referenced_type" : "type-19508", ++ "self_type" : "type-19507", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19922", +- "self_type" : "type-19921", ++ "referenced_type" : "type-19788", ++ "self_type" : "type-19787", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -173318,120 +173360,120 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16159", +- "self_type" : "type-16158", ++ "referenced_type" : "type-15498", ++ "self_type" : "type-15497", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17282", +- "self_type" : "type-17281", ++ "referenced_type" : "type-15642", ++ "self_type" : "type-15641", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17757", +- "self_type" : "type-17756", ++ "referenced_type" : "type-15844", ++ "self_type" : "type-15843", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18062", +- "self_type" : "type-18061", ++ "referenced_type" : "type-16013", ++ "self_type" : "type-16012", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18374", +- "self_type" : "type-18373", ++ "referenced_type" : "type-16170", ++ "self_type" : "type-16169", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18502", +- "self_type" : "type-18501", ++ "referenced_type" : "type-16929", ++ "self_type" : "type-16928", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18734", +- "self_type" : "type-18733", ++ "referenced_type" : "type-18052", ++ "self_type" : "type-18051", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19014", +- "self_type" : "type-19013", ++ "referenced_type" : "type-18535", ++ "self_type" : "type-18534", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19253", +- "self_type" : "type-19252", ++ "referenced_type" : "type-18840", ++ "self_type" : "type-18839", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19398", +- "self_type" : "type-19397", ++ "referenced_type" : "type-19152", ++ "self_type" : "type-19151", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19600", +- "self_type" : "type-19599", ++ "referenced_type" : "type-19280", ++ "self_type" : "type-19279", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19769", +- "self_type" : "type-19768", ++ "referenced_type" : "type-19512", ++ "self_type" : "type-19511", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19926", +- "self_type" : "type-19925", ++ "referenced_type" : "type-19792", ++ "self_type" : "type-19791", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-20690", +- "self_type" : "type-20689", ++ "referenced_type" : "type-20698", ++ "self_type" : "type-20697", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-21814", +- "self_type" : "type-21813", ++ "referenced_type" : "type-21822", ++ "self_type" : "type-21821", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -173888,120 +173930,120 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16163", +- "self_type" : "type-16162", ++ "referenced_type" : "type-15502", ++ "self_type" : "type-15501", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17286", +- "self_type" : "type-17285", ++ "referenced_type" : "type-15646", ++ "self_type" : "type-15645", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17761", +- "self_type" : "type-17760", ++ "referenced_type" : "type-15850", ++ "self_type" : "type-15849", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18066", +- "self_type" : "type-18065", ++ "referenced_type" : "type-16017", ++ "self_type" : "type-16016", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18378", +- "self_type" : "type-18377", ++ "referenced_type" : "type-16174", ++ "self_type" : "type-16173", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18506", +- "self_type" : "type-18505", ++ "referenced_type" : "type-16933", ++ "self_type" : "type-16932", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18738", +- "self_type" : "type-18737", ++ "referenced_type" : "type-18056", ++ "self_type" : "type-18055", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19018", +- "self_type" : "type-19017", ++ "referenced_type" : "type-18539", ++ "self_type" : "type-18538", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19257", +- "self_type" : "type-19256", ++ "referenced_type" : "type-18844", ++ "self_type" : "type-18843", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19402", +- "self_type" : "type-19401", ++ "referenced_type" : "type-19156", ++ "self_type" : "type-19155", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19606", +- "self_type" : "type-19605", ++ "referenced_type" : "type-19284", ++ "self_type" : "type-19283", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19773", +- "self_type" : "type-19772", ++ "referenced_type" : "type-19516", ++ "self_type" : "type-19515", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19930", +- "self_type" : "type-19929", ++ "referenced_type" : "type-19796", ++ "self_type" : "type-19795", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-20694", +- "self_type" : "type-20693", ++ "referenced_type" : "type-20702", ++ "self_type" : "type-20701", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-21818", +- "self_type" : "type-21817", ++ "referenced_type" : "type-21826", ++ "self_type" : "type-21825", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -174458,120 +174500,120 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16167", +- "self_type" : "type-16166", ++ "referenced_type" : "type-15506", ++ "self_type" : "type-15505", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17290", +- "self_type" : "type-17289", ++ "referenced_type" : "type-15650", ++ "self_type" : "type-15649", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17766", +- "self_type" : "type-17765", ++ "referenced_type" : "type-15854", ++ "self_type" : "type-15853", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18070", +- "self_type" : "type-18069", ++ "referenced_type" : "type-16022", ++ "self_type" : "type-16021", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18382", +- "self_type" : "type-18381", ++ "referenced_type" : "type-16178", ++ "self_type" : "type-16177", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18510", +- "self_type" : "type-18509", ++ "referenced_type" : "type-16937", ++ "self_type" : "type-16936", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18742", +- "self_type" : "type-18741", ++ "referenced_type" : "type-18060", ++ "self_type" : "type-18059", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19022", +- "self_type" : "type-19021", ++ "referenced_type" : "type-18544", ++ "self_type" : "type-18543", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19261", +- "self_type" : "type-19260", ++ "referenced_type" : "type-18848", ++ "self_type" : "type-18847", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19406", +- "self_type" : "type-19405", ++ "referenced_type" : "type-19160", ++ "self_type" : "type-19159", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19610", +- "self_type" : "type-19609", ++ "referenced_type" : "type-19288", ++ "self_type" : "type-19287", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19778", +- "self_type" : "type-19777", ++ "referenced_type" : "type-19520", ++ "self_type" : "type-19519", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19934", +- "self_type" : "type-19933", ++ "referenced_type" : "type-19800", ++ "self_type" : "type-19799", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-20698", +- "self_type" : "type-20697", ++ "referenced_type" : "type-20706", ++ "self_type" : "type-20705", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-21822", +- "self_type" : "type-21821", ++ "referenced_type" : "type-21830", ++ "self_type" : "type-21829", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -175280,264 +175322,264 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-15711", +- "self_type" : "type-15710", ++ "referenced_type" : "type-15471", ++ "self_type" : "type-15470", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-15880", +- "self_type" : "type-15879", ++ "referenced_type" : "type-15621", ++ "self_type" : "type-15620", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-15988", +- "self_type" : "type-15987", ++ "referenced_type" : "type-15809", ++ "self_type" : "type-15808", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16122", +- "self_type" : "type-16121", ++ "referenced_type" : "type-15979", ++ "self_type" : "type-15978", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16271", +- "self_type" : "type-16270", ++ "referenced_type" : "type-16139", ++ "self_type" : "type-16138", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16364", +- "self_type" : "type-16363", ++ "referenced_type" : "type-16484", ++ "self_type" : "type-16483", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16464", +- "self_type" : "type-16463", ++ "referenced_type" : "type-16653", ++ "self_type" : "type-16652", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16646", +- "self_type" : "type-16645", ++ "referenced_type" : "type-16759", ++ "self_type" : "type-16758", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16726", +- "self_type" : "type-16725", ++ "referenced_type" : "type-16892", ++ "self_type" : "type-16891", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16784", +- "self_type" : "type-16783", ++ "referenced_type" : "type-17041", ++ "self_type" : "type-17040", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16858", +- "self_type" : "type-16857", ++ "referenced_type" : "type-17134", ++ "self_type" : "type-17133", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17256", +- "self_type" : "type-17255", ++ "referenced_type" : "type-17234", ++ "self_type" : "type-17233", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17363", +- "self_type" : "type-17362", ++ "referenced_type" : "type-17416", ++ "self_type" : "type-17415", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17863", +- "self_type" : "type-17862", ++ "referenced_type" : "type-17496", ++ "self_type" : "type-17495", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17951", +- "self_type" : "type-17950", ++ "referenced_type" : "type-17554", ++ "self_type" : "type-17553", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18041", +- "self_type" : "type-18040", ++ "referenced_type" : "type-17628", ++ "self_type" : "type-17627", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18124", +- "self_type" : "type-18123", ++ "referenced_type" : "type-18026", ++ "self_type" : "type-18025", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18191", +- "self_type" : "type-18190", ++ "referenced_type" : "type-18141", ++ "self_type" : "type-18140", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18353", +- "self_type" : "type-18352", ++ "referenced_type" : "type-18641", ++ "self_type" : "type-18640", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18478", +- "self_type" : "type-18477", ++ "referenced_type" : "type-18729", ++ "self_type" : "type-18728", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18620", +- "self_type" : "type-18619", ++ "referenced_type" : "type-18819", ++ "self_type" : "type-18818", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18704", +- "self_type" : "type-18703", ++ "referenced_type" : "type-18902", ++ "self_type" : "type-18901", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18984", +- "self_type" : "type-18983", ++ "referenced_type" : "type-18969", ++ "self_type" : "type-18968", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19226", +- "self_type" : "type-19225", ++ "referenced_type" : "type-19131", ++ "self_type" : "type-19130", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19377", +- "self_type" : "type-19376", ++ "referenced_type" : "type-19256", ++ "self_type" : "type-19255", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19565", +- "self_type" : "type-19564", ++ "referenced_type" : "type-19398", ++ "self_type" : "type-19397", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19735", +- "self_type" : "type-19734", ++ "referenced_type" : "type-19482", ++ "self_type" : "type-19481", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19895", +- "self_type" : "type-19894", ++ "referenced_type" : "type-19762", ++ "self_type" : "type-19761", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20244", +- "self_type" : "type-20243", ++ "referenced_type" : "type-20248", ++ "self_type" : "type-20247", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20414", +- "self_type" : "type-20413", ++ "referenced_type" : "type-20418", ++ "self_type" : "type-20417", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20520", +- "self_type" : "type-20519", ++ "referenced_type" : "type-20527", ++ "self_type" : "type-20526", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20653", +- "self_type" : "type-20652", ++ "referenced_type" : "type-20661", ++ "self_type" : "type-20660", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20802", +- "self_type" : "type-20801", ++ "referenced_type" : "type-20810", ++ "self_type" : "type-20809", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { +@@ -175552,56 +175594,56 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20895", +- "self_type" : "type-20894", ++ "referenced_type" : "type-20903", ++ "self_type" : "type-20902", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20996", +- "self_type" : "type-20995", ++ "referenced_type" : "type-21004", ++ "self_type" : "type-21003", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21178", +- "self_type" : "type-21177", ++ "referenced_type" : "type-21186", ++ "self_type" : "type-21185", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21258", +- "self_type" : "type-21257", ++ "referenced_type" : "type-21266", ++ "self_type" : "type-21265", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21316", +- "self_type" : "type-21315", ++ "referenced_type" : "type-21324", ++ "self_type" : "type-21323", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21390", +- "self_type" : "type-21389", ++ "referenced_type" : "type-21398", ++ "self_type" : "type-21397", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21788", +- "self_type" : "type-21787", ++ "referenced_type" : "type-21796", ++ "self_type" : "type-21795", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { +@@ -176778,296 +176820,296 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-15729", +- "self_type" : "type-15728", ++ "referenced_type" : "type-15522", ++ "self_type" : "type-15521", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-15902", +- "self_type" : "type-15901", ++ "referenced_type" : "type-15665", ++ "self_type" : "type-15664", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16184", +- "self_type" : "type-16183", ++ "referenced_type" : "type-15869", ++ "self_type" : "type-15868", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16285", +- "self_type" : "type-16284", ++ "referenced_type" : "type-16038", ++ "self_type" : "type-16037", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16425", +- "self_type" : "type-16424", ++ "referenced_type" : "type-16194", ++ "self_type" : "type-16193", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16482", +- "self_type" : "type-16481", ++ "referenced_type" : "type-16502", ++ "self_type" : "type-16501", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16594", +- "self_type" : "type-16593", ++ "referenced_type" : "type-16675", ++ "self_type" : "type-16674", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16662", +- "self_type" : "type-16661", ++ "referenced_type" : "type-16954", ++ "self_type" : "type-16953", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16715", +- "self_type" : "type-16714", ++ "referenced_type" : "type-17055", ++ "self_type" : "type-17054", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16800", +- "self_type" : "type-16799", ++ "referenced_type" : "type-17195", ++ "self_type" : "type-17194", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16868", +- "self_type" : "type-16867", ++ "referenced_type" : "type-17252", ++ "self_type" : "type-17251", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17107", +- "self_type" : "type-17106", ++ "referenced_type" : "type-17364", ++ "self_type" : "type-17363", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17305", +- "self_type" : "type-17304", ++ "referenced_type" : "type-17432", ++ "self_type" : "type-17431", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17379", +- "self_type" : "type-17378", ++ "referenced_type" : "type-17485", ++ "self_type" : "type-17484", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17425", +- "self_type" : "type-17424", ++ "referenced_type" : "type-17570", ++ "self_type" : "type-17569", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17782", +- "self_type" : "type-17781", ++ "referenced_type" : "type-17638", ++ "self_type" : "type-17637", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17883", +- "self_type" : "type-17882", ++ "referenced_type" : "type-17877", ++ "self_type" : "type-17876", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17975", +- "self_type" : "type-17974", ++ "referenced_type" : "type-18075", ++ "self_type" : "type-18074", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18086", +- "self_type" : "type-18085", ++ "referenced_type" : "type-18157", ++ "self_type" : "type-18156", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18138", +- "self_type" : "type-18137", ++ "referenced_type" : "type-18203", ++ "self_type" : "type-18202", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18227", +- "self_type" : "type-18226", ++ "referenced_type" : "type-18560", ++ "self_type" : "type-18559", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18398", +- "self_type" : "type-18397", ++ "referenced_type" : "type-18661", ++ "self_type" : "type-18660", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18525", +- "self_type" : "type-18524", ++ "referenced_type" : "type-18753", ++ "self_type" : "type-18752", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18757", +- "self_type" : "type-18756", ++ "referenced_type" : "type-18864", ++ "self_type" : "type-18863", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18889", +- "self_type" : "type-18888", ++ "referenced_type" : "type-18916", ++ "self_type" : "type-18915", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19037", +- "self_type" : "type-19036", ++ "referenced_type" : "type-19005", ++ "self_type" : "type-19004", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19277", +- "self_type" : "type-19276", ++ "referenced_type" : "type-19176", ++ "self_type" : "type-19175", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19421", +- "self_type" : "type-19420", ++ "referenced_type" : "type-19303", ++ "self_type" : "type-19302", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19625", +- "self_type" : "type-19624", ++ "referenced_type" : "type-19535", ++ "self_type" : "type-19534", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19794", +- "self_type" : "type-19793", ++ "referenced_type" : "type-19667", ++ "self_type" : "type-19666", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19950", +- "self_type" : "type-19949", ++ "referenced_type" : "type-19815", ++ "self_type" : "type-19814", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20263", +- "self_type" : "type-20262", ++ "referenced_type" : "type-20267", ++ "self_type" : "type-20266", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20436", +- "self_type" : "type-20435", ++ "referenced_type" : "type-20440", ++ "self_type" : "type-20439", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20715", +- "self_type" : "type-20714", ++ "referenced_type" : "type-20723", ++ "self_type" : "type-20722", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20816", +- "self_type" : "type-20815", ++ "referenced_type" : "type-20824", ++ "self_type" : "type-20823", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20956", +- "self_type" : "type-20955", ++ "referenced_type" : "type-20964", ++ "self_type" : "type-20963", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21014", +- "self_type" : "type-21013", ++ "referenced_type" : "type-21022", ++ "self_type" : "type-21021", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -177082,56 +177124,56 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21126", +- "self_type" : "type-21125", ++ "referenced_type" : "type-21134", ++ "self_type" : "type-21133", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21194", +- "self_type" : "type-21193", ++ "referenced_type" : "type-21202", ++ "self_type" : "type-21201", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21247", +- "self_type" : "type-21246", ++ "referenced_type" : "type-21255", ++ "self_type" : "type-21254", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21332", +- "self_type" : "type-21331", ++ "referenced_type" : "type-21340", ++ "self_type" : "type-21339", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21400", +- "self_type" : "type-21399", ++ "referenced_type" : "type-21408", ++ "self_type" : "type-21407", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21639", +- "self_type" : "type-21638", ++ "referenced_type" : "type-21647", ++ "self_type" : "type-21646", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21837", +- "self_type" : "type-21836", ++ "referenced_type" : "type-21845", ++ "self_type" : "type-21844", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -178204,24 +178246,24 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > >", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > >", +- "referenced_type" : "type-15983", +- "self_type" : "type-15982", ++ "referenced_type" : "type-16754", ++ "self_type" : "type-16753", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > >", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > >", +- "referenced_type" : "type-18615", +- "self_type" : "type-18614", ++ "referenced_type" : "type-19393", ++ "self_type" : "type-19392", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > >", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > >", +- "referenced_type" : "type-20515", +- "self_type" : "type-20514", ++ "referenced_type" : "type-20522", ++ "self_type" : "type-20521", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { +@@ -178396,106 +178438,106 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-15950", +- "self_type" : "type-15949", ++ "referenced_type" : "type-15438", ++ "self_type" : "type-15437", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +- "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-1624", +- "self_type" : "type-1913", +- "size" : 52, ++ "referenced_type" : "type-15766", ++ "self_type" : "type-15765", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-17019", +- "self_type" : "type-17018", ++ "referenced_type" : "type-15937", ++ "self_type" : "type-15936", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-18578", +- "self_type" : "type-18577", ++ "referenced_type" : "type-16104", ++ "self_type" : "type-16103", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { ++ "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-18662", +- "self_type" : "type-18661", ++ "referenced_type" : "type-1624", ++ "self_type" : "type-1913", ++ "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-18852", +- "self_type" : "type-18851", ++ "referenced_type" : "type-16721", ++ "self_type" : "type-16720", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-18950", +- "self_type" : "type-18949", ++ "referenced_type" : "type-17789", ++ "self_type" : "type-17788", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-19193", +- "self_type" : "type-19192", ++ "referenced_type" : "type-19356", ++ "self_type" : "type-19355", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-19522", +- "self_type" : "type-19521", ++ "referenced_type" : "type-19440", ++ "self_type" : "type-19439", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-19693", +- "self_type" : "type-19692", ++ "referenced_type" : "type-19630", ++ "self_type" : "type-19629", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-19860", +- "self_type" : "type-19859", ++ "referenced_type" : "type-19728", ++ "self_type" : "type-19727", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-20482", +- "self_type" : "type-20481", ++ "referenced_type" : "type-20489", ++ "self_type" : "type-20488", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-21551", +- "self_type" : "type-21550", ++ "referenced_type" : "type-21559", ++ "self_type" : "type-21558", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -178832,106 +178874,106 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-15964", +- "self_type" : "type-15963", ++ "referenced_type" : "type-15453", ++ "self_type" : "type-15452", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +- "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-1628", +- "self_type" : "type-1942", +- "size" : 32, ++ "referenced_type" : "type-15782", ++ "self_type" : "type-15781", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-17034", +- "self_type" : "type-17033", ++ "referenced_type" : "type-15952", ++ "self_type" : "type-15951", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-18593", +- "self_type" : "type-18592", ++ "referenced_type" : "type-16122", ++ "self_type" : "type-16121", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { ++ "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-18678", +- "self_type" : "type-18677", ++ "referenced_type" : "type-1628", ++ "self_type" : "type-1942", ++ "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-18869", +- "self_type" : "type-18868", ++ "referenced_type" : "type-16735", ++ "self_type" : "type-16734", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-18967", +- "self_type" : "type-18966", ++ "referenced_type" : "type-17804", ++ "self_type" : "type-17803", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-19208", +- "self_type" : "type-19207", ++ "referenced_type" : "type-19371", ++ "self_type" : "type-19370", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-19538", +- "self_type" : "type-19537", ++ "referenced_type" : "type-19456", ++ "self_type" : "type-19455", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-19708", +- "self_type" : "type-19707", ++ "referenced_type" : "type-19647", ++ "self_type" : "type-19646", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-19878", +- "self_type" : "type-19877", ++ "referenced_type" : "type-19745", ++ "self_type" : "type-19744", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-20496", +- "self_type" : "type-20495", ++ "referenced_type" : "type-20503", ++ "self_type" : "type-20502", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-21566", +- "self_type" : "type-21565", ++ "referenced_type" : "type-21574", ++ "self_type" : "type-21573", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -179612,7 +179654,7 @@ + "linker_set_key" : "const google::protobuf::hash", + "name" : "const google::protobuf::hash", + "referenced_type" : "type-4258", +- "self_type" : "type-19663", ++ "self_type" : "type-15907", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -179651,8 +179693,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::hash_set, std::equal_to >", + "name" : "const google::protobuf::hash_set, std::equal_to >", +- "referenced_type" : "type-19464", +- "self_type" : "type-19812", ++ "referenced_type" : "type-15708", ++ "self_type" : "type-16056", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -179758,8 +179800,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0>", + "name" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0>", +- "referenced_type" : "type-18896", +- "self_type" : "type-18895", ++ "referenced_type" : "type-19674", ++ "self_type" : "type-19673", + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, + { +@@ -180273,8 +180315,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19875", +- "self_type" : "type-19884", ++ "referenced_type" : "type-16119", ++ "self_type" : "type-16128", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180293,8 +180335,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr >", + "name" : "const google::protobuf::internal::scoped_ptr >", +- "referenced_type" : "type-19633", +- "self_type" : "type-19638", ++ "referenced_type" : "type-15877", ++ "self_type" : "type-15882", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180333,8 +180375,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19842", +- "self_type" : "type-19862", ++ "referenced_type" : "type-16086", ++ "self_type" : "type-16106", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180363,8 +180405,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19469", +- "self_type" : "type-19549", ++ "referenced_type" : "type-15713", ++ "self_type" : "type-15793", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180403,8 +180445,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19150", +- "self_type" : "type-19172", ++ "referenced_type" : "type-15395", ++ "self_type" : "type-15417", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180413,8 +180455,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19470", +- "self_type" : "type-19560", ++ "referenced_type" : "type-15714", ++ "self_type" : "type-15804", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180423,8 +180465,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19446", +- "self_type" : "type-19628", ++ "referenced_type" : "type-15690", ++ "self_type" : "type-15872", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180433,8 +180475,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19443", +- "self_type" : "type-19631", ++ "referenced_type" : "type-15687", ++ "self_type" : "type-15875", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180443,8 +180485,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19449", +- "self_type" : "type-19586", ++ "referenced_type" : "type-15693", ++ "self_type" : "type-15830", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180453,8 +180495,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19459", +- "self_type" : "type-19544", ++ "referenced_type" : "type-15703", ++ "self_type" : "type-15788", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180463,8 +180505,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19140", +- "self_type" : "type-19159", ++ "referenced_type" : "type-15385", ++ "self_type" : "type-15404", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180790,8 +180832,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::FieldContext", + "name" : "const google::protobuf::util::FieldContext", +- "referenced_type" : "type-18632", +- "self_type" : "type-18631", ++ "referenced_type" : "type-19410", ++ "self_type" : "type-19409", + "source_file" : "/external/protobuf/src/google/protobuf/util/field_comparator.h" + }, + { +@@ -180895,8 +180937,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::StatusOr", + "name" : "const google::protobuf::util::StatusOr", +- "referenced_type" : "type-19955", +- "self_type" : "type-19958", ++ "referenced_type" : "type-16199", ++ "self_type" : "type-16202", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -181015,8 +181057,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::converter::ObjectLocationTracker", + "name" : "const google::protobuf::util::converter::ObjectLocationTracker", +- "referenced_type" : "type-19644", +- "self_type" : "type-19648", ++ "referenced_type" : "type-15888", ++ "self_type" : "type-15892", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/object_location_tracker.h" + }, +@@ -181025,8 +181067,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::converter::ObjectSource", + "name" : "const google::protobuf::util::converter::ObjectSource", +- "referenced_type" : "type-19326", +- "self_type" : "type-19428", ++ "referenced_type" : "type-15570", ++ "self_type" : "type-15672", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/object_source.h" + }, +@@ -181045,8 +181087,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::converter::ProtoStreamObjectSource", + "name" : "const google::protobuf::util::converter::ProtoStreamObjectSource", +- "referenced_type" : "type-19324", +- "self_type" : "type-19323", ++ "referenced_type" : "type-15569", ++ "self_type" : "type-15568", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -181055,8 +181097,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::converter::ProtoStreamObjectWriter::Item", + "name" : "const google::protobuf::util::converter::ProtoStreamObjectWriter::Item", +- "referenced_type" : "type-19445", +- "self_type" : "type-19641", ++ "referenced_type" : "type-15689", ++ "self_type" : "type-15885", + "size" : 40, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, +@@ -181065,8 +181107,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::converter::ProtoStreamObjectWriter::Options", + "name" : "const google::protobuf::util::converter::ProtoStreamObjectWriter::Options", +- "referenced_type" : "type-19457", +- "self_type" : "type-19456", ++ "referenced_type" : "type-15701", ++ "self_type" : "type-15700", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, +@@ -181075,8 +181117,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::converter::ProtoWriter::ProtoElement", + "name" : "const google::protobuf::util::converter::ProtoWriter::ProtoElement", +- "referenced_type" : "type-19461", +- "self_type" : "type-19635", ++ "referenced_type" : "type-15705", ++ "self_type" : "type-15879", + "size" : 64, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, +@@ -181085,8 +181127,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::converter::StructuredObjectWriter::BaseElement", + "name" : "const google::protobuf::util::converter::StructuredObjectWriter::BaseElement", +- "referenced_type" : "type-19139", +- "self_type" : "type-19145", ++ "referenced_type" : "type-15384", ++ "self_type" : "type-15390", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/structured_objectwriter.h" + }, +@@ -181170,80 +181212,80 @@ + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-16496", +- "self_type" : "type-16495", ++ "referenced_type" : "type-17266", ++ "self_type" : "type-17265", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-16888", +- "self_type" : "type-16887", ++ "referenced_type" : "type-17658", ++ "self_type" : "type-17657", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-17063", +- "self_type" : "type-17062", ++ "referenced_type" : "type-17833", ++ "self_type" : "type-17832", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-17182", +- "self_type" : "type-17181", ++ "referenced_type" : "type-17952", ++ "self_type" : "type-17951", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-17449", +- "self_type" : "type-17448", ++ "referenced_type" : "type-18227", ++ "self_type" : "type-18226", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-18899", +- "self_type" : "type-18898", ++ "referenced_type" : "type-19677", ++ "self_type" : "type-19676", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-21028", +- "self_type" : "type-21027", ++ "referenced_type" : "type-21036", ++ "self_type" : "type-21035", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-21420", +- "self_type" : "type-21419", ++ "referenced_type" : "type-21428", ++ "self_type" : "type-21427", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-21595", +- "self_type" : "type-21594", ++ "referenced_type" : "type-21603", ++ "self_type" : "type-21602", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-21714", +- "self_type" : "type-21713", ++ "referenced_type" : "type-21722", ++ "self_type" : "type-21721", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { +@@ -181487,8 +181529,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> >", + "name" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> >", +- "referenced_type" : "type-16979", +- "self_type" : "type-16978", ++ "referenced_type" : "type-17749", ++ "self_type" : "type-17748", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181497,8 +181539,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> >", + "name" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> >", +- "referenced_type" : "type-21511", +- "self_type" : "type-21510", ++ "referenced_type" : "type-21519", ++ "self_type" : "type-21518", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181567,8 +181609,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", + "name" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", +- "referenced_type" : "type-17565", +- "self_type" : "type-17564", ++ "referenced_type" : "type-18343", ++ "self_type" : "type-18342", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181617,8 +181659,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> >", + "name" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> >", +- "referenced_type" : "type-16989", +- "self_type" : "type-16988", ++ "referenced_type" : "type-17759", ++ "self_type" : "type-17758", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181627,8 +181669,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> >", + "name" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> >", +- "referenced_type" : "type-21521", +- "self_type" : "type-21520", ++ "referenced_type" : "type-21529", ++ "self_type" : "type-21528", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181707,8 +181749,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", + "name" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", +- "referenced_type" : "type-17575", +- "self_type" : "type-17574", ++ "referenced_type" : "type-18353", ++ "self_type" : "type-18352", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181717,8 +181759,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", + "name" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", +- "referenced_type" : "type-18828", +- "self_type" : "type-18827", ++ "referenced_type" : "type-19606", ++ "self_type" : "type-19605", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181787,8 +181829,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node", + "name" : "const std::__tree_node", +- "referenced_type" : "type-16941", +- "self_type" : "type-16940", ++ "referenced_type" : "type-17711", ++ "self_type" : "type-17710", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181797,8 +181839,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node", + "name" : "const std::__tree_node", +- "referenced_type" : "type-21473", +- "self_type" : "type-21472", ++ "referenced_type" : "type-21481", ++ "self_type" : "type-21480", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181857,8 +181899,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node *>, void *>", + "name" : "const std::__tree_node *>, void *>", +- "referenced_type" : "type-16931", +- "self_type" : "type-16930", ++ "referenced_type" : "type-17701", ++ "self_type" : "type-17700", + "size" : 40, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181867,8 +181909,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node *>, void *>", + "name" : "const std::__tree_node *>, void *>", +- "referenced_type" : "type-21463", +- "self_type" : "type-21462", ++ "referenced_type" : "type-21471", ++ "self_type" : "type-21470", + "size" : 40, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181937,8 +181979,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *>", + "name" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *>", +- "referenced_type" : "type-17515", +- "self_type" : "type-17514", ++ "referenced_type" : "type-18293", ++ "self_type" : "type-18292", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181997,8 +182039,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node, std::allocator > *, void *>", + "name" : "const std::__tree_node, std::allocator > *, void *>", +- "referenced_type" : "type-17523", +- "self_type" : "type-17522", ++ "referenced_type" : "type-18301", ++ "self_type" : "type-18300", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -182047,8 +182089,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-16063", +- "self_type" : "type-16062", ++ "referenced_type" : "type-16834", ++ "self_type" : "type-16833", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182057,8 +182099,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-20595", +- "self_type" : "type-20594", ++ "referenced_type" : "type-20602", ++ "self_type" : "type-20601", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182127,8 +182169,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator &)> >", + "name" : "const std::allocator &)> >", +- "referenced_type" : "type-17143", +- "self_type" : "type-17142", ++ "referenced_type" : "type-17913", ++ "self_type" : "type-17912", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182137,8 +182179,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator &)> >", + "name" : "const std::allocator &)> >", +- "referenced_type" : "type-21675", +- "self_type" : "type-21674", ++ "referenced_type" : "type-21683", ++ "self_type" : "type-21682", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182197,8 +182239,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-16552", +- "self_type" : "type-16551", ++ "referenced_type" : "type-17322", ++ "self_type" : "type-17321", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182207,8 +182249,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-21084", +- "self_type" : "type-21083", ++ "referenced_type" : "type-21092", ++ "self_type" : "type-21091", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182277,8 +182319,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-17149", +- "self_type" : "type-17148", ++ "referenced_type" : "type-17919", ++ "self_type" : "type-17918", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182287,8 +182329,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-21681", +- "self_type" : "type-21680", ++ "referenced_type" : "type-21689", ++ "self_type" : "type-21688", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182337,8 +182379,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> >", + "name" : "const std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> >", +- "referenced_type" : "type-19488", +- "self_type" : "type-19487", ++ "referenced_type" : "type-15732", ++ "self_type" : "type-15731", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182367,8 +182409,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> >", + "name" : "const std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> >", +- "referenced_type" : "type-19346", +- "self_type" : "type-19345", ++ "referenced_type" : "type-15590", ++ "self_type" : "type-15589", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182407,8 +182449,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> >", + "name" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> >", +- "referenced_type" : "type-16071", +- "self_type" : "type-16070", ++ "referenced_type" : "type-16842", ++ "self_type" : "type-16841", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182417,8 +182459,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> >", + "name" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> >", +- "referenced_type" : "type-20603", +- "self_type" : "type-20602", ++ "referenced_type" : "type-20610", ++ "self_type" : "type-20609", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182497,8 +182539,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> >", + "name" : "const std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> >", +- "referenced_type" : "type-18441", +- "self_type" : "type-18440", ++ "referenced_type" : "type-19219", ++ "self_type" : "type-19218", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182537,8 +182579,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, int> >", + "name" : "const std::allocator, std::allocator >, int> >", +- "referenced_type" : "type-19044", +- "self_type" : "type-19043", ++ "referenced_type" : "type-19822", ++ "self_type" : "type-19821", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182597,8 +182639,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, google::protobuf::internal::ExtensionInfo> >", + "name" : "const std::allocator, google::protobuf::internal::ExtensionInfo> >", +- "referenced_type" : "type-17471", +- "self_type" : "type-17470", ++ "referenced_type" : "type-18249", ++ "self_type" : "type-18248", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -183687,8 +183729,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15397", +- "self_type" : "type-15396", ++ "referenced_type" : "type-15375", ++ "self_type" : "type-15374", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183697,8 +183739,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15409", +- "self_type" : "type-15408", ++ "referenced_type" : "type-1548", ++ "self_type" : "type-1547", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183707,8 +183749,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15445", +- "self_type" : "type-15444", ++ "referenced_type" : "type-15550", ++ "self_type" : "type-15549", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183717,8 +183759,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15478", +- "self_type" : "type-15477", ++ "referenced_type" : "type-15555", ++ "self_type" : "type-15554", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183727,8 +183769,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1548", +- "self_type" : "type-1547", ++ "referenced_type" : "type-15583", ++ "self_type" : "type-15582", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183737,8 +183779,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15511", +- "self_type" : "type-15510", ++ "referenced_type" : "type-156", ++ "self_type" : "type-155", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183747,18 +183789,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15569", +- "self_type" : "type-15568", ++ "referenced_type" : "type-15716", ++ "self_type" : "type-15715", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-156", +- "self_type" : "type-155", ++ "referenced_type" : "type-15719", ++ "self_type" : "type-15718", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183767,8 +183809,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15819", +- "self_type" : "type-15818", ++ "referenced_type" : "type-1582", ++ "self_type" : "type-1581", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183777,8 +183819,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1582", +- "self_type" : "type-1581", ++ "referenced_type" : "type-15891", ++ "self_type" : "type-15890", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183787,8 +183829,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15832", +- "self_type" : "type-15831", ++ "referenced_type" : "type-15905", ++ "self_type" : "type-15904", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183797,8 +183839,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15896", +- "self_type" : "type-15895", ++ "referenced_type" : "type-16065", ++ "self_type" : "type-16064", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183807,8 +183849,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15928", +- "self_type" : "type-15927", ++ "referenced_type" : "type-16161", ++ "self_type" : "type-16160", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183817,8 +183859,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15933", +- "self_type" : "type-15932", ++ "referenced_type" : "type-16251", ++ "self_type" : "type-16250", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183827,8 +183869,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16021", +- "self_type" : "type-16020", ++ "referenced_type" : "type-16284", ++ "self_type" : "type-16283", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183837,18 +183879,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16040", +- "self_type" : "type-16039", ++ "referenced_type" : "type-16342", ++ "self_type" : "type-16341", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16182", +- "self_type" : "type-16181", ++ "referenced_type" : "type-16592", ++ "self_type" : "type-16591", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183857,8 +183899,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16233", +- "self_type" : "type-16232", ++ "referenced_type" : "type-16605", ++ "self_type" : "type-16604", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183867,8 +183909,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16260", +- "self_type" : "type-16259", ++ "referenced_type" : "type-16669", ++ "self_type" : "type-16668", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183877,8 +183919,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16330", +- "self_type" : "type-16329", ++ "referenced_type" : "type-16699", ++ "self_type" : "type-16698", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183887,8 +183929,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16333", +- "self_type" : "type-16332", ++ "referenced_type" : "type-16704", ++ "self_type" : "type-16703", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183897,8 +183939,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16408", +- "self_type" : "type-16407", ++ "referenced_type" : "type-16792", ++ "self_type" : "type-16791", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183907,18 +183949,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16437", +- "self_type" : "type-16436", ++ "referenced_type" : "type-16811", ++ "self_type" : "type-16810", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16535", +- "self_type" : "type-16534", ++ "referenced_type" : "type-16952", ++ "self_type" : "type-16951", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183927,8 +183969,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16579", +- "self_type" : "type-16578", ++ "referenced_type" : "type-17003", ++ "self_type" : "type-17002", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183937,8 +183979,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16615", +- "self_type" : "type-16614", ++ "referenced_type" : "type-17030", ++ "self_type" : "type-17029", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183947,8 +183989,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16636", +- "self_type" : "type-16635", ++ "referenced_type" : "type-17100", ++ "self_type" : "type-17099", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183957,8 +183999,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16680", +- "self_type" : "type-16679", ++ "referenced_type" : "type-17103", ++ "self_type" : "type-17102", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183967,8 +184009,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16687", +- "self_type" : "type-16686", ++ "referenced_type" : "type-17178", ++ "self_type" : "type-17177", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183977,8 +184019,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16746", +- "self_type" : "type-16745", ++ "referenced_type" : "type-171", ++ "self_type" : "type-170", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183987,8 +184029,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16811", +- "self_type" : "type-16810", ++ "referenced_type" : "type-17207", ++ "self_type" : "type-17206", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183997,8 +184039,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16826", +- "self_type" : "type-16825", ++ "referenced_type" : "type-17305", ++ "self_type" : "type-17304", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184007,8 +184049,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16849", +- "self_type" : "type-16848", ++ "referenced_type" : "type-17349", ++ "self_type" : "type-17348", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184017,8 +184059,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16897", +- "self_type" : "type-16896", ++ "referenced_type" : "type-17385", ++ "self_type" : "type-17384", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184027,8 +184069,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17121", +- "self_type" : "type-17120", ++ "referenced_type" : "type-17406", ++ "self_type" : "type-17405", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184037,8 +184079,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-171", +- "self_type" : "type-170", ++ "referenced_type" : "type-17450", ++ "self_type" : "type-17449", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184047,8 +184089,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17231", +- "self_type" : "type-17230", ++ "referenced_type" : "type-17457", ++ "self_type" : "type-17456", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184057,8 +184099,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17241", +- "self_type" : "type-17240", ++ "referenced_type" : "type-17516", ++ "self_type" : "type-17515", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184067,8 +184109,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17314", +- "self_type" : "type-17313", ++ "referenced_type" : "type-17581", ++ "self_type" : "type-17580", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184077,8 +184119,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17326", +- "self_type" : "type-17325", ++ "referenced_type" : "type-17596", ++ "self_type" : "type-17595", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184087,8 +184129,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17386", +- "self_type" : "type-17385", ++ "referenced_type" : "type-17619", ++ "self_type" : "type-17618", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184097,8 +184139,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17399", +- "self_type" : "type-17398", ++ "referenced_type" : "type-17667", ++ "self_type" : "type-17666", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184107,8 +184149,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17641", +- "self_type" : "type-17640", ++ "referenced_type" : "type-1786", ++ "self_type" : "type-1785", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184117,8 +184159,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17655", +- "self_type" : "type-17654", ++ "referenced_type" : "type-17891", ++ "self_type" : "type-17890", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184127,8 +184169,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17823", +- "self_type" : "type-17822", ++ "referenced_type" : "type-18001", ++ "self_type" : "type-18000", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184137,8 +184179,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1786", +- "self_type" : "type-1785", ++ "referenced_type" : "type-18011", ++ "self_type" : "type-18010", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184147,8 +184189,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17911", +- "self_type" : "type-17910", ++ "referenced_type" : "type-18084", ++ "self_type" : "type-18083", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184157,8 +184199,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17987", +- "self_type" : "type-17986", ++ "referenced_type" : "type-18096", ++ "self_type" : "type-18095", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184167,8 +184209,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18096", +- "self_type" : "type-18095", ++ "referenced_type" : "type-18164", ++ "self_type" : "type-18163", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184177,8 +184219,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18151", +- "self_type" : "type-18150", ++ "referenced_type" : "type-18177", ++ "self_type" : "type-18176", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184187,8 +184229,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18180", +- "self_type" : "type-18179", ++ "referenced_type" : "type-181", ++ "self_type" : "type-180", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184197,8 +184239,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-181", +- "self_type" : "type-180", ++ "referenced_type" : "type-18419", ++ "self_type" : "type-18418", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184207,8 +184249,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18257", +- "self_type" : "type-18256", ++ "referenced_type" : "type-18433", ++ "self_type" : "type-18432", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184217,8 +184259,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18271", +- "self_type" : "type-18270", ++ "referenced_type" : "type-18601", ++ "self_type" : "type-18600", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184227,18 +184269,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18293", +- "self_type" : "type-18292", ++ "referenced_type" : "type-1861", ++ "self_type" : "type-1860", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18301", +- "self_type" : "type-18300", ++ "referenced_type" : "type-18689", ++ "self_type" : "type-18688", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184247,8 +184289,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18312", +- "self_type" : "type-18311", ++ "referenced_type" : "type-18765", ++ "self_type" : "type-18764", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184257,8 +184299,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18319", +- "self_type" : "type-18318", ++ "referenced_type" : "type-18874", ++ "self_type" : "type-18873", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184267,8 +184309,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18433", +- "self_type" : "type-18432", ++ "referenced_type" : "type-18929", ++ "self_type" : "type-18928", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184277,8 +184319,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18448", +- "self_type" : "type-18447", ++ "referenced_type" : "type-18958", ++ "self_type" : "type-18957", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184287,8 +184329,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18559", +- "self_type" : "type-18558", ++ "referenced_type" : "type-19035", ++ "self_type" : "type-19034", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184297,8 +184339,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18600", +- "self_type" : "type-18599", ++ "referenced_type" : "type-19049", ++ "self_type" : "type-19048", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184307,28 +184349,28 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1861", +- "self_type" : "type-1860", ++ "referenced_type" : "type-19071", ++ "self_type" : "type-19070", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18640", +- "self_type" : "type-18639", ++ "referenced_type" : "type-19079", ++ "self_type" : "type-19078", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18775", +- "self_type" : "type-18774", ++ "referenced_type" : "type-19090", ++ "self_type" : "type-19089", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184337,8 +184379,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18812", +- "self_type" : "type-18811", ++ "referenced_type" : "type-19097", ++ "self_type" : "type-19096", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184347,8 +184389,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18918", +- "self_type" : "type-18917", ++ "referenced_type" : "type-19211", ++ "self_type" : "type-19210", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184357,8 +184399,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19103", +- "self_type" : "type-19102", ++ "referenced_type" : "type-19226", ++ "self_type" : "type-19225", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184367,8 +184409,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19117", +- "self_type" : "type-19116", ++ "referenced_type" : "type-19337", ++ "self_type" : "type-19336", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184377,8 +184419,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19125", +- "self_type" : "type-19124", ++ "referenced_type" : "type-19378", ++ "self_type" : "type-19377", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184387,18 +184429,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19130", +- "self_type" : "type-19129", ++ "referenced_type" : "type-19418", ++ "self_type" : "type-19417", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19305", +- "self_type" : "type-19304", ++ "referenced_type" : "type-194", ++ "self_type" : "type-193", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184407,8 +184449,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19310", +- "self_type" : "type-19309", ++ "referenced_type" : "type-19553", ++ "self_type" : "type-19552", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184417,8 +184459,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19339", +- "self_type" : "type-19338", ++ "referenced_type" : "type-19590", ++ "self_type" : "type-19589", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184427,8 +184469,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19472", +- "self_type" : "type-19471", ++ "referenced_type" : "type-19696", ++ "self_type" : "type-19695", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184437,8 +184479,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19475", +- "self_type" : "type-19474", ++ "referenced_type" : "type-19881", ++ "self_type" : "type-19880", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184447,8 +184489,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-194", +- "self_type" : "type-193", ++ "referenced_type" : "type-19895", ++ "self_type" : "type-19894", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184457,8 +184499,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19647", +- "self_type" : "type-19646", ++ "referenced_type" : "type-19903", ++ "self_type" : "type-19902", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184467,8 +184509,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19661", +- "self_type" : "type-19660", ++ "referenced_type" : "type-19930", ++ "self_type" : "type-19929", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184477,8 +184519,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19821", +- "self_type" : "type-19820", ++ "referenced_type" : "type-19942", ++ "self_type" : "type-19941", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184487,8 +184529,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19917", +- "self_type" : "type-19916", ++ "referenced_type" : "type-19978", ++ "self_type" : "type-19977", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184497,8 +184539,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20007", +- "self_type" : "type-20006", ++ "referenced_type" : "type-20011", ++ "self_type" : "type-20010", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184507,8 +184549,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20044", +- "self_type" : "type-20043", ++ "referenced_type" : "type-20048", ++ "self_type" : "type-20047", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184517,8 +184559,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20102", +- "self_type" : "type-20101", ++ "referenced_type" : "type-20106", ++ "self_type" : "type-20105", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, +@@ -184527,8 +184569,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20353", +- "self_type" : "type-20352", ++ "referenced_type" : "type-20357", ++ "self_type" : "type-20356", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184537,8 +184579,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20366", +- "self_type" : "type-20365", ++ "referenced_type" : "type-20370", ++ "self_type" : "type-20369", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184547,8 +184589,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20430", +- "self_type" : "type-20429", ++ "referenced_type" : "type-20434", ++ "self_type" : "type-20433", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184557,8 +184599,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20460", +- "self_type" : "type-20459", ++ "referenced_type" : "type-20467", ++ "self_type" : "type-20466", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184567,8 +184609,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20465", +- "self_type" : "type-20464", ++ "referenced_type" : "type-20472", ++ "self_type" : "type-20471", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184577,8 +184619,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20553", +- "self_type" : "type-20552", ++ "referenced_type" : "type-20560", ++ "self_type" : "type-20559", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184587,8 +184629,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20572", +- "self_type" : "type-20571", ++ "referenced_type" : "type-20579", ++ "self_type" : "type-20578", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -184597,8 +184639,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20713", +- "self_type" : "type-20712", ++ "referenced_type" : "type-20721", ++ "self_type" : "type-20720", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184607,8 +184649,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20764", +- "self_type" : "type-20763", ++ "referenced_type" : "type-20772", ++ "self_type" : "type-20771", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184617,8 +184659,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20791", +- "self_type" : "type-20790", ++ "referenced_type" : "type-20799", ++ "self_type" : "type-20798", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184627,8 +184669,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20861", +- "self_type" : "type-20860", ++ "referenced_type" : "type-20869", ++ "self_type" : "type-20868", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184637,8 +184679,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20864", +- "self_type" : "type-20863", ++ "referenced_type" : "type-20872", ++ "self_type" : "type-20871", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184657,8 +184699,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20939", +- "self_type" : "type-20938", ++ "referenced_type" : "type-20947", ++ "self_type" : "type-20946", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184667,8 +184709,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20968", +- "self_type" : "type-20967", ++ "referenced_type" : "type-20976", ++ "self_type" : "type-20975", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184677,8 +184719,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21067", +- "self_type" : "type-21066", ++ "referenced_type" : "type-21075", ++ "self_type" : "type-21074", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184687,8 +184729,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21111", +- "self_type" : "type-21110", ++ "referenced_type" : "type-21119", ++ "self_type" : "type-21118", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184697,8 +184739,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21147", +- "self_type" : "type-21146", ++ "referenced_type" : "type-21155", ++ "self_type" : "type-21154", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184707,8 +184749,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21168", +- "self_type" : "type-21167", ++ "referenced_type" : "type-21176", ++ "self_type" : "type-21175", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184717,8 +184759,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21212", +- "self_type" : "type-21211", ++ "referenced_type" : "type-21220", ++ "self_type" : "type-21219", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184727,8 +184769,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21219", +- "self_type" : "type-21218", ++ "referenced_type" : "type-21227", ++ "self_type" : "type-21226", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184737,8 +184779,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21278", +- "self_type" : "type-21277", ++ "referenced_type" : "type-21286", ++ "self_type" : "type-21285", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184747,8 +184789,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21343", +- "self_type" : "type-21342", ++ "referenced_type" : "type-21351", ++ "self_type" : "type-21350", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184757,8 +184799,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21358", +- "self_type" : "type-21357", ++ "referenced_type" : "type-21366", ++ "self_type" : "type-21365", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184767,8 +184809,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21381", +- "self_type" : "type-21380", ++ "referenced_type" : "type-21389", ++ "self_type" : "type-21388", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184777,8 +184819,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21429", +- "self_type" : "type-21428", ++ "referenced_type" : "type-21437", ++ "self_type" : "type-21436", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184787,8 +184829,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21653", +- "self_type" : "type-21652", ++ "referenced_type" : "type-21661", ++ "self_type" : "type-21660", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184797,8 +184839,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21763", +- "self_type" : "type-21762", ++ "referenced_type" : "type-21771", ++ "self_type" : "type-21770", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184807,8 +184849,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21773", +- "self_type" : "type-21772", ++ "referenced_type" : "type-21781", ++ "self_type" : "type-21780", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184817,8 +184859,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21846", +- "self_type" : "type-21845", ++ "referenced_type" : "type-21854", ++ "self_type" : "type-21853", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184827,8 +184869,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21858", +- "self_type" : "type-21857", ++ "referenced_type" : "type-21866", ++ "self_type" : "type-21865", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -188057,8 +188099,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-16549", +- "self_type" : "type-16548", ++ "referenced_type" : "type-17319", ++ "self_type" : "type-17318", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188067,8 +188109,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-17146", +- "self_type" : "type-17145", ++ "referenced_type" : "type-17916", ++ "self_type" : "type-17915", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188077,8 +188119,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-21081", +- "self_type" : "type-21080", ++ "referenced_type" : "type-21089", ++ "self_type" : "type-21088", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188087,8 +188129,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-21678", +- "self_type" : "type-21677", ++ "referenced_type" : "type-21686", ++ "self_type" : "type-21685", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188197,8 +188239,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-16910", +- "self_type" : "type-16909", ++ "referenced_type" : "type-17680", ++ "self_type" : "type-17679", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -188207,8 +188249,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-21442", +- "self_type" : "type-21441", ++ "referenced_type" : "type-21450", ++ "self_type" : "type-21449", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -188317,8 +188359,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-16068", +- "self_type" : "type-16067", ++ "referenced_type" : "type-15587", ++ "self_type" : "type-15586", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188327,18 +188369,18 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-17492", +- "self_type" : "type-17491", ++ "referenced_type" : "type-15729", ++ "self_type" : "type-15728", + "size" : 1, +- "source_file" : "/external/protobuf/src/google/protobuf/arena.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, + { + "alignment" : 1, + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-18438", +- "self_type" : "type-18437", ++ "referenced_type" : "type-16839", ++ "self_type" : "type-16838", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188347,18 +188389,18 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-19041", +- "self_type" : "type-19040", ++ "referenced_type" : "type-18270", ++ "self_type" : "type-18269", + "size" : 1, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, + { + "alignment" : 1, + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-19343", +- "self_type" : "type-19342", ++ "referenced_type" : "type-19216", ++ "self_type" : "type-19215", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188367,8 +188409,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-19485", +- "self_type" : "type-19484", ++ "referenced_type" : "type-19819", ++ "self_type" : "type-19818", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188377,8 +188419,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-20600", +- "self_type" : "type-20599", ++ "referenced_type" : "type-20607", ++ "self_type" : "type-20606", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188577,8 +188619,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to >", + "name" : "const std::equal_to >", +- "referenced_type" : "type-17468", +- "self_type" : "type-17467", ++ "referenced_type" : "type-18246", ++ "self_type" : "type-18245", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188667,8 +188709,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator > >", + "name" : "const std::map, std::allocator > >", +- "referenced_type" : "type-17799", +- "self_type" : "type-17798", ++ "referenced_type" : "type-18577", ++ "self_type" : "type-18576", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188727,8 +188769,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > >", + "name" : "const std::map >, std::less, std::allocator > > > >", +- "referenced_type" : "type-17811", +- "self_type" : "type-17810", ++ "referenced_type" : "type-18589", ++ "self_type" : "type-18588", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188787,8 +188829,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > >", + "name" : "const std::map >, std::less, std::allocator > > > >", +- "referenced_type" : "type-17805", +- "self_type" : "type-17804", ++ "referenced_type" : "type-18583", ++ "self_type" : "type-18582", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188827,8 +188869,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator > >", + "name" : "const std::map, std::allocator > >", +- "referenced_type" : "type-19967", +- "self_type" : "type-19966", ++ "referenced_type" : "type-16211", ++ "self_type" : "type-16210", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188867,8 +188909,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > >", + "name" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > >", +- "referenced_type" : "type-16302", +- "self_type" : "type-16301", ++ "referenced_type" : "type-17072", ++ "self_type" : "type-17071", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188877,8 +188919,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > >", + "name" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > >", +- "referenced_type" : "type-20833", +- "self_type" : "type-20832", ++ "referenced_type" : "type-20841", ++ "self_type" : "type-20840", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188957,8 +188999,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > >", + "name" : "const std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > >", +- "referenced_type" : "type-18278", +- "self_type" : "type-18277", ++ "referenced_type" : "type-19056", ++ "self_type" : "type-19055", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -188997,8 +189039,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > >", + "name" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > >", +- "referenced_type" : "type-16314", +- "self_type" : "type-16313", ++ "referenced_type" : "type-17084", ++ "self_type" : "type-17083", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189007,8 +189049,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > >", + "name" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > >", +- "referenced_type" : "type-20845", +- "self_type" : "type-20844", ++ "referenced_type" : "type-20853", ++ "self_type" : "type-20852", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189087,8 +189129,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::pair, std::less >, std::allocator, std::pair > > >", + "name" : "const std::map, std::pair, std::less >, std::allocator, std::pair > > >", +- "referenced_type" : "type-18552", +- "self_type" : "type-18551", ++ "referenced_type" : "type-19330", ++ "self_type" : "type-19329", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189127,8 +189169,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > >", + "name" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > >", +- "referenced_type" : "type-16305", +- "self_type" : "type-16304", ++ "referenced_type" : "type-17075", ++ "self_type" : "type-17074", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189137,8 +189179,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > >", + "name" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > >", +- "referenced_type" : "type-20836", +- "self_type" : "type-20835", ++ "referenced_type" : "type-20844", ++ "self_type" : "type-20843", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189207,8 +189249,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > >", + "name" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > >", +- "referenced_type" : "type-16317", +- "self_type" : "type-16316", ++ "referenced_type" : "type-17087", ++ "self_type" : "type-17086", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189217,8 +189259,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > >", + "name" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > >", +- "referenced_type" : "type-20848", +- "self_type" : "type-20847", ++ "referenced_type" : "type-20856", ++ "self_type" : "type-20855", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189287,8 +189329,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-16026", +- "self_type" : "type-16025", ++ "referenced_type" : "type-16797", ++ "self_type" : "type-16796", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189297,8 +189339,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-20558", +- "self_type" : "type-20557", ++ "referenced_type" : "type-20565", ++ "self_type" : "type-20564", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189367,8 +189409,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair &)>", + "name" : "const std::pair &)>", +- "referenced_type" : "type-17124", +- "self_type" : "type-17123", ++ "referenced_type" : "type-17894", ++ "self_type" : "type-17893", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189377,8 +189419,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair &)>", + "name" : "const std::pair &)>", +- "referenced_type" : "type-21656", +- "self_type" : "type-21655", ++ "referenced_type" : "type-21664", ++ "self_type" : "type-21663", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189437,8 +189479,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-16019", +- "self_type" : "type-16018", ++ "referenced_type" : "type-16790", ++ "self_type" : "type-16789", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189447,8 +189489,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-20551", +- "self_type" : "type-20550", ++ "referenced_type" : "type-20558", ++ "self_type" : "type-20557", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189517,8 +189559,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-17128", +- "self_type" : "type-17127", ++ "referenced_type" : "type-17898", ++ "self_type" : "type-17897", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189527,8 +189569,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-21660", +- "self_type" : "type-21659", ++ "referenced_type" : "type-21668", ++ "self_type" : "type-21667", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189597,8 +189639,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-18555", +- "self_type" : "type-18554", ++ "referenced_type" : "type-19333", ++ "self_type" : "type-19332", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189657,8 +189699,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-17396", +- "self_type" : "type-17395", ++ "referenced_type" : "type-18174", ++ "self_type" : "type-18173", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -189727,8 +189769,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-19976", +- "self_type" : "type-19975", ++ "referenced_type" : "type-16220", ++ "self_type" : "type-16219", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189767,8 +189809,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *>", + "name" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *>", +- "referenced_type" : "type-16206", +- "self_type" : "type-16205", ++ "referenced_type" : "type-16976", ++ "self_type" : "type-16975", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189777,8 +189819,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *>", + "name" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *>", +- "referenced_type" : "type-20737", +- "self_type" : "type-20736", ++ "referenced_type" : "type-20745", ++ "self_type" : "type-20744", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189847,8 +189889,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>", + "name" : "const std::pair, std::allocator >, int>", +- "referenced_type" : "type-19092", +- "self_type" : "type-19091", ++ "referenced_type" : "type-19870", ++ "self_type" : "type-19869", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189887,8 +189929,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, std::pair >", + "name" : "const std::pair, std::allocator >, std::pair >", +- "referenced_type" : "type-16218", +- "self_type" : "type-16217", ++ "referenced_type" : "type-16988", ++ "self_type" : "type-16987", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189897,8 +189939,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, std::pair >", + "name" : "const std::pair, std::allocator >, std::pair >", +- "referenced_type" : "type-20749", +- "self_type" : "type-20748", ++ "referenced_type" : "type-20757", ++ "self_type" : "type-20756", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189967,8 +190009,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, const google::protobuf::FieldDescriptor *>", + "name" : "const std::pair, const google::protobuf::FieldDescriptor *>", +- "referenced_type" : "type-16032", +- "self_type" : "type-16031", ++ "referenced_type" : "type-16803", ++ "self_type" : "type-16802", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189977,8 +190019,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, const google::protobuf::FieldDescriptor *>", + "name" : "const std::pair, const google::protobuf::FieldDescriptor *>", +- "referenced_type" : "type-20564", +- "self_type" : "type-20563", ++ "referenced_type" : "type-20571", ++ "self_type" : "type-20570", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190067,8 +190109,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, google::protobuf::internal::ExtensionInfo>", + "name" : "const std::pair, google::protobuf::internal::ExtensionInfo>", +- "referenced_type" : "type-18030", +- "self_type" : "type-18029", ++ "referenced_type" : "type-18808", ++ "self_type" : "type-18807", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190147,8 +190189,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *>", + "name" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *>", +- "referenced_type" : "type-16212", +- "self_type" : "type-16211", ++ "referenced_type" : "type-16982", ++ "self_type" : "type-16981", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190157,8 +190199,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *>", + "name" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *>", +- "referenced_type" : "type-20743", +- "self_type" : "type-20742", ++ "referenced_type" : "type-20751", ++ "self_type" : "type-20750", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190227,8 +190269,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>, std::pair >", + "name" : "const std::pair, std::allocator >, int>, std::pair >", +- "referenced_type" : "type-16224", +- "self_type" : "type-16223", ++ "referenced_type" : "type-16994", ++ "self_type" : "type-16993", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190237,8 +190279,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>, std::pair >", + "name" : "const std::pair, std::allocator >, int>, std::pair >", +- "referenced_type" : "type-20755", +- "self_type" : "type-20754", ++ "referenced_type" : "type-20763", ++ "self_type" : "type-20762", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190307,8 +190349,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-16312", +- "self_type" : "type-16311", ++ "referenced_type" : "type-17082", ++ "self_type" : "type-17081", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190317,8 +190359,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-20843", +- "self_type" : "type-20842", ++ "referenced_type" : "type-20851", ++ "self_type" : "type-20850", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190397,8 +190439,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-18550", +- "self_type" : "type-18549", ++ "referenced_type" : "type-19328", ++ "self_type" : "type-19327", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190437,8 +190479,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>", + "name" : "const std::pair, std::allocator >, int>", +- "referenced_type" : "type-16308", +- "self_type" : "type-16307", ++ "referenced_type" : "type-17078", ++ "self_type" : "type-17077", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190447,8 +190489,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>", + "name" : "const std::pair, std::allocator >, int>", +- "referenced_type" : "type-20839", +- "self_type" : "type-20838", ++ "referenced_type" : "type-20847", ++ "self_type" : "type-20846", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190517,8 +190559,8 @@ + "is_const" : true, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator >", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator >", +- "referenced_type" : "type-16952", +- "self_type" : "type-16951", ++ "referenced_type" : "type-17722", ++ "self_type" : "type-17721", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -190527,8 +190569,8 @@ + "is_const" : true, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator >", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator >", +- "referenced_type" : "type-21484", +- "self_type" : "type-21483", ++ "referenced_type" : "type-21492", ++ "self_type" : "type-21491", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -190597,8 +190639,8 @@ + "is_const" : true, + "linker_set_key" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> >", + "name" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> >", +- "referenced_type" : "type-17529", +- "self_type" : "type-17528", ++ "referenced_type" : "type-18307", ++ "self_type" : "type-18306", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -191237,8 +191279,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-15390", +- "self_type" : "type-15389", ++ "referenced_type" : "type-15401", ++ "self_type" : "type-15400", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191247,8 +191289,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-15561", +- "self_type" : "type-15560", ++ "referenced_type" : "type-15596", ++ "self_type" : "type-15595", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191257,8 +191299,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-15835", +- "self_type" : "type-15834", ++ "referenced_type" : "type-15610", ++ "self_type" : "type-15609", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191267,8 +191309,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-15972", +- "self_type" : "type-15971", ++ "referenced_type" : "type-15791", ++ "self_type" : "type-15790", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191277,8 +191319,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16104", +- "self_type" : "type-16103", ++ "referenced_type" : "type-15961", ++ "self_type" : "type-15960", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191287,8 +191329,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16254", +- "self_type" : "type-16253", ++ "referenced_type" : "type-16070", ++ "self_type" : "type-16069", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191297,8 +191339,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16338", +- "self_type" : "type-16337", ++ "referenced_type" : "type-16334", ++ "self_type" : "type-16333", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191307,8 +191349,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16440", +- "self_type" : "type-16439", ++ "referenced_type" : "type-16608", ++ "self_type" : "type-16607", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191317,8 +191359,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16566", +- "self_type" : "type-16565", ++ "referenced_type" : "type-16743", ++ "self_type" : "type-16742", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191327,8 +191369,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16618", +- "self_type" : "type-16617", ++ "referenced_type" : "type-16874", ++ "self_type" : "type-16873", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191337,8 +191379,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16701", +- "self_type" : "type-16700", ++ "referenced_type" : "type-17024", ++ "self_type" : "type-17023", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191347,8 +191389,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16750", +- "self_type" : "type-16749", ++ "referenced_type" : "type-17108", ++ "self_type" : "type-17107", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191357,8 +191399,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16754", +- "self_type" : "type-16753", ++ "referenced_type" : "type-17210", ++ "self_type" : "type-17209", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191367,8 +191409,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16832", +- "self_type" : "type-16831", ++ "referenced_type" : "type-17336", ++ "self_type" : "type-17335", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191377,8 +191419,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16900", +- "self_type" : "type-16899", ++ "referenced_type" : "type-17388", ++ "self_type" : "type-17387", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191387,8 +191429,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16937", +- "self_type" : "type-16936", ++ "referenced_type" : "type-17471", ++ "self_type" : "type-17470", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191397,8 +191439,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-17154", +- "self_type" : "type-17153", ++ "referenced_type" : "type-17520", ++ "self_type" : "type-17519", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191407,8 +191449,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-17236", +- "self_type" : "type-17235", ++ "referenced_type" : "type-17524", ++ "self_type" : "type-17523", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191417,8 +191459,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-17329", +- "self_type" : "type-17328", ++ "referenced_type" : "type-17602", ++ "self_type" : "type-17601", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191427,8 +191469,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-17486", +- "self_type" : "type-17485", ++ "referenced_type" : "type-17670", ++ "self_type" : "type-17669", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191437,8 +191479,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-17591", +- "self_type" : "type-17590", ++ "referenced_type" : "type-17707", ++ "self_type" : "type-17706", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191447,8 +191489,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-17686", +- "self_type" : "type-17685", ++ "referenced_type" : "type-17924", ++ "self_type" : "type-17923", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191457,8 +191499,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-17828", +- "self_type" : "type-17827", ++ "referenced_type" : "type-18006", ++ "self_type" : "type-18005", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191467,8 +191509,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-17918", +- "self_type" : "type-17917", ++ "referenced_type" : "type-18099", ++ "self_type" : "type-18098", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191477,8 +191519,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18008", +- "self_type" : "type-18007", ++ "referenced_type" : "type-18264", ++ "self_type" : "type-18263", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191487,8 +191529,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18101", +- "self_type" : "type-18100", ++ "referenced_type" : "type-18369", ++ "self_type" : "type-18368", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191497,8 +191539,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18156", +- "self_type" : "type-18155", ++ "referenced_type" : "type-18464", ++ "self_type" : "type-18463", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191507,8 +191549,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18282", +- "self_type" : "type-18281", ++ "referenced_type" : "type-1852", ++ "self_type" : "type-1851", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191517,8 +191559,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18334", +- "self_type" : "type-18333", ++ "referenced_type" : "type-18606", ++ "self_type" : "type-18605", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191527,8 +191569,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18460", +- "self_type" : "type-18459", ++ "referenced_type" : "type-18696", ++ "self_type" : "type-18695", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191537,8 +191579,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-1852", +- "self_type" : "type-1851", ++ "referenced_type" : "type-18786", ++ "self_type" : "type-18785", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191547,8 +191589,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18538", +- "self_type" : "type-18537", ++ "referenced_type" : "type-18879", ++ "self_type" : "type-18878", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191557,8 +191599,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18602", +- "self_type" : "type-18601", ++ "referenced_type" : "type-18934", ++ "self_type" : "type-18933", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191567,8 +191609,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18684", +- "self_type" : "type-18683", ++ "referenced_type" : "type-19060", ++ "self_type" : "type-19059", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191577,8 +191619,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18809", +- "self_type" : "type-18808", ++ "referenced_type" : "type-19112", ++ "self_type" : "type-19111", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191587,8 +191629,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18878", +- "self_type" : "type-18877", ++ "referenced_type" : "type-19238", ++ "self_type" : "type-19237", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191597,8 +191639,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18921", +- "self_type" : "type-18920", ++ "referenced_type" : "type-19316", ++ "self_type" : "type-19315", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191607,8 +191649,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-19156", +- "self_type" : "type-19155", ++ "referenced_type" : "type-19380", ++ "self_type" : "type-19379", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191617,8 +191659,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-19352", +- "self_type" : "type-19351", ++ "referenced_type" : "type-19462", ++ "self_type" : "type-19461", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191627,8 +191669,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-19366", +- "self_type" : "type-19365", ++ "referenced_type" : "type-19587", ++ "self_type" : "type-19586", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191637,8 +191679,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-19547", +- "self_type" : "type-19546", ++ "referenced_type" : "type-19656", ++ "self_type" : "type-19655", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191647,8 +191689,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-19717", +- "self_type" : "type-19716", ++ "referenced_type" : "type-19699", ++ "self_type" : "type-19698", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191657,8 +191699,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-19826", +- "self_type" : "type-19825", ++ "referenced_type" : "type-19923", ++ "self_type" : "type-19922", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191667,8 +191709,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-20094", +- "self_type" : "type-20093", ++ "referenced_type" : "type-20098", ++ "self_type" : "type-20097", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191677,8 +191719,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-20369", +- "self_type" : "type-20368", ++ "referenced_type" : "type-20373", ++ "self_type" : "type-20372", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191687,8 +191729,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-20504", +- "self_type" : "type-20503", ++ "referenced_type" : "type-20511", ++ "self_type" : "type-20510", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191697,8 +191739,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-20635", +- "self_type" : "type-20634", ++ "referenced_type" : "type-20643", ++ "self_type" : "type-20642", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191707,8 +191749,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-20785", +- "self_type" : "type-20784", ++ "referenced_type" : "type-20793", ++ "self_type" : "type-20792", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191717,8 +191759,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-20869", +- "self_type" : "type-20868", ++ "referenced_type" : "type-20877", ++ "self_type" : "type-20876", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191727,8 +191769,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-20971", +- "self_type" : "type-20970", ++ "referenced_type" : "type-20979", ++ "self_type" : "type-20978", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191737,8 +191779,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21098", +- "self_type" : "type-21097", ++ "referenced_type" : "type-21106", ++ "self_type" : "type-21105", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191747,8 +191789,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21150", +- "self_type" : "type-21149", ++ "referenced_type" : "type-21158", ++ "self_type" : "type-21157", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191757,8 +191799,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21233", +- "self_type" : "type-21232", ++ "referenced_type" : "type-21241", ++ "self_type" : "type-21240", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191767,8 +191809,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21282", +- "self_type" : "type-21281", ++ "referenced_type" : "type-21290", ++ "self_type" : "type-21289", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191777,8 +191819,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21286", +- "self_type" : "type-21285", ++ "referenced_type" : "type-21294", ++ "self_type" : "type-21293", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191787,8 +191829,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21364", +- "self_type" : "type-21363", ++ "referenced_type" : "type-21372", ++ "self_type" : "type-21371", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191797,8 +191839,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21432", +- "self_type" : "type-21431", ++ "referenced_type" : "type-21440", ++ "self_type" : "type-21439", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191807,8 +191849,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21469", +- "self_type" : "type-21468", ++ "referenced_type" : "type-21477", ++ "self_type" : "type-21476", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191817,8 +191859,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21686", +- "self_type" : "type-21685", ++ "referenced_type" : "type-21694", ++ "self_type" : "type-21693", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191827,8 +191869,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21768", +- "self_type" : "type-21767", ++ "referenced_type" : "type-21776", ++ "self_type" : "type-21775", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191837,8 +191879,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21861", +- "self_type" : "type-21860", ++ "referenced_type" : "type-21869", ++ "self_type" : "type-21868", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193587,8 +193629,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-16874", +- "self_type" : "type-16873", ++ "referenced_type" : "type-17644", ++ "self_type" : "type-17643", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -193597,8 +193639,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-21406", +- "self_type" : "type-21405", ++ "referenced_type" : "type-21414", ++ "self_type" : "type-21413", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -193677,8 +193719,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-16251", +- "self_type" : "type-16250", ++ "referenced_type" : "type-17021", ++ "self_type" : "type-17020", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -193687,8 +193729,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-20782", +- "self_type" : "type-20781", ++ "referenced_type" : "type-20790", ++ "self_type" : "type-20789", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -193767,8 +193809,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-17809", +- "self_type" : "type-17808", ++ "referenced_type" : "type-18587", ++ "self_type" : "type-18586", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -193827,8 +193869,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-17803", +- "self_type" : "type-17802", ++ "referenced_type" : "type-18581", ++ "self_type" : "type-18580", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -193917,8 +193959,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-16088", +- "self_type" : "type-16087", ++ "referenced_type" : "type-16858", ++ "self_type" : "type-16857", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -193927,8 +193969,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-18285", +- "self_type" : "type-18284", ++ "referenced_type" : "type-19063", ++ "self_type" : "type-19062", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -193937,8 +193979,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-20619", +- "self_type" : "type-20618", ++ "referenced_type" : "type-20627", ++ "self_type" : "type-20626", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -194247,8 +194289,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-15483", +- "self_type" : "type-15482", ++ "referenced_type" : "type-15526", ++ "self_type" : "type-15525", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194257,8 +194299,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-16008", +- "self_type" : "type-16007", ++ "referenced_type" : "type-15545", ++ "self_type" : "type-15544", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194267,8 +194309,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-16296", +- "self_type" : "type-16295", ++ "referenced_type" : "type-15559", ++ "self_type" : "type-15558", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194277,8 +194319,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-1632", +- "self_type" : "type-1631", ++ "referenced_type" : "type-15896", ++ "self_type" : "type-15895", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194287,18 +194329,18 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-16342", +- "self_type" : "type-16341", ++ "referenced_type" : "type-16053", ++ "self_type" : "type-16052", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-16447", +- "self_type" : "type-16446", ++ "referenced_type" : "type-16208", ++ "self_type" : "type-16207", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194307,8 +194349,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-16634", +- "self_type" : "type-16633", ++ "referenced_type" : "type-16256", ++ "self_type" : "type-16255", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194317,8 +194359,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-17113", +- "self_type" : "type-17112", ++ "referenced_type" : "type-1632", ++ "self_type" : "type-1631", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194327,8 +194369,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-17309", +- "self_type" : "type-17308", ++ "referenced_type" : "type-16779", ++ "self_type" : "type-16778", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194337,8 +194379,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-17646", +- "self_type" : "type-17645", ++ "referenced_type" : "type-17066", ++ "self_type" : "type-17065", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194347,18 +194389,18 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-17793", +- "self_type" : "type-17792", ++ "referenced_type" : "type-17112", ++ "self_type" : "type-17111", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-18296", +- "self_type" : "type-18295", ++ "referenced_type" : "type-17217", ++ "self_type" : "type-17216", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194367,8 +194409,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-18426", +- "self_type" : "type-18425", ++ "referenced_type" : "type-17404", ++ "self_type" : "type-17403", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194377,8 +194419,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-18546", +- "self_type" : "type-18545", ++ "referenced_type" : "type-17883", ++ "self_type" : "type-17882", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194387,8 +194429,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-18764", +- "self_type" : "type-18763", ++ "referenced_type" : "type-18079", ++ "self_type" : "type-18078", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194397,8 +194439,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-18908", +- "self_type" : "type-18907", ++ "referenced_type" : "type-18424", ++ "self_type" : "type-18423", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194407,18 +194449,18 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-18916", +- "self_type" : "type-18915", ++ "referenced_type" : "type-18571", ++ "self_type" : "type-18570", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-19111", +- "self_type" : "type-19110", ++ "referenced_type" : "type-19074", ++ "self_type" : "type-19073", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194427,8 +194469,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-19281", +- "self_type" : "type-19280", ++ "referenced_type" : "type-19204", ++ "self_type" : "type-19203", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194437,8 +194479,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-19300", +- "self_type" : "type-19299", ++ "referenced_type" : "type-19324", ++ "self_type" : "type-19323", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194447,8 +194489,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-19314", +- "self_type" : "type-19313", ++ "referenced_type" : "type-19542", ++ "self_type" : "type-19541", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194457,8 +194499,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-19652", +- "self_type" : "type-19651", ++ "referenced_type" : "type-19686", ++ "self_type" : "type-19685", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194467,18 +194509,18 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-19809", +- "self_type" : "type-19808", ++ "referenced_type" : "type-19694", ++ "self_type" : "type-19693", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-19964", +- "self_type" : "type-19963", ++ "referenced_type" : "type-19889", ++ "self_type" : "type-19888", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194497,8 +194539,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-20012", +- "self_type" : "type-20011", ++ "referenced_type" : "type-20016", ++ "self_type" : "type-20015", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194507,8 +194549,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-20540", +- "self_type" : "type-20539", ++ "referenced_type" : "type-20547", ++ "self_type" : "type-20546", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194517,8 +194559,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-20827", +- "self_type" : "type-20826", ++ "referenced_type" : "type-20835", ++ "self_type" : "type-20834", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194527,8 +194569,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-20873", +- "self_type" : "type-20872", ++ "referenced_type" : "type-20881", ++ "self_type" : "type-20880", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, +@@ -194537,8 +194579,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-20978", +- "self_type" : "type-20977", ++ "referenced_type" : "type-20986", ++ "self_type" : "type-20985", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194547,8 +194589,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-21166", +- "self_type" : "type-21165", ++ "referenced_type" : "type-21174", ++ "self_type" : "type-21173", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194567,8 +194609,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-21645", +- "self_type" : "type-21644", ++ "referenced_type" : "type-21653", ++ "self_type" : "type-21652", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194577,8 +194619,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-21841", +- "self_type" : "type-21840", ++ "referenced_type" : "type-21849", ++ "self_type" : "type-21848", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195928,336 +195970,336 @@ + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-15373", +- "self_type" : "type-15372", ++ "referenced_type" : "type-15393", ++ "self_type" : "type-15392", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-15719", +- "self_type" : "type-15718", ++ "referenced_type" : "type-15475", ++ "self_type" : "type-15474", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-15890", +- "self_type" : "type-15889", ++ "referenced_type" : "type-15625", ++ "self_type" : "type-15624", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-16142", +- "self_type" : "type-16141", ++ "referenced_type" : "type-15818", ++ "self_type" : "type-15817", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-16275", +- "self_type" : "type-16274", ++ "referenced_type" : "type-15987", ++ "self_type" : "type-15986", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-16414", +- "self_type" : "type-16413", ++ "referenced_type" : "type-16143", ++ "self_type" : "type-16142", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-16471", +- "self_type" : "type-16470", ++ "referenced_type" : "type-16492", ++ "self_type" : "type-16491", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-16589", +- "self_type" : "type-16588", ++ "referenced_type" : "type-16663", ++ "self_type" : "type-16662", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-16652", +- "self_type" : "type-16651", ++ "referenced_type" : "type-16912", ++ "self_type" : "type-16911", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-16707", +- "self_type" : "type-16706", ++ "referenced_type" : "type-17045", ++ "self_type" : "type-17044", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-16790", +- "self_type" : "type-16789", ++ "referenced_type" : "type-17184", ++ "self_type" : "type-17183", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-16864", +- "self_type" : "type-16863", ++ "referenced_type" : "type-17241", ++ "self_type" : "type-17240", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-17050", +- "self_type" : "type-17049", ++ "referenced_type" : "type-17359", ++ "self_type" : "type-17358", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-17179", +- "self_type" : "type-17178", ++ "referenced_type" : "type-17422", ++ "self_type" : "type-17421", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-17265", +- "self_type" : "type-17264", ++ "referenced_type" : "type-17477", ++ "self_type" : "type-17476", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-17369", +- "self_type" : "type-17368", ++ "referenced_type" : "type-17560", ++ "self_type" : "type-17559", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-17415", +- "self_type" : "type-17414", ++ "referenced_type" : "type-17634", ++ "self_type" : "type-17633", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-17723", +- "self_type" : "type-17722", ++ "referenced_type" : "type-17820", ++ "self_type" : "type-17819", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-17870", +- "self_type" : "type-17869", ++ "referenced_type" : "type-17949", ++ "self_type" : "type-17948", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-17872", +- "self_type" : "type-17871", ++ "referenced_type" : "type-18035", ++ "self_type" : "type-18034", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-17965", +- "self_type" : "type-17964", ++ "referenced_type" : "type-18147", ++ "self_type" : "type-18146", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18045", +- "self_type" : "type-18044", ++ "referenced_type" : "type-18193", ++ "self_type" : "type-18192", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18128", +- "self_type" : "type-18127", ++ "referenced_type" : "type-18501", ++ "self_type" : "type-18500", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18214", +- "self_type" : "type-18213", ++ "referenced_type" : "type-18648", ++ "self_type" : "type-18647", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18332", +- "self_type" : "type-18331", ++ "referenced_type" : "type-18650", ++ "self_type" : "type-18649", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18357", +- "self_type" : "type-18356", ++ "referenced_type" : "type-18743", ++ "self_type" : "type-18742", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18485", +- "self_type" : "type-18484", ++ "referenced_type" : "type-18823", ++ "self_type" : "type-18822", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18646", +- "self_type" : "type-18645", ++ "referenced_type" : "type-18906", ++ "self_type" : "type-18905", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18710", +- "self_type" : "type-18709", ++ "referenced_type" : "type-18992", ++ "self_type" : "type-18991", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18876", +- "self_type" : "type-18875", ++ "referenced_type" : "type-19110", ++ "self_type" : "type-19109", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18989", +- "self_type" : "type-18988", ++ "referenced_type" : "type-19135", ++ "self_type" : "type-19134", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-19148", +- "self_type" : "type-19147", ++ "referenced_type" : "type-19263", ++ "self_type" : "type-19262", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-19230", +- "self_type" : "type-19229", ++ "referenced_type" : "type-19424", ++ "self_type" : "type-19423", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-19381", +- "self_type" : "type-19380", ++ "referenced_type" : "type-19488", ++ "self_type" : "type-19487", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-19574", +- "self_type" : "type-19573", ++ "referenced_type" : "type-19654", ++ "self_type" : "type-19653", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-19743", +- "self_type" : "type-19742", ++ "referenced_type" : "type-19767", ++ "self_type" : "type-19766", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-19899", +- "self_type" : "type-19898", ++ "referenced_type" : "type-19906", ++ "self_type" : "type-19905", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-20252", +- "self_type" : "type-20251", ++ "referenced_type" : "type-20256", ++ "self_type" : "type-20255", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-20424", +- "self_type" : "type-20423", ++ "referenced_type" : "type-20428", ++ "self_type" : "type-20427", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-20673", +- "self_type" : "type-20672", ++ "referenced_type" : "type-20681", ++ "self_type" : "type-20680", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-20806", +- "self_type" : "type-20805", ++ "referenced_type" : "type-20814", ++ "self_type" : "type-20813", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-20945", +- "self_type" : "type-20944", ++ "referenced_type" : "type-20953", ++ "self_type" : "type-20952", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -196272,72 +196314,72 @@ + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-21003", +- "self_type" : "type-21002", ++ "referenced_type" : "type-21011", ++ "self_type" : "type-21010", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-21121", +- "self_type" : "type-21120", ++ "referenced_type" : "type-21129", ++ "self_type" : "type-21128", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-21184", +- "self_type" : "type-21183", ++ "referenced_type" : "type-21192", ++ "self_type" : "type-21191", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-21239", +- "self_type" : "type-21238", ++ "referenced_type" : "type-21247", ++ "self_type" : "type-21246", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-21322", +- "self_type" : "type-21321", ++ "referenced_type" : "type-21330", ++ "self_type" : "type-21329", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-21396", +- "self_type" : "type-21395", ++ "referenced_type" : "type-21404", ++ "self_type" : "type-21403", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-21582", +- "self_type" : "type-21581", ++ "referenced_type" : "type-21590", ++ "self_type" : "type-21589", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-21711", +- "self_type" : "type-21710", ++ "referenced_type" : "type-21719", ++ "self_type" : "type-21718", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-21797", +- "self_type" : "type-21796", ++ "referenced_type" : "type-21805", ++ "self_type" : "type-21804", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -197619,7 +197661,7 @@ + "linker_set_key" : "google::protobuf::StringPiece *const", + "name" : "google::protobuf::StringPiece *const", + "referenced_type" : "type-55", +- "self_type" : "type-19969", ++ "self_type" : "type-16213", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -197688,8 +197730,8 @@ + "is_const" : true, + "linker_set_key" : "google::protobuf::hash_set, std::equal_to > *const", + "name" : "google::protobuf::hash_set, std::equal_to > *const", +- "referenced_type" : "type-19665", +- "self_type" : "type-19814", ++ "referenced_type" : "type-15909", ++ "self_type" : "type-16058", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -197699,7 +197741,7 @@ + "linker_set_key" : "google::protobuf::hash_set, std::allocator >, google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > > > *const", + "name" : "google::protobuf::hash_set, std::allocator >, google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > > > *const", + "referenced_type" : "type-3670", +- "self_type" : "type-19655", ++ "self_type" : "type-15899", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -197784,8 +197826,8 @@ + "is_const" : true, + "linker_set_key" : "google::protobuf::util::converter::JsonObjectWriter::Element *const", + "name" : "google::protobuf::util::converter::JsonObjectWriter::Element *const", +- "referenced_type" : "type-19137", +- "self_type" : "type-19136", ++ "referenced_type" : "type-15382", ++ "self_type" : "type-15381", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197794,8 +197836,8 @@ + "is_const" : true, + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Item *const", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Item *const", +- "referenced_type" : "type-19444", +- "self_type" : "type-19570", ++ "referenced_type" : "type-15688", ++ "self_type" : "type-15814", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197804,8 +197846,8 @@ + "is_const" : true, + "linker_set_key" : "google::protobuf::util::converter::ProtoWriter::ProtoElement *const", + "name" : "google::protobuf::util::converter::ProtoWriter::ProtoElement *const", +- "referenced_type" : "type-19460", +- "self_type" : "type-19739", ++ "referenced_type" : "type-15704", ++ "self_type" : "type-15983", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197814,8 +197856,8 @@ + "is_const" : true, + "linker_set_key" : "google::protobuf::util::converter::StructuredObjectWriter::BaseElement *const", + "name" : "google::protobuf::util::converter::StructuredObjectWriter::BaseElement *const", +- "referenced_type" : "type-19141", +- "self_type" : "type-19568", ++ "referenced_type" : "type-15386", ++ "self_type" : "type-15812", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197844,8 +197886,8 @@ + "is_const" : true, + "linker_set_key" : "std::basic_string, std::allocator > *const", + "name" : "std::basic_string, std::allocator > *const", +- "referenced_type" : "type-16042", +- "self_type" : "type-16129", ++ "referenced_type" : "type-16813", ++ "self_type" : "type-16899", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197854,8 +197896,8 @@ + "is_const" : true, + "linker_set_key" : "std::basic_string, std::allocator > *const", + "name" : "std::basic_string, std::allocator > *const", +- "referenced_type" : "type-18689", +- "self_type" : "type-18707", ++ "referenced_type" : "type-19467", ++ "self_type" : "type-19485", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197864,8 +197906,8 @@ + "is_const" : true, + "linker_set_key" : "std::basic_string, std::allocator > *const", + "name" : "std::basic_string, std::allocator > *const", +- "referenced_type" : "type-20574", +- "self_type" : "type-20660", ++ "referenced_type" : "type-20581", ++ "self_type" : "type-20668", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197944,8 +197986,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator > > *const", + "name" : "std::map, std::allocator > > *const", +- "referenced_type" : "type-19970", +- "self_type" : "type-19972", ++ "referenced_type" : "type-16214", ++ "self_type" : "type-16216", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -197984,8 +198026,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *const", + "name" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *const", +- "referenced_type" : "type-16203", +- "self_type" : "type-16202", ++ "referenced_type" : "type-16973", ++ "self_type" : "type-16972", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -197994,8 +198036,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *const", + "name" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *const", +- "referenced_type" : "type-20734", +- "self_type" : "type-20733", ++ "referenced_type" : "type-20742", ++ "self_type" : "type-20741", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198064,8 +198106,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *const", + "name" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *const", +- "referenced_type" : "type-16214", +- "self_type" : "type-16216", ++ "referenced_type" : "type-16984", ++ "self_type" : "type-16986", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198074,8 +198116,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *const", + "name" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *const", +- "referenced_type" : "type-20745", +- "self_type" : "type-20747", ++ "referenced_type" : "type-20753", ++ "self_type" : "type-20755", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198144,8 +198186,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *const", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *const", +- "referenced_type" : "type-16028", +- "self_type" : "type-16030", ++ "referenced_type" : "type-16799", ++ "self_type" : "type-16801", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198154,8 +198196,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *const", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *const", +- "referenced_type" : "type-20560", +- "self_type" : "type-20562", ++ "referenced_type" : "type-20567", ++ "self_type" : "type-20569", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198224,8 +198266,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *const", + "name" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *const", +- "referenced_type" : "type-16208", +- "self_type" : "type-16210", ++ "referenced_type" : "type-16978", ++ "self_type" : "type-16980", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198234,8 +198276,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *const", + "name" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *const", +- "referenced_type" : "type-20739", +- "self_type" : "type-20741", ++ "referenced_type" : "type-20747", ++ "self_type" : "type-20749", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198304,8 +198346,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *const", + "name" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *const", +- "referenced_type" : "type-16220", +- "self_type" : "type-16222", ++ "referenced_type" : "type-16990", ++ "self_type" : "type-16992", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198314,8 +198356,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *const", + "name" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *const", +- "referenced_type" : "type-20751", +- "self_type" : "type-20753", ++ "referenced_type" : "type-20759", ++ "self_type" : "type-20761", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -212181,17 +212223,17 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-19478" ++ "referenced_type" : "type-15722" + } + ], + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > >", + "name" : "google::protobuf::hash_map, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > >", + "record_kind" : "class", +- "referenced_type" : "type-19477", +- "self_type" : "type-19477", ++ "referenced_type" : "type-15721", ++ "self_type" : "type-15721", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h", +- "template_args" : [ "type-19479", "type-19453", "type-47", "type-19480", "type-19481" ], ++ "template_args" : [ "type-15723", "type-15697", "type-47", "type-15724", "type-15725" ], + "unique_id" : "_ZTSN6google8protobuf8hash_mapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEPFNS0_4util6StatusEPNS9_9converter23ProtoStreamObjectWriterERKNSB_9DataPieceEENS0_4hashIS8_EENS2_8equal_toIS8_EENS6_INS2_4pairIKS8_SI_EEEEEE" + }, + { +@@ -212199,17 +212241,17 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-19318" ++ "referenced_type" : "type-15563" + } + ], + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > >", + "name" : "google::protobuf::hash_map, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > >", + "record_kind" : "class", +- "referenced_type" : "type-19317", +- "self_type" : "type-19317", ++ "referenced_type" : "type-15562", ++ "self_type" : "type-15562", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h", +- "template_args" : [ "type-19319", "type-19320", "type-47", "type-19327", "type-19328" ], ++ "template_args" : [ "type-15564", "type-15565", "type-47", "type-15571", "type-15572" ], + "unique_id" : "_ZTSN6google8protobuf8hash_mapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEPFNS0_4util6StatusEPKNS9_9converter23ProtoStreamObjectSourceERKNS0_4TypeENS0_11StringPieceEPNSB_12ObjectWriterEENS0_4hashIS8_EENS2_8equal_toIS8_EENS6_INS2_4pairIKS8_SM_EEEEEE" + }, + { +@@ -212325,17 +212367,17 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-19465" ++ "referenced_type" : "type-15709" + } + ], + "linker_set_key" : "google::protobuf::hash_set, std::equal_to >", + "name" : "google::protobuf::hash_set, std::equal_to >", + "record_kind" : "class", +- "referenced_type" : "type-19464", +- "self_type" : "type-19464", ++ "referenced_type" : "type-15708", ++ "self_type" : "type-15708", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h", +- "template_args" : [ "type-1", "type-4258", "type-19466" ], ++ "template_args" : [ "type-1", "type-4258", "type-15710" ], + "unique_id" : "_ZTSN6google8protobuf8hash_setIiNS0_4hashIiEENSt3__18equal_toIiEEEE" + }, + { +@@ -213217,7 +213259,7 @@ + "access" : "private", + "field_name" : "function_", + "field_offset" : 32, +- "referenced_type" : "type-19439" ++ "referenced_type" : "type-15683" + }, + { + "access" : "private", +@@ -213229,17 +213271,17 @@ + "access" : "private", + "field_name" : "p1_", + "field_offset" : 96, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + } + ], + "linker_set_key" : "google::protobuf::internal::FunctionResultCallback_1_1", + "name" : "google::protobuf::internal::FunctionResultCallback_1_1", + "record_kind" : "class", +- "referenced_type" : "type-19438", +- "self_type" : "type-19438", ++ "referenced_type" : "type-15682", ++ "self_type" : "type-15682", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h", +- "template_args" : [ "type-76", "type-19441", "type-27" ], ++ "template_args" : [ "type-76", "type-15685", "type-27" ], + "unique_id" : "_ZTSN6google8protobuf8internal26FunctionResultCallback_1_1INS0_4util6StatusEPNS3_9converter23ProtoStreamObjectWriterENS0_11StringPieceEEE", + "vtable_components" : + [ +@@ -226280,8 +226322,8 @@ + "linker_set_key" : "google::protobuf::internal::scoped_ptr", + "name" : "google::protobuf::internal::scoped_ptr", + "record_kind" : "class", +- "referenced_type" : "type-19875", +- "self_type" : "type-19875", ++ "referenced_type" : "type-16119", ++ "self_type" : "type-16119", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h", + "template_args" : [ "type-2425" ], +@@ -226320,8 +226362,8 @@ + "linker_set_key" : "google::protobuf::internal::scoped_ptr >", + "name" : "google::protobuf::internal::scoped_ptr >", + "record_kind" : "class", +- "referenced_type" : "type-19633", +- "self_type" : "type-19633", ++ "referenced_type" : "type-15877", ++ "self_type" : "type-15877", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h", + "template_args" : [ "type-15351" ], +@@ -226400,8 +226442,8 @@ + "linker_set_key" : "google::protobuf::internal::scoped_ptr", + "name" : "google::protobuf::internal::scoped_ptr", + "record_kind" : "class", +- "referenced_type" : "type-19842", +- "self_type" : "type-19842", ++ "referenced_type" : "type-16086", ++ "self_type" : "type-16086", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h", + "template_args" : [ "type-2417" ], +@@ -226460,8 +226502,8 @@ + "linker_set_key" : "google::protobuf::internal::scoped_ptr", + "name" : "google::protobuf::internal::scoped_ptr", + "record_kind" : "class", +- "referenced_type" : "type-19469", +- "self_type" : "type-19469", ++ "referenced_type" : "type-15713", ++ "self_type" : "type-15713", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h", + "template_args" : [ "type-615" ], +@@ -226534,17 +226576,17 @@ + { + "access" : "private", + "field_name" : "ptr_", +- "referenced_type" : "type-19137" ++ "referenced_type" : "type-15382" + } + ], + "linker_set_key" : "google::protobuf::internal::scoped_ptr", + "name" : "google::protobuf::internal::scoped_ptr", + "record_kind" : "class", +- "referenced_type" : "type-19150", +- "self_type" : "type-19150", ++ "referenced_type" : "type-15395", ++ "self_type" : "type-15395", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h", +- "template_args" : [ "type-19138" ], ++ "template_args" : [ "type-15383" ], + "unique_id" : "_ZTSN6google8protobuf8internal10scoped_ptrINS0_4util9converter16JsonObjectWriter7ElementEEE" + }, + { +@@ -226560,8 +226602,8 @@ + "linker_set_key" : "google::protobuf::internal::scoped_ptr", + "name" : "google::protobuf::internal::scoped_ptr", + "record_kind" : "class", +- "referenced_type" : "type-19470", +- "self_type" : "type-19470", ++ "referenced_type" : "type-15714", ++ "self_type" : "type-15714", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h", + "template_args" : [ "type-15337" ], +@@ -226574,17 +226616,17 @@ + { + "access" : "private", + "field_name" : "ptr_", +- "referenced_type" : "type-19447" ++ "referenced_type" : "type-15691" + } + ], + "linker_set_key" : "google::protobuf::internal::scoped_ptr", + "name" : "google::protobuf::internal::scoped_ptr", + "record_kind" : "class", +- "referenced_type" : "type-19446", +- "self_type" : "type-19446", ++ "referenced_type" : "type-15690", ++ "self_type" : "type-15690", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h", +- "template_args" : [ "type-19448" ], ++ "template_args" : [ "type-15692" ], + "unique_id" : "_ZTSN6google8protobuf8internal10scoped_ptrINS0_4util9converter23ProtoStreamObjectWriter9AnyWriterEEE" + }, + { +@@ -226594,17 +226636,17 @@ + { + "access" : "private", + "field_name" : "ptr_", +- "referenced_type" : "type-19444" ++ "referenced_type" : "type-15688" + } + ], + "linker_set_key" : "google::protobuf::internal::scoped_ptr", + "name" : "google::protobuf::internal::scoped_ptr", + "record_kind" : "class", +- "referenced_type" : "type-19443", +- "self_type" : "type-19443", ++ "referenced_type" : "type-15687", ++ "self_type" : "type-15687", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h", +- "template_args" : [ "type-19445" ], ++ "template_args" : [ "type-15689" ], + "unique_id" : "_ZTSN6google8protobuf8internal10scoped_ptrINS0_4util9converter23ProtoStreamObjectWriter4ItemEEE" + }, + { +@@ -226614,17 +226656,17 @@ + { + "access" : "private", + "field_name" : "ptr_", +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + } + ], + "linker_set_key" : "google::protobuf::internal::scoped_ptr", + "name" : "google::protobuf::internal::scoped_ptr", + "record_kind" : "class", +- "referenced_type" : "type-19449", +- "self_type" : "type-19449", ++ "referenced_type" : "type-15693", ++ "self_type" : "type-15693", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h", +- "template_args" : [ "type-19442" ], ++ "template_args" : [ "type-15686" ], + "unique_id" : "_ZTSN6google8protobuf8internal10scoped_ptrINS0_4util9converter23ProtoStreamObjectWriterEEE" + }, + { +@@ -226634,17 +226676,17 @@ + { + "access" : "private", + "field_name" : "ptr_", +- "referenced_type" : "type-19460" ++ "referenced_type" : "type-15704" + } + ], + "linker_set_key" : "google::protobuf::internal::scoped_ptr", + "name" : "google::protobuf::internal::scoped_ptr", + "record_kind" : "class", +- "referenced_type" : "type-19459", +- "self_type" : "type-19459", ++ "referenced_type" : "type-15703", ++ "self_type" : "type-15703", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h", +- "template_args" : [ "type-19461" ], ++ "template_args" : [ "type-15705" ], + "unique_id" : "_ZTSN6google8protobuf8internal10scoped_ptrINS0_4util9converter11ProtoWriter12ProtoElementEEE" + }, + { +@@ -226654,17 +226696,17 @@ + { + "access" : "private", + "field_name" : "ptr_", +- "referenced_type" : "type-19141" ++ "referenced_type" : "type-15386" + } + ], + "linker_set_key" : "google::protobuf::internal::scoped_ptr", + "name" : "google::protobuf::internal::scoped_ptr", + "record_kind" : "class", +- "referenced_type" : "type-19140", +- "self_type" : "type-19140", ++ "referenced_type" : "type-15385", ++ "self_type" : "type-15385", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h", +- "template_args" : [ "type-19139" ], ++ "template_args" : [ "type-15384" ], + "unique_id" : "_ZTSN6google8protobuf8internal10scoped_ptrINS0_4util9converter22StructuredObjectWriter11BaseElementEEE" + }, + { +@@ -231887,8 +231929,8 @@ + "linker_set_key" : "google::protobuf::util::StatusOr", + "name" : "google::protobuf::util::StatusOr", + "record_kind" : "class", +- "referenced_type" : "type-19955", +- "self_type" : "type-19955", ++ "referenced_type" : "type-16199", ++ "self_type" : "type-16199", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h", + "template_args" : [ "type-2430" ], +@@ -232546,7 +232588,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-19143" ++ "referenced_type" : "type-15388" + } + ], + "fields" : +@@ -232555,7 +232597,7 @@ + "access" : "private", + "field_name" : "element_", + "field_offset" : 64, +- "referenced_type" : "type-19150" ++ "referenced_type" : "type-15395" + }, + { + "access" : "private", +@@ -232567,13 +232609,13 @@ + "access" : "private", + "field_name" : "sink_", + "field_offset" : 128, +- "referenced_type" : "type-19151" ++ "referenced_type" : "type-15396" + }, + { + "access" : "private", + "field_name" : "indent_string_", + "field_offset" : 192, +- "referenced_type" : "type-19129" ++ "referenced_type" : "type-15374" + }, + { + "access" : "private", +@@ -232585,8 +232627,8 @@ + "linker_set_key" : "google::protobuf::util::converter::JsonObjectWriter", + "name" : "google::protobuf::util::converter::JsonObjectWriter", + "record_kind" : "class", +- "referenced_type" : "type-19149", +- "self_type" : "type-19149", ++ "referenced_type" : "type-15394", ++ "self_type" : "type-15394", + "size" : 40, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter16JsonObjectWriterE", +@@ -232678,8 +232720,8 @@ + "linker_set_key" : "google::protobuf::util::converter::JsonObjectWriter::ByteSinkWrapper", + "name" : "google::protobuf::util::converter::JsonObjectWriter::ByteSinkWrapper", + "record_kind" : "class", +- "referenced_type" : "type-19151", +- "self_type" : "type-19151", ++ "referenced_type" : "type-15396", ++ "self_type" : "type-15396", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter16JsonObjectWriter15ByteSinkWrapperE", +@@ -232714,7 +232756,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-19139" ++ "referenced_type" : "type-15384" + } + ], + "fields" : +@@ -232729,8 +232771,8 @@ + "linker_set_key" : "google::protobuf::util::converter::JsonObjectWriter::Element", + "name" : "google::protobuf::util::converter::JsonObjectWriter::Element", + "record_kind" : "class", +- "referenced_type" : "type-19138", +- "self_type" : "type-19138", ++ "referenced_type" : "type-15383", ++ "self_type" : "type-15383", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter16JsonObjectWriter7ElementE", +@@ -232770,13 +232812,13 @@ + "access" : "private", + "field_name" : "stack_", + "field_offset" : 64, +- "referenced_type" : "type-19284" ++ "referenced_type" : "type-15529" + }, + { + "access" : "private", + "field_name" : "leftover_", + "field_offset" : 256, +- "referenced_type" : "type-19285" ++ "referenced_type" : "type-15530" + }, + { + "access" : "private", +@@ -232800,7 +232842,7 @@ + "access" : "private", + "field_name" : "key_storage_", + "field_offset" : 544, +- "referenced_type" : "type-19286" ++ "referenced_type" : "type-15531" + }, + { + "access" : "private", +@@ -232818,7 +232860,7 @@ + "access" : "private", + "field_name" : "parsed_storage_", + "field_offset" : 736, +- "referenced_type" : "type-19287" ++ "referenced_type" : "type-15532" + }, + { + "access" : "private", +@@ -232830,7 +232872,7 @@ + "access" : "private", + "field_name" : "chunk_storage_", + "field_offset" : 864, +- "referenced_type" : "type-19288" ++ "referenced_type" : "type-15533" + }, + { + "access" : "private", +@@ -232842,8 +232884,8 @@ + "linker_set_key" : "google::protobuf::util::converter::JsonStreamParser", + "name" : "google::protobuf::util::converter::JsonStreamParser", + "record_kind" : "class", +- "referenced_type" : "type-19283", +- "self_type" : "type-19283", ++ "referenced_type" : "type-15528", ++ "self_type" : "type-15528", + "size" : 124, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter16JsonStreamParserE", +@@ -232873,17 +232915,17 @@ + [ + { + "field_name" : "type", +- "referenced_type" : "type-19293" ++ "referenced_type" : "type-15538" + }, + { + "field_offset" : 64, +- "referenced_type" : "type-19294" ++ "referenced_type" : "type-15539" + } + ], + "linker_set_key" : "google::protobuf::util::converter::JsonStreamParser::NumberResult", + "name" : "google::protobuf::util::converter::JsonStreamParser::NumberResult", +- "referenced_type" : "type-19292", +- "self_type" : "type-19292", ++ "referenced_type" : "type-15537", ++ "self_type" : "type-15537", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter16JsonStreamParser12NumberResultE" +@@ -232909,8 +232951,8 @@ + "linker_set_key" : "google::protobuf::util::converter::JsonStreamParser::NumberResult::(anonymous union at external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h:116:5) at external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h:116:5", + "name" : "google::protobuf::util::converter::JsonStreamParser::NumberResult::(anonymous union at external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h:116:5) at external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h:116:5", + "record_kind" : "union", +- "referenced_type" : "type-19294", +- "self_type" : "type-19294", ++ "referenced_type" : "type-15539", ++ "self_type" : "type-15539", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter16JsonStreamParser12NumberResultUt_E" +@@ -233003,8 +233045,8 @@ + "linker_set_key" : "google::protobuf::util::converter::ObjectLocationTracker", + "name" : "google::protobuf::util::converter::ObjectLocationTracker", + "record_kind" : "class", +- "referenced_type" : "type-19644", +- "self_type" : "type-19644", ++ "referenced_type" : "type-15888", ++ "self_type" : "type-15888", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/object_location_tracker.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter21ObjectLocationTrackerE", +@@ -233035,8 +233077,8 @@ + "linker_set_key" : "google::protobuf::util::converter::ObjectSource", + "name" : "google::protobuf::util::converter::ObjectSource", + "record_kind" : "class", +- "referenced_type" : "type-19326", +- "self_type" : "type-19326", ++ "referenced_type" : "type-15570", ++ "self_type" : "type-15570", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/object_source.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter12ObjectSourceE", +@@ -233168,7 +233210,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-19326" ++ "referenced_type" : "type-15570" + } + ], + "fields" : +@@ -233219,8 +233261,8 @@ + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectSource", + "name" : "google::protobuf::util::converter::ProtoStreamObjectSource", + "record_kind" : "class", +- "referenced_type" : "type-19324", +- "self_type" : "type-19324", ++ "referenced_type" : "type-15569", ++ "self_type" : "type-15569", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter23ProtoStreamObjectSourceE", +@@ -233257,7 +233299,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-19458" ++ "referenced_type" : "type-15702" + } + ], + "fields" : +@@ -233272,20 +233314,20 @@ + "access" : "private", + "field_name" : "current_", + "field_offset" : 736, +- "referenced_type" : "type-19443" ++ "referenced_type" : "type-15687" + }, + { + "access" : "private", + "field_name" : "options_", + "field_offset" : 768, +- "referenced_type" : "type-19456" ++ "referenced_type" : "type-15700" + } + ], + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectWriter", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter", + "record_kind" : "class", +- "referenced_type" : "type-19442", +- "self_type" : "type-19442", ++ "referenced_type" : "type-15686", ++ "self_type" : "type-15686", + "size" : 100, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter23ProtoStreamObjectWriterE", +@@ -233367,19 +233409,19 @@ + { + "access" : "private", + "field_name" : "parent_", +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "access" : "private", + "field_name" : "ow_", + "field_offset" : 32, +- "referenced_type" : "type-19449" ++ "referenced_type" : "type-15693" + }, + { + "access" : "private", + "field_name" : "type_url_", + "field_offset" : 64, +- "referenced_type" : "type-19450" ++ "referenced_type" : "type-15694" + }, + { + "access" : "private", +@@ -233391,7 +233433,7 @@ + "access" : "private", + "field_name" : "data_", + "field_offset" : 192, +- "referenced_type" : "type-19451" ++ "referenced_type" : "type-15695" + }, + { + "access" : "private", +@@ -233415,14 +233457,14 @@ + "access" : "private", + "field_name" : "well_known_type_render_", + "field_offset" : 416, +- "referenced_type" : "type-19452" ++ "referenced_type" : "type-15696" + } + ], + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectWriter::AnyWriter", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter::AnyWriter", + "record_kind" : "class", +- "referenced_type" : "type-19448", +- "self_type" : "type-19448", ++ "referenced_type" : "type-15692", ++ "self_type" : "type-15692", + "size" : 56, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter23ProtoStreamObjectWriter9AnyWriterE" +@@ -233433,7 +233475,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-19139" ++ "referenced_type" : "type-15384" + } + ], + "fields" : +@@ -233442,19 +233484,19 @@ + "access" : "private", + "field_name" : "ow_", + "field_offset" : 96, +- "referenced_type" : "type-19441" ++ "referenced_type" : "type-15685" + }, + { + "access" : "private", + "field_name" : "any_", + "field_offset" : 128, +- "referenced_type" : "type-19446" ++ "referenced_type" : "type-15690" + }, + { + "access" : "private", + "field_name" : "item_type_", + "field_offset" : 160, +- "referenced_type" : "type-19455" ++ "referenced_type" : "type-15699" + }, + { + "access" : "private", +@@ -233478,8 +233520,8 @@ + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Item", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Item", + "record_kind" : "class", +- "referenced_type" : "type-19445", +- "self_type" : "type-19445", ++ "referenced_type" : "type-15689", ++ "self_type" : "type-15689", + "size" : 40, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter23ProtoStreamObjectWriter4ItemE", +@@ -233516,8 +233558,8 @@ + ], + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Options", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Options", +- "referenced_type" : "type-19457", +- "self_type" : "type-19457", ++ "referenced_type" : "type-15701", ++ "self_type" : "type-15701", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter23ProtoStreamObjectWriter7OptionsE" +@@ -233527,7 +233569,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-19143" ++ "referenced_type" : "type-15388" + } + ], + "fields" : +@@ -233560,13 +233602,13 @@ + "access" : "private", + "field_name" : "element_", + "field_offset" : 160, +- "referenced_type" : "type-19459" ++ "referenced_type" : "type-15703" + }, + { + "access" : "private", + "field_name" : "size_insert_", + "field_offset" : 192, +- "referenced_type" : "type-19467" ++ "referenced_type" : "type-15711" + }, + { + "access" : "private", +@@ -233578,7 +233620,7 @@ + "access" : "private", + "field_name" : "buffer_", + "field_offset" : 416, +- "referenced_type" : "type-19468" ++ "referenced_type" : "type-15712" + }, + { + "access" : "private", +@@ -233590,7 +233632,7 @@ + "access" : "private", + "field_name" : "stream_", + "field_offset" : 576, +- "referenced_type" : "type-19469" ++ "referenced_type" : "type-15713" + }, + { + "access" : "private", +@@ -233608,14 +233650,14 @@ + "access" : "private", + "field_name" : "tracker_", + "field_offset" : 672, +- "referenced_type" : "type-19470" ++ "referenced_type" : "type-15714" + } + ], + "linker_set_key" : "google::protobuf::util::converter::ProtoWriter", + "name" : "google::protobuf::util::converter::ProtoWriter", + "record_kind" : "class", +- "referenced_type" : "type-19458", +- "self_type" : "type-19458", ++ "referenced_type" : "type-15702", ++ "self_type" : "type-15702", + "size" : 88, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter11ProtoWriterE", +@@ -233695,7 +233737,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-19139" ++ "referenced_type" : "type-15384" + }, + { + "referenced_type" : "type-15337" +@@ -233707,7 +233749,7 @@ + "access" : "private", + "field_name" : "ow_", + "field_offset" : 128, +- "referenced_type" : "type-19462" ++ "referenced_type" : "type-15706" + }, + { + "access" : "private", +@@ -233731,7 +233773,7 @@ + "access" : "private", + "field_name" : "required_fields_", + "field_offset" : 256, +- "referenced_type" : "type-19463" ++ "referenced_type" : "type-15707" + }, + { + "access" : "private", +@@ -233749,14 +233791,14 @@ + "access" : "private", + "field_name" : "oneof_indices_", + "field_offset" : 416, +- "referenced_type" : "type-19464" ++ "referenced_type" : "type-15708" + } + ], + "linker_set_key" : "google::protobuf::util::converter::ProtoWriter::ProtoElement", + "name" : "google::protobuf::util::converter::ProtoWriter::ProtoElement", + "record_kind" : "class", +- "referenced_type" : "type-19461", +- "self_type" : "type-19461", ++ "referenced_type" : "type-15705", ++ "self_type" : "type-15705", + "size" : 64, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter11ProtoWriter12ProtoElementE", +@@ -233821,8 +233863,8 @@ + ], + "linker_set_key" : "google::protobuf::util::converter::ProtoWriter::SizeInfo", + "name" : "google::protobuf::util::converter::ProtoWriter::SizeInfo", +- "referenced_type" : "type-19637", +- "self_type" : "type-19637", ++ "referenced_type" : "type-15881", ++ "self_type" : "type-15881", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter11ProtoWriter8SizeInfoE" +@@ -233838,8 +233880,8 @@ + "linker_set_key" : "google::protobuf::util::converter::StructuredObjectWriter", + "name" : "google::protobuf::util::converter::StructuredObjectWriter", + "record_kind" : "class", +- "referenced_type" : "type-19143", +- "self_type" : "type-19143", ++ "referenced_type" : "type-15388", ++ "self_type" : "type-15388", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/structured_objectwriter.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter22StructuredObjectWriterE", +@@ -233934,7 +233976,7 @@ + "access" : "private", + "field_name" : "parent_", + "field_offset" : 32, +- "referenced_type" : "type-19140" ++ "referenced_type" : "type-15385" + }, + { + "access" : "private", +@@ -233946,8 +233988,8 @@ + "linker_set_key" : "google::protobuf::util::converter::StructuredObjectWriter::BaseElement", + "name" : "google::protobuf::util::converter::StructuredObjectWriter::BaseElement", + "record_kind" : "class", +- "referenced_type" : "type-19139", +- "self_type" : "type-19139", ++ "referenced_type" : "type-15384", ++ "self_type" : "type-15384", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/structured_objectwriter.h", + "unique_id" : "_ZTSN6google8protobuf4util9converter22StructuredObjectWriter11BaseElementE", +@@ -234075,8 +234117,8 @@ + "alignment" : 1, + "linker_set_key" : "google::protobuf::util::internal::StatusOrHelper::Specialize", + "name" : "google::protobuf::util::internal::StatusOrHelper::Specialize", +- "referenced_type" : "type-19962", +- "self_type" : "type-19962", ++ "referenced_type" : "type-16206", ++ "self_type" : "type-16206", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h", + "template_args" : [ "type-2430" ], +@@ -234086,8 +234128,8 @@ + "alignment" : 1, + "linker_set_key" : "google::protobuf::util::internal::StatusOrHelper::Specialize", + "name" : "google::protobuf::util::internal::StatusOrHelper::Specialize", +- "referenced_type" : "type-19961", +- "self_type" : "type-19961", ++ "referenced_type" : "type-16205", ++ "self_type" : "type-16205", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h", + "template_args" : [ "type-2422" ], +diff --git a/29/64/arm_armv8-a/source-based/libhidlbase.so.lsdump b/29/64/arm_armv8-a/source-based/libhidlbase.so.lsdump +index 12aeee8..3577746 100644 +--- a/29/64/arm_armv8-a/source-based/libhidlbase.so.lsdump ++++ b/29/64/arm_armv8-a/source-based/libhidlbase.so.lsdump +@@ -5,16 +5,16 @@ + "alignment" : 1, + "linker_set_key" : "char [0]", + "name" : "char [0]", +- "referenced_type" : "type-48", +- "self_type" : "type-231", ++ "referenced_type" : "type-47", ++ "self_type" : "type-230", + "source_file" : "/system/core/liblog/include/log/log_read.h" + }, + { + "alignment" : 1, + "linker_set_key" : "char [10]", + "name" : "char [10]", +- "referenced_type" : "type-48", +- "self_type" : "type-3656", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3649", + "size" : 10, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -22,8 +22,8 @@ + "alignment" : 1, + "linker_set_key" : "char [11]", + "name" : "char [11]", +- "referenced_type" : "type-48", +- "self_type" : "type-3679", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3672", + "size" : 11, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -31,8 +31,8 @@ + "alignment" : 1, + "linker_set_key" : "char [12]", + "name" : "char [12]", +- "referenced_type" : "type-48", +- "self_type" : "type-3653", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3646", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -40,8 +40,8 @@ + "alignment" : 1, + "linker_set_key" : "char [13]", + "name" : "char [13]", +- "referenced_type" : "type-48", +- "self_type" : "type-3649", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3642", + "size" : 13, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -49,8 +49,8 @@ + "alignment" : 1, + "linker_set_key" : "char [14]", + "name" : "char [14]", +- "referenced_type" : "type-48", +- "self_type" : "type-3698", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3691", + "size" : 14, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -58,8 +58,8 @@ + "alignment" : 1, + "linker_set_key" : "char [15]", + "name" : "char [15]", +- "referenced_type" : "type-48", +- "self_type" : "type-3796", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3789", + "size" : 15, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -67,8 +67,8 @@ + "alignment" : 1, + "linker_set_key" : "char [16]", + "name" : "char [16]", +- "referenced_type" : "type-48", +- "self_type" : "type-47", ++ "referenced_type" : "type-47", ++ "self_type" : "type-46", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -76,8 +76,8 @@ + "alignment" : 1, + "linker_set_key" : "char [17]", + "name" : "char [17]", +- "referenced_type" : "type-48", +- "self_type" : "type-3701", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3694", + "size" : 17, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -85,8 +85,8 @@ + "alignment" : 1, + "linker_set_key" : "char [18]", + "name" : "char [18]", +- "referenced_type" : "type-48", +- "self_type" : "type-3685", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3678", + "size" : 18, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -94,8 +94,8 @@ + "alignment" : 1, + "linker_set_key" : "char [19]", + "name" : "char [19]", +- "referenced_type" : "type-48", +- "self_type" : "type-3717", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3710", + "size" : 19, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -103,8 +103,8 @@ + "alignment" : 1, + "linker_set_key" : "char [20]", + "name" : "char [20]", +- "referenced_type" : "type-48", +- "self_type" : "type-3695", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3688", + "size" : 20, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -112,8 +112,8 @@ + "alignment" : 1, + "linker_set_key" : "char [22]", + "name" : "char [22]", +- "referenced_type" : "type-48", +- "self_type" : "type-3720", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3713", + "size" : 22, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -121,8 +121,8 @@ + "alignment" : 1, + "linker_set_key" : "char [25]", + "name" : "char [25]", +- "referenced_type" : "type-48", +- "self_type" : "type-3710", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3703", + "size" : 25, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -130,8 +130,8 @@ + "alignment" : 1, + "linker_set_key" : "char [28]", + "name" : "char [28]", +- "referenced_type" : "type-48", +- "self_type" : "type-3733", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3726", + "size" : 28, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -139,8 +139,8 @@ + "alignment" : 1, + "linker_set_key" : "char [29]", + "name" : "char [29]", +- "referenced_type" : "type-48", +- "self_type" : "type-3707", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3700", + "size" : 29, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -148,8 +148,8 @@ + "alignment" : 1, + "linker_set_key" : "char [2]", + "name" : "char [2]", +- "referenced_type" : "type-48", +- "self_type" : "type-3660", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3652", + "size" : 2, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -157,8 +157,8 @@ + "alignment" : 1, + "linker_set_key" : "char [31]", + "name" : "char [31]", +- "referenced_type" : "type-48", +- "self_type" : "type-3692", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3684", + "size" : 31, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -166,8 +166,8 @@ + "alignment" : 1, + "linker_set_key" : "char [32]", + "name" : "char [32]", +- "referenced_type" : "type-48", +- "self_type" : "type-3724", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3717", + "size" : 32, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -175,8 +175,8 @@ + "alignment" : 1, + "linker_set_key" : "char [35]", + "name" : "char [35]", +- "referenced_type" : "type-48", +- "self_type" : "type-3713", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3706", + "size" : 35, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -184,8 +184,8 @@ + "alignment" : 1, + "linker_set_key" : "char [37]", + "name" : "char [37]", +- "referenced_type" : "type-48", +- "self_type" : "type-3704", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3697", + "size" : 37, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -193,8 +193,8 @@ + "alignment" : 1, + "linker_set_key" : "char [3]", + "name" : "char [3]", +- "referenced_type" : "type-48", +- "self_type" : "type-3672", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3665", + "size" : 3, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -202,8 +202,8 @@ + "alignment" : 1, + "linker_set_key" : "char [4]", + "name" : "char [4]", +- "referenced_type" : "type-48", +- "self_type" : "type-3793", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3786", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -211,8 +211,8 @@ + "alignment" : 1, + "linker_set_key" : "char [5]", + "name" : "char [5]", +- "referenced_type" : "type-48", +- "self_type" : "type-3799", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3792", + "size" : 5, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -220,8 +220,8 @@ + "alignment" : 1, + "linker_set_key" : "char [6]", + "name" : "char [6]", +- "referenced_type" : "type-48", +- "self_type" : "type-3664", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3657", + "size" : 6, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -229,8 +229,8 @@ + "alignment" : 1, + "linker_set_key" : "char [7]", + "name" : "char [7]", +- "referenced_type" : "type-48", +- "self_type" : "type-3688", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3681", + "size" : 7, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -238,8 +238,8 @@ + "alignment" : 1, + "linker_set_key" : "char [8]", + "name" : "char [8]", +- "referenced_type" : "type-48", +- "self_type" : "type-3676", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3669", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -247,16 +247,16 @@ + "alignment" : 1, + "linker_set_key" : "char [9]", + "name" : "char [9]", +- "referenced_type" : "type-48", +- "self_type" : "type-3667", ++ "referenced_type" : "type-47", ++ "self_type" : "type-3660", + "size" : 9, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { + "linker_set_key" : "float []", + "name" : "float []", +- "referenced_type" : "type-298", +- "self_type" : "type-297", ++ "referenced_type" : "type-297", ++ "self_type" : "type-296", + "source_file" : "/system/core/libsystem/include/system/graphics.h" + }, + { +@@ -271,8 +271,8 @@ + "alignment" : 1, + "linker_set_key" : "unsigned char [32]", + "name" : "unsigned char [32]", +- "referenced_type" : "type-199", +- "self_type" : "type-1013", ++ "referenced_type" : "type-198", ++ "self_type" : "type-1010", + "size" : 32, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -280,8 +280,8 @@ + "alignment" : 1, + "linker_set_key" : "unsigned char [5121]", + "name" : "unsigned char [5121]", +- "referenced_type" : "type-199", +- "self_type" : "type-238", ++ "referenced_type" : "type-198", ++ "self_type" : "type-237", + "size" : 5121, + "source_file" : "/system/core/liblog/include/log/log_read.h" + }, +@@ -290,7 +290,7 @@ + "linker_set_key" : "unsigned int [8]", + "name" : "unsigned int [8]", + "referenced_type" : "type-1", +- "self_type" : "type-288", ++ "self_type" : "type-287", + "size" : 32, + "source_file" : "/system/core/libsystem/include/system/graphics.h" + } +@@ -303,8 +303,8 @@ + "is_unsigned" : true, + "linker_set_key" : "bool", + "name" : "bool", +- "referenced_type" : "type-44", +- "self_type" : "type-44", ++ "referenced_type" : "type-43", ++ "self_type" : "type-43", + "size" : 1 + }, + { +@@ -313,8 +313,8 @@ + "is_unsigned" : true, + "linker_set_key" : "char", + "name" : "char", +- "referenced_type" : "type-48", +- "self_type" : "type-48", ++ "referenced_type" : "type-47", ++ "self_type" : "type-47", + "size" : 1 + }, + { +@@ -323,8 +323,8 @@ + "is_unsigned" : true, + "linker_set_key" : "char16_t", + "name" : "char16_t", +- "referenced_type" : "type-345", +- "self_type" : "type-345", ++ "referenced_type" : "type-344", ++ "self_type" : "type-344", + "size" : 2 + }, + { +@@ -339,8 +339,8 @@ + "alignment" : 4, + "linker_set_key" : "float", + "name" : "float", +- "referenced_type" : "type-298", +- "self_type" : "type-298", ++ "referenced_type" : "type-297", ++ "self_type" : "type-297", + "size" : 4 + }, + { +@@ -357,16 +357,16 @@ + "is_integral" : true, + "linker_set_key" : "long", + "name" : "long", +- "referenced_type" : "type-111", +- "self_type" : "type-111", ++ "referenced_type" : "type-110", ++ "self_type" : "type-110", + "size" : 4 + }, + { + "alignment" : 8, + "linker_set_key" : "long double", + "name" : "long double", +- "referenced_type" : "type-61", +- "self_type" : "type-61", ++ "referenced_type" : "type-60", ++ "self_type" : "type-60", + "size" : 8 + }, + { +@@ -402,8 +402,8 @@ + "is_unsigned" : true, + "linker_set_key" : "unsigned char", + "name" : "unsigned char", +- "referenced_type" : "type-199", +- "self_type" : "type-199", ++ "referenced_type" : "type-198", ++ "self_type" : "type-198", + "size" : 1 + }, + { +@@ -422,8 +422,8 @@ + "is_unsigned" : true, + "linker_set_key" : "unsigned long", + "name" : "unsigned long", +- "referenced_type" : "type-416", +- "self_type" : "type-416", ++ "referenced_type" : "type-415", ++ "self_type" : "type-415", + "size" : 4 + }, + { +@@ -442,15 +442,15 @@ + "is_unsigned" : true, + "linker_set_key" : "unsigned short", + "name" : "unsigned short", +- "referenced_type" : "type-132", +- "self_type" : "type-132", ++ "referenced_type" : "type-131", ++ "self_type" : "type-131", + "size" : 2 + }, + { + "linker_set_key" : "void", + "name" : "void", +- "referenced_type" : "type-106", +- "self_type" : "type-106" ++ "referenced_type" : "type-105", ++ "self_type" : "type-105" + } + ], + "elf_functions" : +@@ -467,14 +467,6 @@ + "binding" : "weak", + "name" : "_ZN7android2spINS_8hardware25PassthroughServiceManagerEED2Ev" + }, +- { +- "binding" : "weak", +- "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_" +- }, + { + "binding" : "weak", + "name" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_" +@@ -2563,6 +2555,230 @@ + { + "name" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_6StatusE" + }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_compareEPKvSA_" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE8do_splatEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_compareES3_S3_" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE15do_move_forwardEPvS3_j" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE16do_move_backwardEPvS3_j" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE7do_copyEPvS3_j" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE8do_splatEPvS3_j" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE8do_splatEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE8do_splatEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE8do_splatEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE10do_destroyEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE12do_constructEPvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE7do_copyEPvPKvj" ++ }, ++ { ++ "binding" : "weak", ++ "name" : "_ZNK7android6VectorIiE8do_splatEPvPKvj" ++ }, + { + "name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv" + }, +@@ -3457,7 +3673,7 @@ + }, + { + "binding" : "weak", +- "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware7details9SchedPrioEEENS_19__map_value_compareIS8_SC_NS_4lessIS8_EELb1EEENS_9allocatorISC_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJOS8_EEENSO_IJEEEEEENS_4pairINS_15__tree_iteratorISC_PNS_11__tree_nodeISC_PvEEiEEbEERKT_DpOT0_" ++ "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEENS2_8hardware7details9SchedPrioEEENS_19__map_value_compareIS8_SC_NS_4lessIS8_EELb1EEENS_9allocatorISC_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSO_IJEEEEEENS_4pairINS_15__tree_iteratorISC_PNS_11__tree_nodeISC_PvEEiEEbEERKT_DpOT0_" + }, + { + "binding" : "weak", +@@ -3465,7 +3681,7 @@ + }, + { + "binding" : "weak", +- "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJOS8_EEENSL_IJEEEEEENS_4pairINS_15__tree_iteratorIS9_PNS_11__tree_nodeIS9_PvEEiEEbEERKT_DpOT0_" ++ "name" : "_ZNSt3__16__treeINS_12__value_typeIN7android2wpINS2_4hidl4base4V1_05IBaseEEEbEENS_19__map_value_compareIS8_S9_NS_4lessIS8_EELb1EEENS_9allocatorIS9_EEE25__emplace_unique_key_argsIS8_JRKNS_21piecewise_construct_tENS_5tupleIJRKS8_EEENSL_IJEEEEEENS_4pairINS_15__tree_iteratorIS9_PNS_11__tree_nodeIS9_PvEEiEEbEERKT_DpOT0_" + }, + { + "binding" : "weak", +@@ -4620,8 +4836,8 @@ + ], + "linker_set_key" : "android::Condition::WakeUpType", + "name" : "android::Condition::WakeUpType", +- "referenced_type" : "type-444", +- "self_type" : "type-444", ++ "referenced_type" : "type-442", ++ "self_type" : "type-442", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Condition.h", + "underlying_type" : "type-1", +@@ -4638,8 +4854,8 @@ + ], + "linker_set_key" : "android::String16::StaticLinkage", + "name" : "android::String16::StaticLinkage", +- "referenced_type" : "type-347", +- "self_type" : "type-347", ++ "referenced_type" : "type-346", ++ "self_type" : "type-346", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String16.h", + "underlying_type" : "type-1", +@@ -4656,8 +4872,8 @@ + ], + "linker_set_key" : "android::String8::StaticLinkage", + "name" : "android::String8::StaticLinkage", +- "referenced_type" : "type-222", +- "self_type" : "type-222", ++ "referenced_type" : "type-221", ++ "self_type" : "type-221", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String8.h", + "underlying_type" : "type-1", +@@ -4682,8 +4898,8 @@ + ], + "linker_set_key" : "android::hardware::HidlReturnRestriction", + "name" : "android::hardware::HidlReturnRestriction", +- "referenced_type" : "type-176", +- "self_type" : "type-176", ++ "referenced_type" : "type-175", ++ "self_type" : "type-175", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", + "underlying_type" : "type-19", +@@ -4712,8 +4928,8 @@ + ], + "linker_set_key" : "android::hardware::MQDescriptor::GrantorType", + "name" : "android::hardware::MQDescriptor::GrantorType", +- "referenced_type" : "type-1033", +- "self_type" : "type-1033", ++ "referenced_type" : "type-1030", ++ "self_type" : "type-1030", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h", + "underlying_type" : "type-19", +@@ -4734,8 +4950,8 @@ + ], + "linker_set_key" : "android::hardware::MQFlavor", + "name" : "android::hardware::MQFlavor", +- "referenced_type" : "type-332", +- "self_type" : "type-332", ++ "referenced_type" : "type-331", ++ "self_type" : "type-331", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h", + "underlying_type" : "type-1", +@@ -4760,8 +4976,8 @@ + ], + "linker_set_key" : "android::hardware::ProcessState::CallRestriction", + "name" : "android::hardware::ProcessState::CallRestriction", +- "referenced_type" : "type-2433", +- "self_type" : "type-2433", ++ "referenced_type" : "type-2428", ++ "self_type" : "type-2428", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h", + "underlying_type" : "type-19", +@@ -4814,8 +5030,8 @@ + ], + "linker_set_key" : "android::hardware::Status::Exception", + "name" : "android::hardware::Status::Exception", +- "referenced_type" : "type-165", +- "self_type" : "type-165", ++ "referenced_type" : "type-164", ++ "self_type" : "type-164", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", + "underlying_type" : "type-19", +@@ -4868,8 +5084,8 @@ + ], + "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent", + "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent", +- "referenced_type" : "type-183", +- "self_type" : "type-183", ++ "referenced_type" : "type-182", ++ "self_type" : "type-182", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "underlying_type" : "type-1", +@@ -4894,8 +5110,8 @@ + ], + "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture", + "name" : "android::hidl::base::V1_0::DebugInfo::Architecture", +- "referenced_type" : "type-336", +- "self_type" : "type-336", ++ "referenced_type" : "type-335", ++ "self_type" : "type-335", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h", + "underlying_type" : "type-19", +@@ -4912,8 +5128,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::PidConstant", + "name" : "android::hidl::manager::V1_0::IServiceManager::PidConstant", +- "referenced_type" : "type-547", +- "self_type" : "type-547", ++ "referenced_type" : "type-545", ++ "self_type" : "type-545", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h", + "underlying_type" : "type-19", +@@ -4938,11 +5154,11 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::Transport", + "name" : "android::hidl::manager::V1_0::IServiceManager::Transport", +- "referenced_type" : "type-546", +- "self_type" : "type-546", ++ "referenced_type" : "type-544", ++ "self_type" : "type-544", + "size" : 1, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h", +- "underlying_type" : "type-199", ++ "underlying_type" : "type-198", + "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager9TransportE" + }, + { +@@ -4988,8 +5204,8 @@ + ], + "linker_set_key" : "android_LogPriority", + "name" : "android_LogPriority", +- "referenced_type" : "type-267", +- "self_type" : "type-267", ++ "referenced_type" : "type-266", ++ "self_type" : "type-266", + "size" : 4, + "source_file" : "/system/core/liblog/include/android/log.h", + "underlying_type" : "type-1", +@@ -5042,8 +5258,8 @@ + ], + "linker_set_key" : "android_color_mode_t", + "name" : "android_color_mode_t", +- "referenced_type" : "type-275", +- "self_type" : "type-275", ++ "referenced_type" : "type-274", ++ "self_type" : "type-274", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h", + "underlying_type" : "type-1", +@@ -5068,8 +5284,8 @@ + ], + "linker_set_key" : "android_color_mode_v1_1_t", + "name" : "android_color_mode_v1_1_t", +- "referenced_type" : "type-280", +- "self_type" : "type-280", ++ "referenced_type" : "type-279", ++ "self_type" : "type-279", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h", + "underlying_type" : "type-1", +@@ -5110,8 +5326,8 @@ + ], + "linker_set_key" : "android_color_transform_t", + "name" : "android_color_transform_t", +- "referenced_type" : "type-276", +- "self_type" : "type-276", ++ "referenced_type" : "type-275", ++ "self_type" : "type-275", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h", + "underlying_type" : "type-1", +@@ -5352,8 +5568,8 @@ + ], + "linker_set_key" : "android_dataspace_t", + "name" : "android_dataspace_t", +- "referenced_type" : "type-274", +- "self_type" : "type-274", ++ "referenced_type" : "type-273", ++ "self_type" : "type-273", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h", + "underlying_type" : "type-1", +@@ -5382,8 +5598,8 @@ + ], + "linker_set_key" : "android_dataspace_v1_1_t", + "name" : "android_dataspace_v1_1_t", +- "referenced_type" : "type-279", +- "self_type" : "type-279", ++ "referenced_type" : "type-278", ++ "self_type" : "type-278", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h", + "underlying_type" : "type-1", +@@ -5412,8 +5628,8 @@ + ], + "linker_set_key" : "android_dataspace_v1_2_t", + "name" : "android_dataspace_v1_2_t", +- "referenced_type" : "type-283", +- "self_type" : "type-283", ++ "referenced_type" : "type-282", ++ "self_type" : "type-282", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h", + "underlying_type" : "type-1", +@@ -5454,8 +5670,8 @@ + ], + "linker_set_key" : "android_flex_component", + "name" : "android_flex_component", +- "referenced_type" : "type-289", +- "self_type" : "type-289", ++ "referenced_type" : "type-288", ++ "self_type" : "type-288", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics.h", + "underlying_type" : "type-1", +@@ -5492,8 +5708,8 @@ + ], + "linker_set_key" : "android_flex_format", + "name" : "android_flex_format", +- "referenced_type" : "type-292", +- "self_type" : "type-292", ++ "referenced_type" : "type-291", ++ "self_type" : "type-291", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics.h", + "underlying_type" : "type-1", +@@ -5518,8 +5734,8 @@ + ], + "linker_set_key" : "android_hdr_t", + "name" : "android_hdr_t", +- "referenced_type" : "type-277", +- "self_type" : "type-277", ++ "referenced_type" : "type-276", ++ "self_type" : "type-276", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h", + "underlying_type" : "type-1", +@@ -5536,8 +5752,8 @@ + ], + "linker_set_key" : "android_hdr_v1_2_t", + "name" : "android_hdr_v1_2_t", +- "referenced_type" : "type-282", +- "self_type" : "type-282", ++ "referenced_type" : "type-281", ++ "self_type" : "type-281", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h", + "underlying_type" : "type-1", +@@ -5566,8 +5782,8 @@ + ], + "linker_set_key" : "android_pixel_format_sw_t", + "name" : "android_pixel_format_sw_t", +- "referenced_type" : "type-286", +- "self_type" : "type-286", ++ "referenced_type" : "type-285", ++ "self_type" : "type-285", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-sw.h", + "underlying_type" : "type-1", +@@ -5660,8 +5876,8 @@ + ], + "linker_set_key" : "android_pixel_format_t", + "name" : "android_pixel_format_t", +- "referenced_type" : "type-271", +- "self_type" : "type-271", ++ "referenced_type" : "type-270", ++ "self_type" : "type-270", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h", + "underlying_type" : "type-1", +@@ -5702,8 +5918,8 @@ + ], + "linker_set_key" : "android_pixel_format_v1_1_t", + "name" : "android_pixel_format_v1_1_t", +- "referenced_type" : "type-278", +- "self_type" : "type-278", ++ "referenced_type" : "type-277", ++ "self_type" : "type-277", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h", + "underlying_type" : "type-1", +@@ -5720,8 +5936,8 @@ + ], + "linker_set_key" : "android_pixel_format_v1_2_t", + "name" : "android_pixel_format_v1_2_t", +- "referenced_type" : "type-285", +- "self_type" : "type-285", ++ "referenced_type" : "type-284", ++ "self_type" : "type-284", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h", + "underlying_type" : "type-1", +@@ -5750,8 +5966,8 @@ + ], + "linker_set_key" : "android_render_intent_v1_1_t", + "name" : "android_render_intent_v1_1_t", +- "referenced_type" : "type-281", +- "self_type" : "type-281", ++ "referenced_type" : "type-280", ++ "self_type" : "type-280", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h", + "underlying_type" : "type-1", +@@ -5784,8 +6000,8 @@ + ], + "linker_set_key" : "android_transform_t", + "name" : "android_transform_t", +- "referenced_type" : "type-272", +- "self_type" : "type-272", ++ "referenced_type" : "type-271", ++ "self_type" : "type-271", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h", + "underlying_type" : "type-1", +@@ -5838,8 +6054,8 @@ + ], + "linker_set_key" : "log_id", + "name" : "log_id", +- "referenced_type" : "type-268", +- "self_type" : "type-268", ++ "referenced_type" : "type-267", ++ "self_type" : "type-267", + "size" : 4, + "source_file" : "/system/core/liblog/include/android/log.h", + "underlying_type" : "type-1", +@@ -5855,12 +6071,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2476" ++ "referenced_type" : "type-2471" + } + ], +- "referenced_type" : "type-2480", +- "return_type" : "type-2476", +- "self_type" : "type-2480", ++ "referenced_type" : "type-2475", ++ "return_type" : "type-2471", ++ "self_type" : "type-2475", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -5870,18 +6086,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-350" ++ "referenced_type" : "type-349" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "referenced_type" : "type-2430", +- "return_type" : "type-44", +- "self_type" : "type-2430", ++ "referenced_type" : "type-2425", ++ "return_type" : "type-43", ++ "self_type" : "type-2425", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -5891,12 +6107,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "referenced_type" : "type-303", ++ "referenced_type" : "type-302", + "return_type" : "type-19", +- "self_type" : "type-303", ++ "self_type" : "type-302", + "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h" + }, + { +@@ -5906,12 +6122,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2492" ++ "referenced_type" : "type-2487" + } + ], +- "referenced_type" : "type-2491", +- "return_type" : "type-2492", +- "self_type" : "type-2491", ++ "referenced_type" : "type-2486", ++ "return_type" : "type-2487", ++ "self_type" : "type-2486", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -5921,27 +6137,27 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-1030" ++ "referenced_type" : "type-1027" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2353" ++ "referenced_type" : "type-2348" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "referenced_type" : "type-2352", +- "return_type" : "type-106", +- "self_type" : "type-2352", ++ "referenced_type" : "type-2347", ++ "return_type" : "type-105", ++ "self_type" : "type-2347", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -5951,18 +6167,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "referenced_type" : "type-2346", +- "return_type" : "type-106", +- "self_type" : "type-2346", ++ "referenced_type" : "type-2341", ++ "return_type" : "type-105", ++ "self_type" : "type-2341", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -5972,15 +6188,15 @@ + "parameters" : + [ + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "referenced_type" : "type-2541", +- "return_type" : "type-106", +- "self_type" : "type-2541", ++ "referenced_type" : "type-2536", ++ "return_type" : "type-105", ++ "self_type" : "type-2536", + "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h" + } + ], +@@ -5993,10 +6209,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-587" ++ "referenced_type" : "type-585" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, + { +@@ -6006,13 +6222,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-495" ++ "referenced_type" : "type-493" + }, + { +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + } + ], +- "return_type" : "type-3841", ++ "return_type" : "type-3834", + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, + { +@@ -6022,42 +6238,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-788" ++ "referenced_type" : "type-785" + } + ], +- "return_type" : "type-106", +- "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" +- }, +- { +- "function_name" : "android::sp::operator=", +- "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-482" +- }, +- { +- "referenced_type" : "type-483" +- } +- ], +- "return_type" : "type-485", +- "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" +- }, +- { +- "function_name" : "android::sp::operator=", +- "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-482" +- }, +- { +- "referenced_type" : "type-2329" +- } +- ], +- "return_type" : "type-485", ++ "return_type" : "type-105", + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, + { +@@ -6067,13 +6251,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2381" ++ "referenced_type" : "type-2376" + }, + { +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + } + ], +- "return_type" : "type-3757", ++ "return_type" : "type-3750", + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, + { +@@ -6086,13 +6270,13 @@ + "referenced_type" : "type-33" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6105,10 +6289,10 @@ + "referenced_type" : "type-33" + }, + { +- "referenced_type" : "type-2766" ++ "referenced_type" : "type-2760" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6121,10 +6305,10 @@ + "referenced_type" : "type-33" + }, + { +- "referenced_type" : "type-2767" ++ "referenced_type" : "type-2761" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6137,10 +6321,10 @@ + "referenced_type" : "type-33" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6153,10 +6337,10 @@ + "referenced_type" : "type-33" + }, + { +- "referenced_type" : "type-2768" ++ "referenced_type" : "type-2762" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6169,10 +6353,10 @@ + "referenced_type" : "type-33" + }, + { +- "referenced_type" : "type-2769" ++ "referenced_type" : "type-2763" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6185,7 +6369,7 @@ + "referenced_type" : "type-33" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6198,7 +6382,7 @@ + "referenced_type" : "type-33" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6211,7 +6395,7 @@ + "referenced_type" : "type-33" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6224,13 +6408,13 @@ + "referenced_type" : "type-33" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6239,14 +6423,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-801", ++ "return_type" : "type-798", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { +@@ -6257,13 +6441,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2250" ++ "referenced_type" : "type-2245" + }, + { +- "referenced_type" : "type-2772" ++ "referenced_type" : "type-2766" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h" + }, + { +@@ -6273,13 +6457,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2250" ++ "referenced_type" : "type-2245" + }, + { +- "referenced_type" : "type-459" ++ "referenced_type" : "type-456" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h" + }, + { +@@ -6289,13 +6473,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2250" ++ "referenced_type" : "type-2245" + }, + { +- "referenced_type" : "type-459" ++ "referenced_type" : "type-456" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h" + }, + { +@@ -6304,16 +6488,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-2280" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2281" ++ "referenced_type" : "type-2276" + }, + { +- "referenced_type" : "type-2775" ++ "referenced_type" : "type-2769" + } + ], + "return_type" : "type-19", +@@ -6326,16 +6510,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2280" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2281" ++ "referenced_type" : "type-2276" + }, + { + "default_arg" : true, +@@ -6343,7 +6527,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-2776" ++ "referenced_type" : "type-2770" + } + ], + "return_type" : "type-19", +@@ -6355,16 +6539,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-2280" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2281" ++ "referenced_type" : "type-2276" + }, + { +- "referenced_type" : "type-2777" ++ "referenced_type" : "type-2771" + } + ], + "return_type" : "type-19", +@@ -6378,13 +6562,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-2778" ++ "referenced_type" : "type-2772" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, + { +@@ -6393,16 +6577,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-2280" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2281" ++ "referenced_type" : "type-2276" + }, + { +- "referenced_type" : "type-2779" ++ "referenced_type" : "type-2773" + } + ], + "return_type" : "type-19", +@@ -6414,16 +6598,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-2280" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2281" ++ "referenced_type" : "type-2276" + }, + { +- "referenced_type" : "type-2780" ++ "referenced_type" : "type-2774" + } + ], + "return_type" : "type-19", +@@ -6435,16 +6619,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-2280" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2281" ++ "referenced_type" : "type-2276" + }, + { +- "referenced_type" : "type-2781" ++ "referenced_type" : "type-2775" + } + ], + "return_type" : "type-19", +@@ -6456,16 +6640,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-2280" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2281" ++ "referenced_type" : "type-2276" + }, + { +- "referenced_type" : "type-2782" ++ "referenced_type" : "type-2776" + } + ], + "return_type" : "type-19", +@@ -6477,16 +6661,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-2280" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2281" ++ "referenced_type" : "type-2276" + }, + { +- "referenced_type" : "type-2783" ++ "referenced_type" : "type-2777" + } + ], + "return_type" : "type-19", +@@ -6500,10 +6684,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, + { +@@ -6513,13 +6697,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, + { +@@ -6529,19 +6713,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-2277" ++ "referenced_type" : "type-2272" + }, + { +- "referenced_type" : "type-2277" ++ "referenced_type" : "type-2272" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, + { +@@ -6551,13 +6735,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, + { +@@ -6567,19 +6751,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-2277" ++ "referenced_type" : "type-2272" + }, + { +- "referenced_type" : "type-2277" ++ "referenced_type" : "type-2272" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, + { +@@ -6589,10 +6773,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, + { +@@ -6602,10 +6786,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, + { +@@ -6615,10 +6799,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, + { +@@ -6627,13 +6811,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2253" ++ "referenced_type" : "type-2248" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6642,19 +6826,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2253" ++ "referenced_type" : "type-2248" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6664,16 +6848,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6683,13 +6867,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + }, + { +- "referenced_type" : "type-2784" ++ "referenced_type" : "type-2778" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6699,13 +6883,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + }, + { +- "referenced_type" : "type-2785" ++ "referenced_type" : "type-2779" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6715,13 +6899,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6731,13 +6915,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + }, + { +- "referenced_type" : "type-2786" ++ "referenced_type" : "type-2780" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6746,16 +6930,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2253" ++ "referenced_type" : "type-2248" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-2787" ++ "referenced_type" : "type-2781" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6764,16 +6948,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2253" ++ "referenced_type" : "type-2248" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-2788" ++ "referenced_type" : "type-2782" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6783,13 +6967,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + }, + { +- "referenced_type" : "type-2789" ++ "referenced_type" : "type-2783" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6798,16 +6982,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2253" ++ "referenced_type" : "type-2248" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-2790" ++ "referenced_type" : "type-2784" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6817,10 +7001,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6830,10 +7014,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6842,16 +7026,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2253" ++ "referenced_type" : "type-2248" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-2791" ++ "referenced_type" : "type-2785" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6860,13 +7044,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2253" ++ "referenced_type" : "type-2248" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6875,13 +7059,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2253" ++ "referenced_type" : "type-2248" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6891,10 +7075,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6904,16 +7088,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6923,13 +7107,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6939,13 +7123,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-960" ++ "referenced_type" : "type-957" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, + { +@@ -6955,14 +7139,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1048" ++ "referenced_type" : "type-1045" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-575", ++ "return_type" : "type-573", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -6972,16 +7156,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -6991,13 +7175,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + }, + { +- "referenced_type" : "type-1570" ++ "referenced_type" : "type-1566" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7007,13 +7191,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + }, + { +- "referenced_type" : "type-1571" ++ "referenced_type" : "type-1567" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7023,14 +7207,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1048" ++ "referenced_type" : "type-1045" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-575", ++ "return_type" : "type-573", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7040,13 +7224,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7056,13 +7240,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + }, + { +- "referenced_type" : "type-1572" ++ "referenced_type" : "type-1568" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7072,11 +7256,11 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + }, + { + "default_arg" : true, +- "referenced_type" : "type-1048" ++ "referenced_type" : "type-1045" + } + ], + "return_type" : "type-19", +@@ -7089,13 +7273,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + }, + { +- "referenced_type" : "type-1573" ++ "referenced_type" : "type-1569" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7105,10 +7289,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7118,10 +7302,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7130,13 +7314,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1048" ++ "referenced_type" : "type-1045" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7146,10 +7330,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7159,16 +7343,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7177,14 +7361,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-986", ++ "return_type" : "type-983", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7193,14 +7377,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-910" ++ "referenced_type" : "type-906" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-986", ++ "return_type" : "type-983", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { +@@ -7211,13 +7395,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-958" ++ "referenced_type" : "type-955" + }, + { +- "referenced_type" : "type-1576" ++ "referenced_type" : "type-1572" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h" + }, + { +@@ -7227,13 +7411,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-958" ++ "referenced_type" : "type-955" + }, + { +- "referenced_type" : "type-578" ++ "referenced_type" : "type-576" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h" + }, + { +@@ -7243,13 +7427,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-958" ++ "referenced_type" : "type-955" + }, + { +- "referenced_type" : "type-578" ++ "referenced_type" : "type-576" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h" + }, + { +@@ -7258,16 +7442,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { +- "referenced_type" : "type-1582" ++ "referenced_type" : "type-1578" + } + ], + "return_type" : "type-19", +@@ -7280,16 +7464,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-872" ++ "referenced_type" : "type-869" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { + "default_arg" : true, +@@ -7297,7 +7481,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-1583" ++ "referenced_type" : "type-1579" + } + ], + "return_type" : "type-19", +@@ -7311,13 +7495,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-872" ++ "referenced_type" : "type-869" + }, + { +- "referenced_type" : "type-1584" ++ "referenced_type" : "type-1580" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h" + }, + { +@@ -7326,16 +7510,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { +- "referenced_type" : "type-1585" ++ "referenced_type" : "type-1581" + } + ], + "return_type" : "type-19", +@@ -7347,16 +7531,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { +- "referenced_type" : "type-1586" ++ "referenced_type" : "type-1582" + } + ], + "return_type" : "type-19", +@@ -7368,16 +7552,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { +- "referenced_type" : "type-1587" ++ "referenced_type" : "type-1583" + } + ], + "return_type" : "type-19", +@@ -7389,16 +7573,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { +- "referenced_type" : "type-1588" ++ "referenced_type" : "type-1584" + } + ], + "return_type" : "type-19", +@@ -7410,16 +7594,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { +- "referenced_type" : "type-1589" ++ "referenced_type" : "type-1585" + } + ], + "return_type" : "type-19", +@@ -7433,10 +7617,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-872" ++ "referenced_type" : "type-869" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h" + }, + { +@@ -7445,16 +7629,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { +- "referenced_type" : "type-1590" ++ "referenced_type" : "type-1586" + } + ], + "return_type" : "type-19", +@@ -7466,16 +7650,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { +- "referenced_type" : "type-1591" ++ "referenced_type" : "type-1587" + } + ], + "return_type" : "type-19", +@@ -7488,13 +7672,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-872" ++ "referenced_type" : "type-869" + }, + { +- "referenced_type" : "type-910" ++ "referenced_type" : "type-906" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h" + }, + { +@@ -7504,13 +7688,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-872" ++ "referenced_type" : "type-869" + }, + { +- "referenced_type" : "type-910" ++ "referenced_type" : "type-906" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h" + }, + { +@@ -7520,10 +7704,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-872" ++ "referenced_type" : "type-869" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h" + }, + { +@@ -7533,10 +7717,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-872" ++ "referenced_type" : "type-869" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h" + }, + { +@@ -7546,10 +7730,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-872" ++ "referenced_type" : "type-869" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h" + }, + { +@@ -7558,16 +7742,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-969" ++ "referenced_type" : "type-966" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-1592" ++ "referenced_type" : "type-1588" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7577,16 +7761,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7596,13 +7780,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-1593" ++ "referenced_type" : "type-1589" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7612,13 +7796,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-1594" ++ "referenced_type" : "type-1590" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7628,16 +7812,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-807", ++ "return_type" : "type-804", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7647,13 +7831,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7663,13 +7847,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-1595" ++ "referenced_type" : "type-1591" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7678,16 +7862,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-969" ++ "referenced_type" : "type-966" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-1596" ++ "referenced_type" : "type-1592" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7697,16 +7881,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-1597" ++ "referenced_type" : "type-1593" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7715,19 +7899,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-969" ++ "referenced_type" : "type-966" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-807", ++ "return_type" : "type-804", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7737,13 +7921,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-1598" ++ "referenced_type" : "type-1594" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7752,19 +7936,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-969" ++ "referenced_type" : "type-966" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-1599" ++ "referenced_type" : "type-1595" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7774,10 +7958,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7787,10 +7971,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7800,19 +7984,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7822,16 +8006,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7840,22 +8024,22 @@ + "parameters" : + [ + { +- "referenced_type" : "type-969" ++ "referenced_type" : "type-966" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7864,19 +8048,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-969" ++ "referenced_type" : "type-966" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7886,16 +8070,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7905,16 +8089,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-801", ++ "return_type" : "type-798", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7924,13 +8108,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-1600" ++ "referenced_type" : "type-1596" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7940,10 +8124,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7953,16 +8137,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7971,19 +8155,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-969" ++ "referenced_type" : "type-966" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -7992,19 +8176,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-969" ++ "referenced_type" : "type-966" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-801", ++ "return_type" : "type-798", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -8014,13 +8198,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-1601" ++ "referenced_type" : "type-1597" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -8030,13 +8214,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -8046,13 +8230,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-959" ++ "referenced_type" : "type-956" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, + { +@@ -8062,14 +8246,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1115" ++ "referenced_type" : "type-1112" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-590", ++ "return_type" : "type-588", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8079,16 +8263,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8098,13 +8282,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + }, + { +- "referenced_type" : "type-1602" ++ "referenced_type" : "type-1598" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8114,13 +8298,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + }, + { +- "referenced_type" : "type-1603" ++ "referenced_type" : "type-1599" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8130,14 +8314,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1115" ++ "referenced_type" : "type-1112" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-590", ++ "return_type" : "type-588", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8147,13 +8331,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8163,13 +8347,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + }, + { +- "referenced_type" : "type-1604" ++ "referenced_type" : "type-1600" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8179,11 +8363,11 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + }, + { + "default_arg" : true, +- "referenced_type" : "type-1115" ++ "referenced_type" : "type-1112" + } + ], + "return_type" : "type-19", +@@ -8196,13 +8380,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + }, + { +- "referenced_type" : "type-1605" ++ "referenced_type" : "type-1601" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8212,10 +8396,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8225,10 +8409,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8237,13 +8421,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1115" ++ "referenced_type" : "type-1112" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8253,10 +8437,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8266,16 +8450,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8284,14 +8468,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1093", ++ "return_type" : "type-1090", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8300,14 +8484,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1093", ++ "return_type" : "type-1090", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { +@@ -8318,13 +8502,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1085" ++ "referenced_type" : "type-1082" + }, + { +- "referenced_type" : "type-1608" ++ "referenced_type" : "type-1604" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h" + }, + { +@@ -8334,13 +8518,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1085" ++ "referenced_type" : "type-1082" + }, + { +- "referenced_type" : "type-593" ++ "referenced_type" : "type-591" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h" + }, + { +@@ -8350,13 +8534,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1085" ++ "referenced_type" : "type-1082" + }, + { +- "referenced_type" : "type-593" ++ "referenced_type" : "type-591" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h" + }, + { +@@ -8365,10 +8549,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1072" ++ "referenced_type" : "type-1069" + }, + { +- "referenced_type" : "type-1044" ++ "referenced_type" : "type-1041" + }, + { + "referenced_type" : "type-1" +@@ -8386,10 +8570,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1072" ++ "referenced_type" : "type-1069" + }, + { +- "referenced_type" : "type-1040" ++ "referenced_type" : "type-1037" + }, + { + "referenced_type" : "type-1" +@@ -8408,16 +8592,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-863" ++ "referenced_type" : "type-860" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1128" ++ "referenced_type" : "type-1125" + }, + { +- "referenced_type" : "type-1129" ++ "referenced_type" : "type-1126" + }, + { + "default_arg" : true, +@@ -8425,7 +8609,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-1611" ++ "referenced_type" : "type-1607" + } + ], + "return_type" : "type-19", +@@ -8439,13 +8623,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-863" ++ "referenced_type" : "type-860" + }, + { +- "referenced_type" : "type-1612" ++ "referenced_type" : "type-1608" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, + { +@@ -8454,16 +8638,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1128" ++ "referenced_type" : "type-1125" + }, + { +- "referenced_type" : "type-1129" ++ "referenced_type" : "type-1126" + }, + { +- "referenced_type" : "type-1613" ++ "referenced_type" : "type-1609" + } + ], + "return_type" : "type-19", +@@ -8477,10 +8661,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-863" ++ "referenced_type" : "type-860" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, + { +@@ -8490,13 +8674,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-863" ++ "referenced_type" : "type-860" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, + { +@@ -8506,13 +8690,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-863" ++ "referenced_type" : "type-860" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, + { +@@ -8522,10 +8706,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-863" ++ "referenced_type" : "type-860" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, + { +@@ -8535,10 +8719,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-863" ++ "referenced_type" : "type-860" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, + { +@@ -8548,10 +8732,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-863" ++ "referenced_type" : "type-860" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, + { +@@ -8561,16 +8745,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8580,13 +8764,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-1614" ++ "referenced_type" : "type-1610" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8596,13 +8780,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-1615" ++ "referenced_type" : "type-1611" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8612,13 +8796,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8628,13 +8812,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-1616" ++ "referenced_type" : "type-1612" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8644,19 +8828,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8666,13 +8850,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-1617" ++ "referenced_type" : "type-1613" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8681,22 +8865,22 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1088" ++ "referenced_type" : "type-1085" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8706,10 +8890,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8719,10 +8903,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8732,10 +8916,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8745,16 +8929,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8764,13 +8948,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8780,13 +8964,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-978" ++ "referenced_type" : "type-975" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, + { +@@ -8796,14 +8980,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1176" ++ "referenced_type" : "type-1173" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-580", ++ "return_type" : "type-578", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8813,16 +8997,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8832,13 +9016,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + }, + { +- "referenced_type" : "type-1618" ++ "referenced_type" : "type-1614" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8848,13 +9032,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + }, + { +- "referenced_type" : "type-1619" ++ "referenced_type" : "type-1615" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8864,14 +9048,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1176" ++ "referenced_type" : "type-1173" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-580", ++ "return_type" : "type-578", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8881,13 +9065,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8897,13 +9081,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + }, + { +- "referenced_type" : "type-1620" ++ "referenced_type" : "type-1616" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8913,11 +9097,11 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + }, + { + "default_arg" : true, +- "referenced_type" : "type-1176" ++ "referenced_type" : "type-1173" + } + ], + "return_type" : "type-19", +@@ -8930,13 +9114,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + }, + { +- "referenced_type" : "type-1621" ++ "referenced_type" : "type-1617" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8946,10 +9130,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8959,10 +9143,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8971,13 +9155,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1176" ++ "referenced_type" : "type-1173" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -8987,10 +9171,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -9000,16 +9184,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -9018,14 +9202,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1153", ++ "return_type" : "type-1150", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -9034,14 +9218,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-910" ++ "referenced_type" : "type-906" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1153", ++ "return_type" : "type-1150", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -9050,14 +9234,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-764" ++ "referenced_type" : "type-761" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1153", ++ "return_type" : "type-1150", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { +@@ -9068,13 +9252,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1141" ++ "referenced_type" : "type-1138" + }, + { +- "referenced_type" : "type-1624" ++ "referenced_type" : "type-1620" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h" + }, + { +@@ -9084,13 +9268,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1141" ++ "referenced_type" : "type-1138" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-581" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h" + }, + { +@@ -9100,13 +9284,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1141" ++ "referenced_type" : "type-1138" + }, + { +- "referenced_type" : "type-583" ++ "referenced_type" : "type-581" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h" + }, + { +@@ -9116,16 +9300,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-880" ++ "referenced_type" : "type-877" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1189" ++ "referenced_type" : "type-1186" + }, + { +- "referenced_type" : "type-1190" ++ "referenced_type" : "type-1187" + }, + { + "default_arg" : true, +@@ -9133,7 +9317,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-1630" ++ "referenced_type" : "type-1626" + } + ], + "return_type" : "type-19", +@@ -9147,13 +9331,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-880" ++ "referenced_type" : "type-877" + }, + { +- "referenced_type" : "type-1631" ++ "referenced_type" : "type-1627" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, + { +@@ -9162,16 +9346,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1189" ++ "referenced_type" : "type-1186" + }, + { +- "referenced_type" : "type-1190" ++ "referenced_type" : "type-1187" + }, + { +- "referenced_type" : "type-1632" ++ "referenced_type" : "type-1628" + } + ], + "return_type" : "type-19", +@@ -9185,10 +9369,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-880" ++ "referenced_type" : "type-877" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, + { +@@ -9198,13 +9382,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-880" ++ "referenced_type" : "type-877" + }, + { +- "referenced_type" : "type-764" ++ "referenced_type" : "type-761" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, + { +@@ -9214,13 +9398,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-880" ++ "referenced_type" : "type-877" + }, + { +- "referenced_type" : "type-764" ++ "referenced_type" : "type-761" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, + { +@@ -9230,10 +9414,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-880" ++ "referenced_type" : "type-877" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, + { +@@ -9243,10 +9427,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-880" ++ "referenced_type" : "type-877" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, + { +@@ -9256,10 +9440,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-880" ++ "referenced_type" : "type-877" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, + { +@@ -9269,16 +9453,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9288,13 +9472,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-1633" ++ "referenced_type" : "type-1629" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9304,13 +9488,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-1634" ++ "referenced_type" : "type-1630" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9320,16 +9504,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-807", ++ "return_type" : "type-804", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9339,13 +9523,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9355,13 +9539,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-1635" ++ "referenced_type" : "type-1631" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9371,16 +9555,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-1636" ++ "referenced_type" : "type-1632" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9390,13 +9574,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-1637" ++ "referenced_type" : "type-1633" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9406,10 +9590,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9419,10 +9603,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9432,19 +9616,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9454,16 +9638,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9473,19 +9657,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9494,22 +9678,22 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1145" ++ "referenced_type" : "type-1142" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9519,16 +9703,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9538,16 +9722,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-801", ++ "return_type" : "type-798", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9557,13 +9741,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-1638" ++ "referenced_type" : "type-1634" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9573,10 +9757,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9586,16 +9770,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9605,13 +9789,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-1639" ++ "referenced_type" : "type-1635" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9621,13 +9805,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9637,13 +9821,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1142" ++ "referenced_type" : "type-1139" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, + { +@@ -9653,14 +9837,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1235" ++ "referenced_type" : "type-1232" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-595", ++ "return_type" : "type-593", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9670,16 +9854,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9689,13 +9873,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + }, + { +- "referenced_type" : "type-1640" ++ "referenced_type" : "type-1636" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9705,13 +9889,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + }, + { +- "referenced_type" : "type-1641" ++ "referenced_type" : "type-1637" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9721,14 +9905,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1235" ++ "referenced_type" : "type-1232" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-595", ++ "return_type" : "type-593", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9738,13 +9922,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9754,13 +9938,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + }, + { +- "referenced_type" : "type-1642" ++ "referenced_type" : "type-1638" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9770,11 +9954,11 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + }, + { + "default_arg" : true, +- "referenced_type" : "type-1235" ++ "referenced_type" : "type-1232" + } + ], + "return_type" : "type-19", +@@ -9787,13 +9971,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + }, + { +- "referenced_type" : "type-1643" ++ "referenced_type" : "type-1639" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9803,10 +9987,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9816,10 +10000,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9828,13 +10012,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1235" ++ "referenced_type" : "type-1232" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9844,10 +10028,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9857,16 +10041,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9875,14 +10059,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1213", ++ "return_type" : "type-1210", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9891,14 +10075,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-787" ++ "referenced_type" : "type-784" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1213", ++ "return_type" : "type-1210", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { +@@ -9908,14 +10092,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1314" ++ "referenced_type" : "type-1311" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-585", ++ "return_type" : "type-583", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -9925,16 +10109,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -9944,13 +10128,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + }, + { +- "referenced_type" : "type-1644" ++ "referenced_type" : "type-1640" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -9960,13 +10144,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + }, + { +- "referenced_type" : "type-1645" ++ "referenced_type" : "type-1641" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -9976,14 +10160,14 @@ + [ + { + "default_arg" : true, +- "referenced_type" : "type-1314" ++ "referenced_type" : "type-1311" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-585", ++ "return_type" : "type-583", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -9993,13 +10177,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10009,13 +10193,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + }, + { +- "referenced_type" : "type-1646" ++ "referenced_type" : "type-1642" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10025,11 +10209,11 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + }, + { + "default_arg" : true, +- "referenced_type" : "type-1314" ++ "referenced_type" : "type-1311" + } + ], + "return_type" : "type-19", +@@ -10042,13 +10226,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + }, + { +- "referenced_type" : "type-1647" ++ "referenced_type" : "type-1643" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10058,10 +10242,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10071,10 +10255,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10083,13 +10267,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1314" ++ "referenced_type" : "type-1311" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10099,10 +10283,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10112,16 +10296,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10130,14 +10314,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1284", ++ "return_type" : "type-1281", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10146,14 +10330,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-910" ++ "referenced_type" : "type-906" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1284", ++ "return_type" : "type-1281", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10162,14 +10346,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-764" ++ "referenced_type" : "type-761" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1284", ++ "return_type" : "type-1281", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10178,14 +10362,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-773" ++ "referenced_type" : "type-769" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1284", ++ "return_type" : "type-1281", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { +@@ -10196,13 +10380,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1198" ++ "referenced_type" : "type-1195" + }, + { +- "referenced_type" : "type-1650" ++ "referenced_type" : "type-1646" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h" + }, + { +@@ -10212,13 +10396,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1198" ++ "referenced_type" : "type-1195" + }, + { +- "referenced_type" : "type-600" ++ "referenced_type" : "type-598" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h" + }, + { +@@ -10228,13 +10412,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1198" ++ "referenced_type" : "type-1195" + }, + { +- "referenced_type" : "type-600" ++ "referenced_type" : "type-598" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h" + }, + { +@@ -10245,13 +10429,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1273" ++ "referenced_type" : "type-1269" + }, + { +- "referenced_type" : "type-1655" ++ "referenced_type" : "type-1651" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h" + }, + { +@@ -10261,13 +10445,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1273" ++ "referenced_type" : "type-1269" + }, + { +- "referenced_type" : "type-588" ++ "referenced_type" : "type-586" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h" + }, + { +@@ -10277,13 +10461,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1273" ++ "referenced_type" : "type-1269" + }, + { +- "referenced_type" : "type-588" ++ "referenced_type" : "type-586" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h" + }, + { +@@ -10293,16 +10477,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-889" ++ "referenced_type" : "type-886" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1255" ++ "referenced_type" : "type-1252" + }, + { +- "referenced_type" : "type-1256" ++ "referenced_type" : "type-1253" + }, + { + "default_arg" : true, +@@ -10310,7 +10494,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-1662" ++ "referenced_type" : "type-1658" + } + ], + "return_type" : "type-19", +@@ -10324,13 +10508,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-889" ++ "referenced_type" : "type-886" + }, + { +- "referenced_type" : "type-1663" ++ "referenced_type" : "type-1659" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, + { +@@ -10339,16 +10523,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1255" ++ "referenced_type" : "type-1252" + }, + { +- "referenced_type" : "type-1256" ++ "referenced_type" : "type-1253" + }, + { +- "referenced_type" : "type-1664" ++ "referenced_type" : "type-1660" + } + ], + "return_type" : "type-19", +@@ -10362,10 +10546,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-889" ++ "referenced_type" : "type-886" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, + { +@@ -10375,13 +10559,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-889" ++ "referenced_type" : "type-886" + }, + { +- "referenced_type" : "type-787" ++ "referenced_type" : "type-784" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, + { +@@ -10391,13 +10575,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-889" ++ "referenced_type" : "type-886" + }, + { +- "referenced_type" : "type-787" ++ "referenced_type" : "type-784" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, + { +@@ -10407,10 +10591,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-889" ++ "referenced_type" : "type-886" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, + { +@@ -10420,10 +10604,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-889" ++ "referenced_type" : "type-886" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, + { +@@ -10433,10 +10617,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-889" ++ "referenced_type" : "type-886" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, + { +@@ -10446,16 +10630,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-896" ++ "referenced_type" : "type-893" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1309" ++ "referenced_type" : "type-1306" + }, + { +- "referenced_type" : "type-1310" ++ "referenced_type" : "type-1307" + }, + { + "default_arg" : true, +@@ -10463,7 +10647,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-1665" ++ "referenced_type" : "type-1661" + } + ], + "return_type" : "type-19", +@@ -10477,13 +10661,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-896" ++ "referenced_type" : "type-893" + }, + { +- "referenced_type" : "type-1666" ++ "referenced_type" : "type-1662" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h" + }, + { +@@ -10492,16 +10676,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1309" ++ "referenced_type" : "type-1306" + }, + { +- "referenced_type" : "type-1310" ++ "referenced_type" : "type-1307" + }, + { +- "referenced_type" : "type-1667" ++ "referenced_type" : "type-1663" + } + ], + "return_type" : "type-19", +@@ -10513,16 +10697,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1309" ++ "referenced_type" : "type-1306" + }, + { +- "referenced_type" : "type-1310" ++ "referenced_type" : "type-1307" + }, + { +- "referenced_type" : "type-1668" ++ "referenced_type" : "type-1664" + } + ], + "return_type" : "type-19", +@@ -10534,16 +10718,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1309" ++ "referenced_type" : "type-1306" + }, + { +- "referenced_type" : "type-1310" ++ "referenced_type" : "type-1307" + }, + { +- "referenced_type" : "type-1669" ++ "referenced_type" : "type-1665" + } + ], + "return_type" : "type-19", +@@ -10555,16 +10739,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1309" ++ "referenced_type" : "type-1306" + }, + { +- "referenced_type" : "type-1310" ++ "referenced_type" : "type-1307" + }, + { +- "referenced_type" : "type-1670" ++ "referenced_type" : "type-1666" + } + ], + "return_type" : "type-19", +@@ -10576,16 +10760,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-358" ++ "referenced_type" : "type-357" + }, + { +- "referenced_type" : "type-1309" ++ "referenced_type" : "type-1306" + }, + { +- "referenced_type" : "type-1310" ++ "referenced_type" : "type-1307" + }, + { +- "referenced_type" : "type-1671" ++ "referenced_type" : "type-1667" + } + ], + "return_type" : "type-19", +@@ -10599,10 +10783,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-896" ++ "referenced_type" : "type-893" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h" + }, + { +@@ -10612,13 +10796,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-896" ++ "referenced_type" : "type-893" + }, + { +- "referenced_type" : "type-773" ++ "referenced_type" : "type-769" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h" + }, + { +@@ -10628,13 +10812,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-896" ++ "referenced_type" : "type-893" + }, + { +- "referenced_type" : "type-773" ++ "referenced_type" : "type-769" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h" + }, + { +@@ -10644,10 +10828,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-896" ++ "referenced_type" : "type-893" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h" + }, + { +@@ -10657,10 +10841,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-896" ++ "referenced_type" : "type-893" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h" + }, + { +@@ -10670,10 +10854,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-896" ++ "referenced_type" : "type-893" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h" + }, + { +@@ -10683,16 +10867,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10702,13 +10886,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-1672" ++ "referenced_type" : "type-1668" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10718,13 +10902,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-1673" ++ "referenced_type" : "type-1669" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10734,13 +10918,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10750,13 +10934,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-1674" ++ "referenced_type" : "type-1670" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10765,19 +10949,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1203" ++ "referenced_type" : "type-1200" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10787,13 +10971,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1671" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10803,10 +10987,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10816,10 +11000,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10829,10 +11013,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10842,16 +11026,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10861,16 +11045,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10880,13 +11064,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10896,13 +11080,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1199" ++ "referenced_type" : "type-1196" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, + { +@@ -10912,16 +11096,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -10931,19 +11115,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -10953,13 +11137,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-1676" ++ "referenced_type" : "type-1672" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -10969,13 +11153,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-1677" ++ "referenced_type" : "type-1673" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -10985,16 +11169,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-807", ++ "return_type" : "type-804", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11004,19 +11188,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11026,13 +11210,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11042,13 +11226,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-1678" ++ "referenced_type" : "type-1674" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11058,16 +11242,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-1679" ++ "referenced_type" : "type-1675" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11076,22 +11260,22 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1277" ++ "referenced_type" : "type-1273" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11100,22 +11284,22 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1277" ++ "referenced_type" : "type-1273" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11125,13 +11309,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-1680" ++ "referenced_type" : "type-1676" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11141,10 +11325,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11154,10 +11338,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11167,22 +11351,22 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-787" ++ "referenced_type" : "type-784" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11192,16 +11376,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-1681" ++ "referenced_type" : "type-1677" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11211,19 +11395,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11233,16 +11417,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-787" ++ "referenced_type" : "type-784" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11252,16 +11436,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11271,19 +11455,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-783" ++ "referenced_type" : "type-780" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11292,25 +11476,25 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1277" ++ "referenced_type" : "type-1273" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-787" ++ "referenced_type" : "type-784" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11319,19 +11503,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1277" ++ "referenced_type" : "type-1273" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-1682" ++ "referenced_type" : "type-1678" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11340,19 +11524,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1277" ++ "referenced_type" : "type-1273" + }, + { +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-787" ++ "referenced_type" : "type-784" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11362,16 +11546,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11381,16 +11565,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-801", ++ "return_type" : "type-798", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11400,13 +11584,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-1683" ++ "referenced_type" : "type-1679" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11416,10 +11600,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11429,16 +11613,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-1042" ++ "referenced_type" : "type-1039" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11448,13 +11632,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-1684" ++ "referenced_type" : "type-1680" + } + ], +- "return_type" : "type-102", ++ "return_type" : "type-101", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11464,13 +11648,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11480,13 +11664,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-778" ++ "referenced_type" : "type-775" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, + { +@@ -11497,10 +11681,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11510,14 +11694,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { +- "referenced_type" : "type-2406" ++ "referenced_type" : "type-2401" + }, + { + "default_arg" : true, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "default_arg" : true, +@@ -11534,22 +11718,22 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-2345" ++ "referenced_type" : "type-2340" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11559,13 +11743,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11575,10 +11759,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], +- "return_type" : "type-2335", ++ "return_type" : "type-2330", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11588,10 +11772,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11601,10 +11785,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2424" ++ "referenced_type" : "type-2419" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11614,22 +11798,22 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2424" ++ "referenced_type" : "type-2419" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-2345" ++ "referenced_type" : "type-2340" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11639,13 +11823,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2424" ++ "referenced_type" : "type-2419" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11655,10 +11839,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2424" ++ "referenced_type" : "type-2419" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11668,10 +11852,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2424" ++ "referenced_type" : "type-2419" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11681,10 +11865,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2424" ++ "referenced_type" : "type-2419" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11694,10 +11878,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2424" ++ "referenced_type" : "type-2419" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11707,14 +11891,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { +- "referenced_type" : "type-2360" ++ "referenced_type" : "type-2355" + }, + { + "default_arg" : true, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "default_arg" : true, +@@ -11722,7 +11906,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-949" ++ "referenced_type" : "type-946" + } + ], + "return_type" : "type-19", +@@ -11736,13 +11920,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { +- "referenced_type" : "type-2415" ++ "referenced_type" : "type-2410" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11753,13 +11937,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11770,16 +11954,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11789,7 +11973,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], + "return_type" : "type-19", +@@ -11802,16 +11986,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2355" ++ "referenced_type" : "type-2350" + }, + { +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "default_arg" : true, +@@ -11819,7 +12003,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-2792" ++ "referenced_type" : "type-2786" + } + ], + "return_type" : "type-19", +@@ -11832,13 +12016,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11848,13 +12032,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11865,10 +12049,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11879,10 +12063,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11893,10 +12077,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -11905,10 +12089,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-126" ++ "referenced_type" : "type-125" + } + ], +- "return_type" : "type-157", ++ "return_type" : "type-156", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -11917,10 +12101,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-124" ++ "referenced_type" : "type-123" + } + ], +- "return_type" : "type-157", ++ "return_type" : "type-156", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -11929,7 +12113,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { + "referenced_type" : "type-19" +@@ -11938,7 +12122,7 @@ + "referenced_type" : "type-21" + } + ], +- "return_type" : "type-157", ++ "return_type" : "type-156", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -11949,10 +12133,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-158" ++ "referenced_type" : "type-157" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { + "referenced_type" : "type-86" +@@ -11961,7 +12145,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -11972,10 +12156,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-158" ++ "referenced_type" : "type-157" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -11986,10 +12170,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-158" ++ "referenced_type" : "type-157" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { + "referenced_type" : "type-86" +@@ -11998,7 +12182,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12009,10 +12193,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-158" ++ "referenced_type" : "type-157" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12022,10 +12206,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-158" ++ "referenced_type" : "type-157" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12035,10 +12219,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-158" ++ "referenced_type" : "type-157" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12048,10 +12232,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-158" ++ "referenced_type" : "type-157" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12060,10 +12244,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2553" ++ "referenced_type" : "type-2548" + } + ], +- "return_type" : "type-71", ++ "return_type" : "type-70", + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h" + }, + { +@@ -12072,10 +12256,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2546" ++ "referenced_type" : "type-2541" + } + ], +- "return_type" : "type-71", ++ "return_type" : "type-70", + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h" + }, + { +@@ -12085,10 +12269,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2550" ++ "referenced_type" : "type-2545" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h" + }, + { +@@ -12099,10 +12283,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2550" ++ "referenced_type" : "type-2545" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h" + }, + { +@@ -12113,10 +12297,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2550" ++ "referenced_type" : "type-2545" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h" + }, + { +@@ -12127,10 +12311,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2550" ++ "referenced_type" : "type-2545" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h" + }, + { +@@ -12140,10 +12324,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3886" ++ "referenced_type" : "type-3879" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -12153,10 +12337,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3886" ++ "referenced_type" : "type-3879" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -12166,10 +12350,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3886" ++ "referenced_type" : "type-3879" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -12179,10 +12363,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3886" ++ "referenced_type" : "type-3879" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -12191,12 +12375,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-356", ++ "return_type" : "type-355", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h", +- "template_args" : [ "type-34", "type-419", "type-355" ] ++ "template_args" : [ "type-34", "type-417", "type-354" ] + }, + { + "function_name" : "android::hardware::fromBinder", +@@ -12204,12 +12388,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-590", ++ "return_type" : "type-588", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h", +- "template_args" : [ "type-541", "type-864", "type-862" ] ++ "template_args" : [ "type-539", "type-861", "type-859" ] + }, + { + "function_name" : "android::hardware::fromBinder", +@@ -12217,12 +12401,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-595", ++ "return_type" : "type-593", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h", +- "template_args" : [ "type-544", "type-890", "type-888" ] ++ "template_args" : [ "type-542", "type-887", "type-884" ] + }, + { + "function_name" : "android::hardware::fromBinder", +@@ -12230,12 +12414,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-585", ++ "return_type" : "type-583", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h", +- "template_args" : [ "type-565", "type-774", "type-845" ] ++ "template_args" : [ "type-563", "type-770", "type-842" ] + }, + { + "access" : "protected", +@@ -12245,10 +12429,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2364" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -12259,13 +12443,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2364" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -12276,16 +12460,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2364" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -12296,13 +12480,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2364" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -12313,13 +12497,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2364" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -12330,10 +12514,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2364" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -12344,10 +12528,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2364" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -12358,10 +12542,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2364" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -12372,10 +12556,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12385,17 +12569,17 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { +- "referenced_type" : "type-91" ++ "referenced_type" : "type-90" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12405,13 +12589,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { + "referenced_type" : "type-86" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12421,13 +12605,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { + "referenced_type" : "type-16" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12437,13 +12621,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12453,10 +12637,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12466,13 +12650,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { + "referenced_type" : "type-86" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12482,13 +12666,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { + "referenced_type" : "type-16" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12498,13 +12682,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12514,10 +12698,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12527,10 +12711,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12540,10 +12724,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12553,13 +12737,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { + "referenced_type" : "type-86" + } + ], +- "return_type" : "type-88", ++ "return_type" : "type-87", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12569,13 +12753,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { + "referenced_type" : "type-16" + } + ], +- "return_type" : "type-88", ++ "return_type" : "type-87", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12585,13 +12769,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-78" ++ "referenced_type" : "type-77" + }, + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + } + ], +- "return_type" : "type-88", ++ "return_type" : "type-87", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12601,16 +12785,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12620,10 +12804,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12634,16 +12818,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12654,13 +12838,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-116" ++ "referenced_type" : "type-115" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12670,13 +12854,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-116" ++ "referenced_type" : "type-115" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12686,13 +12870,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12702,16 +12886,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12721,13 +12905,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-115" ++ "referenced_type" : "type-114" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12737,13 +12921,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12753,10 +12937,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12766,13 +12950,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-116" ++ "referenced_type" : "type-115" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12782,13 +12966,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12798,16 +12982,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12817,13 +13001,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-115" ++ "referenced_type" : "type-114" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12833,13 +13017,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12849,10 +13033,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12862,10 +13046,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12875,10 +13059,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12888,13 +13072,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-116" ++ "referenced_type" : "type-115" + } + ], +- "return_type" : "type-118", ++ "return_type" : "type-117", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12904,13 +13088,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "return_type" : "type-118", ++ "return_type" : "type-117", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12920,13 +13104,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-115" ++ "referenced_type" : "type-114" + } + ], +- "return_type" : "type-118", ++ "return_type" : "type-117", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -12936,19 +13120,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-118", ++ "return_type" : "type-117", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "function_name" : "android::hardware::ProcessState::selfOrNull", + "linker_set_key" : "_ZN7android8hardware12ProcessState10selfOrNullEv", +- "return_type" : "type-491", ++ "return_type" : "type-489", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -12958,7 +13142,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + } + ], + "return_type" : "type-1", +@@ -12971,16 +13155,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -12990,7 +13174,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + } + ], + "return_type" : "type-1", +@@ -13003,10 +13187,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13016,13 +13200,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-71", ++ "return_type" : "type-70", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13032,16 +13216,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { +- "referenced_type" : "type-350" ++ "referenced_type" : "type-349" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-71", ++ "return_type" : "type-70", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13053,7 +13237,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-491", ++ "return_type" : "type-489", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13063,13 +13247,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13079,16 +13263,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + }, + { +- "referenced_type" : "type-350" ++ "referenced_type" : "type-349" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13098,13 +13282,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13114,10 +13298,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13128,13 +13312,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-3809", ++ "return_type" : "type-3802", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13144,13 +13328,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { +- "referenced_type" : "type-2433" ++ "referenced_type" : "type-2428" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13160,13 +13344,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + } + ], + "return_type" : "type-19", +@@ -13179,16 +13363,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { +- "referenced_type" : "type-2432" ++ "referenced_type" : "type-2427" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13199,10 +13383,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + } + ], +- "return_type" : "type-221", ++ "return_type" : "type-220", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13212,13 +13396,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-2382", ++ "return_type" : "type-2377", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13228,13 +13412,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-71", ++ "return_type" : "type-70", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13244,13 +13428,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "return_type" : "type-19", +@@ -13263,7 +13447,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { + "referenced_type" : "type-19" +@@ -13275,7 +13459,7 @@ + { + "function_name" : "android::hardware::ProcessState::self", + "linker_set_key" : "_ZN7android8hardware12ProcessState4selfEv", +- "return_type" : "type-491", ++ "return_type" : "type-489", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13286,13 +13470,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13303,13 +13487,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13320,10 +13504,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13334,10 +13518,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13348,10 +13532,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2443" ++ "referenced_type" : "type-2438" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -13360,10 +13544,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-137" ++ "referenced_type" : "type-136" + }, + { +- "referenced_type" : "type-373" ++ "referenced_type" : "type-372" + } + ], + "return_type" : "type-19", +@@ -13375,10 +13559,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-168" ++ "referenced_type" : "type-167" + }, + { +- "referenced_type" : "type-371" ++ "referenced_type" : "type-370" + } + ], + "return_type" : "type-19", +@@ -13391,31 +13575,31 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-1030" ++ "referenced_type" : "type-1027" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2353" ++ "referenced_type" : "type-2348" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { + "function_name" : "android::hardware::IPCThreadState::selfOrNull", + "linker_set_key" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv", +- "return_type" : "type-3638", ++ "return_type" : "type-3631", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13426,10 +13610,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13439,14 +13623,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13456,10 +13640,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { +- "referenced_type" : "type-521" ++ "referenced_type" : "type-519" + } + ], + "return_type" : "type-19", +@@ -13472,13 +13656,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13490,10 +13674,10 @@ + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13503,10 +13687,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13516,16 +13700,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13535,7 +13719,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], + "return_type" : "type-19", +@@ -13549,7 +13733,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "referenced_type" : "type-19" +@@ -13565,10 +13749,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13578,14 +13762,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13596,11 +13780,11 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "return_type" : "type-19", +@@ -13613,13 +13797,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13629,16 +13813,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13649,14 +13833,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "default_arg" : true, +- "referenced_type" : "type-521" ++ "referenced_type" : "type-519" + } + ], + "return_type" : "type-19", +@@ -13669,10 +13853,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13682,13 +13866,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { +- "referenced_type" : "type-3644" ++ "referenced_type" : "type-3637" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13698,10 +13882,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13711,13 +13895,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13727,13 +13911,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { +- "referenced_type" : "type-472" ++ "referenced_type" : "type-470" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13743,7 +13927,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], + "return_type" : "type-447", +@@ -13757,7 +13941,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], + "return_type" : "type-19", +@@ -13770,7 +13954,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], + "return_type" : "type-19", +@@ -13784,10 +13968,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13798,7 +13982,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "referenced_type" : "type-19" +@@ -13813,10 +13997,10 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2355" ++ "referenced_type" : "type-2350" + }, + { +- "referenced_type" : "type-521" ++ "referenced_type" : "type-519" + } + ], + "return_type" : "type-19", +@@ -13829,7 +14013,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "referenced_type" : "type-19" +@@ -13845,13 +14029,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], + "return_type" : "type-19", +@@ -13865,10 +14049,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13878,13 +14062,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "referenced_type" : "type-447" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13894,13 +14078,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], + "return_type" : "type-19", +@@ -13913,10 +14097,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13926,10 +14110,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13939,19 +14123,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { + "function_name" : "android::hardware::IPCThreadState::self", + "linker_set_key" : "_ZN7android8hardware14IPCThreadState4selfEv", +- "return_type" : "type-3638", ++ "return_type" : "type-3631", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13961,16 +14145,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], +- "return_type" : "type-491", ++ "return_type" : "type-489", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { + "function_name" : "android::hardware::IPCThreadState::shutdown", + "linker_set_key" : "_ZN7android8hardware14IPCThreadState8shutdownEv", +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -13980,7 +14164,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { + "referenced_type" : "type-19" +@@ -13989,10 +14173,10 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2355" ++ "referenced_type" : "type-2350" + }, + { +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -14009,10 +14193,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + }, + { +- "referenced_type" : "type-2355" ++ "referenced_type" : "type-2350" + }, + { + "referenced_type" : "type-1" +@@ -14029,10 +14213,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -14043,10 +14227,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -14057,10 +14241,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -14071,10 +14255,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3638" ++ "referenced_type" : "type-3631" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, + { +@@ -14083,10 +14267,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-166" ++ "referenced_type" : "type-165" + }, + { +- "referenced_type" : "type-370" ++ "referenced_type" : "type-369" + } + ], + "return_type" : "type-19", +@@ -14098,10 +14282,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-370" ++ "referenced_type" : "type-369" + } + ], +- "return_type" : "type-134", ++ "return_type" : "type-133", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -14110,16 +14294,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-3622" ++ "referenced_type" : "type-3615" + }, + { +- "referenced_type" : "type-3772" ++ "referenced_type" : "type-3765" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -14128,13 +14312,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, + { +@@ -14149,19 +14333,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, + { + "function_name" : "android::hardware::joinRpcThreadpool", + "linker_set_key" : "_ZN7android8hardware17joinRpcThreadpoolEv", +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, + { +@@ -14171,13 +14355,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2507" ++ "referenced_type" : "type-2502" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { +@@ -14187,17 +14371,17 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2507" ++ "referenced_type" : "type-2502" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { + "access" : "private", + "function_name" : "android::hardware::BufferedTextOutput::getThreadState", + "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv", +- "return_type" : "type-2508", ++ "return_type" : "type-2503", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { +@@ -14207,10 +14391,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { +@@ -14220,10 +14404,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2507" ++ "referenced_type" : "type-2502" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { + "referenced_type" : "type-1" +@@ -14239,10 +14423,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2507" ++ "referenced_type" : "type-2502" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { +@@ -14252,14 +14436,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2507" ++ "referenced_type" : "type-2502" + }, + { + "default_arg" : true, + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { +@@ -14269,10 +14453,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2507" ++ "referenced_type" : "type-2502" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { +@@ -14282,10 +14466,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2507" ++ "referenced_type" : "type-2502" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { +@@ -14295,10 +14479,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2507" ++ "referenced_type" : "type-2502" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, + { +@@ -14307,10 +14491,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-376" ++ "referenced_type" : "type-375" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -14338,14 +14522,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-532" ++ "referenced_type" : "type-530" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { + "default_arg" : true, +- "referenced_type" : "type-535" ++ "referenced_type" : "type-533" + } + ], + "return_type" : "type-19", +@@ -14358,10 +14542,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-532" ++ "referenced_type" : "type-530" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, + { +@@ -14371,16 +14555,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-532" ++ "referenced_type" : "type-530" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, + { + "function_name" : "android::hardware::defaultServiceManager", + "linker_set_key" : "_ZN7android8hardware21defaultServiceManagerEv", +- "return_type" : "type-575", ++ "return_type" : "type-573", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { +@@ -14389,7 +14573,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { + "referenced_type" : "type-19" +@@ -14398,7 +14582,7 @@ + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, + { +@@ -14413,10 +14597,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-371" ++ "referenced_type" : "type-370" + }, + { + "referenced_type" : "type-1" +@@ -14434,10 +14618,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-124" ++ "referenced_type" : "type-123" + }, + { +- "referenced_type" : "type-371" ++ "referenced_type" : "type-370" + }, + { + "referenced_type" : "type-1" +@@ -14455,10 +14639,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-371" ++ "referenced_type" : "type-370" + }, + { + "referenced_type" : "type-1" +@@ -14479,10 +14663,10 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, + { +@@ -14491,10 +14675,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-83" ++ "referenced_type" : "type-82" + }, + { +- "referenced_type" : "type-370" ++ "referenced_type" : "type-369" + }, + { + "referenced_type" : "type-1" +@@ -14512,10 +14696,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-124" ++ "referenced_type" : "type-123" + }, + { +- "referenced_type" : "type-370" ++ "referenced_type" : "type-369" + }, + { + "referenced_type" : "type-1" +@@ -14533,10 +14717,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + }, + { +- "referenced_type" : "type-370" ++ "referenced_type" : "type-369" + }, + { + "referenced_type" : "type-1" +@@ -14557,25 +14741,25 @@ + "referenced_type" : "type-33" + } + ], +- "return_type" : "type-71", ++ "return_type" : "type-70", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { + "function_name" : "android::hardware::joinBinderRpcThreadpool", + "linker_set_key" : "_ZN7android8hardware23joinBinderRpcThreadpoolEv", +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { + "function_name" : "android::hardware::defaultServiceManager1_1", + "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_1Ev", +- "return_type" : "type-580", ++ "return_type" : "type-578", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { + "function_name" : "android::hardware::defaultServiceManager1_2", + "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_2Ev", +- "return_type" : "type-585", ++ "return_type" : "type-583", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { +@@ -14585,13 +14769,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-363" ++ "referenced_type" : "type-362" + }, + { +- "referenced_type" : "type-367" ++ "referenced_type" : "type-366" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -14601,10 +14785,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-363" ++ "referenced_type" : "type-362" + } + ], +- "return_type" : "type-361", ++ "return_type" : "type-360", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -14614,19 +14798,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-363" ++ "referenced_type" : "type-362" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -14636,19 +14820,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-363" ++ "referenced_type" : "type-362" + }, + { +- "referenced_type" : "type-140" ++ "referenced_type" : "type-139" + }, + { + "referenced_type" : "type-21" + }, + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -14660,22 +14844,22 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { + "function_name" : "android::hardware::getPassthroughServiceManager", + "linker_set_key" : "_ZN7android8hardware28getPassthroughServiceManagerEv", +- "return_type" : "type-575", ++ "return_type" : "type-573", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { + "function_name" : "android::hardware::getPassthroughServiceManager1_1", + "linker_set_key" : "_ZN7android8hardware31getPassthroughServiceManager1_1Ev", +- "return_type" : "type-580", ++ "return_type" : "type-578", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { +@@ -14684,10 +14868,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-176" ++ "referenced_type" : "type-175" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -14697,10 +14881,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-298" ++ "referenced_type" : "type-297" + } + ], + "return_type" : "type-19", +@@ -14713,7 +14897,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-2" +@@ -14729,7 +14913,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-19" +@@ -14745,7 +14929,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-447" +@@ -14761,10 +14945,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-199" ++ "referenced_type" : "type-198" + } + ], + "return_type" : "type-19", +@@ -14778,7 +14962,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -14794,7 +14978,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -14810,16 +14994,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + } + ], + "return_type" : "type-19", +@@ -14832,7 +15016,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-4" +@@ -14848,15 +15032,15 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-3772" ++ "referenced_type" : "type-3765" + } + ], + "return_type" : "type-19", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-4082" ] ++ "template_args" : [ "type-4074" ] + }, + { + "function_name" : "android::hardware::Parcel::writeUint16", +@@ -14865,10 +15049,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + } + ], + "return_type" : "type-19", +@@ -14881,7 +15065,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -14897,7 +15081,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-21" +@@ -14914,7 +15098,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -14930,10 +15114,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], + "return_type" : "type-19", +@@ -14946,13 +15130,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-245", ++ "return_type" : "type-244", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -14963,7 +15147,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -14980,7 +15164,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -14996,10 +15180,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-343" ++ "referenced_type" : "type-342" + }, + { + "referenced_type" : "type-1" +@@ -15015,10 +15199,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-350" ++ "referenced_type" : "type-349" + } + ], + "return_type" : "type-19", +@@ -15031,10 +15215,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-3769" ++ "referenced_type" : "type-3762" + } + ], + "return_type" : "type-19", +@@ -15047,10 +15231,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { + "referenced_type" : "type-1" +@@ -15067,10 +15251,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15081,10 +15265,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15095,10 +15279,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15108,10 +15292,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + }, + { + "referenced_type" : "type-1" +@@ -15130,7 +15314,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -15146,10 +15330,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-3753" ++ "referenced_type" : "type-3746" + } + ], + "return_type" : "type-19", +@@ -15162,10 +15346,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-69" ++ "referenced_type" : "type-68" + } + ], + "return_type" : "type-19", +@@ -15184,10 +15368,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + } + ], + "return_type" : "type-19", +@@ -15207,28 +15391,28 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-1030" ++ "referenced_type" : "type-1027" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2353" ++ "referenced_type" : "type-2348" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2351" ++ "referenced_type" : "type-2346" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15238,16 +15422,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + }, + { + "referenced_type" : "type-1" +@@ -15266,10 +15450,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], + "return_type" : "type-19", +@@ -15282,10 +15466,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15296,7 +15480,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], + "return_type" : "type-19", +@@ -15309,10 +15493,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + }, + { + "referenced_type" : "type-1" +@@ -15337,7 +15521,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-16" +@@ -15353,13 +15537,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-16" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "default_arg" : true, +@@ -15380,7 +15564,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-16" +@@ -15402,10 +15586,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + }, + { + "referenced_type" : "type-1" +@@ -15424,10 +15608,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { + "referenced_type" : "type-1" +@@ -15443,7 +15627,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -15452,7 +15636,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15462,10 +15646,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-1030" ++ "referenced_type" : "type-1027" + }, + { + "referenced_type" : "type-1" +@@ -15481,10 +15665,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15495,7 +15679,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-1" +@@ -15511,13 +15695,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15528,10 +15712,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15541,10 +15725,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "return_type" : "type-19", +@@ -15557,7 +15741,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "referenced_type" : "type-550" +@@ -15573,10 +15757,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15586,10 +15770,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15599,10 +15783,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15612,10 +15796,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -15627,7 +15811,7 @@ + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-104", ++ "return_type" : "type-103", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -15637,16 +15821,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-166" ++ "referenced_type" : "type-165" + }, + { + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -15656,13 +15840,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-166" ++ "referenced_type" : "type-165" + }, + { + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -15674,7 +15858,7 @@ + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-104", ++ "return_type" : "type-103", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -15686,16 +15870,16 @@ + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "return_type" : "type-104", ++ "return_type" : "type-103", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { + "function_name" : "android::hardware::Status::ok", + "linker_set_key" : "_ZN7android8hardware6Status2okEv", +- "return_type" : "type-104", ++ "return_type" : "type-103", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -15706,7 +15890,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-166" ++ "referenced_type" : "type-165" + }, + { + "referenced_type" : "type-19" +@@ -15715,7 +15899,7 @@ + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -15726,7 +15910,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-166" ++ "referenced_type" : "type-165" + }, + { + "referenced_type" : "type-19" +@@ -15735,10 +15919,10 @@ + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -15749,7 +15933,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-166" ++ "referenced_type" : "type-165" + }, + { + "referenced_type" : "type-19" +@@ -15758,7 +15942,7 @@ + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -15769,7 +15953,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-166" ++ "referenced_type" : "type-165" + }, + { + "referenced_type" : "type-19" +@@ -15778,10 +15962,10 @@ + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -15791,10 +15975,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2487" ++ "referenced_type" : "type-2482" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { + "referenced_type" : "type-1" +@@ -15804,7 +15988,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -15814,10 +15998,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2487" ++ "referenced_type" : "type-2482" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { + "referenced_type" : "type-1" +@@ -15827,7 +16011,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -15837,10 +16021,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + } + ], +- "return_type" : "type-2332", ++ "return_type" : "type-2327", + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, + { +@@ -15850,10 +16034,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + } + ], +- "return_type" : "type-2335", ++ "return_type" : "type-2330", + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, + { +@@ -15863,10 +16047,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, + { +@@ -15877,10 +16061,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, + { +@@ -15891,10 +16075,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, + { +@@ -15905,10 +16089,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, + { +@@ -15918,13 +16102,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-301" ++ "referenced_type" : "type-300" + }, + { +- "referenced_type" : "type-308" ++ "referenced_type" : "type-307" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, + { +@@ -15934,13 +16118,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-301" ++ "referenced_type" : "type-300" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, + { +@@ -15950,10 +16134,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-301" ++ "referenced_type" : "type-300" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, + { +@@ -15963,10 +16147,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-301" ++ "referenced_type" : "type-300" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, + { +@@ -15976,10 +16160,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-301" ++ "referenced_type" : "type-300" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, + { +@@ -15989,16 +16173,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-301" ++ "referenced_type" : "type-300" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, + { + "function_name" : "android::hardware::details::debuggable", + "linker_set_key" : "_ZN7android8hardware7details10debuggableEv", +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -16007,18 +16191,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-356" ++ "referenced_type" : "type-355" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-986", ++ "return_type" : "type-983", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-552", "type-34", "type-873" ] ++ "template_args" : [ "type-548", "type-34", "type-870" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16026,18 +16210,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-356" ++ "referenced_type" : "type-355" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1093", ++ "return_type" : "type-1090", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-541", "type-34", "type-864" ] ++ "template_args" : [ "type-539", "type-34", "type-861" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16045,18 +16229,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-356" ++ "referenced_type" : "type-355" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1153", ++ "return_type" : "type-1150", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-562", "type-34", "type-881" ] ++ "template_args" : [ "type-560", "type-34", "type-878" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16064,18 +16248,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-575" ++ "referenced_type" : "type-573" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1153", ++ "return_type" : "type-1150", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-562", "type-552", "type-881" ] ++ "template_args" : [ "type-560", "type-548", "type-878" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16083,18 +16267,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-356" ++ "referenced_type" : "type-355" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1213", ++ "return_type" : "type-1210", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-544", "type-34", "type-890" ] ++ "template_args" : [ "type-542", "type-34", "type-887" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16102,18 +16286,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-356" ++ "referenced_type" : "type-355" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1284", ++ "return_type" : "type-1281", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-565", "type-34", "type-774" ] ++ "template_args" : [ "type-563", "type-34", "type-770" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16121,18 +16305,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-575" ++ "referenced_type" : "type-573" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1284", ++ "return_type" : "type-1281", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-565", "type-552", "type-774" ] ++ "template_args" : [ "type-563", "type-548", "type-770" ] + }, + { + "function_name" : "android::hardware::details::castInterface", +@@ -16140,18 +16324,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-580" ++ "referenced_type" : "type-578" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-1284", ++ "return_type" : "type-1281", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-565", "type-562", "type-774" ] ++ "template_args" : [ "type-563", "type-560", "type-770" ] + }, + { + "function_name" : "android::hardware::details::getDescriptor", +@@ -16162,7 +16346,7 @@ + "referenced_type" : "type-33" + } + ], +- "return_type" : "type-685", ++ "return_type" : "type-683", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h" + }, + { +@@ -16172,10 +16356,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-172" ++ "referenced_type" : "type-171" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -16185,10 +16369,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-172" ++ "referenced_type" : "type-171" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -16198,13 +16382,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-172" ++ "referenced_type" : "type-171" + }, + { +- "referenced_type" : "type-173" ++ "referenced_type" : "type-172" + } + ], +- "return_type" : "type-266", ++ "return_type" : "type-265", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -16213,10 +16397,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16225,12 +16409,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-356" ++ "referenced_type" : "type-355" + } + ], +- "return_type" : "type-356", ++ "return_type" : "type-355", + "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h", +- "template_args" : [ "type-34", "type-106" ] ++ "template_args" : [ "type-34", "type-105" ] + }, + { + "function_name" : "android::hardware::details::wrapPassthrough", +@@ -16238,12 +16422,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-590" ++ "referenced_type" : "type-588" + } + ], +- "return_type" : "type-590", ++ "return_type" : "type-588", + "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h", +- "template_args" : [ "type-541", "type-106" ] ++ "template_args" : [ "type-539", "type-105" ] + }, + { + "function_name" : "android::hardware::details::wrapPassthrough", +@@ -16251,12 +16435,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-595" ++ "referenced_type" : "type-593" + } + ], +- "return_type" : "type-595", ++ "return_type" : "type-593", + "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h", +- "template_args" : [ "type-544", "type-106" ] ++ "template_args" : [ "type-542", "type-105" ] + }, + { + "access" : "protected", +@@ -16266,13 +16450,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-273" ++ "referenced_type" : "type-272" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16283,14 +16467,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16301,13 +16485,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-247" ++ "referenced_type" : "type-246" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16317,16 +16501,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-214" ++ "referenced_type" : "type-213" + }, + { +- "referenced_type" : "type-214" ++ "referenced_type" : "type-213" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16336,16 +16520,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + }, + { +- "referenced_type" : "type-214" ++ "referenced_type" : "type-213" + }, + { +- "referenced_type" : "type-214" ++ "referenced_type" : "type-213" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16355,10 +16539,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16368,10 +16552,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16381,10 +16565,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-194" ++ "referenced_type" : "type-193" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16396,14 +16580,14 @@ + "referenced_type" : "type-33" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-309", ++ "return_type" : "type-308", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h" + }, + { +@@ -16418,19 +16602,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-849" ++ "referenced_type" : "type-845" + }, + { +- "referenced_type" : "type-849" ++ "referenced_type" : "type-845" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { + "function_name" : "android::hardware::details::getVndkVersionStr", + "linker_set_key" : "_ZN7android8hardware7details17getVndkVersionStrEv", +- "return_type" : "type-686", ++ "return_type" : "type-684", + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, + { +@@ -16439,18 +16623,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1048" ++ "referenced_type" : "type-1045" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-575", ++ "return_type" : "type-573", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-873", "type-552", "type-106", "type-106" ] ++ "template_args" : [ "type-870", "type-548", "type-105", "type-105" ] + }, + { + "function_name" : "android::hardware::details::getServiceInternal", +@@ -16458,18 +16642,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1115" ++ "referenced_type" : "type-1112" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-590", ++ "return_type" : "type-588", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-864", "type-541", "type-106", "type-106" ] ++ "template_args" : [ "type-861", "type-539", "type-105", "type-105" ] + }, + { + "function_name" : "android::hardware::details::getServiceInternal", +@@ -16477,18 +16661,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1176" ++ "referenced_type" : "type-1173" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-580", ++ "return_type" : "type-578", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-881", "type-562", "type-106", "type-106" ] ++ "template_args" : [ "type-878", "type-560", "type-105", "type-105" ] + }, + { + "function_name" : "android::hardware::details::getServiceInternal", +@@ -16496,18 +16680,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1235" ++ "referenced_type" : "type-1232" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-595", ++ "return_type" : "type-593", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-890", "type-544", "type-106", "type-106" ] ++ "template_args" : [ "type-887", "type-542", "type-105", "type-105" ] + }, + { + "function_name" : "android::hardware::details::getServiceInternal", +@@ -16515,29 +16699,29 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1314" ++ "referenced_type" : "type-1311" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-585", ++ "return_type" : "type-583", + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h", +- "template_args" : [ "type-774", "type-565", "type-106", "type-106" ] ++ "template_args" : [ "type-770", "type-563", "type-105", "type-105" ] + }, + { + "function_name" : "android::hardware::details::getBnConstructorMap", + "linker_set_key" : "_ZN7android8hardware7details19getBnConstructorMapEv", +- "return_type" : "type-926", ++ "return_type" : "type-923", + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, + { + "function_name" : "android::hardware::details::getBsConstructorMap", + "linker_set_key" : "_ZN7android8hardware7details19getBsConstructorMapEv", +- "return_type" : "type-927", ++ "return_type" : "type-924", + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, + { +@@ -16546,19 +16730,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-849" ++ "referenced_type" : "type-845" + }, + { +- "referenced_type" : "type-849" ++ "referenced_type" : "type-845" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-356", ++ "return_type" : "type-355", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { +@@ -16567,10 +16751,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-356" ++ "referenced_type" : "type-355" + } + ], +- "return_type" : "type-356", ++ "return_type" : "type-355", + "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h" + }, + { +@@ -16579,10 +16763,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-849" ++ "referenced_type" : "type-845" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, + { +@@ -16591,10 +16775,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-460" ++ "referenced_type" : "type-458" + }, + { +- "referenced_type" : "type-849" ++ "referenced_type" : "type-845" + } + ], + "return_type" : "type-19", +@@ -16608,16 +16792,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2355" ++ "referenced_type" : "type-2350" + }, + { +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "default_arg" : true, +@@ -16625,7 +16809,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-2793" ++ "referenced_type" : "type-2787" + } + ], + "return_type" : "type-19", +@@ -16638,14 +16822,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + }, + { +- "referenced_type" : "type-2358" ++ "referenced_type" : "type-2353" + }, + { + "default_arg" : true, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "default_arg" : true, +@@ -16662,10 +16846,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], +- "return_type" : "type-2332", ++ "return_type" : "type-2327", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16675,22 +16859,22 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-2345" ++ "referenced_type" : "type-2340" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16700,13 +16884,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16716,14 +16900,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + }, + { +- "referenced_type" : "type-2360" ++ "referenced_type" : "type-2355" + }, + { + "default_arg" : true, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "default_arg" : true, +@@ -16731,7 +16915,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-949" ++ "referenced_type" : "type-946" + } + ], + "return_type" : "type-19", +@@ -16744,10 +16928,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16758,13 +16942,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16775,10 +16959,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], +- "return_type" : "type-2363", ++ "return_type" : "type-2358", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16788,7 +16972,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], + "return_type" : "type-19", +@@ -16801,7 +16985,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], + "return_type" : "type-19", +@@ -16814,16 +16998,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2355" ++ "referenced_type" : "type-2350" + }, + { +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "default_arg" : true, +@@ -16831,7 +17015,7 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-2794" ++ "referenced_type" : "type-2788" + } + ], + "return_type" : "type-19", +@@ -16844,10 +17028,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16857,10 +17041,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16871,10 +17055,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16885,10 +17069,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16899,10 +17083,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2332" ++ "referenced_type" : "type-2327" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -16911,13 +17095,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2476" ++ "referenced_type" : "type-2471" + }, + { +- "referenced_type" : "type-3888" ++ "referenced_type" : "type-3881" + } + ], +- "return_type" : "type-2476", ++ "return_type" : "type-2471", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -16926,13 +17110,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2476" ++ "referenced_type" : "type-2471" + }, + { +- "referenced_type" : "type-3887" ++ "referenced_type" : "type-3880" + } + ], +- "return_type" : "type-2476", ++ "return_type" : "type-2471", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { +@@ -16941,13 +17125,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-119" ++ "referenced_type" : "type-118" + }, + { +- "referenced_type" : "type-112" ++ "referenced_type" : "type-111" + } + ], +- "return_type" : "type-119", ++ "return_type" : "type-118", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -16956,469 +17140,1697 @@ + "parameters" : + [ + { +- "referenced_type" : "type-264" ++ "referenced_type" : "type-263" + }, + { +- "referenced_type" : "type-168" ++ "referenced_type" : "type-167" + } + ], +- "return_type" : "type-264", ++ "return_type" : "type-263", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +- "function_name" : "android::hardware::BpHwBinder::findObject", +- "linker_set_key" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_compare", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_compareEPKvSA_", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2373" ++ "referenced_type" : "type-3821" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-245", +- "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" ++ "return_type" : "type-19", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::BpHwBinder::ObjectManager::find", +- "linker_set_key" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_destroy", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_destroyEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2426" ++ "referenced_type" : "type-3821" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-245", +- "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::hidl_handle::getNativeHandle", +- "linker_set_key" : "_ZNK7android8hardware11hidl_handle15getNativeHandleEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_construct", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE12do_constructEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-95" ++ "referenced_type" : "type-3821" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-16", +- "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::hidl_handle::operator const native_handle *", +- "linker_set_key" : "_ZNK7android8hardware11hidl_handlecvPK13native_handleEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_move_forward", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE15do_move_forwardEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-95" ++ "referenced_type" : "type-3821" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-16", +- "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::hidl_handle::operator->", +- "linker_set_key" : "_ZNK7android8hardware11hidl_handleptEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_move_backward", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE16do_move_backwardEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-95" ++ "referenced_type" : "type-3821" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-16", +- "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::hidl_string::size", +- "linker_set_key" : "_ZNK7android8hardware11hidl_string4sizeEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_copy", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE7do_copyEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-117" ++ "referenced_type" : "type-3821" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-1", +- "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::hidl_string::c_str", +- "linker_set_key" : "_ZNK7android8hardware11hidl_string5c_strEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector > >::do_splat", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE8do_splatEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-117" ++ "referenced_type" : "type-3821" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-99", +- "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::hidl_string::empty", +- "linker_set_key" : "_ZNK7android8hardware11hidl_string5emptyEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_compare", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_compareES3_S3_", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-117" ++ "referenced_type" : "type-2404" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-44", +- "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ "return_type" : "type-19", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::hidl_string::operator basic_string", +- "linker_set_key" : "_ZNK7android8hardware11hidl_stringcvNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_destroy", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_destroyEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-117" ++ "referenced_type" : "type-2404" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-700", +- "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::ProcessState::isContextManager", +- "linker_set_key" : "_ZNK7android8hardware12ProcessState16isContextManagerEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_construct", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE12do_constructEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3847" ++ "referenced_type" : "type-2404" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-44", +- "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::IPCThreadState::getCallingPid", +- "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_move_forward", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE15do_move_forwardEPvS3_j", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3641" ++ "referenced_type" : "type-2404" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::IPCThreadState::getCallingSid", +- "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_move_backward", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE16do_move_backwardEPvS3_j", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3641" ++ "referenced_type" : "type-2404" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-99", +- "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::IPCThreadState::getCallingUid", +- "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_copy", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE7do_copyEPvS3_j", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3641" ++ "referenced_type" : "type-2404" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-1", +- "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::IPCThreadState::isServingCall", +- "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv", ++ "access" : "protected", ++ "function_name" : "android::SortedVector >::do_splat", ++ "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE8do_splatEPvS3_j", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3641" ++ "referenced_type" : "type-2404" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-44", +- "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, + { +- "function_name" : "android::hardware::IPCThreadState::getStrictModePolicy", +- "linker_set_key" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv", ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE10do_destroyEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3641" ++ "referenced_type" : "type-2516" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::IPCThreadState::getLastTransactionBinderFlags", +- "linker_set_key" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv", ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE12do_constructEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3641" ++ "referenced_type" : "type-2516" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "access" : "private", +- "function_name" : "android::hardware::BufferedTextOutput::getBuffer", +- "linker_set_key" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv", ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2511" ++ "referenced_type" : "type-2516" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-2471", +- "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::clearCache", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10clearCacheEv", ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-2516" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::errorCheck", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10errorCheckEv", ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-2516" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::findBuffer", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_", ++ "access" : "protected", ++ "function_name" : "android::Vector >::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-2516" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-1" ++ "referenced_type" : "type-138" + }, + { +- "referenced_type" : "type-3779" ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE10do_destroyEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2409" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::ipcObjects", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10ipcObjectsEv", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE12do_constructEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-2409" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-1", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::readBuffer", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE15do_move_forwardEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-2409" + }, + { +- "referenced_type" : "type-1" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-138" + }, + { +- "referenced_type" : "type-3783" ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::readBuffer", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE16do_move_backwardEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-2409" + }, + { +- "referenced_type" : "type-1" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-138" + }, + { + "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE7do_copyEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2409" + }, + { +- "referenced_type" : "type-1" ++ "referenced_type" : "type-244" + }, + { +- "referenced_type" : "type-1" ++ "referenced_type" : "type-138" + }, + { +- "referenced_type" : "type-3783" ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::readDouble", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEPd", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE8do_splatEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-2409" + }, + { +- "referenced_type" : "type-3778" ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::readDouble", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEv", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE10do_destroyEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3825" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-4", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::readObject", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE12do_constructEPvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3825" + }, + { +- "default_arg" : true, +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-3782", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-4083" ] ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::readUint16", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint16EPt", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE15do_move_forwardEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3825" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" + }, + { +- "referenced_type" : "type-3775" ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::readUint32", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32EPj", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE16do_move_backwardEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3825" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, + { +- "function_name" : "android::hardware::Parcel::readUint32", +- "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32Ev", ++ "access" : "protected", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE7do_copyEPvPKvj", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" +- } +- ], +- "return_type" : "type-1", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" +- }, +- { +- "function_name" : "android::hardware::Parcel::readUint64", ++ "referenced_type" : "type-3825" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE8do_splatEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3825" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3622" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3622" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3622" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3622" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3622" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3622" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3626" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3626" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3626" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3626" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3626" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3626" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE10do_destroyEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3618" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE12do_constructEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3618" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE15do_move_forwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3618" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE16do_move_backwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3618" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE7do_copyEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3618" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE8do_splatEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3618" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_destroy", ++ "linker_set_key" : "_ZNK7android6VectorIiE10do_destroyEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2511" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_construct", ++ "linker_set_key" : "_ZNK7android6VectorIiE12do_constructEPvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2511" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_forward", ++ "linker_set_key" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2511" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_move_backward", ++ "linker_set_key" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2511" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_copy", ++ "linker_set_key" : "_ZNK7android6VectorIiE7do_copyEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2511" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "access" : "protected", ++ "function_name" : "android::Vector::do_splat", ++ "linker_set_key" : "_ZNK7android6VectorIiE8do_splatEPvPKvj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2511" ++ }, ++ { ++ "referenced_type" : "type-244" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/core/libutils/include/utils/Vector.h" ++ }, ++ { ++ "function_name" : "android::hardware::BpHwBinder::findObject", ++ "linker_set_key" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2368" ++ }, ++ { ++ "referenced_type" : "type-138" ++ } ++ ], ++ "return_type" : "type-244", ++ "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" ++ }, ++ { ++ "function_name" : "android::hardware::BpHwBinder::ObjectManager::find", ++ "linker_set_key" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2421" ++ }, ++ { ++ "referenced_type" : "type-138" ++ } ++ ], ++ "return_type" : "type-244", ++ "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" ++ }, ++ { ++ "function_name" : "android::hardware::hidl_handle::getNativeHandle", ++ "linker_set_key" : "_ZNK7android8hardware11hidl_handle15getNativeHandleEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-94" ++ } ++ ], ++ "return_type" : "type-16", ++ "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ }, ++ { ++ "function_name" : "android::hardware::hidl_handle::operator const native_handle *", ++ "linker_set_key" : "_ZNK7android8hardware11hidl_handlecvPK13native_handleEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-94" ++ } ++ ], ++ "return_type" : "type-16", ++ "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ }, ++ { ++ "function_name" : "android::hardware::hidl_handle::operator->", ++ "linker_set_key" : "_ZNK7android8hardware11hidl_handleptEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-94" ++ } ++ ], ++ "return_type" : "type-16", ++ "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ }, ++ { ++ "function_name" : "android::hardware::hidl_string::size", ++ "linker_set_key" : "_ZNK7android8hardware11hidl_string4sizeEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-116" ++ } ++ ], ++ "return_type" : "type-1", ++ "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ }, ++ { ++ "function_name" : "android::hardware::hidl_string::c_str", ++ "linker_set_key" : "_ZNK7android8hardware11hidl_string5c_strEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-116" ++ } ++ ], ++ "return_type" : "type-98", ++ "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ }, ++ { ++ "function_name" : "android::hardware::hidl_string::empty", ++ "linker_set_key" : "_ZNK7android8hardware11hidl_string5emptyEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-116" ++ } ++ ], ++ "return_type" : "type-43", ++ "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ }, ++ { ++ "function_name" : "android::hardware::hidl_string::operator basic_string", ++ "linker_set_key" : "_ZNK7android8hardware11hidl_stringcvNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-116" ++ } ++ ], ++ "return_type" : "type-698", ++ "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" ++ }, ++ { ++ "function_name" : "android::hardware::ProcessState::isContextManager", ++ "linker_set_key" : "_ZNK7android8hardware12ProcessState16isContextManagerEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3840" ++ } ++ ], ++ "return_type" : "type-43", ++ "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" ++ }, ++ { ++ "function_name" : "android::hardware::IPCThreadState::getCallingPid", ++ "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3634" ++ } ++ ], ++ "return_type" : "type-19", ++ "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ }, ++ { ++ "function_name" : "android::hardware::IPCThreadState::getCallingSid", ++ "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3634" ++ } ++ ], ++ "return_type" : "type-98", ++ "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ }, ++ { ++ "function_name" : "android::hardware::IPCThreadState::getCallingUid", ++ "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3634" ++ } ++ ], ++ "return_type" : "type-1", ++ "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ }, ++ { ++ "function_name" : "android::hardware::IPCThreadState::isServingCall", ++ "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3634" ++ } ++ ], ++ "return_type" : "type-43", ++ "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ }, ++ { ++ "function_name" : "android::hardware::IPCThreadState::getStrictModePolicy", ++ "linker_set_key" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3634" ++ } ++ ], ++ "return_type" : "type-19", ++ "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ }, ++ { ++ "function_name" : "android::hardware::IPCThreadState::getLastTransactionBinderFlags", ++ "linker_set_key" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3634" ++ } ++ ], ++ "return_type" : "type-19", ++ "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" ++ }, ++ { ++ "access" : "private", ++ "function_name" : "android::hardware::BufferedTextOutput::getBuffer", ++ "linker_set_key" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-2506" ++ } ++ ], ++ "return_type" : "type-2466", ++ "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" ++ }, ++ { ++ "access" : "private", ++ "function_name" : "android::hardware::Parcel::clearCache", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10clearCacheEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3759" ++ } ++ ], ++ "return_type" : "type-105", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::errorCheck", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10errorCheckEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3759" ++ } ++ ], ++ "return_type" : "type-19", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::findBuffer", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3759" ++ }, ++ { ++ "referenced_type" : "type-138" ++ }, ++ { ++ "referenced_type" : "type-1" ++ }, ++ { ++ "referenced_type" : "type-3772" ++ }, ++ { ++ "referenced_type" : "type-1038" ++ }, ++ { ++ "referenced_type" : "type-1038" ++ } ++ ], ++ "return_type" : "type-19", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "access" : "private", ++ "function_name" : "android::hardware::Parcel::ipcObjects", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10ipcObjectsEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3759" ++ } ++ ], ++ "return_type" : "type-1", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::readBuffer", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3759" ++ }, ++ { ++ "referenced_type" : "type-1" ++ }, ++ { ++ "referenced_type" : "type-1038" ++ }, ++ { ++ "referenced_type" : "type-3776" ++ } ++ ], ++ "return_type" : "type-19", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "access" : "private", ++ "function_name" : "android::hardware::Parcel::readBuffer", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3759" ++ }, ++ { ++ "referenced_type" : "type-1" ++ }, ++ { ++ "referenced_type" : "type-1038" ++ }, ++ { ++ "referenced_type" : "type-1" ++ }, ++ { ++ "referenced_type" : "type-1" ++ }, ++ { ++ "referenced_type" : "type-1" ++ }, ++ { ++ "referenced_type" : "type-3776" ++ } ++ ], ++ "return_type" : "type-19", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::readDouble", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEPd", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3759" ++ }, ++ { ++ "referenced_type" : "type-3771" ++ } ++ ], ++ "return_type" : "type-19", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::readDouble", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEv", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3759" ++ } ++ ], ++ "return_type" : "type-4", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::readObject", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3759" ++ }, ++ { ++ "default_arg" : true, ++ "referenced_type" : "type-1038" ++ } ++ ], ++ "return_type" : "type-3775", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", ++ "template_args" : [ "type-4075" ] ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::readUint16", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint16EPt", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3759" ++ }, ++ { ++ "referenced_type" : "type-3768" ++ } ++ ], ++ "return_type" : "type-19", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::readUint32", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32EPj", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3759" ++ }, ++ { ++ "referenced_type" : "type-1038" ++ } ++ ], ++ "return_type" : "type-19", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::readUint32", ++ "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32Ev", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3759" ++ } ++ ], ++ "return_type" : "type-1", ++ "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" ++ }, ++ { ++ "function_name" : "android::hardware::Parcel::readUint64", + "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64EPy", + "parameters" : + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-2350" ++ "referenced_type" : "type-2345" + } + ], + "return_type" : "type-19", +@@ -17431,7 +18843,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], + "return_type" : "type-21", +@@ -17445,10 +18857,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17459,7 +18871,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], + "return_type" : "type-1", +@@ -17472,10 +18884,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], +- "return_type" : "type-99", ++ "return_type" : "type-98", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17485,13 +18897,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-139", ++ "return_type" : "type-138", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17502,10 +18914,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + } + ], + "return_type" : "type-19", +@@ -17519,7 +18931,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], + "return_type" : "type-1", +@@ -17533,10 +18945,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17546,7 +18958,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], + "return_type" : "type-1", +@@ -17559,7 +18971,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], + "return_type" : "type-1", +@@ -17572,7 +18984,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], + "return_type" : "type-1", +@@ -17585,10 +18997,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-352" ++ "referenced_type" : "type-351" + } + ], + "return_type" : "type-19", +@@ -17601,10 +19013,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-3780" ++ "referenced_type" : "type-3773" + } + ], + "return_type" : "type-19", +@@ -17617,10 +19029,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], +- "return_type" : "type-342", ++ "return_type" : "type-341", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17631,7 +19043,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], + "return_type" : "type-1", +@@ -17644,16 +19056,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-3783" ++ "referenced_type" : "type-3776" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + }, + { +- "referenced_type" : "type-3779" ++ "referenced_type" : "type-3772" + } + ], + "return_type" : "type-19", +@@ -17666,10 +19078,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], +- "return_type" : "type-2382", ++ "return_type" : "type-2377", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17680,7 +19092,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], + "return_type" : "type-1", +@@ -17693,13 +19105,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + } + ], + "return_type" : "type-19", +@@ -17712,13 +19124,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17728,13 +19140,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17744,10 +19156,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-482" ++ "referenced_type" : "type-480" + } + ], + "return_type" : "type-19", +@@ -17760,10 +19172,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], +- "return_type" : "type-71", ++ "return_type" : "type-70", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17773,13 +19185,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + }, + { + "referenced_type" : "type-1" +@@ -17788,7 +19200,7 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-3783" ++ "referenced_type" : "type-3776" + } + ], + "return_type" : "type-19", +@@ -17801,16 +19213,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + }, + { +- "referenced_type" : "type-3783" ++ "referenced_type" : "type-3776" + } + ], + "return_type" : "type-19", +@@ -17824,10 +19236,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-3787" ++ "referenced_type" : "type-3780" + }, + { + "referenced_type" : "type-1" +@@ -17842,7 +19254,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17852,13 +19264,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + } + ], +- "return_type" : "type-343", ++ "return_type" : "type-342", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17869,7 +19281,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { + "referenced_type" : "type-1" +@@ -17878,7 +19290,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17889,7 +19301,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { + "referenced_type" : "type-1" +@@ -17898,7 +19310,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -17908,13 +19320,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-3783" ++ "referenced_type" : "type-3776" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + }, + { + "referenced_type" : "type-1" +@@ -17923,7 +19335,7 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-3779" ++ "referenced_type" : "type-3772" + } + ], + "return_type" : "type-19", +@@ -17936,10 +19348,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-3784" ++ "referenced_type" : "type-3777" + } + ], + "return_type" : "type-19", +@@ -17952,7 +19364,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { + "referenced_type" : "type-1" +@@ -17961,7 +19373,7 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-3784" ++ "referenced_type" : "type-3777" + } + ], + "return_type" : "type-19", +@@ -17974,10 +19386,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-482" ++ "referenced_type" : "type-480" + } + ], + "return_type" : "type-19", +@@ -17990,13 +19402,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + }, + { + "referenced_type" : "type-1" +@@ -18005,7 +19417,7 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-3783" ++ "referenced_type" : "type-3776" + } + ], + "return_type" : "type-19", +@@ -18018,10 +19430,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-3784" ++ "referenced_type" : "type-3777" + } + ], + "return_type" : "type-19", +@@ -18035,13 +19447,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-3784" ++ "referenced_type" : "type-3777" + }, + { +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "default_arg" : true, +@@ -18062,7 +19474,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { + "referenced_type" : "type-1" +@@ -18071,7 +19483,7 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-3784" ++ "referenced_type" : "type-3777" + } + ], + "return_type" : "type-19", +@@ -18084,10 +19496,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], +- "return_type" : "type-1030", ++ "return_type" : "type-1027", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -18097,10 +19509,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "referenced_type" : "type-1" +@@ -18116,17 +19528,17 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-2476" ++ "referenced_type" : "type-2471" + }, + { + "default_arg" : true, + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -18137,7 +19549,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], + "return_type" : "type-1", +@@ -18151,10 +19563,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], +- "return_type" : "type-2353", ++ "return_type" : "type-2348", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -18164,7 +19576,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], + "return_type" : "type-1", +@@ -18177,10 +19589,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-3779" ++ "referenced_type" : "type-3772" + } + ], + "return_type" : "type-19", +@@ -18193,10 +19605,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -18206,10 +19618,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-3773" ++ "referenced_type" : "type-3766" + } + ], + "return_type" : "type-19", +@@ -18222,7 +19634,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], + "return_type" : "type-1", +@@ -18235,10 +19647,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-3777" ++ "referenced_type" : "type-3770" + } + ], + "return_type" : "type-19", +@@ -18251,10 +19663,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], +- "return_type" : "type-298", ++ "return_type" : "type-297", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, + { +@@ -18264,10 +19676,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-3774" ++ "referenced_type" : "type-3767" + } + ], + "return_type" : "type-19", +@@ -18280,10 +19692,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-521" ++ "referenced_type" : "type-519" + } + ], + "return_type" : "type-19", +@@ -18296,7 +19708,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], + "return_type" : "type-19", +@@ -18309,10 +19721,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-3776" ++ "referenced_type" : "type-3769" + } + ], + "return_type" : "type-19", +@@ -18325,7 +19737,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + } + ], + "return_type" : "type-447", +@@ -18338,10 +19750,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3759" + }, + { +- "referenced_type" : "type-291" ++ "referenced_type" : "type-290" + } + ], + "return_type" : "type-19", +@@ -18354,10 +19766,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-171" ++ "referenced_type" : "type-170" + } + ], +- "return_type" : "type-701", ++ "return_type" : "type-699", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -18367,13 +19779,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2331" ++ "referenced_type" : "type-2326" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, + { +@@ -18383,10 +19795,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-175" ++ "referenced_type" : "type-174" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, + { +@@ -18396,13 +19808,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2362" ++ "referenced_type" : "type-2357" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-245", ++ "return_type" : "type-244", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -18413,10 +19825,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -18427,10 +19839,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2364" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -18441,13 +19853,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -18458,13 +19870,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2364" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -18475,16 +19887,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2335" ++ "referenced_type" : "type-2330" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, + { +@@ -18495,16 +19907,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2364" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + } + ], +- "return_type" : "type-44", ++ "return_type" : "type-43", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -18516,7 +19928,7 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1041" ++ "referenced_type" : "type-1038" + } + ], + "return_type" : "type-19", +@@ -18531,7 +19943,7 @@ + "referenced_type" : "type-19" + }, + { +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { + "referenced_type" : "type-1" +@@ -18550,18 +19962,18 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "default_arg" : true, +- "referenced_type" : "type-2542" ++ "referenced_type" : "type-2537" + }, + { + "default_arg" : true, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h" + }, + { +@@ -18574,14 +19986,14 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-2542" ++ "referenced_type" : "type-2537" + }, + { + "default_arg" : true, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], +- "return_type" : "type-106", ++ "return_type" : "type-105", + "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h" + }, + { +@@ -18593,7 +20005,7 @@ + "referenced_type" : "type-19" + } + ], +- "return_type" : "type-99", ++ "return_type" : "type-98", + "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h" + } + ], +@@ -18602,115 +20014,115 @@ + { + "linker_set_key" : "_ZN7android4hidl4base4V1_05IBase10descriptorE", + "name" : "android::hidl::base::V1_0::IBase::descriptor", +- "referenced_type" : "type-99", ++ "referenced_type" : "type-98", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h" + }, + { + "linker_set_key" : "_ZN7android4hidl7manager4V1_015IServiceManager10descriptorE", + "name" : "android::hidl::manager::V1_0::IServiceManager::descriptor", +- "referenced_type" : "type-99", ++ "referenced_type" : "type-98", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, + { + "linker_set_key" : "_ZN7android4hidl7manager4V1_020IServiceNotification10descriptorE", + "name" : "android::hidl::manager::V1_0::IServiceNotification::descriptor", +- "referenced_type" : "type-99", ++ "referenced_type" : "type-98", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, + { + "linker_set_key" : "_ZN7android4hidl7manager4V1_115IServiceManager10descriptorE", + "name" : "android::hidl::manager::V1_1::IServiceManager::descriptor", +- "referenced_type" : "type-99", ++ "referenced_type" : "type-98", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, + { + "linker_set_key" : "_ZN7android4hidl7manager4V1_215IClientCallback10descriptorE", + "name" : "android::hidl::manager::V1_2::IClientCallback::descriptor", +- "referenced_type" : "type-99", ++ "referenced_type" : "type-98", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, + { + "linker_set_key" : "_ZN7android4hidl7manager4V1_215IServiceManager10descriptorE", + "name" : "android::hidl::manager::V1_2::IServiceManager::descriptor", +- "referenced_type" : "type-99", ++ "referenced_type" : "type-98", + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, + { + "linker_set_key" : "_ZN7android8hardware11hidl_handle21kOffsetOfNativeHandleE", + "name" : "android::hardware::hidl_handle::kOffsetOfNativeHandle", +- "referenced_type" : "type-246", ++ "referenced_type" : "type-245", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "_ZN7android8hardware11hidl_memory13kOffsetOfNameE", + "name" : "android::hardware::hidl_memory::kOffsetOfName", +- "referenced_type" : "type-246", ++ "referenced_type" : "type-245", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "_ZN7android8hardware11hidl_memory15kOffsetOfHandleE", + "name" : "android::hardware::hidl_memory::kOffsetOfHandle", +- "referenced_type" : "type-246", ++ "referenced_type" : "type-245", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "_ZN7android8hardware11hidl_string15kOffsetOfBufferE", + "name" : "android::hardware::hidl_string::kOffsetOfBuffer", +- "referenced_type" : "type-246", ++ "referenced_type" : "type-245", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "_ZN7android8hardware12gTextBuffersE", + "name" : "android::hardware::gTextBuffers", +- "referenced_type" : "type-2514", ++ "referenced_type" : "type-2509", + "source_file" : "/system/libhwbinder/include/hwbinder/Static.h" + }, + { + "linker_set_key" : "_ZN7android8hardware13gProcessMutexE", + "name" : "android::hardware::gProcessMutex", +- "referenced_type" : "type-440", ++ "referenced_type" : "type-438", + "source_file" : "/system/libhwbinder/include/hwbinder/Static.h" + }, + { + "linker_set_key" : "_ZN7android8hardware4aerrE", + "name" : "android::hardware::aerr", +- "referenced_type" : "type-2476", ++ "referenced_type" : "type-2471", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { + "linker_set_key" : "_ZN7android8hardware4alogE", + "name" : "android::hardware::alog", +- "referenced_type" : "type-2476", ++ "referenced_type" : "type-2471", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { + "linker_set_key" : "_ZN7android8hardware4aoutE", + "name" : "android::hardware::aout", +- "referenced_type" : "type-2476", ++ "referenced_type" : "type-2471", + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { + "linker_set_key" : "_ZN7android8hardware7details14gServiceSidMapE", + "name" : "android::hardware::details::gServiceSidMap", +- "referenced_type" : "type-703", ++ "referenced_type" : "type-701", + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, + { + "linker_set_key" : "_ZN7android8hardware7details15gServicePrioMapE", + "name" : "android::hardware::details::gServicePrioMap", +- "referenced_type" : "type-704", ++ "referenced_type" : "type-702", + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, + { + "linker_set_key" : "_ZN7android8hardware7details6gBnMapE", + "name" : "android::hardware::details::gBnMap", +- "referenced_type" : "type-412", ++ "referenced_type" : "type-410", + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, + { + "linker_set_key" : "_ZN7android8hardware8gProcessE", + "name" : "android::hardware::gProcess", +- "referenced_type" : "type-2795", ++ "referenced_type" : "type-2789", + "source_file" : "/system/libhwbinder/include/hwbinder/Static.h" + } + ], +@@ -18720,8 +20132,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Mutex &", + "name" : "android::Mutex &", +- "referenced_type" : "type-436", +- "self_type" : "type-440", ++ "referenced_type" : "type-433", ++ "self_type" : "type-438", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Mutex.h" + }, +@@ -18729,8 +20141,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RWLock &", + "name" : "android::RWLock &", +- "referenced_type" : "type-448", +- "self_type" : "type-452", ++ "referenced_type" : "type-444", ++ "self_type" : "type-450", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RWLock.h" + }, +@@ -18738,8 +20150,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase *const &", + "name" : "android::RefBase *const &", +- "referenced_type" : "type-3611", +- "self_type" : "type-3634", ++ "referenced_type" : "type-3604", ++ "self_type" : "type-3627", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -18747,8 +20159,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_type *const &", + "name" : "android::RefBase::weakref_type *const &", +- "referenced_type" : "type-3609", +- "self_type" : "type-3630", ++ "referenced_type" : "type-3602", ++ "self_type" : "type-3623", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -18756,8 +20168,8 @@ + "alignment" : 4, + "linker_set_key" : "android::String16 &", + "name" : "android::String16 &", +- "referenced_type" : "type-342", +- "self_type" : "type-351", ++ "referenced_type" : "type-341", ++ "self_type" : "type-350", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String16.h" + }, +@@ -18765,8 +20177,8 @@ + "alignment" : 4, + "linker_set_key" : "android::String8 &", + "name" : "android::String8 &", +- "referenced_type" : "type-221", +- "self_type" : "type-226", ++ "referenced_type" : "type-220", ++ "self_type" : "type-225", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String8.h" + }, +@@ -18774,8 +20186,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *const &", + "name" : "android::hardware::BHwBinder *const &", +- "referenced_type" : "type-3607", +- "self_type" : "type-3626", ++ "referenced_type" : "type-3600", ++ "self_type" : "type-3619", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -18784,7 +20196,7 @@ + "linker_set_key" : "android::hardware::ConcurrentMap, android::hardware::details::SchedPrio> &", + "name" : "android::hardware::ConcurrentMap, android::hardware::details::SchedPrio> &", + "referenced_type" : "type-29", +- "self_type" : "type-49", ++ "self_type" : "type-48", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -18792,8 +20204,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ConcurrentMap, bool> &", + "name" : "android::hardware::ConcurrentMap, bool> &", +- "referenced_type" : "type-41", +- "self_type" : "type-52", ++ "referenced_type" : "type-40", ++ "self_type" : "type-51", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -18801,8 +20213,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > &", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > &", +- "referenced_type" : "type-635", +- "self_type" : "type-927", ++ "referenced_type" : "type-633", ++ "self_type" : "type-924", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, +@@ -18810,8 +20222,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > &", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > &", +- "referenced_type" : "type-398", +- "self_type" : "type-926", ++ "referenced_type" : "type-396", ++ "self_type" : "type-923", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/Static.h" + }, +@@ -18819,8 +20231,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::HexDump &", + "name" : "android::hardware::HexDump &", +- "referenced_type" : "type-2486", +- "self_type" : "type-2488", ++ "referenced_type" : "type-2481", ++ "self_type" : "type-2483", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -18828,8 +20240,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel &", + "name" : "android::hardware::Parcel &", +- "referenced_type" : "type-1376", +- "self_type" : "type-1375", ++ "referenced_type" : "type-1373", ++ "self_type" : "type-1372", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -18837,8 +20249,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel &", + "name" : "android::hardware::Parcel &", +- "referenced_type" : "type-2577", +- "self_type" : "type-2576", ++ "referenced_type" : "type-2572", ++ "self_type" : "type-2571", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -18846,8 +20258,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel &", + "name" : "android::hardware::Parcel &", +- "referenced_type" : "type-374", +- "self_type" : "type-373", ++ "referenced_type" : "type-373", ++ "self_type" : "type-372", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -18855,8 +20267,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel &", + "name" : "android::hardware::Parcel &", +- "referenced_type" : "type-3921", +- "self_type" : "type-3920", ++ "referenced_type" : "type-3914", ++ "self_type" : "type-3913", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -18864,8 +20276,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState::handle_entry &", + "name" : "android::hardware::ProcessState::handle_entry &", +- "referenced_type" : "type-2416", +- "self_type" : "type-3833", ++ "referenced_type" : "type-2411", ++ "self_type" : "type-3826", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -18873,8 +20285,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return &", + "name" : "android::hardware::Return &", +- "referenced_type" : "type-807", +- "self_type" : "type-810", ++ "referenced_type" : "type-804", ++ "self_type" : "type-807", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18882,8 +20294,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-801", +- "self_type" : "type-804", ++ "referenced_type" : "type-798", ++ "self_type" : "type-801", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18891,8 +20303,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-986", +- "self_type" : "type-989", ++ "referenced_type" : "type-983", ++ "self_type" : "type-986", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18900,8 +20312,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-1093", +- "self_type" : "type-1096", ++ "referenced_type" : "type-1090", ++ "self_type" : "type-1093", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18909,8 +20321,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-1153", +- "self_type" : "type-1156", ++ "referenced_type" : "type-1150", ++ "self_type" : "type-1153", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18918,8 +20330,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-1213", +- "self_type" : "type-1216", ++ "referenced_type" : "type-1210", ++ "self_type" : "type-1213", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18927,8 +20339,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &", + "name" : "android::hardware::Return > &", +- "referenced_type" : "type-1284", +- "self_type" : "type-1287", ++ "referenced_type" : "type-1281", ++ "self_type" : "type-1284", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18936,8 +20348,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return &", + "name" : "android::hardware::Return &", +- "referenced_type" : "type-309", +- "self_type" : "type-312", ++ "referenced_type" : "type-308", ++ "self_type" : "type-311", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18945,8 +20357,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return &", + "name" : "android::hardware::Return &", +- "referenced_type" : "type-102", +- "self_type" : "type-179", ++ "referenced_type" : "type-101", ++ "self_type" : "type-178", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18954,8 +20366,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Status &", + "name" : "android::hardware::Status &", +- "referenced_type" : "type-104", +- "self_type" : "type-170", ++ "referenced_type" : "type-103", ++ "self_type" : "type-169", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -18963,8 +20375,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-2378", +- "self_type" : "type-2377", ++ "referenced_type" : "type-2373", ++ "self_type" : "type-2372", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -18972,8 +20384,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-2429", +- "self_type" : "type-2428", ++ "referenced_type" : "type-2424", ++ "self_type" : "type-2423", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -18981,8 +20393,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-2474", +- "self_type" : "type-2476", ++ "referenced_type" : "type-2469", ++ "self_type" : "type-2471", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -18990,8 +20402,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-3484", +- "self_type" : "type-3483", ++ "referenced_type" : "type-3477", ++ "self_type" : "type-3476", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -18999,8 +20411,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-3535", +- "self_type" : "type-3534", ++ "referenced_type" : "type-3528", ++ "self_type" : "type-3527", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -19008,8 +20420,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput &", + "name" : "android::hardware::TextOutput &", +- "referenced_type" : "type-3843", +- "self_type" : "type-3842", ++ "referenced_type" : "type-3836", ++ "self_type" : "type-3835", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -19017,8 +20429,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer > &", + "name" : "android::hardware::details::hidl_pointer > &", +- "referenced_type" : "type-1009", +- "self_type" : "type-1075", ++ "referenced_type" : "type-1006", ++ "self_type" : "type-1071", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19026,8 +20438,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer &", + "name" : "android::hardware::details::hidl_pointer &", +- "referenced_type" : "type-620", +- "self_type" : "type-1071", ++ "referenced_type" : "type-618", ++ "self_type" : "type-1068", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19035,8 +20447,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer &", + "name" : "android::hardware::details::hidl_pointer &", +- "referenced_type" : "type-835", +- "self_type" : "type-852", ++ "referenced_type" : "type-832", ++ "self_type" : "type-848", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19044,8 +20456,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer &", + "name" : "android::hardware::details::hidl_pointer &", +- "referenced_type" : "type-97", +- "self_type" : "type-150", ++ "referenced_type" : "type-96", ++ "self_type" : "type-149", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19054,7 +20466,7 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer &", + "name" : "android::hardware::details::hidl_pointer &", + "referenced_type" : "type-14", +- "self_type" : "type-643", ++ "self_type" : "type-641", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19062,8 +20474,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer &", + "name" : "android::hardware::details::hidl_pointer &", +- "referenced_type" : "type-519", +- "self_type" : "type-823", ++ "referenced_type" : "type-517", ++ "self_type" : "type-820", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19071,8 +20483,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::return_status &", + "name" : "android::hardware::details::return_status &", +- "referenced_type" : "type-103", +- "self_type" : "type-266", ++ "referenced_type" : "type-102", ++ "self_type" : "type-265", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -19080,8 +20492,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_array &", + "name" : "android::hardware::hidl_array &", +- "referenced_type" : "type-1012", +- "self_type" : "type-1078", ++ "referenced_type" : "type-1009", ++ "self_type" : "type-1075", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19089,8 +20501,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_handle &", + "name" : "android::hardware::hidl_handle &", +- "referenced_type" : "type-77", +- "self_type" : "type-88", ++ "referenced_type" : "type-76", ++ "self_type" : "type-87", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19098,8 +20510,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_memory &", + "name" : "android::hardware::hidl_memory &", +- "referenced_type" : "type-121", +- "self_type" : "type-125", ++ "referenced_type" : "type-120", ++ "self_type" : "type-124", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19107,8 +20519,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_string &", + "name" : "android::hardware::hidl_string &", +- "referenced_type" : "type-96", +- "self_type" : "type-118", ++ "referenced_type" : "type-95", ++ "self_type" : "type-117", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19116,8 +20528,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec > &", + "name" : "android::hardware::hidl_vec > &", +- "referenced_type" : "type-1008", +- "self_type" : "type-1018", ++ "referenced_type" : "type-1005", ++ "self_type" : "type-1015", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19125,8 +20537,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec &", + "name" : "android::hardware::hidl_vec &", +- "referenced_type" : "type-619", +- "self_type" : "type-1007", ++ "referenced_type" : "type-617", ++ "self_type" : "type-1004", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19134,8 +20546,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec::iter &", + "name" : "android::hardware::hidl_vec::iter &", +- "referenced_type" : "type-625", +- "self_type" : "type-628", ++ "referenced_type" : "type-622", ++ "self_type" : "type-626", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19143,8 +20555,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec &", + "name" : "android::hardware::hidl_vec &", +- "referenced_type" : "type-518", +- "self_type" : "type-829", ++ "referenced_type" : "type-516", ++ "self_type" : "type-826", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19152,8 +20564,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &", + "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &", +- "referenced_type" : "type-548", +- "self_type" : "type-861", ++ "referenced_type" : "type-546", ++ "self_type" : "type-858", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19161,8 +20573,8 @@ + "alignment" : 4, + "linker_set_key" : "android::key_value_pair_t > &", + "name" : "android::key_value_pair_t > &", +- "referenced_type" : "type-3807", +- "self_type" : "type-3819", ++ "referenced_type" : "type-3800", ++ "self_type" : "type-3812", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -19170,8 +20582,8 @@ + "alignment" : 4, + "linker_set_key" : "android::key_value_pair_t &", + "name" : "android::key_value_pair_t &", +- "referenced_type" : "type-2384", +- "self_type" : "type-2397", ++ "referenced_type" : "type-2379", ++ "self_type" : "type-2392", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -19179,8 +20591,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-472", +- "self_type" : "type-3635", ++ "referenced_type" : "type-470", ++ "self_type" : "type-3628", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19188,8 +20600,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-2470", +- "self_type" : "type-2499", ++ "referenced_type" : "type-2465", ++ "self_type" : "type-2494", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19197,8 +20609,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-71", +- "self_type" : "type-485", ++ "referenced_type" : "type-70", ++ "self_type" : "type-483", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19206,8 +20618,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-491", +- "self_type" : "type-3841", ++ "referenced_type" : "type-489", ++ "self_type" : "type-3834", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19215,8 +20627,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-789", +- "self_type" : "type-793", ++ "referenced_type" : "type-786", ++ "self_type" : "type-789", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19224,8 +20636,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-951", +- "self_type" : "type-984", ++ "referenced_type" : "type-948", ++ "self_type" : "type-980", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19233,8 +20645,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-356", +- "self_type" : "type-660", ++ "referenced_type" : "type-355", ++ "self_type" : "type-658", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19242,8 +20654,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-575", +- "self_type" : "type-976", ++ "referenced_type" : "type-573", ++ "self_type" : "type-973", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19251,8 +20663,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-590", +- "self_type" : "type-979", ++ "referenced_type" : "type-588", ++ "self_type" : "type-976", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19260,8 +20672,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-580", +- "self_type" : "type-771", ++ "referenced_type" : "type-578", ++ "self_type" : "type-768", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19269,8 +20681,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-595", +- "self_type" : "type-1210", ++ "referenced_type" : "type-593", ++ "self_type" : "type-1207", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19278,8 +20690,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &", + "name" : "android::sp &", +- "referenced_type" : "type-585", +- "self_type" : "type-779", ++ "referenced_type" : "type-583", ++ "self_type" : "type-776", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -19287,8 +20699,8 @@ + "alignment" : 4, + "linker_set_key" : "android::wp &", + "name" : "android::wp &", +- "referenced_type" : "type-383", +- "self_type" : "type-471", ++ "referenced_type" : "type-382", ++ "self_type" : "type-469", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -19296,8 +20708,8 @@ + "alignment" : 4, + "linker_set_key" : "android::wp &", + "name" : "android::wp &", +- "referenced_type" : "type-944", +- "self_type" : "type-2404", ++ "referenced_type" : "type-941", ++ "self_type" : "type-2399", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -19305,8 +20717,8 @@ + "alignment" : 4, + "linker_set_key" : "android::wp &", + "name" : "android::wp &", +- "referenced_type" : "type-2382", +- "self_type" : "type-3757", ++ "referenced_type" : "type-2377", ++ "self_type" : "type-3750", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -19315,7 +20727,7 @@ + "linker_set_key" : "android::wp &", + "name" : "android::wp &", + "referenced_type" : "type-32", +- "self_type" : "type-461", ++ "self_type" : "type-459", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -19323,8 +20735,8 @@ + "alignment" : 4, + "linker_set_key" : "char *const &", + "name" : "char *const &", +- "referenced_type" : "type-3790", +- "self_type" : "type-3791", ++ "referenced_type" : "type-3783", ++ "self_type" : "type-3784", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19332,8 +20744,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[10]", + "name" : "char const (&)[10]", +- "referenced_type" : "type-3655", +- "self_type" : "type-3657", ++ "referenced_type" : "type-3648", ++ "self_type" : "type-3650", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19341,8 +20753,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[11]", + "name" : "char const (&)[11]", +- "referenced_type" : "type-3678", +- "self_type" : "type-3680", ++ "referenced_type" : "type-3671", ++ "self_type" : "type-3673", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19350,8 +20762,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[12]", + "name" : "char const (&)[12]", +- "referenced_type" : "type-3652", +- "self_type" : "type-3654", ++ "referenced_type" : "type-3645", ++ "self_type" : "type-3647", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19359,8 +20771,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[13]", + "name" : "char const (&)[13]", +- "referenced_type" : "type-3648", +- "self_type" : "type-3651", ++ "referenced_type" : "type-3641", ++ "self_type" : "type-3644", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19368,8 +20780,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[14]", + "name" : "char const (&)[14]", +- "referenced_type" : "type-3697", +- "self_type" : "type-3699", ++ "referenced_type" : "type-3690", ++ "self_type" : "type-3692", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19377,8 +20789,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[15]", + "name" : "char const (&)[15]", +- "referenced_type" : "type-3795", +- "self_type" : "type-3797", ++ "referenced_type" : "type-3788", ++ "self_type" : "type-3790", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19386,8 +20798,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[16]", + "name" : "char const (&)[16]", +- "referenced_type" : "type-3681", +- "self_type" : "type-3682", ++ "referenced_type" : "type-3674", ++ "self_type" : "type-3675", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19395,8 +20807,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[17]", + "name" : "char const (&)[17]", +- "referenced_type" : "type-3700", +- "self_type" : "type-3702", ++ "referenced_type" : "type-3693", ++ "self_type" : "type-3695", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19404,8 +20816,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[18]", + "name" : "char const (&)[18]", +- "referenced_type" : "type-3684", +- "self_type" : "type-3686", ++ "referenced_type" : "type-3677", ++ "self_type" : "type-3679", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19413,17 +20825,17 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[19]", + "name" : "char const (&)[19]", +- "referenced_type" : "type-3716", +- "self_type" : "type-3718", ++ "referenced_type" : "type-3709", ++ "self_type" : "type-3711", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, + { + "alignment" : 4, + "linker_set_key" : "char const (&)[20]", +- "name" : "char const (&)[20]", +- "referenced_type" : "type-3694", +- "self_type" : "type-3696", ++ "name" : "char const (&)[20]", ++ "referenced_type" : "type-3687", ++ "self_type" : "type-3689", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19431,8 +20843,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[22]", + "name" : "char const (&)[22]", +- "referenced_type" : "type-3719", +- "self_type" : "type-3722", ++ "referenced_type" : "type-3712", ++ "self_type" : "type-3714", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19440,8 +20852,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[25]", + "name" : "char const (&)[25]", +- "referenced_type" : "type-3709", +- "self_type" : "type-3711", ++ "referenced_type" : "type-3702", ++ "self_type" : "type-3704", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19449,8 +20861,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[28]", + "name" : "char const (&)[28]", +- "referenced_type" : "type-3732", +- "self_type" : "type-3734", ++ "referenced_type" : "type-3725", ++ "self_type" : "type-3727", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19458,8 +20870,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[29]", + "name" : "char const (&)[29]", +- "referenced_type" : "type-3706", +- "self_type" : "type-3708", ++ "referenced_type" : "type-3699", ++ "self_type" : "type-3701", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19467,8 +20879,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[2]", + "name" : "char const (&)[2]", +- "referenced_type" : "type-3659", +- "self_type" : "type-3661", ++ "referenced_type" : "type-3651", ++ "self_type" : "type-3654", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19476,8 +20888,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[31]", + "name" : "char const (&)[31]", +- "referenced_type" : "type-3691", +- "self_type" : "type-3693", ++ "referenced_type" : "type-3683", ++ "self_type" : "type-3686", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19485,8 +20897,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[32]", + "name" : "char const (&)[32]", +- "referenced_type" : "type-3723", +- "self_type" : "type-3725", ++ "referenced_type" : "type-3716", ++ "self_type" : "type-3718", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19494,8 +20906,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[35]", + "name" : "char const (&)[35]", +- "referenced_type" : "type-3712", +- "self_type" : "type-3714", ++ "referenced_type" : "type-3705", ++ "self_type" : "type-3707", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19503,8 +20915,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[37]", + "name" : "char const (&)[37]", +- "referenced_type" : "type-3703", +- "self_type" : "type-3705", ++ "referenced_type" : "type-3696", ++ "self_type" : "type-3698", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19512,8 +20924,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[3]", + "name" : "char const (&)[3]", +- "referenced_type" : "type-3671", +- "self_type" : "type-3674", ++ "referenced_type" : "type-3664", ++ "self_type" : "type-3667", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19521,8 +20933,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[4]", + "name" : "char const (&)[4]", +- "referenced_type" : "type-3792", +- "self_type" : "type-3794", ++ "referenced_type" : "type-3785", ++ "self_type" : "type-3787", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19530,8 +20942,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[5]", + "name" : "char const (&)[5]", +- "referenced_type" : "type-3798", +- "self_type" : "type-3800", ++ "referenced_type" : "type-3791", ++ "self_type" : "type-3793", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19539,8 +20951,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[6]", + "name" : "char const (&)[6]", +- "referenced_type" : "type-3663", +- "self_type" : "type-3665", ++ "referenced_type" : "type-3656", ++ "self_type" : "type-3658", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19548,8 +20960,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[7]", + "name" : "char const (&)[7]", +- "referenced_type" : "type-3687", +- "self_type" : "type-3690", ++ "referenced_type" : "type-3680", ++ "self_type" : "type-3682", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19557,8 +20969,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[8]", + "name" : "char const (&)[8]", +- "referenced_type" : "type-3675", +- "self_type" : "type-3677", ++ "referenced_type" : "type-3668", ++ "self_type" : "type-3670", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19566,8 +20978,8 @@ + "alignment" : 4, + "linker_set_key" : "char const (&)[9]", + "name" : "char const (&)[9]", +- "referenced_type" : "type-3666", +- "self_type" : "type-3668", ++ "referenced_type" : "type-3659", ++ "self_type" : "type-3661", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19575,8 +20987,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::String16 &", + "name" : "const android::String16 &", +- "referenced_type" : "type-348", +- "self_type" : "type-350", ++ "referenced_type" : "type-347", ++ "self_type" : "type-349", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String16.h" + }, +@@ -19584,8 +20996,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::String8 &", + "name" : "const android::String8 &", +- "referenced_type" : "type-223", +- "self_type" : "type-225", ++ "referenced_type" : "type-222", ++ "self_type" : "type-224", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String8.h" + }, +@@ -19593,8 +21005,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BpHwBinder::Obituary &", + "name" : "const android::hardware::BpHwBinder::Obituary &", +- "referenced_type" : "type-2391", +- "self_type" : "type-2415", ++ "referenced_type" : "type-2386", ++ "self_type" : "type-2410", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -19602,8 +21014,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &", + "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &", +- "referenced_type" : "type-2398", +- "self_type" : "type-2399", ++ "referenced_type" : "type-2393", ++ "self_type" : "type-2394", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -19611,8 +21023,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::HexDump &", + "name" : "const android::hardware::HexDump &", +- "referenced_type" : "type-2489", +- "self_type" : "type-3888", ++ "referenced_type" : "type-2484", ++ "self_type" : "type-3881", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19620,8 +21032,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1038", +- "self_type" : "type-1040", ++ "referenced_type" : "type-1035", ++ "self_type" : "type-1037", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19629,8 +21041,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1126", +- "self_type" : "type-1128", ++ "referenced_type" : "type-1123", ++ "self_type" : "type-1125", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -19638,8 +21050,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1187", +- "self_type" : "type-1189", ++ "referenced_type" : "type-1184", ++ "self_type" : "type-1186", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -19647,8 +21059,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1253", +- "self_type" : "type-1255", ++ "referenced_type" : "type-1250", ++ "self_type" : "type-1252", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -19656,8 +21068,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1307", +- "self_type" : "type-1309", ++ "referenced_type" : "type-1304", ++ "self_type" : "type-1306", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19665,8 +21077,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1370", +- "self_type" : "type-1372", ++ "referenced_type" : "type-1367", ++ "self_type" : "type-1369", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19674,8 +21086,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-1964", +- "self_type" : "type-1966", ++ "referenced_type" : "type-1959", ++ "self_type" : "type-1961", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19683,8 +21095,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2048", +- "self_type" : "type-2050", ++ "referenced_type" : "type-2043", ++ "self_type" : "type-2045", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -19692,8 +21104,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2107", +- "self_type" : "type-2109", ++ "referenced_type" : "type-2102", ++ "self_type" : "type-2104", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -19701,8 +21113,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2172", +- "self_type" : "type-2174", ++ "referenced_type" : "type-2167", ++ "self_type" : "type-2169", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -19710,8 +21122,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2224", +- "self_type" : "type-2226", ++ "referenced_type" : "type-2219", ++ "self_type" : "type-2221", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19719,8 +21131,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2278", +- "self_type" : "type-2280", ++ "referenced_type" : "type-2273", ++ "self_type" : "type-2275", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -19728,8 +21140,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2354", +- "self_type" : "type-2355", ++ "referenced_type" : "type-2349", ++ "self_type" : "type-2350", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -19737,8 +21149,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-2571", +- "self_type" : "type-2573", ++ "referenced_type" : "type-2566", ++ "self_type" : "type-2568", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19746,8 +21158,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3103", +- "self_type" : "type-3105", ++ "referenced_type" : "type-3096", ++ "self_type" : "type-3098", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19755,8 +21167,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3183", +- "self_type" : "type-3186", ++ "referenced_type" : "type-3176", ++ "self_type" : "type-3178", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -19764,8 +21176,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3250", +- "self_type" : "type-3252", ++ "referenced_type" : "type-3243", ++ "self_type" : "type-3245", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -19773,8 +21185,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3308", +- "self_type" : "type-3310", ++ "referenced_type" : "type-3300", ++ "self_type" : "type-3303", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -19782,8 +21194,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3353", +- "self_type" : "type-3355", ++ "referenced_type" : "type-3346", ++ "self_type" : "type-3348", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19791,8 +21203,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3409", +- "self_type" : "type-3411", ++ "referenced_type" : "type-3398", ++ "self_type" : "type-3404", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -19800,8 +21212,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-368", +- "self_type" : "type-370", ++ "referenced_type" : "type-367", ++ "self_type" : "type-369", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19809,8 +21221,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel &", + "name" : "const android::hardware::Parcel &", +- "referenced_type" : "type-3915", +- "self_type" : "type-3917", ++ "referenced_type" : "type-3908", ++ "self_type" : "type-3910", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19818,8 +21230,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::ProcessState::handle_entry &", + "name" : "const android::hardware::ProcessState::handle_entry &", +- "referenced_type" : "type-3812", +- "self_type" : "type-3834", ++ "referenced_type" : "type-3804", ++ "self_type" : "type-3827", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -19827,8 +21239,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return &", + "name" : "const android::hardware::Return &", +- "referenced_type" : "type-506", +- "self_type" : "type-992", ++ "referenced_type" : "type-504", ++ "self_type" : "type-989", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -19836,8 +21248,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return &", + "name" : "const android::hardware::Return &", +- "referenced_type" : "type-101", +- "self_type" : "type-107", ++ "referenced_type" : "type-100", ++ "self_type" : "type-106", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -19845,8 +21257,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Status &", + "name" : "const android::hardware::Status &", +- "referenced_type" : "type-167", +- "self_type" : "type-168", ++ "referenced_type" : "type-166", ++ "self_type" : "type-167", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -19854,8 +21266,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::TypeCode &", + "name" : "const android::hardware::TypeCode &", +- "referenced_type" : "type-2484", +- "self_type" : "type-3887", ++ "referenced_type" : "type-2479", ++ "self_type" : "type-3880", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -19863,8 +21275,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::SchedPrio &", + "name" : "const android::hardware::details::SchedPrio &", +- "referenced_type" : "type-1050", +- "self_type" : "type-1049", ++ "referenced_type" : "type-1047", ++ "self_type" : "type-1046", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -19873,7 +21285,7 @@ + "linker_set_key" : "const android::hardware::details::hidl_pointer &", + "name" : "const android::hardware::details::hidl_pointer &", + "referenced_type" : "type-13", +- "self_type" : "type-76", ++ "self_type" : "type-75", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19881,8 +21293,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::hidl_pointer &", + "name" : "const android::hardware::details::hidl_pointer &", +- "referenced_type" : "type-537", +- "self_type" : "type-830", ++ "referenced_type" : "type-535", ++ "self_type" : "type-827", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19890,8 +21302,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_handle &", + "name" : "const android::hardware::hidl_handle &", +- "referenced_type" : "type-79", +- "self_type" : "type-83", ++ "referenced_type" : "type-78", ++ "self_type" : "type-82", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19899,8 +21311,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_memory &", + "name" : "const android::hardware::hidl_memory &", +- "referenced_type" : "type-123", +- "self_type" : "type-124", ++ "referenced_type" : "type-122", ++ "self_type" : "type-123", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19908,8 +21320,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_string &", + "name" : "const android::hardware::hidl_string &", +- "referenced_type" : "type-110", +- "self_type" : "type-112", ++ "referenced_type" : "type-109", ++ "self_type" : "type-111", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19917,8 +21329,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec > &", + "name" : "const android::hardware::hidl_vec > &", +- "referenced_type" : "type-2270", +- "self_type" : "type-2283", ++ "referenced_type" : "type-2264", ++ "self_type" : "type-2278", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19926,8 +21338,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec &", + "name" : "const android::hardware::hidl_vec &", +- "referenced_type" : "type-622", +- "self_type" : "type-1042", ++ "referenced_type" : "type-620", ++ "self_type" : "type-1039", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19935,8 +21347,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec &", + "name" : "const android::hardware::hidl_vec &", +- "referenced_type" : "type-1022", +- "self_type" : "type-1043", ++ "referenced_type" : "type-1019", ++ "self_type" : "type-1040", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -19944,8 +21356,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec::iter &", + "name" : "const android::hardware::hidl_vec::iter &", +- "referenced_type" : "type-629", +- "self_type" : "type-631", ++ "referenced_type" : "type-627", ++ "self_type" : "type-629", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19953,8 +21365,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec &", + "name" : "const android::hardware::hidl_vec &", +- "referenced_type" : "type-523", +- "self_type" : "type-525", ++ "referenced_type" : "type-521", ++ "self_type" : "type-523", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19962,8 +21374,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_version &", + "name" : "const android::hardware::hidl_version &", +- "referenced_type" : "type-135", +- "self_type" : "type-137", ++ "referenced_type" : "type-134", ++ "self_type" : "type-136", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -19971,8 +21383,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::base::V1_0::IBase *const &", + "name" : "const android::hidl::base::V1_0::IBase *const &", +- "referenced_type" : "type-396", +- "self_type" : "type-397", ++ "referenced_type" : "type-390", ++ "self_type" : "type-391", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -19980,8 +21392,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &", + "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &", +- "referenced_type" : "type-1021", +- "self_type" : "type-1072", ++ "referenced_type" : "type-1018", ++ "self_type" : "type-1069", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -19989,8 +21401,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::key_value_pair_t > &", + "name" : "const android::key_value_pair_t > &", +- "referenced_type" : "type-3806", +- "self_type" : "type-3808", ++ "referenced_type" : "type-3799", ++ "self_type" : "type-3801", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -19998,8 +21410,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::key_value_pair_t &", + "name" : "const android::key_value_pair_t &", +- "referenced_type" : "type-2383", +- "self_type" : "type-2385", ++ "referenced_type" : "type-2378", ++ "self_type" : "type-2380", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20007,8 +21419,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-3640", +- "self_type" : "type-3647", ++ "referenced_type" : "type-3633", ++ "self_type" : "type-3640", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20016,8 +21428,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-2498", +- "self_type" : "type-2497", ++ "referenced_type" : "type-2493", ++ "self_type" : "type-2492", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20025,8 +21437,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-2356", +- "self_type" : "type-2358", ++ "referenced_type" : "type-2351", ++ "self_type" : "type-2353", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -20034,8 +21446,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-2405", +- "self_type" : "type-2406", ++ "referenced_type" : "type-2400", ++ "self_type" : "type-2401", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20043,8 +21455,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-3467", +- "self_type" : "type-3469", ++ "referenced_type" : "type-3460", ++ "self_type" : "type-3462", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -20052,8 +21464,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-2524", +- "self_type" : "type-2526", ++ "referenced_type" : "type-2517", ++ "self_type" : "type-2521", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, +@@ -20061,8 +21473,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-2538", +- "self_type" : "type-2540", ++ "referenced_type" : "type-2533", ++ "self_type" : "type-2535", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, +@@ -20070,8 +21482,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-3583", +- "self_type" : "type-3587", ++ "referenced_type" : "type-3576", ++ "self_type" : "type-3578", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, +@@ -20079,8 +21491,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-3592", +- "self_type" : "type-3594", ++ "referenced_type" : "type-3585", ++ "self_type" : "type-3587", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, +@@ -20088,8 +21500,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-70", +- "self_type" : "type-69", ++ "referenced_type" : "type-69", ++ "self_type" : "type-68", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20097,8 +21509,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-2547", +- "self_type" : "type-2546", ++ "referenced_type" : "type-2542", ++ "self_type" : "type-2541", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h" + }, +@@ -20106,8 +21518,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-765", +- "self_type" : "type-770", ++ "referenced_type" : "type-762", ++ "self_type" : "type-767", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20115,8 +21527,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-496", +- "self_type" : "type-3622", ++ "referenced_type" : "type-494", ++ "self_type" : "type-3615", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20124,8 +21536,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-950", +- "self_type" : "type-953", ++ "referenced_type" : "type-947", ++ "self_type" : "type-950", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20133,8 +21545,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-141", +- "self_type" : "type-140", ++ "referenced_type" : "type-140", ++ "self_type" : "type-139", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -20142,8 +21554,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-459", +- "self_type" : "type-460", ++ "referenced_type" : "type-456", ++ "self_type" : "type-458", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20151,8 +21563,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-578", +- "self_type" : "type-910", ++ "referenced_type" : "type-576", ++ "self_type" : "type-906", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20160,8 +21572,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-593", +- "self_type" : "type-783", ++ "referenced_type" : "type-591", ++ "self_type" : "type-780", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20169,8 +21581,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-583", +- "self_type" : "type-764", ++ "referenced_type" : "type-581", ++ "self_type" : "type-761", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20178,8 +21590,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-600", +- "self_type" : "type-787", ++ "referenced_type" : "type-598", ++ "self_type" : "type-784", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20187,8 +21599,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp &", + "name" : "const android::sp &", +- "referenced_type" : "type-588", +- "self_type" : "type-773", ++ "referenced_type" : "type-586", ++ "self_type" : "type-769", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -20196,8 +21608,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-469", +- "self_type" : "type-470", ++ "referenced_type" : "type-467", ++ "self_type" : "type-468", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20205,8 +21617,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-2359", +- "self_type" : "type-2360", ++ "referenced_type" : "type-2354", ++ "self_type" : "type-2355", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -20214,8 +21626,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-1367", +- "self_type" : "type-1369", ++ "referenced_type" : "type-1364", ++ "self_type" : "type-1366", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -20223,8 +21635,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-2568", +- "self_type" : "type-2570", ++ "referenced_type" : "type-2563", ++ "self_type" : "type-2565", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -20232,8 +21644,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-365", +- "self_type" : "type-367", ++ "referenced_type" : "type-364", ++ "self_type" : "type-366", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -20241,8 +21653,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-3752", +- "self_type" : "type-3753", ++ "referenced_type" : "type-3745", ++ "self_type" : "type-3746", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20250,8 +21662,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-3912", +- "self_type" : "type-3914", ++ "referenced_type" : "type-3905", ++ "self_type" : "type-3907", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -20259,8 +21671,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-464", +- "self_type" : "type-465", ++ "referenced_type" : "type-462", ++ "self_type" : "type-463", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20268,8 +21680,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp &", + "name" : "const android::wp &", +- "referenced_type" : "type-64", +- "self_type" : "type-63", ++ "referenced_type" : "type-63", ++ "self_type" : "type-62", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -20277,8 +21689,8 @@ + "alignment" : 4, + "linker_set_key" : "const bool &", + "name" : "const bool &", +- "referenced_type" : "type-502", +- "self_type" : "type-538", ++ "referenced_type" : "type-500", ++ "self_type" : "type-537", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20286,8 +21698,8 @@ + "alignment" : 4, + "linker_set_key" : "const char &", + "name" : "const char &", +- "referenced_type" : "type-100", +- "self_type" : "type-2495", ++ "referenced_type" : "type-99", ++ "self_type" : "type-2490", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -20295,8 +21707,8 @@ + "alignment" : 4, + "linker_set_key" : "const char *const &", + "name" : "const char *const &", +- "referenced_type" : "type-2478", +- "self_type" : "type-2479", ++ "referenced_type" : "type-2473", ++ "self_type" : "type-2474", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -20313,8 +21725,8 @@ + "alignment" : 4, + "linker_set_key" : "const flat_binder_object &", + "name" : "const flat_binder_object &", +- "referenced_type" : "type-3770", +- "self_type" : "type-3772", ++ "referenced_type" : "type-3763", ++ "self_type" : "type-3765", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -20322,8 +21734,8 @@ + "alignment" : 4, + "linker_set_key" : "const float &", + "name" : "const float &", +- "referenced_type" : "type-665", +- "self_type" : "type-666", ++ "referenced_type" : "type-663", ++ "self_type" : "type-664", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20332,7 +21744,7 @@ + "linker_set_key" : "const int &", + "name" : "const int &", + "referenced_type" : "type-624", +- "self_type" : "type-632", ++ "self_type" : "type-630", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20346,352 +21758,352 @@ + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1000", +- "self_type" : "type-1003", ++ "referenced_type" : "type-1099", ++ "self_type" : "type-1101", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1102", +- "self_type" : "type-1104", ++ "referenced_type" : "type-1159", ++ "self_type" : "type-1161", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1162", +- "self_type" : "type-1164", ++ "referenced_type" : "type-1220", ++ "self_type" : "type-1222", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1223", +- "self_type" : "type-1225", ++ "referenced_type" : "type-127", ++ "self_type" : "type-129", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-128", +- "self_type" : "type-130", ++ "referenced_type" : "type-1294", ++ "self_type" : "type-1296", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1297", +- "self_type" : "type-1299", ++ "referenced_type" : "type-1347", ++ "self_type" : "type-1349", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1350", +- "self_type" : "type-1352", ++ "referenced_type" : "type-1453", ++ "self_type" : "type-1455", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1457", +- "self_type" : "type-1459", ++ "referenced_type" : "type-1522", ++ "self_type" : "type-1525", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1527", +- "self_type" : "type-1529", ++ "referenced_type" : "type-1689", ++ "self_type" : "type-1691", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1693", +- "self_type" : "type-1695", ++ "referenced_type" : "type-1727", ++ "self_type" : "type-1729", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1732", +- "self_type" : "type-1735", ++ "referenced_type" : "type-1792", ++ "self_type" : "type-1794", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1797", +- "self_type" : "type-1799", ++ "referenced_type" : "type-1818", ++ "self_type" : "type-1827", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1823", +- "self_type" : "type-1832", ++ "referenced_type" : "type-1861", ++ "self_type" : "type-1863", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1866", +- "self_type" : "type-1869", ++ "referenced_type" : "type-1933", ++ "self_type" : "type-1935", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-1938", +- "self_type" : "type-1941", ++ "referenced_type" : "type-2019", ++ "self_type" : "type-2021", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2024", +- "self_type" : "type-2026", ++ "referenced_type" : "type-2077", ++ "self_type" : "type-2079", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2082", +- "self_type" : "type-2084", ++ "referenced_type" : "type-2136", ++ "self_type" : "type-2138", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2141", +- "self_type" : "type-2143", ++ "referenced_type" : "type-2209", ++ "self_type" : "type-2211", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2214", +- "self_type" : "type-2216", ++ "referenced_type" : "type-2255", ++ "self_type" : "type-2257", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2260", +- "self_type" : "type-2262", ++ "referenced_type" : "type-2306", ++ "self_type" : "type-2308", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2311", +- "self_type" : "type-2313", ++ "referenced_type" : "type-2543", ++ "self_type" : "type-2549", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2548", +- "self_type" : "type-2554", ++ "referenced_type" : "type-2650", ++ "self_type" : "type-2652", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2656", +- "self_type" : "type-2658", ++ "referenced_type" : "type-2719", ++ "self_type" : "type-2722", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2726", +- "self_type" : "type-2728", ++ "referenced_type" : "type-2830", ++ "self_type" : "type-2833", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2837", +- "self_type" : "type-2839", ++ "referenced_type" : "type-2868", ++ "self_type" : "type-2870", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2875", +- "self_type" : "type-2877", ++ "referenced_type" : "type-2926", ++ "self_type" : "type-2931", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2933", ++ "referenced_type" : "type-2934", + "self_type" : "type-2936", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-2941", +- "self_type" : "type-2944", ++ "referenced_type" : "type-3003", ++ "self_type" : "type-3005", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3010", +- "self_type" : "type-3012", ++ "referenced_type" : "type-3075", ++ "self_type" : "type-3077", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3082", +- "self_type" : "type-3084", ++ "referenced_type" : "type-3154", ++ "self_type" : "type-3156", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3161", +- "self_type" : "type-3163", ++ "referenced_type" : "type-3221", ++ "self_type" : "type-3223", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3228", +- "self_type" : "type-3230", ++ "referenced_type" : "type-326", ++ "self_type" : "type-328", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-327", +- "self_type" : "type-329", ++ "referenced_type" : "type-3276", ++ "self_type" : "type-3278", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3283", +- "self_type" : "type-3285", ++ "referenced_type" : "type-3326", ++ "self_type" : "type-3328", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3333", +- "self_type" : "type-3335", ++ "referenced_type" : "type-3337", ++ "self_type" : "type-3339", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3344", +- "self_type" : "type-3346", ++ "referenced_type" : "type-3383", ++ "self_type" : "type-3385", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3390", +- "self_type" : "type-3392", ++ "referenced_type" : "type-3427", ++ "self_type" : "type-3429", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3434", +- "self_type" : "type-3436", ++ "referenced_type" : "type-3887", ++ "self_type" : "type-3889", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-3894", +- "self_type" : "type-3896", ++ "referenced_type" : "type-3996", ++ "self_type" : "type-3998", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-4004", +- "self_type" : "type-4006", ++ "referenced_type" : "type-4069", ++ "self_type" : "type-4071", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-4077", +- "self_type" : "type-4079", ++ "referenced_type" : "type-513", ++ "self_type" : "type-515", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-515", +- "self_type" : "type-517", ++ "referenced_type" : "type-613", ++ "self_type" : "type-616", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-616", +- "self_type" : "type-618", ++ "referenced_type" : "type-708", ++ "self_type" : "type-710", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-710", +- "self_type" : "type-712", ++ "referenced_type" : "type-746", ++ "self_type" : "type-748", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-749", +- "self_type" : "type-752", ++ "referenced_type" : "type-821", ++ "self_type" : "type-823", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-824", +- "self_type" : "type-826", ++ "referenced_type" : "type-83", ++ "self_type" : "type-85", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-84", +- "self_type" : "type-87", ++ "referenced_type" : "type-851", ++ "self_type" : "type-865", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-854", +- "self_type" : "type-868", ++ "referenced_type" : "type-914", ++ "self_type" : "type-916", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "linker_set_key" : "const iter &", + "name" : "const iter &", +- "referenced_type" : "type-917", +- "self_type" : "type-920", ++ "referenced_type" : "type-997", ++ "self_type" : "type-999", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const log_msg &", + "name" : "const log_msg &", +- "referenced_type" : "type-239", +- "self_type" : "type-241", ++ "referenced_type" : "type-238", ++ "self_type" : "type-240", + "size" : 4, + "source_file" : "/system/core/liblog/include/log/log_read.h" + }, +@@ -20699,8 +22111,8 @@ + "alignment" : 4, + "linker_set_key" : "const long long &", + "name" : "const long long &", +- "referenced_type" : "type-653", +- "self_type" : "type-659", ++ "referenced_type" : "type-651", ++ "self_type" : "type-657", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20708,8 +22120,8 @@ + "alignment" : 4, + "linker_set_key" : "const short &", + "name" : "const short &", +- "referenced_type" : "type-609", +- "self_type" : "type-610", ++ "referenced_type" : "type-607", ++ "self_type" : "type-608", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20718,7 +22130,7 @@ + "linker_set_key" : "const signed char &", + "name" : "const signed char &", + "referenced_type" : "type-549", +- "self_type" : "type-570", ++ "self_type" : "type-568", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -20726,8 +22138,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1046", +- "self_type" : "type-1048", ++ "referenced_type" : "type-1043", ++ "self_type" : "type-1045", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20735,8 +22147,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1109", +- "self_type" : "type-1149", ++ "referenced_type" : "type-1108", ++ "self_type" : "type-1146", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -20744,8 +22156,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1113", +- "self_type" : "type-1115", ++ "referenced_type" : "type-1110", ++ "self_type" : "type-1112", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20753,8 +22165,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-113", +- "self_type" : "type-115", ++ "referenced_type" : "type-112", ++ "self_type" : "type-114", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -20762,8 +22174,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1174", +- "self_type" : "type-1176", ++ "referenced_type" : "type-1171", ++ "self_type" : "type-1173", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20771,8 +22183,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1233", +- "self_type" : "type-1235", ++ "referenced_type" : "type-1230", ++ "self_type" : "type-1232", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20780,8 +22192,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1312", +- "self_type" : "type-1314", ++ "referenced_type" : "type-1309", ++ "self_type" : "type-1311", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20789,8 +22201,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1398", +- "self_type" : "type-1400", ++ "referenced_type" : "type-1394", ++ "self_type" : "type-1396", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20798,8 +22210,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1467", +- "self_type" : "type-1469", ++ "referenced_type" : "type-1463", ++ "self_type" : "type-1465", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -20807,8 +22219,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1546", +- "self_type" : "type-1548", ++ "referenced_type" : "type-1542", ++ "self_type" : "type-1544", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20816,8 +22228,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1774", +- "self_type" : "type-1786", ++ "referenced_type" : "type-1769", ++ "self_type" : "type-1781", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -20825,8 +22237,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1815", +- "self_type" : "type-1818", ++ "referenced_type" : "type-1810", ++ "self_type" : "type-1812", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -20834,8 +22246,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1972", +- "self_type" : "type-1974", ++ "referenced_type" : "type-1967", ++ "self_type" : "type-1969", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20843,8 +22255,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2031", +- "self_type" : "type-2070", ++ "referenced_type" : "type-2028", ++ "self_type" : "type-2065", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -20852,8 +22264,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2035", +- "self_type" : "type-2037", ++ "referenced_type" : "type-2030", ++ "self_type" : "type-2032", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20861,8 +22273,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-206", +- "self_type" : "type-214", ++ "referenced_type" : "type-205", ++ "self_type" : "type-213", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -20870,8 +22282,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2094", +- "self_type" : "type-2096", ++ "referenced_type" : "type-2089", ++ "self_type" : "type-2091", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20879,8 +22291,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2151", +- "self_type" : "type-2153", ++ "referenced_type" : "type-2146", ++ "self_type" : "type-2148", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20888,8 +22300,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2229", +- "self_type" : "type-2231", ++ "referenced_type" : "type-2224", ++ "self_type" : "type-2226", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20897,8 +22309,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2275", +- "self_type" : "type-2277", ++ "referenced_type" : "type-2270", ++ "self_type" : "type-2272", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -20906,8 +22318,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2599", +- "self_type" : "type-2601", ++ "referenced_type" : "type-2593", ++ "self_type" : "type-2595", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20915,8 +22327,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2666", +- "self_type" : "type-2668", ++ "referenced_type" : "type-2660", ++ "self_type" : "type-2662", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -20924,8 +22336,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2744", +- "self_type" : "type-2746", ++ "referenced_type" : "type-2738", ++ "self_type" : "type-2740", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20933,8 +22345,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2814", +- "self_type" : "type-2816", ++ "referenced_type" : "type-2807", ++ "self_type" : "type-2810", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -20942,8 +22354,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2878", +- "self_type" : "type-2882", ++ "referenced_type" : "type-2871", ++ "self_type" : "type-2875", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -20951,8 +22363,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2961", +- "self_type" : "type-2963", ++ "referenced_type" : "type-2954", ++ "self_type" : "type-2956", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -20960,8 +22372,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3111", +- "self_type" : "type-3113", ++ "referenced_type" : "type-3104", ++ "self_type" : "type-3106", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20969,8 +22381,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3151", +- "self_type" : "type-3185", ++ "referenced_type" : "type-3144", ++ "self_type" : "type-3179", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -20978,8 +22390,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3170", +- "self_type" : "type-3172", ++ "referenced_type" : "type-3163", ++ "self_type" : "type-3165", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -20987,8 +22399,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3189", +- "self_type" : "type-3194", ++ "referenced_type" : "type-3182", ++ "self_type" : "type-3189", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -20996,8 +22408,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3237", +- "self_type" : "type-3239", ++ "referenced_type" : "type-3230", ++ "self_type" : "type-3232", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -21005,8 +22417,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3292", +- "self_type" : "type-3294", ++ "referenced_type" : "type-3285", ++ "self_type" : "type-3287", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -21014,8 +22426,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3301", +- "self_type" : "type-3307", ++ "referenced_type" : "type-3294", ++ "self_type" : "type-3302", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21023,8 +22435,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3358", +- "self_type" : "type-3360", ++ "referenced_type" : "type-3351", ++ "self_type" : "type-3353", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -21032,8 +22444,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3402", +- "self_type" : "type-3408", ++ "referenced_type" : "type-3395", ++ "self_type" : "type-3397", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -21041,8 +22453,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3942", +- "self_type" : "type-3944", ++ "referenced_type" : "type-3934", ++ "self_type" : "type-3936", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21050,8 +22462,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-4016", +- "self_type" : "type-4018", ++ "referenced_type" : "type-4008", ++ "self_type" : "type-4010", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -21059,8 +22471,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-409", +- "self_type" : "type-411", ++ "referenced_type" : "type-407", ++ "self_type" : "type-409", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21068,8 +22480,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-533", +- "self_type" : "type-535", ++ "referenced_type" : "type-531", ++ "self_type" : "type-533", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -21077,8 +22489,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-646", +- "self_type" : "type-648", ++ "referenced_type" : "type-644", ++ "self_type" : "type-646", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21086,8 +22498,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-799", +- "self_type" : "type-813", ++ "referenced_type" : "type-796", ++ "self_type" : "type-810", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21095,8 +22507,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-846", +- "self_type" : "type-849", ++ "referenced_type" : "type-843", ++ "self_type" : "type-845", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -21104,8 +22516,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-1541", +- "self_type" : "type-1540", ++ "referenced_type" : "type-1537", ++ "self_type" : "type-1536", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21113,8 +22525,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-2739", +- "self_type" : "type-2738", ++ "referenced_type" : "type-2733", ++ "self_type" : "type-2732", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21122,8 +22534,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-2809", +- "self_type" : "type-2808", ++ "referenced_type" : "type-2803", ++ "self_type" : "type-2802", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21131,8 +22543,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-641", +- "self_type" : "type-640", ++ "referenced_type" : "type-639", ++ "self_type" : "type-638", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21140,8 +22552,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-1394", +- "self_type" : "type-1393", ++ "referenced_type" : "type-1390", ++ "self_type" : "type-1389", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21149,8 +22561,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-2595", +- "self_type" : "type-2594", ++ "referenced_type" : "type-2589", ++ "self_type" : "type-2588", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21158,8 +22570,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-3938", +- "self_type" : "type-3937", ++ "referenced_type" : "type-3930", ++ "self_type" : "type-3929", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21167,8 +22579,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function (void *)> &", + "name" : "const std::function (void *)> &", +- "referenced_type" : "type-404", +- "self_type" : "type-403", ++ "referenced_type" : "type-402", ++ "self_type" : "type-401", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -21176,8 +22588,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function &", + "name" : "const std::function &", +- "referenced_type" : "type-1337", +- "self_type" : "type-1339", ++ "referenced_type" : "type-1334", ++ "self_type" : "type-1336", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -21185,8 +22597,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function &", + "name" : "const std::function &", +- "referenced_type" : "type-2305", +- "self_type" : "type-2310", ++ "referenced_type" : "type-2300", ++ "self_type" : "type-2305", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -21194,8 +22606,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function &", + "name" : "const std::function &", +- "referenced_type" : "type-306", +- "self_type" : "type-308", ++ "referenced_type" : "type-305", ++ "self_type" : "type-307", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -21203,8 +22615,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function &", + "name" : "const std::function &", +- "referenced_type" : "type-3642", +- "self_type" : "type-3644", ++ "referenced_type" : "type-3635", ++ "self_type" : "type-3637", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -21212,8 +22624,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::function &", + "name" : "const std::function &", +- "referenced_type" : "type-3761", +- "self_type" : "type-3765", ++ "referenced_type" : "type-3754", ++ "self_type" : "type-3758", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -21221,8 +22633,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::unique_ptr > &", + "name" : "const std::unique_ptr > &", +- "referenced_type" : "type-3767", +- "self_type" : "type-3769", ++ "referenced_type" : "type-3760", ++ "self_type" : "type-3762", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -21230,8 +22642,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-1804", +- "self_type" : "type-1806", ++ "referenced_type" : "type-1799", ++ "self_type" : "type-1801", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21239,8 +22651,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-2949", +- "self_type" : "type-2951", ++ "referenced_type" : "type-2942", ++ "self_type" : "type-2944", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21248,8 +22660,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-831", +- "self_type" : "type-833", ++ "referenced_type" : "type-828", ++ "self_type" : "type-830", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21257,8 +22669,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1080", +- "self_type" : "type-1079", ++ "referenced_type" : "type-1077", ++ "self_type" : "type-1076", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21266,8 +22678,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1132", +- "self_type" : "type-1131", ++ "referenced_type" : "type-1129", ++ "self_type" : "type-1128", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21275,8 +22687,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1151", +- "self_type" : "type-1150", ++ "referenced_type" : "type-1148", ++ "self_type" : "type-1147", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21284,8 +22696,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1170", +- "self_type" : "type-1169", ++ "referenced_type" : "type-1167", ++ "self_type" : "type-1166", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21293,8 +22705,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1193", +- "self_type" : "type-1192", ++ "referenced_type" : "type-1190", ++ "self_type" : "type-1189", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21302,8 +22714,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1260", +- "self_type" : "type-1259", ++ "referenced_type" : "type-1257", ++ "self_type" : "type-1256", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21311,8 +22723,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1326", +- "self_type" : "type-1325", ++ "referenced_type" : "type-1323", ++ "self_type" : "type-1322", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21320,8 +22732,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1384", +- "self_type" : "type-1383", ++ "referenced_type" : "type-1381", ++ "self_type" : "type-1380", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21329,8 +22741,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1492", +- "self_type" : "type-1491", ++ "referenced_type" : "type-1488", ++ "self_type" : "type-1487", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21338,8 +22750,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-155", +- "self_type" : "type-154", ++ "referenced_type" : "type-154", ++ "self_type" : "type-153", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21347,8 +22759,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1556", +- "self_type" : "type-1555", ++ "referenced_type" : "type-1552", ++ "self_type" : "type-1551", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21356,8 +22768,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1716", +- "self_type" : "type-1715", ++ "referenced_type" : "type-1711", ++ "self_type" : "type-1710", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21365,8 +22777,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1741", +- "self_type" : "type-1740", ++ "referenced_type" : "type-1736", ++ "self_type" : "type-1735", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21374,8 +22786,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1850", +- "self_type" : "type-1849", ++ "referenced_type" : "type-1845", ++ "self_type" : "type-1844", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21383,8 +22795,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1884", +- "self_type" : "type-1883", ++ "referenced_type" : "type-1878", ++ "self_type" : "type-1877", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21392,8 +22804,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-1889", +- "self_type" : "type-1888", ++ "referenced_type" : "type-1884", ++ "self_type" : "type-1883", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21401,8 +22813,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2004", +- "self_type" : "type-2003", ++ "referenced_type" : "type-1999", ++ "self_type" : "type-1998", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21410,8 +22822,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2054", +- "self_type" : "type-2053", ++ "referenced_type" : "type-2049", ++ "self_type" : "type-2048", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21419,8 +22831,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2072", +- "self_type" : "type-2071", ++ "referenced_type" : "type-2067", ++ "self_type" : "type-2066", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21428,8 +22840,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2090", +- "self_type" : "type-2089", ++ "referenced_type" : "type-2085", ++ "self_type" : "type-2084", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21437,8 +22849,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2113", +- "self_type" : "type-2112", ++ "referenced_type" : "type-2108", ++ "self_type" : "type-2107", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21446,8 +22858,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-216", +- "self_type" : "type-215", ++ "referenced_type" : "type-215", ++ "self_type" : "type-214", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21455,8 +22867,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2179", +- "self_type" : "type-2178", ++ "referenced_type" : "type-2174", ++ "self_type" : "type-2173", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21464,8 +22876,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-219", +- "self_type" : "type-218", ++ "referenced_type" : "type-218", ++ "self_type" : "type-217", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21473,8 +22885,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2243", +- "self_type" : "type-2242", ++ "referenced_type" : "type-2238", ++ "self_type" : "type-2237", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21482,8 +22894,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2298", +- "self_type" : "type-2297", ++ "referenced_type" : "type-2293", ++ "self_type" : "type-2292", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21491,8 +22903,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2319", +- "self_type" : "type-2318", ++ "referenced_type" : "type-2313", ++ "self_type" : "type-2312", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21500,8 +22912,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2585", +- "self_type" : "type-2584", ++ "referenced_type" : "type-2580", ++ "self_type" : "type-2579", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21509,8 +22921,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2691", +- "self_type" : "type-2690", ++ "referenced_type" : "type-2685", ++ "self_type" : "type-2684", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21518,8 +22930,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2754", +- "self_type" : "type-2753", ++ "referenced_type" : "type-2748", ++ "self_type" : "type-2747", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21527,8 +22939,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2825", +- "self_type" : "type-2824", ++ "referenced_type" : "type-2819", ++ "self_type" : "type-2818", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21536,8 +22948,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2861", +- "self_type" : "type-2860", ++ "referenced_type" : "type-2854", ++ "self_type" : "type-2853", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21545,8 +22957,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2884", +- "self_type" : "type-2883", ++ "referenced_type" : "type-2877", ++ "self_type" : "type-2876", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21554,8 +22966,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-2994", +- "self_type" : "type-2993", ++ "referenced_type" : "type-2986", ++ "self_type" : "type-2985", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21563,8 +22975,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3005", +- "self_type" : "type-3004", ++ "referenced_type" : "type-2998", ++ "self_type" : "type-2997", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21572,8 +22984,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3027", +- "self_type" : "type-3026", ++ "referenced_type" : "type-3020", ++ "self_type" : "type-3019", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21581,8 +22993,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3140", +- "self_type" : "type-3139", ++ "referenced_type" : "type-3133", ++ "self_type" : "type-3132", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21590,8 +23002,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3192", +- "self_type" : "type-3191", ++ "referenced_type" : "type-3185", ++ "self_type" : "type-3184", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21599,8 +23011,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3198", +- "self_type" : "type-3197", ++ "referenced_type" : "type-3191", ++ "self_type" : "type-3190", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21608,8 +23020,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3217", +- "self_type" : "type-3216", ++ "referenced_type" : "type-3210", ++ "self_type" : "type-3209", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21617,8 +23029,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3256", +- "self_type" : "type-3255", ++ "referenced_type" : "type-3249", ++ "self_type" : "type-3248", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21626,8 +23038,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3314", +- "self_type" : "type-3313", ++ "referenced_type" : "type-3307", ++ "self_type" : "type-3306", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21635,8 +23047,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3369", +- "self_type" : "type-3368", ++ "referenced_type" : "type-3362", ++ "self_type" : "type-3361", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21644,8 +23056,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3376", +- "self_type" : "type-3375", ++ "referenced_type" : "type-3369", ++ "self_type" : "type-3368", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21653,8 +23065,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3406", +- "self_type" : "type-3405", ++ "referenced_type" : "type-3402", ++ "self_type" : "type-3401", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21662,8 +23074,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3426", +- "self_type" : "type-3425", ++ "referenced_type" : "type-3419", ++ "self_type" : "type-3418", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21671,8 +23083,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3440", +- "self_type" : "type-3439", ++ "referenced_type" : "type-3433", ++ "self_type" : "type-3432", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21680,8 +23092,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-388", +- "self_type" : "type-387", ++ "referenced_type" : "type-387", ++ "self_type" : "type-386", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21689,8 +23101,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-3928", +- "self_type" : "type-3927", ++ "referenced_type" : "type-3921", ++ "self_type" : "type-3920", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21698,8 +23110,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-4042", +- "self_type" : "type-4041", ++ "referenced_type" : "type-4034", ++ "self_type" : "type-4033", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21707,8 +23119,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-568", +- "self_type" : "type-567", ++ "referenced_type" : "type-566", ++ "self_type" : "type-565", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21716,8 +23128,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-59", +- "self_type" : "type-58", ++ "referenced_type" : "type-58", ++ "self_type" : "type-57", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21725,8 +23137,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-657", +- "self_type" : "type-656", ++ "referenced_type" : "type-655", ++ "self_type" : "type-654", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21734,8 +23146,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-733", +- "self_type" : "type-732", ++ "referenced_type" : "type-730", ++ "self_type" : "type-729", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21743,8 +23155,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-758", +- "self_type" : "type-757", ++ "referenced_type" : "type-755", ++ "self_type" : "type-754", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21752,8 +23164,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-901", +- "self_type" : "type-900", ++ "referenced_type" : "type-898", ++ "self_type" : "type-897", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21761,8 +23173,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-93", +- "self_type" : "type-92", ++ "referenced_type" : "type-92", ++ "self_type" : "type-91", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21770,8 +23182,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-935", +- "self_type" : "type-934", ++ "referenced_type" : "type-931", ++ "self_type" : "type-930", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21779,8 +23191,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > > &", + "name" : "const std::vector > *)>, std::allocator > *)> > > &", +- "referenced_type" : "type-940", +- "self_type" : "type-939", ++ "referenced_type" : "type-937", ++ "self_type" : "type-936", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -21788,8 +23200,8 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned char &", + "name" : "const unsigned char &", +- "referenced_type" : "type-604", +- "self_type" : "type-608", ++ "referenced_type" : "type-603", ++ "self_type" : "type-606", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -21797,8 +23209,8 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned char *const &", + "name" : "const unsigned char *const &", +- "referenced_type" : "type-3727", +- "self_type" : "type-3728", ++ "referenced_type" : "type-3720", ++ "self_type" : "type-3721", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21806,8 +23218,8 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned int &", + "name" : "const unsigned int &", +- "referenced_type" : "type-246", +- "self_type" : "type-651", ++ "referenced_type" : "type-245", ++ "self_type" : "type-650", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -21815,8 +23227,8 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned int *const &", + "name" : "const unsigned int *const &", +- "referenced_type" : "type-3729", +- "self_type" : "type-3731", ++ "referenced_type" : "type-3722", ++ "self_type" : "type-3724", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21824,8 +23236,8 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned long long &", + "name" : "const unsigned long long &", +- "referenced_type" : "type-661", +- "self_type" : "type-664", ++ "referenced_type" : "type-659", ++ "self_type" : "type-662", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -21833,7 +23245,7 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned short &", + "name" : "const unsigned short &", +- "referenced_type" : "type-614", ++ "referenced_type" : "type-612", + "self_type" : "type-615", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" +@@ -21842,8 +23254,8 @@ + "alignment" : 4, + "linker_set_key" : "const void *const &", + "name" : "const void *const &", +- "referenced_type" : "type-2386", +- "self_type" : "type-2387", ++ "referenced_type" : "type-2381", ++ "self_type" : "type-2382", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -21852,7 +23264,7 @@ + "linker_set_key" : "int &", + "name" : "int &", + "referenced_type" : "type-19", +- "self_type" : "type-339", ++ "self_type" : "type-338", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -21860,8 +23272,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-120", +- "self_type" : "type-119", ++ "referenced_type" : "type-119", ++ "self_type" : "type-118", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21869,8 +23281,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-1295", +- "self_type" : "type-1294", ++ "referenced_type" : "type-1293", ++ "self_type" : "type-1292", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -21878,8 +23290,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-1795", +- "self_type" : "type-1794", ++ "referenced_type" : "type-1790", ++ "self_type" : "type-1789", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21887,8 +23299,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-2212", +- "self_type" : "type-2211", ++ "referenced_type" : "type-2208", ++ "self_type" : "type-2207", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -21896,8 +23308,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-2493", +- "self_type" : "type-2492", ++ "referenced_type" : "type-2488", ++ "self_type" : "type-2487", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21905,8 +23317,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-265", +- "self_type" : "type-264", ++ "referenced_type" : "type-264", ++ "self_type" : "type-263", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -21914,8 +23326,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-2893", +- "self_type" : "type-2892", ++ "referenced_type" : "type-2886", ++ "self_type" : "type-2885", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21923,8 +23335,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3319", +- "self_type" : "type-3318", ++ "referenced_type" : "type-3312", ++ "self_type" : "type-3311", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21932,8 +23344,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3561", +- "self_type" : "type-3560", ++ "referenced_type" : "type-3554", ++ "self_type" : "type-3553", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21941,8 +23353,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3586", +- "self_type" : "type-3585", ++ "referenced_type" : "type-3580", ++ "self_type" : "type-3579", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -21950,8 +23362,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3739", +- "self_type" : "type-3738", ++ "referenced_type" : "type-3732", ++ "self_type" : "type-3731", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21959,8 +23371,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3803", +- "self_type" : "type-3802", ++ "referenced_type" : "type-3796", ++ "self_type" : "type-3795", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21968,8 +23380,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3879", +- "self_type" : "type-3878", ++ "referenced_type" : "type-3872", ++ "self_type" : "type-3871", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21977,8 +23389,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3890", +- "self_type" : "type-3889", ++ "referenced_type" : "type-3883", ++ "self_type" : "type-3882", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -21986,8 +23398,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-822", +- "self_type" : "type-821", ++ "referenced_type" : "type-819", ++ "self_type" : "type-818", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -21995,8 +23407,8 @@ + "alignment" : 4, + "linker_set_key" : "unsigned char &", + "name" : "unsigned char &", +- "referenced_type" : "type-199", +- "self_type" : "type-555", ++ "referenced_type" : "type-198", ++ "self_type" : "type-553", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -22004,8 +23416,8 @@ + "alignment" : 4, + "linker_set_key" : "void *const &", + "name" : "void *const &", +- "referenced_type" : "type-3669", +- "self_type" : "type-3670", ++ "referenced_type" : "type-3662", ++ "self_type" : "type-3663", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + } +@@ -22016,8 +23428,8 @@ + "alignment" : 4, + "linker_set_key" : "android::CallStack *", + "name" : "android::CallStack *", +- "referenced_type" : "type-256", +- "self_type" : "type-257", ++ "referenced_type" : "type-255", ++ "self_type" : "type-256", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/CallStack.h" + }, +@@ -22025,8 +23437,8 @@ + "alignment" : 4, + "linker_set_key" : "android::CallStack::StackDeleter *", + "name" : "android::CallStack::StackDeleter *", +- "referenced_type" : "type-260", +- "self_type" : "type-261", ++ "referenced_type" : "type-259", ++ "self_type" : "type-260", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/CallStack.h" + }, +@@ -22034,8 +23446,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Condition *", + "name" : "android::Condition *", +- "referenced_type" : "type-442", +- "self_type" : "type-445", ++ "referenced_type" : "type-440", ++ "self_type" : "type-443", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Condition.h" + }, +@@ -22043,8 +23455,8 @@ + "alignment" : 4, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-2438", +- "self_type" : "type-2437", ++ "referenced_type" : "type-2433", ++ "self_type" : "type-2432", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -22052,8 +23464,8 @@ + "alignment" : 4, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-3539", +- "self_type" : "type-3538", ++ "referenced_type" : "type-3532", ++ "self_type" : "type-3531", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -22061,8 +23473,8 @@ + "alignment" : 4, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-3637", +- "self_type" : "type-3636", ++ "referenced_type" : "type-3630", ++ "self_type" : "type-3629", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -22070,8 +23482,8 @@ + "alignment" : 4, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-3789", +- "self_type" : "type-3788", ++ "referenced_type" : "type-3782", ++ "self_type" : "type-3781", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -22079,8 +23491,8 @@ + "alignment" : 4, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-3845", +- "self_type" : "type-3844", ++ "referenced_type" : "type-3838", ++ "self_type" : "type-3837", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -22088,8 +23500,8 @@ + "alignment" : 4, + "linker_set_key" : "android::IPCThreadStateBase *", + "name" : "android::IPCThreadStateBase *", +- "referenced_type" : "type-3883", +- "self_type" : "type-3882", ++ "referenced_type" : "type-3876", ++ "self_type" : "type-3875", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -22097,8 +23509,8 @@ + "alignment" : 4, + "linker_set_key" : "android::KeyedVector > *", + "name" : "android::KeyedVector > *", +- "referenced_type" : "type-433", +- "self_type" : "type-3835", ++ "referenced_type" : "type-431", ++ "self_type" : "type-3828", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -22106,8 +23518,8 @@ + "alignment" : 4, + "linker_set_key" : "android::KeyedVector *", + "name" : "android::KeyedVector *", +- "referenced_type" : "type-2341", +- "self_type" : "type-2417", ++ "referenced_type" : "type-2336", ++ "self_type" : "type-2412", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -22115,8 +23527,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Mutex *", + "name" : "android::Mutex *", +- "referenced_type" : "type-436", +- "self_type" : "type-438", ++ "referenced_type" : "type-433", ++ "self_type" : "type-436", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Mutex.h" + }, +@@ -22124,8 +23536,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Mutex::Autolock *", + "name" : "android::Mutex::Autolock *", +- "referenced_type" : "type-439", +- "self_type" : "type-441", ++ "referenced_type" : "type-437", ++ "self_type" : "type-439", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Mutex.h" + }, +@@ -22133,8 +23545,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RWLock *", + "name" : "android::RWLock *", +- "referenced_type" : "type-448", +- "self_type" : "type-450", ++ "referenced_type" : "type-444", ++ "self_type" : "type-448", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RWLock.h" + }, +@@ -22142,8 +23554,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RWLock::AutoRLock *", + "name" : "android::RWLock::AutoRLock *", +- "referenced_type" : "type-451", +- "self_type" : "type-453", ++ "referenced_type" : "type-449", ++ "self_type" : "type-451", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RWLock.h" + }, +@@ -22151,8 +23563,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RWLock::AutoWLock *", + "name" : "android::RWLock::AutoWLock *", +- "referenced_type" : "type-455", +- "self_type" : "type-456", ++ "referenced_type" : "type-452", ++ "self_type" : "type-454", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RWLock.h" + }, +@@ -22161,7 +23573,7 @@ + "linker_set_key" : "android::RefBase *", + "name" : "android::RefBase *", + "referenced_type" : "type-25", +- "self_type" : "type-68", ++ "self_type" : "type-67", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22169,8 +23581,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase **", + "name" : "android::RefBase **", +- "referenced_type" : "type-68", +- "self_type" : "type-3606", ++ "referenced_type" : "type-67", ++ "self_type" : "type-3599", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -22178,8 +23590,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase *const *", + "name" : "android::RefBase *const *", +- "referenced_type" : "type-3611", +- "self_type" : "type-3612", ++ "referenced_type" : "type-3604", ++ "self_type" : "type-3605", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -22187,8 +23599,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1100", +- "self_type" : "type-1099", ++ "referenced_type" : "type-1097", ++ "self_type" : "type-1096", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22196,8 +23608,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1160", +- "self_type" : "type-1159", ++ "referenced_type" : "type-1157", ++ "self_type" : "type-1156", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22205,8 +23617,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1221", +- "self_type" : "type-1220", ++ "referenced_type" : "type-1218", ++ "self_type" : "type-1217", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22214,8 +23626,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1293", +- "self_type" : "type-1292", ++ "referenced_type" : "type-1290", ++ "self_type" : "type-1289", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22223,8 +23635,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1348", +- "self_type" : "type-1347", ++ "referenced_type" : "type-1345", ++ "self_type" : "type-1344", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22232,8 +23644,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1455", +- "self_type" : "type-1454", ++ "referenced_type" : "type-1451", ++ "self_type" : "type-1450", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22241,8 +23653,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1523", +- "self_type" : "type-1522", ++ "referenced_type" : "type-1519", ++ "self_type" : "type-1518", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22250,8 +23662,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1690", +- "self_type" : "type-1689", ++ "referenced_type" : "type-1686", ++ "self_type" : "type-1685", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22259,8 +23671,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1702", +- "self_type" : "type-1701", ++ "referenced_type" : "type-1698", ++ "self_type" : "type-1697", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22268,8 +23680,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1729", +- "self_type" : "type-1728", ++ "referenced_type" : "type-1724", ++ "self_type" : "type-1723", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22277,8 +23689,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1792", +- "self_type" : "type-1791", ++ "referenced_type" : "type-1787", ++ "self_type" : "type-1786", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22286,8 +23698,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1864", +- "self_type" : "type-1863", ++ "referenced_type" : "type-1859", ++ "self_type" : "type-1858", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22295,8 +23707,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-1935", +- "self_type" : "type-1934", ++ "referenced_type" : "type-1930", ++ "self_type" : "type-1929", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22304,8 +23716,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2022", +- "self_type" : "type-2021", ++ "referenced_type" : "type-2017", ++ "self_type" : "type-2016", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22313,8 +23725,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2080", +- "self_type" : "type-2079", ++ "referenced_type" : "type-2075", ++ "self_type" : "type-2074", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22322,8 +23734,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2139", +- "self_type" : "type-2138", ++ "referenced_type" : "type-2134", ++ "self_type" : "type-2133", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22331,8 +23743,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2210", +- "self_type" : "type-2209", ++ "referenced_type" : "type-2205", ++ "self_type" : "type-2204", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22340,8 +23752,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2258", +- "self_type" : "type-2257", ++ "referenced_type" : "type-2253", ++ "self_type" : "type-2252", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22349,8 +23761,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2308", +- "self_type" : "type-2307", ++ "referenced_type" : "type-2303", ++ "self_type" : "type-2302", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22358,8 +23770,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2326", +- "self_type" : "type-2325", ++ "referenced_type" : "type-2321", ++ "self_type" : "type-2320", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22367,8 +23779,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2402", +- "self_type" : "type-2401", ++ "referenced_type" : "type-2397", ++ "self_type" : "type-2396", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22376,8 +23788,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2501", +- "self_type" : "type-2500", ++ "referenced_type" : "type-2496", ++ "self_type" : "type-2495", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22385,8 +23797,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2523", +- "self_type" : "type-2522", ++ "referenced_type" : "type-2520", ++ "self_type" : "type-2519", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22394,8 +23806,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2536", +- "self_type" : "type-2535", ++ "referenced_type" : "type-2531", ++ "self_type" : "type-2530", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22403,8 +23815,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2544", +- "self_type" : "type-2543", ++ "referenced_type" : "type-2539", ++ "self_type" : "type-2538", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22412,8 +23824,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2654", +- "self_type" : "type-2653", ++ "referenced_type" : "type-2648", ++ "self_type" : "type-2647", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22421,8 +23833,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2722", +- "self_type" : "type-2721", ++ "referenced_type" : "type-2716", ++ "self_type" : "type-2715", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22439,8 +23851,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2821", +- "self_type" : "type-2820", ++ "referenced_type" : "type-2816", ++ "self_type" : "type-2815", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22448,8 +23860,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2834", +- "self_type" : "type-2833", ++ "referenced_type" : "type-2828", ++ "self_type" : "type-2827", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22457,8 +23869,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2872", +- "self_type" : "type-2871", ++ "referenced_type" : "type-2865", ++ "self_type" : "type-2864", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22466,8 +23878,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-2938", +- "self_type" : "type-2937", ++ "referenced_type" : "type-2930", ++ "self_type" : "type-2929", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22475,8 +23887,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3008", +- "self_type" : "type-3007", ++ "referenced_type" : "type-3001", ++ "self_type" : "type-3000", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22484,8 +23896,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3079", +- "self_type" : "type-3078", ++ "referenced_type" : "type-3072", ++ "self_type" : "type-3071", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22493,8 +23905,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3159", +- "self_type" : "type-3158", ++ "referenced_type" : "type-3152", ++ "self_type" : "type-3151", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22502,8 +23914,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-321", +- "self_type" : "type-320", ++ "referenced_type" : "type-320", ++ "self_type" : "type-319", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22511,8 +23923,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3226", +- "self_type" : "type-3225", ++ "referenced_type" : "type-3219", ++ "self_type" : "type-3218", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22520,8 +23932,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3269", +- "self_type" : "type-3268", ++ "referenced_type" : "type-3262", ++ "self_type" : "type-3261", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22529,8 +23941,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3279", +- "self_type" : "type-3278", ++ "referenced_type" : "type-3272", ++ "self_type" : "type-3271", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22538,8 +23950,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3342", +- "self_type" : "type-3341", ++ "referenced_type" : "type-3335", ++ "self_type" : "type-3334", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22547,8 +23959,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3388", +- "self_type" : "type-3387", ++ "referenced_type" : "type-3381", ++ "self_type" : "type-3380", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22556,8 +23968,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3432", +- "self_type" : "type-3431", ++ "referenced_type" : "type-3425", ++ "self_type" : "type-3424", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22565,8 +23977,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3447", +- "self_type" : "type-3446", ++ "referenced_type" : "type-3440", ++ "self_type" : "type-3439", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22574,8 +23986,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3505", +- "self_type" : "type-3504", ++ "referenced_type" : "type-3498", ++ "self_type" : "type-3497", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22583,8 +23995,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3568", +- "self_type" : "type-3567", ++ "referenced_type" : "type-3561", ++ "self_type" : "type-3560", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22592,8 +24004,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3589", +- "self_type" : "type-3588", ++ "referenced_type" : "type-3582", ++ "self_type" : "type-3581", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22601,8 +24013,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3597", +- "self_type" : "type-3596", ++ "referenced_type" : "type-3590", ++ "self_type" : "type-3589", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22610,8 +24022,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3620", +- "self_type" : "type-3619", ++ "referenced_type" : "type-3613", ++ "self_type" : "type-3612", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22619,8 +24031,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3755", +- "self_type" : "type-3754", ++ "referenced_type" : "type-3748", ++ "self_type" : "type-3747", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22628,8 +24040,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3821", +- "self_type" : "type-3820", ++ "referenced_type" : "type-3814", ++ "self_type" : "type-3813", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22637,8 +24049,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3876", +- "self_type" : "type-3875", ++ "referenced_type" : "type-3869", ++ "self_type" : "type-3868", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22646,8 +24058,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-3892", +- "self_type" : "type-3891", ++ "referenced_type" : "type-3885", ++ "self_type" : "type-3884", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22655,8 +24067,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-4002", +- "self_type" : "type-4001", ++ "referenced_type" : "type-3994", ++ "self_type" : "type-3993", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22664,8 +24076,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-4074", +- "self_type" : "type-4073", ++ "referenced_type" : "type-4066", ++ "self_type" : "type-4065", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22673,8 +24085,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-511", +- "self_type" : "type-510", ++ "referenced_type" : "type-509", ++ "self_type" : "type-508", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22691,8 +24103,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-612", +- "self_type" : "type-611", ++ "referenced_type" : "type-610", ++ "self_type" : "type-609", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22700,8 +24112,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-707", +- "self_type" : "type-706", ++ "referenced_type" : "type-705", ++ "self_type" : "type-704", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22709,8 +24121,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-719", +- "self_type" : "type-718", ++ "referenced_type" : "type-717", ++ "self_type" : "type-716", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22718,8 +24130,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-746", +- "self_type" : "type-745", ++ "referenced_type" : "type-743", ++ "self_type" : "type-742", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22727,8 +24139,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-81", +- "self_type" : "type-80", ++ "referenced_type" : "type-80", ++ "self_type" : "type-79", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22736,8 +24148,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-819", +- "self_type" : "type-818", ++ "referenced_type" : "type-816", ++ "self_type" : "type-815", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22745,8 +24157,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-915", +- "self_type" : "type-914", ++ "referenced_type" : "type-912", ++ "self_type" : "type-911", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22754,8 +24166,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_impl *", + "name" : "android::RefBase::weakref_impl *", +- "referenced_type" : "type-997", +- "self_type" : "type-996", ++ "referenced_type" : "type-994", ++ "self_type" : "type-993", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22773,7 +24185,7 @@ + "linker_set_key" : "android::RefBase::weakref_type **", + "name" : "android::RefBase::weakref_type **", + "referenced_type" : "type-35", +- "self_type" : "type-3605", ++ "self_type" : "type-3598", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -22781,8 +24193,8 @@ + "alignment" : 4, + "linker_set_key" : "android::RefBase::weakref_type *const *", + "name" : "android::RefBase::weakref_type *const *", +- "referenced_type" : "type-3609", +- "self_type" : "type-3610", ++ "referenced_type" : "type-3602", ++ "self_type" : "type-3603", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -22799,8 +24211,8 @@ + "alignment" : 4, + "linker_set_key" : "android::ScopedTrace *", + "name" : "android::ScopedTrace *", +- "referenced_type" : "type-1064", +- "self_type" : "type-1065", ++ "referenced_type" : "type-1061", ++ "self_type" : "type-1062", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Trace.h" + }, +@@ -22808,8 +24220,8 @@ + "alignment" : 4, + "linker_set_key" : "android::SortedVector > > *", + "name" : "android::SortedVector > > *", +- "referenced_type" : "type-426", +- "self_type" : "type-3826", ++ "referenced_type" : "type-424", ++ "self_type" : "type-3819", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -22817,8 +24229,8 @@ + "alignment" : 4, + "linker_set_key" : "android::SortedVector > *", + "name" : "android::SortedVector > *", +- "referenced_type" : "type-2342", +- "self_type" : "type-2407", ++ "referenced_type" : "type-2337", ++ "self_type" : "type-2402", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -22826,8 +24238,8 @@ + "alignment" : 4, + "linker_set_key" : "android::String16 *", + "name" : "android::String16 *", +- "referenced_type" : "type-342", +- "self_type" : "type-352", ++ "referenced_type" : "type-341", ++ "self_type" : "type-351", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String16.h" + }, +@@ -22835,8 +24247,8 @@ + "alignment" : 4, + "linker_set_key" : "android::String8 *", + "name" : "android::String8 *", +- "referenced_type" : "type-221", +- "self_type" : "type-227", ++ "referenced_type" : "type-220", ++ "self_type" : "type-226", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String8.h" + }, +@@ -22844,8 +24256,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Thread *", + "name" : "android::Thread *", +- "referenced_type" : "type-501", +- "self_type" : "type-500", ++ "referenced_type" : "type-499", ++ "self_type" : "type-498", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -22853,8 +24265,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-432", +- "self_type" : "type-3631", ++ "referenced_type" : "type-430", ++ "self_type" : "type-3624", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22862,8 +24274,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-431", +- "self_type" : "type-3627", ++ "referenced_type" : "type-429", ++ "self_type" : "type-3620", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22871,8 +24283,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-252", +- "self_type" : "type-253", ++ "referenced_type" : "type-251", ++ "self_type" : "type-252", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22880,8 +24292,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-430", +- "self_type" : "type-3623", ++ "referenced_type" : "type-428", ++ "self_type" : "type-3616", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22889,8 +24301,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-2339", +- "self_type" : "type-2338", ++ "referenced_type" : "type-2334", ++ "self_type" : "type-2333", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -22898,8 +24310,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-2410", +- "self_type" : "type-2412", ++ "referenced_type" : "type-2405", ++ "self_type" : "type-2407", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22907,8 +24319,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-3459", +- "self_type" : "type-3458", ++ "referenced_type" : "type-3452", ++ "self_type" : "type-3451", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -22916,8 +24328,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-3646", +- "self_type" : "type-3645", ++ "referenced_type" : "type-3639", ++ "self_type" : "type-3638", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -22925,8 +24337,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-3764", +- "self_type" : "type-3763", ++ "referenced_type" : "type-3757", ++ "self_type" : "type-3756", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -22934,8 +24346,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-3840", +- "self_type" : "type-3839", ++ "referenced_type" : "type-3833", ++ "self_type" : "type-3832", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -22943,8 +24355,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-428", +- "self_type" : "type-3829", ++ "referenced_type" : "type-426", ++ "self_type" : "type-3822", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22952,8 +24364,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector > *", + "name" : "android::Vector > *", +- "referenced_type" : "type-2518", +- "self_type" : "type-2519", ++ "referenced_type" : "type-2513", ++ "self_type" : "type-2514", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22961,8 +24373,8 @@ + "alignment" : 4, + "linker_set_key" : "android::Vector *", + "name" : "android::Vector *", +- "referenced_type" : "type-2514", +- "self_type" : "type-2517", ++ "referenced_type" : "type-2509", ++ "self_type" : "type-2512", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -22970,8 +24382,8 @@ + "alignment" : 4, + "linker_set_key" : "android::VirtualLightRefBase *", + "name" : "android::VirtualLightRefBase *", +- "referenced_type" : "type-182", +- "self_type" : "type-184", ++ "referenced_type" : "type-181", ++ "self_type" : "type-183", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/LightRefBase.h" + }, +@@ -22979,8 +24391,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1083", +- "self_type" : "type-1082", ++ "referenced_type" : "type-1080", ++ "self_type" : "type-1079", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22988,8 +24400,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1139", +- "self_type" : "type-1138", ++ "referenced_type" : "type-1136", ++ "self_type" : "type-1135", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -22997,8 +24409,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1196", +- "self_type" : "type-1195", ++ "referenced_type" : "type-1193", ++ "self_type" : "type-1192", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23006,8 +24418,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1269", +- "self_type" : "type-1268", ++ "referenced_type" : "type-1266", ++ "self_type" : "type-1265", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23015,8 +24427,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1381", +- "self_type" : "type-1380", ++ "referenced_type" : "type-1378", ++ "self_type" : "type-1377", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23024,8 +24436,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1759", +- "self_type" : "type-1758", ++ "referenced_type" : "type-1753", ++ "self_type" : "type-1752", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23033,8 +24445,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1887", +- "self_type" : "type-1886", ++ "referenced_type" : "type-1882", ++ "self_type" : "type-1881", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23042,8 +24454,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-1899", +- "self_type" : "type-1898", ++ "referenced_type" : "type-1894", ++ "self_type" : "type-1893", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23051,8 +24463,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2007", +- "self_type" : "type-2006", ++ "referenced_type" : "type-2002", ++ "self_type" : "type-2001", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23060,8 +24472,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2061", +- "self_type" : "type-2060", ++ "referenced_type" : "type-2056", ++ "self_type" : "type-2055", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23069,8 +24481,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2116", +- "self_type" : "type-2115", ++ "referenced_type" : "type-2111", ++ "self_type" : "type-2110", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23078,8 +24490,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2188", +- "self_type" : "type-2187", ++ "referenced_type" : "type-2183", ++ "self_type" : "type-2182", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23087,8 +24499,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2247", +- "self_type" : "type-2246", ++ "referenced_type" : "type-2242", ++ "self_type" : "type-2241", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23096,8 +24508,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2333", +- "self_type" : "type-2332", ++ "referenced_type" : "type-2328", ++ "self_type" : "type-2327", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, +@@ -23105,8 +24517,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2582", +- "self_type" : "type-2581", ++ "referenced_type" : "type-2577", ++ "self_type" : "type-2576", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23114,8 +24526,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-2904", +- "self_type" : "type-2903", ++ "referenced_type" : "type-2897", ++ "self_type" : "type-2896", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23123,8 +24535,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3031", +- "self_type" : "type-3030", ++ "referenced_type" : "type-3024", ++ "self_type" : "type-3023", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23132,8 +24544,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3042", +- "self_type" : "type-3041", ++ "referenced_type" : "type-3035", ++ "self_type" : "type-3034", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23141,8 +24553,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3143", +- "self_type" : "type-3142", ++ "referenced_type" : "type-3136", ++ "self_type" : "type-3135", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23150,8 +24562,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3203", +- "self_type" : "type-3202", ++ "referenced_type" : "type-3196", ++ "self_type" : "type-3195", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23159,8 +24571,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3259", +- "self_type" : "type-3258", ++ "referenced_type" : "type-3252", ++ "self_type" : "type-3251", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23168,8 +24580,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3323", +- "self_type" : "type-3322", ++ "referenced_type" : "type-3316", ++ "self_type" : "type-3315", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23177,8 +24589,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3379", +- "self_type" : "type-3378", ++ "referenced_type" : "type-3372", ++ "self_type" : "type-3371", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23186,8 +24598,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-385", +- "self_type" : "type-384", ++ "referenced_type" : "type-384", ++ "self_type" : "type-383", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23195,8 +24607,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-3926", +- "self_type" : "type-3925", ++ "referenced_type" : "type-3919", ++ "self_type" : "type-3918", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23204,8 +24616,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-782", +- "self_type" : "type-781", ++ "referenced_type" : "type-778", ++ "self_type" : "type-777", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23213,8 +24625,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-938", +- "self_type" : "type-937", ++ "referenced_type" : "type-935", ++ "self_type" : "type-934", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23222,8 +24634,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *", + "name" : "android::hardware::BHwBinder *", +- "referenced_type" : "type-955", +- "self_type" : "type-954", ++ "referenced_type" : "type-952", ++ "self_type" : "type-951", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23231,8 +24643,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder **", + "name" : "android::hardware::BHwBinder **", +- "referenced_type" : "type-2332", +- "self_type" : "type-3604", ++ "referenced_type" : "type-2327", ++ "self_type" : "type-3597", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -23240,8 +24652,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder *const *", + "name" : "android::hardware::BHwBinder *const *", +- "referenced_type" : "type-3607", +- "self_type" : "type-3608", ++ "referenced_type" : "type-3600", ++ "self_type" : "type-3601", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -23249,8 +24661,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder::Extras *", + "name" : "android::hardware::BHwBinder::Extras *", +- "referenced_type" : "type-2364", +- "self_type" : "type-2363", ++ "referenced_type" : "type-2359", ++ "self_type" : "type-2358", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -23258,8 +24670,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BHwBinder::Extras *", + "name" : "android::hardware::BHwBinder::Extras *", +- "referenced_type" : "type-3475", +- "self_type" : "type-3474", ++ "referenced_type" : "type-3468", ++ "self_type" : "type-3467", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -23267,8 +24679,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BpHwBinder *", + "name" : "android::hardware::BpHwBinder *", +- "referenced_type" : "type-2336", +- "self_type" : "type-2335", ++ "referenced_type" : "type-2331", ++ "self_type" : "type-2330", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, +@@ -23276,8 +24688,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BpHwBinder::Obituary *", + "name" : "android::hardware::BpHwBinder::Obituary *", +- "referenced_type" : "type-2374", +- "self_type" : "type-2389", ++ "referenced_type" : "type-2369", ++ "self_type" : "type-2384", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -23285,8 +24697,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager *", + "name" : "android::hardware::BpHwBinder::ObjectManager *", +- "referenced_type" : "type-2340", +- "self_type" : "type-2424", ++ "referenced_type" : "type-2335", ++ "self_type" : "type-2419", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -23294,8 +24706,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BpHwRefBase *", + "name" : "android::hardware::BpHwRefBase *", +- "referenced_type" : "type-2365", +- "self_type" : "type-2369", ++ "referenced_type" : "type-2360", ++ "self_type" : "type-2364", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -23303,8 +24715,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BufferedTextOutput *", + "name" : "android::hardware::BufferedTextOutput *", +- "referenced_type" : "type-2506", +- "self_type" : "type-2507", ++ "referenced_type" : "type-2501", ++ "self_type" : "type-2502", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -23312,8 +24724,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *", + "name" : "android::hardware::BufferedTextOutput::BufferState *", +- "referenced_type" : "type-2472", +- "self_type" : "type-2471", ++ "referenced_type" : "type-2467", ++ "self_type" : "type-2466", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23321,8 +24733,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *", + "name" : "android::hardware::BufferedTextOutput::BufferState *", +- "referenced_type" : "type-3545", +- "self_type" : "type-3544", ++ "referenced_type" : "type-3538", ++ "self_type" : "type-3537", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23330,8 +24742,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *", + "name" : "android::hardware::BufferedTextOutput::BufferState *", +- "referenced_type" : "type-3881", +- "self_type" : "type-3880", ++ "referenced_type" : "type-3874", ++ "self_type" : "type-3873", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -23339,8 +24751,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *", + "name" : "android::hardware::BufferedTextOutput::ThreadState *", +- "referenced_type" : "type-2509", +- "self_type" : "type-2508", ++ "referenced_type" : "type-2504", ++ "self_type" : "type-2503", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -23348,8 +24760,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *", + "name" : "android::hardware::BufferedTextOutput::ThreadState *", +- "referenced_type" : "type-3574", +- "self_type" : "type-3573", ++ "referenced_type" : "type-3567", ++ "self_type" : "type-3566", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -23366,8 +24778,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ConcurrentMap, bool> *", + "name" : "android::hardware::ConcurrentMap, bool> *", +- "referenced_type" : "type-41", +- "self_type" : "type-45", ++ "referenced_type" : "type-40", ++ "self_type" : "type-44", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -23375,8 +24787,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ConcurrentMap > *", + "name" : "android::hardware::ConcurrentMap > *", +- "referenced_type" : "type-378", +- "self_type" : "type-390", ++ "referenced_type" : "type-377", ++ "self_type" : "type-389", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -23384,8 +24796,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", +- "referenced_type" : "type-635", +- "self_type" : "type-650", ++ "referenced_type" : "type-633", ++ "self_type" : "type-648", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -23393,8 +24805,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", +- "referenced_type" : "type-398", +- "self_type" : "type-417", ++ "referenced_type" : "type-396", ++ "self_type" : "type-413", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -23402,8 +24814,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::GrantorDescriptor *", + "name" : "android::hardware::GrantorDescriptor *", +- "referenced_type" : "type-319", +- "self_type" : "type-318", ++ "referenced_type" : "type-318", ++ "self_type" : "type-317", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -23411,8 +24823,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::HexDump *", + "name" : "android::hardware::HexDump *", +- "referenced_type" : "type-2486", +- "self_type" : "type-2487", ++ "referenced_type" : "type-2481", ++ "self_type" : "type-2482", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -23420,8 +24832,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::HidlMemory *", + "name" : "android::hardware::HidlMemory *", +- "referenced_type" : "type-159", +- "self_type" : "type-158", ++ "referenced_type" : "type-158", ++ "self_type" : "type-157", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23429,8 +24841,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1087", +- "self_type" : "type-1086", ++ "referenced_type" : "type-1084", ++ "self_type" : "type-1083", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23438,8 +24850,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1144", +- "self_type" : "type-1143", ++ "referenced_type" : "type-1141", ++ "self_type" : "type-1140", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23447,8 +24859,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1201", +- "self_type" : "type-1200", ++ "referenced_type" : "type-1198", ++ "self_type" : "type-1197", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23456,8 +24868,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1275", +- "self_type" : "type-1274", ++ "referenced_type" : "type-1272", ++ "self_type" : "type-1271", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23465,8 +24877,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1408", +- "self_type" : "type-1407", ++ "referenced_type" : "type-1404", ++ "self_type" : "type-1403", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23474,8 +24886,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1497", +- "self_type" : "type-1496", ++ "referenced_type" : "type-1493", ++ "self_type" : "type-1492", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23483,8 +24895,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1562", +- "self_type" : "type-1561", ++ "referenced_type" : "type-1558", ++ "self_type" : "type-1557", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23492,8 +24904,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1722", +- "self_type" : "type-1721", ++ "referenced_type" : "type-1717", ++ "self_type" : "type-1716", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23501,8 +24913,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1854", +- "self_type" : "type-1853", ++ "referenced_type" : "type-1849", ++ "self_type" : "type-1848", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23510,8 +24922,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1892", +- "self_type" : "type-1891", ++ "referenced_type" : "type-1887", ++ "self_type" : "type-1886", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23519,8 +24931,17 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-1907", +- "self_type" : "type-1906", ++ "referenced_type" : "type-1902", ++ "self_type" : "type-1901", ++ "size" : 4, ++ "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "android::hardware::IBinder *", ++ "name" : "android::hardware::IBinder *", ++ "referenced_type" : "type-2005", ++ "self_type" : "type-2004", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23528,8 +24949,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2010", +- "self_type" : "type-2009", ++ "referenced_type" : "type-2060", ++ "self_type" : "type-2059", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23537,8 +24958,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2065", +- "self_type" : "type-2064", ++ "referenced_type" : "type-2115", ++ "self_type" : "type-2114", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23546,8 +24967,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2120", +- "self_type" : "type-2119", ++ "referenced_type" : "type-2188", ++ "self_type" : "type-2187", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23555,8 +24976,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2193", +- "self_type" : "type-2192", ++ "referenced_type" : "type-2247", ++ "self_type" : "type-2246", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23564,8 +24985,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2252", +- "self_type" : "type-2251", ++ "referenced_type" : "type-2318", ++ "self_type" : "type-2317", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23574,7 +24995,7 @@ + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", + "referenced_type" : "type-2323", +- "self_type" : "type-2322", ++ "self_type" : "type-2324", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23582,8 +25003,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2328", +- "self_type" : "type-2329", ++ "referenced_type" : "type-2603", ++ "self_type" : "type-2602", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23591,8 +25012,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2609", +- "self_type" : "type-2608", ++ "referenced_type" : "type-2690", ++ "self_type" : "type-2689", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23600,8 +25021,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2696", +- "self_type" : "type-2695", ++ "referenced_type" : "type-2753", ++ "self_type" : "type-2752", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23609,8 +25030,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2759", +- "self_type" : "type-2758", ++ "referenced_type" : "type-2823", ++ "self_type" : "type-2822", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23618,17 +25039,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2829", +- "self_type" : "type-2828", +- "size" : 4, +- "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "android::hardware::IBinder *", +- "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2866", +- "self_type" : "type-2865", ++ "referenced_type" : "type-2859", ++ "self_type" : "type-2858", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23636,8 +25048,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-2998", +- "self_type" : "type-2997", ++ "referenced_type" : "type-2991", ++ "self_type" : "type-2990", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23645,8 +25057,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3033", +- "self_type" : "type-3032", ++ "referenced_type" : "type-3026", ++ "self_type" : "type-3025", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23654,8 +25066,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3051", +- "self_type" : "type-3050", ++ "referenced_type" : "type-3044", ++ "self_type" : "type-3043", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23663,8 +25075,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3146", +- "self_type" : "type-3145", ++ "referenced_type" : "type-3139", ++ "self_type" : "type-3138", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23672,8 +25084,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3209", +- "self_type" : "type-3208", ++ "referenced_type" : "type-3202", ++ "self_type" : "type-3201", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23681,8 +25093,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3263", +- "self_type" : "type-3262", ++ "referenced_type" : "type-3256", ++ "self_type" : "type-3255", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23690,8 +25102,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3328", +- "self_type" : "type-3327", ++ "referenced_type" : "type-3321", ++ "self_type" : "type-3320", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23699,8 +25111,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3382", +- "self_type" : "type-3381", ++ "referenced_type" : "type-3375", ++ "self_type" : "type-3374", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23708,8 +25120,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3443", +- "self_type" : "type-3442", ++ "referenced_type" : "type-3436", ++ "self_type" : "type-3435", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23717,8 +25129,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-3951", +- "self_type" : "type-3950", ++ "referenced_type" : "type-3943", ++ "self_type" : "type-3942", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23726,8 +25138,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-4046", +- "self_type" : "type-4045", ++ "referenced_type" : "type-4038", ++ "self_type" : "type-4037", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23735,8 +25147,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-573", +- "self_type" : "type-572", ++ "referenced_type" : "type-571", ++ "self_type" : "type-570", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23744,8 +25156,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-663", +- "self_type" : "type-662", ++ "referenced_type" : "type-66", ++ "self_type" : "type-65", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23753,8 +25165,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-67", +- "self_type" : "type-66", ++ "referenced_type" : "type-661", ++ "self_type" : "type-660", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23762,8 +25174,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-73", +- "self_type" : "type-72", ++ "referenced_type" : "type-72", ++ "self_type" : "type-71", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23771,8 +25183,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-739", +- "self_type" : "type-738", ++ "referenced_type" : "type-736", ++ "self_type" : "type-735", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23780,8 +25192,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-905", +- "self_type" : "type-904", ++ "referenced_type" : "type-902", ++ "self_type" : "type-901", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23789,8 +25201,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-943", +- "self_type" : "type-942", ++ "referenced_type" : "type-940", ++ "self_type" : "type-939", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23798,8 +25210,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder *", + "name" : "android::hardware::IBinder *", +- "referenced_type" : "type-966", +- "self_type" : "type-965", ++ "referenced_type" : "type-963", ++ "self_type" : "type-962", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23807,8 +25219,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-1135", +- "self_type" : "type-1134", ++ "referenced_type" : "type-1132", ++ "self_type" : "type-1131", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23816,8 +25228,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-1137", +- "self_type" : "type-1136", ++ "referenced_type" : "type-1134", ++ "self_type" : "type-1133", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23825,8 +25237,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-1264", +- "self_type" : "type-1263", ++ "referenced_type" : "type-1261", ++ "self_type" : "type-1260", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23834,8 +25246,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-1266", +- "self_type" : "type-1265", ++ "referenced_type" : "type-1263", ++ "self_type" : "type-1262", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23843,8 +25255,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-1894", +- "self_type" : "type-1893", ++ "referenced_type" : "type-1889", ++ "self_type" : "type-1888", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23852,8 +25264,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-2057", +- "self_type" : "type-2056", ++ "referenced_type" : "type-2052", ++ "self_type" : "type-2051", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23861,8 +25273,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-2059", +- "self_type" : "type-2058", ++ "referenced_type" : "type-2054", ++ "self_type" : "type-2053", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23870,8 +25282,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-2183", +- "self_type" : "type-2182", ++ "referenced_type" : "type-2178", ++ "self_type" : "type-2177", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23879,8 +25291,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-2185", +- "self_type" : "type-2184", ++ "referenced_type" : "type-2180", ++ "self_type" : "type-2179", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23888,8 +25300,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-2301", +- "self_type" : "type-2300", ++ "referenced_type" : "type-2296", ++ "self_type" : "type-2295", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23897,8 +25309,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-2379", +- "self_type" : "type-2380", ++ "referenced_type" : "type-2374", ++ "self_type" : "type-2375", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23906,8 +25318,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-3036", +- "self_type" : "type-3035", ++ "referenced_type" : "type-3028", ++ "self_type" : "type-3027", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23915,8 +25327,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-3196", +- "self_type" : "type-3195", ++ "referenced_type" : "type-3188", ++ "self_type" : "type-3187", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23924,8 +25336,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-3201", +- "self_type" : "type-3200", ++ "referenced_type" : "type-3194", ++ "self_type" : "type-3193", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23933,8 +25345,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-3317", +- "self_type" : "type-3316", ++ "referenced_type" : "type-3310", ++ "self_type" : "type-3309", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23942,8 +25354,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-3321", +- "self_type" : "type-3320", ++ "referenced_type" : "type-3314", ++ "self_type" : "type-3313", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23951,8 +25363,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-3429", +- "self_type" : "type-3428", ++ "referenced_type" : "type-3422", ++ "self_type" : "type-3421", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23960,8 +25372,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IBinder::DeathRecipient *", + "name" : "android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-946", +- "self_type" : "type-945", ++ "referenced_type" : "type-943", ++ "self_type" : "type-942", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -23969,8 +25381,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-1089", +- "self_type" : "type-1088", ++ "referenced_type" : "type-1086", ++ "self_type" : "type-1085", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23978,8 +25390,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-1146", +- "self_type" : "type-1145", ++ "referenced_type" : "type-1143", ++ "self_type" : "type-1142", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23987,8 +25399,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-1204", +- "self_type" : "type-1203", ++ "referenced_type" : "type-1201", ++ "self_type" : "type-1200", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -23996,8 +25408,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-1278", +- "self_type" : "type-1277", ++ "referenced_type" : "type-1274", ++ "self_type" : "type-1273", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24005,8 +25417,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-1910", +- "self_type" : "type-1909", ++ "referenced_type" : "type-1905", ++ "self_type" : "type-1904", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24014,8 +25426,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-2012", +- "self_type" : "type-2011", ++ "referenced_type" : "type-2007", ++ "self_type" : "type-2006", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24023,8 +25435,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-2067", +- "self_type" : "type-2066", ++ "referenced_type" : "type-2062", ++ "self_type" : "type-2061", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24032,8 +25444,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-2123", +- "self_type" : "type-2122", ++ "referenced_type" : "type-2118", ++ "self_type" : "type-2117", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24041,8 +25453,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-2196", +- "self_type" : "type-2195", ++ "referenced_type" : "type-2190", ++ "self_type" : "type-2189", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24050,8 +25462,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-2254", +- "self_type" : "type-2253", ++ "referenced_type" : "type-2249", ++ "self_type" : "type-2248", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24059,8 +25471,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-2375", +- "self_type" : "type-2550", ++ "referenced_type" : "type-2370", ++ "self_type" : "type-2545", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24068,8 +25480,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-3054", +- "self_type" : "type-3053", ++ "referenced_type" : "type-3046", ++ "self_type" : "type-3045", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24077,8 +25489,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-3148", +- "self_type" : "type-3147", ++ "referenced_type" : "type-3141", ++ "self_type" : "type-3140", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24086,8 +25498,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-3213", +- "self_type" : "type-3212", ++ "referenced_type" : "type-3206", ++ "self_type" : "type-3205", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24095,8 +25507,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-3265", +- "self_type" : "type-3264", ++ "referenced_type" : "type-3258", ++ "self_type" : "type-3257", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24104,8 +25516,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-3330", +- "self_type" : "type-3329", ++ "referenced_type" : "type-3323", ++ "self_type" : "type-3322", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24113,8 +25525,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-3384", +- "self_type" : "type-3383", ++ "referenced_type" : "type-3377", ++ "self_type" : "type-3376", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24122,8 +25534,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IInterface *", + "name" : "android::hardware::IInterface *", +- "referenced_type" : "type-970", +- "self_type" : "type-969", ++ "referenced_type" : "type-967", ++ "self_type" : "type-966", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24131,8 +25543,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::IPCThreadState *", + "name" : "android::hardware::IPCThreadState *", +- "referenced_type" : "type-2434", +- "self_type" : "type-3638", ++ "referenced_type" : "type-2429", ++ "self_type" : "type-3631", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -24140,8 +25552,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::LazyServiceRegistrar *", + "name" : "android::hardware::LazyServiceRegistrar *", +- "referenced_type" : "type-530", +- "self_type" : "type-532", ++ "referenced_type" : "type-528", ++ "self_type" : "type-530", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -24149,8 +25561,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1045", +- "self_type" : "type-1044", ++ "referenced_type" : "type-1042", ++ "self_type" : "type-1041", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24158,8 +25570,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1130", +- "self_type" : "type-1129", ++ "referenced_type" : "type-1127", ++ "self_type" : "type-1126", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -24167,8 +25579,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1191", +- "self_type" : "type-1190", ++ "referenced_type" : "type-1188", ++ "self_type" : "type-1187", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -24176,8 +25588,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1257", +- "self_type" : "type-1256", ++ "referenced_type" : "type-1254", ++ "self_type" : "type-1253", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -24185,8 +25597,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1311", +- "self_type" : "type-1310", ++ "referenced_type" : "type-1308", ++ "self_type" : "type-1307", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24194,8 +25606,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1374", +- "self_type" : "type-1373", ++ "referenced_type" : "type-1371", ++ "self_type" : "type-1370", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24203,8 +25615,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-1971", +- "self_type" : "type-1970", ++ "referenced_type" : "type-1966", ++ "self_type" : "type-1965", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24212,8 +25624,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2052", +- "self_type" : "type-2051", ++ "referenced_type" : "type-2047", ++ "self_type" : "type-2046", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -24221,8 +25633,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2111", +- "self_type" : "type-2110", ++ "referenced_type" : "type-2106", ++ "self_type" : "type-2105", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -24230,8 +25642,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2176", +- "self_type" : "type-2175", ++ "referenced_type" : "type-2171", ++ "self_type" : "type-2170", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -24239,8 +25651,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2228", +- "self_type" : "type-2227", ++ "referenced_type" : "type-2223", ++ "self_type" : "type-2222", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24248,8 +25660,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2282", +- "self_type" : "type-2281", ++ "referenced_type" : "type-2277", ++ "self_type" : "type-2276", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -24257,8 +25669,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2348", +- "self_type" : "type-2347", ++ "referenced_type" : "type-2343", ++ "self_type" : "type-2342", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -24266,8 +25678,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-2575", +- "self_type" : "type-2574", ++ "referenced_type" : "type-2570", ++ "self_type" : "type-2569", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24275,8 +25687,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3110", +- "self_type" : "type-3109", ++ "referenced_type" : "type-3103", ++ "self_type" : "type-3102", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24284,8 +25696,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3188", +- "self_type" : "type-3187", ++ "referenced_type" : "type-3181", ++ "self_type" : "type-3180", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -24293,8 +25705,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3254", +- "self_type" : "type-3253", ++ "referenced_type" : "type-3247", ++ "self_type" : "type-3246", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -24302,8 +25714,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3312", +- "self_type" : "type-3311", ++ "referenced_type" : "type-3305", ++ "self_type" : "type-3304", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -24311,8 +25723,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3357", +- "self_type" : "type-3356", ++ "referenced_type" : "type-3350", ++ "self_type" : "type-3349", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24320,8 +25732,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3413", +- "self_type" : "type-3412", ++ "referenced_type" : "type-3406", ++ "self_type" : "type-3405", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -24329,8 +25741,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-372", +- "self_type" : "type-371", ++ "referenced_type" : "type-371", ++ "self_type" : "type-370", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24338,8 +25750,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Parcel *", + "name" : "android::hardware::Parcel *", +- "referenced_type" : "type-3919", +- "self_type" : "type-3918", ++ "referenced_type" : "type-3912", ++ "self_type" : "type-3911", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24347,8 +25759,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::PassthroughServiceManager *", + "name" : "android::hardware::PassthroughServiceManager *", +- "referenced_type" : "type-1750", +- "self_type" : "type-1749", ++ "referenced_type" : "type-1745", ++ "self_type" : "type-1744", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24356,8 +25768,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::PassthroughServiceManager *", + "name" : "android::hardware::PassthroughServiceManager *", +- "referenced_type" : "type-2897", +- "self_type" : "type-2896", ++ "referenced_type" : "type-2890", ++ "self_type" : "type-2889", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24365,8 +25777,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::PassthroughServiceManager *", + "name" : "android::hardware::PassthroughServiceManager *", +- "referenced_type" : "type-768", +- "self_type" : "type-767", ++ "referenced_type" : "type-765", ++ "self_type" : "type-764", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24374,8 +25786,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::PoolThread *", + "name" : "android::hardware::PoolThread *", +- "referenced_type" : "type-3825", +- "self_type" : "type-3824", ++ "referenced_type" : "type-3818", ++ "self_type" : "type-3817", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24383,8 +25795,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1091", +- "self_type" : "type-1090", ++ "referenced_type" : "type-1088", ++ "self_type" : "type-1087", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24392,8 +25804,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1148", +- "self_type" : "type-1147", ++ "referenced_type" : "type-1145", ++ "self_type" : "type-1144", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24401,8 +25813,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1206", +- "self_type" : "type-1205", ++ "referenced_type" : "type-1203", ++ "self_type" : "type-1202", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24410,8 +25822,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1280", +- "self_type" : "type-1279", ++ "referenced_type" : "type-1277", ++ "self_type" : "type-1276", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24419,8 +25831,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1447", +- "self_type" : "type-1446", ++ "referenced_type" : "type-1443", ++ "self_type" : "type-1442", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24428,8 +25840,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1857", +- "self_type" : "type-1856", ++ "referenced_type" : "type-1852", ++ "self_type" : "type-1851", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24437,8 +25849,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-1912", +- "self_type" : "type-1911", ++ "referenced_type" : "type-1907", ++ "self_type" : "type-1906", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24446,8 +25858,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2014", +- "self_type" : "type-2013", ++ "referenced_type" : "type-2009", ++ "self_type" : "type-2008", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24455,8 +25867,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2069", +- "self_type" : "type-2068", ++ "referenced_type" : "type-2064", ++ "self_type" : "type-2063", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24464,8 +25876,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2125", +- "self_type" : "type-2124", ++ "referenced_type" : "type-2120", ++ "self_type" : "type-2119", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24473,8 +25885,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2198", +- "self_type" : "type-2197", ++ "referenced_type" : "type-2193", ++ "self_type" : "type-2192", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24482,8 +25894,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2256", +- "self_type" : "type-2255", ++ "referenced_type" : "type-2251", ++ "self_type" : "type-2250", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24491,8 +25903,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2439", +- "self_type" : "type-2443", ++ "referenced_type" : "type-2434", ++ "self_type" : "type-2438", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24500,8 +25912,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-2647", +- "self_type" : "type-2646", ++ "referenced_type" : "type-2641", ++ "self_type" : "type-2640", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24509,8 +25921,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3001", +- "self_type" : "type-3000", ++ "referenced_type" : "type-2993", ++ "self_type" : "type-2992", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24518,8 +25930,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3056", +- "self_type" : "type-3055", ++ "referenced_type" : "type-3049", ++ "self_type" : "type-3048", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24527,8 +25939,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3150", +- "self_type" : "type-3149", ++ "referenced_type" : "type-3143", ++ "self_type" : "type-3142", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24536,8 +25948,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3215", +- "self_type" : "type-3214", ++ "referenced_type" : "type-3208", ++ "self_type" : "type-3207", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24545,8 +25957,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3267", +- "self_type" : "type-3266", ++ "referenced_type" : "type-3260", ++ "self_type" : "type-3259", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24554,8 +25966,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3332", +- "self_type" : "type-3331", ++ "referenced_type" : "type-3325", ++ "self_type" : "type-3324", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24563,8 +25975,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3386", +- "self_type" : "type-3385", ++ "referenced_type" : "type-3379", ++ "self_type" : "type-3378", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24572,8 +25984,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-3990", +- "self_type" : "type-3989", ++ "referenced_type" : "type-3982", ++ "self_type" : "type-3981", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24581,8 +25993,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-493", +- "self_type" : "type-492", ++ "referenced_type" : "type-491", ++ "self_type" : "type-490", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24590,8 +26002,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-908", +- "self_type" : "type-907", ++ "referenced_type" : "type-905", ++ "self_type" : "type-904", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24599,8 +26011,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState *", + "name" : "android::hardware::ProcessState *", +- "referenced_type" : "type-973", +- "self_type" : "type-972", ++ "referenced_type" : "type-970", ++ "self_type" : "type-969", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24608,8 +26020,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::ProcessState::handle_entry *", + "name" : "android::hardware::ProcessState::handle_entry *", +- "referenced_type" : "type-2416", +- "self_type" : "type-3809", ++ "referenced_type" : "type-2411", ++ "self_type" : "type-3802", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -24617,8 +26029,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return *", + "name" : "android::hardware::Return *", +- "referenced_type" : "type-807", +- "self_type" : "type-808", ++ "referenced_type" : "type-804", ++ "self_type" : "type-805", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24626,8 +26038,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-801", +- "self_type" : "type-802", ++ "referenced_type" : "type-798", ++ "self_type" : "type-799", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24635,8 +26047,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-986", +- "self_type" : "type-987", ++ "referenced_type" : "type-983", ++ "self_type" : "type-984", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24644,8 +26056,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-1093", +- "self_type" : "type-1094", ++ "referenced_type" : "type-1090", ++ "self_type" : "type-1091", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24653,8 +26065,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-1153", +- "self_type" : "type-1154", ++ "referenced_type" : "type-1150", ++ "self_type" : "type-1151", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24662,8 +26074,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-1213", +- "self_type" : "type-1214", ++ "referenced_type" : "type-1210", ++ "self_type" : "type-1211", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24671,8 +26083,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > *", + "name" : "android::hardware::Return > *", +- "referenced_type" : "type-1284", +- "self_type" : "type-1285", ++ "referenced_type" : "type-1281", ++ "self_type" : "type-1282", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24680,8 +26092,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return *", + "name" : "android::hardware::Return *", +- "referenced_type" : "type-309", +- "self_type" : "type-310", ++ "referenced_type" : "type-308", ++ "self_type" : "type-309", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24689,8 +26101,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return *", + "name" : "android::hardware::Return *", +- "referenced_type" : "type-102", +- "self_type" : "type-177", ++ "referenced_type" : "type-101", ++ "self_type" : "type-176", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24698,8 +26110,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Status *", + "name" : "android::hardware::Status *", +- "referenced_type" : "type-104", +- "self_type" : "type-166", ++ "referenced_type" : "type-103", ++ "self_type" : "type-165", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24707,8 +26119,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)", + "name" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)", +- "referenced_type" : "type-2480", +- "self_type" : "type-2481", ++ "referenced_type" : "type-2475", ++ "self_type" : "type-2476", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -24716,8 +26128,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput *", + "name" : "android::hardware::TextOutput *", +- "referenced_type" : "type-2474", +- "self_type" : "type-3886", ++ "referenced_type" : "type-2469", ++ "self_type" : "type-3879", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -24725,8 +26137,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TextOutput::Bundle *", + "name" : "android::hardware::TextOutput::Bundle *", +- "referenced_type" : "type-2475", +- "self_type" : "type-2477", ++ "referenced_type" : "type-2470", ++ "self_type" : "type-2472", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -24734,8 +26146,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::TypeCode *", + "name" : "android::hardware::TypeCode *", +- "referenced_type" : "type-2482", +- "self_type" : "type-2483", ++ "referenced_type" : "type-2477", ++ "self_type" : "type-2478", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -24743,8 +26155,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::ClientCounterCallback *", + "name" : "android::hardware::details::ClientCounterCallback *", +- "referenced_type" : "type-1514", +- "self_type" : "type-1513", ++ "referenced_type" : "type-1510", ++ "self_type" : "type-1509", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24752,8 +26164,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::ClientCounterCallback *", + "name" : "android::hardware::details::ClientCounterCallback *", +- "referenced_type" : "type-2713", +- "self_type" : "type-2712", ++ "referenced_type" : "type-2707", ++ "self_type" : "type-2706", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24761,8 +26173,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::ClientCounterCallback *", + "name" : "android::hardware::details::ClientCounterCallback *", +- "referenced_type" : "type-4065", +- "self_type" : "type-4064", ++ "referenced_type" : "type-4057", ++ "self_type" : "type-4056", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24770,8 +26182,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::ClientCounterCallback *", + "name" : "android::hardware::details::ClientCounterCallback *", +- "referenced_type" : "type-599", +- "self_type" : "type-598", ++ "referenced_type" : "type-597", ++ "self_type" : "type-596", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24779,8 +26191,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::DoNotDestruct, android::hardware::details::SchedPrio> > *", + "name" : "android::hardware::details::DoNotDestruct, android::hardware::details::SchedPrio> > *", +- "referenced_type" : "type-46", +- "self_type" : "type-50", ++ "referenced_type" : "type-45", ++ "self_type" : "type-49", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -24788,8 +26200,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::DoNotDestruct, bool> > *", + "name" : "android::hardware::details::DoNotDestruct, bool> > *", +- "referenced_type" : "type-51", +- "self_type" : "type-53", ++ "referenced_type" : "type-50", ++ "self_type" : "type-52", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -24797,8 +26209,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::DoNotDestruct > > *", + "name" : "android::hardware::details::DoNotDestruct > > *", +- "referenced_type" : "type-412", +- "self_type" : "type-413", ++ "referenced_type" : "type-410", ++ "self_type" : "type-411", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -24806,8 +26218,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > > *", + "name" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > > *", +- "referenced_type" : "type-649", +- "self_type" : "type-652", ++ "referenced_type" : "type-647", ++ "self_type" : "type-649", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -24815,8 +26227,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > > *", + "name" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > > *", +- "referenced_type" : "type-414", +- "self_type" : "type-418", ++ "referenced_type" : "type-412", ++ "self_type" : "type-416", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -24824,8 +26236,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::HidlInstrumentor *", + "name" : "android::hardware::details::HidlInstrumentor *", +- "referenced_type" : "type-145", +- "self_type" : "type-194", ++ "referenced_type" : "type-144", ++ "self_type" : "type-193", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24833,8 +26245,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::TaskRunner *", + "name" : "android::hardware::details::TaskRunner *", +- "referenced_type" : "type-269", +- "self_type" : "type-301", ++ "referenced_type" : "type-268", ++ "self_type" : "type-300", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -24842,8 +26254,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::Waiter *", + "name" : "android::hardware::details::Waiter *", +- "referenced_type" : "type-1762", +- "self_type" : "type-1761", ++ "referenced_type" : "type-1757", ++ "self_type" : "type-1756", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24851,8 +26263,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::Waiter *", + "name" : "android::hardware::details::Waiter *", +- "referenced_type" : "type-2908", +- "self_type" : "type-2907", ++ "referenced_type" : "type-2901", ++ "self_type" : "type-2900", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24860,8 +26272,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::Waiter *", + "name" : "android::hardware::details::Waiter *", +- "referenced_type" : "type-785", +- "self_type" : "type-784", ++ "referenced_type" : "type-782", ++ "self_type" : "type-781", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24869,8 +26281,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer > *", + "name" : "android::hardware::details::hidl_pointer > *", +- "referenced_type" : "type-1009", +- "self_type" : "type-1073", ++ "referenced_type" : "type-1006", ++ "self_type" : "type-1070", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24878,8 +26290,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer *", + "name" : "android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-620", +- "self_type" : "type-1070", ++ "referenced_type" : "type-618", ++ "self_type" : "type-1067", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24887,8 +26299,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer *", + "name" : "android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-835", +- "self_type" : "type-850", ++ "referenced_type" : "type-832", ++ "self_type" : "type-847", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24896,8 +26308,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer *", + "name" : "android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-97", +- "self_type" : "type-149", ++ "referenced_type" : "type-96", ++ "self_type" : "type-148", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24906,7 +26318,7 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer *", + "name" : "android::hardware::details::hidl_pointer *", + "referenced_type" : "type-14", +- "self_type" : "type-574", ++ "self_type" : "type-572", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24914,8 +26326,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer *", + "name" : "android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-519", +- "self_type" : "type-817", ++ "referenced_type" : "type-517", ++ "self_type" : "type-814", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24923,8 +26335,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::return_status *", + "name" : "android::hardware::details::return_status *", +- "referenced_type" : "type-103", +- "self_type" : "type-172", ++ "referenced_type" : "type-102", ++ "self_type" : "type-171", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -24932,8 +26344,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_array *", + "name" : "android::hardware::hidl_array *", +- "referenced_type" : "type-1012", +- "self_type" : "type-1011", ++ "referenced_type" : "type-1009", ++ "self_type" : "type-1008", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -24941,8 +26353,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_binder_death_recipient *", + "name" : "android::hardware::hidl_binder_death_recipient *", +- "referenced_type" : "type-360", +- "self_type" : "type-363", ++ "referenced_type" : "type-359", ++ "self_type" : "type-362", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -24950,8 +26362,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_death_recipient *", + "name" : "android::hardware::hidl_death_recipient *", +- "referenced_type" : "type-144", +- "self_type" : "type-143", ++ "referenced_type" : "type-143", ++ "self_type" : "type-142", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -24959,8 +26371,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_handle *", + "name" : "android::hardware::hidl_handle *", +- "referenced_type" : "type-77", +- "self_type" : "type-78", ++ "referenced_type" : "type-76", ++ "self_type" : "type-77", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -24968,8 +26380,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_memory *", + "name" : "android::hardware::hidl_memory *", +- "referenced_type" : "type-121", +- "self_type" : "type-122", ++ "referenced_type" : "type-120", ++ "self_type" : "type-121", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -24977,8 +26389,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_string *", + "name" : "android::hardware::hidl_string *", +- "referenced_type" : "type-96", +- "self_type" : "type-108", ++ "referenced_type" : "type-95", ++ "self_type" : "type-107", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -24986,8 +26398,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec > *", + "name" : "android::hardware::hidl_vec > *", +- "referenced_type" : "type-1008", +- "self_type" : "type-1015", ++ "referenced_type" : "type-1005", ++ "self_type" : "type-1012", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -24995,8 +26407,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec *", + "name" : "android::hardware::hidl_vec *", +- "referenced_type" : "type-619", +- "self_type" : "type-1004", ++ "referenced_type" : "type-617", ++ "self_type" : "type-1001", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -25004,8 +26416,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec *", + "name" : "android::hardware::hidl_vec *", +- "referenced_type" : "type-834", +- "self_type" : "type-838", ++ "referenced_type" : "type-831", ++ "self_type" : "type-835", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -25013,8 +26425,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec::iter *", + "name" : "android::hardware::hidl_vec::iter *", +- "referenced_type" : "type-625", +- "self_type" : "type-627", ++ "referenced_type" : "type-622", ++ "self_type" : "type-625", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -25022,8 +26434,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec *", + "name" : "android::hardware::hidl_vec *", +- "referenced_type" : "type-518", +- "self_type" : "type-827", ++ "referenced_type" : "type-516", ++ "self_type" : "type-824", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -25031,8 +26443,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_version *", + "name" : "android::hardware::hidl_version *", +- "referenced_type" : "type-131", +- "self_type" : "type-134", ++ "referenced_type" : "type-130", ++ "self_type" : "type-133", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -25040,8 +26452,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::base::V1_0::BnHwBase *", + "name" : "android::hidl::base::V1_0::BnHwBase *", +- "referenced_type" : "type-355", +- "self_type" : "type-358", ++ "referenced_type" : "type-354", ++ "self_type" : "type-357", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -25049,8 +26461,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::base::V1_0::BpHwBase *", + "name" : "android::hidl::base::V1_0::BpHwBase *", +- "referenced_type" : "type-419", +- "self_type" : "type-960", ++ "referenced_type" : "type-417", ++ "self_type" : "type-957", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25058,8 +26470,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::base::V1_0::BsBase *", + "name" : "android::hidl::base::V1_0::BsBase *", +- "referenced_type" : "type-2248", +- "self_type" : "type-2250", ++ "referenced_type" : "type-2243", ++ "self_type" : "type-2245", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25076,8 +26488,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager *", + "name" : "android::hidl::manager::V1_0::BnHwServiceManager *", +- "referenced_type" : "type-871", +- "self_type" : "type-872", ++ "referenced_type" : "type-868", ++ "self_type" : "type-869", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h" + }, +@@ -25085,8 +26497,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification *", + "name" : "android::hidl::manager::V1_0::BnHwServiceNotification *", +- "referenced_type" : "type-862", +- "self_type" : "type-863", ++ "referenced_type" : "type-859", ++ "self_type" : "type-860", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -25094,8 +26506,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager *", + "name" : "android::hidl::manager::V1_0::BpHwServiceManager *", +- "referenced_type" : "type-873", +- "self_type" : "type-959", ++ "referenced_type" : "type-870", ++ "self_type" : "type-956", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25103,8 +26515,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification *", + "name" : "android::hidl::manager::V1_0::BpHwServiceNotification *", +- "referenced_type" : "type-864", +- "self_type" : "type-978", ++ "referenced_type" : "type-861", ++ "self_type" : "type-975", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25112,8 +26524,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager *", + "name" : "android::hidl::manager::V1_0::BsServiceManager *", +- "referenced_type" : "type-957", +- "self_type" : "type-958", ++ "referenced_type" : "type-954", ++ "self_type" : "type-955", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25121,8 +26533,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification *", + "name" : "android::hidl::manager::V1_0::BsServiceNotification *", +- "referenced_type" : "type-1084", +- "self_type" : "type-1085", ++ "referenced_type" : "type-1081", ++ "self_type" : "type-1082", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25130,8 +26542,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager *", + "name" : "android::hidl::manager::V1_0::IServiceManager *", +- "referenced_type" : "type-552", +- "self_type" : "type-576", ++ "referenced_type" : "type-548", ++ "self_type" : "type-574", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25139,8 +26551,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *", + "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *", +- "referenced_type" : "type-548", +- "self_type" : "type-837", ++ "referenced_type" : "type-546", ++ "self_type" : "type-834", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -25148,8 +26560,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *", + "name" : "android::hidl::manager::V1_0::IServiceNotification *", +- "referenced_type" : "type-541", +- "self_type" : "type-591", ++ "referenced_type" : "type-539", ++ "self_type" : "type-589", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25157,8 +26569,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager *", + "name" : "android::hidl::manager::V1_1::BnHwServiceManager *", +- "referenced_type" : "type-879", +- "self_type" : "type-880", ++ "referenced_type" : "type-876", ++ "self_type" : "type-877", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -25166,8 +26578,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager *", + "name" : "android::hidl::manager::V1_1::BpHwServiceManager *", +- "referenced_type" : "type-881", +- "self_type" : "type-1142", ++ "referenced_type" : "type-878", ++ "self_type" : "type-1139", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25175,8 +26587,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager *", + "name" : "android::hidl::manager::V1_1::BsServiceManager *", +- "referenced_type" : "type-1140", +- "self_type" : "type-1141", ++ "referenced_type" : "type-1137", ++ "self_type" : "type-1138", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25184,8 +26596,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager *", + "name" : "android::hidl::manager::V1_1::IServiceManager *", +- "referenced_type" : "type-562", +- "self_type" : "type-581", ++ "referenced_type" : "type-560", ++ "self_type" : "type-579", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25193,8 +26605,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback *", + "name" : "android::hidl::manager::V1_2::BnHwClientCallback *", +- "referenced_type" : "type-888", +- "self_type" : "type-889", ++ "referenced_type" : "type-884", ++ "self_type" : "type-886", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -25202,8 +26614,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager *", + "name" : "android::hidl::manager::V1_2::BnHwServiceManager *", +- "referenced_type" : "type-845", +- "self_type" : "type-896", ++ "referenced_type" : "type-842", ++ "self_type" : "type-893", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h" + }, +@@ -25211,8 +26623,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback *", + "name" : "android::hidl::manager::V1_2::BpHwClientCallback *", +- "referenced_type" : "type-890", +- "self_type" : "type-1199", ++ "referenced_type" : "type-887", ++ "self_type" : "type-1196", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25220,8 +26632,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager *", + "name" : "android::hidl::manager::V1_2::BpHwServiceManager *", +- "referenced_type" : "type-774", +- "self_type" : "type-778", ++ "referenced_type" : "type-770", ++ "self_type" : "type-775", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25229,8 +26641,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback *", + "name" : "android::hidl::manager::V1_2::BsClientCallback *", +- "referenced_type" : "type-1197", +- "self_type" : "type-1198", ++ "referenced_type" : "type-1194", ++ "self_type" : "type-1195", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25238,8 +26650,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager *", + "name" : "android::hidl::manager::V1_2::BsServiceManager *", +- "referenced_type" : "type-1271", +- "self_type" : "type-1273", ++ "referenced_type" : "type-1268", ++ "self_type" : "type-1269", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25247,8 +26659,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback *", + "name" : "android::hidl::manager::V1_2::IClientCallback *", +- "referenced_type" : "type-544", +- "self_type" : "type-596", ++ "referenced_type" : "type-542", ++ "self_type" : "type-594", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25256,8 +26668,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager *", + "name" : "android::hidl::manager::V1_2::IServiceManager *", +- "referenced_type" : "type-565", +- "self_type" : "type-586", ++ "referenced_type" : "type-563", ++ "self_type" : "type-584", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25265,8 +26677,8 @@ + "alignment" : 4, + "linker_set_key" : "android::key_value_pair_t > *", + "name" : "android::key_value_pair_t > *", +- "referenced_type" : "type-3807", +- "self_type" : "type-3811", ++ "referenced_type" : "type-3800", ++ "self_type" : "type-3803", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -25274,8 +26686,8 @@ + "alignment" : 4, + "linker_set_key" : "android::key_value_pair_t *", + "name" : "android::key_value_pair_t *", +- "referenced_type" : "type-2384", +- "self_type" : "type-2388", ++ "referenced_type" : "type-2379", ++ "self_type" : "type-2383", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -25283,8 +26695,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-499", +- "self_type" : "type-3823", ++ "referenced_type" : "type-497", ++ "self_type" : "type-3816", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25292,8 +26704,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-472", +- "self_type" : "type-503", ++ "referenced_type" : "type-470", ++ "self_type" : "type-501", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25301,8 +26713,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-2470", +- "self_type" : "type-2504", ++ "referenced_type" : "type-2465", ++ "self_type" : "type-2499", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -25310,8 +26722,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-157", +- "self_type" : "type-160", ++ "referenced_type" : "type-156", ++ "self_type" : "type-159", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25319,8 +26731,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-962", +- "self_type" : "type-964", ++ "referenced_type" : "type-959", ++ "self_type" : "type-961", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25328,8 +26740,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-71", +- "self_type" : "type-482", ++ "referenced_type" : "type-70", ++ "self_type" : "type-480", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25337,8 +26749,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-766", +- "self_type" : "type-788", ++ "referenced_type" : "type-763", ++ "self_type" : "type-785", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25346,8 +26758,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-491", +- "self_type" : "type-495", ++ "referenced_type" : "type-489", ++ "self_type" : "type-493", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25355,8 +26767,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-602", +- "self_type" : "type-605", ++ "referenced_type" : "type-600", ++ "self_type" : "type-602", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25364,8 +26776,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-789", +- "self_type" : "type-791", ++ "referenced_type" : "type-786", ++ "self_type" : "type-788", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25373,8 +26785,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-951", +- "self_type" : "type-981", ++ "referenced_type" : "type-948", ++ "self_type" : "type-978", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25382,8 +26794,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-142", +- "self_type" : "type-475", ++ "referenced_type" : "type-141", ++ "self_type" : "type-473", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25391,8 +26803,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-356", +- "self_type" : "type-480", ++ "referenced_type" : "type-355", ++ "self_type" : "type-478", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25400,8 +26812,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-575", +- "self_type" : "type-577", ++ "referenced_type" : "type-573", ++ "self_type" : "type-575", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25409,8 +26821,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-590", +- "self_type" : "type-592", ++ "referenced_type" : "type-588", ++ "self_type" : "type-590", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25418,8 +26830,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-580", +- "self_type" : "type-582", ++ "referenced_type" : "type-578", ++ "self_type" : "type-580", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25427,8 +26839,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-595", +- "self_type" : "type-597", ++ "referenced_type" : "type-593", ++ "self_type" : "type-595", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25436,8 +26848,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp *", + "name" : "android::sp *", +- "referenced_type" : "type-585", +- "self_type" : "type-587", ++ "referenced_type" : "type-583", ++ "self_type" : "type-585", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25445,8 +26857,8 @@ + "alignment" : 4, + "linker_set_key" : "android::wp *", + "name" : "android::wp *", +- "referenced_type" : "type-383", +- "self_type" : "type-468", ++ "referenced_type" : "type-382", ++ "self_type" : "type-466", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25454,8 +26866,8 @@ + "alignment" : 4, + "linker_set_key" : "android::wp *", + "name" : "android::wp *", +- "referenced_type" : "type-944", +- "self_type" : "type-949", ++ "referenced_type" : "type-941", ++ "self_type" : "type-946", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25463,8 +26875,8 @@ + "alignment" : 4, + "linker_set_key" : "android::wp *", + "name" : "android::wp *", +- "referenced_type" : "type-2382", +- "self_type" : "type-2381", ++ "referenced_type" : "type-2377", ++ "self_type" : "type-2376", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25472,8 +26884,8 @@ + "alignment" : 4, + "linker_set_key" : "android::wp *", + "name" : "android::wp *", +- "referenced_type" : "type-361", +- "self_type" : "type-463", ++ "referenced_type" : "type-360", ++ "self_type" : "type-461", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25482,7 +26894,7 @@ + "linker_set_key" : "android::wp *", + "name" : "android::wp *", + "referenced_type" : "type-32", +- "self_type" : "type-454", ++ "self_type" : "type-453", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25490,8 +26902,8 @@ + "alignment" : 4, + "linker_set_key" : "android_flex_plane *", + "name" : "android_flex_plane *", +- "referenced_type" : "type-290", +- "self_type" : "type-294", ++ "referenced_type" : "type-289", ++ "self_type" : "type-293", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics.h" + }, +@@ -25499,8 +26911,8 @@ + "alignment" : 4, + "linker_set_key" : "bool (*)(const android::String16 &, const android::sp &, void *)", + "name" : "bool (*)(const android::String16 &, const android::sp &, void *)", +- "referenced_type" : "type-2430", +- "self_type" : "type-2432", ++ "referenced_type" : "type-2425", ++ "self_type" : "type-2427", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, +@@ -25508,8 +26920,8 @@ + "alignment" : 4, + "linker_set_key" : "bool *", + "name" : "bool *", +- "referenced_type" : "type-44", +- "self_type" : "type-3779", ++ "referenced_type" : "type-43", ++ "self_type" : "type-3772", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -25517,8 +26929,8 @@ + "alignment" : 4, + "linker_set_key" : "char *", + "name" : "char *", +- "referenced_type" : "type-48", +- "self_type" : "type-243", ++ "referenced_type" : "type-47", ++ "self_type" : "type-242", + "size" : 4, + "source_file" : "/system/core/liblog/include/log/log_read.h" + }, +@@ -25526,8 +26938,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::CallStack *", + "name" : "const android::CallStack *", +- "referenced_type" : "type-258", +- "self_type" : "type-259", ++ "referenced_type" : "type-257", ++ "self_type" : "type-258", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/CallStack.h" + }, +@@ -25535,8 +26947,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::KeyedVector > *", + "name" : "const android::KeyedVector > *", +- "referenced_type" : "type-3836", +- "self_type" : "type-3838", ++ "referenced_type" : "type-3829", ++ "self_type" : "type-3831", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -25544,8 +26956,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::KeyedVector *", + "name" : "const android::KeyedVector *", +- "referenced_type" : "type-2418", +- "self_type" : "type-2419", ++ "referenced_type" : "type-2413", ++ "self_type" : "type-2414", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -25553,8 +26965,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::NativeHandle *", + "name" : "const android::NativeHandle *", +- "referenced_type" : "type-333", +- "self_type" : "type-334", ++ "referenced_type" : "type-332", ++ "self_type" : "type-333", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/NativeHandle.h" + }, +@@ -25562,8 +26974,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::RefBase *", + "name" : "const android::RefBase *", +- "referenced_type" : "type-62", +- "self_type" : "type-65", ++ "referenced_type" : "type-61", ++ "self_type" : "type-64", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25571,8 +26983,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::SortedVector > > *", + "name" : "const android::SortedVector > > *", +- "referenced_type" : "type-3827", +- "self_type" : "type-3828", ++ "referenced_type" : "type-3820", ++ "self_type" : "type-3821", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -25580,8 +26992,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::SortedVector > *", + "name" : "const android::SortedVector > *", +- "referenced_type" : "type-2408", +- "self_type" : "type-2409", ++ "referenced_type" : "type-2403", ++ "self_type" : "type-2404", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -25589,8 +27001,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::String16 *", + "name" : "const android::String16 *", +- "referenced_type" : "type-348", +- "self_type" : "type-349", ++ "referenced_type" : "type-347", ++ "self_type" : "type-348", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String16.h" + }, +@@ -25598,8 +27010,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::String8 *", + "name" : "const android::String8 *", +- "referenced_type" : "type-223", +- "self_type" : "type-224", ++ "referenced_type" : "type-222", ++ "self_type" : "type-223", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String8.h" + }, +@@ -25607,8 +27019,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-3632", +- "self_type" : "type-3633", ++ "referenced_type" : "type-3625", ++ "self_type" : "type-3626", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25616,8 +27028,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-3628", +- "self_type" : "type-3629", ++ "referenced_type" : "type-3621", ++ "self_type" : "type-3622", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25625,8 +27037,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-254", +- "self_type" : "type-255", ++ "referenced_type" : "type-253", ++ "self_type" : "type-254", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25634,8 +27046,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-3624", +- "self_type" : "type-3625", ++ "referenced_type" : "type-3617", ++ "self_type" : "type-3618", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25643,8 +27055,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-2413", +- "self_type" : "type-2414", ++ "referenced_type" : "type-2408", ++ "self_type" : "type-2409", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25652,8 +27064,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-3831", +- "self_type" : "type-3832", ++ "referenced_type" : "type-3824", ++ "self_type" : "type-3825", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25661,8 +27073,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector > *", + "name" : "const android::Vector > *", +- "referenced_type" : "type-2520", +- "self_type" : "type-2521", ++ "referenced_type" : "type-2515", ++ "self_type" : "type-2516", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25670,8 +27082,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::Vector *", + "name" : "const android::Vector *", +- "referenced_type" : "type-2515", +- "self_type" : "type-2516", ++ "referenced_type" : "type-2510", ++ "self_type" : "type-2511", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -25679,8 +27091,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::VectorImpl *", + "name" : "const android::VectorImpl *", +- "referenced_type" : "type-249", +- "self_type" : "type-250", ++ "referenced_type" : "type-248", ++ "self_type" : "type-249", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/VectorImpl.h" + }, +@@ -25688,8 +27100,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BHwBinder *", + "name" : "const android::hardware::BHwBinder *", +- "referenced_type" : "type-2361", +- "self_type" : "type-2362", ++ "referenced_type" : "type-2356", ++ "self_type" : "type-2357", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -25697,8 +27109,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BpHwBinder *", + "name" : "const android::hardware::BpHwBinder *", +- "referenced_type" : "type-2372", +- "self_type" : "type-2373", ++ "referenced_type" : "type-2367", ++ "self_type" : "type-2368", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -25706,8 +27118,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BpHwBinder::Obituary *", + "name" : "const android::hardware::BpHwBinder::Obituary *", +- "referenced_type" : "type-2391", +- "self_type" : "type-2392", ++ "referenced_type" : "type-2386", ++ "self_type" : "type-2387", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -25715,8 +27127,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager *", + "name" : "const android::hardware::BpHwBinder::ObjectManager *", +- "referenced_type" : "type-2425", +- "self_type" : "type-2426", ++ "referenced_type" : "type-2420", ++ "self_type" : "type-2421", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -25724,8 +27136,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BpHwRefBase *", + "name" : "const android::hardware::BpHwRefBase *", +- "referenced_type" : "type-2370", +- "self_type" : "type-2371", ++ "referenced_type" : "type-2365", ++ "self_type" : "type-2366", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -25733,8 +27145,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::BufferedTextOutput *", + "name" : "const android::hardware::BufferedTextOutput *", +- "referenced_type" : "type-2510", +- "self_type" : "type-2511", ++ "referenced_type" : "type-2505", ++ "self_type" : "type-2506", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -25742,8 +27154,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::ConcurrentMap, android::hardware::details::SchedPrio> *", + "name" : "const android::hardware::ConcurrentMap, android::hardware::details::SchedPrio> *", +- "referenced_type" : "type-1051", +- "self_type" : "type-1052", ++ "referenced_type" : "type-1048", ++ "self_type" : "type-1049", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -25751,8 +27163,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::ConcurrentMap, bool> *", + "name" : "const android::hardware::ConcurrentMap, bool> *", +- "referenced_type" : "type-1053", +- "self_type" : "type-1054", ++ "referenced_type" : "type-1050", ++ "self_type" : "type-1051", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -25761,7 +27173,7 @@ + "linker_set_key" : "const android::hardware::ConcurrentMap > *", + "name" : "const android::hardware::ConcurrentMap > *", + "referenced_type" : "type-393", +- "self_type" : "type-394", ++ "self_type" : "type-395", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -25769,8 +27181,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", + "name" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", +- "referenced_type" : "type-644", +- "self_type" : "type-645", ++ "referenced_type" : "type-642", ++ "self_type" : "type-643", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -25778,8 +27190,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", + "name" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> > *", +- "referenced_type" : "type-407", +- "self_type" : "type-408", ++ "referenced_type" : "type-404", ++ "self_type" : "type-406", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -25787,8 +27199,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::HexDump *", + "name" : "const android::hardware::HexDump *", +- "referenced_type" : "type-2489", +- "self_type" : "type-2490", ++ "referenced_type" : "type-2484", ++ "self_type" : "type-2485", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -25796,8 +27208,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IBinder *", + "name" : "const android::hardware::IBinder *", +- "referenced_type" : "type-1443", +- "self_type" : "type-1445", ++ "referenced_type" : "type-1439", ++ "self_type" : "type-1441", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25805,8 +27217,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IBinder *", + "name" : "const android::hardware::IBinder *", +- "referenced_type" : "type-2330", +- "self_type" : "type-2331", ++ "referenced_type" : "type-2325", ++ "self_type" : "type-2326", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, +@@ -25814,8 +27226,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IBinder *", + "name" : "const android::hardware::IBinder *", +- "referenced_type" : "type-2643", +- "self_type" : "type-2645", ++ "referenced_type" : "type-2637", ++ "self_type" : "type-2639", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25823,8 +27235,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IBinder *", + "name" : "const android::hardware::IBinder *", +- "referenced_type" : "type-3986", +- "self_type" : "type-3988", ++ "referenced_type" : "type-3978", ++ "self_type" : "type-3980", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25832,8 +27244,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IBinder *", + "name" : "const android::hardware::IBinder *", +- "referenced_type" : "type-488", +- "self_type" : "type-490", ++ "referenced_type" : "type-486", ++ "self_type" : "type-488", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25841,8 +27253,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IBinder::DeathRecipient *", + "name" : "const android::hardware::IBinder::DeathRecipient *", +- "referenced_type" : "type-2420", +- "self_type" : "type-2421", ++ "referenced_type" : "type-2415", ++ "self_type" : "type-2416", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -25850,8 +27262,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IInterface *", + "name" : "const android::hardware::IInterface *", +- "referenced_type" : "type-2552", +- "self_type" : "type-2553", ++ "referenced_type" : "type-2547", ++ "self_type" : "type-2548", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25859,8 +27271,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::IPCThreadState *", + "name" : "const android::hardware::IPCThreadState *", +- "referenced_type" : "type-3639", +- "self_type" : "type-3641", ++ "referenced_type" : "type-3632", ++ "self_type" : "type-3634", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -25868,8 +27280,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Parcel *", + "name" : "const android::hardware::Parcel *", +- "referenced_type" : "type-2354", +- "self_type" : "type-3766", ++ "referenced_type" : "type-2349", ++ "self_type" : "type-3759", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -25877,8 +27289,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::ProcessState *", + "name" : "const android::hardware::ProcessState *", +- "referenced_type" : "type-3846", +- "self_type" : "type-3847", ++ "referenced_type" : "type-3839", ++ "self_type" : "type-3840", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25886,8 +27298,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::ProcessState::handle_entry *", + "name" : "const android::hardware::ProcessState::handle_entry *", +- "referenced_type" : "type-3812", +- "self_type" : "type-3813", ++ "referenced_type" : "type-3804", ++ "self_type" : "type-3806", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -25895,8 +27307,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return *", + "name" : "const android::hardware::Return *", +- "referenced_type" : "type-811", +- "self_type" : "type-812", ++ "referenced_type" : "type-808", ++ "self_type" : "type-809", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25904,8 +27316,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-805", +- "self_type" : "type-806", ++ "referenced_type" : "type-802", ++ "self_type" : "type-803", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25913,8 +27325,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-990", +- "self_type" : "type-991", ++ "referenced_type" : "type-987", ++ "self_type" : "type-988", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25922,8 +27334,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-1097", +- "self_type" : "type-1098", ++ "referenced_type" : "type-1094", ++ "self_type" : "type-1095", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25931,8 +27343,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-1157", +- "self_type" : "type-1158", ++ "referenced_type" : "type-1154", ++ "self_type" : "type-1155", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25940,8 +27352,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-1217", +- "self_type" : "type-1218", ++ "referenced_type" : "type-1214", ++ "self_type" : "type-1215", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25949,8 +27361,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return > *", + "name" : "const android::hardware::Return > *", +- "referenced_type" : "type-1288", +- "self_type" : "type-1289", ++ "referenced_type" : "type-1285", ++ "self_type" : "type-1286", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25958,8 +27370,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Return *", + "name" : "const android::hardware::Return *", +- "referenced_type" : "type-506", +- "self_type" : "type-507", ++ "referenced_type" : "type-504", ++ "self_type" : "type-505", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25967,8 +27379,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::Status *", + "name" : "const android::hardware::Status *", +- "referenced_type" : "type-167", +- "self_type" : "type-171", ++ "referenced_type" : "type-166", ++ "self_type" : "type-170", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -25976,8 +27388,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::TypeCode *", + "name" : "const android::hardware::TypeCode *", +- "referenced_type" : "type-2484", +- "self_type" : "type-2485", ++ "referenced_type" : "type-2479", ++ "self_type" : "type-2480", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -25985,8 +27397,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::Waiter *", + "name" : "const android::hardware::details::Waiter *", +- "referenced_type" : "type-1771", +- "self_type" : "type-1773", ++ "referenced_type" : "type-1766", ++ "self_type" : "type-1768", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -25994,8 +27406,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::Waiter *", + "name" : "const android::hardware::details::Waiter *", +- "referenced_type" : "type-2917", +- "self_type" : "type-2919", ++ "referenced_type" : "type-2909", ++ "self_type" : "type-2912", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26003,8 +27415,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::Waiter *", + "name" : "const android::hardware::details::Waiter *", +- "referenced_type" : "type-796", +- "self_type" : "type-798", ++ "referenced_type" : "type-793", ++ "self_type" : "type-795", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26012,8 +27424,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::hidl_pointer > *", + "name" : "const android::hardware::details::hidl_pointer > *", +- "referenced_type" : "type-1076", +- "self_type" : "type-1077", ++ "referenced_type" : "type-1072", ++ "self_type" : "type-1074", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26021,8 +27433,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::hidl_pointer *", + "name" : "const android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-654", +- "self_type" : "type-655", ++ "referenced_type" : "type-652", ++ "self_type" : "type-653", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26030,8 +27442,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::hidl_pointer *", + "name" : "const android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-853", +- "self_type" : "type-856", ++ "referenced_type" : "type-850", ++ "self_type" : "type-853", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26039,8 +27451,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::hidl_pointer *", + "name" : "const android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-152", +- "self_type" : "type-153", ++ "referenced_type" : "type-151", ++ "self_type" : "type-152", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26049,7 +27461,7 @@ + "linker_set_key" : "const android::hardware::details::hidl_pointer *", + "name" : "const android::hardware::details::hidl_pointer *", + "referenced_type" : "type-13", +- "self_type" : "type-109", ++ "self_type" : "type-108", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26057,8 +27469,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::hidl_pointer *", + "name" : "const android::hardware::details::hidl_pointer *", +- "referenced_type" : "type-537", +- "self_type" : "type-539", ++ "referenced_type" : "type-535", ++ "self_type" : "type-536", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26066,8 +27478,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::details::return_status *", + "name" : "const android::hardware::details::return_status *", +- "referenced_type" : "type-174", +- "self_type" : "type-175", ++ "referenced_type" : "type-173", ++ "self_type" : "type-174", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -26075,8 +27487,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_array *", + "name" : "const android::hardware::hidl_array *", +- "referenced_type" : "type-2268", +- "self_type" : "type-2267", ++ "referenced_type" : "type-2263", ++ "self_type" : "type-2262", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26084,8 +27496,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_death_recipient *", + "name" : "const android::hardware::hidl_death_recipient *", +- "referenced_type" : "type-478", +- "self_type" : "type-479", ++ "referenced_type" : "type-476", ++ "self_type" : "type-477", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26093,8 +27505,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_handle *", + "name" : "const android::hardware::hidl_handle *", +- "referenced_type" : "type-79", +- "self_type" : "type-95", ++ "referenced_type" : "type-78", ++ "self_type" : "type-94", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26102,8 +27514,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_memory *", + "name" : "const android::hardware::hidl_memory *", +- "referenced_type" : "type-123", +- "self_type" : "type-127", ++ "referenced_type" : "type-122", ++ "self_type" : "type-126", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26111,8 +27523,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_string *", + "name" : "const android::hardware::hidl_string *", +- "referenced_type" : "type-110", +- "self_type" : "type-117", ++ "referenced_type" : "type-109", ++ "self_type" : "type-116", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26120,8 +27532,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec > *", + "name" : "const android::hardware::hidl_vec > *", +- "referenced_type" : "type-2270", +- "self_type" : "type-2271", ++ "referenced_type" : "type-2264", ++ "self_type" : "type-2265", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26129,8 +27541,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec *", + "name" : "const android::hardware::hidl_vec *", +- "referenced_type" : "type-622", +- "self_type" : "type-623", ++ "referenced_type" : "type-620", ++ "self_type" : "type-621", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26138,8 +27550,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec *", + "name" : "const android::hardware::hidl_vec *", +- "referenced_type" : "type-1022", +- "self_type" : "type-1023", ++ "referenced_type" : "type-1019", ++ "self_type" : "type-1020", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26147,8 +27559,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec::iter *", + "name" : "const android::hardware::hidl_vec::iter *", +- "referenced_type" : "type-629", +- "self_type" : "type-630", ++ "referenced_type" : "type-627", ++ "self_type" : "type-628", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26156,8 +27568,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_vec *", + "name" : "const android::hardware::hidl_vec *", +- "referenced_type" : "type-523", +- "self_type" : "type-524", ++ "referenced_type" : "type-521", ++ "self_type" : "type-522", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26165,8 +27577,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hardware::hidl_version *", + "name" : "const android::hardware::hidl_version *", +- "referenced_type" : "type-135", +- "self_type" : "type-136", ++ "referenced_type" : "type-134", ++ "self_type" : "type-135", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26174,8 +27586,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase *", + "name" : "const android::hidl::base::V1_0::BpHwBase *", +- "referenced_type" : "type-423", +- "self_type" : "type-424", ++ "referenced_type" : "type-421", ++ "self_type" : "type-422", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, +@@ -26183,8 +27595,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::base::V1_0::IBase *", + "name" : "const android::hidl::base::V1_0::IBase *", +- "referenced_type" : "type-382", +- "self_type" : "type-381", ++ "referenced_type" : "type-381", ++ "self_type" : "type-380", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26192,8 +27604,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceManager *", + "name" : "const android::hidl::manager::V1_0::BpHwServiceManager *", +- "referenced_type" : "type-877", +- "self_type" : "type-878", ++ "referenced_type" : "type-874", ++ "self_type" : "type-875", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, +@@ -26201,8 +27613,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceNotification *", + "name" : "const android::hidl::manager::V1_0::BpHwServiceNotification *", +- "referenced_type" : "type-869", +- "self_type" : "type-870", ++ "referenced_type" : "type-866", ++ "self_type" : "type-867", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, +@@ -26210,8 +27622,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager *", + "name" : "const android::hidl::manager::V1_0::IServiceManager *", +- "referenced_type" : "type-551", +- "self_type" : "type-553", ++ "referenced_type" : "type-547", ++ "self_type" : "type-551", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -26219,8 +27631,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *", + "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *", +- "referenced_type" : "type-1021", +- "self_type" : "type-1020", ++ "referenced_type" : "type-1018", ++ "self_type" : "type-1017", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26228,8 +27640,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *", + "name" : "const android::hidl::manager::V1_0::IServiceNotification *", +- "referenced_type" : "type-540", +- "self_type" : "type-542", ++ "referenced_type" : "type-538", ++ "self_type" : "type-540", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, +@@ -26237,8 +27649,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_1::BpHwServiceManager *", + "name" : "const android::hidl::manager::V1_1::BpHwServiceManager *", +- "referenced_type" : "type-885", +- "self_type" : "type-887", ++ "referenced_type" : "type-882", ++ "self_type" : "type-883", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, +@@ -26246,8 +27658,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_1::IServiceManager *", + "name" : "const android::hidl::manager::V1_1::IServiceManager *", +- "referenced_type" : "type-561", +- "self_type" : "type-563", ++ "referenced_type" : "type-559", ++ "self_type" : "type-561", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, +@@ -26255,8 +27667,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_2::BpHwClientCallback *", + "name" : "const android::hidl::manager::V1_2::BpHwClientCallback *", +- "referenced_type" : "type-894", +- "self_type" : "type-895", ++ "referenced_type" : "type-891", ++ "self_type" : "type-892", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, +@@ -26264,8 +27676,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_2::BpHwServiceManager *", + "name" : "const android::hidl::manager::V1_2::BpHwServiceManager *", +- "referenced_type" : "type-898", +- "self_type" : "type-899", ++ "referenced_type" : "type-894", ++ "self_type" : "type-895", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, +@@ -26273,8 +27685,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_2::IClientCallback *", + "name" : "const android::hidl::manager::V1_2::IClientCallback *", +- "referenced_type" : "type-543", +- "self_type" : "type-545", ++ "referenced_type" : "type-541", ++ "self_type" : "type-543", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, +@@ -26282,8 +27694,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager *", + "name" : "const android::hidl::manager::V1_2::IServiceManager *", +- "referenced_type" : "type-564", +- "self_type" : "type-566", ++ "referenced_type" : "type-562", ++ "self_type" : "type-564", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, +@@ -26291,8 +27703,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::key_value_pair_t > *", + "name" : "const android::key_value_pair_t > *", +- "referenced_type" : "type-3806", +- "self_type" : "type-3814", ++ "referenced_type" : "type-3799", ++ "self_type" : "type-3807", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -26300,8 +27712,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::key_value_pair_t *", + "name" : "const android::key_value_pair_t *", +- "referenced_type" : "type-2383", +- "self_type" : "type-2390", ++ "referenced_type" : "type-2378", ++ "self_type" : "type-2385", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -26309,8 +27721,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-3830", +- "self_type" : "type-3837", ++ "referenced_type" : "type-3823", ++ "self_type" : "type-3830", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26318,8 +27730,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-3640", +- "self_type" : "type-3650", ++ "referenced_type" : "type-3633", ++ "self_type" : "type-3643", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26327,8 +27739,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-2498", +- "self_type" : "type-2505", ++ "referenced_type" : "type-2493", ++ "self_type" : "type-2500", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -26336,8 +27748,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-162", +- "self_type" : "type-163", ++ "referenced_type" : "type-161", ++ "self_type" : "type-162", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26345,8 +27757,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-2405", +- "self_type" : "type-2423", ++ "referenced_type" : "type-2400", ++ "self_type" : "type-2418", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26354,8 +27766,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-70", +- "self_type" : "type-487", ++ "referenced_type" : "type-69", ++ "self_type" : "type-484", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26363,8 +27775,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-2547", +- "self_type" : "type-2551", ++ "referenced_type" : "type-2542", ++ "self_type" : "type-2546", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26372,8 +27784,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-496", +- "self_type" : "type-498", ++ "referenced_type" : "type-494", ++ "self_type" : "type-495", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26381,8 +27793,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-606", +- "self_type" : "type-607", ++ "referenced_type" : "type-604", ++ "self_type" : "type-605", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26390,8 +27802,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-794", +- "self_type" : "type-795", ++ "referenced_type" : "type-790", ++ "self_type" : "type-792", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26399,8 +27811,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-950", +- "self_type" : "type-985", ++ "referenced_type" : "type-947", ++ "self_type" : "type-982", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26408,8 +27820,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-141", +- "self_type" : "type-164", ++ "referenced_type" : "type-140", ++ "self_type" : "type-163", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26417,8 +27829,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-459", +- "self_type" : "type-481", ++ "referenced_type" : "type-456", ++ "self_type" : "type-479", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26426,8 +27838,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-578", +- "self_type" : "type-579", ++ "referenced_type" : "type-576", ++ "self_type" : "type-577", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26435,8 +27847,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-593", +- "self_type" : "type-594", ++ "referenced_type" : "type-591", ++ "self_type" : "type-592", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26444,8 +27856,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-583", +- "self_type" : "type-584", ++ "referenced_type" : "type-581", ++ "self_type" : "type-582", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26453,8 +27865,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-600", +- "self_type" : "type-601", ++ "referenced_type" : "type-598", ++ "self_type" : "type-599", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26462,8 +27874,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::sp *", + "name" : "const android::sp *", +- "referenced_type" : "type-588", +- "self_type" : "type-589", ++ "referenced_type" : "type-586", ++ "self_type" : "type-587", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -26471,8 +27883,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp *", + "name" : "const android::wp *", +- "referenced_type" : "type-469", +- "self_type" : "type-474", ++ "referenced_type" : "type-467", ++ "self_type" : "type-472", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26480,8 +27892,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp *", + "name" : "const android::wp *", +- "referenced_type" : "type-2359", +- "self_type" : "type-2411", ++ "referenced_type" : "type-2354", ++ "self_type" : "type-2406", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26489,8 +27901,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp *", + "name" : "const android::wp *", +- "referenced_type" : "type-3752", +- "self_type" : "type-3759", ++ "referenced_type" : "type-3745", ++ "self_type" : "type-3752", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26498,8 +27910,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp *", + "name" : "const android::wp *", +- "referenced_type" : "type-464", +- "self_type" : "type-467", ++ "referenced_type" : "type-462", ++ "self_type" : "type-464", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26507,8 +27919,8 @@ + "alignment" : 4, + "linker_set_key" : "const android::wp *", + "name" : "const android::wp *", +- "referenced_type" : "type-64", +- "self_type" : "type-462", ++ "referenced_type" : "type-63", ++ "self_type" : "type-460", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26516,8 +27928,8 @@ + "alignment" : 4, + "linker_set_key" : "const binder_buffer_object *", + "name" : "const binder_buffer_object *", +- "referenced_type" : "type-3785", +- "self_type" : "type-3787", ++ "referenced_type" : "type-3778", ++ "self_type" : "type-3780", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26525,8 +27937,8 @@ + "alignment" : 4, + "linker_set_key" : "const char *", + "name" : "const char *", +- "referenced_type" : "type-100", +- "self_type" : "type-99", ++ "referenced_type" : "type-99", ++ "self_type" : "type-98", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26534,8 +27946,8 @@ + "alignment" : 4, + "linker_set_key" : "const char16_t *", + "name" : "const char16_t *", +- "referenced_type" : "type-344", +- "self_type" : "type-343", ++ "referenced_type" : "type-343", ++ "self_type" : "type-342", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String16.h" + }, +@@ -26543,8 +27955,8 @@ + "alignment" : 4, + "linker_set_key" : "const dirent *", + "name" : "const dirent *", +- "referenced_type" : "type-1290", +- "self_type" : "type-1328", ++ "referenced_type" : "type-1287", ++ "self_type" : "type-1325", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26552,8 +27964,8 @@ + "alignment" : 4, + "linker_set_key" : "const dirent *", + "name" : "const dirent *", +- "referenced_type" : "type-2207", +- "self_type" : "type-2245", ++ "referenced_type" : "type-2202", ++ "self_type" : "type-2240", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26561,8 +27973,8 @@ + "alignment" : 4, + "linker_set_key" : "const dirent *", + "name" : "const dirent *", +- "referenced_type" : "type-262", +- "self_type" : "type-273", ++ "referenced_type" : "type-261", ++ "self_type" : "type-272", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26570,8 +27982,8 @@ + "alignment" : 4, + "linker_set_key" : "const dirent *", + "name" : "const dirent *", +- "referenced_type" : "type-3210", +- "self_type" : "type-3219", ++ "referenced_type" : "type-3203", ++ "self_type" : "type-3212", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26579,8 +27991,8 @@ + "alignment" : 4, + "linker_set_key" : "const dirent *", + "name" : "const dirent *", +- "referenced_type" : "type-3325", +- "self_type" : "type-3361", ++ "referenced_type" : "type-3318", ++ "self_type" : "type-3354", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26588,8 +28000,8 @@ + "alignment" : 4, + "linker_set_key" : "const flat_binder_object *", + "name" : "const flat_binder_object *", +- "referenced_type" : "type-3770", +- "self_type" : "type-3782", ++ "referenced_type" : "type-3763", ++ "self_type" : "type-3775", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26598,7 +28010,7 @@ + "linker_set_key" : "const int *", + "name" : "const int *", + "referenced_type" : "type-624", +- "self_type" : "type-1019", ++ "self_type" : "type-1016", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26606,8 +28018,8 @@ + "alignment" : 4, + "linker_set_key" : "const log_msg *", + "name" : "const log_msg *", +- "referenced_type" : "type-239", +- "self_type" : "type-240", ++ "referenced_type" : "type-238", ++ "self_type" : "type-239", + "size" : 4, + "source_file" : "/system/core/liblog/include/log/log_read.h" + }, +@@ -26625,7 +28037,7 @@ + "linker_set_key" : "const native_handle **", + "name" : "const native_handle **", + "referenced_type" : "type-16", +- "self_type" : "type-3784", ++ "self_type" : "type-3777", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26633,8 +28045,8 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned char *", + "name" : "const unsigned char *", +- "referenced_type" : "type-604", +- "self_type" : "type-1030", ++ "referenced_type" : "type-603", ++ "self_type" : "type-1027", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26642,8 +28054,8 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned int *", + "name" : "const unsigned int *", +- "referenced_type" : "type-246", +- "self_type" : "type-3730", ++ "referenced_type" : "type-245", ++ "self_type" : "type-3723", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -26651,8 +28063,8 @@ + "alignment" : 4, + "linker_set_key" : "const unsigned long long *", + "name" : "const unsigned long long *", +- "referenced_type" : "type-661", +- "self_type" : "type-2353", ++ "referenced_type" : "type-659", ++ "self_type" : "type-2348", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26660,8 +28072,8 @@ + "alignment" : 4, + "linker_set_key" : "const void *", + "name" : "const void *", +- "referenced_type" : "type-138", +- "self_type" : "type-139", ++ "referenced_type" : "type-137", ++ "self_type" : "type-138", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26669,8 +28081,8 @@ + "alignment" : 4, + "linker_set_key" : "const void **", + "name" : "const void **", +- "referenced_type" : "type-139", +- "self_type" : "type-3783", ++ "referenced_type" : "type-138", ++ "self_type" : "type-3776", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26679,7 +28091,7 @@ + "linker_set_key" : "double *", + "name" : "double *", + "referenced_type" : "type-4", +- "self_type" : "type-3778", ++ "self_type" : "type-3771", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26687,8 +28099,8 @@ + "alignment" : 4, + "linker_set_key" : "float *", + "name" : "float *", +- "referenced_type" : "type-298", +- "self_type" : "type-3777", ++ "referenced_type" : "type-297", ++ "self_type" : "type-3770", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26696,8 +28108,8 @@ + "alignment" : 4, + "linker_set_key" : "int (*)(void *)", + "name" : "int (*)(void *)", +- "referenced_type" : "type-303", +- "self_type" : "type-304", ++ "referenced_type" : "type-302", ++ "self_type" : "type-303", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h" + }, +@@ -26706,7 +28118,7 @@ + "linker_set_key" : "int *", + "name" : "int *", + "referenced_type" : "type-19", +- "self_type" : "type-521", ++ "self_type" : "type-519", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26714,8 +28126,8 @@ + "alignment" : 4, + "linker_set_key" : "log_msg *", + "name" : "log_msg *", +- "referenced_type" : "type-236", +- "self_type" : "type-242", ++ "referenced_type" : "type-235", ++ "self_type" : "type-241", + "size" : 4, + "source_file" : "/system/core/liblog/include/log/log_read.h" + }, +@@ -26724,7 +28136,7 @@ + "linker_set_key" : "long long *", + "name" : "long long *", + "referenced_type" : "type-447", +- "self_type" : "type-3776", ++ "self_type" : "type-3769", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26733,7 +28145,7 @@ + "linker_set_key" : "native_handle *", + "name" : "native_handle *", + "referenced_type" : "type-18", +- "self_type" : "type-91", ++ "self_type" : "type-90", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -26742,7 +28154,7 @@ + "linker_set_key" : "short *", + "name" : "short *", + "referenced_type" : "type-2", +- "self_type" : "type-3774", ++ "self_type" : "type-3767", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26751,7 +28163,7 @@ + "linker_set_key" : "signed char *", + "name" : "signed char *", + "referenced_type" : "type-550", +- "self_type" : "type-3773", ++ "self_type" : "type-3766", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26759,8 +28171,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__1::basic_ostream &(*)(std::__1::basic_ostream &)", + "name" : "std::__1::basic_ostream &(*)(std::__1::basic_ostream &)", +- "referenced_type" : "type-2491", +- "self_type" : "type-2494", ++ "referenced_type" : "type-2486", ++ "self_type" : "type-2489", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -26768,8 +28180,8 @@ + "alignment" : 4, + "linker_set_key" : "std::unique_ptr > *", + "name" : "std::unique_ptr > *", +- "referenced_type" : "type-3781", +- "self_type" : "type-3780", ++ "referenced_type" : "type-3774", ++ "self_type" : "type-3773", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26777,8 +28189,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *)>, std::allocator > *)> > > *", + "name" : "std::vector > *)>, std::allocator > *)> > > *", +- "referenced_type" : "type-1251", +- "self_type" : "type-1250", ++ "referenced_type" : "type-1248", ++ "self_type" : "type-1247", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26786,8 +28198,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *)>, std::allocator > *)> > > *", + "name" : "std::vector > *)>, std::allocator > *)> > > *", +- "referenced_type" : "type-2170", +- "self_type" : "type-2169", ++ "referenced_type" : "type-2165", ++ "self_type" : "type-2164", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26795,8 +28207,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *)>, std::allocator > *)> > > *", + "name" : "std::vector > *)>, std::allocator > *)> > > *", +- "referenced_type" : "type-248", +- "self_type" : "type-247", ++ "referenced_type" : "type-247", ++ "self_type" : "type-246", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26804,8 +28216,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *)>, std::allocator > *)> > > *", + "name" : "std::vector > *)>, std::allocator > *)> > > *", +- "referenced_type" : "type-3205", +- "self_type" : "type-3204", ++ "referenced_type" : "type-3198", ++ "self_type" : "type-3197", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26813,8 +28225,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *)>, std::allocator > *)> > > *", + "name" : "std::vector > *)>, std::allocator > *)> > > *", +- "referenced_type" : "type-3282", +- "self_type" : "type-3281", ++ "referenced_type" : "type-3275", ++ "self_type" : "type-3274", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -26822,8 +28234,8 @@ + "alignment" : 4, + "linker_set_key" : "unsigned char *", + "name" : "unsigned char *", +- "referenced_type" : "type-199", +- "self_type" : "type-291", ++ "referenced_type" : "type-198", ++ "self_type" : "type-290", + "size" : 4, + "source_file" : "/system/core/libsystem/include/system/graphics.h" + }, +@@ -26832,7 +28244,7 @@ + "linker_set_key" : "unsigned int *", + "name" : "unsigned int *", + "referenced_type" : "type-1", +- "self_type" : "type-1041", ++ "self_type" : "type-1038", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -26841,7 +28253,7 @@ + "linker_set_key" : "unsigned long long *", + "name" : "unsigned long long *", + "referenced_type" : "type-21", +- "self_type" : "type-2350", ++ "self_type" : "type-2345", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26849,8 +28261,8 @@ + "alignment" : 4, + "linker_set_key" : "unsigned short *", + "name" : "unsigned short *", +- "referenced_type" : "type-132", +- "self_type" : "type-3775", ++ "referenced_type" : "type-131", ++ "self_type" : "type-3768", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26858,8 +28270,8 @@ + "alignment" : 4, + "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)", + "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)", +- "referenced_type" : "type-2352", +- "self_type" : "type-2351", ++ "referenced_type" : "type-2347", ++ "self_type" : "type-2346", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -26867,8 +28279,8 @@ + "alignment" : 4, + "linker_set_key" : "void (*)(const void *, void *, void *)", + "name" : "void (*)(const void *, void *, void *)", +- "referenced_type" : "type-2346", +- "self_type" : "type-2345", ++ "referenced_type" : "type-2341", ++ "self_type" : "type-2340", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -26876,8 +28288,8 @@ + "alignment" : 4, + "linker_set_key" : "void (*)(void *, const char *)", + "name" : "void (*)(void *, const char *)", +- "referenced_type" : "type-2541", +- "self_type" : "type-2542", ++ "referenced_type" : "type-2536", ++ "self_type" : "type-2537", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h" + }, +@@ -26885,8 +28297,8 @@ + "alignment" : 4, + "linker_set_key" : "void *", + "name" : "void *", +- "referenced_type" : "type-106", +- "self_type" : "type-245", ++ "referenced_type" : "type-105", ++ "self_type" : "type-244", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/VectorImpl.h" + }, +@@ -26894,8 +28306,8 @@ + "alignment" : 4, + "linker_set_key" : "void **", + "name" : "void **", +- "referenced_type" : "type-245", +- "self_type" : "type-305", ++ "referenced_type" : "type-244", ++ "self_type" : "type-304", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h" + } +@@ -26907,8 +28319,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase *const", + "name" : "android::RefBase *const", +- "referenced_type" : "type-68", +- "self_type" : "type-3611", ++ "referenced_type" : "type-67", ++ "self_type" : "type-3604", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -26917,8 +28329,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1099", +- "self_type" : "type-1101", ++ "referenced_type" : "type-1096", ++ "self_type" : "type-1098", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26927,8 +28339,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1159", +- "self_type" : "type-1161", ++ "referenced_type" : "type-1156", ++ "self_type" : "type-1158", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26937,8 +28349,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1220", +- "self_type" : "type-1222", ++ "referenced_type" : "type-1217", ++ "self_type" : "type-1219", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26947,8 +28359,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1292", +- "self_type" : "type-1296", ++ "referenced_type" : "type-1289", ++ "self_type" : "type-1291", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26957,8 +28369,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1347", +- "self_type" : "type-1349", ++ "referenced_type" : "type-1344", ++ "self_type" : "type-1346", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26967,8 +28379,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1454", +- "self_type" : "type-1456", ++ "referenced_type" : "type-1450", ++ "self_type" : "type-1452", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26977,8 +28389,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1522", +- "self_type" : "type-1524", ++ "referenced_type" : "type-1518", ++ "self_type" : "type-1520", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26987,8 +28399,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1689", +- "self_type" : "type-1691", ++ "referenced_type" : "type-1685", ++ "self_type" : "type-1687", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -26997,8 +28409,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1701", +- "self_type" : "type-1700", ++ "referenced_type" : "type-1697", ++ "self_type" : "type-1696", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27007,8 +28419,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1728", +- "self_type" : "type-1730", ++ "referenced_type" : "type-1723", ++ "self_type" : "type-1725", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27017,8 +28429,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1791", +- "self_type" : "type-1793", ++ "referenced_type" : "type-1786", ++ "self_type" : "type-1788", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27027,8 +28439,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1863", +- "self_type" : "type-1865", ++ "referenced_type" : "type-1858", ++ "self_type" : "type-1860", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27037,8 +28449,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-1934", +- "self_type" : "type-1936", ++ "referenced_type" : "type-1929", ++ "self_type" : "type-1931", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27047,8 +28459,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2021", +- "self_type" : "type-2023", ++ "referenced_type" : "type-2016", ++ "self_type" : "type-2018", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27057,8 +28469,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2079", +- "self_type" : "type-2081", ++ "referenced_type" : "type-2074", ++ "self_type" : "type-2076", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27067,8 +28479,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2138", +- "self_type" : "type-2140", ++ "referenced_type" : "type-2133", ++ "self_type" : "type-2135", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27077,8 +28489,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2209", +- "self_type" : "type-2213", ++ "referenced_type" : "type-2204", ++ "self_type" : "type-2206", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27087,8 +28499,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2257", +- "self_type" : "type-2259", ++ "referenced_type" : "type-2252", ++ "self_type" : "type-2254", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27097,8 +28509,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2307", +- "self_type" : "type-2309", ++ "referenced_type" : "type-2302", ++ "self_type" : "type-2304", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27107,8 +28519,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2325", +- "self_type" : "type-2327", ++ "referenced_type" : "type-2320", ++ "self_type" : "type-2322", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27117,8 +28529,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2401", +- "self_type" : "type-2403", ++ "referenced_type" : "type-2396", ++ "self_type" : "type-2398", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27127,8 +28539,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2500", +- "self_type" : "type-2502", ++ "referenced_type" : "type-2495", ++ "self_type" : "type-2497", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27137,8 +28549,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2522", +- "self_type" : "type-2534", ++ "referenced_type" : "type-2519", ++ "self_type" : "type-2529", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27147,8 +28559,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2535", +- "self_type" : "type-2537", ++ "referenced_type" : "type-2530", ++ "self_type" : "type-2532", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27157,8 +28569,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2543", +- "self_type" : "type-2545", ++ "referenced_type" : "type-2538", ++ "self_type" : "type-2540", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27167,8 +28579,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2653", +- "self_type" : "type-2655", ++ "referenced_type" : "type-2647", ++ "self_type" : "type-2649", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27177,8 +28589,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2721", +- "self_type" : "type-2723", ++ "referenced_type" : "type-2715", ++ "self_type" : "type-2717", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27197,8 +28609,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2820", +- "self_type" : "type-2819", ++ "referenced_type" : "type-2815", ++ "self_type" : "type-2814", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27207,8 +28619,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2833", +- "self_type" : "type-2835", ++ "referenced_type" : "type-2827", ++ "self_type" : "type-2829", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27217,8 +28629,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2871", +- "self_type" : "type-2873", ++ "referenced_type" : "type-2864", ++ "self_type" : "type-2866", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27227,8 +28639,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-2937", +- "self_type" : "type-2939", ++ "referenced_type" : "type-2929", ++ "self_type" : "type-2932", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27237,8 +28649,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3007", +- "self_type" : "type-3009", ++ "referenced_type" : "type-3000", ++ "self_type" : "type-3002", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27247,8 +28659,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3078", +- "self_type" : "type-3080", ++ "referenced_type" : "type-3071", ++ "self_type" : "type-3073", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27257,8 +28669,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3158", +- "self_type" : "type-3160", ++ "referenced_type" : "type-3151", ++ "self_type" : "type-3153", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27267,8 +28679,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-320", +- "self_type" : "type-322", ++ "referenced_type" : "type-319", ++ "self_type" : "type-321", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27277,8 +28689,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3225", +- "self_type" : "type-3227", ++ "referenced_type" : "type-3218", ++ "self_type" : "type-3220", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27287,8 +28699,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3268", +- "self_type" : "type-3272", ++ "referenced_type" : "type-3261", ++ "self_type" : "type-3265", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27297,8 +28709,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3278", +- "self_type" : "type-3280", ++ "referenced_type" : "type-3271", ++ "self_type" : "type-3273", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27307,8 +28719,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3341", +- "self_type" : "type-3343", ++ "referenced_type" : "type-3334", ++ "self_type" : "type-3336", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27317,8 +28729,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3387", +- "self_type" : "type-3389", ++ "referenced_type" : "type-3380", ++ "self_type" : "type-3382", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27327,8 +28739,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3431", +- "self_type" : "type-3433", ++ "referenced_type" : "type-3424", ++ "self_type" : "type-3426", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27337,8 +28749,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3446", +- "self_type" : "type-3448", ++ "referenced_type" : "type-3439", ++ "self_type" : "type-3441", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27347,8 +28759,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3504", +- "self_type" : "type-3507", ++ "referenced_type" : "type-3497", ++ "self_type" : "type-3499", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27357,8 +28769,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3567", +- "self_type" : "type-3569", ++ "referenced_type" : "type-3560", ++ "self_type" : "type-3562", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27367,8 +28779,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3588", +- "self_type" : "type-3590", ++ "referenced_type" : "type-3581", ++ "self_type" : "type-3583", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27377,8 +28789,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3596", +- "self_type" : "type-3598", ++ "referenced_type" : "type-3589", ++ "self_type" : "type-3591", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27387,8 +28799,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3619", +- "self_type" : "type-3621", ++ "referenced_type" : "type-3612", ++ "self_type" : "type-3614", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27397,8 +28809,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3754", +- "self_type" : "type-3756", ++ "referenced_type" : "type-3747", ++ "self_type" : "type-3749", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27407,8 +28819,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3820", +- "self_type" : "type-3822", ++ "referenced_type" : "type-3813", ++ "self_type" : "type-3815", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27417,8 +28829,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3875", +- "self_type" : "type-3877", ++ "referenced_type" : "type-3868", ++ "self_type" : "type-3870", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27427,8 +28839,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-3891", +- "self_type" : "type-3893", ++ "referenced_type" : "type-3884", ++ "self_type" : "type-3886", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27437,8 +28849,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-4001", +- "self_type" : "type-4003", ++ "referenced_type" : "type-3993", ++ "self_type" : "type-3995", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27447,8 +28859,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-4073", +- "self_type" : "type-4075", ++ "referenced_type" : "type-4065", ++ "self_type" : "type-4067", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27457,8 +28869,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-510", +- "self_type" : "type-513", ++ "referenced_type" : "type-508", ++ "self_type" : "type-510", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27477,8 +28889,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-611", +- "self_type" : "type-613", ++ "referenced_type" : "type-609", ++ "self_type" : "type-611", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27487,8 +28899,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-706", +- "self_type" : "type-708", ++ "referenced_type" : "type-704", ++ "self_type" : "type-706", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27497,8 +28909,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-718", +- "self_type" : "type-717", ++ "referenced_type" : "type-716", ++ "self_type" : "type-715", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27507,8 +28919,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-745", +- "self_type" : "type-747", ++ "referenced_type" : "type-742", ++ "self_type" : "type-744", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27517,8 +28929,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-80", +- "self_type" : "type-82", ++ "referenced_type" : "type-79", ++ "self_type" : "type-81", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27527,8 +28939,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-818", +- "self_type" : "type-820", ++ "referenced_type" : "type-815", ++ "self_type" : "type-817", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27537,8 +28949,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-914", +- "self_type" : "type-916", ++ "referenced_type" : "type-911", ++ "self_type" : "type-913", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27547,8 +28959,8 @@ + "is_const" : true, + "linker_set_key" : "android::RefBase::weakref_impl *const", + "name" : "android::RefBase::weakref_impl *const", +- "referenced_type" : "type-996", +- "self_type" : "type-998", ++ "referenced_type" : "type-993", ++ "self_type" : "type-995", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27558,7 +28970,7 @@ + "linker_set_key" : "android::RefBase::weakref_type *const", + "name" : "android::RefBase::weakref_type *const", + "referenced_type" : "type-35", +- "self_type" : "type-3609", ++ "self_type" : "type-3602", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -27567,8 +28979,8 @@ + "is_const" : true, + "linker_set_key" : "android::hardware::BHwBinder *const", + "name" : "android::hardware::BHwBinder *const", +- "referenced_type" : "type-2332", +- "self_type" : "type-3607", ++ "referenced_type" : "type-2327", ++ "self_type" : "type-3600", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -27577,8 +28989,8 @@ + "is_const" : true, + "linker_set_key" : "android::hardware::IBinder *const", + "name" : "android::hardware::IBinder *const", +- "referenced_type" : "type-2329", +- "self_type" : "type-2366", ++ "referenced_type" : "type-2324", ++ "self_type" : "type-2361", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -27587,8 +28999,8 @@ + "is_const" : true, + "linker_set_key" : "char *const", + "name" : "char *const", +- "referenced_type" : "type-243", +- "self_type" : "type-3790", ++ "referenced_type" : "type-242", ++ "self_type" : "type-3783", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27597,8 +29009,8 @@ + "is_const" : true, + "linker_set_key" : "char const[10]", + "name" : "char const[10]", +- "referenced_type" : "type-3656", +- "self_type" : "type-3655", ++ "referenced_type" : "type-3649", ++ "self_type" : "type-3648", + "size" : 10, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27607,8 +29019,8 @@ + "is_const" : true, + "linker_set_key" : "char const[11]", + "name" : "char const[11]", +- "referenced_type" : "type-3679", +- "self_type" : "type-3678", ++ "referenced_type" : "type-3672", ++ "self_type" : "type-3671", + "size" : 11, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27617,8 +29029,8 @@ + "is_const" : true, + "linker_set_key" : "char const[12]", + "name" : "char const[12]", +- "referenced_type" : "type-3653", +- "self_type" : "type-3652", ++ "referenced_type" : "type-3646", ++ "self_type" : "type-3645", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27627,8 +29039,8 @@ + "is_const" : true, + "linker_set_key" : "char const[13]", + "name" : "char const[13]", +- "referenced_type" : "type-3649", +- "self_type" : "type-3648", ++ "referenced_type" : "type-3642", ++ "self_type" : "type-3641", + "size" : 13, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27637,8 +29049,8 @@ + "is_const" : true, + "linker_set_key" : "char const[14]", + "name" : "char const[14]", +- "referenced_type" : "type-3698", +- "self_type" : "type-3697", ++ "referenced_type" : "type-3691", ++ "self_type" : "type-3690", + "size" : 14, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27647,8 +29059,8 @@ + "is_const" : true, + "linker_set_key" : "char const[15]", + "name" : "char const[15]", +- "referenced_type" : "type-3796", +- "self_type" : "type-3795", ++ "referenced_type" : "type-3789", ++ "self_type" : "type-3788", + "size" : 15, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27657,8 +29069,8 @@ + "is_const" : true, + "linker_set_key" : "char const[16]", + "name" : "char const[16]", +- "referenced_type" : "type-47", +- "self_type" : "type-3681", ++ "referenced_type" : "type-46", ++ "self_type" : "type-3674", + "size" : 16, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27667,8 +29079,8 @@ + "is_const" : true, + "linker_set_key" : "char const[17]", + "name" : "char const[17]", +- "referenced_type" : "type-3701", +- "self_type" : "type-3700", ++ "referenced_type" : "type-3694", ++ "self_type" : "type-3693", + "size" : 17, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27677,8 +29089,8 @@ + "is_const" : true, + "linker_set_key" : "char const[18]", + "name" : "char const[18]", +- "referenced_type" : "type-3685", +- "self_type" : "type-3684", ++ "referenced_type" : "type-3678", ++ "self_type" : "type-3677", + "size" : 18, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27687,8 +29099,8 @@ + "is_const" : true, + "linker_set_key" : "char const[19]", + "name" : "char const[19]", +- "referenced_type" : "type-3717", +- "self_type" : "type-3716", ++ "referenced_type" : "type-3710", ++ "self_type" : "type-3709", + "size" : 19, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27697,8 +29109,8 @@ + "is_const" : true, + "linker_set_key" : "char const[20]", + "name" : "char const[20]", +- "referenced_type" : "type-3695", +- "self_type" : "type-3694", ++ "referenced_type" : "type-3688", ++ "self_type" : "type-3687", + "size" : 20, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27707,8 +29119,8 @@ + "is_const" : true, + "linker_set_key" : "char const[22]", + "name" : "char const[22]", +- "referenced_type" : "type-3720", +- "self_type" : "type-3719", ++ "referenced_type" : "type-3713", ++ "self_type" : "type-3712", + "size" : 22, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27717,8 +29129,8 @@ + "is_const" : true, + "linker_set_key" : "char const[25]", + "name" : "char const[25]", +- "referenced_type" : "type-3710", +- "self_type" : "type-3709", ++ "referenced_type" : "type-3703", ++ "self_type" : "type-3702", + "size" : 25, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27727,8 +29139,8 @@ + "is_const" : true, + "linker_set_key" : "char const[28]", + "name" : "char const[28]", +- "referenced_type" : "type-3733", +- "self_type" : "type-3732", ++ "referenced_type" : "type-3726", ++ "self_type" : "type-3725", + "size" : 28, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27737,8 +29149,8 @@ + "is_const" : true, + "linker_set_key" : "char const[29]", + "name" : "char const[29]", +- "referenced_type" : "type-3707", +- "self_type" : "type-3706", ++ "referenced_type" : "type-3700", ++ "self_type" : "type-3699", + "size" : 29, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27747,8 +29159,8 @@ + "is_const" : true, + "linker_set_key" : "char const[2]", + "name" : "char const[2]", +- "referenced_type" : "type-3660", +- "self_type" : "type-3659", ++ "referenced_type" : "type-3652", ++ "self_type" : "type-3651", + "size" : 2, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27757,8 +29169,8 @@ + "is_const" : true, + "linker_set_key" : "char const[31]", + "name" : "char const[31]", +- "referenced_type" : "type-3692", +- "self_type" : "type-3691", ++ "referenced_type" : "type-3684", ++ "self_type" : "type-3683", + "size" : 31, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27767,8 +29179,8 @@ + "is_const" : true, + "linker_set_key" : "char const[32]", + "name" : "char const[32]", +- "referenced_type" : "type-3724", +- "self_type" : "type-3723", ++ "referenced_type" : "type-3717", ++ "self_type" : "type-3716", + "size" : 32, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27777,8 +29189,8 @@ + "is_const" : true, + "linker_set_key" : "char const[35]", + "name" : "char const[35]", +- "referenced_type" : "type-3713", +- "self_type" : "type-3712", ++ "referenced_type" : "type-3706", ++ "self_type" : "type-3705", + "size" : 35, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27787,8 +29199,8 @@ + "is_const" : true, + "linker_set_key" : "char const[37]", + "name" : "char const[37]", +- "referenced_type" : "type-3704", +- "self_type" : "type-3703", ++ "referenced_type" : "type-3697", ++ "self_type" : "type-3696", + "size" : 37, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27797,8 +29209,8 @@ + "is_const" : true, + "linker_set_key" : "char const[3]", + "name" : "char const[3]", +- "referenced_type" : "type-3672", +- "self_type" : "type-3671", ++ "referenced_type" : "type-3665", ++ "self_type" : "type-3664", + "size" : 3, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27807,8 +29219,8 @@ + "is_const" : true, + "linker_set_key" : "char const[4]", + "name" : "char const[4]", +- "referenced_type" : "type-3793", +- "self_type" : "type-3792", ++ "referenced_type" : "type-3786", ++ "self_type" : "type-3785", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27817,8 +29229,8 @@ + "is_const" : true, + "linker_set_key" : "char const[5]", + "name" : "char const[5]", +- "referenced_type" : "type-3799", +- "self_type" : "type-3798", ++ "referenced_type" : "type-3792", ++ "self_type" : "type-3791", + "size" : 5, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27827,8 +29239,8 @@ + "is_const" : true, + "linker_set_key" : "char const[6]", + "name" : "char const[6]", +- "referenced_type" : "type-3664", +- "self_type" : "type-3663", ++ "referenced_type" : "type-3657", ++ "self_type" : "type-3656", + "size" : 6, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27837,8 +29249,8 @@ + "is_const" : true, + "linker_set_key" : "char const[7]", + "name" : "char const[7]", +- "referenced_type" : "type-3688", +- "self_type" : "type-3687", ++ "referenced_type" : "type-3681", ++ "self_type" : "type-3680", + "size" : 7, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27847,8 +29259,8 @@ + "is_const" : true, + "linker_set_key" : "char const[8]", + "name" : "char const[8]", +- "referenced_type" : "type-3676", +- "self_type" : "type-3675", ++ "referenced_type" : "type-3669", ++ "self_type" : "type-3668", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27857,8 +29269,8 @@ + "is_const" : true, + "linker_set_key" : "char const[9]", + "name" : "char const[9]", +- "referenced_type" : "type-3667", +- "self_type" : "type-3666", ++ "referenced_type" : "type-3660", ++ "self_type" : "type-3659", + "size" : 9, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -27867,8 +29279,8 @@ + "is_const" : true, + "linker_set_key" : "const android::CallStack", + "name" : "const android::CallStack", +- "referenced_type" : "type-256", +- "self_type" : "type-258", ++ "referenced_type" : "type-255", ++ "self_type" : "type-257", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/CallStack.h" + }, +@@ -27877,8 +29289,8 @@ + "is_const" : true, + "linker_set_key" : "const android::KeyedVector >", + "name" : "const android::KeyedVector >", +- "referenced_type" : "type-433", +- "self_type" : "type-3836", ++ "referenced_type" : "type-431", ++ "self_type" : "type-3829", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -27887,8 +29299,8 @@ + "is_const" : true, + "linker_set_key" : "const android::KeyedVector", + "name" : "const android::KeyedVector", +- "referenced_type" : "type-2341", +- "self_type" : "type-2418", ++ "referenced_type" : "type-2336", ++ "self_type" : "type-2413", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h" + }, +@@ -27897,8 +29309,8 @@ + "is_const" : true, + "linker_set_key" : "const android::NativeHandle", + "name" : "const android::NativeHandle", +- "referenced_type" : "type-315", +- "self_type" : "type-333", ++ "referenced_type" : "type-314", ++ "self_type" : "type-332", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/NativeHandle.h" + }, +@@ -27908,7 +29320,7 @@ + "linker_set_key" : "const android::RefBase", + "name" : "const android::RefBase", + "referenced_type" : "type-25", +- "self_type" : "type-62", ++ "self_type" : "type-61", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -27917,8 +29329,8 @@ + "is_const" : true, + "linker_set_key" : "const android::SortedVector > >", + "name" : "const android::SortedVector > >", +- "referenced_type" : "type-426", +- "self_type" : "type-3827", ++ "referenced_type" : "type-424", ++ "self_type" : "type-3820", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -27927,8 +29339,8 @@ + "is_const" : true, + "linker_set_key" : "const android::SortedVector >", + "name" : "const android::SortedVector >", +- "referenced_type" : "type-2342", +- "self_type" : "type-2408", ++ "referenced_type" : "type-2337", ++ "self_type" : "type-2403", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h" + }, +@@ -27937,8 +29349,8 @@ + "is_const" : true, + "linker_set_key" : "const android::String16", + "name" : "const android::String16", +- "referenced_type" : "type-342", +- "self_type" : "type-348", ++ "referenced_type" : "type-341", ++ "self_type" : "type-347", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String16.h" + }, +@@ -27947,8 +29359,8 @@ + "is_const" : true, + "linker_set_key" : "const android::String8", + "name" : "const android::String8", +- "referenced_type" : "type-221", +- "self_type" : "type-223", ++ "referenced_type" : "type-220", ++ "self_type" : "type-222", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String8.h" + }, +@@ -27957,8 +29369,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-432", +- "self_type" : "type-3632", ++ "referenced_type" : "type-430", ++ "self_type" : "type-3625", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -27967,8 +29379,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-431", +- "self_type" : "type-3628", ++ "referenced_type" : "type-429", ++ "self_type" : "type-3621", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -27977,8 +29389,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-252", +- "self_type" : "type-254", ++ "referenced_type" : "type-251", ++ "self_type" : "type-253", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -27987,8 +29399,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-430", +- "self_type" : "type-3624", ++ "referenced_type" : "type-428", ++ "self_type" : "type-3617", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -27997,8 +29409,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-2410", +- "self_type" : "type-2413", ++ "referenced_type" : "type-2405", ++ "self_type" : "type-2408", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -28007,8 +29419,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-428", +- "self_type" : "type-3831", ++ "referenced_type" : "type-426", ++ "self_type" : "type-3824", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -28017,8 +29429,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector >", + "name" : "const android::Vector >", +- "referenced_type" : "type-2518", +- "self_type" : "type-2520", ++ "referenced_type" : "type-2513", ++ "self_type" : "type-2515", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -28027,8 +29439,8 @@ + "is_const" : true, + "linker_set_key" : "const android::Vector", + "name" : "const android::Vector", +- "referenced_type" : "type-2514", +- "self_type" : "type-2515", ++ "referenced_type" : "type-2509", ++ "self_type" : "type-2510", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h" + }, +@@ -28037,8 +29449,8 @@ + "is_const" : true, + "linker_set_key" : "const android::VectorImpl", + "name" : "const android::VectorImpl", +- "referenced_type" : "type-244", +- "self_type" : "type-249", ++ "referenced_type" : "type-243", ++ "self_type" : "type-248", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/VectorImpl.h" + }, +@@ -28047,8 +29459,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BHwBinder", + "name" : "const android::hardware::BHwBinder", +- "referenced_type" : "type-2333", +- "self_type" : "type-2361", ++ "referenced_type" : "type-2328", ++ "self_type" : "type-2356", + "size" : 28, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -28057,8 +29469,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BpHwBinder", + "name" : "const android::hardware::BpHwBinder", +- "referenced_type" : "type-2336", +- "self_type" : "type-2372", ++ "referenced_type" : "type-2331", ++ "self_type" : "type-2367", + "size" : 60, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -28067,8 +29479,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BpHwBinder::Obituary", + "name" : "const android::hardware::BpHwBinder::Obituary", +- "referenced_type" : "type-2374", +- "self_type" : "type-2391", ++ "referenced_type" : "type-2369", ++ "self_type" : "type-2386", + "size" : 16, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -28077,8 +29489,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager", + "name" : "const android::hardware::BpHwBinder::ObjectManager", +- "referenced_type" : "type-2340", +- "self_type" : "type-2425", ++ "referenced_type" : "type-2335", ++ "self_type" : "type-2420", + "size" : 20, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + }, +@@ -28087,8 +29499,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t", + "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t", +- "referenced_type" : "type-2344", +- "self_type" : "type-2398", ++ "referenced_type" : "type-2339", ++ "self_type" : "type-2393", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -28097,8 +29509,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BpHwRefBase", + "name" : "const android::hardware::BpHwRefBase", +- "referenced_type" : "type-2365", +- "self_type" : "type-2370", ++ "referenced_type" : "type-2360", ++ "self_type" : "type-2365", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -28107,8 +29519,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::BufferedTextOutput", + "name" : "const android::hardware::BufferedTextOutput", +- "referenced_type" : "type-2506", +- "self_type" : "type-2510", ++ "referenced_type" : "type-2501", ++ "self_type" : "type-2505", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h" + }, +@@ -28118,7 +29530,7 @@ + "linker_set_key" : "const android::hardware::ConcurrentMap, android::hardware::details::SchedPrio>", + "name" : "const android::hardware::ConcurrentMap, android::hardware::details::SchedPrio>", + "referenced_type" : "type-29", +- "self_type" : "type-1051", ++ "self_type" : "type-1048", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -28127,8 +29539,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ConcurrentMap, bool>", + "name" : "const android::hardware::ConcurrentMap, bool>", +- "referenced_type" : "type-41", +- "self_type" : "type-1053", ++ "referenced_type" : "type-40", ++ "self_type" : "type-1050", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -28137,7 +29549,7 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ConcurrentMap >", + "name" : "const android::hardware::ConcurrentMap >", +- "referenced_type" : "type-378", ++ "referenced_type" : "type-377", + "self_type" : "type-393", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" +@@ -28147,8 +29559,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "name" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", +- "referenced_type" : "type-635", +- "self_type" : "type-644", ++ "referenced_type" : "type-633", ++ "self_type" : "type-642", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -28157,8 +29569,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "name" : "const android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", +- "referenced_type" : "type-398", +- "self_type" : "type-407", ++ "referenced_type" : "type-396", ++ "self_type" : "type-404", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -28167,8 +29579,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::HexDump", + "name" : "const android::hardware::HexDump", +- "referenced_type" : "type-2486", +- "self_type" : "type-2489", ++ "referenced_type" : "type-2481", ++ "self_type" : "type-2484", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -28177,8 +29589,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder", + "name" : "const android::hardware::IBinder", +- "referenced_type" : "type-1444", +- "self_type" : "type-1443", ++ "referenced_type" : "type-1440", ++ "self_type" : "type-1439", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28187,8 +29599,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder", + "name" : "const android::hardware::IBinder", +- "referenced_type" : "type-2328", +- "self_type" : "type-2330", ++ "referenced_type" : "type-2323", ++ "self_type" : "type-2325", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h" + }, +@@ -28197,8 +29609,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder", + "name" : "const android::hardware::IBinder", +- "referenced_type" : "type-2644", +- "self_type" : "type-2643", ++ "referenced_type" : "type-2638", ++ "self_type" : "type-2637", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28207,8 +29619,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder", + "name" : "const android::hardware::IBinder", +- "referenced_type" : "type-3987", +- "self_type" : "type-3986", ++ "referenced_type" : "type-3979", ++ "self_type" : "type-3978", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28217,8 +29629,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder", + "name" : "const android::hardware::IBinder", +- "referenced_type" : "type-489", +- "self_type" : "type-488", ++ "referenced_type" : "type-487", ++ "self_type" : "type-486", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28227,8 +29639,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IBinder::DeathRecipient", + "name" : "const android::hardware::IBinder::DeathRecipient", +- "referenced_type" : "type-2379", +- "self_type" : "type-2420", ++ "referenced_type" : "type-2374", ++ "self_type" : "type-2415", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -28237,8 +29649,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IInterface", + "name" : "const android::hardware::IInterface", +- "referenced_type" : "type-2375", +- "self_type" : "type-2552", ++ "referenced_type" : "type-2370", ++ "self_type" : "type-2547", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28247,8 +29659,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::IPCThreadState", + "name" : "const android::hardware::IPCThreadState", +- "referenced_type" : "type-2434", +- "self_type" : "type-3639", ++ "referenced_type" : "type-2429", ++ "self_type" : "type-3632", + "size" : 272, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -28257,8 +29669,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1039", +- "self_type" : "type-1038", ++ "referenced_type" : "type-1036", ++ "self_type" : "type-1035", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28267,8 +29679,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1127", +- "self_type" : "type-1126", ++ "referenced_type" : "type-1124", ++ "self_type" : "type-1123", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -28277,8 +29689,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1188", +- "self_type" : "type-1187", ++ "referenced_type" : "type-1185", ++ "self_type" : "type-1184", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -28287,8 +29699,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1254", +- "self_type" : "type-1253", ++ "referenced_type" : "type-1251", ++ "self_type" : "type-1250", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -28297,8 +29709,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1308", +- "self_type" : "type-1307", ++ "referenced_type" : "type-1305", ++ "self_type" : "type-1304", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28307,8 +29719,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1371", +- "self_type" : "type-1370", ++ "referenced_type" : "type-1368", ++ "self_type" : "type-1367", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28317,8 +29729,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-1965", +- "self_type" : "type-1964", ++ "referenced_type" : "type-1960", ++ "self_type" : "type-1959", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28327,8 +29739,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2049", +- "self_type" : "type-2048", ++ "referenced_type" : "type-2044", ++ "self_type" : "type-2043", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -28337,8 +29749,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2108", +- "self_type" : "type-2107", ++ "referenced_type" : "type-2103", ++ "self_type" : "type-2102", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -28347,8 +29759,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2173", +- "self_type" : "type-2172", ++ "referenced_type" : "type-2168", ++ "self_type" : "type-2167", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -28357,8 +29769,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2225", +- "self_type" : "type-2224", ++ "referenced_type" : "type-2220", ++ "self_type" : "type-2219", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28367,8 +29779,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2279", +- "self_type" : "type-2278", ++ "referenced_type" : "type-2274", ++ "self_type" : "type-2273", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -28377,8 +29789,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2348", +- "self_type" : "type-2354", ++ "referenced_type" : "type-2343", ++ "self_type" : "type-2349", + "size" : 68, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -28387,8 +29799,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-2572", +- "self_type" : "type-2571", ++ "referenced_type" : "type-2567", ++ "self_type" : "type-2566", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28397,8 +29809,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3104", +- "self_type" : "type-3103", ++ "referenced_type" : "type-3097", ++ "self_type" : "type-3096", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28407,8 +29819,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3184", +- "self_type" : "type-3183", ++ "referenced_type" : "type-3177", ++ "self_type" : "type-3176", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h" + }, +@@ -28417,8 +29829,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3251", +- "self_type" : "type-3250", ++ "referenced_type" : "type-3244", ++ "self_type" : "type-3243", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h" + }, +@@ -28427,8 +29839,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3309", +- "self_type" : "type-3308", ++ "referenced_type" : "type-3301", ++ "self_type" : "type-3300", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h" + }, +@@ -28437,8 +29849,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3354", +- "self_type" : "type-3353", ++ "referenced_type" : "type-3347", ++ "self_type" : "type-3346", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28447,8 +29859,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3410", +- "self_type" : "type-3409", ++ "referenced_type" : "type-3399", ++ "self_type" : "type-3398", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -28457,8 +29869,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-369", +- "self_type" : "type-368", ++ "referenced_type" : "type-368", ++ "self_type" : "type-367", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28467,8 +29879,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Parcel", + "name" : "const android::hardware::Parcel", +- "referenced_type" : "type-3916", +- "self_type" : "type-3915", ++ "referenced_type" : "type-3909", ++ "self_type" : "type-3908", + "size" : 68, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -28477,8 +29889,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ProcessState", + "name" : "const android::hardware::ProcessState", +- "referenced_type" : "type-2439", +- "self_type" : "type-3846", ++ "referenced_type" : "type-2434", ++ "self_type" : "type-3839", + "size" : 128, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28487,8 +29899,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::ProcessState::handle_entry", + "name" : "const android::hardware::ProcessState::handle_entry", +- "referenced_type" : "type-2416", +- "self_type" : "type-3812", ++ "referenced_type" : "type-2411", ++ "self_type" : "type-3804", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -28497,8 +29909,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return", + "name" : "const android::hardware::Return", +- "referenced_type" : "type-807", +- "self_type" : "type-811", ++ "referenced_type" : "type-804", ++ "self_type" : "type-808", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28507,8 +29919,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-801", +- "self_type" : "type-805", ++ "referenced_type" : "type-798", ++ "self_type" : "type-802", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28517,8 +29929,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-986", +- "self_type" : "type-990", ++ "referenced_type" : "type-983", ++ "self_type" : "type-987", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28527,8 +29939,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-1093", +- "self_type" : "type-1097", ++ "referenced_type" : "type-1090", ++ "self_type" : "type-1094", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28537,8 +29949,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-1153", +- "self_type" : "type-1157", ++ "referenced_type" : "type-1150", ++ "self_type" : "type-1154", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28547,8 +29959,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-1213", +- "self_type" : "type-1217", ++ "referenced_type" : "type-1210", ++ "self_type" : "type-1214", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28557,8 +29969,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return >", + "name" : "const android::hardware::Return >", +- "referenced_type" : "type-1284", +- "self_type" : "type-1288", ++ "referenced_type" : "type-1281", ++ "self_type" : "type-1285", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28567,8 +29979,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return", + "name" : "const android::hardware::Return", +- "referenced_type" : "type-309", +- "self_type" : "type-506", ++ "referenced_type" : "type-308", ++ "self_type" : "type-504", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28577,8 +29989,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Return", + "name" : "const android::hardware::Return", +- "referenced_type" : "type-102", +- "self_type" : "type-101", ++ "referenced_type" : "type-101", ++ "self_type" : "type-100", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28587,8 +29999,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::Status", + "name" : "const android::hardware::Status", +- "referenced_type" : "type-104", +- "self_type" : "type-167", ++ "referenced_type" : "type-103", ++ "self_type" : "type-166", + "size" : 20, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28597,8 +30009,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::TypeCode", + "name" : "const android::hardware::TypeCode", +- "referenced_type" : "type-2482", +- "self_type" : "type-2484", ++ "referenced_type" : "type-2477", ++ "self_type" : "type-2479", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -28608,7 +30020,7 @@ + "linker_set_key" : "const android::hardware::details::SchedPrio", + "name" : "const android::hardware::details::SchedPrio", + "referenced_type" : "type-37", +- "self_type" : "type-1050", ++ "self_type" : "type-1047", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -28617,8 +30029,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::Waiter", + "name" : "const android::hardware::details::Waiter", +- "referenced_type" : "type-1772", +- "self_type" : "type-1771", ++ "referenced_type" : "type-1767", ++ "self_type" : "type-1766", + "size" : 52, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28627,8 +30039,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::Waiter", + "name" : "const android::hardware::details::Waiter", +- "referenced_type" : "type-2918", +- "self_type" : "type-2917", ++ "referenced_type" : "type-2910", ++ "self_type" : "type-2909", + "size" : 52, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28637,8 +30049,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::Waiter", + "name" : "const android::hardware::details::Waiter", +- "referenced_type" : "type-797", +- "self_type" : "type-796", ++ "referenced_type" : "type-794", ++ "self_type" : "type-793", + "size" : 52, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28647,8 +30059,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::hidl_pointer >", + "name" : "const android::hardware::details::hidl_pointer >", +- "referenced_type" : "type-1009", +- "self_type" : "type-1076", ++ "referenced_type" : "type-1006", ++ "self_type" : "type-1072", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28657,8 +30069,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::hidl_pointer", + "name" : "const android::hardware::details::hidl_pointer", +- "referenced_type" : "type-620", +- "self_type" : "type-654", ++ "referenced_type" : "type-618", ++ "self_type" : "type-652", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28667,8 +30079,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::hidl_pointer", + "name" : "const android::hardware::details::hidl_pointer", +- "referenced_type" : "type-835", +- "self_type" : "type-853", ++ "referenced_type" : "type-832", ++ "self_type" : "type-850", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28677,8 +30089,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::hidl_pointer", + "name" : "const android::hardware::details::hidl_pointer", +- "referenced_type" : "type-97", +- "self_type" : "type-152", ++ "referenced_type" : "type-96", ++ "self_type" : "type-151", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28697,8 +30109,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::hidl_pointer", + "name" : "const android::hardware::details::hidl_pointer", +- "referenced_type" : "type-519", +- "self_type" : "type-537", ++ "referenced_type" : "type-517", ++ "self_type" : "type-535", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28707,8 +30119,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::details::return_status", + "name" : "const android::hardware::details::return_status", +- "referenced_type" : "type-103", +- "self_type" : "type-174", ++ "referenced_type" : "type-102", ++ "self_type" : "type-173", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -28717,8 +30129,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_array", + "name" : "const android::hardware::hidl_array", +- "referenced_type" : "type-1012", +- "self_type" : "type-2268", ++ "referenced_type" : "type-1009", ++ "self_type" : "type-2263", + "size" : 32, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28727,8 +30139,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_death_recipient", + "name" : "const android::hardware::hidl_death_recipient", +- "referenced_type" : "type-144", +- "self_type" : "type-478", ++ "referenced_type" : "type-143", ++ "self_type" : "type-476", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -28737,8 +30149,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_handle", + "name" : "const android::hardware::hidl_handle", +- "referenced_type" : "type-77", +- "self_type" : "type-79", ++ "referenced_type" : "type-76", ++ "self_type" : "type-78", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28747,8 +30159,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_memory", + "name" : "const android::hardware::hidl_memory", +- "referenced_type" : "type-121", +- "self_type" : "type-123", ++ "referenced_type" : "type-120", ++ "self_type" : "type-122", + "size" : 40, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28757,8 +30169,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_string", + "name" : "const android::hardware::hidl_string", +- "referenced_type" : "type-96", +- "self_type" : "type-110", ++ "referenced_type" : "type-95", ++ "self_type" : "type-109", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28767,8 +30179,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_vec >", + "name" : "const android::hardware::hidl_vec >", +- "referenced_type" : "type-1008", +- "self_type" : "type-2270", ++ "referenced_type" : "type-1005", ++ "self_type" : "type-2264", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28777,8 +30189,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_vec", + "name" : "const android::hardware::hidl_vec", +- "referenced_type" : "type-619", +- "self_type" : "type-622", ++ "referenced_type" : "type-617", ++ "self_type" : "type-620", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28787,8 +30199,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_vec", + "name" : "const android::hardware::hidl_vec", +- "referenced_type" : "type-834", +- "self_type" : "type-1022", ++ "referenced_type" : "type-831", ++ "self_type" : "type-1019", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28797,8 +30209,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_vec::iter", + "name" : "const android::hardware::hidl_vec::iter", +- "referenced_type" : "type-625", +- "self_type" : "type-629", ++ "referenced_type" : "type-622", ++ "self_type" : "type-627", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28807,8 +30219,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_vec", + "name" : "const android::hardware::hidl_vec", +- "referenced_type" : "type-518", +- "self_type" : "type-523", ++ "referenced_type" : "type-516", ++ "self_type" : "type-521", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28817,8 +30229,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hardware::hidl_version", + "name" : "const android::hardware::hidl_version", +- "referenced_type" : "type-131", +- "self_type" : "type-135", ++ "referenced_type" : "type-130", ++ "self_type" : "type-134", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -28827,8 +30239,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase", + "name" : "const android::hidl::base::V1_0::BpHwBase", +- "referenced_type" : "type-419", +- "self_type" : "type-423", ++ "referenced_type" : "type-417", ++ "self_type" : "type-421", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h" + }, +@@ -28837,8 +30249,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::base::V1_0::DebugInfo::Architecture", + "name" : "const android::hidl::base::V1_0::DebugInfo::Architecture", +- "referenced_type" : "type-336", +- "self_type" : "type-338", ++ "referenced_type" : "type-335", ++ "self_type" : "type-337", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -28848,7 +30260,7 @@ + "linker_set_key" : "const android::hidl::base::V1_0::IBase", + "name" : "const android::hidl::base::V1_0::IBase", + "referenced_type" : "type-34", +- "self_type" : "type-382", ++ "self_type" : "type-381", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -28857,8 +30269,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::base::V1_0::IBase *const", + "name" : "const android::hidl::base::V1_0::IBase *const", +- "referenced_type" : "type-381", +- "self_type" : "type-396", ++ "referenced_type" : "type-380", ++ "self_type" : "type-390", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -28867,8 +30279,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceManager", + "name" : "const android::hidl::manager::V1_0::BpHwServiceManager", +- "referenced_type" : "type-873", +- "self_type" : "type-877", ++ "referenced_type" : "type-870", ++ "self_type" : "type-874", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h" + }, +@@ -28877,8 +30289,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceNotification", + "name" : "const android::hidl::manager::V1_0::BpHwServiceNotification", +- "referenced_type" : "type-864", +- "self_type" : "type-869", ++ "referenced_type" : "type-861", ++ "self_type" : "type-866", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h" + }, +@@ -28887,8 +30299,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager", + "name" : "const android::hidl::manager::V1_0::IServiceManager", +- "referenced_type" : "type-552", +- "self_type" : "type-551", ++ "referenced_type" : "type-548", ++ "self_type" : "type-547", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -28897,8 +30309,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo", + "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo", +- "referenced_type" : "type-548", +- "self_type" : "type-1021", ++ "referenced_type" : "type-546", ++ "self_type" : "type-1018", + "size" : 64, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -28907,8 +30319,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::PidConstant", + "name" : "const android::hidl::manager::V1_0::IServiceManager::PidConstant", +- "referenced_type" : "type-547", +- "self_type" : "type-556", ++ "referenced_type" : "type-545", ++ "self_type" : "type-554", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -28917,8 +30329,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::Transport", + "name" : "const android::hidl::manager::V1_0::IServiceManager::Transport", +- "referenced_type" : "type-546", +- "self_type" : "type-554", ++ "referenced_type" : "type-544", ++ "self_type" : "type-552", + "size" : 1, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -28927,8 +30339,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification", + "name" : "const android::hidl::manager::V1_0::IServiceNotification", +- "referenced_type" : "type-541", +- "self_type" : "type-540", ++ "referenced_type" : "type-539", ++ "self_type" : "type-538", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h" + }, +@@ -28937,8 +30349,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_1::BpHwServiceManager", + "name" : "const android::hidl::manager::V1_1::BpHwServiceManager", +- "referenced_type" : "type-881", +- "self_type" : "type-885", ++ "referenced_type" : "type-878", ++ "self_type" : "type-882", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h" + }, +@@ -28947,8 +30359,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_1::IServiceManager", + "name" : "const android::hidl::manager::V1_1::IServiceManager", +- "referenced_type" : "type-562", +- "self_type" : "type-561", ++ "referenced_type" : "type-560", ++ "self_type" : "type-559", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h" + }, +@@ -28957,8 +30369,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_2::BpHwClientCallback", + "name" : "const android::hidl::manager::V1_2::BpHwClientCallback", +- "referenced_type" : "type-890", +- "self_type" : "type-894", ++ "referenced_type" : "type-887", ++ "self_type" : "type-891", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h" + }, +@@ -28967,8 +30379,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_2::BpHwServiceManager", + "name" : "const android::hidl::manager::V1_2::BpHwServiceManager", +- "referenced_type" : "type-774", +- "self_type" : "type-898", ++ "referenced_type" : "type-770", ++ "self_type" : "type-894", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h" + }, +@@ -28977,8 +30389,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_2::IClientCallback", + "name" : "const android::hidl::manager::V1_2::IClientCallback", +- "referenced_type" : "type-544", +- "self_type" : "type-543", ++ "referenced_type" : "type-542", ++ "self_type" : "type-541", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h" + }, +@@ -28987,8 +30399,8 @@ + "is_const" : true, + "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager", + "name" : "const android::hidl::manager::V1_2::IServiceManager", +- "referenced_type" : "type-565", +- "self_type" : "type-564", ++ "referenced_type" : "type-563", ++ "self_type" : "type-562", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h" + }, +@@ -28997,8 +30409,8 @@ + "is_const" : true, + "linker_set_key" : "const android::key_value_pair_t >", + "name" : "const android::key_value_pair_t >", +- "referenced_type" : "type-3807", +- "self_type" : "type-3806", ++ "referenced_type" : "type-3800", ++ "self_type" : "type-3799", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -29007,8 +30419,8 @@ + "is_const" : true, + "linker_set_key" : "const android::key_value_pair_t", + "name" : "const android::key_value_pair_t", +- "referenced_type" : "type-2384", +- "self_type" : "type-2383", ++ "referenced_type" : "type-2379", ++ "self_type" : "type-2378", + "size" : 16, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -29017,8 +30429,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-499", +- "self_type" : "type-3830", ++ "referenced_type" : "type-497", ++ "self_type" : "type-3823", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29027,8 +30439,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-472", +- "self_type" : "type-3640", ++ "referenced_type" : "type-470", ++ "self_type" : "type-3633", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29037,8 +30449,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-2470", +- "self_type" : "type-2498", ++ "referenced_type" : "type-2465", ++ "self_type" : "type-2493", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -29047,8 +30459,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-157", +- "self_type" : "type-162", ++ "referenced_type" : "type-156", ++ "self_type" : "type-161", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29056,16 +30468,16 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-2357", +- "self_type" : "type-2356", ++ "referenced_type" : "type-2352", ++ "self_type" : "type-2351", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-3468", +- "self_type" : "type-3467", ++ "referenced_type" : "type-3461", ++ "self_type" : "type-3460", + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, + { +@@ -29073,8 +30485,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-962", +- "self_type" : "type-2405", ++ "referenced_type" : "type-959", ++ "self_type" : "type-2400", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -29082,32 +30494,32 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-2525", +- "self_type" : "type-2524", ++ "referenced_type" : "type-2518", ++ "self_type" : "type-2517", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-2539", +- "self_type" : "type-2538", ++ "referenced_type" : "type-2534", ++ "self_type" : "type-2533", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-3584", +- "self_type" : "type-3583", ++ "referenced_type" : "type-3577", ++ "self_type" : "type-3576", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-3593", +- "self_type" : "type-3592", ++ "referenced_type" : "type-3586", ++ "self_type" : "type-3585", + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h" + }, + { +@@ -29115,8 +30527,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-71", +- "self_type" : "type-70", ++ "referenced_type" : "type-70", ++ "self_type" : "type-69", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29125,8 +30537,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-968", +- "self_type" : "type-2547", ++ "referenced_type" : "type-965", ++ "self_type" : "type-2542", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29135,8 +30547,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-766", +- "self_type" : "type-765", ++ "referenced_type" : "type-763", ++ "self_type" : "type-762", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29145,8 +30557,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-491", +- "self_type" : "type-496", ++ "referenced_type" : "type-489", ++ "self_type" : "type-494", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29155,8 +30567,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-602", +- "self_type" : "type-606", ++ "referenced_type" : "type-600", ++ "self_type" : "type-604", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29165,8 +30577,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-789", +- "self_type" : "type-794", ++ "referenced_type" : "type-786", ++ "self_type" : "type-790", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29175,8 +30587,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-951", +- "self_type" : "type-950", ++ "referenced_type" : "type-948", ++ "self_type" : "type-947", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -29185,8 +30597,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-142", +- "self_type" : "type-141", ++ "referenced_type" : "type-141", ++ "self_type" : "type-140", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29195,8 +30607,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-356", +- "self_type" : "type-459", ++ "referenced_type" : "type-355", ++ "self_type" : "type-456", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -29205,8 +30617,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-575", +- "self_type" : "type-578", ++ "referenced_type" : "type-573", ++ "self_type" : "type-576", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29215,8 +30627,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-590", +- "self_type" : "type-593", ++ "referenced_type" : "type-588", ++ "self_type" : "type-591", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29225,8 +30637,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-580", +- "self_type" : "type-583", ++ "referenced_type" : "type-578", ++ "self_type" : "type-581", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29235,8 +30647,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-595", +- "self_type" : "type-600", ++ "referenced_type" : "type-593", ++ "self_type" : "type-598", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29245,8 +30657,8 @@ + "is_const" : true, + "linker_set_key" : "const android::sp", + "name" : "const android::sp", +- "referenced_type" : "type-585", +- "self_type" : "type-588", ++ "referenced_type" : "type-583", ++ "self_type" : "type-586", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -29255,8 +30667,8 @@ + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-383", +- "self_type" : "type-469", ++ "referenced_type" : "type-382", ++ "self_type" : "type-467", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -29265,8 +30677,8 @@ + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-944", +- "self_type" : "type-2359", ++ "referenced_type" : "type-941", ++ "self_type" : "type-2354", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h" + }, +@@ -29274,8 +30686,8 @@ + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-1368", +- "self_type" : "type-1367", ++ "referenced_type" : "type-1365", ++ "self_type" : "type-1364", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -29283,8 +30695,8 @@ + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-2382", +- "self_type" : "type-3752", ++ "referenced_type" : "type-2377", ++ "self_type" : "type-3745", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -29292,24 +30704,24 @@ + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-2569", +- "self_type" : "type-2568", ++ "referenced_type" : "type-2564", ++ "self_type" : "type-2563", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-366", +- "self_type" : "type-365", ++ "referenced_type" : "type-365", ++ "self_type" : "type-364", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-3913", +- "self_type" : "type-3912", ++ "referenced_type" : "type-3906", ++ "self_type" : "type-3905", + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, + { +@@ -29317,8 +30729,8 @@ + "is_const" : true, + "linker_set_key" : "const android::wp", + "name" : "const android::wp", +- "referenced_type" : "type-361", +- "self_type" : "type-464", ++ "referenced_type" : "type-360", ++ "self_type" : "type-462", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -29328,7 +30740,7 @@ + "linker_set_key" : "const android::wp", + "name" : "const android::wp", + "referenced_type" : "type-32", +- "self_type" : "type-64", ++ "self_type" : "type-63", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h" + }, +@@ -29337,8 +30749,8 @@ + "is_const" : true, + "linker_set_key" : "const binder_buffer_object", + "name" : "const binder_buffer_object", +- "referenced_type" : "type-3786", +- "self_type" : "type-3785", ++ "referenced_type" : "type-3779", ++ "self_type" : "type-3778", + "size" : 40, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -29347,8 +30759,8 @@ + "is_const" : true, + "linker_set_key" : "const bool", + "name" : "const bool", +- "referenced_type" : "type-44", +- "self_type" : "type-502", ++ "referenced_type" : "type-43", ++ "self_type" : "type-500", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -29357,8 +30769,8 @@ + "is_const" : true, + "linker_set_key" : "const char", + "name" : "const char", +- "referenced_type" : "type-48", +- "self_type" : "type-100", ++ "referenced_type" : "type-47", ++ "self_type" : "type-99", + "size" : 1, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -29367,8 +30779,8 @@ + "is_const" : true, + "linker_set_key" : "const char *const", + "name" : "const char *const", +- "referenced_type" : "type-99", +- "self_type" : "type-2478", ++ "referenced_type" : "type-98", ++ "self_type" : "type-2473", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -29377,8 +30789,8 @@ + "is_const" : true, + "linker_set_key" : "const char16_t", + "name" : "const char16_t", +- "referenced_type" : "type-345", +- "self_type" : "type-344", ++ "referenced_type" : "type-344", ++ "self_type" : "type-343", + "size" : 2, + "source_file" : "/system/core/libutils/include/utils/String16.h" + }, +@@ -29387,8 +30799,8 @@ + "is_const" : true, + "linker_set_key" : "const dirent", + "name" : "const dirent", +- "referenced_type" : "type-1291", +- "self_type" : "type-1290", ++ "referenced_type" : "type-1288", ++ "self_type" : "type-1287", + "size" : 280, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -29397,8 +30809,8 @@ + "is_const" : true, + "linker_set_key" : "const dirent", + "name" : "const dirent", +- "referenced_type" : "type-2208", +- "self_type" : "type-2207", ++ "referenced_type" : "type-2203", ++ "self_type" : "type-2202", + "size" : 280, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -29407,8 +30819,8 @@ + "is_const" : true, + "linker_set_key" : "const dirent", + "name" : "const dirent", +- "referenced_type" : "type-263", +- "self_type" : "type-262", ++ "referenced_type" : "type-262", ++ "self_type" : "type-261", + "size" : 280, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -29417,8 +30829,8 @@ + "is_const" : true, + "linker_set_key" : "const dirent", + "name" : "const dirent", +- "referenced_type" : "type-3211", +- "self_type" : "type-3210", ++ "referenced_type" : "type-3204", ++ "self_type" : "type-3203", + "size" : 280, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -29427,8 +30839,8 @@ + "is_const" : true, + "linker_set_key" : "const dirent", + "name" : "const dirent", +- "referenced_type" : "type-3326", +- "self_type" : "type-3325", ++ "referenced_type" : "type-3319", ++ "self_type" : "type-3318", + "size" : 280, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -29447,8 +30859,8 @@ + "is_const" : true, + "linker_set_key" : "const flat_binder_object", + "name" : "const flat_binder_object", +- "referenced_type" : "type-3771", +- "self_type" : "type-3770", ++ "referenced_type" : "type-3764", ++ "self_type" : "type-3763", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -29457,8 +30869,8 @@ + "is_const" : true, + "linker_set_key" : "const float", + "name" : "const float", +- "referenced_type" : "type-298", +- "self_type" : "type-665", ++ "referenced_type" : "type-297", ++ "self_type" : "type-663", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -29476,400 +30888,400 @@ + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1001", +- "self_type" : "type-1000", ++ "referenced_type" : "type-1100", ++ "self_type" : "type-1099", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1103", +- "self_type" : "type-1102", ++ "referenced_type" : "type-1160", ++ "self_type" : "type-1159", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1163", +- "self_type" : "type-1162", ++ "referenced_type" : "type-11", ++ "self_type" : "type-10", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-11", +- "self_type" : "type-10", ++ "referenced_type" : "type-1221", ++ "self_type" : "type-1220", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1224", +- "self_type" : "type-1223", ++ "referenced_type" : "type-128", ++ "self_type" : "type-127", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1298", +- "self_type" : "type-1297", ++ "referenced_type" : "type-1295", ++ "self_type" : "type-1294", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-129", +- "self_type" : "type-128", ++ "referenced_type" : "type-1348", ++ "self_type" : "type-1347", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1351", +- "self_type" : "type-1350", ++ "referenced_type" : "type-1454", ++ "self_type" : "type-1453", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1458", +- "self_type" : "type-1457", ++ "referenced_type" : "type-1523", ++ "self_type" : "type-1522", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1528", +- "self_type" : "type-1527", ++ "referenced_type" : "type-1690", ++ "self_type" : "type-1689", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1694", +- "self_type" : "type-1693", ++ "referenced_type" : "type-1728", ++ "self_type" : "type-1727", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1733", +- "self_type" : "type-1732", ++ "referenced_type" : "type-1793", ++ "self_type" : "type-1792", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1798", +- "self_type" : "type-1797", ++ "referenced_type" : "type-1819", ++ "self_type" : "type-1818", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1824", +- "self_type" : "type-1823", ++ "referenced_type" : "type-1862", ++ "self_type" : "type-1861", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1867", +- "self_type" : "type-1866", ++ "referenced_type" : "type-1934", ++ "self_type" : "type-1933", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-1939", +- "self_type" : "type-1938", ++ "referenced_type" : "type-2020", ++ "self_type" : "type-2019", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2025", +- "self_type" : "type-2024", ++ "referenced_type" : "type-2078", ++ "self_type" : "type-2077", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2083", +- "self_type" : "type-2082", ++ "referenced_type" : "type-2137", ++ "self_type" : "type-2136", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2142", +- "self_type" : "type-2141", ++ "referenced_type" : "type-2210", ++ "self_type" : "type-2209", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2215", +- "self_type" : "type-2214", ++ "referenced_type" : "type-2256", ++ "self_type" : "type-2255", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2261", +- "self_type" : "type-2260", ++ "referenced_type" : "type-2307", ++ "self_type" : "type-2306", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2312", +- "self_type" : "type-2311", ++ "referenced_type" : "type-2544", ++ "self_type" : "type-2543", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2549", +- "self_type" : "type-2548", ++ "referenced_type" : "type-2651", ++ "self_type" : "type-2650", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2657", +- "self_type" : "type-2656", ++ "referenced_type" : "type-2720", ++ "self_type" : "type-2719", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2727", +- "self_type" : "type-2726", ++ "referenced_type" : "type-2831", ++ "self_type" : "type-2830", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2838", +- "self_type" : "type-2837", ++ "referenced_type" : "type-2869", ++ "self_type" : "type-2868", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2876", +- "self_type" : "type-2875", ++ "referenced_type" : "type-2927", ++ "self_type" : "type-2926", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2934", +- "self_type" : "type-2933", ++ "referenced_type" : "type-2935", ++ "self_type" : "type-2934", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-2942", +- "self_type" : "type-2941", ++ "referenced_type" : "type-3004", ++ "self_type" : "type-3003", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3011", +- "self_type" : "type-3010", ++ "referenced_type" : "type-3076", ++ "self_type" : "type-3075", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3083", +- "self_type" : "type-3082", ++ "referenced_type" : "type-3155", ++ "self_type" : "type-3154", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3162", +- "self_type" : "type-3161", ++ "referenced_type" : "type-3222", ++ "self_type" : "type-3221", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3229", +- "self_type" : "type-3228", ++ "referenced_type" : "type-3277", ++ "self_type" : "type-3276", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3284", +- "self_type" : "type-3283", ++ "referenced_type" : "type-327", ++ "self_type" : "type-326", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-328", +- "self_type" : "type-327", ++ "referenced_type" : "type-3327", ++ "self_type" : "type-3326", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3334", +- "self_type" : "type-3333", ++ "referenced_type" : "type-3338", ++ "self_type" : "type-3337", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3345", +- "self_type" : "type-3344", ++ "referenced_type" : "type-3384", ++ "self_type" : "type-3383", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3391", +- "self_type" : "type-3390", ++ "referenced_type" : "type-3428", ++ "self_type" : "type-3427", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3435", +- "self_type" : "type-3434", ++ "referenced_type" : "type-3888", ++ "self_type" : "type-3887", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-3895", +- "self_type" : "type-3894", ++ "referenced_type" : "type-3997", ++ "self_type" : "type-3996", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-4005", +- "self_type" : "type-4004", ++ "referenced_type" : "type-4070", ++ "self_type" : "type-4069", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-4078", +- "self_type" : "type-4077", ++ "referenced_type" : "type-514", ++ "self_type" : "type-513", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-516", +- "self_type" : "type-515", ++ "referenced_type" : "type-614", ++ "self_type" : "type-613", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-617", +- "self_type" : "type-616", ++ "referenced_type" : "type-709", ++ "self_type" : "type-708", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-711", +- "self_type" : "type-710", ++ "referenced_type" : "type-747", ++ "self_type" : "type-746", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-750", +- "self_type" : "type-749", ++ "referenced_type" : "type-822", ++ "self_type" : "type-821", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-825", +- "self_type" : "type-824", ++ "referenced_type" : "type-84", ++ "self_type" : "type-83", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-855", +- "self_type" : "type-854", ++ "referenced_type" : "type-852", ++ "self_type" : "type-851", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-85", +- "self_type" : "type-84", ++ "referenced_type" : "type-915", ++ "self_type" : "type-914", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iter", + "name" : "const iter", +- "referenced_type" : "type-918", +- "self_type" : "type-917", ++ "referenced_type" : "type-998", ++ "self_type" : "type-997", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -29877,8 +31289,8 @@ + "is_const" : true, + "linker_set_key" : "const log_msg", + "name" : "const log_msg", +- "referenced_type" : "type-236", +- "self_type" : "type-239", ++ "referenced_type" : "type-235", ++ "self_type" : "type-238", + "size" : 5124, + "source_file" : "/system/core/liblog/include/log/log_read.h" + }, +@@ -29888,7 +31300,7 @@ + "linker_set_key" : "const long long", + "name" : "const long long", + "referenced_type" : "type-447", +- "self_type" : "type-653", ++ "self_type" : "type-651", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -29908,7 +31320,7 @@ + "linker_set_key" : "const short", + "name" : "const short", + "referenced_type" : "type-2", +- "self_type" : "type-609", ++ "self_type" : "type-607", + "size" : 2, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -29927,8 +31339,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1035", +- "self_type" : "type-1034", ++ "referenced_type" : "type-1032", ++ "self_type" : "type-1031", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29937,8 +31349,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1112", +- "self_type" : "type-1111", ++ "referenced_type" : "type-1107", ++ "self_type" : "type-1106", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29947,8 +31359,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1173", +- "self_type" : "type-1172", ++ "referenced_type" : "type-1170", ++ "self_type" : "type-1169", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29957,8 +31369,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1231", +- "self_type" : "type-1230", ++ "referenced_type" : "type-1228", ++ "self_type" : "type-1227", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29967,8 +31379,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1305", +- "self_type" : "type-1304", ++ "referenced_type" : "type-1302", ++ "self_type" : "type-1301", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29977,8 +31389,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1358", +- "self_type" : "type-1357", ++ "referenced_type" : "type-1355", ++ "self_type" : "type-1354", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29987,8 +31399,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1465", +- "self_type" : "type-1464", ++ "referenced_type" : "type-1461", ++ "self_type" : "type-1460", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -29997,8 +31409,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1539", +- "self_type" : "type-1538", ++ "referenced_type" : "type-1535", ++ "self_type" : "type-1534", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30007,8 +31419,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1699", +- "self_type" : "type-1698", ++ "referenced_type" : "type-1695", ++ "self_type" : "type-1694", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30017,8 +31429,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1738", +- "self_type" : "type-1737", ++ "referenced_type" : "type-1733", ++ "self_type" : "type-1732", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30027,8 +31439,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1812", +- "self_type" : "type-1811", ++ "referenced_type" : "type-1807", ++ "self_type" : "type-1806", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30037,8 +31449,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1871", +- "self_type" : "type-1870", ++ "referenced_type" : "type-1866", ++ "self_type" : "type-1865", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30047,8 +31459,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1961", +- "self_type" : "type-1960", ++ "referenced_type" : "type-1956", ++ "self_type" : "type-1955", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30057,8 +31469,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2034", +- "self_type" : "type-2033", ++ "referenced_type" : "type-2027", ++ "self_type" : "type-2026", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30067,8 +31479,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2093", +- "self_type" : "type-2092", ++ "referenced_type" : "type-2088", ++ "self_type" : "type-2087", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30077,8 +31489,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2149", +- "self_type" : "type-2148", ++ "referenced_type" : "type-2144", ++ "self_type" : "type-2143", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30087,8 +31499,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2222", +- "self_type" : "type-2221", ++ "referenced_type" : "type-2217", ++ "self_type" : "type-2216", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30097,8 +31509,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2273", +- "self_type" : "type-2272", ++ "referenced_type" : "type-2268", ++ "self_type" : "type-2267", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30107,8 +31519,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2315", +- "self_type" : "type-2314", ++ "referenced_type" : "type-2310", ++ "self_type" : "type-2309", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30127,8 +31539,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2560", +- "self_type" : "type-2559", ++ "referenced_type" : "type-2555", ++ "self_type" : "type-2554", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30137,8 +31549,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2664", +- "self_type" : "type-2663", ++ "referenced_type" : "type-2658", ++ "self_type" : "type-2657", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30147,8 +31559,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2737", +- "self_type" : "type-2736", ++ "referenced_type" : "type-2731", ++ "self_type" : "type-2730", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30157,8 +31569,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2806", +- "self_type" : "type-2805", ++ "referenced_type" : "type-2800", ++ "self_type" : "type-2799", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30167,8 +31579,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2842", +- "self_type" : "type-2841", ++ "referenced_type" : "type-2835", ++ "self_type" : "type-2834", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30177,8 +31589,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2881", +- "self_type" : "type-2880", ++ "referenced_type" : "type-2874", ++ "self_type" : "type-2873", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30187,8 +31599,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2958", +- "self_type" : "type-2957", ++ "referenced_type" : "type-2950", ++ "self_type" : "type-2949", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30197,8 +31609,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3015", +- "self_type" : "type-3014", ++ "referenced_type" : "type-3008", ++ "self_type" : "type-3007", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30207,8 +31619,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3102", +- "self_type" : "type-3101", ++ "referenced_type" : "type-3095", ++ "self_type" : "type-3094", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30217,8 +31629,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3169", +- "self_type" : "type-3168", ++ "referenced_type" : "type-3162", ++ "self_type" : "type-3161", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30227,8 +31639,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3236", +- "self_type" : "type-3235", ++ "referenced_type" : "type-3229", ++ "self_type" : "type-3228", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30237,8 +31649,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3291", +- "self_type" : "type-3290", ++ "referenced_type" : "type-3284", ++ "self_type" : "type-3283", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30247,8 +31659,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3352", +- "self_type" : "type-3351", ++ "referenced_type" : "type-3345", ++ "self_type" : "type-3344", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30257,8 +31669,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3401", +- "self_type" : "type-3400", ++ "referenced_type" : "type-3394", ++ "self_type" : "type-3393", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30267,8 +31679,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-341", +- "self_type" : "type-340", ++ "referenced_type" : "type-340", ++ "self_type" : "type-339", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30277,8 +31689,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3438", +- "self_type" : "type-3437", ++ "referenced_type" : "type-3431", ++ "self_type" : "type-3430", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30287,8 +31699,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3902", +- "self_type" : "type-3901", ++ "referenced_type" : "type-3895", ++ "self_type" : "type-3894", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30297,8 +31709,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-4013", +- "self_type" : "type-4012", ++ "referenced_type" : "type-4005", ++ "self_type" : "type-4004", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30307,8 +31719,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-528", +- "self_type" : "type-527", ++ "referenced_type" : "type-526", ++ "self_type" : "type-525", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30317,8 +31729,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-634", +- "self_type" : "type-633", ++ "referenced_type" : "type-632", ++ "self_type" : "type-631", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30327,8 +31739,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-716", +- "self_type" : "type-715", ++ "referenced_type" : "type-714", ++ "self_type" : "type-713", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30337,8 +31749,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-755", +- "self_type" : "type-754", ++ "referenced_type" : "type-752", ++ "self_type" : "type-751", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30347,8 +31759,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-842", +- "self_type" : "type-841", ++ "referenced_type" : "type-839", ++ "self_type" : "type-838", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30357,8 +31769,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-90", +- "self_type" : "type-89", ++ "referenced_type" : "type-89", ++ "self_type" : "type-88", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30367,8 +31779,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-922", +- "self_type" : "type-921", ++ "referenced_type" : "type-919", ++ "self_type" : "type-918", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h" + }, +@@ -30377,8 +31789,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1069", +- "self_type" : "type-1068", ++ "referenced_type" : "type-1066", ++ "self_type" : "type-1065", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30387,8 +31799,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1125", +- "self_type" : "type-1124", ++ "referenced_type" : "type-1122", ++ "self_type" : "type-1121", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30397,8 +31809,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1186", +- "self_type" : "type-1185", ++ "referenced_type" : "type-1183", ++ "self_type" : "type-1182", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30407,8 +31819,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1249", +- "self_type" : "type-1248", ++ "referenced_type" : "type-1246", ++ "self_type" : "type-1245", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30417,8 +31829,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1324", +- "self_type" : "type-1323", ++ "referenced_type" : "type-1321", ++ "self_type" : "type-1320", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30427,8 +31839,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1486", +- "self_type" : "type-1485", ++ "referenced_type" : "type-1482", ++ "self_type" : "type-1481", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30437,8 +31849,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1714", +- "self_type" : "type-1713", ++ "referenced_type" : "type-1709", ++ "self_type" : "type-1708", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30447,8 +31859,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1829", +- "self_type" : "type-1828", ++ "referenced_type" : "type-1824", ++ "self_type" : "type-1823", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30457,8 +31869,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1881", +- "self_type" : "type-1880", ++ "referenced_type" : "type-1876", ++ "self_type" : "type-1875", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30467,8 +31879,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1993", +- "self_type" : "type-1992", ++ "referenced_type" : "type-1988", ++ "self_type" : "type-1987", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30477,8 +31889,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2047", +- "self_type" : "type-2046", ++ "referenced_type" : "type-2042", ++ "self_type" : "type-2041", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30487,8 +31899,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2106", +- "self_type" : "type-2105", ++ "referenced_type" : "type-2101", ++ "self_type" : "type-2100", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30497,8 +31909,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2168", +- "self_type" : "type-2167", ++ "referenced_type" : "type-2163", ++ "self_type" : "type-2162", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30507,8 +31919,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2241", +- "self_type" : "type-2240", ++ "referenced_type" : "type-2236", ++ "self_type" : "type-2235", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30517,8 +31929,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2295", +- "self_type" : "type-2294", ++ "referenced_type" : "type-2290", ++ "self_type" : "type-2289", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30527,8 +31939,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2685", +- "self_type" : "type-2684", ++ "referenced_type" : "type-2679", ++ "self_type" : "type-2678", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30537,8 +31949,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2859", +- "self_type" : "type-2858", ++ "referenced_type" : "type-2852", ++ "self_type" : "type-2851", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30547,8 +31959,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2972", +- "self_type" : "type-2971", ++ "referenced_type" : "type-2965", ++ "self_type" : "type-2964", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30557,8 +31969,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3025", +- "self_type" : "type-3024", ++ "referenced_type" : "type-3017", ++ "self_type" : "type-3016", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30567,8 +31979,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3129", +- "self_type" : "type-3128", ++ "referenced_type" : "type-3122", ++ "self_type" : "type-3121", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30577,8 +31989,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3182", +- "self_type" : "type-3181", ++ "referenced_type" : "type-3175", ++ "self_type" : "type-3174", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30587,8 +31999,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3249", +- "self_type" : "type-3248", ++ "referenced_type" : "type-3242", ++ "self_type" : "type-3241", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30597,8 +32009,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3306", +- "self_type" : "type-3305", ++ "referenced_type" : "type-3299", ++ "self_type" : "type-3298", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30607,8 +32019,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3374", +- "self_type" : "type-3373", ++ "referenced_type" : "type-3367", ++ "self_type" : "type-3366", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30617,8 +32029,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3424", +- "self_type" : "type-3423", ++ "referenced_type" : "type-3417", ++ "self_type" : "type-3416", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30627,8 +32039,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-4035", +- "self_type" : "type-4034", ++ "referenced_type" : "type-4027", ++ "self_type" : "type-4026", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30637,8 +32049,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-560", +- "self_type" : "type-559", ++ "referenced_type" : "type-558", ++ "self_type" : "type-557", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30647,8 +32059,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-57", +- "self_type" : "type-56", ++ "referenced_type" : "type-56", ++ "self_type" : "type-55", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30657,8 +32069,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-731", +- "self_type" : "type-730", ++ "referenced_type" : "type-728", ++ "self_type" : "type-727", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30667,8 +32079,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-860", +- "self_type" : "type-859", ++ "referenced_type" : "type-857", ++ "self_type" : "type-856", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30677,8 +32089,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-932", +- "self_type" : "type-931", ++ "referenced_type" : "type-929", ++ "self_type" : "type-928", + "size" : 4, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30687,8 +32099,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1067", +- "self_type" : "type-1066", ++ "referenced_type" : "type-1064", ++ "self_type" : "type-1063", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30697,8 +32109,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1123", +- "self_type" : "type-1122", ++ "referenced_type" : "type-1120", ++ "self_type" : "type-1119", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30707,8 +32119,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1184", +- "self_type" : "type-1183", ++ "referenced_type" : "type-1181", ++ "self_type" : "type-1180", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30717,8 +32129,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1247", +- "self_type" : "type-1246", ++ "referenced_type" : "type-1244", ++ "self_type" : "type-1243", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30727,8 +32139,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1322", +- "self_type" : "type-1321", ++ "referenced_type" : "type-1319", ++ "self_type" : "type-1318", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30737,8 +32149,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1484", +- "self_type" : "type-1483", ++ "referenced_type" : "type-1480", ++ "self_type" : "type-1479", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30747,8 +32159,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1712", +- "self_type" : "type-1711", ++ "referenced_type" : "type-1707", ++ "self_type" : "type-1706", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30757,8 +32169,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1827", +- "self_type" : "type-1826", ++ "referenced_type" : "type-1822", ++ "self_type" : "type-1821", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30767,8 +32179,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1879", +- "self_type" : "type-1878", ++ "referenced_type" : "type-1873", ++ "self_type" : "type-1872", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30777,8 +32189,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-1991", +- "self_type" : "type-1990", ++ "referenced_type" : "type-1986", ++ "self_type" : "type-1985", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30787,8 +32199,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2045", +- "self_type" : "type-2044", ++ "referenced_type" : "type-2040", ++ "self_type" : "type-2039", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30797,8 +32209,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2104", +- "self_type" : "type-2103", ++ "referenced_type" : "type-2099", ++ "self_type" : "type-2098", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30807,8 +32219,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2166", +- "self_type" : "type-2165", ++ "referenced_type" : "type-2161", ++ "self_type" : "type-2160", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30817,8 +32229,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2239", +- "self_type" : "type-2238", ++ "referenced_type" : "type-2234", ++ "self_type" : "type-2233", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30827,8 +32239,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2293", +- "self_type" : "type-2292", ++ "referenced_type" : "type-2288", ++ "self_type" : "type-2287", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30837,8 +32249,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2683", +- "self_type" : "type-2682", ++ "referenced_type" : "type-2677", ++ "self_type" : "type-2676", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30847,8 +32259,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2857", +- "self_type" : "type-2856", ++ "referenced_type" : "type-2849", ++ "self_type" : "type-2848", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30857,8 +32269,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-2970", +- "self_type" : "type-2969", ++ "referenced_type" : "type-2963", ++ "self_type" : "type-2962", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30867,8 +32279,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3022", +- "self_type" : "type-3021", ++ "referenced_type" : "type-3015", ++ "self_type" : "type-3014", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30877,8 +32289,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3127", +- "self_type" : "type-3126", ++ "referenced_type" : "type-3120", ++ "self_type" : "type-3119", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30887,8 +32299,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3180", +- "self_type" : "type-3179", ++ "referenced_type" : "type-3173", ++ "self_type" : "type-3172", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30897,8 +32309,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3247", +- "self_type" : "type-3246", ++ "referenced_type" : "type-3240", ++ "self_type" : "type-3239", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30907,8 +32319,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3304", +- "self_type" : "type-3303", ++ "referenced_type" : "type-3297", ++ "self_type" : "type-3296", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30917,8 +32329,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3372", +- "self_type" : "type-3371", ++ "referenced_type" : "type-3365", ++ "self_type" : "type-3364", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30927,8 +32339,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-3422", +- "self_type" : "type-3421", ++ "referenced_type" : "type-3415", ++ "self_type" : "type-3414", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30937,8 +32349,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-4033", +- "self_type" : "type-4032", ++ "referenced_type" : "type-4025", ++ "self_type" : "type-4024", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30947,8 +32359,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-558", +- "self_type" : "type-557", ++ "referenced_type" : "type-54", ++ "self_type" : "type-53", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30957,8 +32369,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-55", +- "self_type" : "type-54", ++ "referenced_type" : "type-556", ++ "self_type" : "type-555", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30967,8 +32379,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-729", +- "self_type" : "type-728", ++ "referenced_type" : "type-726", ++ "self_type" : "type-725", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30977,8 +32389,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-858", +- "self_type" : "type-857", ++ "referenced_type" : "type-855", ++ "self_type" : "type-854", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30987,8 +32399,8 @@ + "is_const" : true, + "linker_set_key" : "const std::array", + "name" : "const std::array", +- "referenced_type" : "type-930", +- "self_type" : "type-929", ++ "referenced_type" : "type-926", ++ "self_type" : "type-925", + "size" : 3, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h" + }, +@@ -30997,8 +32409,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1047", +- "self_type" : "type-1046", ++ "referenced_type" : "type-1044", ++ "self_type" : "type-1043", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31007,8 +32419,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1110", +- "self_type" : "type-1109", ++ "referenced_type" : "type-1109", ++ "self_type" : "type-1108", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31017,8 +32429,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1114", +- "self_type" : "type-1113", ++ "referenced_type" : "type-1111", ++ "self_type" : "type-1110", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31027,8 +32439,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-114", +- "self_type" : "type-113", ++ "referenced_type" : "type-113", ++ "self_type" : "type-112", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31037,8 +32449,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1175", +- "self_type" : "type-1174", ++ "referenced_type" : "type-1172", ++ "self_type" : "type-1171", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31047,8 +32459,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1234", +- "self_type" : "type-1233", ++ "referenced_type" : "type-1231", ++ "self_type" : "type-1230", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31057,8 +32469,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1313", +- "self_type" : "type-1312", ++ "referenced_type" : "type-1310", ++ "self_type" : "type-1309", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31067,8 +32479,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1399", +- "self_type" : "type-1398", ++ "referenced_type" : "type-1395", ++ "self_type" : "type-1394", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31077,8 +32489,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1468", +- "self_type" : "type-1467", ++ "referenced_type" : "type-1464", ++ "self_type" : "type-1463", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -31087,8 +32499,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1547", +- "self_type" : "type-1546", ++ "referenced_type" : "type-1543", ++ "self_type" : "type-1542", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31097,8 +32509,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1775", +- "self_type" : "type-1774", ++ "referenced_type" : "type-1770", ++ "self_type" : "type-1769", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31107,8 +32519,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1816", +- "self_type" : "type-1815", ++ "referenced_type" : "type-1811", ++ "self_type" : "type-1810", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -31117,8 +32529,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1973", +- "self_type" : "type-1972", ++ "referenced_type" : "type-1968", ++ "self_type" : "type-1967", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31127,8 +32539,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2032", +- "self_type" : "type-2031", ++ "referenced_type" : "type-2029", ++ "self_type" : "type-2028", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31137,8 +32549,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2036", +- "self_type" : "type-2035", ++ "referenced_type" : "type-2031", ++ "self_type" : "type-2030", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31147,8 +32559,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-207", +- "self_type" : "type-206", ++ "referenced_type" : "type-206", ++ "self_type" : "type-205", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31157,8 +32569,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2095", +- "self_type" : "type-2094", ++ "referenced_type" : "type-2090", ++ "self_type" : "type-2089", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31167,8 +32579,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2152", +- "self_type" : "type-2151", ++ "referenced_type" : "type-2147", ++ "self_type" : "type-2146", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31177,8 +32589,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2230", +- "self_type" : "type-2229", ++ "referenced_type" : "type-2225", ++ "self_type" : "type-2224", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31187,8 +32599,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2276", +- "self_type" : "type-2275", ++ "referenced_type" : "type-2271", ++ "self_type" : "type-2270", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -31197,8 +32609,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2600", +- "self_type" : "type-2599", ++ "referenced_type" : "type-2594", ++ "self_type" : "type-2593", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31207,8 +32619,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2667", +- "self_type" : "type-2666", ++ "referenced_type" : "type-2661", ++ "self_type" : "type-2660", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -31217,8 +32629,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2745", +- "self_type" : "type-2744", ++ "referenced_type" : "type-2739", ++ "self_type" : "type-2738", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31227,8 +32639,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2815", +- "self_type" : "type-2814", ++ "referenced_type" : "type-2808", ++ "self_type" : "type-2807", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31237,8 +32649,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2879", +- "self_type" : "type-2878", ++ "referenced_type" : "type-2872", ++ "self_type" : "type-2871", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31247,8 +32659,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2962", +- "self_type" : "type-2961", ++ "referenced_type" : "type-2955", ++ "self_type" : "type-2954", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -31257,8 +32669,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3112", +- "self_type" : "type-3111", ++ "referenced_type" : "type-3105", ++ "self_type" : "type-3104", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31267,8 +32679,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3152", +- "self_type" : "type-3151", ++ "referenced_type" : "type-3145", ++ "self_type" : "type-3144", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31277,8 +32689,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3171", +- "self_type" : "type-3170", ++ "referenced_type" : "type-3164", ++ "self_type" : "type-3163", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31287,8 +32699,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3190", +- "self_type" : "type-3189", ++ "referenced_type" : "type-3183", ++ "self_type" : "type-3182", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31297,8 +32709,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3238", +- "self_type" : "type-3237", ++ "referenced_type" : "type-3231", ++ "self_type" : "type-3230", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31307,8 +32719,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3293", +- "self_type" : "type-3292", ++ "referenced_type" : "type-3286", ++ "self_type" : "type-3285", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31317,8 +32729,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3302", +- "self_type" : "type-3301", ++ "referenced_type" : "type-3295", ++ "self_type" : "type-3294", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31327,8 +32739,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3359", +- "self_type" : "type-3358", ++ "referenced_type" : "type-3352", ++ "self_type" : "type-3351", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h" + }, +@@ -31337,8 +32749,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3403", +- "self_type" : "type-3402", ++ "referenced_type" : "type-3396", ++ "self_type" : "type-3395", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h" + }, +@@ -31347,8 +32759,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3943", +- "self_type" : "type-3942", ++ "referenced_type" : "type-3935", ++ "self_type" : "type-3934", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31357,8 +32769,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-4017", +- "self_type" : "type-4016", ++ "referenced_type" : "type-4009", ++ "self_type" : "type-4008", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -31367,8 +32779,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-410", +- "self_type" : "type-409", ++ "referenced_type" : "type-408", ++ "self_type" : "type-407", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31377,8 +32789,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-534", +- "self_type" : "type-533", ++ "referenced_type" : "type-532", ++ "self_type" : "type-531", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h" + }, +@@ -31387,8 +32799,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-647", +- "self_type" : "type-646", ++ "referenced_type" : "type-645", ++ "self_type" : "type-644", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31397,8 +32809,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-800", +- "self_type" : "type-799", ++ "referenced_type" : "type-797", ++ "self_type" : "type-796", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31407,8 +32819,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-847", +- "self_type" : "type-846", ++ "referenced_type" : "type-844", ++ "self_type" : "type-843", + "size" : 12, + "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h" + }, +@@ -31417,8 +32829,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-1542", +- "self_type" : "type-1541", ++ "referenced_type" : "type-1538", ++ "self_type" : "type-1537", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31427,8 +32839,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-2740", +- "self_type" : "type-2739", ++ "referenced_type" : "type-2734", ++ "self_type" : "type-2733", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31437,8 +32849,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-2810", +- "self_type" : "type-2809", ++ "referenced_type" : "type-2804", ++ "self_type" : "type-2803", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31447,8 +32859,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-642", +- "self_type" : "type-641", ++ "referenced_type" : "type-640", ++ "self_type" : "type-639", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31457,8 +32869,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-1395", +- "self_type" : "type-1394", ++ "referenced_type" : "type-1391", ++ "self_type" : "type-1390", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31467,8 +32879,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-2596", +- "self_type" : "type-2595", ++ "referenced_type" : "type-2590", ++ "self_type" : "type-2589", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31477,8 +32889,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-3939", +- "self_type" : "type-3938", ++ "referenced_type" : "type-3931", ++ "self_type" : "type-3930", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31487,8 +32899,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function (void *)>", + "name" : "const std::function (void *)>", +- "referenced_type" : "type-405", +- "self_type" : "type-404", ++ "referenced_type" : "type-403", ++ "self_type" : "type-402", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -31497,8 +32909,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-1338", +- "self_type" : "type-1337", ++ "referenced_type" : "type-1335", ++ "self_type" : "type-1334", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -31507,8 +32919,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-1378", +- "self_type" : "type-1377", ++ "referenced_type" : "type-1375", ++ "self_type" : "type-1374", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -31517,8 +32929,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-2306", +- "self_type" : "type-2305", ++ "referenced_type" : "type-2301", ++ "self_type" : "type-2300", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -31527,8 +32939,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-2579", +- "self_type" : "type-2578", ++ "referenced_type" : "type-2574", ++ "self_type" : "type-2573", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -31537,8 +32949,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-307", +- "self_type" : "type-306", ++ "referenced_type" : "type-306", ++ "self_type" : "type-305", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -31547,8 +32959,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-3643", +- "self_type" : "type-3642", ++ "referenced_type" : "type-3636", ++ "self_type" : "type-3635", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h" + }, +@@ -31557,8 +32969,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-3762", +- "self_type" : "type-3761", ++ "referenced_type" : "type-3755", ++ "self_type" : "type-3754", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h" + }, +@@ -31567,8 +32979,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-377", +- "self_type" : "type-376", ++ "referenced_type" : "type-376", ++ "self_type" : "type-375", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -31577,8 +32989,8 @@ + "is_const" : true, + "linker_set_key" : "const std::function", + "name" : "const std::function", +- "referenced_type" : "type-3923", +- "self_type" : "type-3922", ++ "referenced_type" : "type-3916", ++ "self_type" : "type-3915", + "size" : 24, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h" + }, +@@ -31587,8 +32999,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1017", +- "self_type" : "type-1016", ++ "referenced_type" : "type-1014", ++ "self_type" : "type-1013", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31597,8 +33009,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1108", +- "self_type" : "type-1107", ++ "referenced_type" : "type-1105", ++ "self_type" : "type-1104", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31607,8 +33019,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1168", +- "self_type" : "type-1167", ++ "referenced_type" : "type-1165", ++ "self_type" : "type-1164", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31617,8 +33029,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1229", +- "self_type" : "type-1228", ++ "referenced_type" : "type-1226", ++ "self_type" : "type-1225", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31627,8 +33039,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1303", +- "self_type" : "type-1302", ++ "referenced_type" : "type-1300", ++ "self_type" : "type-1299", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31637,8 +33049,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-1951", +- "self_type" : "type-1950", ++ "referenced_type" : "type-1946", ++ "self_type" : "type-1945", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31647,8 +33059,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-2030", +- "self_type" : "type-2029", ++ "referenced_type" : "type-2025", ++ "self_type" : "type-2024", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31657,8 +33069,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-2088", +- "self_type" : "type-2087", ++ "referenced_type" : "type-2083", ++ "self_type" : "type-2082", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31667,8 +33079,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-2147", +- "self_type" : "type-2146", ++ "referenced_type" : "type-2142", ++ "self_type" : "type-2141", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31677,8 +33089,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-2220", +- "self_type" : "type-2219", ++ "referenced_type" : "type-2215", ++ "self_type" : "type-2214", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31687,8 +33099,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-2266", +- "self_type" : "type-2265", ++ "referenced_type" : "type-2261", ++ "self_type" : "type-2260", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31697,8 +33109,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-3093", +- "self_type" : "type-3092", ++ "referenced_type" : "type-3086", ++ "self_type" : "type-3085", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31707,8 +33119,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-3167", +- "self_type" : "type-3166", ++ "referenced_type" : "type-3160", ++ "self_type" : "type-3159", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31717,8 +33129,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-3234", +- "self_type" : "type-3233", ++ "referenced_type" : "type-3227", ++ "self_type" : "type-3226", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31727,8 +33139,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-3289", +- "self_type" : "type-3288", ++ "referenced_type" : "type-3282", ++ "self_type" : "type-3281", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31737,8 +33149,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-3350", +- "self_type" : "type-3349", ++ "referenced_type" : "type-3343", ++ "self_type" : "type-3342", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31747,8 +33159,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list >", + "name" : "const std::initializer_list >", +- "referenced_type" : "type-3396", +- "self_type" : "type-3395", ++ "referenced_type" : "type-3389", ++ "self_type" : "type-3388", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31757,8 +33169,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1006", +- "self_type" : "type-1005", ++ "referenced_type" : "type-1003", ++ "self_type" : "type-1002", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31767,8 +33179,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1106", +- "self_type" : "type-1105", ++ "referenced_type" : "type-1103", ++ "self_type" : "type-1102", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31777,8 +33189,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1166", +- "self_type" : "type-1165", ++ "referenced_type" : "type-1163", ++ "self_type" : "type-1162", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31787,8 +33199,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1227", +- "self_type" : "type-1226", ++ "referenced_type" : "type-1224", ++ "self_type" : "type-1223", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31797,8 +33209,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1301", +- "self_type" : "type-1300", ++ "referenced_type" : "type-1298", ++ "self_type" : "type-1297", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31807,8 +33219,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-1944", +- "self_type" : "type-1943", ++ "referenced_type" : "type-1939", ++ "self_type" : "type-1938", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31817,8 +33229,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-2028", +- "self_type" : "type-2027", ++ "referenced_type" : "type-2023", ++ "self_type" : "type-2022", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31827,8 +33239,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-2086", +- "self_type" : "type-2085", ++ "referenced_type" : "type-2081", ++ "self_type" : "type-2080", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31837,8 +33249,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-2145", +- "self_type" : "type-2144", ++ "referenced_type" : "type-2140", ++ "self_type" : "type-2139", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31847,8 +33259,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-2218", +- "self_type" : "type-2217", ++ "referenced_type" : "type-2213", ++ "self_type" : "type-2212", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31857,8 +33269,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-2264", +- "self_type" : "type-2263", ++ "referenced_type" : "type-2259", ++ "self_type" : "type-2258", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31867,8 +33279,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-3087", +- "self_type" : "type-3086", ++ "referenced_type" : "type-3080", ++ "self_type" : "type-3079", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31877,8 +33289,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-3165", +- "self_type" : "type-3164", ++ "referenced_type" : "type-3158", ++ "self_type" : "type-3157", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31887,8 +33299,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-3232", +- "self_type" : "type-3231", ++ "referenced_type" : "type-3225", ++ "self_type" : "type-3224", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31897,8 +33309,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-3287", +- "self_type" : "type-3286", ++ "referenced_type" : "type-3280", ++ "self_type" : "type-3279", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31907,8 +33319,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-3348", +- "self_type" : "type-3347", ++ "referenced_type" : "type-3341", ++ "self_type" : "type-3340", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31917,8 +33329,8 @@ + "is_const" : true, + "linker_set_key" : "const std::initializer_list", + "name" : "const std::initializer_list", +- "referenced_type" : "type-3394", +- "self_type" : "type-3393", ++ "referenced_type" : "type-3387", ++ "self_type" : "type-3386", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31927,8 +33339,8 @@ + "is_const" : true, + "linker_set_key" : "const std::unique_ptr >", + "name" : "const std::unique_ptr >", +- "referenced_type" : "type-3768", +- "self_type" : "type-3767", ++ "referenced_type" : "type-3761", ++ "self_type" : "type-3760", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +@@ -31937,8 +33349,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-1805", +- "self_type" : "type-1804", ++ "referenced_type" : "type-1800", ++ "self_type" : "type-1799", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31947,8 +33359,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-2950", +- "self_type" : "type-2949", ++ "referenced_type" : "type-2943", ++ "self_type" : "type-2942", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31957,8 +33369,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-832", +- "self_type" : "type-831", ++ "referenced_type" : "type-829", ++ "self_type" : "type-828", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -31967,8 +33379,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1081", +- "self_type" : "type-1080", ++ "referenced_type" : "type-1078", ++ "self_type" : "type-1077", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31977,8 +33389,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1133", +- "self_type" : "type-1132", ++ "referenced_type" : "type-1130", ++ "self_type" : "type-1129", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31987,8 +33399,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1152", +- "self_type" : "type-1151", ++ "referenced_type" : "type-1149", ++ "self_type" : "type-1148", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -31997,8 +33409,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1171", +- "self_type" : "type-1170", ++ "referenced_type" : "type-1168", ++ "self_type" : "type-1167", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32007,8 +33419,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1194", +- "self_type" : "type-1193", ++ "referenced_type" : "type-1191", ++ "self_type" : "type-1190", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32017,8 +33429,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1261", +- "self_type" : "type-1260", ++ "referenced_type" : "type-1258", ++ "self_type" : "type-1257", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32027,8 +33439,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1327", +- "self_type" : "type-1326", ++ "referenced_type" : "type-1324", ++ "self_type" : "type-1323", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32037,8 +33449,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1385", +- "self_type" : "type-1384", ++ "referenced_type" : "type-1382", ++ "self_type" : "type-1381", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32047,8 +33459,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1493", +- "self_type" : "type-1492", ++ "referenced_type" : "type-1489", ++ "self_type" : "type-1488", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32057,8 +33469,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1557", +- "self_type" : "type-1556", ++ "referenced_type" : "type-1553", ++ "self_type" : "type-1552", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32067,8 +33479,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-156", +- "self_type" : "type-155", ++ "referenced_type" : "type-155", ++ "self_type" : "type-154", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32077,8 +33489,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1717", +- "self_type" : "type-1716", ++ "referenced_type" : "type-1712", ++ "self_type" : "type-1711", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32087,8 +33499,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1742", +- "self_type" : "type-1741", ++ "referenced_type" : "type-1737", ++ "self_type" : "type-1736", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32097,8 +33509,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1851", +- "self_type" : "type-1850", ++ "referenced_type" : "type-1846", ++ "self_type" : "type-1845", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32107,8 +33519,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1885", +- "self_type" : "type-1884", ++ "referenced_type" : "type-1879", ++ "self_type" : "type-1878", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32117,8 +33529,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-1890", +- "self_type" : "type-1889", ++ "referenced_type" : "type-1885", ++ "self_type" : "type-1884", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32127,8 +33539,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2005", +- "self_type" : "type-2004", ++ "referenced_type" : "type-2000", ++ "self_type" : "type-1999", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32137,8 +33549,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2055", +- "self_type" : "type-2054", ++ "referenced_type" : "type-2050", ++ "self_type" : "type-2049", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32147,8 +33559,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2073", +- "self_type" : "type-2072", ++ "referenced_type" : "type-2068", ++ "self_type" : "type-2067", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32157,8 +33569,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2091", +- "self_type" : "type-2090", ++ "referenced_type" : "type-2086", ++ "self_type" : "type-2085", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32167,8 +33579,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2114", +- "self_type" : "type-2113", ++ "referenced_type" : "type-2109", ++ "self_type" : "type-2108", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32177,8 +33589,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-217", +- "self_type" : "type-216", ++ "referenced_type" : "type-216", ++ "self_type" : "type-215", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32187,8 +33599,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2180", +- "self_type" : "type-2179", ++ "referenced_type" : "type-2175", ++ "self_type" : "type-2174", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32197,8 +33609,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-220", +- "self_type" : "type-219", ++ "referenced_type" : "type-219", ++ "self_type" : "type-218", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32207,8 +33619,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2244", +- "self_type" : "type-2243", ++ "referenced_type" : "type-2239", ++ "self_type" : "type-2238", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32217,8 +33629,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2299", +- "self_type" : "type-2298", ++ "referenced_type" : "type-2294", ++ "self_type" : "type-2293", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32227,8 +33639,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2320", +- "self_type" : "type-2319", ++ "referenced_type" : "type-2314", ++ "self_type" : "type-2313", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32237,8 +33649,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2586", +- "self_type" : "type-2585", ++ "referenced_type" : "type-2581", ++ "self_type" : "type-2580", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32247,8 +33659,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2692", +- "self_type" : "type-2691", ++ "referenced_type" : "type-2686", ++ "self_type" : "type-2685", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32257,8 +33669,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2755", +- "self_type" : "type-2754", ++ "referenced_type" : "type-2749", ++ "self_type" : "type-2748", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32267,8 +33679,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2826", +- "self_type" : "type-2825", ++ "referenced_type" : "type-2820", ++ "self_type" : "type-2819", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32277,8 +33689,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2862", +- "self_type" : "type-2861", ++ "referenced_type" : "type-2855", ++ "self_type" : "type-2854", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32287,8 +33699,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2885", +- "self_type" : "type-2884", ++ "referenced_type" : "type-2878", ++ "self_type" : "type-2877", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32297,8 +33709,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-2995", +- "self_type" : "type-2994", ++ "referenced_type" : "type-2987", ++ "self_type" : "type-2986", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32307,8 +33719,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3006", +- "self_type" : "type-3005", ++ "referenced_type" : "type-2999", ++ "self_type" : "type-2998", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32317,8 +33729,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3028", +- "self_type" : "type-3027", ++ "referenced_type" : "type-3021", ++ "self_type" : "type-3020", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32327,8 +33739,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3141", +- "self_type" : "type-3140", ++ "referenced_type" : "type-3134", ++ "self_type" : "type-3133", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32337,8 +33749,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3193", +- "self_type" : "type-3192", ++ "referenced_type" : "type-3186", ++ "self_type" : "type-3185", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32347,8 +33759,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3199", +- "self_type" : "type-3198", ++ "referenced_type" : "type-3192", ++ "self_type" : "type-3191", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32357,8 +33769,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3218", +- "self_type" : "type-3217", ++ "referenced_type" : "type-3211", ++ "self_type" : "type-3210", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32367,8 +33779,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3257", +- "self_type" : "type-3256", ++ "referenced_type" : "type-3250", ++ "self_type" : "type-3249", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32377,8 +33789,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3315", +- "self_type" : "type-3314", ++ "referenced_type" : "type-3308", ++ "self_type" : "type-3307", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32387,8 +33799,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3370", +- "self_type" : "type-3369", ++ "referenced_type" : "type-3363", ++ "self_type" : "type-3362", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32397,8 +33809,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3377", +- "self_type" : "type-3376", ++ "referenced_type" : "type-3370", ++ "self_type" : "type-3369", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32407,8 +33819,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3407", +- "self_type" : "type-3406", ++ "referenced_type" : "type-3403", ++ "self_type" : "type-3402", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32417,8 +33829,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3427", +- "self_type" : "type-3426", ++ "referenced_type" : "type-3420", ++ "self_type" : "type-3419", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32427,8 +33839,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3441", +- "self_type" : "type-3440", ++ "referenced_type" : "type-3434", ++ "self_type" : "type-3433", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32437,8 +33849,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-389", +- "self_type" : "type-388", ++ "referenced_type" : "type-388", ++ "self_type" : "type-387", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32447,8 +33859,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-3929", +- "self_type" : "type-3928", ++ "referenced_type" : "type-3922", ++ "self_type" : "type-3921", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32457,8 +33869,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-4043", +- "self_type" : "type-4042", ++ "referenced_type" : "type-4035", ++ "self_type" : "type-4034", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32467,8 +33879,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-569", +- "self_type" : "type-568", ++ "referenced_type" : "type-567", ++ "self_type" : "type-566", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32477,8 +33889,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-60", +- "self_type" : "type-59", ++ "referenced_type" : "type-59", ++ "self_type" : "type-58", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32487,8 +33899,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-658", +- "self_type" : "type-657", ++ "referenced_type" : "type-656", ++ "self_type" : "type-655", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32497,8 +33909,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-734", +- "self_type" : "type-733", ++ "referenced_type" : "type-731", ++ "self_type" : "type-730", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32507,8 +33919,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-759", +- "self_type" : "type-758", ++ "referenced_type" : "type-756", ++ "self_type" : "type-755", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32517,8 +33929,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-902", +- "self_type" : "type-901", ++ "referenced_type" : "type-899", ++ "self_type" : "type-898", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32527,8 +33939,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-936", +- "self_type" : "type-935", ++ "referenced_type" : "type-932", ++ "self_type" : "type-931", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32537,8 +33949,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-941", +- "self_type" : "type-940", ++ "referenced_type" : "type-938", ++ "self_type" : "type-937", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32547,8 +33959,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector > *)>, std::allocator > *)> > >", + "name" : "const std::vector > *)>, std::allocator > *)> > >", +- "referenced_type" : "type-94", +- "self_type" : "type-93", ++ "referenced_type" : "type-93", ++ "self_type" : "type-92", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -32557,8 +33969,8 @@ + "is_const" : true, + "linker_set_key" : "const unsigned char", + "name" : "const unsigned char", +- "referenced_type" : "type-199", +- "self_type" : "type-604", ++ "referenced_type" : "type-198", ++ "self_type" : "type-603", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -32567,8 +33979,8 @@ + "is_const" : true, + "linker_set_key" : "const unsigned char *const", + "name" : "const unsigned char *const", +- "referenced_type" : "type-1030", +- "self_type" : "type-3727", ++ "referenced_type" : "type-1027", ++ "self_type" : "type-3720", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -32578,7 +33990,7 @@ + "linker_set_key" : "const unsigned int", + "name" : "const unsigned int", + "referenced_type" : "type-1", +- "self_type" : "type-246", ++ "self_type" : "type-245", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -32587,8 +33999,8 @@ + "is_const" : true, + "linker_set_key" : "const unsigned int *const", + "name" : "const unsigned int *const", +- "referenced_type" : "type-3730", +- "self_type" : "type-3729", ++ "referenced_type" : "type-3723", ++ "self_type" : "type-3722", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -32598,7 +34010,7 @@ + "linker_set_key" : "const unsigned long long", + "name" : "const unsigned long long", + "referenced_type" : "type-21", +- "self_type" : "type-661", ++ "self_type" : "type-659", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -32607,8 +34019,8 @@ + "is_const" : true, + "linker_set_key" : "const unsigned short", + "name" : "const unsigned short", +- "referenced_type" : "type-132", +- "self_type" : "type-614", ++ "referenced_type" : "type-131", ++ "self_type" : "type-612", + "size" : 2, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -32616,8 +34028,8 @@ + "is_const" : true, + "linker_set_key" : "const void", + "name" : "const void", +- "referenced_type" : "type-106", +- "self_type" : "type-138", ++ "referenced_type" : "type-105", ++ "self_type" : "type-137", + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, + { +@@ -32625,8 +34037,8 @@ + "is_const" : true, + "linker_set_key" : "const void *const", + "name" : "const void *const", +- "referenced_type" : "type-139", +- "self_type" : "type-2386", ++ "referenced_type" : "type-138", ++ "self_type" : "type-2381", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h" + }, +@@ -32635,8 +34047,8 @@ + "is_const" : true, + "linker_set_key" : "void *const", + "name" : "void *const", +- "referenced_type" : "type-245", +- "self_type" : "type-3669", ++ "referenced_type" : "type-244", ++ "self_type" : "type-3662", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h" + }, +@@ -32645,8 +34057,8 @@ + "is_volatile" : true, + "linker_set_key" : "volatile bool", + "name" : "volatile bool", +- "referenced_type" : "type-44", +- "self_type" : "type-457", ++ "referenced_type" : "type-43", ++ "self_type" : "type-455", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/Thread.h" + }, +@@ -32656,7 +34068,7 @@ + "linker_set_key" : "volatile int", + "name" : "volatile int", + "referenced_type" : "type-19", +- "self_type" : "type-2337", ++ "self_type" : "type-2332", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h" + } +@@ -32677,20 +34089,20 @@ + "access" : "private", + "field_name" : "d_", + "field_offset" : 32, +- "referenced_type" : "type-2504" ++ "referenced_type" : "type-2499" + }, + { + "access" : "private", + "field_name" : "s_", + "field_offset" : 64, +- "referenced_type" : "type-2505" ++ "referenced_type" : "type-2500" + } + ], + "linker_set_key" : "Renamer", + "name" : "Renamer", + "record_kind" : "class", +- "referenced_type" : "type-2503", +- "self_type" : "type-2503", ++ "referenced_type" : "type-2498", ++ "self_type" : "type-2498", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/RefBase.h", + "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jE7Renamer", +@@ -32723,14 +34135,14 @@ + { + "access" : "private", + "field_name" : "mFrameLines", +- "referenced_type" : "type-252" ++ "referenced_type" : "type-251" + } + ], + "linker_set_key" : "android::CallStack", + "name" : "android::CallStack", + "record_kind" : "class", +- "referenced_type" : "type-256", +- "self_type" : "type-256", ++ "referenced_type" : "type-255", ++ "self_type" : "type-255", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/CallStack.h", + "unique_id" : "_ZTSN7android9CallStackE" +@@ -32739,8 +34151,8 @@ + "alignment" : 1, + "linker_set_key" : "android::CallStack::StackDeleter", + "name" : "android::CallStack::StackDeleter", +- "referenced_type" : "type-260", +- "self_type" : "type-260", ++ "referenced_type" : "type-259", ++ "self_type" : "type-259", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/CallStack.h", + "unique_id" : "_ZTSN7android9CallStack12StackDeleterE" +@@ -32749,8 +34161,8 @@ + "alignment" : 1, + "linker_set_key" : "android::CompileTimeAssert", + "name" : "android::CompileTimeAssert", +- "referenced_type" : "type-3804", +- "self_type" : "type-3804", ++ "referenced_type" : "type-3797", ++ "self_type" : "type-3797", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/Debug.h", + "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE" +@@ -32762,14 +34174,14 @@ + { + "access" : "private", + "field_name" : "mCond", +- "referenced_type" : "type-443" ++ "referenced_type" : "type-441" + } + ], + "linker_set_key" : "android::Condition", + "name" : "android::Condition", + "record_kind" : "class", +- "referenced_type" : "type-442", +- "self_type" : "type-442", ++ "referenced_type" : "type-440", ++ "self_type" : "type-440", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Condition.h", + "unique_id" : "_ZTSN7android9ConditionE" +@@ -32781,17 +34193,17 @@ + { + "access" : "private", + "field_name" : "mVector", +- "referenced_type" : "type-426" ++ "referenced_type" : "type-424" + } + ], + "linker_set_key" : "android::KeyedVector >", + "name" : "android::KeyedVector >", + "record_kind" : "class", +- "referenced_type" : "type-433", +- "self_type" : "type-433", ++ "referenced_type" : "type-431", ++ "self_type" : "type-431", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h", +- "template_args" : [ "type-342", "type-71" ], ++ "template_args" : [ "type-341", "type-70" ], + "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE" + }, + { +@@ -32801,17 +34213,17 @@ + { + "access" : "private", + "field_name" : "mVector", +- "referenced_type" : "type-2342" ++ "referenced_type" : "type-2337" + } + ], + "linker_set_key" : "android::KeyedVector", + "name" : "android::KeyedVector", + "record_kind" : "class", +- "referenced_type" : "type-2341", +- "self_type" : "type-2341", ++ "referenced_type" : "type-2336", ++ "self_type" : "type-2336", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/KeyedVector.h", +- "template_args" : [ "type-139", "type-2344" ], ++ "template_args" : [ "type-138", "type-2339" ], + "unique_id" : "_ZTSN7android11KeyedVectorIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { +@@ -32821,17 +34233,17 @@ + { + "access" : "private", + "field_name" : "mCount", +- "referenced_type" : "type-314" ++ "referenced_type" : "type-313" + } + ], + "linker_set_key" : "android::LightRefBase", + "name" : "android::LightRefBase", + "record_kind" : "class", +- "referenced_type" : "type-313", +- "self_type" : "type-313", ++ "referenced_type" : "type-312", ++ "self_type" : "type-312", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/LightRefBase.h", +- "template_args" : [ "type-315" ], ++ "template_args" : [ "type-314" ], + "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE" + }, + { +@@ -32841,17 +34253,17 @@ + { + "access" : "private", + "field_name" : "mCount", +- "referenced_type" : "type-181" ++ "referenced_type" : "type-180" + } + ], + "linker_set_key" : "android::LightRefBase", + "name" : "android::LightRefBase", + "record_kind" : "class", +- "referenced_type" : "type-180", +- "self_type" : "type-180", ++ "referenced_type" : "type-179", ++ "self_type" : "type-179", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/LightRefBase.h", +- "template_args" : [ "type-182" ], ++ "template_args" : [ "type-181" ], + "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE" + }, + { +@@ -32861,14 +34273,14 @@ + { + "access" : "private", + "field_name" : "mMutex", +- "referenced_type" : "type-437" ++ "referenced_type" : "type-434" + } + ], + "linker_set_key" : "android::Mutex", + "name" : "android::Mutex", + "record_kind" : "class", +- "referenced_type" : "type-436", +- "self_type" : "type-436", ++ "referenced_type" : "type-433", ++ "self_type" : "type-433", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Mutex.h", + "unique_id" : "_ZTSN7android5MutexE" +@@ -32880,14 +34292,14 @@ + { + "access" : "private", + "field_name" : "mLock", +- "referenced_type" : "type-440" ++ "referenced_type" : "type-438" + } + ], + "linker_set_key" : "android::Mutex::Autolock", + "name" : "android::Mutex::Autolock", + "record_kind" : "class", +- "referenced_type" : "type-439", +- "self_type" : "type-439", ++ "referenced_type" : "type-437", ++ "self_type" : "type-437", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/Mutex.h", + "unique_id" : "_ZTSN7android5Mutex8AutolockE" +@@ -32897,7 +34309,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-313" ++ "referenced_type" : "type-312" + } + ], + "fields" : +@@ -32906,20 +34318,20 @@ + "access" : "private", + "field_name" : "mHandle", + "field_offset" : 32, +- "referenced_type" : "type-91" ++ "referenced_type" : "type-90" + }, + { + "access" : "private", + "field_name" : "mOwnsHandle", + "field_offset" : 64, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::NativeHandle", + "name" : "android::NativeHandle", + "record_kind" : "class", +- "referenced_type" : "type-315", +- "self_type" : "type-315", ++ "referenced_type" : "type-314", ++ "self_type" : "type-314", + "size" : 12, + "source_file" : "/system/core/libutils/include/utils/NativeHandle.h", + "unique_id" : "_ZTSN7android12NativeHandleE" +@@ -32931,14 +34343,14 @@ + { + "access" : "private", + "field_name" : "mRWLock", +- "referenced_type" : "type-449" ++ "referenced_type" : "type-445" + } + ], + "linker_set_key" : "android::RWLock", + "name" : "android::RWLock", + "record_kind" : "class", +- "referenced_type" : "type-448", +- "self_type" : "type-448", ++ "referenced_type" : "type-444", ++ "self_type" : "type-444", + "size" : 40, + "source_file" : "/system/core/libutils/include/utils/RWLock.h", + "unique_id" : "_ZTSN7android6RWLockE" +@@ -32950,14 +34362,14 @@ + { + "access" : "private", + "field_name" : "mLock", +- "referenced_type" : "type-452" ++ "referenced_type" : "type-450" + } + ], + "linker_set_key" : "android::RWLock::AutoRLock", + "name" : "android::RWLock::AutoRLock", + "record_kind" : "class", +- "referenced_type" : "type-451", +- "self_type" : "type-451", ++ "referenced_type" : "type-449", ++ "self_type" : "type-449", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RWLock.h", + "unique_id" : "_ZTSN7android6RWLock9AutoRLockE" +@@ -32969,14 +34381,14 @@ + { + "access" : "private", + "field_name" : "mLock", +- "referenced_type" : "type-452" ++ "referenced_type" : "type-450" + } + ], + "linker_set_key" : "android::RWLock::AutoWLock", + "name" : "android::RWLock::AutoWLock", + "record_kind" : "class", +- "referenced_type" : "type-455", +- "self_type" : "type-455", ++ "referenced_type" : "type-452", ++ "self_type" : "type-452", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/RWLock.h", + "unique_id" : "_ZTSN7android6RWLock9AutoWLockE" +@@ -33047,8 +34459,8 @@ + "linker_set_key" : "android::ReferenceMover", + "name" : "android::ReferenceMover", + "record_kind" : "class", +- "referenced_type" : "type-75", +- "self_type" : "type-75", ++ "referenced_type" : "type-74", ++ "self_type" : "type-74", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/RefBase.h", + "unique_id" : "_ZTSN7android14ReferenceMoverE" +@@ -33091,8 +34503,8 @@ + "linker_set_key" : "android::ScopedTrace", + "name" : "android::ScopedTrace", + "record_kind" : "class", +- "referenced_type" : "type-1064", +- "self_type" : "type-1064", ++ "referenced_type" : "type-1061", ++ "self_type" : "type-1061", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/Trace.h", + "unique_id" : "_ZTSN7android11ScopedTraceE" +@@ -33103,17 +34515,17 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-251" ++ "referenced_type" : "type-250" + } + ], + "linker_set_key" : "android::SortedVector > >", + "name" : "android::SortedVector > >", + "record_kind" : "class", +- "referenced_type" : "type-426", +- "self_type" : "type-426", ++ "referenced_type" : "type-424", ++ "self_type" : "type-424", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h", +- "template_args" : [ "type-427" ], ++ "template_args" : [ "type-425" ], + "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE", + "vtable_components" : + [ +@@ -33161,17 +34573,17 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-251" ++ "referenced_type" : "type-250" + } + ], + "linker_set_key" : "android::SortedVector >", + "name" : "android::SortedVector >", + "record_kind" : "class", +- "referenced_type" : "type-2342", +- "self_type" : "type-2342", ++ "referenced_type" : "type-2337", ++ "self_type" : "type-2337", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/SortedVector.h", +- "template_args" : [ "type-2343" ], ++ "template_args" : [ "type-2338" ], + "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE", + "vtable_components" : + [ +@@ -33218,14 +34630,14 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-244" ++ "referenced_type" : "type-243" + } + ], + "linker_set_key" : "android::SortedVectorImpl", + "name" : "android::SortedVectorImpl", + "record_kind" : "class", +- "referenced_type" : "type-251", +- "self_type" : "type-251", ++ "referenced_type" : "type-250", ++ "self_type" : "type-250", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/VectorImpl.h", + "unique_id" : "_ZTSN7android16SortedVectorImplE", +@@ -33283,14 +34695,14 @@ + { + "access" : "private", + "field_name" : "mString", +- "referenced_type" : "type-343" ++ "referenced_type" : "type-342" + } + ], + "linker_set_key" : "android::String16", + "name" : "android::String16", + "record_kind" : "class", +- "referenced_type" : "type-342", +- "self_type" : "type-342", ++ "referenced_type" : "type-341", ++ "self_type" : "type-341", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String16.h", + "unique_id" : "_ZTSN7android8String16E" +@@ -33302,14 +34714,14 @@ + { + "access" : "private", + "field_name" : "mString", +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + } + ], + "linker_set_key" : "android::String8", + "name" : "android::String8", + "record_kind" : "class", +- "referenced_type" : "type-221", +- "self_type" : "type-221", ++ "referenced_type" : "type-220", ++ "self_type" : "type-220", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/String8.h", + "unique_id" : "_ZTSN7android7String8E" +@@ -33329,25 +34741,25 @@ + "access" : "private", + "field_name" : "mCanCallJava", + "field_offset" : 32, +- "referenced_type" : "type-502" ++ "referenced_type" : "type-500" + }, + { + "access" : "private", + "field_name" : "mThread", + "field_offset" : 64, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "access" : "private", + "field_name" : "mLock", + "field_offset" : 96, +- "referenced_type" : "type-436" ++ "referenced_type" : "type-433" + }, + { + "access" : "private", + "field_name" : "mThreadExitedCondition", + "field_offset" : 128, +- "referenced_type" : "type-442" ++ "referenced_type" : "type-440" + }, + { + "access" : "private", +@@ -33359,19 +34771,19 @@ + "access" : "private", + "field_name" : "mExitPending", + "field_offset" : 192, +- "referenced_type" : "type-457" ++ "referenced_type" : "type-455" + }, + { + "access" : "private", + "field_name" : "mRunning", + "field_offset" : 200, +- "referenced_type" : "type-457" ++ "referenced_type" : "type-455" + }, + { + "access" : "private", + "field_name" : "mHoldSelf", + "field_offset" : 224, +- "referenced_type" : "type-499" ++ "referenced_type" : "type-497" + }, + { + "access" : "private", +@@ -33383,8 +34795,8 @@ + "linker_set_key" : "android::Thread", + "name" : "android::Thread", + "record_kind" : "class", +- "referenced_type" : "type-501", +- "self_type" : "type-501", ++ "referenced_type" : "type-499", ++ "self_type" : "type-499", + "size" : 44, + "source_file" : "/system/core/libutils/include/utils/Thread.h", + "unique_id" : "_ZTSN7android6ThreadE", +@@ -33474,17 +34886,17 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-244" ++ "referenced_type" : "type-243" + } + ], + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-432", +- "self_type" : "type-432", ++ "referenced_type" : "type-430", ++ "self_type" : "type-430", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", +- "template_args" : [ "type-68" ], ++ "template_args" : [ "type-67" ], + "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE", + "vtable_components" : + [ +@@ -33529,14 +34941,14 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-244" ++ "referenced_type" : "type-243" + } + ], + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-431", +- "self_type" : "type-431", ++ "referenced_type" : "type-429", ++ "self_type" : "type-429", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", + "template_args" : [ "type-35" ], +@@ -33584,17 +34996,17 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-244" ++ "referenced_type" : "type-243" + } + ], + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-252", +- "self_type" : "type-252", ++ "referenced_type" : "type-251", ++ "self_type" : "type-251", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", +- "template_args" : [ "type-221" ], ++ "template_args" : [ "type-220" ], + "unique_id" : "_ZTSN7android6VectorINS_7String8EEE", + "vtable_components" : + [ +@@ -33639,17 +35051,17 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-244" ++ "referenced_type" : "type-243" + } + ], + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-430", +- "self_type" : "type-430", ++ "referenced_type" : "type-428", ++ "self_type" : "type-428", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", +- "template_args" : [ "type-384" ], ++ "template_args" : [ "type-383" ], + "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE", + "vtable_components" : + [ +@@ -33694,17 +35106,17 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-244" ++ "referenced_type" : "type-243" + } + ], + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-2410", +- "self_type" : "type-2410", ++ "referenced_type" : "type-2405", ++ "self_type" : "type-2405", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", +- "template_args" : [ "type-2374" ], ++ "template_args" : [ "type-2369" ], + "unique_id" : "_ZTSN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE", + "vtable_components" : + [ +@@ -33749,17 +35161,17 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-244" ++ "referenced_type" : "type-243" + } + ], + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-428", +- "self_type" : "type-428", ++ "referenced_type" : "type-426", ++ "self_type" : "type-426", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", +- "template_args" : [ "type-429" ], ++ "template_args" : [ "type-427" ], + "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE", + "vtable_components" : + [ +@@ -33804,17 +35216,17 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-244" ++ "referenced_type" : "type-243" + } + ], + "linker_set_key" : "android::Vector >", + "name" : "android::Vector >", + "record_kind" : "class", +- "referenced_type" : "type-2518", +- "self_type" : "type-2518", ++ "referenced_type" : "type-2513", ++ "self_type" : "type-2513", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", +- "template_args" : [ "type-2470" ], ++ "template_args" : [ "type-2465" ], + "unique_id" : "_ZTSN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE", + "vtable_components" : + [ +@@ -33859,14 +35271,14 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-244" ++ "referenced_type" : "type-243" + } + ], + "linker_set_key" : "android::Vector", + "name" : "android::Vector", + "record_kind" : "class", +- "referenced_type" : "type-2514", +- "self_type" : "type-2514", ++ "referenced_type" : "type-2509", ++ "self_type" : "type-2509", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/Vector.h", + "template_args" : [ "type-19" ], +@@ -33916,7 +35328,7 @@ + "access" : "private", + "field_name" : "mStorage", + "field_offset" : 32, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "access" : "private", +@@ -33928,20 +35340,20 @@ + "access" : "private", + "field_name" : "mFlags", + "field_offset" : 96, +- "referenced_type" : "type-246" ++ "referenced_type" : "type-245" + }, + { + "access" : "private", + "field_name" : "mItemSize", + "field_offset" : 128, +- "referenced_type" : "type-246" ++ "referenced_type" : "type-245" + } + ], + "linker_set_key" : "android::VectorImpl", + "name" : "android::VectorImpl", + "record_kind" : "class", +- "referenced_type" : "type-244", +- "self_type" : "type-244", ++ "referenced_type" : "type-243", ++ "self_type" : "type-243", + "size" : 20, + "source_file" : "/system/core/libutils/include/utils/VectorImpl.h", + "unique_id" : "_ZTSN7android10VectorImplE", +@@ -33993,14 +35405,14 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-180" ++ "referenced_type" : "type-179" + } + ], + "linker_set_key" : "android::VirtualLightRefBase", + "name" : "android::VirtualLightRefBase", + "record_kind" : "class", +- "referenced_type" : "type-182", +- "self_type" : "type-182", ++ "referenced_type" : "type-181", ++ "self_type" : "type-181", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/LightRefBase.h", + "unique_id" : "_ZTSN7android19VirtualLightRefBaseE", +@@ -34027,22 +35439,22 @@ + "alignment" : 1, + "linker_set_key" : "android::aggregate_traits >", + "name" : "android::aggregate_traits >", +- "referenced_type" : "type-3871", +- "self_type" : "type-3871", ++ "referenced_type" : "type-3864", ++ "self_type" : "type-3864", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-342", "type-71" ], ++ "template_args" : [ "type-341", "type-70" ], + "unique_id" : "_ZTSN7android16aggregate_traitsINS_8String16ENS_2spINS_8hardware7IBinderEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::aggregate_traits", + "name" : "android::aggregate_traits", +- "referenced_type" : "type-2468", +- "self_type" : "type-2468", ++ "referenced_type" : "type-2463", ++ "self_type" : "type-2463", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-139", "type-2344" ], ++ "template_args" : [ "type-138", "type-2339" ], + "unique_id" : "_ZTSN7android16aggregate_traitsIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { +@@ -34050,7 +35462,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2328" ++ "referenced_type" : "type-2323" + } + ], + "fields" : +@@ -34071,20 +35483,20 @@ + "access" : "private", + "field_name" : "mExtras", + "field_offset" : 96, +- "referenced_type" : "type-2334" ++ "referenced_type" : "type-2329" + }, + { + "access" : "private", + "field_name" : "mReserved0", + "field_offset" : 128, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], + "linker_set_key" : "android::hardware::BHwBinder", + "name" : "android::hardware::BHwBinder", + "record_kind" : "class", +- "referenced_type" : "type-2333", +- "self_type" : "type-2333", ++ "referenced_type" : "type-2328", ++ "self_type" : "type-2328", + "size" : 28, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h", + "unique_id" : "_ZTSN7android8hardware9BHwBinderE", +@@ -34190,7 +35602,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2328" ++ "referenced_type" : "type-2323" + } + ], + "fields" : +@@ -34205,50 +35617,50 @@ + "access" : "private", + "field_name" : "mLock", + "field_offset" : 64, +- "referenced_type" : "type-436" ++ "referenced_type" : "type-433" + }, + { + "access" : "private", + "field_name" : "mAlive", + "field_offset" : 96, +- "referenced_type" : "type-2337" ++ "referenced_type" : "type-2332" + }, + { + "access" : "private", + "field_name" : "mObitsSent", + "field_offset" : 128, +- "referenced_type" : "type-2337" ++ "referenced_type" : "type-2332" + }, + { + "access" : "private", + "field_name" : "mObituaries", + "field_offset" : 160, +- "referenced_type" : "type-2338" ++ "referenced_type" : "type-2333" + }, + { + "access" : "private", + "field_name" : "mObjects", + "field_offset" : 192, +- "referenced_type" : "type-2340" ++ "referenced_type" : "type-2335" + }, + { + "access" : "private", + "field_name" : "mConstantData", + "field_offset" : 352, +- "referenced_type" : "type-2347" ++ "referenced_type" : "type-2342" + }, + { + "access" : "private", + "field_name" : "mDescriptorCache", + "field_offset" : 384, +- "referenced_type" : "type-342" ++ "referenced_type" : "type-341" + } + ], + "linker_set_key" : "android::hardware::BpHwBinder", + "name" : "android::hardware::BpHwBinder", + "record_kind" : "class", +- "referenced_type" : "type-2336", +- "self_type" : "type-2336", ++ "referenced_type" : "type-2331", ++ "self_type" : "type-2331", + "size" : 60, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h", + "unique_id" : "_ZTSN7android8hardware10BpHwBinderE", +@@ -34365,12 +35777,12 @@ + [ + { + "field_name" : "recipient", +- "referenced_type" : "type-944" ++ "referenced_type" : "type-941" + }, + { + "field_name" : "cookie", + "field_offset" : 64, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "field_name" : "flags", +@@ -34380,8 +35792,8 @@ + ], + "linker_set_key" : "android::hardware::BpHwBinder::Obituary", + "name" : "android::hardware::BpHwBinder::Obituary", +- "referenced_type" : "type-2374", +- "self_type" : "type-2374", ++ "referenced_type" : "type-2369", ++ "self_type" : "type-2369", + "size" : 16, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h", + "unique_id" : "_ZTSN7android8hardware10BpHwBinder8ObituaryE" +@@ -34393,14 +35805,14 @@ + { + "access" : "private", + "field_name" : "mObjects", +- "referenced_type" : "type-2341" ++ "referenced_type" : "type-2336" + } + ], + "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager", + "name" : "android::hardware::BpHwBinder::ObjectManager", + "record_kind" : "class", +- "referenced_type" : "type-2340", +- "self_type" : "type-2340", ++ "referenced_type" : "type-2335", ++ "self_type" : "type-2335", + "size" : 20, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h", + "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManagerE" +@@ -34412,23 +35824,23 @@ + [ + { + "field_name" : "object", +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "field_name" : "cleanupCookie", + "field_offset" : 32, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "field_name" : "func", + "field_offset" : 64, +- "referenced_type" : "type-2345" ++ "referenced_type" : "type-2340" + } + ], + "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager::entry_t", + "name" : "android::hardware::BpHwBinder::ObjectManager::entry_t", +- "referenced_type" : "type-2344", +- "self_type" : "type-2344", ++ "referenced_type" : "type-2339", ++ "self_type" : "type-2339", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h", + "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManager7entry_tE" +@@ -34448,7 +35860,7 @@ + "access" : "private", + "field_name" : "mRemote", + "field_offset" : 32, +- "referenced_type" : "type-2366" ++ "referenced_type" : "type-2361" + }, + { + "access" : "private", +@@ -34460,14 +35872,14 @@ + "access" : "private", + "field_name" : "mState", + "field_offset" : 96, +- "referenced_type" : "type-2368" ++ "referenced_type" : "type-2363" + } + ], + "linker_set_key" : "android::hardware::BpHwRefBase", + "name" : "android::hardware::BpHwRefBase", + "record_kind" : "class", +- "referenced_type" : "type-2365", +- "self_type" : "type-2365", ++ "referenced_type" : "type-2360", ++ "self_type" : "type-2360", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h", + "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE", +@@ -34555,7 +35967,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2474" ++ "referenced_type" : "type-2469" + } + ], + "fields" : +@@ -34582,20 +35994,20 @@ + "access" : "private", + "field_name" : "mLock", + "field_offset" : 128, +- "referenced_type" : "type-436" ++ "referenced_type" : "type-433" + }, + { + "access" : "private", + "field_name" : "mGlobalState", + "field_offset" : 160, +- "referenced_type" : "type-2471" ++ "referenced_type" : "type-2466" + } + ], + "linker_set_key" : "android::hardware::BufferedTextOutput", + "name" : "android::hardware::BufferedTextOutput", + "record_kind" : "class", +- "referenced_type" : "type-2506", +- "self_type" : "type-2506", ++ "referenced_type" : "type-2501", ++ "self_type" : "type-2501", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h", + "unique_id" : "_ZTSN7android8hardware18BufferedTextOutputE", +@@ -34667,23 +36079,23 @@ + { + "access" : "private", + "field_name" : "mMutex", +- "referenced_type" : "type-42" ++ "referenced_type" : "type-41" + }, + { + "access" : "private", + "field_name" : "mMap", + "field_offset" : 32, +- "referenced_type" : "type-43" ++ "referenced_type" : "type-42" + } + ], + "linker_set_key" : "android::hardware::ConcurrentMap, bool>", + "name" : "android::hardware::ConcurrentMap, bool>", + "record_kind" : "class", +- "referenced_type" : "type-41", +- "self_type" : "type-41", ++ "referenced_type" : "type-40", ++ "self_type" : "type-40", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-32", "type-44" ], ++ "template_args" : [ "type-32", "type-43" ], + "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEE" + }, + { +@@ -34693,23 +36105,23 @@ + { + "access" : "private", + "field_name" : "mMutex", +- "referenced_type" : "type-379" ++ "referenced_type" : "type-378" + }, + { + "access" : "private", + "field_name" : "mMap", + "field_offset" : 32, +- "referenced_type" : "type-380" ++ "referenced_type" : "type-379" + } + ], + "linker_set_key" : "android::hardware::ConcurrentMap >", + "name" : "android::hardware::ConcurrentMap >", + "record_kind" : "class", +- "referenced_type" : "type-378", +- "self_type" : "type-378", ++ "referenced_type" : "type-377", ++ "self_type" : "type-377", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-381", "type-383" ], ++ "template_args" : [ "type-380", "type-382" ], + "unique_id" : "_ZTSN7android8hardware13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEE" + }, + { +@@ -34719,23 +36131,23 @@ + { + "access" : "private", + "field_name" : "mMutex", +- "referenced_type" : "type-636" ++ "referenced_type" : "type-634" + }, + { + "access" : "private", + "field_name" : "mMap", + "field_offset" : 32, +- "referenced_type" : "type-637" ++ "referenced_type" : "type-635" + } + ], + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "record_kind" : "class", +- "referenced_type" : "type-635", +- "self_type" : "type-635", ++ "referenced_type" : "type-633", ++ "self_type" : "type-633", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-638", "type-639" ], ++ "template_args" : [ "type-636", "type-637" ], + "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEE" + }, + { +@@ -34745,23 +36157,23 @@ + { + "access" : "private", + "field_name" : "mMutex", +- "referenced_type" : "type-399" ++ "referenced_type" : "type-397" + }, + { + "access" : "private", + "field_name" : "mMap", + "field_offset" : 32, +- "referenced_type" : "type-400" ++ "referenced_type" : "type-398" + } + ], + "linker_set_key" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "name" : "android::hardware::ConcurrentMap, std::allocator >, std::function (void *)> >", + "record_kind" : "class", +- "referenced_type" : "type-398", +- "self_type" : "type-398", ++ "referenced_type" : "type-396", ++ "self_type" : "type-396", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-401", "type-402" ], ++ "template_args" : [ "type-399", "type-400" ], + "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS0_7IBinderEEEPvEEEEE" + }, + { +@@ -34790,8 +36202,8 @@ + ], + "linker_set_key" : "android::hardware::GrantorDescriptor", + "name" : "android::hardware::GrantorDescriptor", +- "referenced_type" : "type-319", +- "self_type" : "type-319", ++ "referenced_type" : "type-318", ++ "self_type" : "type-318", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h", + "unique_id" : "_ZTSN7android8hardware17GrantorDescriptorE" +@@ -34803,7 +36215,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { + "access" : "private", +@@ -34833,14 +36245,14 @@ + "access" : "private", + "field_name" : "mCArrayStyle", + "field_offset" : 160, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::HexDump", + "name" : "android::hardware::HexDump", + "record_kind" : "class", +- "referenced_type" : "type-2486", +- "self_type" : "type-2486", ++ "referenced_type" : "type-2481", ++ "self_type" : "type-2481", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h", + "unique_id" : "_ZTSN7android8hardware7HexDumpE" +@@ -34851,7 +36263,7 @@ + [ + { + "is_virtual" : true, +- "referenced_type" : "type-121" ++ "referenced_type" : "type-120" + }, + { + "is_virtual" : true, +@@ -34861,8 +36273,8 @@ + "linker_set_key" : "android::hardware::HidlMemory", + "name" : "android::hardware::HidlMemory", + "record_kind" : "class", +- "referenced_type" : "type-159", +- "self_type" : "type-159", ++ "referenced_type" : "type-158", ++ "self_type" : "type-158", + "size" : 56, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "unique_id" : "_ZTSN7android8hardware10HidlMemoryE", +@@ -34949,8 +36361,8 @@ + "linker_set_key" : "android::hardware::IBinder", + "name" : "android::hardware::IBinder", + "record_kind" : "class", +- "referenced_type" : "type-2328", +- "self_type" : "type-2328", ++ "referenced_type" : "type-2323", ++ "self_type" : "type-2323", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h", + "unique_id" : "_ZTSN7android8hardware7IBinderE", +@@ -35066,8 +36478,8 @@ + "linker_set_key" : "android::hardware::IBinder::DeathRecipient", + "name" : "android::hardware::IBinder::DeathRecipient", + "record_kind" : "class", +- "referenced_type" : "type-2379", +- "self_type" : "type-2379", ++ "referenced_type" : "type-2374", ++ "self_type" : "type-2374", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h", + "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE", +@@ -35154,8 +36566,8 @@ + "linker_set_key" : "android::hardware::IInterface", + "name" : "android::hardware::IInterface", + "record_kind" : "class", +- "referenced_type" : "type-2375", +- "self_type" : "type-2375", ++ "referenced_type" : "type-2370", ++ "self_type" : "type-2370", + "size" : 12, + "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h", + "unique_id" : "_ZTSN7android8hardware10IInterfaceE", +@@ -35237,43 +36649,43 @@ + { + "access" : "private", + "field_name" : "mProcess", +- "referenced_type" : "type-496" ++ "referenced_type" : "type-494" + }, + { + "access" : "private", + "field_name" : "mPendingStrongDerefs", + "field_offset" : 32, +- "referenced_type" : "type-430" ++ "referenced_type" : "type-428" + }, + { + "access" : "private", + "field_name" : "mPendingWeakDerefs", + "field_offset" : 192, +- "referenced_type" : "type-431" ++ "referenced_type" : "type-429" + }, + { + "access" : "private", + "field_name" : "mPostWriteStrongDerefs", + "field_offset" : 352, +- "referenced_type" : "type-432" ++ "referenced_type" : "type-430" + }, + { + "access" : "private", + "field_name" : "mPostWriteWeakDerefs", + "field_offset" : 512, +- "referenced_type" : "type-431" ++ "referenced_type" : "type-429" + }, + { + "access" : "private", + "field_name" : "mIn", + "field_offset" : 672, +- "referenced_type" : "type-2348" ++ "referenced_type" : "type-2343" + }, + { + "access" : "private", + "field_name" : "mOut", + "field_offset" : 1216, +- "referenced_type" : "type-2348" ++ "referenced_type" : "type-2343" + }, + { + "access" : "private", +@@ -35291,7 +36703,7 @@ + "access" : "private", + "field_name" : "mCallingSid", + "field_offset" : 1824, +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { + "access" : "private", +@@ -35315,44 +36727,44 @@ + "access" : "private", + "field_name" : "mContextObject", + "field_offset" : 1952, +- "referenced_type" : "type-472" ++ "referenced_type" : "type-470" + }, + { + "access" : "private", + "field_name" : "mIsLooper", + "field_offset" : 1984, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "access" : "private", + "field_name" : "mIsPollingThread", + "field_offset" : 1992, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "access" : "private", + "field_name" : "mPostCommandTasks", + "field_offset" : 2016, +- "referenced_type" : "type-2436" ++ "referenced_type" : "type-2431" + }, + { + "access" : "private", + "field_name" : "mIPCThreadStateBase", + "field_offset" : 2112, +- "referenced_type" : "type-2437" ++ "referenced_type" : "type-2432" + }, + { + "access" : "private", + "field_name" : "mCallRestriction", + "field_offset" : 2144, +- "referenced_type" : "type-2433" ++ "referenced_type" : "type-2428" + } + ], + "linker_set_key" : "android::hardware::IPCThreadState", + "name" : "android::hardware::IPCThreadState", + "record_kind" : "class", +- "referenced_type" : "type-2434", +- "self_type" : "type-2434", ++ "referenced_type" : "type-2429", ++ "self_type" : "type-2429", + "size" : 272, + "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h", + "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE" +@@ -35364,14 +36776,14 @@ + { + "access" : "private", + "field_name" : "mImpl", +- "referenced_type" : "type-531" ++ "referenced_type" : "type-529" + } + ], + "linker_set_key" : "android::hardware::LazyServiceRegistrar", + "name" : "android::hardware::LazyServiceRegistrar", + "record_kind" : "class", +- "referenced_type" : "type-530", +- "self_type" : "type-530", ++ "referenced_type" : "type-528", ++ "self_type" : "type-528", + "size" : 8, + "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h", + "unique_id" : "_ZTSN7android8hardware20LazyServiceRegistrarE" +@@ -35383,13 +36795,13 @@ + { + "access" : "private", + "field_name" : "mGrantors", +- "referenced_type" : "type-330" ++ "referenced_type" : "type-329" + }, + { + "access" : "private", + "field_name" : "mHandle", + "field_offset" : 128, +- "referenced_type" : "type-324" ++ "referenced_type" : "type-323" + }, + { + "access" : "private", +@@ -35406,11 +36818,11 @@ + ], + "linker_set_key" : "android::hardware::MQDescriptor", + "name" : "android::hardware::MQDescriptor", +- "referenced_type" : "type-1032", +- "self_type" : "type-1032", ++ "referenced_type" : "type-1029", ++ "self_type" : "type-1029", + "size" : 32, + "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h", +- "template_args" : [ "type-48" ], ++ "template_args" : [ "type-47" ], + "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EEE" + }, + { +@@ -35426,7 +36838,7 @@ + "access" : "private", + "field_name" : "mBufCache", + "field_offset" : 32, +- "referenced_type" : "type-2349" ++ "referenced_type" : "type-2344" + }, + { + "access" : "private", +@@ -35438,7 +36850,7 @@ + "access" : "private", + "field_name" : "mData", + "field_offset" : 160, +- "referenced_type" : "type-291" ++ "referenced_type" : "type-290" + }, + { + "access" : "private", +@@ -35462,7 +36874,7 @@ + "access" : "private", + "field_name" : "mObjects", + "field_offset" : 288, +- "referenced_type" : "type-2350" ++ "referenced_type" : "type-2345" + }, + { + "access" : "private", +@@ -35492,38 +36904,38 @@ + "access" : "private", + "field_name" : "mFdsKnown", + "field_offset" : 448, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "access" : "private", + "field_name" : "mHasFds", + "field_offset" : 456, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "access" : "private", + "field_name" : "mAllowFds", + "field_offset" : 464, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "access" : "private", + "field_name" : "mOwner", + "field_offset" : 480, +- "referenced_type" : "type-2351" ++ "referenced_type" : "type-2346" + }, + { + "access" : "private", + "field_name" : "mOwnerCookie", + "field_offset" : 512, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + } + ], + "linker_set_key" : "android::hardware::Parcel", + "name" : "android::hardware::Parcel", + "record_kind" : "class", +- "referenced_type" : "type-2348", +- "self_type" : "type-2348", ++ "referenced_type" : "type-2343", ++ "self_type" : "type-2343", + "size" : 68, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", + "unique_id" : "_ZTSN7android8hardware6ParcelE" +@@ -35550,8 +36962,8 @@ + ], + "linker_set_key" : "android::hardware::Parcel::BufferInfo", + "name" : "android::hardware::Parcel::BufferInfo", +- "referenced_type" : "type-2376", +- "self_type" : "type-2376", ++ "referenced_type" : "type-2371", ++ "self_type" : "type-2371", + "size" : 24, + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", + "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE" +@@ -35577,19 +36989,19 @@ + "access" : "private", + "field_name" : "mVMStart", + "field_offset" : 64, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "access" : "private", + "field_name" : "mThreadCountLock", + "field_offset" : 96, +- "referenced_type" : "type-2440" ++ "referenced_type" : "type-2435" + }, + { + "access" : "private", + "field_name" : "mThreadCountDecrement", + "field_offset" : 128, +- "referenced_type" : "type-2441" ++ "referenced_type" : "type-2436" + }, + { + "access" : "private", +@@ -35613,80 +37025,80 @@ + "access" : "private", + "field_name" : "mLock", + "field_offset" : 320, +- "referenced_type" : "type-436" ++ "referenced_type" : "type-433" + }, + { + "access" : "private", + "field_name" : "mHandleToObject", + "field_offset" : 352, +- "referenced_type" : "type-428" ++ "referenced_type" : "type-426" + }, + { + "access" : "private", + "field_name" : "mManagesContexts", + "field_offset" : 512, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "access" : "private", + "field_name" : "mBinderContextCheckFunc", + "field_offset" : 544, +- "referenced_type" : "type-2432" ++ "referenced_type" : "type-2427" + }, + { + "access" : "private", + "field_name" : "mBinderContextUserData", + "field_offset" : 576, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "access" : "private", + "field_name" : "mContexts", + "field_offset" : 608, +- "referenced_type" : "type-433" ++ "referenced_type" : "type-431" + }, + { + "access" : "private", + "field_name" : "mRootDir", + "field_offset" : 768, +- "referenced_type" : "type-221" ++ "referenced_type" : "type-220" + }, + { + "access" : "private", + "field_name" : "mThreadPoolStarted", + "field_offset" : 800, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "access" : "private", + "field_name" : "mSpawnThreadOnStart", + "field_offset" : 808, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "access" : "private", + "field_name" : "mThreadPoolSeq", + "field_offset" : 832, +- "referenced_type" : "type-2337" ++ "referenced_type" : "type-2332" + }, + { + "access" : "private", + "field_name" : "mMmapSize", + "field_offset" : 864, +- "referenced_type" : "type-246" ++ "referenced_type" : "type-245" + }, + { + "access" : "private", + "field_name" : "mCallRestriction", + "field_offset" : 896, +- "referenced_type" : "type-2433" ++ "referenced_type" : "type-2428" + } + ], + "linker_set_key" : "android::hardware::ProcessState", + "name" : "android::hardware::ProcessState", + "record_kind" : "class", +- "referenced_type" : "type-2439", +- "self_type" : "type-2439", ++ "referenced_type" : "type-2434", ++ "self_type" : "type-2434", + "size" : 128, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h", + "unique_id" : "_ZTSN7android8hardware12ProcessStateE", +@@ -35764,7 +37176,7 @@ + [ + { + "field_name" : "binder", +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + }, + { + "field_name" : "refs", +@@ -35774,8 +37186,8 @@ + ], + "linker_set_key" : "android::hardware::ProcessState::handle_entry", + "name" : "android::hardware::ProcessState::handle_entry", +- "referenced_type" : "type-2416", +- "self_type" : "type-2416", ++ "referenced_type" : "type-2411", ++ "self_type" : "type-2411", + "size" : 8, + "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h", + "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE" +@@ -35785,7 +37197,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-103" ++ "referenced_type" : "type-102" + } + ], + "fields" : +@@ -35794,17 +37206,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 168, +- "referenced_type" : "type-546" ++ "referenced_type" : "type-544" + } + ], + "linker_set_key" : "android::hardware::Return", + "name" : "android::hardware::Return", + "record_kind" : "class", +- "referenced_type" : "type-807", +- "self_type" : "type-807", ++ "referenced_type" : "type-804", ++ "self_type" : "type-804", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-546" ], ++ "template_args" : [ "type-544" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_4hidl7manager4V1_015IServiceManager9TransportEEE" + }, + { +@@ -35812,7 +37224,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-103" ++ "referenced_type" : "type-102" + } + ], + "fields" : +@@ -35821,17 +37233,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 192, +- "referenced_type" : "type-356" ++ "referenced_type" : "type-355" + } + ], + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-801", +- "self_type" : "type-801", ++ "referenced_type" : "type-798", ++ "self_type" : "type-798", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-356" ], ++ "template_args" : [ "type-355" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl4base4V1_05IBaseEEEEE" + }, + { +@@ -35839,7 +37251,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-103" ++ "referenced_type" : "type-102" + } + ], + "fields" : +@@ -35848,17 +37260,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 192, +- "referenced_type" : "type-575" ++ "referenced_type" : "type-573" + } + ], + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-986", +- "self_type" : "type-986", ++ "referenced_type" : "type-983", ++ "self_type" : "type-983", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-575" ], ++ "template_args" : [ "type-573" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEE" + }, + { +@@ -35866,7 +37278,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-103" ++ "referenced_type" : "type-102" + } + ], + "fields" : +@@ -35875,17 +37287,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 192, +- "referenced_type" : "type-590" ++ "referenced_type" : "type-588" + } + ], + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-1093", +- "self_type" : "type-1093", ++ "referenced_type" : "type-1090", ++ "self_type" : "type-1090", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-590" ], ++ "template_args" : [ "type-588" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEE" + }, + { +@@ -35893,7 +37305,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-103" ++ "referenced_type" : "type-102" + } + ], + "fields" : +@@ -35902,17 +37314,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 192, +- "referenced_type" : "type-580" ++ "referenced_type" : "type-578" + } + ], + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-1153", +- "self_type" : "type-1153", ++ "referenced_type" : "type-1150", ++ "self_type" : "type-1150", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-580" ], ++ "template_args" : [ "type-578" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEE" + }, + { +@@ -35920,7 +37332,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-103" ++ "referenced_type" : "type-102" + } + ], + "fields" : +@@ -35929,17 +37341,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 192, +- "referenced_type" : "type-595" ++ "referenced_type" : "type-593" + } + ], + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-1213", +- "self_type" : "type-1213", ++ "referenced_type" : "type-1210", ++ "self_type" : "type-1210", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-595" ], ++ "template_args" : [ "type-593" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEE" + }, + { +@@ -35947,7 +37359,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-103" ++ "referenced_type" : "type-102" + } + ], + "fields" : +@@ -35956,17 +37368,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 192, +- "referenced_type" : "type-585" ++ "referenced_type" : "type-583" + } + ], + "linker_set_key" : "android::hardware::Return >", + "name" : "android::hardware::Return >", + "record_kind" : "class", +- "referenced_type" : "type-1284", +- "self_type" : "type-1284", ++ "referenced_type" : "type-1281", ++ "self_type" : "type-1281", + "size" : 28, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-585" ], ++ "template_args" : [ "type-583" ], + "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEE" + }, + { +@@ -35974,7 +37386,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-103" ++ "referenced_type" : "type-102" + } + ], + "fields" : +@@ -35983,17 +37395,17 @@ + "access" : "private", + "field_name" : "mVal", + "field_offset" : 168, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::Return", + "name" : "android::hardware::Return", + "record_kind" : "class", +- "referenced_type" : "type-309", +- "self_type" : "type-309", ++ "referenced_type" : "type-308", ++ "self_type" : "type-308", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-44" ], ++ "template_args" : [ "type-43" ], + "unique_id" : "_ZTSN7android8hardware6ReturnIbEE" + }, + { +@@ -36001,17 +37413,17 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-103" ++ "referenced_type" : "type-102" + } + ], + "linker_set_key" : "android::hardware::Return", + "name" : "android::hardware::Return", + "record_kind" : "class", +- "referenced_type" : "type-102", +- "self_type" : "type-102", ++ "referenced_type" : "type-101", ++ "self_type" : "type-101", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", +- "template_args" : [ "type-106" ], ++ "template_args" : [ "type-105" ], + "unique_id" : "_ZTSN7android8hardware6ReturnIvEE" + }, + { +@@ -36033,14 +37445,14 @@ + "access" : "private", + "field_name" : "mMessage", + "field_offset" : 64, +- "referenced_type" : "type-105" ++ "referenced_type" : "type-104" + } + ], + "linker_set_key" : "android::hardware::Status", + "name" : "android::hardware::Status", + "record_kind" : "class", +- "referenced_type" : "type-104", +- "self_type" : "type-104", ++ "referenced_type" : "type-103", ++ "self_type" : "type-103", + "size" : 20, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", + "unique_id" : "_ZTSN7android8hardware6StatusE" +@@ -36050,8 +37462,8 @@ + "linker_set_key" : "android::hardware::TextOutput", + "name" : "android::hardware::TextOutput", + "record_kind" : "class", +- "referenced_type" : "type-2474", +- "self_type" : "type-2474", ++ "referenced_type" : "type-2469", ++ "self_type" : "type-2469", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h", + "unique_id" : "_ZTSN7android8hardware10TextOutputE", +@@ -36097,14 +37509,14 @@ + { + "access" : "private", + "field_name" : "mTO", +- "referenced_type" : "type-2476" ++ "referenced_type" : "type-2471" + } + ], + "linker_set_key" : "android::hardware::TextOutput::Bundle", + "name" : "android::hardware::TextOutput::Bundle", + "record_kind" : "class", +- "referenced_type" : "type-2475", +- "self_type" : "type-2475", ++ "referenced_type" : "type-2470", ++ "self_type" : "type-2470", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h", + "unique_id" : "_ZTSN7android8hardware10TextOutput6BundleE" +@@ -36122,8 +37534,8 @@ + "linker_set_key" : "android::hardware::TypeCode", + "name" : "android::hardware::TypeCode", + "record_kind" : "class", +- "referenced_type" : "type-2482", +- "self_type" : "type-2482", ++ "referenced_type" : "type-2477", ++ "self_type" : "type-2477", + "size" : 4, + "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h", + "unique_id" : "_ZTSN7android8hardware8TypeCodeE" +@@ -36135,14 +37547,14 @@ + { + "access" : "private", + "field_name" : "buffer", +- "referenced_type" : "type-47" ++ "referenced_type" : "type-46" + } + ], + "linker_set_key" : "android::hardware::details::DoNotDestruct, android::hardware::details::SchedPrio> >", + "name" : "android::hardware::details::DoNotDestruct, android::hardware::details::SchedPrio> >", + "record_kind" : "class", +- "referenced_type" : "type-46", +- "self_type" : "type-46", ++ "referenced_type" : "type-45", ++ "self_type" : "type-45", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", + "template_args" : [ "type-29" ], +@@ -36155,17 +37567,17 @@ + { + "access" : "private", + "field_name" : "buffer", +- "referenced_type" : "type-47" ++ "referenced_type" : "type-46" + } + ], + "linker_set_key" : "android::hardware::details::DoNotDestruct, bool> >", + "name" : "android::hardware::details::DoNotDestruct, bool> >", + "record_kind" : "class", +- "referenced_type" : "type-51", +- "self_type" : "type-51", ++ "referenced_type" : "type-50", ++ "self_type" : "type-50", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-41" ], ++ "template_args" : [ "type-40" ], + "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEEEE" + }, + { +@@ -36175,17 +37587,17 @@ + { + "access" : "private", + "field_name" : "buffer", +- "referenced_type" : "type-47" ++ "referenced_type" : "type-46" + } + ], + "linker_set_key" : "android::hardware::details::DoNotDestruct > >", + "name" : "android::hardware::details::DoNotDestruct > >", + "record_kind" : "class", +- "referenced_type" : "type-412", +- "self_type" : "type-412", ++ "referenced_type" : "type-410", ++ "self_type" : "type-410", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-378" ], ++ "template_args" : [ "type-377" ], + "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEEEE" + }, + { +@@ -36195,17 +37607,17 @@ + { + "access" : "private", + "field_name" : "buffer", +- "referenced_type" : "type-47" ++ "referenced_type" : "type-46" + } + ], + "linker_set_key" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > >", + "name" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > >", + "record_kind" : "class", +- "referenced_type" : "type-649", +- "self_type" : "type-649", ++ "referenced_type" : "type-647", ++ "self_type" : "type-647", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-635" ], ++ "template_args" : [ "type-633" ], + "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEEEE" + }, + { +@@ -36215,17 +37627,17 @@ + { + "access" : "private", + "field_name" : "buffer", +- "referenced_type" : "type-47" ++ "referenced_type" : "type-46" + } + ], + "linker_set_key" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > >", + "name" : "android::hardware::details::DoNotDestruct, std::allocator >, std::function (void *)> > >", + "record_kind" : "class", +- "referenced_type" : "type-414", +- "self_type" : "type-414", ++ "referenced_type" : "type-412", ++ "self_type" : "type-412", + "size" : 16, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h", +- "template_args" : [ "type-398" ], ++ "template_args" : [ "type-396" ], + "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS0_7IBinderEEEPvEEEEEEE" + }, + { +@@ -36236,31 +37648,31 @@ + "access" : "protected", + "field_name" : "mInstrumentationCallbacks", + "field_offset" : 32, +- "referenced_type" : "type-146" ++ "referenced_type" : "type-145" + }, + { + "access" : "protected", + "field_name" : "mEnableInstrumentation", + "field_offset" : 128, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + }, + { + "access" : "protected", + "field_name" : "mInstrumentationLibPackage", + "field_offset" : 160, +- "referenced_type" : "type-147" ++ "referenced_type" : "type-146" + }, + { + "access" : "protected", + "field_name" : "mInterfaceName", + "field_offset" : 256, +- "referenced_type" : "type-148" ++ "referenced_type" : "type-147" + } + ], + "linker_set_key" : "android::hardware::details::HidlInstrumentor", + "name" : "android::hardware::details::HidlInstrumentor", +- "referenced_type" : "type-145", +- "self_type" : "type-145", ++ "referenced_type" : "type-144", ++ "self_type" : "type-144", + "size" : 44, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE", +@@ -36312,14 +37724,14 @@ + { + "access" : "private", + "field_name" : "mQueue", +- "referenced_type" : "type-270" ++ "referenced_type" : "type-269" + } + ], + "linker_set_key" : "android::hardware::details::TaskRunner", + "name" : "android::hardware::details::TaskRunner", + "record_kind" : "class", +- "referenced_type" : "type-269", +- "self_type" : "type-269", ++ "referenced_type" : "type-268", ++ "self_type" : "type-268", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h", + "unique_id" : "_ZTSN7android8hardware7details10TaskRunnerE" +@@ -36328,8 +37740,8 @@ + "alignment" : 1, + "linker_set_key" : "android::hardware::details::bnhw_tag", + "name" : "android::hardware::details::bnhw_tag", +- "referenced_type" : "type-234", +- "self_type" : "type-234", ++ "referenced_type" : "type-233", ++ "self_type" : "type-233", + "size" : 1, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE" +@@ -36338,8 +37750,8 @@ + "alignment" : 1, + "linker_set_key" : "android::hardware::details::bphw_tag", + "name" : "android::hardware::details::bphw_tag", +- "referenced_type" : "type-284", +- "self_type" : "type-284", ++ "referenced_type" : "type-283", ++ "self_type" : "type-283", + "size" : 1, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE" +@@ -36348,8 +37760,8 @@ + "alignment" : 1, + "linker_set_key" : "android::hardware::details::bs_tag", + "name" : "android::hardware::details::bs_tag", +- "referenced_type" : "type-295", +- "self_type" : "type-295", ++ "referenced_type" : "type-294", ++ "self_type" : "type-294", + "size" : 1, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details6bs_tagE" +@@ -36361,7 +37773,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-318" ++ "referenced_type" : "type-317" + }, + { + "field_name" : "_pad", +@@ -36372,8 +37784,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-317", +- "self_type" : "type-317", ++ "referenced_type" : "type-316", ++ "self_type" : "type-316", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E" +@@ -36385,7 +37797,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-837" ++ "referenced_type" : "type-834" + }, + { + "field_name" : "_pad", +@@ -36396,8 +37808,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-836", +- "self_type" : "type-836", ++ "referenced_type" : "type-833", ++ "self_type" : "type-833", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEUt_E" +@@ -36408,16 +37820,16 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-317" ++ "referenced_type" : "type-316" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer", + "name" : "android::hardware::details::hidl_pointer", +- "referenced_type" : "type-316", +- "self_type" : "type-316", ++ "referenced_type" : "type-315", ++ "self_type" : "type-315", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", +- "template_args" : [ "type-319" ], ++ "template_args" : [ "type-318" ], + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEE" + }, + { +@@ -36426,16 +37838,16 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-1010" ++ "referenced_type" : "type-1007" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer >", + "name" : "android::hardware::details::hidl_pointer >", +- "referenced_type" : "type-1009", +- "self_type" : "type-1009", ++ "referenced_type" : "type-1006", ++ "self_type" : "type-1006", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", +- "template_args" : [ "type-1012" ], ++ "template_args" : [ "type-1009" ], + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEE" + }, + { +@@ -36444,16 +37856,16 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-621" ++ "referenced_type" : "type-619" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer", + "name" : "android::hardware::details::hidl_pointer", +- "referenced_type" : "type-620", +- "self_type" : "type-620", ++ "referenced_type" : "type-618", ++ "self_type" : "type-618", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", +- "template_args" : [ "type-96" ], ++ "template_args" : [ "type-95" ], + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEE" + }, + { +@@ -36462,16 +37874,16 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-836" ++ "referenced_type" : "type-833" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer", + "name" : "android::hardware::details::hidl_pointer", +- "referenced_type" : "type-835", +- "self_type" : "type-835", ++ "referenced_type" : "type-832", ++ "self_type" : "type-832", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", +- "template_args" : [ "type-548" ], ++ "template_args" : [ "type-546" ], + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE" + }, + { +@@ -36480,16 +37892,16 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-1026" ++ "referenced_type" : "type-1023" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer", + "name" : "android::hardware::details::hidl_pointer", +- "referenced_type" : "type-1025", +- "self_type" : "type-1025", ++ "referenced_type" : "type-1022", ++ "self_type" : "type-1022", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", +- "template_args" : [ "type-48" ], ++ "template_args" : [ "type-47" ], + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEE" + }, + { +@@ -36499,7 +37911,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-243" ++ "referenced_type" : "type-242" + }, + { + "field_name" : "_pad", +@@ -36510,8 +37922,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-1026", +- "self_type" : "type-1026", ++ "referenced_type" : "type-1023", ++ "self_type" : "type-1023", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEUt_E" +@@ -36522,16 +37934,16 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-98" ++ "referenced_type" : "type-97" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer", + "name" : "android::hardware::details::hidl_pointer", +- "referenced_type" : "type-97", +- "self_type" : "type-97", ++ "referenced_type" : "type-96", ++ "self_type" : "type-96", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", +- "template_args" : [ "type-100" ], ++ "template_args" : [ "type-99" ], + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE" + }, + { +@@ -36541,7 +37953,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-99" ++ "referenced_type" : "type-98" + }, + { + "field_name" : "_pad", +@@ -36552,8 +37964,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-98", +- "self_type" : "type-98", ++ "referenced_type" : "type-97", ++ "self_type" : "type-97", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEUt_E" +@@ -36607,7 +38019,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-1011" ++ "referenced_type" : "type-1008" + }, + { + "field_name" : "_pad", +@@ -36618,8 +38030,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-1010", +- "self_type" : "type-1010", ++ "referenced_type" : "type-1007", ++ "self_type" : "type-1007", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEUt_E" +@@ -36631,7 +38043,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-108" ++ "referenced_type" : "type-107" + }, + { + "field_name" : "_pad", +@@ -36642,8 +38054,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-621", +- "self_type" : "type-621", ++ "referenced_type" : "type-619", ++ "self_type" : "type-619", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEUt_E" +@@ -36654,13 +38066,13 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-520" ++ "referenced_type" : "type-518" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer", + "name" : "android::hardware::details::hidl_pointer", +- "referenced_type" : "type-519", +- "self_type" : "type-519", ++ "referenced_type" : "type-517", ++ "self_type" : "type-517", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "template_args" : [ "type-19" ], +@@ -36673,7 +38085,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-521" ++ "referenced_type" : "type-519" + }, + { + "field_name" : "_pad", +@@ -36684,8 +38096,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-520", +- "self_type" : "type-520", ++ "referenced_type" : "type-518", ++ "self_type" : "type-518", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEUt_E" +@@ -36696,13 +38108,13 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-325" ++ "referenced_type" : "type-324" + } + ], + "linker_set_key" : "android::hardware::details::hidl_pointer", + "name" : "android::hardware::details::hidl_pointer", +- "referenced_type" : "type-324", +- "self_type" : "type-324", ++ "referenced_type" : "type-323", ++ "self_type" : "type-323", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "template_args" : [ "type-18" ], +@@ -36715,7 +38127,7 @@ + [ + { + "field_name" : "mPointer", +- "referenced_type" : "type-91" ++ "referenced_type" : "type-90" + }, + { + "field_name" : "_pad", +@@ -36726,8 +38138,8 @@ + "linker_set_key" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "name" : "android::hardware::details::hidl_pointer::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5", + "record_kind" : "union", +- "referenced_type" : "type-325", +- "self_type" : "type-325", ++ "referenced_type" : "type-324", ++ "self_type" : "type-324", + "size" : 8, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E" +@@ -36736,8 +38148,8 @@ + "alignment" : 1, + "linker_set_key" : "android::hardware::details::i_tag", + "name" : "android::hardware::details::i_tag", +- "referenced_type" : "type-133", +- "self_type" : "type-133", ++ "referenced_type" : "type-132", ++ "self_type" : "type-132", + "size" : 1, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h", + "unique_id" : "_ZTSN7android8hardware7details5i_tagE" +@@ -36749,20 +38161,20 @@ + { + "access" : "private", + "field_name" : "mStatus", +- "referenced_type" : "type-104" ++ "referenced_type" : "type-103" + }, + { + "access" : "private", + "field_name" : "mCheckedStatus", + "field_offset" : 160, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::details::return_status", + "name" : "android::hardware::details::return_status", + "record_kind" : "class", +- "referenced_type" : "type-103", +- "self_type" : "type-103", ++ "referenced_type" : "type-102", ++ "self_type" : "type-102", + "size" : 24, + "source_file" : "/system/libhidl/base/include/hidl/Status.h", + "unique_id" : "_ZTSN7android8hardware7details13return_statusE" +@@ -36771,11 +38183,11 @@ + "alignment" : 1, + "linker_set_key" : "android::hardware::details::std_array", + "name" : "android::hardware::details::std_array", +- "referenced_type" : "type-1029", +- "self_type" : "type-1029", ++ "referenced_type" : "type-1025", ++ "self_type" : "type-1025", + "size" : 1, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", +- "template_args" : [ "type-199" ], ++ "template_args" : [ "type-198" ], + "unique_id" : "_ZTSN7android8hardware7details9std_arrayIhLj32EJEEE" + }, + { +@@ -36785,16 +38197,16 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-1013" ++ "referenced_type" : "type-1010" + } + ], + "linker_set_key" : "android::hardware::hidl_array", + "name" : "android::hardware::hidl_array", +- "referenced_type" : "type-1012", +- "self_type" : "type-1012", ++ "referenced_type" : "type-1009", ++ "self_type" : "type-1009", + "size" : 32, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", +- "template_args" : [ "type-199" ], ++ "template_args" : [ "type-198" ], + "unique_id" : "_ZTSN7android8hardware10hidl_arrayIhLj32EJEEE" + }, + { +@@ -36802,7 +38214,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-362" ++ "referenced_type" : "type-361" + } + ], + "fields" : +@@ -36811,7 +38223,7 @@ + "access" : "private", + "field_name" : "mRecipient", + "field_offset" : 32, +- "referenced_type" : "type-361" ++ "referenced_type" : "type-360" + }, + { + "access" : "private", +@@ -36828,8 +38240,8 @@ + ], + "linker_set_key" : "android::hardware::hidl_binder_death_recipient", + "name" : "android::hardware::hidl_binder_death_recipient", +- "referenced_type" : "type-360", +- "self_type" : "type-360", ++ "referenced_type" : "type-359", ++ "self_type" : "type-359", + "size" : 40, + "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h", + "unique_id" : "_ZTSN7android8hardware27hidl_binder_death_recipientE", +@@ -36914,8 +38326,8 @@ + ], + "linker_set_key" : "android::hardware::hidl_death_recipient", + "name" : "android::hardware::hidl_death_recipient", +- "referenced_type" : "type-144", +- "self_type" : "type-144", ++ "referenced_type" : "type-143", ++ "self_type" : "type-143", + "size" : 12, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE", +@@ -37003,13 +38415,13 @@ + "access" : "private", + "field_name" : "mOwnsHandle", + "field_offset" : 64, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::hidl_handle", + "name" : "android::hardware::hidl_handle", +- "referenced_type" : "type-77", +- "self_type" : "type-77", ++ "referenced_type" : "type-76", ++ "self_type" : "type-76", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "unique_id" : "_ZTSN7android8hardware11hidl_handleE" +@@ -37021,7 +38433,7 @@ + { + "access" : "private", + "field_name" : "mHandle", +- "referenced_type" : "type-77" ++ "referenced_type" : "type-76" + }, + { + "access" : "private", +@@ -37033,13 +38445,13 @@ + "access" : "private", + "field_name" : "mName", + "field_offset" : 192, +- "referenced_type" : "type-96" ++ "referenced_type" : "type-95" + } + ], + "linker_set_key" : "android::hardware::hidl_memory", + "name" : "android::hardware::hidl_memory", +- "referenced_type" : "type-121", +- "self_type" : "type-121", ++ "referenced_type" : "type-120", ++ "self_type" : "type-120", + "size" : 40, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "unique_id" : "_ZTSN7android8hardware11hidl_memoryE" +@@ -37051,7 +38463,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-97" ++ "referenced_type" : "type-96" + }, + { + "access" : "private", +@@ -37063,13 +38475,13 @@ + "access" : "private", + "field_name" : "mOwnsBuffer", + "field_offset" : 96, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::hidl_string", + "name" : "android::hardware::hidl_string", +- "referenced_type" : "type-96", +- "self_type" : "type-96", ++ "referenced_type" : "type-95", ++ "self_type" : "type-95", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "unique_id" : "_ZTSN7android8hardware11hidl_stringE" +@@ -37081,7 +38493,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-316" ++ "referenced_type" : "type-315" + }, + { + "access" : "private", +@@ -37093,16 +38505,16 @@ + "access" : "private", + "field_name" : "mOwnsBuffer", + "field_offset" : 96, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::hidl_vec", + "name" : "android::hardware::hidl_vec", +- "referenced_type" : "type-330", +- "self_type" : "type-330", ++ "referenced_type" : "type-329", ++ "self_type" : "type-329", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", +- "template_args" : [ "type-319" ], ++ "template_args" : [ "type-318" ], + "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_17GrantorDescriptorEEE" + }, + { +@@ -37112,7 +38524,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-1009" ++ "referenced_type" : "type-1006" + }, + { + "access" : "private", +@@ -37124,16 +38536,16 @@ + "access" : "private", + "field_name" : "mOwnsBuffer", + "field_offset" : 96, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::hidl_vec >", + "name" : "android::hardware::hidl_vec >", +- "referenced_type" : "type-1008", +- "self_type" : "type-1008", ++ "referenced_type" : "type-1005", ++ "self_type" : "type-1005", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", +- "template_args" : [ "type-1012" ], ++ "template_args" : [ "type-1009" ], + "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEE" + }, + { +@@ -37143,7 +38555,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-620" ++ "referenced_type" : "type-618" + }, + { + "access" : "private", +@@ -37155,16 +38567,16 @@ + "access" : "private", + "field_name" : "mOwnsBuffer", + "field_offset" : 96, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::hidl_vec", + "name" : "android::hardware::hidl_vec", +- "referenced_type" : "type-619", +- "self_type" : "type-619", ++ "referenced_type" : "type-617", ++ "self_type" : "type-617", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", +- "template_args" : [ "type-96" ], ++ "template_args" : [ "type-95" ], + "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEEE" + }, + { +@@ -37174,7 +38586,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-835" ++ "referenced_type" : "type-832" + }, + { + "access" : "private", +@@ -37186,16 +38598,16 @@ + "access" : "private", + "field_name" : "mOwnsBuffer", + "field_offset" : 96, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::hidl_vec", + "name" : "android::hardware::hidl_vec", +- "referenced_type" : "type-834", +- "self_type" : "type-834", ++ "referenced_type" : "type-831", ++ "self_type" : "type-831", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", +- "template_args" : [ "type-548" ], ++ "template_args" : [ "type-546" ], + "unique_id" : "_ZTSN7android8hardware8hidl_vecINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE" + }, + { +@@ -37205,7 +38617,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-1025" ++ "referenced_type" : "type-1022" + }, + { + "access" : "private", +@@ -37217,16 +38629,16 @@ + "access" : "private", + "field_name" : "mOwnsBuffer", + "field_offset" : 96, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::hidl_vec", + "name" : "android::hardware::hidl_vec", +- "referenced_type" : "type-1024", +- "self_type" : "type-1024", ++ "referenced_type" : "type-1021", ++ "self_type" : "type-1021", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", +- "template_args" : [ "type-48" ], ++ "template_args" : [ "type-47" ], + "unique_id" : "_ZTSN7android8hardware8hidl_vecIcEE" + }, + { +@@ -37234,7 +38646,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-626" ++ "referenced_type" : "type-623" + } + ], + "fields" : +@@ -37242,14 +38654,14 @@ + { + "access" : "private", + "field_name" : "mPtr", +- "referenced_type" : "type-117" ++ "referenced_type" : "type-116" + } + ], + "linker_set_key" : "android::hardware::hidl_vec::iter", + "name" : "android::hardware::hidl_vec::iter", + "record_kind" : "class", +- "referenced_type" : "type-625", +- "self_type" : "type-625", ++ "referenced_type" : "type-622", ++ "self_type" : "type-622", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEE4iterILb1EEE" +@@ -37261,7 +38673,7 @@ + { + "access" : "private", + "field_name" : "mBuffer", +- "referenced_type" : "type-519" ++ "referenced_type" : "type-517" + }, + { + "access" : "private", +@@ -37273,13 +38685,13 @@ + "access" : "private", + "field_name" : "mOwnsBuffer", + "field_offset" : 96, +- "referenced_type" : "type-44" ++ "referenced_type" : "type-43" + } + ], + "linker_set_key" : "android::hardware::hidl_vec", + "name" : "android::hardware::hidl_vec", +- "referenced_type" : "type-518", +- "self_type" : "type-518", ++ "referenced_type" : "type-516", ++ "self_type" : "type-516", + "size" : 16, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "template_args" : [ "type-19" ], +@@ -37292,19 +38704,19 @@ + { + "access" : "private", + "field_name" : "mMajor", +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + }, + { + "access" : "private", + "field_name" : "mMinor", + "field_offset" : 16, +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + } + ], + "linker_set_key" : "android::hardware::hidl_version", + "name" : "android::hardware::hidl_version", +- "referenced_type" : "type-131", +- "self_type" : "type-131", ++ "referenced_type" : "type-130", ++ "self_type" : "type-130", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h", + "unique_id" : "_ZTSN7android8hardware12hidl_versionE" +@@ -37314,10 +38726,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-357" ++ "referenced_type" : "type-356" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -37326,13 +38738,13 @@ + "access" : "private", + "field_name" : "_hidl_mImpl", + "field_offset" : 512, +- "referenced_type" : "type-356" ++ "referenced_type" : "type-355" + } + ], + "linker_set_key" : "android::hidl::base::V1_0::BnHwBase", + "name" : "android::hidl::base::V1_0::BnHwBase", +- "referenced_type" : "type-355", +- "self_type" : "type-355", ++ "referenced_type" : "type-354", ++ "self_type" : "type-354", + "size" : 76, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h", + "unique_id" : "_ZTSN7android4hidl4base4V1_08BnHwBaseE", +@@ -37454,10 +38866,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-422" ++ "referenced_type" : "type-420" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -37466,19 +38878,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 544, +- "referenced_type" : "type-420" ++ "referenced_type" : "type-418" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 576, +- "referenced_type" : "type-421" ++ "referenced_type" : "type-419" + } + ], + "linker_set_key" : "android::hidl::base::V1_0::BpHwBase", + "name" : "android::hidl::base::V1_0::BpHwBase", +- "referenced_type" : "type-419", +- "self_type" : "type-419", ++ "referenced_type" : "type-417", ++ "self_type" : "type-417", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h", + "unique_id" : "_ZTSN7android4hidl4base4V1_08BpHwBaseE", +@@ -37664,7 +39076,7 @@ + "referenced_type" : "type-34" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -37673,19 +39085,19 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 384, +- "referenced_type" : "type-459" ++ "referenced_type" : "type-456" + }, + { + "access" : "private", + "field_name" : "mOnewayQueue", + "field_offset" : 416, +- "referenced_type" : "type-269" ++ "referenced_type" : "type-268" + } + ], + "linker_set_key" : "android::hidl::base::V1_0::BsBase", + "name" : "android::hidl::base::V1_0::BsBase", +- "referenced_type" : "type-2248", +- "self_type" : "type-2248", ++ "referenced_type" : "type-2243", ++ "self_type" : "type-2243", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h", + "unique_id" : "_ZTSN7android4hidl4base4V1_06BsBaseE", +@@ -37821,13 +39233,13 @@ + { + "field_name" : "arch", + "field_offset" : 128, +- "referenced_type" : "type-336" ++ "referenced_type" : "type-335" + } + ], + "linker_set_key" : "android::hidl::base::V1_0::DebugInfo", + "name" : "android::hidl::base::V1_0::DebugInfo", +- "referenced_type" : "type-335", +- "self_type" : "type-335", ++ "referenced_type" : "type-334", ++ "self_type" : "type-334", + "size" : 24, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h", + "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfoE" +@@ -37953,7 +39365,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-355" ++ "referenced_type" : "type-354" + } + ], + "fields" : +@@ -37962,13 +39374,13 @@ + "access" : "private", + "field_name" : "_hidl_mImpl", + "field_offset" : 544, +- "referenced_type" : "type-575" ++ "referenced_type" : "type-573" + } + ], + "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager", + "name" : "android::hidl::manager::V1_0::BnHwServiceManager", +- "referenced_type" : "type-871", +- "self_type" : "type-871", ++ "referenced_type" : "type-868", ++ "self_type" : "type-868", + "size" : 80, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_018BnHwServiceManagerE", +@@ -38090,7 +39502,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-355" ++ "referenced_type" : "type-354" + } + ], + "fields" : +@@ -38099,13 +39511,13 @@ + "access" : "private", + "field_name" : "_hidl_mImpl", + "field_offset" : 544, +- "referenced_type" : "type-590" ++ "referenced_type" : "type-588" + } + ], + "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification", + "name" : "android::hidl::manager::V1_0::BnHwServiceNotification", +- "referenced_type" : "type-862", +- "self_type" : "type-862", ++ "referenced_type" : "type-859", ++ "self_type" : "type-859", + "size" : 80, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_023BnHwServiceNotificationE", +@@ -38227,10 +39639,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-876" ++ "referenced_type" : "type-873" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -38239,19 +39651,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 544, +- "referenced_type" : "type-874" ++ "referenced_type" : "type-871" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 576, +- "referenced_type" : "type-875" ++ "referenced_type" : "type-872" + } + ], + "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager", + "name" : "android::hidl::manager::V1_0::BpHwServiceManager", +- "referenced_type" : "type-873", +- "self_type" : "type-873", ++ "referenced_type" : "type-870", ++ "self_type" : "type-870", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_018BpHwServiceManagerE", +@@ -38458,10 +39870,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-867" ++ "referenced_type" : "type-864" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -38470,19 +39882,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 544, +- "referenced_type" : "type-865" ++ "referenced_type" : "type-862" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 576, +- "referenced_type" : "type-866" ++ "referenced_type" : "type-863" + } + ], + "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification", + "name" : "android::hidl::manager::V1_0::BpHwServiceNotification", +- "referenced_type" : "type-864", +- "self_type" : "type-864", ++ "referenced_type" : "type-861", ++ "self_type" : "type-861", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_023BpHwServiceNotificationE", +@@ -38668,10 +40080,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-552" ++ "referenced_type" : "type-548" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -38680,19 +40092,19 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 384, +- "referenced_type" : "type-578" ++ "referenced_type" : "type-576" + }, + { + "access" : "private", + "field_name" : "mOnewayQueue", + "field_offset" : 416, +- "referenced_type" : "type-269" ++ "referenced_type" : "type-268" + } + ], + "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager", + "name" : "android::hidl::manager::V1_0::BsServiceManager", +- "referenced_type" : "type-957", +- "self_type" : "type-957", ++ "referenced_type" : "type-954", ++ "self_type" : "type-954", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_016BsServiceManagerE", +@@ -38841,10 +40253,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-541" ++ "referenced_type" : "type-539" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -38853,19 +40265,19 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 384, +- "referenced_type" : "type-593" ++ "referenced_type" : "type-591" + }, + { + "access" : "private", + "field_name" : "mOnewayQueue", + "field_offset" : 416, +- "referenced_type" : "type-269" ++ "referenced_type" : "type-268" + } + ], + "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification", + "name" : "android::hidl::manager::V1_0::BsServiceNotification", +- "referenced_type" : "type-1084", +- "self_type" : "type-1084", ++ "referenced_type" : "type-1081", ++ "self_type" : "type-1081", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_021BsServiceNotificationE", +@@ -38998,8 +40410,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager", + "name" : "android::hidl::manager::V1_0::IServiceManager", +- "referenced_type" : "type-552", +- "self_type" : "type-552", ++ "referenced_type" : "type-548", ++ "self_type" : "type-548", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManagerE", +@@ -39141,12 +40553,12 @@ + [ + { + "field_name" : "interfaceName", +- "referenced_type" : "type-96" ++ "referenced_type" : "type-95" + }, + { + "field_name" : "instanceName", + "field_offset" : 128, +- "referenced_type" : "type-96" ++ "referenced_type" : "type-95" + }, + { + "field_name" : "pid", +@@ -39156,18 +40568,18 @@ + { + "field_name" : "clientPids", + "field_offset" : 320, +- "referenced_type" : "type-518" ++ "referenced_type" : "type-516" + }, + { + "field_name" : "arch", + "field_offset" : 448, +- "referenced_type" : "type-336" ++ "referenced_type" : "type-335" + } + ], + "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo", + "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo", +- "referenced_type" : "type-548", +- "self_type" : "type-548", ++ "referenced_type" : "type-546", ++ "self_type" : "type-546", + "size" : 64, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoE" +@@ -39182,8 +40594,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification", + "name" : "android::hidl::manager::V1_0::IServiceNotification", +- "referenced_type" : "type-541", +- "self_type" : "type-541", ++ "referenced_type" : "type-539", ++ "self_type" : "type-539", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_020IServiceNotificationE", +@@ -39296,7 +40708,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-355" ++ "referenced_type" : "type-354" + } + ], + "fields" : +@@ -39305,13 +40717,13 @@ + "access" : "private", + "field_name" : "_hidl_mImpl", + "field_offset" : 544, +- "referenced_type" : "type-580" ++ "referenced_type" : "type-578" + } + ], + "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager", + "name" : "android::hidl::manager::V1_1::BnHwServiceManager", +- "referenced_type" : "type-879", +- "self_type" : "type-879", ++ "referenced_type" : "type-876", ++ "self_type" : "type-876", + "size" : 80, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_118BnHwServiceManagerE", +@@ -39433,10 +40845,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-884" ++ "referenced_type" : "type-881" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -39445,19 +40857,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 544, +- "referenced_type" : "type-882" ++ "referenced_type" : "type-879" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 576, +- "referenced_type" : "type-883" ++ "referenced_type" : "type-880" + } + ], + "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager", + "name" : "android::hidl::manager::V1_1::BpHwServiceManager", +- "referenced_type" : "type-881", +- "self_type" : "type-881", ++ "referenced_type" : "type-878", ++ "self_type" : "type-878", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_118BpHwServiceManagerE", +@@ -39667,10 +41079,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-562" ++ "referenced_type" : "type-560" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -39679,19 +41091,19 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 384, +- "referenced_type" : "type-583" ++ "referenced_type" : "type-581" + }, + { + "access" : "private", + "field_name" : "mOnewayQueue", + "field_offset" : 416, +- "referenced_type" : "type-269" ++ "referenced_type" : "type-268" + } + ], + "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager", + "name" : "android::hidl::manager::V1_1::BsServiceManager", +- "referenced_type" : "type-1140", +- "self_type" : "type-1140", ++ "referenced_type" : "type-1137", ++ "self_type" : "type-1137", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_116BsServiceManagerE", +@@ -39843,13 +41255,13 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-552" ++ "referenced_type" : "type-548" + } + ], + "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager", + "name" : "android::hidl::manager::V1_1::IServiceManager", +- "referenced_type" : "type-562", +- "self_type" : "type-562", ++ "referenced_type" : "type-560", ++ "self_type" : "type-560", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_115IServiceManagerE", +@@ -39994,7 +41406,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-355" ++ "referenced_type" : "type-354" + } + ], + "fields" : +@@ -40003,13 +41415,13 @@ + "access" : "private", + "field_name" : "_hidl_mImpl", + "field_offset" : 544, +- "referenced_type" : "type-595" ++ "referenced_type" : "type-593" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback", + "name" : "android::hidl::manager::V1_2::BnHwClientCallback", +- "referenced_type" : "type-888", +- "self_type" : "type-888", ++ "referenced_type" : "type-884", ++ "self_type" : "type-884", + "size" : 80, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_218BnHwClientCallbackE", +@@ -40131,7 +41543,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-355" ++ "referenced_type" : "type-354" + } + ], + "fields" : +@@ -40140,13 +41552,13 @@ + "access" : "private", + "field_name" : "_hidl_mImpl", + "field_offset" : 544, +- "referenced_type" : "type-585" ++ "referenced_type" : "type-583" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager", + "name" : "android::hidl::manager::V1_2::BnHwServiceManager", +- "referenced_type" : "type-845", +- "self_type" : "type-845", ++ "referenced_type" : "type-842", ++ "self_type" : "type-842", + "size" : 80, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_218BnHwServiceManagerE", +@@ -40268,10 +41680,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-893" ++ "referenced_type" : "type-890" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -40280,19 +41692,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 544, +- "referenced_type" : "type-891" ++ "referenced_type" : "type-888" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 576, +- "referenced_type" : "type-892" ++ "referenced_type" : "type-889" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback", + "name" : "android::hidl::manager::V1_2::BpHwClientCallback", +- "referenced_type" : "type-890", +- "self_type" : "type-890", ++ "referenced_type" : "type-887", ++ "self_type" : "type-887", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_218BpHwClientCallbackE", +@@ -40478,10 +41890,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-777" ++ "referenced_type" : "type-773" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -40490,19 +41902,19 @@ + "access" : "private", + "field_name" : "_hidl_mMutex", + "field_offset" : 544, +- "referenced_type" : "type-775" ++ "referenced_type" : "type-771" + }, + { + "access" : "private", + "field_name" : "_hidl_mDeathRecipients", + "field_offset" : 576, +- "referenced_type" : "type-776" ++ "referenced_type" : "type-772" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager", + "name" : "android::hidl::manager::V1_2::BpHwServiceManager", +- "referenced_type" : "type-774", +- "self_type" : "type-774", ++ "referenced_type" : "type-770", ++ "self_type" : "type-770", + "size" : 92, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_218BpHwServiceManagerE", +@@ -40727,10 +42139,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-544" ++ "referenced_type" : "type-542" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -40739,19 +42151,19 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 384, +- "referenced_type" : "type-600" ++ "referenced_type" : "type-598" + }, + { + "access" : "private", + "field_name" : "mOnewayQueue", + "field_offset" : 416, +- "referenced_type" : "type-269" ++ "referenced_type" : "type-268" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback", + "name" : "android::hidl::manager::V1_2::BsClientCallback", +- "referenced_type" : "type-1197", +- "self_type" : "type-1197", ++ "referenced_type" : "type-1194", ++ "self_type" : "type-1194", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_216BsClientCallbackE", +@@ -40879,10 +42291,10 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-565" ++ "referenced_type" : "type-563" + }, + { +- "referenced_type" : "type-145" ++ "referenced_type" : "type-144" + } + ], + "fields" : +@@ -40891,19 +42303,19 @@ + "access" : "private", + "field_name" : "mImpl", + "field_offset" : 384, +- "referenced_type" : "type-588" ++ "referenced_type" : "type-586" + }, + { + "access" : "private", + "field_name" : "mOnewayQueue", + "field_offset" : 416, +- "referenced_type" : "type-269" ++ "referenced_type" : "type-268" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager", + "name" : "android::hidl::manager::V1_2::BsServiceManager", +- "referenced_type" : "type-1271", +- "self_type" : "type-1271", ++ "referenced_type" : "type-1268", ++ "self_type" : "type-1268", + "size" : 68, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_216BsServiceManagerE", +@@ -41075,8 +42487,8 @@ + ], + "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback", + "name" : "android::hidl::manager::V1_2::IClientCallback", +- "referenced_type" : "type-544", +- "self_type" : "type-544", ++ "referenced_type" : "type-542", ++ "self_type" : "type-542", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_215IClientCallbackE", +@@ -41189,13 +42601,13 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-562" ++ "referenced_type" : "type-560" + } + ], + "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager", + "name" : "android::hidl::manager::V1_2::IServiceManager", +- "referenced_type" : "type-565", +- "self_type" : "type-565", ++ "referenced_type" : "type-563", ++ "self_type" : "type-563", + "size" : 12, + "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h", + "unique_id" : "_ZTSN7android4hidl7manager4V1_215IServiceManagerE", +@@ -41361,21 +42773,21 @@ + [ + { + "field_name" : "key", +- "referenced_type" : "type-342" ++ "referenced_type" : "type-341" + }, + { + "field_name" : "value", + "field_offset" : 32, +- "referenced_type" : "type-71" ++ "referenced_type" : "type-70" + } + ], + "linker_set_key" : "android::key_value_pair_t >", + "name" : "android::key_value_pair_t >", +- "referenced_type" : "type-3807", +- "self_type" : "type-3807", ++ "referenced_type" : "type-3800", ++ "self_type" : "type-3800", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-342", "type-71" ], ++ "template_args" : [ "type-341", "type-70" ], + "unique_id" : "_ZTSN7android16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEE" + }, + { +@@ -41384,21 +42796,21 @@ + [ + { + "field_name" : "key", +- "referenced_type" : "type-139" ++ "referenced_type" : "type-138" + }, + { + "field_name" : "value", + "field_offset" : 32, +- "referenced_type" : "type-2344" ++ "referenced_type" : "type-2339" + } + ], + "linker_set_key" : "android::key_value_pair_t", + "name" : "android::key_value_pair_t", +- "referenced_type" : "type-2384", +- "self_type" : "type-2384", ++ "referenced_type" : "type-2379", ++ "self_type" : "type-2379", + "size" : 16, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-139", "type-2344" ], ++ "template_args" : [ "type-138", "type-2339" ], + "unique_id" : "_ZTSN7android16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { +@@ -41408,17 +42820,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-500" ++ "referenced_type" : "type-498" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-499", +- "self_type" : "type-499", ++ "referenced_type" : "type-497", ++ "self_type" : "type-497", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-501" ], ++ "template_args" : [ "type-499" ], + "unique_id" : "_ZTSN7android2spINS_6ThreadEEE" + }, + { +@@ -41428,17 +42840,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-384" ++ "referenced_type" : "type-383" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-472", +- "self_type" : "type-472", ++ "referenced_type" : "type-470", ++ "self_type" : "type-470", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-473" ], ++ "template_args" : [ "type-471" ], + "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE" + }, + { +@@ -41448,17 +42860,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-2471" ++ "referenced_type" : "type-2466" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-2470", +- "self_type" : "type-2470", ++ "referenced_type" : "type-2465", ++ "self_type" : "type-2465", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-2473" ], ++ "template_args" : [ "type-2468" ], + "unique_id" : "_ZTSN7android2spINS_8hardware18BufferedTextOutput11BufferStateEEE" + }, + { +@@ -41468,17 +42880,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-158" ++ "referenced_type" : "type-157" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-157", +- "self_type" : "type-157", ++ "referenced_type" : "type-156", ++ "self_type" : "type-156", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-159" ], ++ "template_args" : [ "type-158" ], + "unique_id" : "_ZTSN7android2spINS_8hardware10HidlMemoryEEE" + }, + { +@@ -41488,17 +42900,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-945" ++ "referenced_type" : "type-942" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-962", +- "self_type" : "type-962", ++ "referenced_type" : "type-959", ++ "self_type" : "type-959", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-963" ], ++ "template_args" : [ "type-960" ], + "unique_id" : "_ZTSN7android2spINS_8hardware7IBinder14DeathRecipientEEE" + }, + { +@@ -41508,17 +42920,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-72" ++ "referenced_type" : "type-71" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-71", +- "self_type" : "type-71", ++ "referenced_type" : "type-70", ++ "self_type" : "type-70", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-74" ], ++ "template_args" : [ "type-73" ], + "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE" + }, + { +@@ -41528,17 +42940,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-969" ++ "referenced_type" : "type-966" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-968", +- "self_type" : "type-968", ++ "referenced_type" : "type-965", ++ "self_type" : "type-965", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-971" ], ++ "template_args" : [ "type-968" ], + "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE" + }, + { +@@ -41548,17 +42960,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-767" ++ "referenced_type" : "type-764" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-766", +- "self_type" : "type-766", ++ "referenced_type" : "type-763", ++ "self_type" : "type-763", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-769" ], ++ "template_args" : [ "type-766" ], + "unique_id" : "_ZTSN7android2spINS_8hardware25PassthroughServiceManagerEEE" + }, + { +@@ -41568,17 +42980,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-492" ++ "referenced_type" : "type-490" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-491", +- "self_type" : "type-491", ++ "referenced_type" : "type-489", ++ "self_type" : "type-489", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-494" ], ++ "template_args" : [ "type-492" ], + "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE" + }, + { +@@ -41588,17 +43000,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-598" ++ "referenced_type" : "type-596" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-602", +- "self_type" : "type-602", ++ "referenced_type" : "type-600", ++ "self_type" : "type-600", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-603" ], ++ "template_args" : [ "type-601" ], + "unique_id" : "_ZTSN7android2spINS_8hardware7details21ClientCounterCallbackEEE" + }, + { +@@ -41608,17 +43020,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-784" ++ "referenced_type" : "type-781" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-789", +- "self_type" : "type-789", ++ "referenced_type" : "type-786", ++ "self_type" : "type-786", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-790" ], ++ "template_args" : [ "type-787" ], + "unique_id" : "_ZTSN7android2spINS_8hardware7details6WaiterEEE" + }, + { +@@ -41628,17 +43040,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-363" ++ "referenced_type" : "type-362" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-951", +- "self_type" : "type-951", ++ "referenced_type" : "type-948", ++ "self_type" : "type-948", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-360" ], ++ "template_args" : [ "type-359" ], + "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE" + }, + { +@@ -41648,17 +43060,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-143" ++ "referenced_type" : "type-142" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-142", +- "self_type" : "type-142", ++ "referenced_type" : "type-141", ++ "self_type" : "type-141", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-144" ], ++ "template_args" : [ "type-143" ], + "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE" + }, + { +@@ -41674,8 +43086,8 @@ + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-356", +- "self_type" : "type-356", ++ "referenced_type" : "type-355", ++ "self_type" : "type-355", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", + "template_args" : [ "type-34" ], +@@ -41688,17 +43100,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-576" ++ "referenced_type" : "type-574" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-575", +- "self_type" : "type-575", ++ "referenced_type" : "type-573", ++ "self_type" : "type-573", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-552" ], ++ "template_args" : [ "type-548" ], + "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE" + }, + { +@@ -41708,17 +43120,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-591" ++ "referenced_type" : "type-589" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-590", +- "self_type" : "type-590", ++ "referenced_type" : "type-588", ++ "self_type" : "type-588", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-541" ], ++ "template_args" : [ "type-539" ], + "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE" + }, + { +@@ -41728,17 +43140,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-581" ++ "referenced_type" : "type-579" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-580", +- "self_type" : "type-580", ++ "referenced_type" : "type-578", ++ "self_type" : "type-578", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-562" ], ++ "template_args" : [ "type-560" ], + "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE" + }, + { +@@ -41748,17 +43160,17 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-596" ++ "referenced_type" : "type-594" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-595", +- "self_type" : "type-595", ++ "referenced_type" : "type-593", ++ "self_type" : "type-593", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-544" ], ++ "template_args" : [ "type-542" ], + "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IClientCallbackEEE" + }, + { +@@ -41768,36 +43180,36 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-586" ++ "referenced_type" : "type-584" + } + ], + "linker_set_key" : "android::sp", + "name" : "android::sp", + "record_kind" : "class", +- "referenced_type" : "type-585", +- "self_type" : "type-585", ++ "referenced_type" : "type-583", ++ "self_type" : "type-583", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h", +- "template_args" : [ "type-565" ], ++ "template_args" : [ "type-563" ], + "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3747", +- "self_type" : "type-3747", ++ "referenced_type" : "type-3740", ++ "self_type" : "type-3740", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-68" ], ++ "template_args" : [ "type-67" ], + "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBaseEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3746", +- "self_type" : "type-3746", ++ "referenced_type" : "type-3739", ++ "self_type" : "type-3739", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-35" ], +@@ -41807,118 +43219,118 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3865", +- "self_type" : "type-3865", ++ "referenced_type" : "type-3858", ++ "self_type" : "type-3858", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-342" ], ++ "template_args" : [ "type-341" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_8String16EEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3745", +- "self_type" : "type-3745", ++ "referenced_type" : "type-3738", ++ "self_type" : "type-3738", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2332" ], ++ "template_args" : [ "type-2327" ], + "unique_id" : "_ZTSN7android13trait_pointerIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-2463", +- "self_type" : "type-2463", ++ "referenced_type" : "type-2458", ++ "self_type" : "type-2458", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2374" ], ++ "template_args" : [ "type-2369" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-2462", +- "self_type" : "type-2462", ++ "referenced_type" : "type-2457", ++ "self_type" : "type-2457", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2344" ], ++ "template_args" : [ "type-2339" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3863", +- "self_type" : "type-3863", ++ "referenced_type" : "type-3856", ++ "self_type" : "type-3856", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2416" ], ++ "template_args" : [ "type-2411" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer > >", + "name" : "android::trait_pointer > >", +- "referenced_type" : "type-3864", +- "self_type" : "type-3864", ++ "referenced_type" : "type-3857", ++ "self_type" : "type-3857", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3807" ], ++ "template_args" : [ "type-3800" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer >", + "name" : "android::trait_pointer >", +- "referenced_type" : "type-2460", +- "self_type" : "type-2460", ++ "referenced_type" : "type-2455", ++ "self_type" : "type-2455", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2384" ], ++ "template_args" : [ "type-2379" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer >", + "name" : "android::trait_pointer >", +- "referenced_type" : "type-2530", +- "self_type" : "type-2530", ++ "referenced_type" : "type-2525", ++ "self_type" : "type-2525", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2470" ], ++ "template_args" : [ "type-2465" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer >", + "name" : "android::trait_pointer >", +- "referenced_type" : "type-3866", +- "self_type" : "type-3866", ++ "referenced_type" : "type-3859", ++ "self_type" : "type-3859", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-71" ], ++ "template_args" : [ "type-70" ], + "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware7IBinderEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-2461", +- "self_type" : "type-2461", ++ "referenced_type" : "type-2456", ++ "self_type" : "type-2456", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-139" ], ++ "template_args" : [ "type-138" ], + "unique_id" : "_ZTSN7android13trait_pointerIPKvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_pointer", + "name" : "android::trait_pointer", +- "referenced_type" : "type-3884", +- "self_type" : "type-3884", ++ "referenced_type" : "type-3877", ++ "self_type" : "type-3877", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-19" ], +@@ -41928,19 +43340,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-3741", +- "self_type" : "type-3741", ++ "referenced_type" : "type-3734", ++ "self_type" : "type-3734", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-68" ], ++ "template_args" : [ "type-67" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBaseEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-3740", +- "self_type" : "type-3740", ++ "referenced_type" : "type-3733", ++ "self_type" : "type-3733", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-35" ], +@@ -41950,140 +43362,140 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-3857", +- "self_type" : "type-3857", ++ "referenced_type" : "type-3850", ++ "self_type" : "type-3850", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-342" ], ++ "template_args" : [ "type-341" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8String16EEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-3737", +- "self_type" : "type-3737", ++ "referenced_type" : "type-3730", ++ "self_type" : "type-3730", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2332" ], ++ "template_args" : [ "type-2327" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-2455", +- "self_type" : "type-2455", ++ "referenced_type" : "type-2450", ++ "self_type" : "type-2450", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2374" ], ++ "template_args" : [ "type-2369" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-2453", +- "self_type" : "type-2453", ++ "referenced_type" : "type-2448", ++ "self_type" : "type-2448", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2344" ], ++ "template_args" : [ "type-2339" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-3856", +- "self_type" : "type-3856", ++ "referenced_type" : "type-3849", ++ "self_type" : "type-3849", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2416" ], ++ "template_args" : [ "type-2411" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy > >", + "name" : "android::trait_trivial_copy > >", +- "referenced_type" : "type-3859", +- "self_type" : "type-3859", ++ "referenced_type" : "type-3852", ++ "self_type" : "type-3852", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3807" ], ++ "template_args" : [ "type-3800" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy >", + "name" : "android::trait_trivial_copy >", +- "referenced_type" : "type-2454", +- "self_type" : "type-2454", ++ "referenced_type" : "type-2449", ++ "self_type" : "type-2449", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2384" ], ++ "template_args" : [ "type-2379" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy >", + "name" : "android::trait_trivial_copy >", +- "referenced_type" : "type-2528", +- "self_type" : "type-2528", ++ "referenced_type" : "type-2523", ++ "self_type" : "type-2523", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2470" ], ++ "template_args" : [ "type-2465" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy >", + "name" : "android::trait_trivial_copy >", +- "referenced_type" : "type-3858", +- "self_type" : "type-3858", ++ "referenced_type" : "type-3851", ++ "self_type" : "type-3851", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-71" ], ++ "template_args" : [ "type-70" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware7IBinderEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-191", +- "self_type" : "type-191", ++ "referenced_type" : "type-190", ++ "self_type" : "type-190", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-44" ], ++ "template_args" : [ "type-43" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-196", +- "self_type" : "type-196", ++ "referenced_type" : "type-195", ++ "self_type" : "type-195", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-48" ], ++ "template_args" : [ "type-47" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-2452", +- "self_type" : "type-2452", ++ "referenced_type" : "type-2447", ++ "self_type" : "type-2447", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-139" ], ++ "template_args" : [ "type-138" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIPKvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-529", +- "self_type" : "type-529", ++ "referenced_type" : "type-527", ++ "self_type" : "type-527", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-4" ], +@@ -42093,19 +43505,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-512", +- "self_type" : "type-512", ++ "referenced_type" : "type-511", ++ "self_type" : "type-511", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-298" ], ++ "template_args" : [ "type-297" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-326", +- "self_type" : "type-326", ++ "referenced_type" : "type-325", ++ "self_type" : "type-325", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-19" ], +@@ -42115,8 +43527,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-466", +- "self_type" : "type-466", ++ "referenced_type" : "type-465", ++ "self_type" : "type-465", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-447" ], +@@ -42126,19 +43538,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-395", +- "self_type" : "type-395", ++ "referenced_type" : "type-394", ++ "self_type" : "type-394", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-111" ], ++ "template_args" : [ "type-110" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-205", +- "self_type" : "type-205", ++ "referenced_type" : "type-204", ++ "self_type" : "type-204", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-2" ], +@@ -42148,19 +43560,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-201", +- "self_type" : "type-201", ++ "referenced_type" : "type-200", ++ "self_type" : "type-200", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-199" ], ++ "template_args" : [ "type-198" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-354", +- "self_type" : "type-354", ++ "referenced_type" : "type-353", ++ "self_type" : "type-353", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-1" ], +@@ -42170,8 +43582,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-504", +- "self_type" : "type-504", ++ "referenced_type" : "type-502", ++ "self_type" : "type-502", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-21" ], +@@ -42181,52 +43593,52 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-434", +- "self_type" : "type-434", ++ "referenced_type" : "type-432", ++ "self_type" : "type-432", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-416" ], ++ "template_args" : [ "type-415" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyImEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-211", +- "self_type" : "type-211", ++ "referenced_type" : "type-210", ++ "self_type" : "type-210", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-132" ], ++ "template_args" : [ "type-131" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyItEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_copy", + "name" : "android::trait_trivial_copy", +- "referenced_type" : "type-187", +- "self_type" : "type-187", ++ "referenced_type" : "type-186", ++ "self_type" : "type-186", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-106" ], ++ "template_args" : [ "type-105" ], + "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-3683", +- "self_type" : "type-3683", ++ "referenced_type" : "type-3676", ++ "self_type" : "type-3676", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-68" ], ++ "template_args" : [ "type-67" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBaseEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-3673", +- "self_type" : "type-3673", ++ "referenced_type" : "type-3666", ++ "self_type" : "type-3666", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-35" ], +@@ -42236,140 +43648,140 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-3850", +- "self_type" : "type-3850", ++ "referenced_type" : "type-3843", ++ "self_type" : "type-3843", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-342" ], ++ "template_args" : [ "type-341" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8String16EEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-3662", +- "self_type" : "type-3662", ++ "referenced_type" : "type-3655", ++ "self_type" : "type-3655", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2332" ], ++ "template_args" : [ "type-2327" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-2447", +- "self_type" : "type-2447", ++ "referenced_type" : "type-2442", ++ "self_type" : "type-2442", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2374" ], ++ "template_args" : [ "type-2369" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-2446", +- "self_type" : "type-2446", ++ "referenced_type" : "type-2441", ++ "self_type" : "type-2441", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2344" ], ++ "template_args" : [ "type-2339" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-3848", +- "self_type" : "type-3848", ++ "referenced_type" : "type-3841", ++ "self_type" : "type-3841", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2416" ], ++ "template_args" : [ "type-2411" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor > >", + "name" : "android::trait_trivial_ctor > >", +- "referenced_type" : "type-3849", +- "self_type" : "type-3849", ++ "referenced_type" : "type-3842", ++ "self_type" : "type-3842", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3807" ], ++ "template_args" : [ "type-3800" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor >", + "name" : "android::trait_trivial_ctor >", +- "referenced_type" : "type-2444", +- "self_type" : "type-2444", ++ "referenced_type" : "type-2439", ++ "self_type" : "type-2439", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2384" ], ++ "template_args" : [ "type-2379" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor >", + "name" : "android::trait_trivial_ctor >", +- "referenced_type" : "type-2469", +- "self_type" : "type-2469", ++ "referenced_type" : "type-2464", ++ "self_type" : "type-2464", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2470" ], ++ "template_args" : [ "type-2465" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor >", + "name" : "android::trait_trivial_ctor >", +- "referenced_type" : "type-3851", +- "self_type" : "type-3851", ++ "referenced_type" : "type-3844", ++ "self_type" : "type-3844", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-71" ], ++ "template_args" : [ "type-70" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware7IBinderEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-189", +- "self_type" : "type-189", ++ "referenced_type" : "type-188", ++ "self_type" : "type-188", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-44" ], ++ "template_args" : [ "type-43" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-193", +- "self_type" : "type-193", ++ "referenced_type" : "type-192", ++ "self_type" : "type-192", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-48" ], ++ "template_args" : [ "type-47" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-2445", +- "self_type" : "type-2445", ++ "referenced_type" : "type-2440", ++ "self_type" : "type-2440", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-139" ], ++ "template_args" : [ "type-138" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIPKvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-522", +- "self_type" : "type-522", ++ "referenced_type" : "type-520", ++ "self_type" : "type-520", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-4" ], +@@ -42379,19 +43791,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-508", +- "self_type" : "type-508", ++ "referenced_type" : "type-506", ++ "self_type" : "type-506", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-298" ], ++ "template_args" : [ "type-297" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-213", +- "self_type" : "type-213", ++ "referenced_type" : "type-212", ++ "self_type" : "type-212", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-19" ], +@@ -42412,19 +43824,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-364", +- "self_type" : "type-364", ++ "referenced_type" : "type-363", ++ "self_type" : "type-363", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-111" ], ++ "template_args" : [ "type-110" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-203", +- "self_type" : "type-203", ++ "referenced_type" : "type-202", ++ "self_type" : "type-202", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-2" ], +@@ -42434,19 +43846,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-198", +- "self_type" : "type-198", ++ "referenced_type" : "type-197", ++ "self_type" : "type-197", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-199" ], ++ "template_args" : [ "type-198" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-337", +- "self_type" : "type-337", ++ "referenced_type" : "type-336", ++ "self_type" : "type-336", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-1" ], +@@ -42456,8 +43868,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-486", +- "self_type" : "type-486", ++ "referenced_type" : "type-485", ++ "self_type" : "type-485", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-21" ], +@@ -42467,52 +43879,52 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-415", +- "self_type" : "type-415", ++ "referenced_type" : "type-414", ++ "self_type" : "type-414", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-416" ], ++ "template_args" : [ "type-415" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorImEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-209", +- "self_type" : "type-209", ++ "referenced_type" : "type-208", ++ "self_type" : "type-208", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-132" ], ++ "template_args" : [ "type-131" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_ctor", + "name" : "android::trait_trivial_ctor", +- "referenced_type" : "type-185", +- "self_type" : "type-185", ++ "referenced_type" : "type-184", ++ "self_type" : "type-184", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-106" ], ++ "template_args" : [ "type-105" ], + "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-3735", +- "self_type" : "type-3735", ++ "referenced_type" : "type-3728", ++ "self_type" : "type-3728", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-68" ], ++ "template_args" : [ "type-67" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBaseEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-3726", +- "self_type" : "type-3726", ++ "referenced_type" : "type-3719", ++ "self_type" : "type-3719", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-35" ], +@@ -42522,140 +43934,140 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-3853", +- "self_type" : "type-3853", ++ "referenced_type" : "type-3846", ++ "self_type" : "type-3846", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-342" ], ++ "template_args" : [ "type-341" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8String16EEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-3715", +- "self_type" : "type-3715", ++ "referenced_type" : "type-3708", ++ "self_type" : "type-3708", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2332" ], ++ "template_args" : [ "type-2327" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-2451", +- "self_type" : "type-2451", ++ "referenced_type" : "type-2446", ++ "self_type" : "type-2446", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2374" ], ++ "template_args" : [ "type-2369" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-2449", +- "self_type" : "type-2449", ++ "referenced_type" : "type-2444", ++ "self_type" : "type-2444", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2344" ], ++ "template_args" : [ "type-2339" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-3852", +- "self_type" : "type-3852", ++ "referenced_type" : "type-3845", ++ "self_type" : "type-3845", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2416" ], ++ "template_args" : [ "type-2411" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor > >", + "name" : "android::trait_trivial_dtor > >", +- "referenced_type" : "type-3855", +- "self_type" : "type-3855", ++ "referenced_type" : "type-3848", ++ "self_type" : "type-3848", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3807" ], ++ "template_args" : [ "type-3800" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor >", + "name" : "android::trait_trivial_dtor >", +- "referenced_type" : "type-2450", +- "self_type" : "type-2450", ++ "referenced_type" : "type-2445", ++ "self_type" : "type-2445", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2384" ], ++ "template_args" : [ "type-2379" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor >", + "name" : "android::trait_trivial_dtor >", +- "referenced_type" : "type-2527", +- "self_type" : "type-2527", ++ "referenced_type" : "type-2522", ++ "self_type" : "type-2522", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2470" ], ++ "template_args" : [ "type-2465" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor >", + "name" : "android::trait_trivial_dtor >", +- "referenced_type" : "type-3854", +- "self_type" : "type-3854", ++ "referenced_type" : "type-3847", ++ "self_type" : "type-3847", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-71" ], ++ "template_args" : [ "type-70" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware7IBinderEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-190", +- "self_type" : "type-190", ++ "referenced_type" : "type-189", ++ "self_type" : "type-189", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-44" ], ++ "template_args" : [ "type-43" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-195", +- "self_type" : "type-195", ++ "referenced_type" : "type-194", ++ "self_type" : "type-194", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-48" ], ++ "template_args" : [ "type-47" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-2448", +- "self_type" : "type-2448", ++ "referenced_type" : "type-2443", ++ "self_type" : "type-2443", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-139" ], ++ "template_args" : [ "type-138" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIPKvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-526", +- "self_type" : "type-526", ++ "referenced_type" : "type-524", ++ "self_type" : "type-524", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-4" ], +@@ -42665,19 +44077,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-509", +- "self_type" : "type-509", ++ "referenced_type" : "type-507", ++ "self_type" : "type-507", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-298" ], ++ "template_args" : [ "type-297" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-323", +- "self_type" : "type-323", ++ "referenced_type" : "type-322", ++ "self_type" : "type-322", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-19" ], +@@ -42687,8 +44099,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-458", +- "self_type" : "type-458", ++ "referenced_type" : "type-457", ++ "self_type" : "type-457", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-447" ], +@@ -42698,19 +44110,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-375", +- "self_type" : "type-375", ++ "referenced_type" : "type-374", ++ "self_type" : "type-374", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-111" ], ++ "template_args" : [ "type-110" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-204", +- "self_type" : "type-204", ++ "referenced_type" : "type-203", ++ "self_type" : "type-203", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-2" ], +@@ -42720,19 +44132,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-200", +- "self_type" : "type-200", ++ "referenced_type" : "type-199", ++ "self_type" : "type-199", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-199" ], ++ "template_args" : [ "type-198" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-346", +- "self_type" : "type-346", ++ "referenced_type" : "type-345", ++ "self_type" : "type-345", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-1" ], +@@ -42742,8 +44154,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-497", +- "self_type" : "type-497", ++ "referenced_type" : "type-496", ++ "self_type" : "type-496", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-21" ], +@@ -42753,52 +44165,52 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-425", +- "self_type" : "type-425", ++ "referenced_type" : "type-423", ++ "self_type" : "type-423", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-416" ], ++ "template_args" : [ "type-415" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorImEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-210", +- "self_type" : "type-210", ++ "referenced_type" : "type-209", ++ "self_type" : "type-209", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-132" ], ++ "template_args" : [ "type-131" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_dtor", + "name" : "android::trait_trivial_dtor", +- "referenced_type" : "type-186", +- "self_type" : "type-186", ++ "referenced_type" : "type-185", ++ "self_type" : "type-185", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-106" ], ++ "template_args" : [ "type-105" ], + "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-3744", +- "self_type" : "type-3744", ++ "referenced_type" : "type-3737", ++ "self_type" : "type-3737", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-68" ], ++ "template_args" : [ "type-67" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBaseEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-3743", +- "self_type" : "type-3743", ++ "referenced_type" : "type-3736", ++ "self_type" : "type-3736", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-35" ], +@@ -42808,151 +44220,151 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-353", +- "self_type" : "type-353", ++ "referenced_type" : "type-352", ++ "self_type" : "type-352", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/String16.h", +- "template_args" : [ "type-342" ], ++ "template_args" : [ "type-341" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-228", +- "self_type" : "type-228", ++ "referenced_type" : "type-227", ++ "self_type" : "type-227", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/String8.h", +- "template_args" : [ "type-221" ], ++ "template_args" : [ "type-220" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-3742", +- "self_type" : "type-3742", ++ "referenced_type" : "type-3735", ++ "self_type" : "type-3735", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2332" ], ++ "template_args" : [ "type-2327" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-2459", +- "self_type" : "type-2459", ++ "referenced_type" : "type-2454", ++ "self_type" : "type-2454", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2374" ], ++ "template_args" : [ "type-2369" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-2457", +- "self_type" : "type-2457", ++ "referenced_type" : "type-2452", ++ "self_type" : "type-2452", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2344" ], ++ "template_args" : [ "type-2339" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-3860", +- "self_type" : "type-3860", ++ "referenced_type" : "type-3853", ++ "self_type" : "type-3853", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2416" ], ++ "template_args" : [ "type-2411" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move > >", + "name" : "android::trait_trivial_move > >", +- "referenced_type" : "type-3862", +- "self_type" : "type-3862", ++ "referenced_type" : "type-3855", ++ "self_type" : "type-3855", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3807" ], ++ "template_args" : [ "type-3800" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move >", + "name" : "android::trait_trivial_move >", +- "referenced_type" : "type-2458", +- "self_type" : "type-2458", ++ "referenced_type" : "type-2453", ++ "self_type" : "type-2453", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2384" ], ++ "template_args" : [ "type-2379" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move >", + "name" : "android::trait_trivial_move >", +- "referenced_type" : "type-2529", +- "self_type" : "type-2529", ++ "referenced_type" : "type-2524", ++ "self_type" : "type-2524", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2470" ], ++ "template_args" : [ "type-2465" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move >", + "name" : "android::trait_trivial_move >", +- "referenced_type" : "type-3861", +- "self_type" : "type-3861", ++ "referenced_type" : "type-3854", ++ "self_type" : "type-3854", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-71" ], ++ "template_args" : [ "type-70" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware7IBinderEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-192", +- "self_type" : "type-192", ++ "referenced_type" : "type-191", ++ "self_type" : "type-191", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-44" ], ++ "template_args" : [ "type-43" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-197", +- "self_type" : "type-197", ++ "referenced_type" : "type-196", ++ "self_type" : "type-196", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-48" ], ++ "template_args" : [ "type-47" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-2456", +- "self_type" : "type-2456", ++ "referenced_type" : "type-2451", ++ "self_type" : "type-2451", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-139" ], ++ "template_args" : [ "type-138" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIPKvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-536", +- "self_type" : "type-536", ++ "referenced_type" : "type-534", ++ "self_type" : "type-534", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-4" ], +@@ -42962,19 +44374,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-514", +- "self_type" : "type-514", ++ "referenced_type" : "type-512", ++ "self_type" : "type-512", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-298" ], ++ "template_args" : [ "type-297" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-331", +- "self_type" : "type-331", ++ "referenced_type" : "type-330", ++ "self_type" : "type-330", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-19" ], +@@ -42984,8 +44396,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-477", +- "self_type" : "type-477", ++ "referenced_type" : "type-475", ++ "self_type" : "type-475", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-447" ], +@@ -42995,19 +44407,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-406", +- "self_type" : "type-406", ++ "referenced_type" : "type-405", ++ "self_type" : "type-405", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-111" ], ++ "template_args" : [ "type-110" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-208", +- "self_type" : "type-208", ++ "referenced_type" : "type-207", ++ "self_type" : "type-207", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-2" ], +@@ -43017,19 +44429,19 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-202", +- "self_type" : "type-202", ++ "referenced_type" : "type-201", ++ "self_type" : "type-201", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-199" ], ++ "template_args" : [ "type-198" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-359", +- "self_type" : "type-359", ++ "referenced_type" : "type-358", ++ "self_type" : "type-358", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-1" ], +@@ -43039,8 +44451,8 @@ + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-505", +- "self_type" : "type-505", ++ "referenced_type" : "type-503", ++ "self_type" : "type-503", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-21" ], +@@ -43054,48 +44466,48 @@ + "self_type" : "type-435", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-416" ], ++ "template_args" : [ "type-415" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveImEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-212", +- "self_type" : "type-212", ++ "referenced_type" : "type-211", ++ "self_type" : "type-211", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-132" ], ++ "template_args" : [ "type-131" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveItEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::trait_trivial_move", + "name" : "android::trait_trivial_move", +- "referenced_type" : "type-188", +- "self_type" : "type-188", ++ "referenced_type" : "type-187", ++ "self_type" : "type-187", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-106" ], ++ "template_args" : [ "type-105" ], + "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3750", +- "self_type" : "type-3750", ++ "referenced_type" : "type-3743", ++ "self_type" : "type-3743", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-68" ], ++ "template_args" : [ "type-67" ], + "unique_id" : "_ZTSN7android6traitsIPNS_7RefBaseEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3749", +- "self_type" : "type-3749", ++ "referenced_type" : "type-3742", ++ "self_type" : "type-3742", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-35" ], +@@ -43105,118 +44517,118 @@ + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3869", +- "self_type" : "type-3869", ++ "referenced_type" : "type-3862", ++ "self_type" : "type-3862", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-342" ], ++ "template_args" : [ "type-341" ], + "unique_id" : "_ZTSN7android6traitsINS_8String16EEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3748", +- "self_type" : "type-3748", ++ "referenced_type" : "type-3741", ++ "self_type" : "type-3741", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2332" ], ++ "template_args" : [ "type-2327" ], + "unique_id" : "_ZTSN7android6traitsIPNS_8hardware9BHwBinderEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-2467", +- "self_type" : "type-2467", ++ "referenced_type" : "type-2462", ++ "self_type" : "type-2462", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2374" ], ++ "template_args" : [ "type-2369" ], + "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-2466", +- "self_type" : "type-2466", ++ "referenced_type" : "type-2461", ++ "self_type" : "type-2461", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2344" ], ++ "template_args" : [ "type-2339" ], + "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3867", +- "self_type" : "type-3867", ++ "referenced_type" : "type-3860", ++ "self_type" : "type-3860", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2416" ], ++ "template_args" : [ "type-2411" ], + "unique_id" : "_ZTSN7android6traitsINS_8hardware12ProcessState12handle_entryEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits > >", + "name" : "android::traits > >", +- "referenced_type" : "type-3868", +- "self_type" : "type-3868", ++ "referenced_type" : "type-3861", ++ "self_type" : "type-3861", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3807" ], ++ "template_args" : [ "type-3800" ], + "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits >", + "name" : "android::traits >", +- "referenced_type" : "type-2464", +- "self_type" : "type-2464", ++ "referenced_type" : "type-2459", ++ "self_type" : "type-2459", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2384" ], ++ "template_args" : [ "type-2379" ], + "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits >", + "name" : "android::traits >", +- "referenced_type" : "type-2531", +- "self_type" : "type-2531", ++ "referenced_type" : "type-2526", ++ "self_type" : "type-2526", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2470" ], ++ "template_args" : [ "type-2465" ], + "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits >", + "name" : "android::traits >", +- "referenced_type" : "type-3870", +- "self_type" : "type-3870", ++ "referenced_type" : "type-3863", ++ "self_type" : "type-3863", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-71" ], ++ "template_args" : [ "type-70" ], + "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware7IBinderEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-2465", +- "self_type" : "type-2465", ++ "referenced_type" : "type-2460", ++ "self_type" : "type-2460", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-139" ], ++ "template_args" : [ "type-138" ], + "unique_id" : "_ZTSN7android6traitsIPKvEE" + }, + { + "alignment" : 1, + "linker_set_key" : "android::traits", + "name" : "android::traits", +- "referenced_type" : "type-3885", +- "self_type" : "type-3885", ++ "referenced_type" : "type-3878", ++ "self_type" : "type-3878", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-19" ], +@@ -43227,16 +44639,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3618" ++ "referenced_type" : "type-3611" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-3617", +- "self_type" : "type-3617", ++ "referenced_type" : "type-3610", ++ "self_type" : "type-3610", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-68" ], ++ "template_args" : [ "type-67" ], + "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBaseEEE" + }, + { +@@ -43244,13 +44656,13 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3616" ++ "referenced_type" : "type-3609" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-3615", +- "self_type" : "type-3615", ++ "referenced_type" : "type-3608", ++ "self_type" : "type-3608", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-35" ], +@@ -43261,16 +44673,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3614" ++ "referenced_type" : "type-3607" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-3613", +- "self_type" : "type-3613", ++ "referenced_type" : "type-3606", ++ "self_type" : "type-3606", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2332" ], ++ "template_args" : [ "type-2327" ], + "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_8hardware9BHwBinderEEE" + }, + { +@@ -43278,16 +44690,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2396" ++ "referenced_type" : "type-2391" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-2395", +- "self_type" : "type-2395", ++ "referenced_type" : "type-2390", ++ "self_type" : "type-2390", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2374" ], ++ "template_args" : [ "type-2369" ], + "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE" + }, + { +@@ -43295,16 +44707,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3816" ++ "referenced_type" : "type-3809" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-3815", +- "self_type" : "type-3815", ++ "referenced_type" : "type-3808", ++ "self_type" : "type-3808", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2416" ], ++ "template_args" : [ "type-2411" ], + "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware12ProcessState12handle_entryEEE" + }, + { +@@ -43312,16 +44724,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3818" ++ "referenced_type" : "type-3811" + } + ], + "linker_set_key" : "android::use_trivial_move > >", + "name" : "android::use_trivial_move > >", +- "referenced_type" : "type-3817", +- "self_type" : "type-3817", ++ "referenced_type" : "type-3810", ++ "self_type" : "type-3810", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-3807" ], ++ "template_args" : [ "type-3800" ], + "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE" + }, + { +@@ -43329,16 +44741,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2394" ++ "referenced_type" : "type-2389" + } + ], + "linker_set_key" : "android::use_trivial_move >", + "name" : "android::use_trivial_move >", +- "referenced_type" : "type-2393", +- "self_type" : "type-2393", ++ "referenced_type" : "type-2388", ++ "self_type" : "type-2388", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2384" ], ++ "template_args" : [ "type-2379" ], + "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE" + }, + { +@@ -43346,16 +44758,16 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2533" ++ "referenced_type" : "type-2528" + } + ], + "linker_set_key" : "android::use_trivial_move >", + "name" : "android::use_trivial_move >", +- "referenced_type" : "type-2532", +- "self_type" : "type-2532", ++ "referenced_type" : "type-2527", ++ "self_type" : "type-2527", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", +- "template_args" : [ "type-2470" ], ++ "template_args" : [ "type-2465" ], + "unique_id" : "_ZTSN7android16use_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE" + }, + { +@@ -43363,13 +44775,13 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3873" ++ "referenced_type" : "type-3866" + } + ], + "linker_set_key" : "android::use_trivial_move", + "name" : "android::use_trivial_move", +- "referenced_type" : "type-3872", +- "self_type" : "type-3872", ++ "referenced_type" : "type-3865", ++ "self_type" : "type-3865", + "size" : 1, + "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h", + "template_args" : [ "type-19" ], +@@ -43382,7 +44794,7 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-384" ++ "referenced_type" : "type-383" + }, + { + "access" : "private", +@@ -43394,11 +44806,11 @@ + "linker_set_key" : "android::wp", + "name" : "android::wp", + "record_kind" : "class", +- "referenced_type" : "type-383", +- "self_type" : "type-383", ++ "referenced_type" : "type-382", ++ "self_type" : "type-382", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h", +- "template_args" : [ "type-386" ], ++ "template_args" : [ "type-385" ], + "unique_id" : "_ZTSN7android2wpINS_8hardware9BHwBinderEEE" + }, + { +@@ -43408,7 +44820,7 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-945" ++ "referenced_type" : "type-942" + }, + { + "access" : "private", +@@ -43420,11 +44832,11 @@ + "linker_set_key" : "android::wp", + "name" : "android::wp", + "record_kind" : "class", +- "referenced_type" : "type-944", +- "self_type" : "type-944", ++ "referenced_type" : "type-941", ++ "self_type" : "type-941", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h", +- "template_args" : [ "type-948" ], ++ "template_args" : [ "type-945" ], + "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinder14DeathRecipientEEE" + }, + { +@@ -43434,7 +44846,7 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-2329" ++ "referenced_type" : "type-2324" + }, + { + "access" : "private", +@@ -43446,11 +44858,11 @@ + "linker_set_key" : "android::wp", + "name" : "android::wp", + "record_kind" : "class", +- "referenced_type" : "type-2382", +- "self_type" : "type-2382", ++ "referenced_type" : "type-2377", ++ "self_type" : "type-2377", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h", +- "template_args" : [ "type-2328" ], ++ "template_args" : [ "type-2323" ], + "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinderEEE" + }, + { +@@ -43460,7 +44872,7 @@ + { + "access" : "private", + "field_name" : "m_ptr", +- "referenced_type" : "type-143" ++ "referenced_type" : "type-142" + }, + { + "access" : "private", +@@ -43472,11 +44884,11 @@ + "linker_set_key" : "android::wp", + "name" : "android::wp", + "record_kind" : "class", +- "referenced_type" : "type-361", +- "self_type" : "type-361", ++ "referenced_type" : "type-360", ++ "self_type" : "type-360", + "size" : 8, + "source_file" : "/system/core/libutils/include/utils/RefBase.h", +- "template_args" : [ "type-144" ], ++ "template_args" : [ "type-143" ], + "unique_id" : "_ZTSN7android2wpINS_8hardware20hidl_death_recipientEEE" + }, + { +@@ -43511,18 +44923,18 @@ + [ + { + "field_name" : "maxContentLightLevel", +- "referenced_type" : "type-298" ++ "referenced_type" : "type-297" + }, + { + "field_name" : "maxFrameAverageLightLevel", + "field_offset" : 32, +- "referenced_type" : "type-298" ++ "referenced_type" : "type-297" + } + ], + "linker_set_key" : "android_cta861_3_metadata", + "name" : "android_cta861_3_metadata", +- "referenced_type" : "type-302", +- "self_type" : "type-302", ++ "referenced_type" : "type-301", ++ "self_type" : "type-301", + "size" : 8, + "source_file" : "/system/core/libsystem/include/system/graphics.h", + "unique_id" : "android_cta861_3_metadata" +@@ -43538,18 +44950,18 @@ + { + "field_name" : "reserved", + "field_offset" : 32, +- "referenced_type" : "type-288" ++ "referenced_type" : "type-287" + }, + { + "field_name" : "xyzc_points", + "field_offset" : 288, +- "referenced_type" : "type-297" ++ "referenced_type" : "type-296" + } + ], + "linker_set_key" : "android_depth_points", + "name" : "android_depth_points", +- "referenced_type" : "type-296", +- "self_type" : "type-296", ++ "referenced_type" : "type-295", ++ "self_type" : "type-295", + "size" : 36, + "source_file" : "/system/core/libsystem/include/system/graphics.h", + "unique_id" : "android_depth_points" +@@ -43560,7 +44972,7 @@ + [ + { + "field_name" : "format", +- "referenced_type" : "type-292" ++ "referenced_type" : "type-291" + }, + { + "field_name" : "num_planes", +@@ -43570,13 +44982,13 @@ + { + "field_name" : "planes", + "field_offset" : 64, +- "referenced_type" : "type-294" ++ "referenced_type" : "type-293" + } + ], + "linker_set_key" : "android_flex_layout", + "name" : "android_flex_layout", +- "referenced_type" : "type-293", +- "self_type" : "type-293", ++ "referenced_type" : "type-292", ++ "self_type" : "type-292", + "size" : 12, + "source_file" : "/system/core/libsystem/include/system/graphics.h", + "unique_id" : "android_flex_layout" +@@ -43587,12 +44999,12 @@ + [ + { + "field_name" : "top_left", +- "referenced_type" : "type-291" ++ "referenced_type" : "type-290" + }, + { + "field_name" : "component", + "field_offset" : 32, +- "referenced_type" : "type-289" ++ "referenced_type" : "type-288" + }, + { + "field_name" : "bits_per_component", +@@ -43627,8 +45039,8 @@ + ], + "linker_set_key" : "android_flex_plane", + "name" : "android_flex_plane", +- "referenced_type" : "type-290", +- "self_type" : "type-290", ++ "referenced_type" : "type-289", ++ "self_type" : "type-289", + "size" : 32, + "source_file" : "/system/core/libsystem/include/system/graphics.h", + "unique_id" : "android_flex_plane" +@@ -43639,38 +45051,38 @@ + [ + { + "field_name" : "displayPrimaryRed", +- "referenced_type" : "type-299" ++ "referenced_type" : "type-298" + }, + { + "field_name" : "displayPrimaryGreen", + "field_offset" : 64, +- "referenced_type" : "type-299" ++ "referenced_type" : "type-298" + }, + { + "field_name" : "displayPrimaryBlue", + "field_offset" : 128, +- "referenced_type" : "type-299" ++ "referenced_type" : "type-298" + }, + { + "field_name" : "whitePoint", + "field_offset" : 192, +- "referenced_type" : "type-299" ++ "referenced_type" : "type-298" + }, + { + "field_name" : "maxLuminance", + "field_offset" : 256, +- "referenced_type" : "type-298" ++ "referenced_type" : "type-297" + }, + { + "field_name" : "minLuminance", + "field_offset" : 288, +- "referenced_type" : "type-298" ++ "referenced_type" : "type-297" + } + ], + "linker_set_key" : "android_smpte2086_metadata", + "name" : "android_smpte2086_metadata", +- "referenced_type" : "type-300", +- "self_type" : "type-300", ++ "referenced_type" : "type-299", ++ "self_type" : "type-299", + "size" : 40, + "source_file" : "/system/core/libsystem/include/system/graphics.h", + "unique_id" : "android_smpte2086_metadata" +@@ -43681,18 +45093,18 @@ + [ + { + "field_name" : "x", +- "referenced_type" : "type-298" ++ "referenced_type" : "type-297" + }, + { + "field_name" : "y", + "field_offset" : 32, +- "referenced_type" : "type-298" ++ "referenced_type" : "type-297" + } + ], + "linker_set_key" : "android_xy_color", + "name" : "android_xy_color", +- "referenced_type" : "type-299", +- "self_type" : "type-299", ++ "referenced_type" : "type-298", ++ "self_type" : "type-298", + "size" : 8, + "source_file" : "/system/core/libsystem/include/system/graphics.h", + "unique_id" : "android_xy_color" +@@ -43703,17 +45115,17 @@ + [ + { + "field_name" : "y", +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "field_name" : "cb", + "field_offset" : 32, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "field_name" : "cr", + "field_offset" : 64, +- "referenced_type" : "type-245" ++ "referenced_type" : "type-244" + }, + { + "field_name" : "ystride", +@@ -43733,13 +45145,13 @@ + { + "field_name" : "reserved", + "field_offset" : 192, +- "referenced_type" : "type-288" ++ "referenced_type" : "type-287" + } + ], + "linker_set_key" : "android_ycbcr", + "name" : "android_ycbcr", +- "referenced_type" : "type-287", +- "self_type" : "type-287", ++ "referenced_type" : "type-286", ++ "self_type" : "type-286", + "size" : 56, + "source_file" : "/system/core/libsystem/include/system/graphics.h", + "unique_id" : "android_ycbcr" +@@ -43749,13 +45161,13 @@ + "fields" : + [ + { +- "referenced_type" : "type-237" ++ "referenced_type" : "type-236" + } + ], + "linker_set_key" : "log_msg", + "name" : "log_msg", +- "referenced_type" : "type-236", +- "self_type" : "type-236", ++ "referenced_type" : "type-235", ++ "self_type" : "type-235", + "size" : 5124, + "source_file" : "/system/core/liblog/include/log/log_read.h", + "unique_id" : "log_msg" +@@ -43766,35 +45178,35 @@ + [ + { + "field_name" : "buf", +- "referenced_type" : "type-238" ++ "referenced_type" : "type-237" + }, + { + "field_name" : "entry", +- "referenced_type" : "type-235" ++ "referenced_type" : "type-234" + }, + { + "field_name" : "entry_v4", +- "referenced_type" : "type-235" ++ "referenced_type" : "type-234" + }, + { + "field_name" : "entry_v3", +- "referenced_type" : "type-233" ++ "referenced_type" : "type-232" + }, + { + "field_name" : "entry_v2", +- "referenced_type" : "type-232" ++ "referenced_type" : "type-231" + }, + { + "field_name" : "entry_v1", +- "referenced_type" : "type-230" ++ "referenced_type" : "type-229" + } + ], + "is_anonymous" : true, + "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3", + "name" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3", + "record_kind" : "union", +- "referenced_type" : "type-237", +- "self_type" : "type-237", ++ "referenced_type" : "type-236", ++ "self_type" : "type-236", + "size" : 5124, + "source_file" : "/system/core/liblog/include/log/log_read.h", + "unique_id" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3)" +@@ -43815,8 +45227,8 @@ + ], + "linker_set_key" : "log_time", + "name" : "log_time", +- "referenced_type" : "type-229", +- "self_type" : "type-229", ++ "referenced_type" : "type-228", ++ "self_type" : "type-228", + "size" : 8, + "source_file" : "/system/core/liblog/include_vndk/log/log_time.h", + "unique_id" : "_ZTS8log_time" +@@ -43827,12 +45239,12 @@ + [ + { + "field_name" : "len", +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + }, + { + "field_name" : "__pad", + "field_offset" : 16, +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + }, + { + "field_name" : "pid", +@@ -43857,13 +45269,13 @@ + { + "field_name" : "msg", + "field_offset" : 160, +- "referenced_type" : "type-231" ++ "referenced_type" : "type-230" + } + ], + "linker_set_key" : "logger_entry", + "name" : "logger_entry", +- "referenced_type" : "type-230", +- "self_type" : "type-230", ++ "referenced_type" : "type-229", ++ "self_type" : "type-229", + "size" : 20, + "source_file" : "/system/core/liblog/include/log/log_read.h", + "unique_id" : "logger_entry" +@@ -43874,12 +45286,12 @@ + [ + { + "field_name" : "len", +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + }, + { + "field_name" : "hdr_size", + "field_offset" : 16, +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + }, + { + "field_name" : "pid", +@@ -43909,13 +45321,13 @@ + { + "field_name" : "msg", + "field_offset" : 192, +- "referenced_type" : "type-231" ++ "referenced_type" : "type-230" + } + ], + "linker_set_key" : "logger_entry_v2", + "name" : "logger_entry_v2", +- "referenced_type" : "type-232", +- "self_type" : "type-232", ++ "referenced_type" : "type-231", ++ "self_type" : "type-231", + "size" : 24, + "source_file" : "/system/core/liblog/include/log/log_read.h", + "unique_id" : "logger_entry_v2" +@@ -43926,12 +45338,12 @@ + [ + { + "field_name" : "len", +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + }, + { + "field_name" : "hdr_size", + "field_offset" : 16, +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + }, + { + "field_name" : "pid", +@@ -43961,13 +45373,13 @@ + { + "field_name" : "msg", + "field_offset" : 192, +- "referenced_type" : "type-231" ++ "referenced_type" : "type-230" + } + ], + "linker_set_key" : "logger_entry_v3", + "name" : "logger_entry_v3", +- "referenced_type" : "type-233", +- "self_type" : "type-233", ++ "referenced_type" : "type-232", ++ "self_type" : "type-232", + "size" : 24, + "source_file" : "/system/core/liblog/include/log/log_read.h", + "unique_id" : "logger_entry_v3" +@@ -43978,12 +45390,12 @@ + [ + { + "field_name" : "len", +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + }, + { + "field_name" : "hdr_size", + "field_offset" : 16, +- "referenced_type" : "type-132" ++ "referenced_type" : "type-131" + }, + { + "field_name" : "pid", +@@ -44018,13 +45430,13 @@ + { + "field_name" : "msg", + "field_offset" : 224, +- "referenced_type" : "type-231" ++ "referenced_type" : "type-230" + } + ], + "linker_set_key" : "logger_entry_v4", + "name" : "logger_entry_v4", +- "referenced_type" : "type-235", +- "self_type" : "type-235", ++ "referenced_type" : "type-234", ++ "self_type" : "type-234", + "size" : 28, + "source_file" : "/system/core/liblog/include/log/log_read.h", + "unique_id" : "logger_entry_v4" +@@ -44067,7 +45479,7 @@ + [ + { + "field_name" : "lock", +- "referenced_type" : "type-2513" ++ "referenced_type" : "type-2508" + }, + { + "field_name" : "has_tls", +@@ -44082,8 +45494,8 @@ + ], + "linker_set_key" : "thread_store_t", + "name" : "thread_store_t", +- "referenced_type" : "type-2512", +- "self_type" : "type-2512", ++ "referenced_type" : "type-2507", ++ "self_type" : "type-2507", + "size" : 12, + "source_file" : "/system/core/libcutils/include/cutils/threads.h", + "unique_id" : "thread_store_t" +@@ -44095,8 +45507,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return &&", + "name" : "android::hardware::Return &&", +- "referenced_type" : "type-807", +- "self_type" : "type-809", ++ "referenced_type" : "type-804", ++ "self_type" : "type-806", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44104,8 +45516,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-801", +- "self_type" : "type-803", ++ "referenced_type" : "type-798", ++ "self_type" : "type-800", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44113,8 +45525,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-986", +- "self_type" : "type-988", ++ "referenced_type" : "type-983", ++ "self_type" : "type-985", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44122,8 +45534,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-1093", +- "self_type" : "type-1095", ++ "referenced_type" : "type-1090", ++ "self_type" : "type-1092", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44131,8 +45543,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-1153", +- "self_type" : "type-1155", ++ "referenced_type" : "type-1150", ++ "self_type" : "type-1152", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44140,8 +45552,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-1213", +- "self_type" : "type-1215", ++ "referenced_type" : "type-1210", ++ "self_type" : "type-1212", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44149,8 +45561,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return > &&", + "name" : "android::hardware::Return > &&", +- "referenced_type" : "type-1284", +- "self_type" : "type-1286", ++ "referenced_type" : "type-1281", ++ "self_type" : "type-1283", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44158,8 +45570,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return &&", + "name" : "android::hardware::Return &&", +- "referenced_type" : "type-309", +- "self_type" : "type-311", ++ "referenced_type" : "type-308", ++ "self_type" : "type-310", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44167,8 +45579,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Return &&", + "name" : "android::hardware::Return &&", +- "referenced_type" : "type-102", +- "self_type" : "type-178", ++ "referenced_type" : "type-101", ++ "self_type" : "type-177", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44176,8 +45588,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::Status &&", + "name" : "android::hardware::Status &&", +- "referenced_type" : "type-104", +- "self_type" : "type-169", ++ "referenced_type" : "type-103", ++ "self_type" : "type-168", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44186,7 +45598,7 @@ + "linker_set_key" : "android::hardware::details::SchedPrio &&", + "name" : "android::hardware::details::SchedPrio &&", + "referenced_type" : "type-37", +- "self_type" : "type-40", ++ "self_type" : "type-39", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44194,8 +45606,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::hidl_pointer &&", + "name" : "android::hardware::details::hidl_pointer &&", +- "referenced_type" : "type-97", +- "self_type" : "type-151", ++ "referenced_type" : "type-96", ++ "self_type" : "type-150", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h" + }, +@@ -44203,8 +45615,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::details::return_status &&", + "name" : "android::hardware::details::return_status &&", +- "referenced_type" : "type-103", +- "self_type" : "type-173", ++ "referenced_type" : "type-102", ++ "self_type" : "type-172", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/Status.h" + }, +@@ -44212,7 +45624,7 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_handle &&", + "name" : "android::hardware::hidl_handle &&", +- "referenced_type" : "type-77", ++ "referenced_type" : "type-76", + "self_type" : "type-86", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" +@@ -44221,8 +45633,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_memory &&", + "name" : "android::hardware::hidl_memory &&", +- "referenced_type" : "type-121", +- "self_type" : "type-126", ++ "referenced_type" : "type-120", ++ "self_type" : "type-125", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -44230,8 +45642,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_string &&", + "name" : "android::hardware::hidl_string &&", +- "referenced_type" : "type-96", +- "self_type" : "type-116", ++ "referenced_type" : "type-95", ++ "self_type" : "type-115", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -44239,8 +45651,8 @@ + "alignment" : 4, + "linker_set_key" : "android::hardware::hidl_vec &&", + "name" : "android::hardware::hidl_vec &&", +- "referenced_type" : "type-518", +- "self_type" : "type-828", ++ "referenced_type" : "type-516", ++ "self_type" : "type-825", + "size" : 4, + "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h" + }, +@@ -44248,8 +45660,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-472", +- "self_type" : "type-484", ++ "referenced_type" : "type-470", ++ "self_type" : "type-482", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44257,8 +45669,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-157", +- "self_type" : "type-161", ++ "referenced_type" : "type-156", ++ "self_type" : "type-160", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44266,8 +45678,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-962", +- "self_type" : "type-2422", ++ "referenced_type" : "type-959", ++ "self_type" : "type-2417", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44275,8 +45687,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-71", +- "self_type" : "type-483", ++ "referenced_type" : "type-70", ++ "self_type" : "type-481", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44284,8 +45696,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-951", +- "self_type" : "type-983", ++ "referenced_type" : "type-948", ++ "self_type" : "type-979", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44293,8 +45705,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-142", +- "self_type" : "type-476", ++ "referenced_type" : "type-141", ++ "self_type" : "type-474", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44302,8 +45714,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-356", +- "self_type" : "type-571", ++ "referenced_type" : "type-355", ++ "self_type" : "type-569", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44311,8 +45723,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-575", +- "self_type" : "type-975", ++ "referenced_type" : "type-573", ++ "self_type" : "type-972", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44320,8 +45732,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-590", +- "self_type" : "type-980", ++ "referenced_type" : "type-588", ++ "self_type" : "type-977", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44329,8 +45741,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-580", +- "self_type" : "type-763", ++ "referenced_type" : "type-578", ++ "self_type" : "type-760", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44338,8 +45750,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-595", +- "self_type" : "type-1209", ++ "referenced_type" : "type-593", ++ "self_type" : "type-1206", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44347,8 +45759,8 @@ + "alignment" : 4, + "linker_set_key" : "android::sp &&", + "name" : "android::sp &&", +- "referenced_type" : "type-585", +- "self_type" : "type-911", ++ "referenced_type" : "type-583", ++ "self_type" : "type-907", + "size" : 4, + "source_file" : "/system/core/libutils/include/utils/StrongPointer.h" + }, +@@ -44356,35 +45768,17 @@ + "alignment" : 4, + "linker_set_key" : "android::wp &&", + "name" : "android::wp &&", +- "referenced_type" : "type-383", ++ "referenced_type" : "type-382", + "self_type" : "type-392", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +- { +- "alignment" : 4, +- "linker_set_key" : "android::wp &&", +- "name" : "android::wp &&", +- "referenced_type" : "type-32", +- "self_type" : "type-39", +- "size" : 4, +- "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "const android::hidl::base::V1_0::IBase *&&", +- "name" : "const android::hidl::base::V1_0::IBase *&&", +- "referenced_type" : "type-381", +- "self_type" : "type-391", +- "size" : 4, +- "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" +- }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1056", +- "self_type" : "type-1055", ++ "referenced_type" : "type-1053", ++ "self_type" : "type-1052", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44392,8 +45786,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1117", +- "self_type" : "type-1116", ++ "referenced_type" : "type-1114", ++ "self_type" : "type-1113", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44401,8 +45795,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1178", +- "self_type" : "type-1177", ++ "referenced_type" : "type-1175", ++ "self_type" : "type-1174", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44410,8 +45804,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1238", +- "self_type" : "type-1237", ++ "referenced_type" : "type-1235", ++ "self_type" : "type-1234", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44419,8 +45813,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1316", +- "self_type" : "type-1315", ++ "referenced_type" : "type-1313", ++ "self_type" : "type-1312", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44428,8 +45822,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-1981", +- "self_type" : "type-1980", ++ "referenced_type" : "type-1976", ++ "self_type" : "type-1975", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44437,8 +45831,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-2039", +- "self_type" : "type-2038", ++ "referenced_type" : "type-2034", ++ "self_type" : "type-2033", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44446,8 +45840,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-2098", +- "self_type" : "type-2097", ++ "referenced_type" : "type-2093", ++ "self_type" : "type-2092", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44455,8 +45849,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-2156", +- "self_type" : "type-2155", ++ "referenced_type" : "type-2151", ++ "self_type" : "type-2150", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44464,8 +45858,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-2233", +- "self_type" : "type-2232", ++ "referenced_type" : "type-2228", ++ "self_type" : "type-2227", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44473,8 +45867,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-2286", +- "self_type" : "type-2285", ++ "referenced_type" : "type-2280", ++ "self_type" : "type-2279", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44482,8 +45876,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-3120", +- "self_type" : "type-3119", ++ "referenced_type" : "type-3113", ++ "self_type" : "type-3112", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44491,8 +45885,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-3174", +- "self_type" : "type-3173", ++ "referenced_type" : "type-3167", ++ "self_type" : "type-3166", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44500,8 +45894,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-3241", +- "self_type" : "type-3240", ++ "referenced_type" : "type-3234", ++ "self_type" : "type-3233", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44509,8 +45903,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-3296", +- "self_type" : "type-3295", ++ "referenced_type" : "type-3289", ++ "self_type" : "type-3288", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44518,8 +45912,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-3363", +- "self_type" : "type-3362", ++ "referenced_type" : "type-3356", ++ "self_type" : "type-3355", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44527,8 +45921,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &&", + "name" : "std::basic_string, std::allocator > &&", +- "referenced_type" : "type-3416", +- "self_type" : "type-3415", ++ "referenced_type" : "type-3409", ++ "self_type" : "type-3408", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44536,8 +45930,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1061", +- "self_type" : "type-1060", ++ "referenced_type" : "type-1058", ++ "self_type" : "type-1057", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44545,8 +45939,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1121", +- "self_type" : "type-1120", ++ "referenced_type" : "type-1118", ++ "self_type" : "type-1117", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44554,8 +45948,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1182", +- "self_type" : "type-1181", ++ "referenced_type" : "type-1179", ++ "self_type" : "type-1178", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44563,8 +45957,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1243", +- "self_type" : "type-1242", ++ "referenced_type" : "type-1240", ++ "self_type" : "type-1239", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44572,8 +45966,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1320", +- "self_type" : "type-1319", ++ "referenced_type" : "type-1317", ++ "self_type" : "type-1316", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44581,8 +45975,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1986", +- "self_type" : "type-1985", ++ "referenced_type" : "type-1981", ++ "self_type" : "type-1980", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44590,8 +45984,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2043", +- "self_type" : "type-2042", ++ "referenced_type" : "type-2038", ++ "self_type" : "type-2037", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44599,8 +45993,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2102", +- "self_type" : "type-2101", ++ "referenced_type" : "type-2097", ++ "self_type" : "type-2096", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44608,8 +46002,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2161", +- "self_type" : "type-2160", ++ "referenced_type" : "type-2156", ++ "self_type" : "type-2155", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44617,8 +46011,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2237", +- "self_type" : "type-2236", ++ "referenced_type" : "type-2232", ++ "self_type" : "type-2231", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44626,8 +46020,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2290", +- "self_type" : "type-2289", ++ "referenced_type" : "type-2285", ++ "self_type" : "type-2284", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44635,8 +46029,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3124", +- "self_type" : "type-3123", ++ "referenced_type" : "type-3117", ++ "self_type" : "type-3116", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44644,8 +46038,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3178", +- "self_type" : "type-3177", ++ "referenced_type" : "type-3171", ++ "self_type" : "type-3170", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44653,8 +46047,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3245", +- "self_type" : "type-3244", ++ "referenced_type" : "type-3238", ++ "self_type" : "type-3237", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44662,8 +46056,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3300", +- "self_type" : "type-3299", ++ "referenced_type" : "type-3293", ++ "self_type" : "type-3292", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44671,8 +46065,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3367", +- "self_type" : "type-3366", ++ "referenced_type" : "type-3360", ++ "self_type" : "type-3359", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44680,8 +46074,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3420", +- "self_type" : "type-3419", ++ "referenced_type" : "type-3413", ++ "self_type" : "type-3412", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44689,8 +46083,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1058", +- "self_type" : "type-1057", ++ "referenced_type" : "type-1055", ++ "self_type" : "type-1054", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44698,8 +46092,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1119", +- "self_type" : "type-1118", ++ "referenced_type" : "type-1116", ++ "self_type" : "type-1115", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44707,8 +46101,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1180", +- "self_type" : "type-1179", ++ "referenced_type" : "type-1177", ++ "self_type" : "type-1176", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44716,8 +46110,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1241", +- "self_type" : "type-1240", ++ "referenced_type" : "type-1237", ++ "self_type" : "type-1236", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44725,8 +46119,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1318", +- "self_type" : "type-1317", ++ "referenced_type" : "type-1315", ++ "self_type" : "type-1314", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44734,8 +46128,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-1983", +- "self_type" : "type-1982", ++ "referenced_type" : "type-1978", ++ "self_type" : "type-1977", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44743,8 +46137,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2041", +- "self_type" : "type-2040", ++ "referenced_type" : "type-2036", ++ "self_type" : "type-2035", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44752,8 +46146,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2100", +- "self_type" : "type-2099", ++ "referenced_type" : "type-2095", ++ "self_type" : "type-2094", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44761,8 +46155,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2159", +- "self_type" : "type-2158", ++ "referenced_type" : "type-2153", ++ "self_type" : "type-2152", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44770,8 +46164,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2235", +- "self_type" : "type-2234", ++ "referenced_type" : "type-2230", ++ "self_type" : "type-2229", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44779,8 +46173,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-2288", +- "self_type" : "type-2287", ++ "referenced_type" : "type-2283", ++ "self_type" : "type-2282", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44788,8 +46182,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3122", +- "self_type" : "type-3121", ++ "referenced_type" : "type-3115", ++ "self_type" : "type-3114", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44797,8 +46191,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3176", +- "self_type" : "type-3175", ++ "referenced_type" : "type-3169", ++ "self_type" : "type-3168", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44806,8 +46200,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3243", +- "self_type" : "type-3242", ++ "referenced_type" : "type-3236", ++ "self_type" : "type-3235", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44815,8 +46209,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3298", +- "self_type" : "type-3297", ++ "referenced_type" : "type-3291", ++ "self_type" : "type-3290", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44824,8 +46218,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3365", +- "self_type" : "type-3364", ++ "referenced_type" : "type-3358", ++ "self_type" : "type-3357", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + }, +@@ -44833,8 +46227,8 @@ + "alignment" : 4, + "linker_set_key" : "std::function (void *)> &&", + "name" : "std::function (void *)> &&", +- "referenced_type" : "type-3418", +- "self_type" : "type-3417", ++ "referenced_type" : "type-3411", ++ "self_type" : "type-3410", + "size" : 4, + "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h" + } +diff --git a/29/64/arm_armv8-a/source-based/libhwbinder_noltopgo.so.lsdump b/29/64/arm_armv8-a/source-based/libhwbinder_noltopgo.so.lsdump +index 3935bba..8dc4f1f 100644 +--- a/29/64/arm_armv8-a/source-based/libhwbinder_noltopgo.so.lsdump ++++ b/29/64/arm_armv8-a/source-based/libhwbinder_noltopgo.so.lsdump +@@ -895,30 +895,6 @@ + { + "name" : "_ZN7android8hardware6Parcel12restartWriteEj" + }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIdEEiT_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIfEEiT_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIiEEiT_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIjEEiT_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIxEEiT_" +- }, +- { +- "binding" : "weak", +- "name" : "_ZN7android8hardware6Parcel12writeAlignedIyEEiT_" +- }, + { + "name" : "_ZN7android8hardware6Parcel12writeCStringEPKc" + }, +@@ -5234,114 +5210,6 @@ + "return_type" : "type-10", + "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h" + }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIdEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-71" +- }, +- { +- "referenced_type" : "type-97" +- } +- ], +- "return_type" : "type-10", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-97" ] +- }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIfEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-71" +- }, +- { +- "referenced_type" : "type-95" +- } +- ], +- "return_type" : "type-10", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-95" ] +- }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIiEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-71" +- }, +- { +- "referenced_type" : "type-10" +- } +- ], +- "return_type" : "type-10", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-10" ] +- }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIjEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-71" +- }, +- { +- "referenced_type" : "type-4" +- } +- ], +- "return_type" : "type-10", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-4" ] +- }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIxEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-71" +- }, +- { +- "referenced_type" : "type-93" +- } +- ], +- "return_type" : "type-10", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-93" ] +- }, +- { +- "access" : "private", +- "function_name" : "android::hardware::Parcel::writeAligned", +- "linker_set_key" : "_ZN7android8hardware6Parcel12writeAlignedIyEEiT_", +- "parameters" : +- [ +- { +- "is_this_ptr" : true, +- "referenced_type" : "type-71" +- }, +- { +- "referenced_type" : "type-68" +- } +- ], +- "return_type" : "type-10", +- "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h", +- "template_args" : [ "type-68" ] +- }, + { + "function_name" : "android::hardware::Parcel::writeCString", + "linker_set_key" : "_ZN7android8hardware6Parcel12writeCStringEPKc", +diff --git a/29/64/arm_armv8-a/source-based/libprotobuf-cpp-full.so.lsdump b/29/64/arm_armv8-a/source-based/libprotobuf-cpp-full.so.lsdump +index 8d5cfca..7819a03 100644 +--- a/29/64/arm_armv8-a/source-based/libprotobuf-cpp-full.so.lsdump ++++ b/29/64/arm_armv8-a/source-based/libprotobuf-cpp-full.so.lsdump +@@ -15,7 +15,7 @@ + "linker_set_key" : "char [18]", + "name" : "char [18]", + "referenced_type" : "type-7", +- "self_type" : "type-15359", ++ "self_type" : "type-15311", + "size" : 18, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/constants.h" + }, +@@ -24,7 +24,7 @@ + "linker_set_key" : "char [20]", + "name" : "char [20]", + "referenced_type" : "type-7", +- "self_type" : "type-15357", ++ "self_type" : "type-15309", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/constants.h" + }, +@@ -33,7 +33,7 @@ + "linker_set_key" : "char [22]", + "name" : "char [22]", + "referenced_type" : "type-7", +- "self_type" : "type-15366", ++ "self_type" : "type-15318", + "size" : 22, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/constants.h" + }, +@@ -42,7 +42,7 @@ + "linker_set_key" : "char [23]", + "name" : "char [23]", + "referenced_type" : "type-7", +- "self_type" : "type-15364", ++ "self_type" : "type-15316", + "size" : 23, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/constants.h" + }, +@@ -51,7 +51,7 @@ + "linker_set_key" : "char [25]", + "name" : "char [25]", + "referenced_type" : "type-7", +- "self_type" : "type-15370", ++ "self_type" : "type-15322", + "size" : 25, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/constants.h" + }, +@@ -60,7 +60,7 @@ + "linker_set_key" : "char [26]", + "name" : "char [26]", + "referenced_type" : "type-7", +- "self_type" : "type-15368", ++ "self_type" : "type-15320", + "size" : 26, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/constants.h" + }, +@@ -87,7 +87,7 @@ + "linker_set_key" : "char [42]", + "name" : "char [42]", + "referenced_type" : "type-7", +- "self_type" : "type-15372", ++ "self_type" : "type-15324", + "size" : 42, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/constants.h" + }, +@@ -96,7 +96,7 @@ + "linker_set_key" : "char [43]", + "name" : "char [43]", + "referenced_type" : "type-7", +- "self_type" : "type-15374", ++ "self_type" : "type-15326", + "size" : 43, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/constants.h" + }, +@@ -105,7 +105,7 @@ + "linker_set_key" : "char [46]", + "name" : "char [46]", + "referenced_type" : "type-7", +- "self_type" : "type-15362", ++ "self_type" : "type-15314", + "size" : 46, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/constants.h" + }, +@@ -113,7 +113,7 @@ + "linker_set_key" : "char []", + "name" : "char []", + "referenced_type" : "type-7", +- "self_type" : "type-2182", ++ "self_type" : "type-2113", + "source_file" : "/external/protobuf/src/google/protobuf/any.h" + }, + { +@@ -121,7 +121,7 @@ + "linker_set_key" : "const char *[11]", + "name" : "const char *[11]", + "referenced_type" : "type-5", +- "self_type" : "type-2040", ++ "self_type" : "type-1969", + "size" : 44, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -130,7 +130,7 @@ + "linker_set_key" : "const char *[19]", + "name" : "const char *[19]", + "referenced_type" : "type-5", +- "self_type" : "type-2038", ++ "self_type" : "type-1967", + "size" : 76, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -139,7 +139,7 @@ + "linker_set_key" : "const char *[4]", + "name" : "const char *[4]", + "referenced_type" : "type-5", +- "self_type" : "type-2042", ++ "self_type" : "type-1971", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -165,8 +165,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::FieldDescriptor::CppType [19]", + "name" : "google::protobuf::FieldDescriptor::CppType [19]", +- "referenced_type" : "type-2033", +- "self_type" : "type-2036", ++ "referenced_type" : "type-1962", ++ "self_type" : "type-1965", + "size" : 76, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -198,7 +198,7 @@ + "linker_set_key" : "int [2]", + "name" : "int [2]", + "referenced_type" : "type-1", +- "self_type" : "type-4266", ++ "self_type" : "type-4218", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/map_entry.h" + }, +@@ -3342,6 +3342,10 @@ + "binding" : "weak", + "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexINSt3__14pairIPKviEEE13FindExtensionERKNS3_12basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEEi" + }, ++ { ++ "binding" : "weak", ++ "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexINSt3__14pairIPKviEEE18ValidateSymbolNameERKNS3_12basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE" ++ }, + { + "binding" : "weak", + "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexINSt3__14pairIPKviEEE19AddNestedExtensionsERKNS0_15DescriptorProtoES7_" +@@ -3370,6 +3374,10 @@ + "binding" : "weak", + "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexIPKNS0_19FileDescriptorProtoEE12AddExtensionERKNS0_20FieldDescriptorProtoES5_" + }, ++ { ++ "binding" : "weak", ++ "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexIPKNS0_19FileDescriptorProtoEE18ValidateSymbolNameERKNSt3__112basic_stringIcNS7_11char_traitsIcEENS7_9allocatorIcEEEE" ++ }, + { + "binding" : "weak", + "name" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexIPKNS0_19FileDescriptorProtoEE19AddNestedExtensionsERKNS0_15DescriptorProtoES5_" +@@ -14017,8 +14025,8 @@ + ], + "linker_set_key" : "google::protobuf::DescriptorPool::ErrorCollector::ErrorLocation", + "name" : "google::protobuf::DescriptorPool::ErrorCollector::ErrorLocation", +- "referenced_type" : "type-2055", +- "self_type" : "type-2055", ++ "referenced_type" : "type-1985", ++ "self_type" : "type-1985", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h", + "underlying_type" : "type-4", +@@ -14075,8 +14083,8 @@ + ], + "linker_set_key" : "google::protobuf::FieldDescriptor::CppType", + "name" : "google::protobuf::FieldDescriptor::CppType", +- "referenced_type" : "type-2033", +- "self_type" : "type-2033", ++ "referenced_type" : "type-1962", ++ "self_type" : "type-1962", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h", + "underlying_type" : "type-4", +@@ -14105,8 +14113,8 @@ + ], + "linker_set_key" : "google::protobuf::FieldDescriptor::Label", + "name" : "google::protobuf::FieldDescriptor::Label", +- "referenced_type" : "type-1998", +- "self_type" : "type-1998", ++ "referenced_type" : "type-1924", ++ "self_type" : "type-1924", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h", + "underlying_type" : "type-4", +@@ -14128,8 +14136,8 @@ + ], + "linker_set_key" : "google::protobuf::FieldDescriptor::PrintLabelFlag", + "name" : "google::protobuf::FieldDescriptor::PrintLabelFlag", +- "referenced_type" : "type-2035", +- "self_type" : "type-2035", ++ "referenced_type" : "type-1964", ++ "self_type" : "type-1964", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h", + "underlying_type" : "type-4", +@@ -14218,8 +14226,8 @@ + ], + "linker_set_key" : "google::protobuf::FieldDescriptor::Type", + "name" : "google::protobuf::FieldDescriptor::Type", +- "referenced_type" : "type-1997", +- "self_type" : "type-1997", ++ "referenced_type" : "type-1923", ++ "self_type" : "type-1923", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h", + "underlying_type" : "type-4", +@@ -14244,8 +14252,8 @@ + ], + "linker_set_key" : "google::protobuf::FieldDescriptorProto_Label", + "name" : "google::protobuf::FieldDescriptorProto_Label", +- "referenced_type" : "type-2195", +- "self_type" : "type-2195", ++ "referenced_type" : "type-2126", ++ "self_type" : "type-2126", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h", + "underlying_type" : "type-4", +@@ -14330,8 +14338,8 @@ + ], + "linker_set_key" : "google::protobuf::FieldDescriptorProto_Type", + "name" : "google::protobuf::FieldDescriptorProto_Type", +- "referenced_type" : "type-2193", +- "self_type" : "type-2193", ++ "referenced_type" : "type-2124", ++ "self_type" : "type-2124", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h", + "underlying_type" : "type-4", +@@ -14356,8 +14364,8 @@ + ], + "linker_set_key" : "google::protobuf::FieldOptions_CType", + "name" : "google::protobuf::FieldOptions_CType", +- "referenced_type" : "type-2199", +- "self_type" : "type-2199", ++ "referenced_type" : "type-2130", ++ "self_type" : "type-2130", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h", + "underlying_type" : "type-4", +@@ -14382,8 +14390,8 @@ + ], + "linker_set_key" : "google::protobuf::FieldOptions_JSType", + "name" : "google::protobuf::FieldOptions_JSType", +- "referenced_type" : "type-2201", +- "self_type" : "type-2201", ++ "referenced_type" : "type-2132", ++ "self_type" : "type-2132", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h", + "underlying_type" : "type-4", +@@ -14420,8 +14428,8 @@ + ], + "linker_set_key" : "google::protobuf::Field_Cardinality", + "name" : "google::protobuf::Field_Cardinality", +- "referenced_type" : "type-2479", +- "self_type" : "type-2479", ++ "referenced_type" : "type-2409", ++ "self_type" : "type-2409", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h", + "underlying_type" : "type-1", +@@ -14518,8 +14526,8 @@ + ], + "linker_set_key" : "google::protobuf::Field_Kind", + "name" : "google::protobuf::Field_Kind", +- "referenced_type" : "type-2477", +- "self_type" : "type-2477", ++ "referenced_type" : "type-2407", ++ "self_type" : "type-2407", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h", + "underlying_type" : "type-1", +@@ -14544,8 +14552,8 @@ + ], + "linker_set_key" : "google::protobuf::FileDescriptor::Syntax", + "name" : "google::protobuf::FileDescriptor::Syntax", +- "referenced_type" : "type-1994", +- "self_type" : "type-1994", ++ "referenced_type" : "type-1920", ++ "self_type" : "type-1920", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h", + "underlying_type" : "type-4", +@@ -14570,8 +14578,8 @@ + ], + "linker_set_key" : "google::protobuf::FileOptions_OptimizeMode", + "name" : "google::protobuf::FileOptions_OptimizeMode", +- "referenced_type" : "type-2197", +- "self_type" : "type-2197", ++ "referenced_type" : "type-2128", ++ "self_type" : "type-2128", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h", + "underlying_type" : "type-4", +@@ -14630,8 +14638,8 @@ + ], + "linker_set_key" : "google::protobuf::Map::iterator_base::IteratorStyle", + "name" : "google::protobuf::Map::iterator_base::IteratorStyle", +- "referenced_type" : "type-6669", +- "self_type" : "type-6669", ++ "referenced_type" : "type-6621", ++ "self_type" : "type-6621", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", + "underlying_type" : "type-4", +@@ -14656,8 +14664,8 @@ + ], + "linker_set_key" : "google::protobuf::Map, Value>::iterator_base::IteratorStyle", + "name" : "google::protobuf::Map, Value>::iterator_base::IteratorStyle", +- "referenced_type" : "type-7514", +- "self_type" : "type-7514", ++ "referenced_type" : "type-7466", ++ "self_type" : "type-7466", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", + "underlying_type" : "type-4", +@@ -14682,8 +14690,8 @@ + ], + "linker_set_key" : "google::protobuf::NullValue", + "name" : "google::protobuf::NullValue", +- "referenced_type" : "type-7325", +- "self_type" : "type-7325", ++ "referenced_type" : "type-7277", ++ "self_type" : "type-7277", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/struct.pb.h", + "underlying_type" : "type-1", +@@ -14704,8 +14712,8 @@ + ], + "linker_set_key" : "google::protobuf::Service::ChannelOwnership", + "name" : "google::protobuf::Service::ChannelOwnership", +- "referenced_type" : "type-7104", +- "self_type" : "type-7104", ++ "referenced_type" : "type-7056", ++ "self_type" : "type-7056", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/service.h", + "underlying_type" : "type-4", +@@ -14734,8 +14742,8 @@ + ], + "linker_set_key" : "google::protobuf::Syntax", + "name" : "google::protobuf::Syntax", +- "referenced_type" : "type-2481", +- "self_type" : "type-2481", ++ "referenced_type" : "type-2411", ++ "self_type" : "type-2411", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h", + "underlying_type" : "type-1", +@@ -14768,8 +14776,8 @@ + ], + "linker_set_key" : "google::protobuf::UnknownField::Type", + "name" : "google::protobuf::UnknownField::Type", +- "referenced_type" : "type-1946", +- "self_type" : "type-1946", ++ "referenced_type" : "type-1870", ++ "self_type" : "type-1870", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h", + "underlying_type" : "type-4", +@@ -14810,8 +14818,8 @@ + ], + "linker_set_key" : "google::protobuf::Value::KindCase", + "name" : "google::protobuf::Value::KindCase", +- "referenced_type" : "type-7334", +- "self_type" : "type-7334", ++ "referenced_type" : "type-7286", ++ "self_type" : "type-7286", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/struct.pb.h", + "underlying_type" : "type-4", +@@ -14840,8 +14848,8 @@ + ], + "linker_set_key" : "google::protobuf::compiler::DiskSourceTree::DiskFileToVirtualFileResult", + "name" : "google::protobuf::compiler::DiskSourceTree::DiskFileToVirtualFileResult", +- "referenced_type" : "type-11373", +- "self_type" : "type-11373", ++ "referenced_type" : "type-11325", ++ "self_type" : "type-11325", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/importer.h", + "underlying_type" : "type-4", +@@ -14863,8 +14871,8 @@ + ], + "linker_set_key" : "google::protobuf::compiler::Parser::OptionStyle", + "name" : "google::protobuf::compiler::Parser::OptionStyle", +- "referenced_type" : "type-11349", +- "self_type" : "type-11349", ++ "referenced_type" : "type-11301", ++ "self_type" : "type-11301", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/parser.h", + "underlying_type" : "type-4", +@@ -14890,8 +14898,8 @@ + ], + "linker_set_key" : "google::protobuf::internal::MapFieldBase::State", + "name" : "google::protobuf::internal::MapFieldBase::State", +- "referenced_type" : "type-4275", +- "self_type" : "type-4275", ++ "referenced_type" : "type-4227", ++ "self_type" : "type-4227", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h", + "underlying_type" : "type-4", +@@ -14912,8 +14920,8 @@ + ], + "linker_set_key" : "google::protobuf::internal::WireFormat::Operation", + "name" : "google::protobuf::internal::WireFormat::Operation", +- "referenced_type" : "type-2276", +- "self_type" : "type-2276", ++ "referenced_type" : "type-2205", ++ "self_type" : "type-2205", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format.h", + "underlying_type" : "type-4", +@@ -15146,8 +15154,8 @@ + ], + "linker_set_key" : "google::protobuf::io::GzipInputStream::Format", + "name" : "google::protobuf::io::GzipInputStream::Format", +- "referenced_type" : "type-11180", +- "self_type" : "type-11180", ++ "referenced_type" : "type-11132", ++ "self_type" : "type-11132", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/gzip_stream.h", + "underlying_type" : "type-4", +@@ -15168,8 +15176,8 @@ + ], + "linker_set_key" : "google::protobuf::io::GzipOutputStream::Format", + "name" : "google::protobuf::io::GzipOutputStream::Format", +- "referenced_type" : "type-11188", +- "self_type" : "type-11188", ++ "referenced_type" : "type-11140", ++ "self_type" : "type-11140", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/gzip_stream.h", + "underlying_type" : "type-4", +@@ -15190,8 +15198,8 @@ + ], + "linker_set_key" : "google::protobuf::io::Tokenizer::CommentStyle", + "name" : "google::protobuf::io::Tokenizer::CommentStyle", +- "referenced_type" : "type-3885", +- "self_type" : "type-3885", ++ "referenced_type" : "type-3837", ++ "self_type" : "type-3837", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h", + "underlying_type" : "type-4", +@@ -15221,8 +15229,8 @@ + ], + "linker_set_key" : "google::protobuf::io::Tokenizer::NextCommentStatus", + "name" : "google::protobuf::io::Tokenizer::NextCommentStatus", +- "referenced_type" : "type-3889", +- "self_type" : "type-3889", ++ "referenced_type" : "type-3841", ++ "self_type" : "type-3841", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h", + "underlying_type" : "type-4", +@@ -15263,8 +15271,8 @@ + ], + "linker_set_key" : "google::protobuf::io::Tokenizer::TokenType", + "name" : "google::protobuf::io::Tokenizer::TokenType", +- "referenced_type" : "type-3883", +- "self_type" : "type-3883", ++ "referenced_type" : "type-3835", ++ "self_type" : "type-3835", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h", + "underlying_type" : "type-4", +@@ -15363,8 +15371,8 @@ + ], + "linker_set_key" : "google::protobuf::util::DefaultFieldComparator::FloatComparison", + "name" : "google::protobuf::util::DefaultFieldComparator::FloatComparison", +- "referenced_type" : "type-14818", +- "self_type" : "type-14818", ++ "referenced_type" : "type-14770", ++ "self_type" : "type-14770", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/field_comparator.h", + "underlying_type" : "type-4", +@@ -15389,8 +15397,8 @@ + ], + "linker_set_key" : "google::protobuf::util::FieldComparator::ComparisonResult", + "name" : "google::protobuf::util::FieldComparator::ComparisonResult", +- "referenced_type" : "type-14816", +- "self_type" : "type-14816", ++ "referenced_type" : "type-14768", ++ "self_type" : "type-14768", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/field_comparator.h", + "underlying_type" : "type-4", +@@ -15411,8 +15419,8 @@ + ], + "linker_set_key" : "google::protobuf::util::MessageDifferencer::FloatComparison", + "name" : "google::protobuf::util::MessageDifferencer::FloatComparison", +- "referenced_type" : "type-25004", +- "self_type" : "type-25004", ++ "referenced_type" : "type-24973", ++ "self_type" : "type-24973", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h", + "underlying_type" : "type-4", +@@ -15433,8 +15441,8 @@ + ], + "linker_set_key" : "google::protobuf::util::MessageDifferencer::MessageFieldComparison", + "name" : "google::protobuf::util::MessageDifferencer::MessageFieldComparison", +- "referenced_type" : "type-24911", +- "self_type" : "type-24911", ++ "referenced_type" : "type-24878", ++ "self_type" : "type-24878", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h", + "underlying_type" : "type-4", +@@ -15455,8 +15463,8 @@ + ], + "linker_set_key" : "google::protobuf::util::MessageDifferencer::RepeatedFieldComparison", + "name" : "google::protobuf::util::MessageDifferencer::RepeatedFieldComparison", +- "referenced_type" : "type-24913", +- "self_type" : "type-24913", ++ "referenced_type" : "type-24880", ++ "self_type" : "type-24880", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h", + "underlying_type" : "type-4", +@@ -15477,8 +15485,8 @@ + ], + "linker_set_key" : "google::protobuf::util::MessageDifferencer::Scope", + "name" : "google::protobuf::util::MessageDifferencer::Scope", +- "referenced_type" : "type-24912", +- "self_type" : "type-24912", ++ "referenced_type" : "type-24879", ++ "self_type" : "type-24879", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h", + "underlying_type" : "type-4", +@@ -15535,8 +15543,8 @@ + ], + "linker_set_key" : "google::protobuf::util::converter::DataPiece::Type", + "name" : "google::protobuf::util::converter::DataPiece::Type", +- "referenced_type" : "type-15045", +- "self_type" : "type-15045", ++ "referenced_type" : "type-14997", ++ "self_type" : "type-14997", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h", + "underlying_type" : "type-4", +@@ -15566,8 +15574,8 @@ + ], + "linker_set_key" : "google::protobuf::util::converter::DefaultValueObjectWriter::NodeKind", + "name" : "google::protobuf::util::converter::DefaultValueObjectWriter::NodeKind", +- "referenced_type" : "type-15234", +- "self_type" : "type-15234", ++ "referenced_type" : "type-15186", ++ "self_type" : "type-15186", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h", + "underlying_type" : "type-4", +@@ -15592,8 +15600,8 @@ + ], + "linker_set_key" : "google::protobuf::util::converter::JsonStreamParser::NumberResult::Type", + "name" : "google::protobuf::util::converter::JsonStreamParser::NumberResult::Type", +- "referenced_type" : "type-19341", +- "self_type" : "type-19341", ++ "referenced_type" : "type-19293", ++ "self_type" : "type-19293", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h", + "underlying_type" : "type-4", +@@ -15631,8 +15639,8 @@ + ], + "linker_set_key" : "google::protobuf::util::converter::JsonStreamParser::ParseType", + "name" : "google::protobuf::util::converter::JsonStreamParser::ParseType", +- "referenced_type" : "type-19339", +- "self_type" : "type-19339", ++ "referenced_type" : "type-19291", ++ "self_type" : "type-19291", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h", + "underlying_type" : "type-4", +@@ -15698,8 +15706,8 @@ + ], + "linker_set_key" : "google::protobuf::util::converter::JsonStreamParser::TokenType", + "name" : "google::protobuf::util::converter::JsonStreamParser::TokenType", +- "referenced_type" : "type-19338", +- "self_type" : "type-19338", ++ "referenced_type" : "type-19290", ++ "self_type" : "type-19290", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h", + "underlying_type" : "type-4", +@@ -15724,8 +15732,8 @@ + ], + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Item::ItemType", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Item::ItemType", +- "referenced_type" : "type-19503", +- "self_type" : "type-19503", ++ "referenced_type" : "type-19455", ++ "self_type" : "type-19455", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h", + "underlying_type" : "type-4", +@@ -15742,8 +15750,8 @@ + ], + "linker_set_key" : "google::protobuf::util::converter::testing::TypeInfoSource", + "name" : "google::protobuf::util::converter::testing::TypeInfoSource", +- "referenced_type" : "type-24639", +- "self_type" : "type-24639", ++ "referenced_type" : "type-24607", ++ "self_type" : "type-24607", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/type_info_test_helper.h", + "underlying_type" : "type-4", +@@ -15865,9 +15873,9 @@ + "referenced_type" : "type-214" + } + ], +- "referenced_type" : "type-15069", ++ "referenced_type" : "type-15021", + "return_type" : "type-12", +- "self_type" : "type-15069", ++ "self_type" : "type-15021", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, + { +@@ -15883,9 +15891,9 @@ + "referenced_type" : "type-97" + } + ], +- "referenced_type" : "type-15063", ++ "referenced_type" : "type-15015", + "return_type" : "type-12", +- "self_type" : "type-15063", ++ "self_type" : "type-15015", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, + { +@@ -15901,9 +15909,9 @@ + "referenced_type" : "type-95" + } + ], +- "referenced_type" : "type-15066", ++ "referenced_type" : "type-15018", + "return_type" : "type-12", +- "self_type" : "type-15066", ++ "self_type" : "type-15018", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, + { +@@ -15919,9 +15927,9 @@ + "referenced_type" : "type-129" + } + ], +- "referenced_type" : "type-15052", ++ "referenced_type" : "type-15004", + "return_type" : "type-12", +- "self_type" : "type-15052", ++ "self_type" : "type-15004", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, + { +@@ -15937,9 +15945,9 @@ + "referenced_type" : "type-88" + } + ], +- "referenced_type" : "type-15057", ++ "referenced_type" : "type-15009", + "return_type" : "type-12", +- "self_type" : "type-15057", ++ "self_type" : "type-15009", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, + { +@@ -15955,9 +15963,9 @@ + "referenced_type" : "type-19" + } + ], +- "referenced_type" : "type-15055", ++ "referenced_type" : "type-15007", + "return_type" : "type-12", +- "self_type" : "type-15055", ++ "self_type" : "type-15007", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, + { +@@ -15973,9 +15981,9 @@ + "referenced_type" : "type-90" + } + ], +- "referenced_type" : "type-15060", ++ "referenced_type" : "type-15012", + "return_type" : "type-12", +- "self_type" : "type-15060", ++ "self_type" : "type-15012", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, + { +@@ -16000,21 +16008,21 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19370" ++ "referenced_type" : "type-19322" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], +- "referenced_type" : "type-19369", ++ "referenced_type" : "type-19321", + "return_type" : "type-76", +- "self_type" : "type-19369", ++ "self_type" : "type-19321", + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, + { +@@ -16024,15 +16032,15 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + }, + { +- "referenced_type" : "type-15049" ++ "referenced_type" : "type-15001" + } + ], +- "referenced_type" : "type-19502", ++ "referenced_type" : "type-19454", + "return_type" : "type-76", +- "self_type" : "type-19502", ++ "self_type" : "type-19454", + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, + { +@@ -16042,15 +16050,15 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + }, + { + "referenced_type" : "type-27" + } + ], +- "referenced_type" : "type-19488", ++ "referenced_type" : "type-19440", + "return_type" : "type-76", +- "self_type" : "type-19488", ++ "self_type" : "type-19440", + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, + { +@@ -16084,9 +16092,9 @@ + "referenced_type" : "type-27" + } + ], +- "referenced_type" : "type-15396", +- "return_type" : "type-15397", +- "self_type" : "type-15396", ++ "referenced_type" : "type-15348", ++ "return_type" : "type-15349", ++ "self_type" : "type-15348", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/field_mask_utility.h" + }, + { +@@ -16105,12 +16113,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-6869" ++ "referenced_type" : "type-6821" + } + ], +- "referenced_type" : "type-6868", ++ "referenced_type" : "type-6820", + "return_type" : "type-81", +- "self_type" : "type-6868", ++ "self_type" : "type-6820", + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, + { +@@ -16186,12 +16194,12 @@ + "parameters" : + [ + { +- "referenced_type" : "type-3686" ++ "referenced_type" : "type-3638" + } + ], +- "referenced_type" : "type-3685", ++ "referenced_type" : "type-3637", + "return_type" : "type-81", +- "self_type" : "type-3685", ++ "self_type" : "type-3637", + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, + { +@@ -16268,7 +16276,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11068" ++ "referenced_type" : "type-11020" + } + ], + "return_type" : "type-81", +@@ -16282,7 +16290,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11068" ++ "referenced_type" : "type-11020" + } + ], + "return_type" : "type-81", +@@ -16291,7 +16299,7 @@ + { + "function_name" : "google::protobuf::BytesValue::descriptor", + "linker_set_key" : "_ZN6google8protobuf10BytesValue10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -16302,10 +16310,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11068" ++ "referenced_type" : "type-11020" + }, + { +- "referenced_type" : "type-11068" ++ "referenced_type" : "type-11020" + } + ], + "return_type" : "type-81", +@@ -16318,10 +16326,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11068" ++ "referenced_type" : "type-11020" + }, + { +- "referenced_type" : "type-11068" ++ "referenced_type" : "type-11020" + } + ], + "return_type" : "type-81", +@@ -16330,7 +16338,7 @@ + { + "function_name" : "google::protobuf::BytesValue::default_instance", + "linker_set_key" : "_ZN6google8protobuf10BytesValue16default_instanceEv", +- "return_type" : "type-11165", ++ "return_type" : "type-11117", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -16341,7 +16349,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11068" ++ "referenced_type" : "type-11020" + } + ], + "return_type" : "type-81", +@@ -16354,7 +16362,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11068" ++ "referenced_type" : "type-11020" + }, + { + "referenced_type" : "type-612" +@@ -16370,10 +16378,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11068" ++ "referenced_type" : "type-11020" + }, + { +- "referenced_type" : "type-11068" ++ "referenced_type" : "type-11020" + } + ], + "return_type" : "type-81", +@@ -16386,7 +16394,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11068" ++ "referenced_type" : "type-11020" + } + ], + "return_type" : "type-81", +@@ -16399,10 +16407,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11068" ++ "referenced_type" : "type-11020" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -16415,10 +16423,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11068" ++ "referenced_type" : "type-11020" + }, + { +- "referenced_type" : "type-11165" ++ "referenced_type" : "type-11117" + } + ], + "return_type" : "type-81", +@@ -16444,10 +16452,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11068" ++ "referenced_type" : "type-11020" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -16460,10 +16468,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11068" ++ "referenced_type" : "type-11020" + }, + { +- "referenced_type" : "type-11165" ++ "referenced_type" : "type-11117" + } + ], + "return_type" : "type-81", +@@ -16477,7 +16485,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11068" ++ "referenced_type" : "type-11020" + }, + { + "referenced_type" : "type-288" +@@ -16493,10 +16501,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11068" ++ "referenced_type" : "type-11020" + }, + { +- "referenced_type" : "type-11165" ++ "referenced_type" : "type-11117" + } + ], + "return_type" : "type-81", +@@ -16509,7 +16517,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11068" ++ "referenced_type" : "type-11020" + } + ], + "return_type" : "type-81", +@@ -16523,7 +16531,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11068" ++ "referenced_type" : "type-11020" + }, + { + "referenced_type" : "type-288" +@@ -16539,10 +16547,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11068" ++ "referenced_type" : "type-11020" + }, + { +- "referenced_type" : "type-11165" ++ "referenced_type" : "type-11117" + } + ], + "return_type" : "type-81", +@@ -16555,7 +16563,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11068" ++ "referenced_type" : "type-11020" + } + ], + "return_type" : "type-81", +@@ -16568,7 +16576,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11068" ++ "referenced_type" : "type-11020" + } + ], + "return_type" : "type-81", +@@ -16581,7 +16589,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11068" ++ "referenced_type" : "type-11020" + } + ], + "return_type" : "type-81", +@@ -16594,7 +16602,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11068" ++ "referenced_type" : "type-11020" + } + ], + "return_type" : "type-81", +@@ -16608,7 +16616,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11061" ++ "referenced_type" : "type-11013" + } + ], + "return_type" : "type-81", +@@ -16622,7 +16630,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11061" ++ "referenced_type" : "type-11013" + } + ], + "return_type" : "type-81", +@@ -16631,7 +16639,7 @@ + { + "function_name" : "google::protobuf::FloatValue::descriptor", + "linker_set_key" : "_ZN6google8protobuf10FloatValue10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -16642,10 +16650,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11061" ++ "referenced_type" : "type-11013" + }, + { +- "referenced_type" : "type-11061" ++ "referenced_type" : "type-11013" + } + ], + "return_type" : "type-81", +@@ -16658,10 +16666,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11061" ++ "referenced_type" : "type-11013" + }, + { +- "referenced_type" : "type-11061" ++ "referenced_type" : "type-11013" + } + ], + "return_type" : "type-81", +@@ -16670,7 +16678,7 @@ + { + "function_name" : "google::protobuf::FloatValue::default_instance", + "linker_set_key" : "_ZN6google8protobuf10FloatValue16default_instanceEv", +- "return_type" : "type-11151", ++ "return_type" : "type-11103", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -16681,7 +16689,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11061" ++ "referenced_type" : "type-11013" + } + ], + "return_type" : "type-81", +@@ -16694,7 +16702,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11061" ++ "referenced_type" : "type-11013" + }, + { + "referenced_type" : "type-612" +@@ -16710,10 +16718,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11061" ++ "referenced_type" : "type-11013" + }, + { +- "referenced_type" : "type-11061" ++ "referenced_type" : "type-11013" + } + ], + "return_type" : "type-81", +@@ -16726,7 +16734,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11061" ++ "referenced_type" : "type-11013" + } + ], + "return_type" : "type-81", +@@ -16739,10 +16747,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11061" ++ "referenced_type" : "type-11013" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -16755,10 +16763,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11061" ++ "referenced_type" : "type-11013" + }, + { +- "referenced_type" : "type-11151" ++ "referenced_type" : "type-11103" + } + ], + "return_type" : "type-81", +@@ -16784,10 +16792,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11061" ++ "referenced_type" : "type-11013" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -16800,10 +16808,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11061" ++ "referenced_type" : "type-11013" + }, + { +- "referenced_type" : "type-11151" ++ "referenced_type" : "type-11103" + } + ], + "return_type" : "type-81", +@@ -16817,7 +16825,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11061" ++ "referenced_type" : "type-11013" + }, + { + "referenced_type" : "type-288" +@@ -16833,10 +16841,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11061" ++ "referenced_type" : "type-11013" + }, + { +- "referenced_type" : "type-11151" ++ "referenced_type" : "type-11103" + } + ], + "return_type" : "type-81", +@@ -16849,7 +16857,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11061" ++ "referenced_type" : "type-11013" + } + ], + "return_type" : "type-81", +@@ -16863,7 +16871,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11061" ++ "referenced_type" : "type-11013" + }, + { + "referenced_type" : "type-288" +@@ -16879,10 +16887,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11061" ++ "referenced_type" : "type-11013" + }, + { +- "referenced_type" : "type-11151" ++ "referenced_type" : "type-11103" + } + ], + "return_type" : "type-81", +@@ -16895,7 +16903,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11061" ++ "referenced_type" : "type-11013" + } + ], + "return_type" : "type-81", +@@ -16908,7 +16916,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11061" ++ "referenced_type" : "type-11013" + } + ], + "return_type" : "type-81", +@@ -16921,7 +16929,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11061" ++ "referenced_type" : "type-11013" + } + ], + "return_type" : "type-81", +@@ -16934,7 +16942,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11061" ++ "referenced_type" : "type-11013" + } + ], + "return_type" : "type-81", +@@ -16948,7 +16956,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11064" ++ "referenced_type" : "type-11016" + } + ], + "return_type" : "type-81", +@@ -16962,7 +16970,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11064" ++ "referenced_type" : "type-11016" + } + ], + "return_type" : "type-81", +@@ -16971,7 +16979,7 @@ + { + "function_name" : "google::protobuf::Int32Value::descriptor", + "linker_set_key" : "_ZN6google8protobuf10Int32Value10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -16982,10 +16990,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11064" ++ "referenced_type" : "type-11016" + }, + { +- "referenced_type" : "type-11064" ++ "referenced_type" : "type-11016" + } + ], + "return_type" : "type-81", +@@ -16998,10 +17006,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11064" ++ "referenced_type" : "type-11016" + }, + { +- "referenced_type" : "type-11064" ++ "referenced_type" : "type-11016" + } + ], + "return_type" : "type-81", +@@ -17010,7 +17018,7 @@ + { + "function_name" : "google::protobuf::Int32Value::default_instance", + "linker_set_key" : "_ZN6google8protobuf10Int32Value16default_instanceEv", +- "return_type" : "type-11157", ++ "return_type" : "type-11109", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -17021,7 +17029,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11064" ++ "referenced_type" : "type-11016" + } + ], + "return_type" : "type-81", +@@ -17034,7 +17042,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11064" ++ "referenced_type" : "type-11016" + }, + { + "referenced_type" : "type-612" +@@ -17050,10 +17058,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11064" ++ "referenced_type" : "type-11016" + }, + { +- "referenced_type" : "type-11064" ++ "referenced_type" : "type-11016" + } + ], + "return_type" : "type-81", +@@ -17066,7 +17074,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11064" ++ "referenced_type" : "type-11016" + } + ], + "return_type" : "type-81", +@@ -17079,10 +17087,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11064" ++ "referenced_type" : "type-11016" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -17095,10 +17103,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11064" ++ "referenced_type" : "type-11016" + }, + { +- "referenced_type" : "type-11157" ++ "referenced_type" : "type-11109" + } + ], + "return_type" : "type-81", +@@ -17124,10 +17132,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11064" ++ "referenced_type" : "type-11016" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -17140,10 +17148,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11064" ++ "referenced_type" : "type-11016" + }, + { +- "referenced_type" : "type-11157" ++ "referenced_type" : "type-11109" + } + ], + "return_type" : "type-81", +@@ -17157,7 +17165,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11064" ++ "referenced_type" : "type-11016" + }, + { + "referenced_type" : "type-288" +@@ -17173,10 +17181,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11064" ++ "referenced_type" : "type-11016" + }, + { +- "referenced_type" : "type-11157" ++ "referenced_type" : "type-11109" + } + ], + "return_type" : "type-81", +@@ -17189,7 +17197,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11064" ++ "referenced_type" : "type-11016" + } + ], + "return_type" : "type-81", +@@ -17203,7 +17211,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11064" ++ "referenced_type" : "type-11016" + }, + { + "referenced_type" : "type-288" +@@ -17219,10 +17227,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11064" ++ "referenced_type" : "type-11016" + }, + { +- "referenced_type" : "type-11157" ++ "referenced_type" : "type-11109" + } + ], + "return_type" : "type-81", +@@ -17235,7 +17243,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11064" ++ "referenced_type" : "type-11016" + } + ], + "return_type" : "type-81", +@@ -17248,7 +17256,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11064" ++ "referenced_type" : "type-11016" + } + ], + "return_type" : "type-81", +@@ -17261,7 +17269,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11064" ++ "referenced_type" : "type-11016" + } + ], + "return_type" : "type-81", +@@ -17274,7 +17282,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11064" ++ "referenced_type" : "type-11016" + } + ], + "return_type" : "type-81", +@@ -17288,7 +17296,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11062" ++ "referenced_type" : "type-11014" + } + ], + "return_type" : "type-81", +@@ -17302,7 +17310,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11062" ++ "referenced_type" : "type-11014" + } + ], + "return_type" : "type-81", +@@ -17311,7 +17319,7 @@ + { + "function_name" : "google::protobuf::Int64Value::descriptor", + "linker_set_key" : "_ZN6google8protobuf10Int64Value10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -17322,10 +17330,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11062" ++ "referenced_type" : "type-11014" + }, + { +- "referenced_type" : "type-11062" ++ "referenced_type" : "type-11014" + } + ], + "return_type" : "type-81", +@@ -17338,10 +17346,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11062" ++ "referenced_type" : "type-11014" + }, + { +- "referenced_type" : "type-11062" ++ "referenced_type" : "type-11014" + } + ], + "return_type" : "type-81", +@@ -17350,7 +17358,7 @@ + { + "function_name" : "google::protobuf::Int64Value::default_instance", + "linker_set_key" : "_ZN6google8protobuf10Int64Value16default_instanceEv", +- "return_type" : "type-11153", ++ "return_type" : "type-11105", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -17361,7 +17369,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11062" ++ "referenced_type" : "type-11014" + } + ], + "return_type" : "type-81", +@@ -17374,7 +17382,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11062" ++ "referenced_type" : "type-11014" + }, + { + "referenced_type" : "type-612" +@@ -17390,10 +17398,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11062" ++ "referenced_type" : "type-11014" + }, + { +- "referenced_type" : "type-11062" ++ "referenced_type" : "type-11014" + } + ], + "return_type" : "type-81", +@@ -17406,7 +17414,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11062" ++ "referenced_type" : "type-11014" + } + ], + "return_type" : "type-81", +@@ -17419,10 +17427,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11062" ++ "referenced_type" : "type-11014" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -17435,10 +17443,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11062" ++ "referenced_type" : "type-11014" + }, + { +- "referenced_type" : "type-11153" ++ "referenced_type" : "type-11105" + } + ], + "return_type" : "type-81", +@@ -17464,10 +17472,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11062" ++ "referenced_type" : "type-11014" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -17480,10 +17488,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11062" ++ "referenced_type" : "type-11014" + }, + { +- "referenced_type" : "type-11153" ++ "referenced_type" : "type-11105" + } + ], + "return_type" : "type-81", +@@ -17497,7 +17505,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11062" ++ "referenced_type" : "type-11014" + }, + { + "referenced_type" : "type-288" +@@ -17513,10 +17521,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11062" ++ "referenced_type" : "type-11014" + }, + { +- "referenced_type" : "type-11153" ++ "referenced_type" : "type-11105" + } + ], + "return_type" : "type-81", +@@ -17529,7 +17537,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11062" ++ "referenced_type" : "type-11014" + } + ], + "return_type" : "type-81", +@@ -17543,7 +17551,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11062" ++ "referenced_type" : "type-11014" + }, + { + "referenced_type" : "type-288" +@@ -17559,10 +17567,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11062" ++ "referenced_type" : "type-11014" + }, + { +- "referenced_type" : "type-11153" ++ "referenced_type" : "type-11105" + } + ], + "return_type" : "type-81", +@@ -17575,7 +17583,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11062" ++ "referenced_type" : "type-11014" + } + ], + "return_type" : "type-81", +@@ -17588,7 +17596,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11062" ++ "referenced_type" : "type-11014" + } + ], + "return_type" : "type-81", +@@ -17601,7 +17609,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11062" ++ "referenced_type" : "type-11014" + } + ], + "return_type" : "type-81", +@@ -17614,7 +17622,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11062" ++ "referenced_type" : "type-11014" + } + ], + "return_type" : "type-81", +@@ -17627,7 +17635,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2143" ++ "referenced_type" : "type-2074" + } + ], + "return_type" : "type-81", +@@ -17640,7 +17648,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2143" ++ "referenced_type" : "type-2074" + } + ], + "return_type" : "type-81", +@@ -17653,7 +17661,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2143" ++ "referenced_type" : "type-2074" + } + ], + "return_type" : "type-81", +@@ -17666,7 +17674,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7108" ++ "referenced_type" : "type-7060" + } + ], + "return_type" : "type-81", +@@ -17679,7 +17687,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7108" ++ "referenced_type" : "type-7060" + } + ], + "return_type" : "type-81", +@@ -17692,7 +17700,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7108" ++ "referenced_type" : "type-7060" + } + ], + "return_type" : "type-81", +@@ -17802,13 +17810,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3879" ++ "referenced_type" : "type-3831" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], +- "return_type" : "type-3879", ++ "return_type" : "type-3831", + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, + { +@@ -17819,13 +17827,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3879" ++ "referenced_type" : "type-3831" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-3870" ++ "referenced_type" : "type-3822" + } + ], + "return_type" : "type-81", +@@ -17838,7 +17846,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3879" ++ "referenced_type" : "type-3831" + } + ], + "return_type" : "type-81", +@@ -17851,7 +17859,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3879" ++ "referenced_type" : "type-3831" + } + ], + "return_type" : "type-81", +@@ -17864,7 +17872,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3879" ++ "referenced_type" : "type-3831" + } + ], + "return_type" : "type-81", +@@ -17877,7 +17885,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3879" ++ "referenced_type" : "type-3831" + } + ], + "return_type" : "type-81", +@@ -17889,10 +17897,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-7625" ++ "referenced_type" : "type-7577" + } + ], + "return_type" : "type-12", +@@ -17904,10 +17912,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-7631" ++ "referenced_type" : "type-7583" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-12", +@@ -17919,10 +17927,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-7631" ++ "referenced_type" : "type-7583" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-12", +@@ -17935,7 +17943,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7683" ++ "referenced_type" : "type-7635" + } + ], + "return_type" : "type-81", +@@ -17948,7 +17956,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7683" ++ "referenced_type" : "type-7635" + } + ], + "return_type" : "type-81", +@@ -17961,7 +17969,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7683" ++ "referenced_type" : "type-7635" + } + ], + "return_type" : "type-81", +@@ -17974,7 +17982,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7683" ++ "referenced_type" : "type-7635" + } + ], + "return_type" : "type-81", +@@ -17987,7 +17995,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7683" ++ "referenced_type" : "type-7635" + } + ], + "return_type" : "type-81", +@@ -17999,7 +18007,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1948" ++ "referenced_type" : "type-1872" + }, + { + "referenced_type" : "type-741" +@@ -18014,16 +18022,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-7625" ++ "referenced_type" : "type-7577" + } + ], + "return_type" : "type-81", +@@ -18035,13 +18043,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-7631" ++ "referenced_type" : "type-7583" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-12", +@@ -18053,10 +18061,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1948" ++ "referenced_type" : "type-1872" + }, + { +- "referenced_type" : "type-7625" ++ "referenced_type" : "type-7577" + } + ], + "return_type" : "type-12", +@@ -18071,7 +18079,7 @@ + "referenced_type" : "type-793" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-12", +@@ -18086,7 +18094,7 @@ + "referenced_type" : "type-793" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-12", +@@ -18098,7 +18106,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { + "referenced_type" : "type-741" +@@ -18114,7 +18122,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3878" ++ "referenced_type" : "type-3830" + } + ], + "return_type" : "type-81", +@@ -18127,7 +18135,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3878" ++ "referenced_type" : "type-3830" + } + ], + "return_type" : "type-81", +@@ -18140,7 +18148,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3878" ++ "referenced_type" : "type-3830" + } + ], + "return_type" : "type-81", +@@ -18154,16 +18162,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3880" ++ "referenced_type" : "type-3832" + }, + { + "referenced_type" : "type-793" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-7691" ++ "referenced_type" : "type-7643" + } + ], + "return_type" : "type-12", +@@ -18176,13 +18184,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3880" ++ "referenced_type" : "type-3832" + }, + { +- "referenced_type" : "type-7631" ++ "referenced_type" : "type-7583" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-12", +@@ -18195,13 +18203,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3880" ++ "referenced_type" : "type-3832" + }, + { +- "referenced_type" : "type-7631" ++ "referenced_type" : "type-7583" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-12", +@@ -18214,16 +18222,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3880" ++ "referenced_type" : "type-3832" + }, + { +- "referenced_type" : "type-7631" ++ "referenced_type" : "type-7583" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-12", +@@ -18236,13 +18244,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3880" ++ "referenced_type" : "type-3832" + }, + { + "referenced_type" : "type-793" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-12", +@@ -18255,13 +18263,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3880" ++ "referenced_type" : "type-3832" + }, + { + "referenced_type" : "type-793" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-12", +@@ -18274,7 +18282,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3880" ++ "referenced_type" : "type-3832" + } + ], + "return_type" : "type-81", +@@ -18287,7 +18295,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3880" ++ "referenced_type" : "type-3832" + } + ], + "return_type" : "type-81", +@@ -18300,7 +18308,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3880" ++ "referenced_type" : "type-3832" + } + ], + "return_type" : "type-81", +@@ -18313,7 +18321,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3880" ++ "referenced_type" : "type-3832" + } + ], + "return_type" : "type-81", +@@ -18326,7 +18334,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3868" ++ "referenced_type" : "type-3820" + }, + { + "referenced_type" : "type-12" +@@ -18342,13 +18350,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3868" ++ "referenced_type" : "type-3820" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-3724" ++ "referenced_type" : "type-3676" + } + ], + "return_type" : "type-12", +@@ -18361,10 +18369,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3868" ++ "referenced_type" : "type-3820" + }, + { +- "referenced_type" : "type-3724" ++ "referenced_type" : "type-3676" + } + ], + "return_type" : "type-81", +@@ -18377,7 +18385,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3868" ++ "referenced_type" : "type-3820" + } + ], + "return_type" : "type-81", +@@ -18390,7 +18398,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3868" ++ "referenced_type" : "type-3820" + } + ], + "return_type" : "type-81", +@@ -18403,7 +18411,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3868" ++ "referenced_type" : "type-3820" + } + ], + "return_type" : "type-81", +@@ -18416,7 +18424,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3868" ++ "referenced_type" : "type-3820" + } + ], + "return_type" : "type-81", +@@ -18430,7 +18438,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11060" ++ "referenced_type" : "type-11012" + } + ], + "return_type" : "type-81", +@@ -18444,7 +18452,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11060" ++ "referenced_type" : "type-11012" + } + ], + "return_type" : "type-81", +@@ -18453,7 +18461,7 @@ + { + "function_name" : "google::protobuf::DoubleValue::descriptor", + "linker_set_key" : "_ZN6google8protobuf11DoubleValue10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -18464,10 +18472,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11060" ++ "referenced_type" : "type-11012" + }, + { +- "referenced_type" : "type-11060" ++ "referenced_type" : "type-11012" + } + ], + "return_type" : "type-81", +@@ -18480,10 +18488,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11060" ++ "referenced_type" : "type-11012" + }, + { +- "referenced_type" : "type-11060" ++ "referenced_type" : "type-11012" + } + ], + "return_type" : "type-81", +@@ -18492,7 +18500,7 @@ + { + "function_name" : "google::protobuf::DoubleValue::default_instance", + "linker_set_key" : "_ZN6google8protobuf11DoubleValue16default_instanceEv", +- "return_type" : "type-11149", ++ "return_type" : "type-11101", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -18503,7 +18511,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11060" ++ "referenced_type" : "type-11012" + } + ], + "return_type" : "type-81", +@@ -18516,7 +18524,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11060" ++ "referenced_type" : "type-11012" + }, + { + "referenced_type" : "type-612" +@@ -18532,10 +18540,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11060" ++ "referenced_type" : "type-11012" + }, + { +- "referenced_type" : "type-11060" ++ "referenced_type" : "type-11012" + } + ], + "return_type" : "type-81", +@@ -18548,7 +18556,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11060" ++ "referenced_type" : "type-11012" + } + ], + "return_type" : "type-81", +@@ -18561,10 +18569,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11060" ++ "referenced_type" : "type-11012" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -18577,10 +18585,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11060" ++ "referenced_type" : "type-11012" + }, + { +- "referenced_type" : "type-11149" ++ "referenced_type" : "type-11101" + } + ], + "return_type" : "type-81", +@@ -18606,10 +18614,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11060" ++ "referenced_type" : "type-11012" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -18622,10 +18630,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11060" ++ "referenced_type" : "type-11012" + }, + { +- "referenced_type" : "type-11149" ++ "referenced_type" : "type-11101" + } + ], + "return_type" : "type-81", +@@ -18639,7 +18647,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11060" ++ "referenced_type" : "type-11012" + }, + { + "referenced_type" : "type-288" +@@ -18655,10 +18663,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11060" ++ "referenced_type" : "type-11012" + }, + { +- "referenced_type" : "type-11149" ++ "referenced_type" : "type-11101" + } + ], + "return_type" : "type-81", +@@ -18671,7 +18679,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11060" ++ "referenced_type" : "type-11012" + } + ], + "return_type" : "type-81", +@@ -18685,7 +18693,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11060" ++ "referenced_type" : "type-11012" + }, + { + "referenced_type" : "type-288" +@@ -18701,10 +18709,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11060" ++ "referenced_type" : "type-11012" + }, + { +- "referenced_type" : "type-11149" ++ "referenced_type" : "type-11101" + } + ], + "return_type" : "type-81", +@@ -18717,7 +18725,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11060" ++ "referenced_type" : "type-11012" + } + ], + "return_type" : "type-81", +@@ -18730,7 +18738,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11060" ++ "referenced_type" : "type-11012" + } + ], + "return_type" : "type-81", +@@ -18743,7 +18751,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11060" ++ "referenced_type" : "type-11012" + } + ], + "return_type" : "type-81", +@@ -18756,7 +18764,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11060" ++ "referenced_type" : "type-11012" + } + ], + "return_type" : "type-81", +@@ -18770,7 +18778,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1693" ++ "referenced_type" : "type-1607" + } + ], + "return_type" : "type-81", +@@ -18784,7 +18792,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1693" ++ "referenced_type" : "type-1607" + } + ], + "return_type" : "type-81", +@@ -18793,7 +18801,7 @@ + { + "function_name" : "google::protobuf::EnumOptions::descriptor", + "linker_set_key" : "_ZN6google8protobuf11EnumOptions10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -18804,10 +18812,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1693" ++ "referenced_type" : "type-1607" + }, + { +- "referenced_type" : "type-1693" ++ "referenced_type" : "type-1607" + } + ], + "return_type" : "type-81", +@@ -18816,7 +18824,7 @@ + { + "function_name" : "google::protobuf::EnumOptions::default_instance", + "linker_set_key" : "_ZN6google8protobuf11EnumOptions16default_instanceEv", +- "return_type" : "type-2044", ++ "return_type" : "type-1973", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -18827,7 +18835,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1693" ++ "referenced_type" : "type-1607" + } + ], + "return_type" : "type-81", +@@ -18840,7 +18848,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1693" ++ "referenced_type" : "type-1607" + }, + { + "referenced_type" : "type-612" +@@ -18856,10 +18864,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1693" ++ "referenced_type" : "type-1607" + }, + { +- "referenced_type" : "type-1693" ++ "referenced_type" : "type-1607" + } + ], + "return_type" : "type-81", +@@ -18872,7 +18880,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1693" ++ "referenced_type" : "type-1607" + } + ], + "return_type" : "type-81", +@@ -18885,10 +18893,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1693" ++ "referenced_type" : "type-1607" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -18901,10 +18909,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1693" ++ "referenced_type" : "type-1607" + }, + { +- "referenced_type" : "type-2044" ++ "referenced_type" : "type-1973" + } + ], + "return_type" : "type-81", +@@ -18917,10 +18925,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1693" ++ "referenced_type" : "type-1607" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -18933,10 +18941,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1693" ++ "referenced_type" : "type-1607" + }, + { +- "referenced_type" : "type-2044" ++ "referenced_type" : "type-1973" + } + ], + "return_type" : "type-81", +@@ -18949,10 +18957,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1693" ++ "referenced_type" : "type-1607" + }, + { +- "referenced_type" : "type-2044" ++ "referenced_type" : "type-1973" + } + ], + "return_type" : "type-81", +@@ -18965,7 +18973,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1693" ++ "referenced_type" : "type-1607" + } + ], + "return_type" : "type-81", +@@ -18978,10 +18986,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1693" ++ "referenced_type" : "type-1607" + }, + { +- "referenced_type" : "type-2044" ++ "referenced_type" : "type-1973" + } + ], + "return_type" : "type-81", +@@ -18994,7 +19002,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1693" ++ "referenced_type" : "type-1607" + } + ], + "return_type" : "type-81", +@@ -19007,7 +19015,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1693" ++ "referenced_type" : "type-1607" + } + ], + "return_type" : "type-81", +@@ -19020,7 +19028,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1693" ++ "referenced_type" : "type-1607" + } + ], + "return_type" : "type-81", +@@ -19033,7 +19041,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1693" ++ "referenced_type" : "type-1607" + } + ], + "return_type" : "type-81", +@@ -19047,7 +19055,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1711" ++ "referenced_type" : "type-1625" + } + ], + "return_type" : "type-81", +@@ -19061,7 +19069,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1711" ++ "referenced_type" : "type-1625" + } + ], + "return_type" : "type-81", +@@ -19070,7 +19078,7 @@ + { + "function_name" : "google::protobuf::FileOptions::descriptor", + "linker_set_key" : "_ZN6google8protobuf11FileOptions10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -19081,10 +19089,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1711" ++ "referenced_type" : "type-1625" + }, + { +- "referenced_type" : "type-1711" ++ "referenced_type" : "type-1625" + } + ], + "return_type" : "type-81", +@@ -19093,7 +19101,7 @@ + { + "function_name" : "google::protobuf::FileOptions::default_instance", + "linker_set_key" : "_ZN6google8protobuf11FileOptions16default_instanceEv", +- "return_type" : "type-2052", ++ "return_type" : "type-1982", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -19104,7 +19112,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1711" ++ "referenced_type" : "type-1625" + } + ], + "return_type" : "type-81", +@@ -19117,7 +19125,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1711" ++ "referenced_type" : "type-1625" + }, + { + "referenced_type" : "type-612" +@@ -19133,10 +19141,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1711" ++ "referenced_type" : "type-1625" + }, + { +- "referenced_type" : "type-1711" ++ "referenced_type" : "type-1625" + } + ], + "return_type" : "type-81", +@@ -19149,7 +19157,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1711" ++ "referenced_type" : "type-1625" + } + ], + "return_type" : "type-81", +@@ -19162,10 +19170,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1711" ++ "referenced_type" : "type-1625" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -19178,10 +19186,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1711" ++ "referenced_type" : "type-1625" + }, + { +- "referenced_type" : "type-2052" ++ "referenced_type" : "type-1982" + } + ], + "return_type" : "type-81", +@@ -19194,10 +19202,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1711" ++ "referenced_type" : "type-1625" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -19210,10 +19218,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1711" ++ "referenced_type" : "type-1625" + }, + { +- "referenced_type" : "type-2052" ++ "referenced_type" : "type-1982" + } + ], + "return_type" : "type-81", +@@ -19226,10 +19234,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1711" ++ "referenced_type" : "type-1625" + }, + { +- "referenced_type" : "type-2052" ++ "referenced_type" : "type-1982" + } + ], + "return_type" : "type-81", +@@ -19242,7 +19250,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1711" ++ "referenced_type" : "type-1625" + } + ], + "return_type" : "type-81", +@@ -19255,10 +19263,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1711" ++ "referenced_type" : "type-1625" + }, + { +- "referenced_type" : "type-2052" ++ "referenced_type" : "type-1982" + } + ], + "return_type" : "type-81", +@@ -19271,7 +19279,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1711" ++ "referenced_type" : "type-1625" + } + ], + "return_type" : "type-81", +@@ -19284,7 +19292,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1711" ++ "referenced_type" : "type-1625" + } + ], + "return_type" : "type-81", +@@ -19297,7 +19305,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1711" ++ "referenced_type" : "type-1625" + } + ], + "return_type" : "type-81", +@@ -19310,7 +19318,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1711" ++ "referenced_type" : "type-1625" + } + ], + "return_type" : "type-81", +@@ -19751,7 +19759,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11067" ++ "referenced_type" : "type-11019" + } + ], + "return_type" : "type-81", +@@ -19765,7 +19773,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11067" ++ "referenced_type" : "type-11019" + } + ], + "return_type" : "type-81", +@@ -19774,7 +19782,7 @@ + { + "function_name" : "google::protobuf::StringValue::descriptor", + "linker_set_key" : "_ZN6google8protobuf11StringValue10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -19785,10 +19793,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11067" ++ "referenced_type" : "type-11019" + }, + { +- "referenced_type" : "type-11067" ++ "referenced_type" : "type-11019" + } + ], + "return_type" : "type-81", +@@ -19801,10 +19809,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11067" ++ "referenced_type" : "type-11019" + }, + { +- "referenced_type" : "type-11067" ++ "referenced_type" : "type-11019" + } + ], + "return_type" : "type-81", +@@ -19813,7 +19821,7 @@ + { + "function_name" : "google::protobuf::StringValue::default_instance", + "linker_set_key" : "_ZN6google8protobuf11StringValue16default_instanceEv", +- "return_type" : "type-11163", ++ "return_type" : "type-11115", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -19824,7 +19832,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11067" ++ "referenced_type" : "type-11019" + } + ], + "return_type" : "type-81", +@@ -19837,7 +19845,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11067" ++ "referenced_type" : "type-11019" + }, + { + "referenced_type" : "type-612" +@@ -19853,10 +19861,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11067" ++ "referenced_type" : "type-11019" + }, + { +- "referenced_type" : "type-11067" ++ "referenced_type" : "type-11019" + } + ], + "return_type" : "type-81", +@@ -19869,7 +19877,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11067" ++ "referenced_type" : "type-11019" + } + ], + "return_type" : "type-81", +@@ -19882,10 +19890,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11067" ++ "referenced_type" : "type-11019" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -19898,10 +19906,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11067" ++ "referenced_type" : "type-11019" + }, + { +- "referenced_type" : "type-11163" ++ "referenced_type" : "type-11115" + } + ], + "return_type" : "type-81", +@@ -19927,10 +19935,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11067" ++ "referenced_type" : "type-11019" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -19943,10 +19951,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11067" ++ "referenced_type" : "type-11019" + }, + { +- "referenced_type" : "type-11163" ++ "referenced_type" : "type-11115" + } + ], + "return_type" : "type-81", +@@ -19960,7 +19968,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11067" ++ "referenced_type" : "type-11019" + }, + { + "referenced_type" : "type-288" +@@ -19976,10 +19984,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11067" ++ "referenced_type" : "type-11019" + }, + { +- "referenced_type" : "type-11163" ++ "referenced_type" : "type-11115" + } + ], + "return_type" : "type-81", +@@ -19992,7 +20000,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11067" ++ "referenced_type" : "type-11019" + } + ], + "return_type" : "type-81", +@@ -20006,7 +20014,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11067" ++ "referenced_type" : "type-11019" + }, + { + "referenced_type" : "type-288" +@@ -20022,10 +20030,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11067" ++ "referenced_type" : "type-11019" + }, + { +- "referenced_type" : "type-11163" ++ "referenced_type" : "type-11115" + } + ], + "return_type" : "type-81", +@@ -20038,7 +20046,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11067" ++ "referenced_type" : "type-11019" + } + ], + "return_type" : "type-81", +@@ -20051,7 +20059,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11067" ++ "referenced_type" : "type-11019" + } + ], + "return_type" : "type-81", +@@ -20064,7 +20072,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11067" ++ "referenced_type" : "type-11019" + } + ], + "return_type" : "type-81", +@@ -20077,7 +20085,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11067" ++ "referenced_type" : "type-11019" + } + ], + "return_type" : "type-81", +@@ -20109,7 +20117,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11065" ++ "referenced_type" : "type-11017" + } + ], + "return_type" : "type-81", +@@ -20123,7 +20131,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11065" ++ "referenced_type" : "type-11017" + } + ], + "return_type" : "type-81", +@@ -20132,7 +20140,7 @@ + { + "function_name" : "google::protobuf::UInt32Value::descriptor", + "linker_set_key" : "_ZN6google8protobuf11UInt32Value10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -20143,10 +20151,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11065" ++ "referenced_type" : "type-11017" + }, + { +- "referenced_type" : "type-11065" ++ "referenced_type" : "type-11017" + } + ], + "return_type" : "type-81", +@@ -20159,10 +20167,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11065" ++ "referenced_type" : "type-11017" + }, + { +- "referenced_type" : "type-11065" ++ "referenced_type" : "type-11017" + } + ], + "return_type" : "type-81", +@@ -20171,7 +20179,7 @@ + { + "function_name" : "google::protobuf::UInt32Value::default_instance", + "linker_set_key" : "_ZN6google8protobuf11UInt32Value16default_instanceEv", +- "return_type" : "type-11159", ++ "return_type" : "type-11111", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -20182,7 +20190,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11065" ++ "referenced_type" : "type-11017" + } + ], + "return_type" : "type-81", +@@ -20195,7 +20203,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11065" ++ "referenced_type" : "type-11017" + }, + { + "referenced_type" : "type-612" +@@ -20211,10 +20219,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11065" ++ "referenced_type" : "type-11017" + }, + { +- "referenced_type" : "type-11065" ++ "referenced_type" : "type-11017" + } + ], + "return_type" : "type-81", +@@ -20227,7 +20235,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11065" ++ "referenced_type" : "type-11017" + } + ], + "return_type" : "type-81", +@@ -20240,10 +20248,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11065" ++ "referenced_type" : "type-11017" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -20256,10 +20264,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11065" ++ "referenced_type" : "type-11017" + }, + { +- "referenced_type" : "type-11159" ++ "referenced_type" : "type-11111" + } + ], + "return_type" : "type-81", +@@ -20285,10 +20293,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11065" ++ "referenced_type" : "type-11017" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -20301,10 +20309,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11065" ++ "referenced_type" : "type-11017" + }, + { +- "referenced_type" : "type-11159" ++ "referenced_type" : "type-11111" + } + ], + "return_type" : "type-81", +@@ -20318,7 +20326,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11065" ++ "referenced_type" : "type-11017" + }, + { + "referenced_type" : "type-288" +@@ -20334,10 +20342,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11065" ++ "referenced_type" : "type-11017" + }, + { +- "referenced_type" : "type-11159" ++ "referenced_type" : "type-11111" + } + ], + "return_type" : "type-81", +@@ -20350,7 +20358,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11065" ++ "referenced_type" : "type-11017" + } + ], + "return_type" : "type-81", +@@ -20364,7 +20372,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11065" ++ "referenced_type" : "type-11017" + }, + { + "referenced_type" : "type-288" +@@ -20380,10 +20388,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11065" ++ "referenced_type" : "type-11017" + }, + { +- "referenced_type" : "type-11159" ++ "referenced_type" : "type-11111" + } + ], + "return_type" : "type-81", +@@ -20396,7 +20404,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11065" ++ "referenced_type" : "type-11017" + } + ], + "return_type" : "type-81", +@@ -20409,7 +20417,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11065" ++ "referenced_type" : "type-11017" + } + ], + "return_type" : "type-81", +@@ -20422,7 +20430,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11065" ++ "referenced_type" : "type-11017" + } + ], + "return_type" : "type-81", +@@ -20435,7 +20443,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11065" ++ "referenced_type" : "type-11017" + } + ], + "return_type" : "type-81", +@@ -20449,7 +20457,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11063" ++ "referenced_type" : "type-11015" + } + ], + "return_type" : "type-81", +@@ -20463,7 +20471,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11063" ++ "referenced_type" : "type-11015" + } + ], + "return_type" : "type-81", +@@ -20472,7 +20480,7 @@ + { + "function_name" : "google::protobuf::UInt64Value::descriptor", + "linker_set_key" : "_ZN6google8protobuf11UInt64Value10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -20483,10 +20491,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11063" ++ "referenced_type" : "type-11015" + }, + { +- "referenced_type" : "type-11063" ++ "referenced_type" : "type-11015" + } + ], + "return_type" : "type-81", +@@ -20499,10 +20507,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11063" ++ "referenced_type" : "type-11015" + }, + { +- "referenced_type" : "type-11063" ++ "referenced_type" : "type-11015" + } + ], + "return_type" : "type-81", +@@ -20511,7 +20519,7 @@ + { + "function_name" : "google::protobuf::UInt64Value::default_instance", + "linker_set_key" : "_ZN6google8protobuf11UInt64Value16default_instanceEv", +- "return_type" : "type-11155", ++ "return_type" : "type-11107", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -20522,7 +20530,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11063" ++ "referenced_type" : "type-11015" + } + ], + "return_type" : "type-81", +@@ -20535,7 +20543,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11063" ++ "referenced_type" : "type-11015" + }, + { + "referenced_type" : "type-612" +@@ -20551,10 +20559,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11063" ++ "referenced_type" : "type-11015" + }, + { +- "referenced_type" : "type-11063" ++ "referenced_type" : "type-11015" + } + ], + "return_type" : "type-81", +@@ -20567,7 +20575,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11063" ++ "referenced_type" : "type-11015" + } + ], + "return_type" : "type-81", +@@ -20580,10 +20588,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11063" ++ "referenced_type" : "type-11015" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -20596,10 +20604,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11063" ++ "referenced_type" : "type-11015" + }, + { +- "referenced_type" : "type-11155" ++ "referenced_type" : "type-11107" + } + ], + "return_type" : "type-81", +@@ -20625,10 +20633,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11063" ++ "referenced_type" : "type-11015" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -20641,10 +20649,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11063" ++ "referenced_type" : "type-11015" + }, + { +- "referenced_type" : "type-11155" ++ "referenced_type" : "type-11107" + } + ], + "return_type" : "type-81", +@@ -20658,7 +20666,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11063" ++ "referenced_type" : "type-11015" + }, + { + "referenced_type" : "type-288" +@@ -20674,10 +20682,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11063" ++ "referenced_type" : "type-11015" + }, + { +- "referenced_type" : "type-11155" ++ "referenced_type" : "type-11107" + } + ], + "return_type" : "type-81", +@@ -20690,7 +20698,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11063" ++ "referenced_type" : "type-11015" + } + ], + "return_type" : "type-81", +@@ -20704,7 +20712,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11063" ++ "referenced_type" : "type-11015" + }, + { + "referenced_type" : "type-288" +@@ -20720,10 +20728,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11063" ++ "referenced_type" : "type-11015" + }, + { +- "referenced_type" : "type-11155" ++ "referenced_type" : "type-11107" + } + ], + "return_type" : "type-81", +@@ -20736,7 +20744,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11063" ++ "referenced_type" : "type-11015" + } + ], + "return_type" : "type-81", +@@ -20749,7 +20757,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11063" ++ "referenced_type" : "type-11015" + } + ], + "return_type" : "type-81", +@@ -20762,7 +20770,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11063" ++ "referenced_type" : "type-11015" + } + ], + "return_type" : "type-81", +@@ -20775,7 +20783,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11063" ++ "referenced_type" : "type-11015" + } + ], + "return_type" : "type-81", +@@ -20891,7 +20899,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1680" ++ "referenced_type" : "type-1594" + } + ], + "return_type" : "type-81", +@@ -20905,7 +20913,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1680" ++ "referenced_type" : "type-1594" + } + ], + "return_type" : "type-81", +@@ -20914,7 +20922,7 @@ + { + "function_name" : "google::protobuf::FieldOptions::descriptor", + "linker_set_key" : "_ZN6google8protobuf12FieldOptions10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -20925,10 +20933,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1680" ++ "referenced_type" : "type-1594" + }, + { +- "referenced_type" : "type-1680" ++ "referenced_type" : "type-1594" + } + ], + "return_type" : "type-81", +@@ -20937,7 +20945,7 @@ + { + "function_name" : "google::protobuf::FieldOptions::default_instance", + "linker_set_key" : "_ZN6google8protobuf12FieldOptions16default_instanceEv", +- "return_type" : "type-2034", ++ "return_type" : "type-1963", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -20948,7 +20956,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1680" ++ "referenced_type" : "type-1594" + } + ], + "return_type" : "type-81", +@@ -20961,7 +20969,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1680" ++ "referenced_type" : "type-1594" + }, + { + "referenced_type" : "type-612" +@@ -20977,10 +20985,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1680" ++ "referenced_type" : "type-1594" + }, + { +- "referenced_type" : "type-1680" ++ "referenced_type" : "type-1594" + } + ], + "return_type" : "type-81", +@@ -20993,7 +21001,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1680" ++ "referenced_type" : "type-1594" + } + ], + "return_type" : "type-81", +@@ -21006,10 +21014,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1680" ++ "referenced_type" : "type-1594" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -21022,10 +21030,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1680" ++ "referenced_type" : "type-1594" + }, + { +- "referenced_type" : "type-2034" ++ "referenced_type" : "type-1963" + } + ], + "return_type" : "type-81", +@@ -21038,10 +21046,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1680" ++ "referenced_type" : "type-1594" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -21054,10 +21062,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1680" ++ "referenced_type" : "type-1594" + }, + { +- "referenced_type" : "type-2034" ++ "referenced_type" : "type-1963" + } + ], + "return_type" : "type-81", +@@ -21070,10 +21078,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1680" ++ "referenced_type" : "type-1594" + }, + { +- "referenced_type" : "type-2034" ++ "referenced_type" : "type-1963" + } + ], + "return_type" : "type-81", +@@ -21086,7 +21094,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1680" ++ "referenced_type" : "type-1594" + } + ], + "return_type" : "type-81", +@@ -21099,10 +21107,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1680" ++ "referenced_type" : "type-1594" + }, + { +- "referenced_type" : "type-2034" ++ "referenced_type" : "type-1963" + } + ], + "return_type" : "type-81", +@@ -21115,7 +21123,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1680" ++ "referenced_type" : "type-1594" + } + ], + "return_type" : "type-81", +@@ -21128,7 +21136,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1680" ++ "referenced_type" : "type-1594" + } + ], + "return_type" : "type-81", +@@ -21141,7 +21149,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1680" ++ "referenced_type" : "type-1594" + } + ], + "return_type" : "type-81", +@@ -21154,7 +21162,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1680" ++ "referenced_type" : "type-1594" + } + ], + "return_type" : "type-81", +@@ -21180,7 +21188,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1945" ++ "referenced_type" : "type-1869" + } + ], + "return_type" : "type-81", +@@ -21194,7 +21202,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1945" ++ "referenced_type" : "type-1869" + } + ], + "return_type" : "type-81", +@@ -21208,10 +21216,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1945" ++ "referenced_type" : "type-1869" + }, + { +- "referenced_type" : "type-1939" ++ "referenced_type" : "type-1864" + } + ], + "return_type" : "type-81", +@@ -21270,7 +21278,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1707" ++ "referenced_type" : "type-1621" + } + ], + "return_type" : "type-81", +@@ -21284,7 +21292,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1707" ++ "referenced_type" : "type-1621" + } + ], + "return_type" : "type-81", +@@ -21293,7 +21301,7 @@ + { + "function_name" : "google::protobuf::MethodOptions::descriptor", + "linker_set_key" : "_ZN6google8protobuf13MethodOptions10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -21304,10 +21312,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1707" ++ "referenced_type" : "type-1621" + }, + { +- "referenced_type" : "type-1707" ++ "referenced_type" : "type-1621" + } + ], + "return_type" : "type-81", +@@ -21316,7 +21324,7 @@ + { + "function_name" : "google::protobuf::MethodOptions::default_instance", + "linker_set_key" : "_ZN6google8protobuf13MethodOptions16default_instanceEv", +- "return_type" : "type-2050", ++ "return_type" : "type-1980", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -21327,7 +21335,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1707" ++ "referenced_type" : "type-1621" + } + ], + "return_type" : "type-81", +@@ -21340,7 +21348,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1707" ++ "referenced_type" : "type-1621" + }, + { + "referenced_type" : "type-612" +@@ -21356,10 +21364,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1707" ++ "referenced_type" : "type-1621" + }, + { +- "referenced_type" : "type-1707" ++ "referenced_type" : "type-1621" + } + ], + "return_type" : "type-81", +@@ -21372,7 +21380,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1707" ++ "referenced_type" : "type-1621" + } + ], + "return_type" : "type-81", +@@ -21385,10 +21393,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1707" ++ "referenced_type" : "type-1621" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -21401,10 +21409,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1707" ++ "referenced_type" : "type-1621" + }, + { +- "referenced_type" : "type-2050" ++ "referenced_type" : "type-1980" + } + ], + "return_type" : "type-81", +@@ -21417,10 +21425,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1707" ++ "referenced_type" : "type-1621" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -21433,10 +21441,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1707" ++ "referenced_type" : "type-1621" + }, + { +- "referenced_type" : "type-2050" ++ "referenced_type" : "type-1980" + } + ], + "return_type" : "type-81", +@@ -21449,10 +21457,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1707" ++ "referenced_type" : "type-1621" + }, + { +- "referenced_type" : "type-2050" ++ "referenced_type" : "type-1980" + } + ], + "return_type" : "type-81", +@@ -21465,7 +21473,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1707" ++ "referenced_type" : "type-1621" + } + ], + "return_type" : "type-81", +@@ -21478,10 +21486,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1707" ++ "referenced_type" : "type-1621" + }, + { +- "referenced_type" : "type-2050" ++ "referenced_type" : "type-1980" + } + ], + "return_type" : "type-81", +@@ -21494,7 +21502,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1707" ++ "referenced_type" : "type-1621" + } + ], + "return_type" : "type-81", +@@ -21507,7 +21515,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1707" ++ "referenced_type" : "type-1621" + } + ], + "return_type" : "type-81", +@@ -21520,7 +21528,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1707" ++ "referenced_type" : "type-1621" + } + ], + "return_type" : "type-81", +@@ -21533,7 +21541,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1707" ++ "referenced_type" : "type-1621" + } + ], + "return_type" : "type-81", +@@ -21770,7 +21778,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7106" ++ "referenced_type" : "type-7058" + } + ], + "return_type" : "type-81", +@@ -21783,7 +21791,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7106" ++ "referenced_type" : "type-7058" + } + ], + "return_type" : "type-81", +@@ -21796,7 +21804,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7106" ++ "referenced_type" : "type-7058" + } + ], + "return_type" : "type-81", +@@ -21837,7 +21845,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2344" ++ "referenced_type" : "type-2271" + } + ], + "return_type" : "type-81", +@@ -21851,7 +21859,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2344" ++ "referenced_type" : "type-2271" + } + ], + "return_type" : "type-81", +@@ -21860,7 +21868,7 @@ + { + "function_name" : "google::protobuf::SourceContext::descriptor", + "linker_set_key" : "_ZN6google8protobuf13SourceContext10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/source_context.pb.h" + }, + { +@@ -21871,10 +21879,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2344" ++ "referenced_type" : "type-2271" + }, + { +- "referenced_type" : "type-2344" ++ "referenced_type" : "type-2271" + } + ], + "return_type" : "type-81", +@@ -21883,7 +21891,7 @@ + { + "function_name" : "google::protobuf::SourceContext::default_instance", + "linker_set_key" : "_ZN6google8protobuf13SourceContext16default_instanceEv", +- "return_type" : "type-2475", ++ "return_type" : "type-2405", + "source_file" : "/external/protobuf/src/google/protobuf/source_context.pb.h" + }, + { +@@ -21894,7 +21902,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2344" ++ "referenced_type" : "type-2271" + } + ], + "return_type" : "type-81", +@@ -21907,7 +21915,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2344" ++ "referenced_type" : "type-2271" + }, + { + "referenced_type" : "type-612" +@@ -21923,10 +21931,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2344" ++ "referenced_type" : "type-2271" + }, + { +- "referenced_type" : "type-2344" ++ "referenced_type" : "type-2271" + } + ], + "return_type" : "type-81", +@@ -21939,7 +21947,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2344" ++ "referenced_type" : "type-2271" + } + ], + "return_type" : "type-81", +@@ -21952,10 +21960,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2344" ++ "referenced_type" : "type-2271" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -21968,10 +21976,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2344" ++ "referenced_type" : "type-2271" + }, + { +- "referenced_type" : "type-2475" ++ "referenced_type" : "type-2405" + } + ], + "return_type" : "type-81", +@@ -21984,10 +21992,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2344" ++ "referenced_type" : "type-2271" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -22000,10 +22008,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2344" ++ "referenced_type" : "type-2271" + }, + { +- "referenced_type" : "type-2475" ++ "referenced_type" : "type-2405" + } + ], + "return_type" : "type-81", +@@ -22016,10 +22024,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2344" ++ "referenced_type" : "type-2271" + }, + { +- "referenced_type" : "type-2475" ++ "referenced_type" : "type-2405" + } + ], + "return_type" : "type-81", +@@ -22032,7 +22040,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2344" ++ "referenced_type" : "type-2271" + } + ], + "return_type" : "type-81", +@@ -22045,10 +22053,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2344" ++ "referenced_type" : "type-2271" + }, + { +- "referenced_type" : "type-2475" ++ "referenced_type" : "type-2405" + } + ], + "return_type" : "type-81", +@@ -22061,7 +22069,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2344" ++ "referenced_type" : "type-2271" + } + ], + "return_type" : "type-81", +@@ -22074,7 +22082,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2344" ++ "referenced_type" : "type-2271" + } + ], + "return_type" : "type-81", +@@ -22087,7 +22095,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2344" ++ "referenced_type" : "type-2271" + } + ], + "return_type" : "type-81", +@@ -22100,7 +22108,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2344" ++ "referenced_type" : "type-2271" + } + ], + "return_type" : "type-81", +@@ -22212,7 +22220,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1967" ++ "referenced_type" : "type-1892" + } + ], + "return_type" : "type-81", +@@ -22225,7 +22233,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1967" ++ "referenced_type" : "type-1892" + } + ], + "return_type" : "type-81", +@@ -22238,7 +22246,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1967" ++ "referenced_type" : "type-1892" + } + ], + "return_type" : "type-81", +@@ -22247,13 +22255,13 @@ + { + "function_name" : "google::protobuf::DescriptorPool::generated_pool", + "linker_set_key" : "_ZN6google8protobuf14DescriptorPool14generated_poolEv", +- "return_type" : "type-1962", ++ "return_type" : "type-1887", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "function_name" : "google::protobuf::DescriptorPool::internal_generated_pool", + "linker_set_key" : "_ZN6google8protobuf14DescriptorPool23internal_generated_poolEv", +- "return_type" : "type-2057", ++ "return_type" : "type-1987", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -22263,10 +22271,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2057" ++ "referenced_type" : "type-1987" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], + "return_type" : "type-81", +@@ -22294,16 +22302,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2057" ++ "referenced_type" : "type-1987" + }, + { +- "referenced_type" : "type-2064" ++ "referenced_type" : "type-1996" + }, + { +- "referenced_type" : "type-1967" ++ "referenced_type" : "type-1892" + } + ], +- "return_type" : "type-1959", ++ "return_type" : "type-1884", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -22313,7 +22321,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2057" ++ "referenced_type" : "type-1987" + } + ], + "return_type" : "type-81", +@@ -22326,7 +22334,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2057" ++ "referenced_type" : "type-1987" + } + ], + "return_type" : "type-81", +@@ -22339,13 +22347,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2057" ++ "referenced_type" : "type-1987" + }, + { +- "referenced_type" : "type-2064" ++ "referenced_type" : "type-1996" + } + ], +- "return_type" : "type-1959", ++ "return_type" : "type-1884", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -22355,10 +22363,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2057" ++ "referenced_type" : "type-1987" + }, + { +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + } + ], + "return_type" : "type-81", +@@ -22371,14 +22379,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2057" ++ "referenced_type" : "type-1987" + }, + { +- "referenced_type" : "type-3745" ++ "referenced_type" : "type-3697" + }, + { + "default_arg" : true, +- "referenced_type" : "type-1967" ++ "referenced_type" : "type-1892" + } + ], + "return_type" : "type-81", +@@ -22391,7 +22399,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2057" ++ "referenced_type" : "type-1987" + } + ], + "return_type" : "type-81", +@@ -22404,10 +22412,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2057" ++ "referenced_type" : "type-1987" + }, + { +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + } + ], + "return_type" : "type-81", +@@ -22420,14 +22428,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2057" ++ "referenced_type" : "type-1987" + }, + { +- "referenced_type" : "type-3745" ++ "referenced_type" : "type-3697" + }, + { + "default_arg" : true, +- "referenced_type" : "type-1967" ++ "referenced_type" : "type-1892" + } + ], + "return_type" : "type-81", +@@ -22440,7 +22448,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2057" ++ "referenced_type" : "type-1987" + } + ], + "return_type" : "type-81", +@@ -22453,7 +22461,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2057" ++ "referenced_type" : "type-1987" + } + ], + "return_type" : "type-81", +@@ -22466,7 +22474,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2057" ++ "referenced_type" : "type-1987" + } + ], + "return_type" : "type-81", +@@ -22493,7 +22501,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1994" ++ "referenced_type" : "type-1920" + } + ], + "return_type" : "type-5", +@@ -22502,7 +22510,7 @@ + { + "function_name" : "google::protobuf::MessageFactory::generated_factory", + "linker_set_key" : "_ZN6google8protobuf14MessageFactory17generated_factoryEv", +- "return_type" : "type-2153", ++ "return_type" : "type-2084", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { +@@ -22514,7 +22522,7 @@ + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-6867" ++ "referenced_type" : "type-6819" + } + ], + "return_type" : "type-81", +@@ -22526,10 +22534,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + } + ], + "return_type" : "type-81", +@@ -22542,7 +22550,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2153" ++ "referenced_type" : "type-2084" + } + ], + "return_type" : "type-81", +@@ -22555,7 +22563,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2153" ++ "referenced_type" : "type-2084" + } + ], + "return_type" : "type-81", +@@ -22568,7 +22576,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2153" ++ "referenced_type" : "type-2084" + } + ], + "return_type" : "type-81", +@@ -22582,7 +22590,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1699" ++ "referenced_type" : "type-1613" + } + ], + "return_type" : "type-81", +@@ -22596,7 +22604,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1699" ++ "referenced_type" : "type-1613" + } + ], + "return_type" : "type-81", +@@ -22605,7 +22613,7 @@ + { + "function_name" : "google::protobuf::MessageOptions::descriptor", + "linker_set_key" : "_ZN6google8protobuf14MessageOptions10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -22616,10 +22624,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1699" ++ "referenced_type" : "type-1613" + }, + { +- "referenced_type" : "type-1699" ++ "referenced_type" : "type-1613" + } + ], + "return_type" : "type-81", +@@ -22628,7 +22636,7 @@ + { + "function_name" : "google::protobuf::MessageOptions::default_instance", + "linker_set_key" : "_ZN6google8protobuf14MessageOptions16default_instanceEv", +- "return_type" : "type-2026", ++ "return_type" : "type-1955", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -22639,7 +22647,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1699" ++ "referenced_type" : "type-1613" + } + ], + "return_type" : "type-81", +@@ -22652,7 +22660,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1699" ++ "referenced_type" : "type-1613" + }, + { + "referenced_type" : "type-612" +@@ -22668,10 +22676,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1699" ++ "referenced_type" : "type-1613" + }, + { +- "referenced_type" : "type-1699" ++ "referenced_type" : "type-1613" + } + ], + "return_type" : "type-81", +@@ -22684,7 +22692,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1699" ++ "referenced_type" : "type-1613" + } + ], + "return_type" : "type-81", +@@ -22697,10 +22705,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1699" ++ "referenced_type" : "type-1613" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -22713,10 +22721,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1699" ++ "referenced_type" : "type-1613" + }, + { +- "referenced_type" : "type-2026" ++ "referenced_type" : "type-1955" + } + ], + "return_type" : "type-81", +@@ -22729,10 +22737,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1699" ++ "referenced_type" : "type-1613" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -22745,10 +22753,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1699" ++ "referenced_type" : "type-1613" + }, + { +- "referenced_type" : "type-2026" ++ "referenced_type" : "type-1955" + } + ], + "return_type" : "type-81", +@@ -22761,10 +22769,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1699" ++ "referenced_type" : "type-1613" + }, + { +- "referenced_type" : "type-2026" ++ "referenced_type" : "type-1955" + } + ], + "return_type" : "type-81", +@@ -22777,7 +22785,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1699" ++ "referenced_type" : "type-1613" + } + ], + "return_type" : "type-81", +@@ -22790,10 +22798,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1699" ++ "referenced_type" : "type-1613" + }, + { +- "referenced_type" : "type-2026" ++ "referenced_type" : "type-1955" + } + ], + "return_type" : "type-81", +@@ -22806,7 +22814,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1699" ++ "referenced_type" : "type-1613" + } + ], + "return_type" : "type-81", +@@ -22819,7 +22827,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1699" ++ "referenced_type" : "type-1613" + } + ], + "return_type" : "type-81", +@@ -22832,7 +22840,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1699" ++ "referenced_type" : "type-1613" + } + ], + "return_type" : "type-81", +@@ -22845,7 +22853,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1699" ++ "referenced_type" : "type-1613" + } + ], + "return_type" : "type-81", +@@ -22859,7 +22867,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1709" ++ "referenced_type" : "type-1623" + } + ], + "return_type" : "type-81", +@@ -22873,7 +22881,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1709" ++ "referenced_type" : "type-1623" + } + ], + "return_type" : "type-81", +@@ -22882,7 +22890,7 @@ + { + "function_name" : "google::protobuf::ServiceOptions::descriptor", + "linker_set_key" : "_ZN6google8protobuf14ServiceOptions10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -22893,10 +22901,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1709" ++ "referenced_type" : "type-1623" + }, + { +- "referenced_type" : "type-1709" ++ "referenced_type" : "type-1623" + } + ], + "return_type" : "type-81", +@@ -22905,7 +22913,7 @@ + { + "function_name" : "google::protobuf::ServiceOptions::default_instance", + "linker_set_key" : "_ZN6google8protobuf14ServiceOptions16default_instanceEv", +- "return_type" : "type-2047", ++ "return_type" : "type-1976", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -22916,7 +22924,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1709" ++ "referenced_type" : "type-1623" + } + ], + "return_type" : "type-81", +@@ -22929,7 +22937,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1709" ++ "referenced_type" : "type-1623" + }, + { + "referenced_type" : "type-612" +@@ -22945,10 +22953,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1709" ++ "referenced_type" : "type-1623" + }, + { +- "referenced_type" : "type-1709" ++ "referenced_type" : "type-1623" + } + ], + "return_type" : "type-81", +@@ -22961,7 +22969,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1709" ++ "referenced_type" : "type-1623" + } + ], + "return_type" : "type-81", +@@ -22974,10 +22982,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1709" ++ "referenced_type" : "type-1623" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -22990,10 +22998,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1709" ++ "referenced_type" : "type-1623" + }, + { +- "referenced_type" : "type-2047" ++ "referenced_type" : "type-1976" + } + ], + "return_type" : "type-81", +@@ -23006,10 +23014,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1709" ++ "referenced_type" : "type-1623" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -23022,10 +23030,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1709" ++ "referenced_type" : "type-1623" + }, + { +- "referenced_type" : "type-2047" ++ "referenced_type" : "type-1976" + } + ], + "return_type" : "type-81", +@@ -23038,10 +23046,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1709" ++ "referenced_type" : "type-1623" + }, + { +- "referenced_type" : "type-2047" ++ "referenced_type" : "type-1976" + } + ], + "return_type" : "type-81", +@@ -23054,7 +23062,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1709" ++ "referenced_type" : "type-1623" + } + ], + "return_type" : "type-81", +@@ -23067,10 +23075,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1709" ++ "referenced_type" : "type-1623" + }, + { +- "referenced_type" : "type-2047" ++ "referenced_type" : "type-1976" + } + ], + "return_type" : "type-81", +@@ -23083,7 +23091,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1709" ++ "referenced_type" : "type-1623" + } + ], + "return_type" : "type-81", +@@ -23096,7 +23104,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1709" ++ "referenced_type" : "type-1623" + } + ], + "return_type" : "type-81", +@@ -23109,7 +23117,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1709" ++ "referenced_type" : "type-1623" + } + ], + "return_type" : "type-81", +@@ -23122,7 +23130,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1709" ++ "referenced_type" : "type-1623" + } + ], + "return_type" : "type-81", +@@ -23136,7 +23144,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1713" ++ "referenced_type" : "type-1627" + } + ], + "return_type" : "type-81", +@@ -23150,7 +23158,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1713" ++ "referenced_type" : "type-1627" + } + ], + "return_type" : "type-81", +@@ -23159,7 +23167,7 @@ + { + "function_name" : "google::protobuf::SourceCodeInfo::descriptor", + "linker_set_key" : "_ZN6google8protobuf14SourceCodeInfo10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -23170,10 +23178,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1713" ++ "referenced_type" : "type-1627" + }, + { +- "referenced_type" : "type-1713" ++ "referenced_type" : "type-1627" + } + ], + "return_type" : "type-81", +@@ -23182,7 +23190,7 @@ + { + "function_name" : "google::protobuf::SourceCodeInfo::default_instance", + "linker_set_key" : "_ZN6google8protobuf14SourceCodeInfo16default_instanceEv", +- "return_type" : "type-2227", ++ "return_type" : "type-2156", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -23193,7 +23201,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1713" ++ "referenced_type" : "type-1627" + } + ], + "return_type" : "type-81", +@@ -23206,7 +23214,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1713" ++ "referenced_type" : "type-1627" + }, + { + "referenced_type" : "type-612" +@@ -23222,10 +23230,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1713" ++ "referenced_type" : "type-1627" + }, + { +- "referenced_type" : "type-1713" ++ "referenced_type" : "type-1627" + } + ], + "return_type" : "type-81", +@@ -23238,7 +23246,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1713" ++ "referenced_type" : "type-1627" + } + ], + "return_type" : "type-81", +@@ -23251,10 +23259,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1713" ++ "referenced_type" : "type-1627" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -23267,10 +23275,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1713" ++ "referenced_type" : "type-1627" + }, + { +- "referenced_type" : "type-2227" ++ "referenced_type" : "type-2156" + } + ], + "return_type" : "type-81", +@@ -23283,10 +23291,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1713" ++ "referenced_type" : "type-1627" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -23299,10 +23307,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1713" ++ "referenced_type" : "type-1627" + }, + { +- "referenced_type" : "type-2227" ++ "referenced_type" : "type-2156" + } + ], + "return_type" : "type-81", +@@ -23315,10 +23323,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1713" ++ "referenced_type" : "type-1627" + }, + { +- "referenced_type" : "type-2227" ++ "referenced_type" : "type-2156" + } + ], + "return_type" : "type-81", +@@ -23331,7 +23339,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1713" ++ "referenced_type" : "type-1627" + } + ], + "return_type" : "type-81", +@@ -23344,10 +23352,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1713" ++ "referenced_type" : "type-1627" + }, + { +- "referenced_type" : "type-2227" ++ "referenced_type" : "type-2156" + } + ], + "return_type" : "type-81", +@@ -23360,7 +23368,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1713" ++ "referenced_type" : "type-1627" + } + ], + "return_type" : "type-81", +@@ -23373,7 +23381,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1713" ++ "referenced_type" : "type-1627" + } + ], + "return_type" : "type-81", +@@ -23386,7 +23394,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1713" ++ "referenced_type" : "type-1627" + } + ], + "return_type" : "type-81", +@@ -23399,7 +23407,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1713" ++ "referenced_type" : "type-1627" + } + ], + "return_type" : "type-81", +@@ -23425,7 +23433,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + } + ], + "return_type" : "type-81", +@@ -23439,7 +23447,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + } + ], + "return_type" : "type-81", +@@ -23448,7 +23456,7 @@ + { + "function_name" : "google::protobuf::DescriptorProto::descriptor", + "linker_set_key" : "_ZN6google8protobuf15DescriptorProto10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -23459,10 +23467,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + }, + { +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + } + ], + "return_type" : "type-81", +@@ -23471,7 +23479,7 @@ + { + "function_name" : "google::protobuf::DescriptorProto::default_instance", + "linker_set_key" : "_ZN6google8protobuf15DescriptorProto16default_instanceEv", +- "return_type" : "type-2069", ++ "return_type" : "type-2001", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -23482,7 +23490,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + } + ], + "return_type" : "type-81", +@@ -23495,7 +23503,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + }, + { + "referenced_type" : "type-612" +@@ -23511,10 +23519,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + }, + { +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + } + ], + "return_type" : "type-81", +@@ -23527,7 +23535,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + } + ], + "return_type" : "type-81", +@@ -23540,10 +23548,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -23556,10 +23564,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + }, + { +- "referenced_type" : "type-2069" ++ "referenced_type" : "type-2001" + } + ], + "return_type" : "type-81", +@@ -23572,10 +23580,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -23588,10 +23596,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + }, + { +- "referenced_type" : "type-2069" ++ "referenced_type" : "type-2001" + } + ], + "return_type" : "type-81", +@@ -23604,10 +23612,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + }, + { +- "referenced_type" : "type-2069" ++ "referenced_type" : "type-2001" + } + ], + "return_type" : "type-81", +@@ -23620,7 +23628,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + } + ], + "return_type" : "type-81", +@@ -23633,10 +23641,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + }, + { +- "referenced_type" : "type-2069" ++ "referenced_type" : "type-2001" + } + ], + "return_type" : "type-81", +@@ -23649,7 +23657,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + } + ], + "return_type" : "type-81", +@@ -23662,7 +23670,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + } + ], + "return_type" : "type-81", +@@ -23675,7 +23683,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + } + ], + "return_type" : "type-81", +@@ -23688,7 +23696,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + } + ], + "return_type" : "type-81", +@@ -23728,7 +23736,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1936" ++ "referenced_type" : "type-1859" + }, + { + "referenced_type" : "type-1" +@@ -23747,7 +23755,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1936" ++ "referenced_type" : "type-1859" + }, + { + "referenced_type" : "type-1" +@@ -23767,7 +23775,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1936" ++ "referenced_type" : "type-1859" + } + ], + "return_type" : "type-81", +@@ -23780,7 +23788,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1936" ++ "referenced_type" : "type-1859" + }, + { + "referenced_type" : "type-1" +@@ -23796,7 +23804,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1936" ++ "referenced_type" : "type-1859" + }, + { + "referenced_type" : "type-1" +@@ -23815,7 +23823,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1936" ++ "referenced_type" : "type-1859" + }, + { + "referenced_type" : "type-167" +@@ -23830,7 +23838,7 @@ + { + "function_name" : "google::protobuf::UnknownFieldSet::default_instance", + "linker_set_key" : "_ZN6google8protobuf15UnknownFieldSet16default_instanceEv", +- "return_type" : "type-1938", ++ "return_type" : "type-1863", + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, + { +@@ -23841,10 +23849,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1936" ++ "referenced_type" : "type-1859" + }, + { +- "referenced_type" : "type-1948" ++ "referenced_type" : "type-1872" + } + ], + "return_type" : "type-81", +@@ -23857,13 +23865,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1936" ++ "referenced_type" : "type-1859" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-7977", ++ "return_type" : "type-7929", + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, + { +@@ -23873,7 +23881,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1936" ++ "referenced_type" : "type-1859" + } + ], + "return_type" : "type-81", +@@ -23886,10 +23894,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1936" ++ "referenced_type" : "type-1859" + }, + { +- "referenced_type" : "type-1936" ++ "referenced_type" : "type-1859" + } + ], + "return_type" : "type-81", +@@ -23902,7 +23910,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1936" ++ "referenced_type" : "type-1859" + }, + { + "referenced_type" : "type-612" +@@ -23918,7 +23926,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1936" ++ "referenced_type" : "type-1859" + }, + { + "referenced_type" : "type-612" +@@ -23934,7 +23942,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1936" ++ "referenced_type" : "type-1859" + }, + { + "referenced_type" : "type-793" +@@ -23950,10 +23958,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1936" ++ "referenced_type" : "type-1859" + }, + { +- "referenced_type" : "type-1939" ++ "referenced_type" : "type-1864" + } + ], + "return_type" : "type-81", +@@ -23966,13 +23974,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1936" ++ "referenced_type" : "type-1859" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-1936", ++ "return_type" : "type-1859", + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, + { +@@ -23982,7 +23990,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1936" ++ "referenced_type" : "type-1859" + }, + { + "referenced_type" : "type-1" +@@ -24001,10 +24009,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1936" ++ "referenced_type" : "type-1859" + }, + { +- "referenced_type" : "type-1948" ++ "referenced_type" : "type-1872" + } + ], + "return_type" : "type-81", +@@ -24017,7 +24025,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1936" ++ "referenced_type" : "type-1859" + } + ], + "return_type" : "type-81", +@@ -24030,7 +24038,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1936" ++ "referenced_type" : "type-1859" + } + ], + "return_type" : "type-81", +@@ -24043,7 +24051,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1936" ++ "referenced_type" : "type-1859" + } + ], + "return_type" : "type-81", +@@ -24056,7 +24064,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1936" ++ "referenced_type" : "type-1859" + } + ], + "return_type" : "type-81", +@@ -24118,7 +24126,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1691" ++ "referenced_type" : "type-1605" + } + ], + "return_type" : "type-81", +@@ -24132,7 +24140,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1691" ++ "referenced_type" : "type-1605" + } + ], + "return_type" : "type-81", +@@ -24141,7 +24149,7 @@ + { + "function_name" : "google::protobuf::EnumValueOptions::descriptor", + "linker_set_key" : "_ZN6google8protobuf16EnumValueOptions10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -24152,10 +24160,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1691" ++ "referenced_type" : "type-1605" + }, + { +- "referenced_type" : "type-1691" ++ "referenced_type" : "type-1605" + } + ], + "return_type" : "type-81", +@@ -24164,7 +24172,7 @@ + { + "function_name" : "google::protobuf::EnumValueOptions::default_instance", + "linker_set_key" : "_ZN6google8protobuf16EnumValueOptions16default_instanceEv", +- "return_type" : "type-2046", ++ "return_type" : "type-1975", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -24175,7 +24183,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1691" ++ "referenced_type" : "type-1605" + } + ], + "return_type" : "type-81", +@@ -24188,7 +24196,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1691" ++ "referenced_type" : "type-1605" + }, + { + "referenced_type" : "type-612" +@@ -24204,10 +24212,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1691" ++ "referenced_type" : "type-1605" + }, + { +- "referenced_type" : "type-1691" ++ "referenced_type" : "type-1605" + } + ], + "return_type" : "type-81", +@@ -24220,7 +24228,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1691" ++ "referenced_type" : "type-1605" + } + ], + "return_type" : "type-81", +@@ -24233,10 +24241,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1691" ++ "referenced_type" : "type-1605" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -24249,10 +24257,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1691" ++ "referenced_type" : "type-1605" + }, + { +- "referenced_type" : "type-2046" ++ "referenced_type" : "type-1975" + } + ], + "return_type" : "type-81", +@@ -24265,10 +24273,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1691" ++ "referenced_type" : "type-1605" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -24281,10 +24289,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1691" ++ "referenced_type" : "type-1605" + }, + { +- "referenced_type" : "type-2046" ++ "referenced_type" : "type-1975" + } + ], + "return_type" : "type-81", +@@ -24297,10 +24305,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1691" ++ "referenced_type" : "type-1605" + }, + { +- "referenced_type" : "type-2046" ++ "referenced_type" : "type-1975" + } + ], + "return_type" : "type-81", +@@ -24313,7 +24321,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1691" ++ "referenced_type" : "type-1605" + } + ], + "return_type" : "type-81", +@@ -24326,10 +24334,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1691" ++ "referenced_type" : "type-1605" + }, + { +- "referenced_type" : "type-2046" ++ "referenced_type" : "type-1975" + } + ], + "return_type" : "type-81", +@@ -24342,7 +24350,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1691" ++ "referenced_type" : "type-1605" + } + ], + "return_type" : "type-81", +@@ -24355,7 +24363,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1691" ++ "referenced_type" : "type-1605" + } + ], + "return_type" : "type-81", +@@ -24368,7 +24376,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1691" ++ "referenced_type" : "type-1605" + } + ], + "return_type" : "type-81", +@@ -24381,7 +24389,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1691" ++ "referenced_type" : "type-1605" + } + ], + "return_type" : "type-81", +@@ -24491,7 +24499,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2213" ++ "referenced_type" : "type-2144" + } + ], + "return_type" : "type-81", +@@ -24505,7 +24513,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2213" ++ "referenced_type" : "type-2144" + } + ], + "return_type" : "type-81", +@@ -24514,7 +24522,7 @@ + { + "function_name" : "google::protobuf::FileDescriptorSet::descriptor", + "linker_set_key" : "_ZN6google8protobuf17FileDescriptorSet10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -24525,10 +24533,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2213" ++ "referenced_type" : "type-2144" + }, + { +- "referenced_type" : "type-2213" ++ "referenced_type" : "type-2144" + } + ], + "return_type" : "type-81", +@@ -24537,7 +24545,7 @@ + { + "function_name" : "google::protobuf::FileDescriptorSet::default_instance", + "linker_set_key" : "_ZN6google8protobuf17FileDescriptorSet16default_instanceEv", +- "return_type" : "type-2216", ++ "return_type" : "type-2147", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -24548,7 +24556,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2213" ++ "referenced_type" : "type-2144" + } + ], + "return_type" : "type-81", +@@ -24561,7 +24569,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2213" ++ "referenced_type" : "type-2144" + }, + { + "referenced_type" : "type-612" +@@ -24577,10 +24585,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2213" ++ "referenced_type" : "type-2144" + }, + { +- "referenced_type" : "type-2213" ++ "referenced_type" : "type-2144" + } + ], + "return_type" : "type-81", +@@ -24593,7 +24601,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2213" ++ "referenced_type" : "type-2144" + } + ], + "return_type" : "type-81", +@@ -24606,10 +24614,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2213" ++ "referenced_type" : "type-2144" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -24622,10 +24630,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2213" ++ "referenced_type" : "type-2144" + }, + { +- "referenced_type" : "type-2216" ++ "referenced_type" : "type-2147" + } + ], + "return_type" : "type-81", +@@ -24638,10 +24646,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2213" ++ "referenced_type" : "type-2144" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -24654,10 +24662,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2213" ++ "referenced_type" : "type-2144" + }, + { +- "referenced_type" : "type-2216" ++ "referenced_type" : "type-2147" + } + ], + "return_type" : "type-81", +@@ -24670,10 +24678,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2213" ++ "referenced_type" : "type-2144" + }, + { +- "referenced_type" : "type-2216" ++ "referenced_type" : "type-2147" + } + ], + "return_type" : "type-81", +@@ -24686,7 +24694,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2213" ++ "referenced_type" : "type-2144" + } + ], + "return_type" : "type-81", +@@ -24699,10 +24707,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2213" ++ "referenced_type" : "type-2144" + }, + { +- "referenced_type" : "type-2216" ++ "referenced_type" : "type-2147" + } + ], + "return_type" : "type-81", +@@ -24715,7 +24723,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2213" ++ "referenced_type" : "type-2144" + } + ], + "return_type" : "type-81", +@@ -24728,7 +24736,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2213" ++ "referenced_type" : "type-2144" + } + ], + "return_type" : "type-81", +@@ -24741,7 +24749,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2213" ++ "referenced_type" : "type-2144" + } + ], + "return_type" : "type-81", +@@ -24754,7 +24762,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2213" ++ "referenced_type" : "type-2144" + } + ], + "return_type" : "type-81", +@@ -24768,7 +24776,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2263" ++ "referenced_type" : "type-2192" + } + ], + "return_type" : "type-81", +@@ -24782,7 +24790,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2263" ++ "referenced_type" : "type-2192" + } + ], + "return_type" : "type-81", +@@ -24791,7 +24799,7 @@ + { + "function_name" : "google::protobuf::GeneratedCodeInfo::descriptor", + "linker_set_key" : "_ZN6google8protobuf17GeneratedCodeInfo10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -24802,10 +24810,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2263" ++ "referenced_type" : "type-2192" + }, + { +- "referenced_type" : "type-2263" ++ "referenced_type" : "type-2192" + } + ], + "return_type" : "type-81", +@@ -24814,7 +24822,7 @@ + { + "function_name" : "google::protobuf::GeneratedCodeInfo::default_instance", + "linker_set_key" : "_ZN6google8protobuf17GeneratedCodeInfo16default_instanceEv", +- "return_type" : "type-2266", ++ "return_type" : "type-2195", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -24825,7 +24833,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2263" ++ "referenced_type" : "type-2192" + } + ], + "return_type" : "type-81", +@@ -24838,7 +24846,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2263" ++ "referenced_type" : "type-2192" + }, + { + "referenced_type" : "type-612" +@@ -24854,10 +24862,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2263" ++ "referenced_type" : "type-2192" + }, + { +- "referenced_type" : "type-2263" ++ "referenced_type" : "type-2192" + } + ], + "return_type" : "type-81", +@@ -24870,7 +24878,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2263" ++ "referenced_type" : "type-2192" + } + ], + "return_type" : "type-81", +@@ -24883,10 +24891,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2263" ++ "referenced_type" : "type-2192" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -24899,10 +24907,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2263" ++ "referenced_type" : "type-2192" + }, + { +- "referenced_type" : "type-2266" ++ "referenced_type" : "type-2195" + } + ], + "return_type" : "type-81", +@@ -24915,10 +24923,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2263" ++ "referenced_type" : "type-2192" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -24931,10 +24939,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2263" ++ "referenced_type" : "type-2192" + }, + { +- "referenced_type" : "type-2266" ++ "referenced_type" : "type-2195" + } + ], + "return_type" : "type-81", +@@ -24947,10 +24955,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2263" ++ "referenced_type" : "type-2192" + }, + { +- "referenced_type" : "type-2266" ++ "referenced_type" : "type-2195" + } + ], + "return_type" : "type-81", +@@ -24963,7 +24971,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2263" ++ "referenced_type" : "type-2192" + } + ], + "return_type" : "type-81", +@@ -24976,10 +24984,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2263" ++ "referenced_type" : "type-2192" + }, + { +- "referenced_type" : "type-2266" ++ "referenced_type" : "type-2195" + } + ], + "return_type" : "type-81", +@@ -24992,7 +25000,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2263" ++ "referenced_type" : "type-2192" + } + ], + "return_type" : "type-81", +@@ -25005,7 +25013,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2263" ++ "referenced_type" : "type-2192" + } + ], + "return_type" : "type-81", +@@ -25018,7 +25026,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2263" ++ "referenced_type" : "type-2192" + } + ], + "return_type" : "type-81", +@@ -25031,7 +25039,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2263" ++ "referenced_type" : "type-2192" + } + ], + "return_type" : "type-81", +@@ -25052,7 +25060,7 @@ + { + "function_name" : "google::protobuf::Syntax_descriptor", + "linker_set_key" : "_ZN6google8protobuf17Syntax_descriptorEv", +- "return_type" : "type-1980", ++ "return_type" : "type-1906", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -25062,7 +25070,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3745" ++ "referenced_type" : "type-3697" + } + ], + "return_type" : "type-81", +@@ -25075,7 +25083,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3745" ++ "referenced_type" : "type-3697" + } + ], + "return_type" : "type-81", +@@ -25088,7 +25096,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3745" ++ "referenced_type" : "type-3697" + } + ], + "return_type" : "type-81", +@@ -25127,15 +25135,15 @@ + "parameters" : + [ + { +- "referenced_type" : "type-15376" ++ "referenced_type" : "type-15328" + }, + { +- "referenced_type" : "type-15379" ++ "referenced_type" : "type-15331" + } + ], + "return_type" : "type-12", + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h", +- "template_args" : [ "type-15311" ] ++ "template_args" : [ "type-15263" ] + }, + { + "function_name" : "google::protobuf::InsertIfNotPresent", +@@ -25162,15 +25170,15 @@ + "parameters" : + [ + { +- "referenced_type" : "type-3910" ++ "referenced_type" : "type-3862" + }, + { +- "referenced_type" : "type-3913" ++ "referenced_type" : "type-3865" + } + ], + "return_type" : "type-12", + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h", +- "template_args" : [ "type-4593" ] ++ "template_args" : [ "type-4545" ] + }, + { + "function_name" : "google::protobuf::InsertIfNotPresent", +@@ -25178,15 +25186,15 @@ + "parameters" : + [ + { +- "referenced_type" : "type-3896" ++ "referenced_type" : "type-3848" + }, + { +- "referenced_type" : "type-3901" ++ "referenced_type" : "type-3853" + } + ], + "return_type" : "type-12", + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h", +- "template_args" : [ "type-4595" ] ++ "template_args" : [ "type-4547" ] + }, + { + "function_name" : "google::protobuf::InsertIfNotPresent", +@@ -25194,18 +25202,18 @@ + "parameters" : + [ + { +- "referenced_type" : "type-3663" ++ "referenced_type" : "type-3615" + }, + { +- "referenced_type" : "type-3649" ++ "referenced_type" : "type-3601" + }, + { +- "referenced_type" : "type-3671" ++ "referenced_type" : "type-3623" + } + ], + "return_type" : "type-12", + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h", +- "template_args" : [ "type-4600" ] ++ "template_args" : [ "type-4552" ] + }, + { + "function_name" : "google::protobuf::StringPrintfVector", +@@ -25230,7 +25238,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1882" ++ "referenced_type" : "type-1800" + } + ], + "return_type" : "type-81", +@@ -25244,7 +25252,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1882" ++ "referenced_type" : "type-1800" + } + ], + "return_type" : "type-81", +@@ -25253,7 +25261,7 @@ + { + "function_name" : "google::protobuf::EnumDescriptorProto::descriptor", + "linker_set_key" : "_ZN6google8protobuf19EnumDescriptorProto10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -25264,10 +25272,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1882" ++ "referenced_type" : "type-1800" + }, + { +- "referenced_type" : "type-1882" ++ "referenced_type" : "type-1800" + } + ], + "return_type" : "type-81", +@@ -25276,7 +25284,7 @@ + { + "function_name" : "google::protobuf::EnumDescriptorProto::default_instance", + "linker_set_key" : "_ZN6google8protobuf19EnumDescriptorProto16default_instanceEv", +- "return_type" : "type-2075", ++ "return_type" : "type-2007", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -25287,7 +25295,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1882" ++ "referenced_type" : "type-1800" + } + ], + "return_type" : "type-81", +@@ -25300,7 +25308,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1882" ++ "referenced_type" : "type-1800" + }, + { + "referenced_type" : "type-612" +@@ -25316,10 +25324,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1882" ++ "referenced_type" : "type-1800" + }, + { +- "referenced_type" : "type-1882" ++ "referenced_type" : "type-1800" + } + ], + "return_type" : "type-81", +@@ -25332,7 +25340,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1882" ++ "referenced_type" : "type-1800" + } + ], + "return_type" : "type-81", +@@ -25345,10 +25353,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1882" ++ "referenced_type" : "type-1800" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -25361,10 +25369,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1882" ++ "referenced_type" : "type-1800" + }, + { +- "referenced_type" : "type-2075" ++ "referenced_type" : "type-2007" + } + ], + "return_type" : "type-81", +@@ -25377,10 +25385,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1882" ++ "referenced_type" : "type-1800" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -25393,10 +25401,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1882" ++ "referenced_type" : "type-1800" + }, + { +- "referenced_type" : "type-2075" ++ "referenced_type" : "type-2007" + } + ], + "return_type" : "type-81", +@@ -25409,10 +25417,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1882" ++ "referenced_type" : "type-1800" + }, + { +- "referenced_type" : "type-2075" ++ "referenced_type" : "type-2007" + } + ], + "return_type" : "type-81", +@@ -25425,7 +25433,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1882" ++ "referenced_type" : "type-1800" + } + ], + "return_type" : "type-81", +@@ -25438,10 +25446,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1882" ++ "referenced_type" : "type-1800" + }, + { +- "referenced_type" : "type-2075" ++ "referenced_type" : "type-2007" + } + ], + "return_type" : "type-81", +@@ -25454,7 +25462,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1882" ++ "referenced_type" : "type-1800" + } + ], + "return_type" : "type-81", +@@ -25467,7 +25475,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1882" ++ "referenced_type" : "type-1800" + } + ], + "return_type" : "type-81", +@@ -25480,7 +25488,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1882" ++ "referenced_type" : "type-1800" + } + ], + "return_type" : "type-81", +@@ -25493,7 +25501,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1882" ++ "referenced_type" : "type-1800" + } + ], + "return_type" : "type-81", +@@ -25507,7 +25515,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-81", +@@ -25521,7 +25529,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-81", +@@ -25530,7 +25538,7 @@ + { + "function_name" : "google::protobuf::FileDescriptorProto::descriptor", + "linker_set_key" : "_ZN6google8protobuf19FileDescriptorProto10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -25541,10 +25549,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + }, + { +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-81", +@@ -25553,7 +25561,7 @@ + { + "function_name" : "google::protobuf::FileDescriptorProto::default_instance", + "linker_set_key" : "_ZN6google8protobuf19FileDescriptorProto16default_instanceEv", +- "return_type" : "type-2064", ++ "return_type" : "type-1996", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -25564,7 +25572,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-81", +@@ -25577,7 +25585,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + }, + { + "referenced_type" : "type-612" +@@ -25593,10 +25601,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + }, + { +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-81", +@@ -25609,7 +25617,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-81", +@@ -25622,10 +25630,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -25638,10 +25646,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + }, + { +- "referenced_type" : "type-2064" ++ "referenced_type" : "type-1996" + } + ], + "return_type" : "type-81", +@@ -25654,10 +25662,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -25670,10 +25678,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + }, + { +- "referenced_type" : "type-2064" ++ "referenced_type" : "type-1996" + } + ], + "return_type" : "type-81", +@@ -25686,10 +25694,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + }, + { +- "referenced_type" : "type-2064" ++ "referenced_type" : "type-1996" + } + ], + "return_type" : "type-81", +@@ -25702,7 +25710,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-81", +@@ -25715,10 +25723,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + }, + { +- "referenced_type" : "type-2064" ++ "referenced_type" : "type-1996" + } + ], + "return_type" : "type-81", +@@ -25731,7 +25739,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-81", +@@ -25744,7 +25752,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-81", +@@ -25757,7 +25765,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-81", +@@ -25770,7 +25778,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-81", +@@ -25784,7 +25792,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1914" ++ "referenced_type" : "type-1834" + } + ], + "return_type" : "type-81", +@@ -25798,7 +25806,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1914" ++ "referenced_type" : "type-1834" + } + ], + "return_type" : "type-81", +@@ -25807,7 +25815,7 @@ + { + "function_name" : "google::protobuf::UninterpretedOption::descriptor", + "linker_set_key" : "_ZN6google8protobuf19UninterpretedOption10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -25818,10 +25826,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1914" ++ "referenced_type" : "type-1834" + }, + { +- "referenced_type" : "type-1914" ++ "referenced_type" : "type-1834" + } + ], + "return_type" : "type-81", +@@ -25830,7 +25838,7 @@ + { + "function_name" : "google::protobuf::UninterpretedOption::default_instance", + "linker_set_key" : "_ZN6google8protobuf19UninterpretedOption16default_instanceEv", +- "return_type" : "type-2117", ++ "return_type" : "type-2050", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -25841,7 +25849,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1914" ++ "referenced_type" : "type-1834" + } + ], + "return_type" : "type-81", +@@ -25854,7 +25862,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1914" ++ "referenced_type" : "type-1834" + }, + { + "referenced_type" : "type-612" +@@ -25870,10 +25878,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1914" ++ "referenced_type" : "type-1834" + }, + { +- "referenced_type" : "type-1914" ++ "referenced_type" : "type-1834" + } + ], + "return_type" : "type-81", +@@ -25886,7 +25894,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1914" ++ "referenced_type" : "type-1834" + } + ], + "return_type" : "type-81", +@@ -25899,10 +25907,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1914" ++ "referenced_type" : "type-1834" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -25915,10 +25923,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1914" ++ "referenced_type" : "type-1834" + }, + { +- "referenced_type" : "type-2117" ++ "referenced_type" : "type-2050" + } + ], + "return_type" : "type-81", +@@ -25931,10 +25939,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1914" ++ "referenced_type" : "type-1834" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -25947,10 +25955,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1914" ++ "referenced_type" : "type-1834" + }, + { +- "referenced_type" : "type-2117" ++ "referenced_type" : "type-2050" + } + ], + "return_type" : "type-81", +@@ -25963,10 +25971,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1914" ++ "referenced_type" : "type-1834" + }, + { +- "referenced_type" : "type-2117" ++ "referenced_type" : "type-2050" + } + ], + "return_type" : "type-81", +@@ -25979,7 +25987,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1914" ++ "referenced_type" : "type-1834" + } + ], + "return_type" : "type-81", +@@ -25992,10 +26000,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1914" ++ "referenced_type" : "type-1834" + }, + { +- "referenced_type" : "type-2117" ++ "referenced_type" : "type-2050" + } + ], + "return_type" : "type-81", +@@ -26008,7 +26016,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1914" ++ "referenced_type" : "type-1834" + } + ], + "return_type" : "type-81", +@@ -26021,7 +26029,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1914" ++ "referenced_type" : "type-1834" + } + ], + "return_type" : "type-81", +@@ -26034,7 +26042,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1914" ++ "referenced_type" : "type-1834" + } + ], + "return_type" : "type-81", +@@ -26047,7 +26055,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1914" ++ "referenced_type" : "type-1834" + } + ], + "return_type" : "type-81", +@@ -26121,7 +26129,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + } + ], + "return_type" : "type-81", +@@ -26135,7 +26143,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + } + ], + "return_type" : "type-81", +@@ -26144,7 +26152,7 @@ + { + "function_name" : "google::protobuf::FieldDescriptorProto::descriptor", + "linker_set_key" : "_ZN6google8protobuf20FieldDescriptorProto10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -26155,10 +26163,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + }, + { +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + } + ], + "return_type" : "type-81", +@@ -26167,7 +26175,7 @@ + { + "function_name" : "google::protobuf::FieldDescriptorProto::default_instance", + "linker_set_key" : "_ZN6google8protobuf20FieldDescriptorProto16default_instanceEv", +- "return_type" : "type-2085", ++ "return_type" : "type-2018", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -26178,7 +26186,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + } + ], + "return_type" : "type-81", +@@ -26191,7 +26199,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + }, + { + "referenced_type" : "type-612" +@@ -26207,10 +26215,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + }, + { +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + } + ], + "return_type" : "type-81", +@@ -26223,7 +26231,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + } + ], + "return_type" : "type-81", +@@ -26236,10 +26244,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -26252,10 +26260,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + }, + { +- "referenced_type" : "type-2085" ++ "referenced_type" : "type-2018" + } + ], + "return_type" : "type-81", +@@ -26268,10 +26276,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -26284,10 +26292,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + }, + { +- "referenced_type" : "type-2085" ++ "referenced_type" : "type-2018" + } + ], + "return_type" : "type-81", +@@ -26300,10 +26308,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + }, + { +- "referenced_type" : "type-2085" ++ "referenced_type" : "type-2018" + } + ], + "return_type" : "type-81", +@@ -26316,7 +26324,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + } + ], + "return_type" : "type-81", +@@ -26329,10 +26337,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + }, + { +- "referenced_type" : "type-2085" ++ "referenced_type" : "type-2018" + } + ], + "return_type" : "type-81", +@@ -26345,7 +26353,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + } + ], + "return_type" : "type-81", +@@ -26358,7 +26366,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + } + ], + "return_type" : "type-81", +@@ -26371,7 +26379,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + } + ], + "return_type" : "type-81", +@@ -26384,7 +26392,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + } + ], + "return_type" : "type-81", +@@ -26393,7 +26401,7 @@ + { + "function_name" : "google::protobuf::NullValue_descriptor", + "linker_set_key" : "_ZN6google8protobuf20NullValue_descriptorEv", +- "return_type" : "type-1980", ++ "return_type" : "type-1906", + "source_file" : "/external/protobuf/src/google/protobuf/struct.pb.h" + }, + { +@@ -26404,7 +26412,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1898" ++ "referenced_type" : "type-1817" + } + ], + "return_type" : "type-81", +@@ -26418,7 +26426,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1898" ++ "referenced_type" : "type-1817" + } + ], + "return_type" : "type-81", +@@ -26427,7 +26435,7 @@ + { + "function_name" : "google::protobuf::OneofDescriptorProto::descriptor", + "linker_set_key" : "_ZN6google8protobuf20OneofDescriptorProto10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -26438,10 +26446,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1898" ++ "referenced_type" : "type-1817" + }, + { +- "referenced_type" : "type-1898" ++ "referenced_type" : "type-1817" + } + ], + "return_type" : "type-81", +@@ -26450,7 +26458,7 @@ + { + "function_name" : "google::protobuf::OneofDescriptorProto::default_instance", + "linker_set_key" : "_ZN6google8protobuf20OneofDescriptorProto16default_instanceEv", +- "return_type" : "type-2096", ++ "return_type" : "type-2029", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -26461,7 +26469,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1898" ++ "referenced_type" : "type-1817" + } + ], + "return_type" : "type-81", +@@ -26474,7 +26482,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1898" ++ "referenced_type" : "type-1817" + }, + { + "referenced_type" : "type-612" +@@ -26490,10 +26498,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1898" ++ "referenced_type" : "type-1817" + }, + { +- "referenced_type" : "type-1898" ++ "referenced_type" : "type-1817" + } + ], + "return_type" : "type-81", +@@ -26506,7 +26514,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1898" ++ "referenced_type" : "type-1817" + } + ], + "return_type" : "type-81", +@@ -26519,10 +26527,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1898" ++ "referenced_type" : "type-1817" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -26535,10 +26543,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1898" ++ "referenced_type" : "type-1817" + }, + { +- "referenced_type" : "type-2096" ++ "referenced_type" : "type-2029" + } + ], + "return_type" : "type-81", +@@ -26551,10 +26559,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1898" ++ "referenced_type" : "type-1817" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -26567,10 +26575,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1898" ++ "referenced_type" : "type-1817" + }, + { +- "referenced_type" : "type-2096" ++ "referenced_type" : "type-2029" + } + ], + "return_type" : "type-81", +@@ -26583,10 +26591,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1898" ++ "referenced_type" : "type-1817" + }, + { +- "referenced_type" : "type-2096" ++ "referenced_type" : "type-2029" + } + ], + "return_type" : "type-81", +@@ -26599,7 +26607,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1898" ++ "referenced_type" : "type-1817" + } + ], + "return_type" : "type-81", +@@ -26612,10 +26620,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1898" ++ "referenced_type" : "type-1817" + }, + { +- "referenced_type" : "type-2096" ++ "referenced_type" : "type-2029" + } + ], + "return_type" : "type-81", +@@ -26628,7 +26636,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1898" ++ "referenced_type" : "type-1817" + } + ], + "return_type" : "type-81", +@@ -26641,7 +26649,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1898" ++ "referenced_type" : "type-1817" + } + ], + "return_type" : "type-81", +@@ -26654,7 +26662,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1898" ++ "referenced_type" : "type-1817" + } + ], + "return_type" : "type-81", +@@ -26667,7 +26675,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1898" ++ "referenced_type" : "type-1817" + } + ], + "return_type" : "type-81", +@@ -26680,13 +26688,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3864" ++ "referenced_type" : "type-3816" + }, + { +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + } + ], +- "return_type" : "type-2056", ++ "return_type" : "type-1986", + "source_file" : "/external/protobuf/src/google/protobuf/dynamic_message.h" + }, + { +@@ -26697,13 +26705,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3864" ++ "referenced_type" : "type-3816" + }, + { +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + } + ], +- "return_type" : "type-2056", ++ "return_type" : "type-1986", + "source_file" : "/external/protobuf/src/google/protobuf/dynamic_message.h" + }, + { +@@ -26713,7 +26721,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { + "referenced_type" : "type-507" +@@ -26732,7 +26740,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { + "referenced_type" : "type-507" +@@ -26751,10 +26759,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3864" ++ "referenced_type" : "type-3816" + }, + { +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + } + ], + "return_type" : "type-81", +@@ -26767,7 +26775,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3864" ++ "referenced_type" : "type-3816" + } + ], + "return_type" : "type-81", +@@ -26780,10 +26788,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3864" ++ "referenced_type" : "type-3816" + }, + { +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + } + ], + "return_type" : "type-81", +@@ -26796,7 +26804,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3864" ++ "referenced_type" : "type-3816" + } + ], + "return_type" : "type-81", +@@ -26809,7 +26817,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3864" ++ "referenced_type" : "type-3816" + } + ], + "return_type" : "type-81", +@@ -26822,7 +26830,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3864" ++ "referenced_type" : "type-3816" + } + ], + "return_type" : "type-81", +@@ -26835,7 +26843,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3864" ++ "referenced_type" : "type-3816" + } + ], + "return_type" : "type-81", +@@ -26874,7 +26882,7 @@ + { + "function_name" : "google::protobuf::Field_Kind_descriptor", + "linker_set_key" : "_ZN6google8protobuf21Field_Kind_descriptorEv", +- "return_type" : "type-1980", ++ "return_type" : "type-1906", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -26885,7 +26893,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1910" ++ "referenced_type" : "type-1830" + } + ], + "return_type" : "type-81", +@@ -26899,7 +26907,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1910" ++ "referenced_type" : "type-1830" + } + ], + "return_type" : "type-81", +@@ -26908,7 +26916,7 @@ + { + "function_name" : "google::protobuf::MethodDescriptorProto::descriptor", + "linker_set_key" : "_ZN6google8protobuf21MethodDescriptorProto10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -26919,10 +26927,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1910" ++ "referenced_type" : "type-1830" + }, + { +- "referenced_type" : "type-1910" ++ "referenced_type" : "type-1830" + } + ], + "return_type" : "type-81", +@@ -26931,7 +26939,7 @@ + { + "function_name" : "google::protobuf::MethodDescriptorProto::default_instance", + "linker_set_key" : "_ZN6google8protobuf21MethodDescriptorProto16default_instanceEv", +- "return_type" : "type-2112", ++ "return_type" : "type-2045", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -26942,7 +26950,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1910" ++ "referenced_type" : "type-1830" + } + ], + "return_type" : "type-81", +@@ -26955,7 +26963,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1910" ++ "referenced_type" : "type-1830" + }, + { + "referenced_type" : "type-612" +@@ -26971,10 +26979,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1910" ++ "referenced_type" : "type-1830" + }, + { +- "referenced_type" : "type-1910" ++ "referenced_type" : "type-1830" + } + ], + "return_type" : "type-81", +@@ -26987,7 +26995,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1910" ++ "referenced_type" : "type-1830" + } + ], + "return_type" : "type-81", +@@ -27000,10 +27008,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1910" ++ "referenced_type" : "type-1830" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -27016,10 +27024,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1910" ++ "referenced_type" : "type-1830" + }, + { +- "referenced_type" : "type-2112" ++ "referenced_type" : "type-2045" + } + ], + "return_type" : "type-81", +@@ -27032,10 +27040,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1910" ++ "referenced_type" : "type-1830" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -27048,10 +27056,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1910" ++ "referenced_type" : "type-1830" + }, + { +- "referenced_type" : "type-2112" ++ "referenced_type" : "type-2045" + } + ], + "return_type" : "type-81", +@@ -27064,10 +27072,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1910" ++ "referenced_type" : "type-1830" + }, + { +- "referenced_type" : "type-2112" ++ "referenced_type" : "type-2045" + } + ], + "return_type" : "type-81", +@@ -27080,7 +27088,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1910" ++ "referenced_type" : "type-1830" + } + ], + "return_type" : "type-81", +@@ -27093,10 +27101,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1910" ++ "referenced_type" : "type-1830" + }, + { +- "referenced_type" : "type-2112" ++ "referenced_type" : "type-2045" + } + ], + "return_type" : "type-81", +@@ -27109,7 +27117,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1910" ++ "referenced_type" : "type-1830" + } + ], + "return_type" : "type-81", +@@ -27122,7 +27130,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1910" ++ "referenced_type" : "type-1830" + } + ], + "return_type" : "type-81", +@@ -27135,7 +27143,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1910" ++ "referenced_type" : "type-1830" + } + ], + "return_type" : "type-81", +@@ -27148,7 +27156,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1910" ++ "referenced_type" : "type-1830" + } + ], + "return_type" : "type-81", +@@ -27260,13 +27268,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3942" ++ "referenced_type" : "type-3894" + }, + { +- "referenced_type" : "type-3928" ++ "referenced_type" : "type-3880" + }, + { +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-12", +@@ -27279,13 +27287,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3942" ++ "referenced_type" : "type-3894" + }, + { +- "referenced_type" : "type-3928" ++ "referenced_type" : "type-3880" + }, + { +- "referenced_type" : "type-3936" ++ "referenced_type" : "type-3888" + } + ], + "return_type" : "type-12", +@@ -27298,13 +27306,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3942" ++ "referenced_type" : "type-3894" + }, + { +- "referenced_type" : "type-3928" ++ "referenced_type" : "type-3880" + }, + { +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-12", +@@ -27317,16 +27325,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3942" ++ "referenced_type" : "type-3894" + }, + { +- "referenced_type" : "type-3928" ++ "referenced_type" : "type-3880" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-12", +@@ -27339,10 +27347,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3942" ++ "referenced_type" : "type-3894" + }, + { +- "referenced_type" : "type-3764" ++ "referenced_type" : "type-3716" + } + ], + "return_type" : "type-81", +@@ -27355,10 +27363,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3942" ++ "referenced_type" : "type-3894" + }, + { +- "referenced_type" : "type-3764" ++ "referenced_type" : "type-3716" + } + ], + "return_type" : "type-81", +@@ -27371,7 +27379,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3942" ++ "referenced_type" : "type-3894" + } + ], + "return_type" : "type-81", +@@ -27384,7 +27392,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3942" ++ "referenced_type" : "type-3894" + } + ], + "return_type" : "type-81", +@@ -27397,7 +27405,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3942" ++ "referenced_type" : "type-3894" + } + ], + "return_type" : "type-81", +@@ -27459,7 +27467,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1886" ++ "referenced_type" : "type-1804" + } + ], + "return_type" : "type-81", +@@ -27473,7 +27481,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1886" ++ "referenced_type" : "type-1804" + } + ], + "return_type" : "type-81", +@@ -27482,7 +27490,7 @@ + { + "function_name" : "google::protobuf::ServiceDescriptorProto::descriptor", + "linker_set_key" : "_ZN6google8protobuf22ServiceDescriptorProto10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -27493,10 +27501,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1886" ++ "referenced_type" : "type-1804" + }, + { +- "referenced_type" : "type-1886" ++ "referenced_type" : "type-1804" + } + ], + "return_type" : "type-81", +@@ -27505,7 +27513,7 @@ + { + "function_name" : "google::protobuf::ServiceDescriptorProto::default_instance", + "linker_set_key" : "_ZN6google8protobuf22ServiceDescriptorProto16default_instanceEv", +- "return_type" : "type-2080", ++ "return_type" : "type-2013", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -27516,7 +27524,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1886" ++ "referenced_type" : "type-1804" + } + ], + "return_type" : "type-81", +@@ -27529,7 +27537,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1886" ++ "referenced_type" : "type-1804" + }, + { + "referenced_type" : "type-612" +@@ -27545,10 +27553,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1886" ++ "referenced_type" : "type-1804" + }, + { +- "referenced_type" : "type-1886" ++ "referenced_type" : "type-1804" + } + ], + "return_type" : "type-81", +@@ -27561,7 +27569,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1886" ++ "referenced_type" : "type-1804" + } + ], + "return_type" : "type-81", +@@ -27574,10 +27582,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1886" ++ "referenced_type" : "type-1804" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -27590,10 +27598,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1886" ++ "referenced_type" : "type-1804" + }, + { +- "referenced_type" : "type-2080" ++ "referenced_type" : "type-2013" + } + ], + "return_type" : "type-81", +@@ -27606,10 +27614,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1886" ++ "referenced_type" : "type-1804" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -27622,10 +27630,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1886" ++ "referenced_type" : "type-1804" + }, + { +- "referenced_type" : "type-2080" ++ "referenced_type" : "type-2013" + } + ], + "return_type" : "type-81", +@@ -27638,10 +27646,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1886" ++ "referenced_type" : "type-1804" + }, + { +- "referenced_type" : "type-2080" ++ "referenced_type" : "type-2013" + } + ], + "return_type" : "type-81", +@@ -27654,7 +27662,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1886" ++ "referenced_type" : "type-1804" + } + ], + "return_type" : "type-81", +@@ -27667,10 +27675,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1886" ++ "referenced_type" : "type-1804" + }, + { +- "referenced_type" : "type-2080" ++ "referenced_type" : "type-2013" + } + ], + "return_type" : "type-81", +@@ -27683,7 +27691,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1886" ++ "referenced_type" : "type-1804" + } + ], + "return_type" : "type-81", +@@ -27696,7 +27704,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1886" ++ "referenced_type" : "type-1804" + } + ], + "return_type" : "type-81", +@@ -27709,7 +27717,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1886" ++ "referenced_type" : "type-1804" + } + ], + "return_type" : "type-81", +@@ -27722,7 +27730,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1886" ++ "referenced_type" : "type-1804" + } + ], + "return_type" : "type-81", +@@ -27742,7 +27750,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1922" ++ "referenced_type" : "type-1843" + } + ], + "return_type" : "type-81", +@@ -27756,7 +27764,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1922" ++ "referenced_type" : "type-1843" + } + ], + "return_type" : "type-81", +@@ -27765,7 +27773,7 @@ + { + "function_name" : "google::protobuf::SourceCodeInfo_Location::descriptor", + "linker_set_key" : "_ZN6google8protobuf23SourceCodeInfo_Location10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -27776,10 +27784,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1922" ++ "referenced_type" : "type-1843" + }, + { +- "referenced_type" : "type-1922" ++ "referenced_type" : "type-1843" + } + ], + "return_type" : "type-81", +@@ -27788,7 +27796,7 @@ + { + "function_name" : "google::protobuf::SourceCodeInfo_Location::default_instance", + "linker_set_key" : "_ZN6google8protobuf23SourceCodeInfo_Location16default_instanceEv", +- "return_type" : "type-2128", ++ "return_type" : "type-2061", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -27799,7 +27807,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1922" ++ "referenced_type" : "type-1843" + } + ], + "return_type" : "type-81", +@@ -27812,7 +27820,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1922" ++ "referenced_type" : "type-1843" + }, + { + "referenced_type" : "type-612" +@@ -27828,10 +27836,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1922" ++ "referenced_type" : "type-1843" + }, + { +- "referenced_type" : "type-1922" ++ "referenced_type" : "type-1843" + } + ], + "return_type" : "type-81", +@@ -27844,7 +27852,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1922" ++ "referenced_type" : "type-1843" + } + ], + "return_type" : "type-81", +@@ -27857,10 +27865,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1922" ++ "referenced_type" : "type-1843" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -27873,10 +27881,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1922" ++ "referenced_type" : "type-1843" + }, + { +- "referenced_type" : "type-2128" ++ "referenced_type" : "type-2061" + } + ], + "return_type" : "type-81", +@@ -27889,10 +27897,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1922" ++ "referenced_type" : "type-1843" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -27905,10 +27913,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1922" ++ "referenced_type" : "type-1843" + }, + { +- "referenced_type" : "type-2128" ++ "referenced_type" : "type-2061" + } + ], + "return_type" : "type-81", +@@ -27921,10 +27929,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1922" ++ "referenced_type" : "type-1843" + }, + { +- "referenced_type" : "type-2128" ++ "referenced_type" : "type-2061" + } + ], + "return_type" : "type-81", +@@ -27937,7 +27945,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1922" ++ "referenced_type" : "type-1843" + } + ], + "return_type" : "type-81", +@@ -27950,10 +27958,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1922" ++ "referenced_type" : "type-1843" + }, + { +- "referenced_type" : "type-2128" ++ "referenced_type" : "type-2061" + } + ], + "return_type" : "type-81", +@@ -27966,7 +27974,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1922" ++ "referenced_type" : "type-1843" + } + ], + "return_type" : "type-81", +@@ -27979,7 +27987,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1922" ++ "referenced_type" : "type-1843" + } + ], + "return_type" : "type-81", +@@ -27992,7 +28000,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1922" ++ "referenced_type" : "type-1843" + } + ], + "return_type" : "type-81", +@@ -28005,7 +28013,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1922" ++ "referenced_type" : "type-1843" + } + ], + "return_type" : "type-81", +@@ -28034,7 +28042,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1906" ++ "referenced_type" : "type-1825" + } + ], + "return_type" : "type-81", +@@ -28048,7 +28056,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1906" ++ "referenced_type" : "type-1825" + } + ], + "return_type" : "type-81", +@@ -28057,7 +28065,7 @@ + { + "function_name" : "google::protobuf::EnumValueDescriptorProto::descriptor", + "linker_set_key" : "_ZN6google8protobuf24EnumValueDescriptorProto10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -28068,10 +28076,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1906" ++ "referenced_type" : "type-1825" + }, + { +- "referenced_type" : "type-1906" ++ "referenced_type" : "type-1825" + } + ], + "return_type" : "type-81", +@@ -28080,7 +28088,7 @@ + { + "function_name" : "google::protobuf::EnumValueDescriptorProto::default_instance", + "linker_set_key" : "_ZN6google8protobuf24EnumValueDescriptorProto16default_instanceEv", +- "return_type" : "type-2107", ++ "return_type" : "type-2040", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -28091,7 +28099,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1906" ++ "referenced_type" : "type-1825" + } + ], + "return_type" : "type-81", +@@ -28104,7 +28112,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1906" ++ "referenced_type" : "type-1825" + }, + { + "referenced_type" : "type-612" +@@ -28120,10 +28128,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1906" ++ "referenced_type" : "type-1825" + }, + { +- "referenced_type" : "type-1906" ++ "referenced_type" : "type-1825" + } + ], + "return_type" : "type-81", +@@ -28136,7 +28144,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1906" ++ "referenced_type" : "type-1825" + } + ], + "return_type" : "type-81", +@@ -28149,10 +28157,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1906" ++ "referenced_type" : "type-1825" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -28165,10 +28173,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1906" ++ "referenced_type" : "type-1825" + }, + { +- "referenced_type" : "type-2107" ++ "referenced_type" : "type-2040" + } + ], + "return_type" : "type-81", +@@ -28181,10 +28189,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1906" ++ "referenced_type" : "type-1825" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -28197,10 +28205,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1906" ++ "referenced_type" : "type-1825" + }, + { +- "referenced_type" : "type-2107" ++ "referenced_type" : "type-2040" + } + ], + "return_type" : "type-81", +@@ -28213,10 +28221,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1906" ++ "referenced_type" : "type-1825" + }, + { +- "referenced_type" : "type-2107" ++ "referenced_type" : "type-2040" + } + ], + "return_type" : "type-81", +@@ -28229,7 +28237,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1906" ++ "referenced_type" : "type-1825" + } + ], + "return_type" : "type-81", +@@ -28242,10 +28250,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1906" ++ "referenced_type" : "type-1825" + }, + { +- "referenced_type" : "type-2107" ++ "referenced_type" : "type-2040" + } + ], + "return_type" : "type-81", +@@ -28258,7 +28266,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1906" ++ "referenced_type" : "type-1825" + } + ], + "return_type" : "type-81", +@@ -28271,7 +28279,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1906" ++ "referenced_type" : "type-1825" + } + ], + "return_type" : "type-81", +@@ -28284,7 +28292,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1906" ++ "referenced_type" : "type-1825" + } + ], + "return_type" : "type-81", +@@ -28297,7 +28305,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1906" ++ "referenced_type" : "type-1825" + } + ], + "return_type" : "type-81", +@@ -28310,13 +28318,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3943" ++ "referenced_type" : "type-3895" + }, + { +- "referenced_type" : "type-3928" ++ "referenced_type" : "type-3880" + }, + { +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-12", +@@ -28329,13 +28337,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3943" ++ "referenced_type" : "type-3895" + }, + { +- "referenced_type" : "type-3928" ++ "referenced_type" : "type-3880" + }, + { +- "referenced_type" : "type-3936" ++ "referenced_type" : "type-3888" + } + ], + "return_type" : "type-12", +@@ -28348,13 +28356,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3943" ++ "referenced_type" : "type-3895" + }, + { +- "referenced_type" : "type-3928" ++ "referenced_type" : "type-3880" + }, + { +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-12", +@@ -28367,16 +28375,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3943" ++ "referenced_type" : "type-3895" + }, + { +- "referenced_type" : "type-3928" ++ "referenced_type" : "type-3880" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-12", +@@ -28389,13 +28397,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3943" ++ "referenced_type" : "type-3895" + }, + { +- "referenced_type" : "type-3745" ++ "referenced_type" : "type-3697" + }, + { +- "referenced_type" : "type-3745" ++ "referenced_type" : "type-3697" + } + ], + "return_type" : "type-81", +@@ -28408,10 +28416,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3943" ++ "referenced_type" : "type-3895" + }, + { +- "referenced_type" : "type-3946" ++ "referenced_type" : "type-3898" + } + ], + "return_type" : "type-81", +@@ -28424,13 +28432,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3943" ++ "referenced_type" : "type-3895" + }, + { +- "referenced_type" : "type-3745" ++ "referenced_type" : "type-3697" + }, + { +- "referenced_type" : "type-3745" ++ "referenced_type" : "type-3697" + } + ], + "return_type" : "type-81", +@@ -28443,10 +28451,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3943" ++ "referenced_type" : "type-3895" + }, + { +- "referenced_type" : "type-3946" ++ "referenced_type" : "type-3898" + } + ], + "return_type" : "type-81", +@@ -28459,7 +28467,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3943" ++ "referenced_type" : "type-3895" + } + ], + "return_type" : "type-81", +@@ -28472,7 +28480,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3943" ++ "referenced_type" : "type-3895" + } + ], + "return_type" : "type-81", +@@ -28485,7 +28493,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3943" ++ "referenced_type" : "type-3895" + } + ], + "return_type" : "type-81", +@@ -28498,13 +28506,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3938" ++ "referenced_type" : "type-3890" + }, + { +- "referenced_type" : "type-3928" ++ "referenced_type" : "type-3880" + }, + { +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-12", +@@ -28518,13 +28526,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3940" ++ "referenced_type" : "type-3892" + }, + { +- "referenced_type" : "type-3928" ++ "referenced_type" : "type-3880" + }, + { +- "referenced_type" : "type-3928" ++ "referenced_type" : "type-3880" + } + ], + "return_type" : "type-12", +@@ -28537,13 +28545,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3940" ++ "referenced_type" : "type-3892" + }, + { +- "referenced_type" : "type-2085" ++ "referenced_type" : "type-2018" + }, + { +- "referenced_type" : "type-4603" ++ "referenced_type" : "type-4555" + } + ], + "return_type" : "type-12", +@@ -28556,16 +28564,33 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3940" ++ "referenced_type" : "type-3892" + }, + { +- "referenced_type" : "type-3928" ++ "referenced_type" : "type-3880" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-4604", ++ "return_type" : "type-4556", ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" ++ }, ++ { ++ "access" : "private", ++ "function_name" : "google::protobuf::SimpleDescriptorDatabase::DescriptorIndex >::ValidateSymbolName", ++ "linker_set_key" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexINSt3__14pairIPKviEEE18ValidateSymbolNameERKNS3_12basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3892" ++ }, ++ { ++ "referenced_type" : "type-3880" ++ } ++ ], ++ "return_type" : "type-12", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, + { +@@ -28575,13 +28600,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3940" ++ "referenced_type" : "type-3892" + }, + { +- "referenced_type" : "type-2069" ++ "referenced_type" : "type-2001" + }, + { +- "referenced_type" : "type-4605" ++ "referenced_type" : "type-4557" + } + ], + "return_type" : "type-12", +@@ -28595,13 +28620,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3940" ++ "referenced_type" : "type-3892" + }, + { +- "referenced_type" : "type-3928" ++ "referenced_type" : "type-3880" + } + ], +- "return_type" : "type-4606", ++ "return_type" : "type-4558", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, + { +@@ -28611,13 +28636,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3940" ++ "referenced_type" : "type-3892" + }, + { +- "referenced_type" : "type-3928" ++ "referenced_type" : "type-3880" + }, + { +- "referenced_type" : "type-3936" ++ "referenced_type" : "type-3888" + } + ], + "return_type" : "type-12", +@@ -28630,13 +28655,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3940" ++ "referenced_type" : "type-3892" + }, + { +- "referenced_type" : "type-2064" ++ "referenced_type" : "type-1996" + }, + { +- "referenced_type" : "type-4607" ++ "referenced_type" : "type-4559" + } + ], + "return_type" : "type-12", +@@ -28649,13 +28674,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3940" ++ "referenced_type" : "type-3892" + }, + { +- "referenced_type" : "type-3928" ++ "referenced_type" : "type-3880" + }, + { +- "referenced_type" : "type-4609" ++ "referenced_type" : "type-4561" + } + ], + "return_type" : "type-12", +@@ -28669,13 +28694,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3939" ++ "referenced_type" : "type-3891" + }, + { +- "referenced_type" : "type-3928" ++ "referenced_type" : "type-3880" + }, + { +- "referenced_type" : "type-3928" ++ "referenced_type" : "type-3880" + } + ], + "return_type" : "type-12", +@@ -28688,13 +28713,30 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3939" ++ "referenced_type" : "type-3891" + }, + { +- "referenced_type" : "type-2085" ++ "referenced_type" : "type-2018" ++ }, ++ { ++ "referenced_type" : "type-1794" ++ } ++ ], ++ "return_type" : "type-12", ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" ++ }, ++ { ++ "access" : "private", ++ "function_name" : "google::protobuf::SimpleDescriptorDatabase::DescriptorIndex::ValidateSymbolName", ++ "linker_set_key" : "_ZN6google8protobuf24SimpleDescriptorDatabase15DescriptorIndexIPKNS0_19FileDescriptorProtoEE18ValidateSymbolNameERKNSt3__112basic_stringIcNS7_11char_traitsIcEENS7_9allocatorIcEEEE", ++ "parameters" : ++ [ ++ { ++ "is_this_ptr" : true, ++ "referenced_type" : "type-3891" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-3880" + } + ], + "return_type" : "type-12", +@@ -28707,13 +28749,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3939" ++ "referenced_type" : "type-3891" + }, + { +- "referenced_type" : "type-2069" ++ "referenced_type" : "type-2001" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-12", +@@ -28727,13 +28769,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3939" ++ "referenced_type" : "type-3891" + }, + { +- "referenced_type" : "type-3928" ++ "referenced_type" : "type-3880" + } + ], +- "return_type" : "type-4610", ++ "return_type" : "type-4562", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, + { +@@ -28743,13 +28785,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3939" ++ "referenced_type" : "type-3891" + }, + { +- "referenced_type" : "type-3928" ++ "referenced_type" : "type-3880" + }, + { +- "referenced_type" : "type-3936" ++ "referenced_type" : "type-3888" + } + ], + "return_type" : "type-12", +@@ -28762,13 +28804,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3939" ++ "referenced_type" : "type-3891" + }, + { +- "referenced_type" : "type-2064" ++ "referenced_type" : "type-1996" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-12", +@@ -28781,13 +28823,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3939" ++ "referenced_type" : "type-3891" + }, + { +- "referenced_type" : "type-3928" ++ "referenced_type" : "type-3880" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-12", +@@ -28800,13 +28842,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3938" ++ "referenced_type" : "type-3890" + }, + { +- "referenced_type" : "type-3928" ++ "referenced_type" : "type-3880" + }, + { +- "referenced_type" : "type-3936" ++ "referenced_type" : "type-3888" + } + ], + "return_type" : "type-12", +@@ -28819,13 +28861,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3938" ++ "referenced_type" : "type-3890" + }, + { +- "referenced_type" : "type-3928" ++ "referenced_type" : "type-3880" + }, + { +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-12", +@@ -28838,16 +28880,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3938" ++ "referenced_type" : "type-3890" + }, + { +- "referenced_type" : "type-3928" ++ "referenced_type" : "type-3880" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-12", +@@ -28860,10 +28902,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3938" ++ "referenced_type" : "type-3890" + }, + { +- "referenced_type" : "type-2064" ++ "referenced_type" : "type-1996" + } + ], + "return_type" : "type-12", +@@ -28876,10 +28918,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3938" ++ "referenced_type" : "type-3890" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-12", +@@ -28893,13 +28935,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3938" ++ "referenced_type" : "type-3890" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + }, + { +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-12", +@@ -28912,7 +28954,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3938" ++ "referenced_type" : "type-3890" + } + ], + "return_type" : "type-81", +@@ -28925,7 +28967,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3938" ++ "referenced_type" : "type-3890" + } + ], + "return_type" : "type-81", +@@ -28938,7 +28980,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3938" ++ "referenced_type" : "type-3890" + } + ], + "return_type" : "type-81", +@@ -28951,7 +28993,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3938" ++ "referenced_type" : "type-3890" + } + ], + "return_type" : "type-81", +@@ -28964,7 +29006,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3938" ++ "referenced_type" : "type-3890" + } + ], + "return_type" : "type-81", +@@ -29038,13 +29080,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3941" ++ "referenced_type" : "type-3893" + }, + { +- "referenced_type" : "type-4611" ++ "referenced_type" : "type-4563" + }, + { +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-12", +@@ -29057,13 +29099,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3941" ++ "referenced_type" : "type-3893" + }, + { +- "referenced_type" : "type-3928" ++ "referenced_type" : "type-3880" + }, + { +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-12", +@@ -29076,13 +29118,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3941" ++ "referenced_type" : "type-3893" + }, + { +- "referenced_type" : "type-3928" ++ "referenced_type" : "type-3880" + }, + { +- "referenced_type" : "type-3936" ++ "referenced_type" : "type-3888" + } + ], + "return_type" : "type-12", +@@ -29095,13 +29137,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3941" ++ "referenced_type" : "type-3893" + }, + { +- "referenced_type" : "type-3928" ++ "referenced_type" : "type-3880" + }, + { +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-12", +@@ -29114,16 +29156,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3941" ++ "referenced_type" : "type-3893" + }, + { +- "referenced_type" : "type-3928" ++ "referenced_type" : "type-3880" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-12", +@@ -29136,13 +29178,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3941" ++ "referenced_type" : "type-3893" + }, + { +- "referenced_type" : "type-3928" ++ "referenced_type" : "type-3880" + }, + { +- "referenced_type" : "type-3920" ++ "referenced_type" : "type-3872" + } + ], + "return_type" : "type-12", +@@ -29155,7 +29197,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3941" ++ "referenced_type" : "type-3893" + }, + { + "referenced_type" : "type-167" +@@ -29174,7 +29216,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3941" ++ "referenced_type" : "type-3893" + }, + { + "referenced_type" : "type-167" +@@ -29193,7 +29235,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3941" ++ "referenced_type" : "type-3893" + } + ], + "return_type" : "type-81", +@@ -29206,7 +29248,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3941" ++ "referenced_type" : "type-3893" + } + ], + "return_type" : "type-81", +@@ -29219,7 +29261,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3941" ++ "referenced_type" : "type-3893" + } + ], + "return_type" : "type-81", +@@ -29232,7 +29274,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3941" ++ "referenced_type" : "type-3893" + } + ], + "return_type" : "type-81", +@@ -29245,7 +29287,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3941" ++ "referenced_type" : "type-3893" + } + ], + "return_type" : "type-81", +@@ -29281,15 +29323,15 @@ + "parameters" : + [ + { +- "referenced_type" : "type-4615" ++ "referenced_type" : "type-4567" + }, + { +- "referenced_type" : "type-4616" ++ "referenced_type" : "type-4568" + } + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h", +- "template_args" : [ "type-4617" ] ++ "template_args" : [ "type-4569" ] + }, + { + "function_name" : "google::protobuf::FieldOptions_JSType_IsValid", +@@ -29306,7 +29348,7 @@ + { + "function_name" : "google::protobuf::Field_Cardinality_descriptor", + "linker_set_key" : "_ZN6google8protobuf28Field_Cardinality_descriptorEv", +- "return_type" : "type-1980", ++ "return_type" : "type-1906", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -29317,7 +29359,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1926" ++ "referenced_type" : "type-1847" + } + ], + "return_type" : "type-81", +@@ -29331,7 +29373,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1926" ++ "referenced_type" : "type-1847" + } + ], + "return_type" : "type-81", +@@ -29340,7 +29382,7 @@ + { + "function_name" : "google::protobuf::GeneratedCodeInfo_Annotation::descriptor", + "linker_set_key" : "_ZN6google8protobuf28GeneratedCodeInfo_Annotation10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -29351,10 +29393,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1926" ++ "referenced_type" : "type-1847" + }, + { +- "referenced_type" : "type-1926" ++ "referenced_type" : "type-1847" + } + ], + "return_type" : "type-81", +@@ -29363,7 +29405,7 @@ + { + "function_name" : "google::protobuf::GeneratedCodeInfo_Annotation::default_instance", + "linker_set_key" : "_ZN6google8protobuf28GeneratedCodeInfo_Annotation16default_instanceEv", +- "return_type" : "type-2136", ++ "return_type" : "type-2067", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -29374,7 +29416,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1926" ++ "referenced_type" : "type-1847" + } + ], + "return_type" : "type-81", +@@ -29387,7 +29429,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1926" ++ "referenced_type" : "type-1847" + }, + { + "referenced_type" : "type-612" +@@ -29403,10 +29445,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1926" ++ "referenced_type" : "type-1847" + }, + { +- "referenced_type" : "type-1926" ++ "referenced_type" : "type-1847" + } + ], + "return_type" : "type-81", +@@ -29419,7 +29461,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1926" ++ "referenced_type" : "type-1847" + } + ], + "return_type" : "type-81", +@@ -29432,10 +29474,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1926" ++ "referenced_type" : "type-1847" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -29448,10 +29490,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1926" ++ "referenced_type" : "type-1847" + }, + { +- "referenced_type" : "type-2136" ++ "referenced_type" : "type-2067" + } + ], + "return_type" : "type-81", +@@ -29464,10 +29506,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1926" ++ "referenced_type" : "type-1847" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -29480,10 +29522,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1926" ++ "referenced_type" : "type-1847" + }, + { +- "referenced_type" : "type-2136" ++ "referenced_type" : "type-2067" + } + ], + "return_type" : "type-81", +@@ -29496,10 +29538,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1926" ++ "referenced_type" : "type-1847" + }, + { +- "referenced_type" : "type-2136" ++ "referenced_type" : "type-2067" + } + ], + "return_type" : "type-81", +@@ -29512,7 +29554,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1926" ++ "referenced_type" : "type-1847" + } + ], + "return_type" : "type-81", +@@ -29525,10 +29567,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1926" ++ "referenced_type" : "type-1847" + }, + { +- "referenced_type" : "type-2136" ++ "referenced_type" : "type-2067" + } + ], + "return_type" : "type-81", +@@ -29541,7 +29583,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1926" ++ "referenced_type" : "type-1847" + } + ], + "return_type" : "type-81", +@@ -29554,7 +29596,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1926" ++ "referenced_type" : "type-1847" + } + ], + "return_type" : "type-81", +@@ -29567,7 +29609,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1926" ++ "referenced_type" : "type-1847" + } + ], + "return_type" : "type-81", +@@ -29580,7 +29622,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1926" ++ "referenced_type" : "type-1847" + } + ], + "return_type" : "type-81", +@@ -29594,7 +29636,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1918" ++ "referenced_type" : "type-1839" + } + ], + "return_type" : "type-81", +@@ -29608,7 +29650,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1918" ++ "referenced_type" : "type-1839" + } + ], + "return_type" : "type-81", +@@ -29617,7 +29659,7 @@ + { + "function_name" : "google::protobuf::UninterpretedOption_NamePart::descriptor", + "linker_set_key" : "_ZN6google8protobuf28UninterpretedOption_NamePart10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -29628,10 +29670,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1918" ++ "referenced_type" : "type-1839" + }, + { +- "referenced_type" : "type-1918" ++ "referenced_type" : "type-1839" + } + ], + "return_type" : "type-81", +@@ -29640,7 +29682,7 @@ + { + "function_name" : "google::protobuf::UninterpretedOption_NamePart::default_instance", + "linker_set_key" : "_ZN6google8protobuf28UninterpretedOption_NamePart16default_instanceEv", +- "return_type" : "type-2122", ++ "return_type" : "type-2055", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -29651,7 +29693,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1918" ++ "referenced_type" : "type-1839" + } + ], + "return_type" : "type-81", +@@ -29664,7 +29706,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1918" ++ "referenced_type" : "type-1839" + }, + { + "referenced_type" : "type-612" +@@ -29680,10 +29722,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1918" ++ "referenced_type" : "type-1839" + }, + { +- "referenced_type" : "type-1918" ++ "referenced_type" : "type-1839" + } + ], + "return_type" : "type-81", +@@ -29696,7 +29738,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1918" ++ "referenced_type" : "type-1839" + } + ], + "return_type" : "type-81", +@@ -29709,10 +29751,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1918" ++ "referenced_type" : "type-1839" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -29725,10 +29767,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1918" ++ "referenced_type" : "type-1839" + }, + { +- "referenced_type" : "type-2122" ++ "referenced_type" : "type-2055" + } + ], + "return_type" : "type-81", +@@ -29741,10 +29783,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1918" ++ "referenced_type" : "type-1839" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -29757,10 +29799,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1918" ++ "referenced_type" : "type-1839" + }, + { +- "referenced_type" : "type-2122" ++ "referenced_type" : "type-2055" + } + ], + "return_type" : "type-81", +@@ -29773,10 +29815,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1918" ++ "referenced_type" : "type-1839" + }, + { +- "referenced_type" : "type-2122" ++ "referenced_type" : "type-2055" + } + ], + "return_type" : "type-81", +@@ -29789,7 +29831,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1918" ++ "referenced_type" : "type-1839" + } + ], + "return_type" : "type-81", +@@ -29802,10 +29844,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1918" ++ "referenced_type" : "type-1839" + }, + { +- "referenced_type" : "type-2122" ++ "referenced_type" : "type-2055" + } + ], + "return_type" : "type-81", +@@ -29818,7 +29860,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1918" ++ "referenced_type" : "type-1839" + } + ], + "return_type" : "type-81", +@@ -29831,7 +29873,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1918" ++ "referenced_type" : "type-1839" + } + ], + "return_type" : "type-81", +@@ -29844,7 +29886,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1918" ++ "referenced_type" : "type-1839" + } + ], + "return_type" : "type-81", +@@ -29857,7 +29899,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1918" ++ "referenced_type" : "type-1839" + } + ], + "return_type" : "type-81", +@@ -29871,7 +29913,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1902" ++ "referenced_type" : "type-1821" + } + ], + "return_type" : "type-81", +@@ -29885,7 +29927,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1902" ++ "referenced_type" : "type-1821" + } + ], + "return_type" : "type-81", +@@ -29894,7 +29936,7 @@ + { + "function_name" : "google::protobuf::DescriptorProto_ReservedRange::descriptor", + "linker_set_key" : "_ZN6google8protobuf29DescriptorProto_ReservedRange10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -29905,10 +29947,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1902" ++ "referenced_type" : "type-1821" + }, + { +- "referenced_type" : "type-1902" ++ "referenced_type" : "type-1821" + } + ], + "return_type" : "type-81", +@@ -29917,7 +29959,7 @@ + { + "function_name" : "google::protobuf::DescriptorProto_ReservedRange::default_instance", + "linker_set_key" : "_ZN6google8protobuf29DescriptorProto_ReservedRange16default_instanceEv", +- "return_type" : "type-2101", ++ "return_type" : "type-2034", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -29928,7 +29970,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1902" ++ "referenced_type" : "type-1821" + } + ], + "return_type" : "type-81", +@@ -29941,7 +29983,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1902" ++ "referenced_type" : "type-1821" + }, + { + "referenced_type" : "type-612" +@@ -29957,10 +29999,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1902" ++ "referenced_type" : "type-1821" + }, + { +- "referenced_type" : "type-1902" ++ "referenced_type" : "type-1821" + } + ], + "return_type" : "type-81", +@@ -29973,7 +30015,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1902" ++ "referenced_type" : "type-1821" + } + ], + "return_type" : "type-81", +@@ -29986,10 +30028,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1902" ++ "referenced_type" : "type-1821" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -30002,10 +30044,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1902" ++ "referenced_type" : "type-1821" + }, + { +- "referenced_type" : "type-2101" ++ "referenced_type" : "type-2034" + } + ], + "return_type" : "type-81", +@@ -30018,10 +30060,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1902" ++ "referenced_type" : "type-1821" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -30034,10 +30076,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1902" ++ "referenced_type" : "type-1821" + }, + { +- "referenced_type" : "type-2101" ++ "referenced_type" : "type-2034" + } + ], + "return_type" : "type-81", +@@ -30050,10 +30092,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1902" ++ "referenced_type" : "type-1821" + }, + { +- "referenced_type" : "type-2101" ++ "referenced_type" : "type-2034" + } + ], + "return_type" : "type-81", +@@ -30066,7 +30108,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1902" ++ "referenced_type" : "type-1821" + } + ], + "return_type" : "type-81", +@@ -30079,10 +30121,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1902" ++ "referenced_type" : "type-1821" + }, + { +- "referenced_type" : "type-2101" ++ "referenced_type" : "type-2034" + } + ], + "return_type" : "type-81", +@@ -30095,7 +30137,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1902" ++ "referenced_type" : "type-1821" + } + ], + "return_type" : "type-81", +@@ -30108,7 +30150,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1902" ++ "referenced_type" : "type-1821" + } + ], + "return_type" : "type-81", +@@ -30121,7 +30163,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1902" ++ "referenced_type" : "type-1821" + } + ], + "return_type" : "type-81", +@@ -30134,7 +30176,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1902" ++ "referenced_type" : "type-1821" + } + ], + "return_type" : "type-81", +@@ -30143,7 +30185,7 @@ + { + "function_name" : "google::protobuf::FieldOptions_CType_descriptor", + "linker_set_key" : "_ZN6google8protobuf29FieldOptions_CType_descriptorEv", +- "return_type" : "type-1980", ++ "return_type" : "type-1906", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -30153,7 +30195,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3876" ++ "referenced_type" : "type-3828" + } + ], + "return_type" : "type-81", +@@ -30166,7 +30208,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3876" ++ "referenced_type" : "type-3828" + } + ], + "return_type" : "type-81", +@@ -30179,7 +30221,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3876" ++ "referenced_type" : "type-3828" + } + ], + "return_type" : "type-81", +@@ -30207,7 +30249,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1590" ++ "referenced_type" : "type-1508" + }, + { + "referenced_type" : "type-201" +@@ -30226,7 +30268,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1590" ++ "referenced_type" : "type-1508" + }, + { + "referenced_type" : "type-1" +@@ -30242,7 +30284,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1590" ++ "referenced_type" : "type-1508" + } + ], + "return_type" : "type-12", +@@ -30255,7 +30297,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1590" ++ "referenced_type" : "type-1508" + }, + { + "referenced_type" : "type-1" +@@ -30271,7 +30313,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1590" ++ "referenced_type" : "type-1508" + }, + { + "referenced_type" : "type-1" +@@ -30287,7 +30329,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1590" ++ "referenced_type" : "type-1508" + } + ], + "return_type" : "type-81", +@@ -30300,7 +30342,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1590" ++ "referenced_type" : "type-1508" + } + ], + "return_type" : "type-81", +@@ -30313,7 +30355,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1590" ++ "referenced_type" : "type-1508" + } + ], + "return_type" : "type-81", +@@ -30326,7 +30368,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1587" ++ "referenced_type" : "type-1505" + }, + { + "referenced_type" : "type-659" +@@ -30345,7 +30387,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1587" ++ "referenced_type" : "type-1505" + }, + { + "referenced_type" : "type-1" +@@ -30361,7 +30403,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1587" ++ "referenced_type" : "type-1505" + } + ], + "return_type" : "type-12", +@@ -30374,7 +30416,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1587" ++ "referenced_type" : "type-1505" + }, + { + "referenced_type" : "type-1" +@@ -30390,7 +30432,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1587" ++ "referenced_type" : "type-1505" + }, + { + "referenced_type" : "type-1" +@@ -30410,7 +30452,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1587" ++ "referenced_type" : "type-1505" + }, + { + "referenced_type" : "type-1" +@@ -30430,7 +30472,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1587" ++ "referenced_type" : "type-1505" + } + ], + "return_type" : "type-81", +@@ -30443,7 +30485,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1587" ++ "referenced_type" : "type-1505" + } + ], + "return_type" : "type-81", +@@ -30456,7 +30498,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1587" ++ "referenced_type" : "type-1505" + } + ], + "return_type" : "type-81", +@@ -30470,7 +30512,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11183" ++ "referenced_type" : "type-11135" + }, + { + "referenced_type" : "type-659" +@@ -30489,7 +30531,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11183" ++ "referenced_type" : "type-11135" + }, + { + "referenced_type" : "type-659" +@@ -30508,7 +30550,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11183" ++ "referenced_type" : "type-11135" + }, + { + "referenced_type" : "type-1" +@@ -30524,7 +30566,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11183" ++ "referenced_type" : "type-11135" + }, + { + "referenced_type" : "type-1" +@@ -30541,7 +30583,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11183" ++ "referenced_type" : "type-11135" + }, + { + "referenced_type" : "type-1" +@@ -30557,14 +30599,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11183" ++ "referenced_type" : "type-11135" + }, + { + "referenced_type" : "type-793" + }, + { + "default_arg" : true, +- "referenced_type" : "type-11180" ++ "referenced_type" : "type-11132" + }, + { + "default_arg" : true, +@@ -30581,14 +30623,14 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11183" ++ "referenced_type" : "type-11135" + }, + { + "referenced_type" : "type-793" + }, + { + "default_arg" : true, +- "referenced_type" : "type-11180" ++ "referenced_type" : "type-11132" + }, + { + "default_arg" : true, +@@ -30605,7 +30647,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11183" ++ "referenced_type" : "type-11135" + } + ], + "return_type" : "type-81", +@@ -30618,7 +30660,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11183" ++ "referenced_type" : "type-11135" + } + ], + "return_type" : "type-81", +@@ -30631,7 +30673,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11183" ++ "referenced_type" : "type-11135" + } + ], + "return_type" : "type-81", +@@ -30644,7 +30686,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1639" ++ "referenced_type" : "type-1552" + }, + { + "referenced_type" : "type-659" +@@ -30663,7 +30705,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1639" ++ "referenced_type" : "type-1552" + }, + { + "referenced_type" : "type-1" +@@ -30679,7 +30721,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1639" ++ "referenced_type" : "type-1552" + }, + { + "referenced_type" : "type-1" +@@ -30695,7 +30737,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1639" ++ "referenced_type" : "type-1552" + }, + { + "referenced_type" : "type-167" +@@ -30718,7 +30760,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1639" ++ "referenced_type" : "type-1552" + }, + { + "referenced_type" : "type-167" +@@ -30741,7 +30783,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1639" ++ "referenced_type" : "type-1552" + } + ], + "return_type" : "type-81", +@@ -30754,7 +30796,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1639" ++ "referenced_type" : "type-1552" + } + ], + "return_type" : "type-81", +@@ -30767,7 +30809,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1639" ++ "referenced_type" : "type-1552" + } + ], + "return_type" : "type-81", +@@ -31183,7 +31225,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1596" ++ "referenced_type" : "type-1514" + } + ], + "return_type" : "type-12", +@@ -31196,7 +31238,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1596" ++ "referenced_type" : "type-1514" + }, + { + "referenced_type" : "type-167" +@@ -31215,7 +31257,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1596" ++ "referenced_type" : "type-1514" + }, + { + "referenced_type" : "type-1" +@@ -31231,7 +31273,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1596" ++ "referenced_type" : "type-1514" + }, + { + "referenced_type" : "type-1" +@@ -31247,7 +31289,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1596" ++ "referenced_type" : "type-1514" + } + ], + "return_type" : "type-81", +@@ -31260,7 +31302,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1596" ++ "referenced_type" : "type-1514" + } + ], + "return_type" : "type-81", +@@ -31273,7 +31315,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1596" ++ "referenced_type" : "type-1514" + } + ], + "return_type" : "type-81", +@@ -31286,7 +31328,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1593" ++ "referenced_type" : "type-1511" + }, + { + "referenced_type" : "type-577" +@@ -31305,7 +31347,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1593" ++ "referenced_type" : "type-1511" + } + ], + "return_type" : "type-12", +@@ -31318,7 +31360,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1593" ++ "referenced_type" : "type-1511" + } + ], + "return_type" : "type-12", +@@ -31331,7 +31373,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1593" ++ "referenced_type" : "type-1511" + }, + { + "referenced_type" : "type-1" +@@ -31347,7 +31389,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1593" ++ "referenced_type" : "type-1511" + }, + { + "referenced_type" : "type-1" +@@ -31367,7 +31409,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1593" ++ "referenced_type" : "type-1511" + }, + { + "referenced_type" : "type-1" +@@ -31387,7 +31429,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1593" ++ "referenced_type" : "type-1511" + } + ], + "return_type" : "type-81", +@@ -31400,7 +31442,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1593" ++ "referenced_type" : "type-1511" + } + ], + "return_type" : "type-81", +@@ -31413,7 +31455,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1593" ++ "referenced_type" : "type-1511" + } + ], + "return_type" : "type-81", +@@ -31427,13 +31469,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11191" ++ "referenced_type" : "type-11143" + }, + { + "referenced_type" : "type-741" + }, + { +- "referenced_type" : "type-11193" ++ "referenced_type" : "type-11145" + } + ], + "return_type" : "type-81", +@@ -31446,7 +31488,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11191" ++ "referenced_type" : "type-11143" + }, + { + "referenced_type" : "type-577" +@@ -31465,7 +31507,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11191" ++ "referenced_type" : "type-11143" + } + ], + "return_type" : "type-12", +@@ -31478,7 +31520,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11191" ++ "referenced_type" : "type-11143" + } + ], + "return_type" : "type-12", +@@ -31491,7 +31533,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11191" ++ "referenced_type" : "type-11143" + }, + { + "referenced_type" : "type-1" +@@ -31508,7 +31550,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11191" ++ "referenced_type" : "type-11143" + }, + { + "referenced_type" : "type-1" +@@ -31524,7 +31566,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11190" ++ "referenced_type" : "type-11142" + } + ], + "return_type" : "type-81", +@@ -31537,7 +31579,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11190" ++ "referenced_type" : "type-11142" + } + ], + "return_type" : "type-81", +@@ -31550,7 +31592,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11191" ++ "referenced_type" : "type-11143" + }, + { + "referenced_type" : "type-741" +@@ -31566,13 +31608,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11191" ++ "referenced_type" : "type-11143" + }, + { + "referenced_type" : "type-741" + }, + { +- "referenced_type" : "type-11193" ++ "referenced_type" : "type-11145" + } + ], + "return_type" : "type-81", +@@ -31585,7 +31627,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11191" ++ "referenced_type" : "type-11143" + }, + { + "referenced_type" : "type-741" +@@ -31601,13 +31643,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11191" ++ "referenced_type" : "type-11143" + }, + { + "referenced_type" : "type-741" + }, + { +- "referenced_type" : "type-11193" ++ "referenced_type" : "type-11145" + } + ], + "return_type" : "type-81", +@@ -31620,7 +31662,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11191" ++ "referenced_type" : "type-11143" + } + ], + "return_type" : "type-81", +@@ -31633,7 +31675,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11191" ++ "referenced_type" : "type-11143" + } + ], + "return_type" : "type-81", +@@ -31646,7 +31688,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11191" ++ "referenced_type" : "type-11143" + } + ], + "return_type" : "type-81", +@@ -31659,7 +31701,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1642" ++ "referenced_type" : "type-1556" + }, + { + "referenced_type" : "type-577" +@@ -31678,7 +31720,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1642" ++ "referenced_type" : "type-1556" + }, + { + "referenced_type" : "type-1" +@@ -31694,7 +31736,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1642" ++ "referenced_type" : "type-1556" + }, + { + "referenced_type" : "type-201" +@@ -31717,7 +31759,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1642" ++ "referenced_type" : "type-1556" + }, + { + "referenced_type" : "type-201" +@@ -31740,7 +31782,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1642" ++ "referenced_type" : "type-1556" + } + ], + "return_type" : "type-81", +@@ -31753,7 +31795,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1642" ++ "referenced_type" : "type-1556" + } + ], + "return_type" : "type-81", +@@ -31766,7 +31808,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1642" ++ "referenced_type" : "type-1556" + } + ], + "return_type" : "type-81", +@@ -32197,7 +32239,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1605" ++ "referenced_type" : "type-1522" + }, + { + "referenced_type" : "type-201" +@@ -32216,10 +32258,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1605" ++ "referenced_type" : "type-1522" + }, + { +- "referenced_type" : "type-1599" ++ "referenced_type" : "type-1517" + } + ], + "return_type" : "type-81", +@@ -32232,10 +32274,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1605" ++ "referenced_type" : "type-1522" + }, + { +- "referenced_type" : "type-1599" ++ "referenced_type" : "type-1517" + } + ], + "return_type" : "type-81", +@@ -32248,7 +32290,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1605" ++ "referenced_type" : "type-1522" + } + ], + "return_type" : "type-81", +@@ -32261,7 +32303,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1605" ++ "referenced_type" : "type-1522" + } + ], + "return_type" : "type-81", +@@ -32274,7 +32316,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1605" ++ "referenced_type" : "type-1522" + } + ], + "return_type" : "type-81", +@@ -32287,7 +32329,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1601" ++ "referenced_type" : "type-1519" + }, + { + "referenced_type" : "type-659" +@@ -32306,7 +32348,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1601" ++ "referenced_type" : "type-1519" + }, + { + "referenced_type" : "type-1" +@@ -32322,7 +32364,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1601" ++ "referenced_type" : "type-1519" + }, + { + "referenced_type" : "type-1" +@@ -32338,10 +32380,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1601" ++ "referenced_type" : "type-1519" + }, + { +- "referenced_type" : "type-1599" ++ "referenced_type" : "type-1517" + }, + { + "default_arg" : true, +@@ -32358,10 +32400,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1601" ++ "referenced_type" : "type-1519" + }, + { +- "referenced_type" : "type-1599" ++ "referenced_type" : "type-1517" + }, + { + "default_arg" : true, +@@ -32378,7 +32420,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1601" ++ "referenced_type" : "type-1519" + } + ], + "return_type" : "type-81", +@@ -32391,7 +32433,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1601" ++ "referenced_type" : "type-1519" + } + ], + "return_type" : "type-81", +@@ -32404,7 +32446,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1601" ++ "referenced_type" : "type-1519" + } + ], + "return_type" : "type-81", +@@ -32417,7 +32459,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1645" ++ "referenced_type" : "type-1559" + }, + { + "referenced_type" : "type-577" +@@ -32436,7 +32478,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1645" ++ "referenced_type" : "type-1559" + }, + { + "referenced_type" : "type-1" +@@ -32453,10 +32495,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1645" ++ "referenced_type" : "type-1559" + }, + { +- "referenced_type" : "type-1658" ++ "referenced_type" : "type-1571" + } + ], + "return_type" : "type-81", +@@ -32469,10 +32511,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1645" ++ "referenced_type" : "type-1559" + }, + { +- "referenced_type" : "type-1658" ++ "referenced_type" : "type-1571" + } + ], + "return_type" : "type-81", +@@ -32485,10 +32527,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1645" ++ "referenced_type" : "type-1559" + }, + { +- "referenced_type" : "type-1658" ++ "referenced_type" : "type-1571" + } + ], + "return_type" : "type-81", +@@ -32501,7 +32543,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1645" ++ "referenced_type" : "type-1559" + } + ], + "return_type" : "type-81", +@@ -32514,7 +32556,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1645" ++ "referenced_type" : "type-1559" + } + ], + "return_type" : "type-81", +@@ -32527,7 +32569,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1645" ++ "referenced_type" : "type-1559" + } + ], + "return_type" : "type-81", +@@ -32579,7 +32621,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1622" ++ "referenced_type" : "type-1540" + }, + { + "referenced_type" : "type-659" +@@ -32598,7 +32640,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1622" ++ "referenced_type" : "type-1540" + }, + { + "referenced_type" : "type-1" +@@ -32614,7 +32656,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1622" ++ "referenced_type" : "type-1540" + }, + { + "referenced_type" : "type-1" +@@ -32630,7 +32672,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1622" ++ "referenced_type" : "type-1540" + }, + { + "referenced_type" : "type-793" +@@ -32649,7 +32691,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1622" ++ "referenced_type" : "type-1540" + }, + { + "referenced_type" : "type-793" +@@ -32668,7 +32710,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1622" ++ "referenced_type" : "type-1540" + } + ], + "return_type" : "type-81", +@@ -32681,7 +32723,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1622" ++ "referenced_type" : "type-1540" + } + ], + "return_type" : "type-81", +@@ -32694,7 +32736,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1622" ++ "referenced_type" : "type-1540" + } + ], + "return_type" : "type-81", +@@ -32707,7 +32749,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1614" ++ "referenced_type" : "type-1530" + }, + { + "referenced_type" : "type-167" +@@ -32726,10 +32768,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1614" ++ "referenced_type" : "type-1530" + }, + { +- "referenced_type" : "type-1608" ++ "referenced_type" : "type-1525" + } + ], + "return_type" : "type-81", +@@ -32742,10 +32784,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1614" ++ "referenced_type" : "type-1530" + }, + { +- "referenced_type" : "type-1608" ++ "referenced_type" : "type-1525" + } + ], + "return_type" : "type-81", +@@ -32758,7 +32800,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1614" ++ "referenced_type" : "type-1530" + } + ], + "return_type" : "type-81", +@@ -32771,7 +32813,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1614" ++ "referenced_type" : "type-1530" + } + ], + "return_type" : "type-81", +@@ -32784,7 +32826,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1614" ++ "referenced_type" : "type-1530" + } + ], + "return_type" : "type-81", +@@ -32797,7 +32839,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1610" ++ "referenced_type" : "type-1527" + }, + { + "referenced_type" : "type-577" +@@ -32816,7 +32858,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1610" ++ "referenced_type" : "type-1527" + }, + { + "referenced_type" : "type-1" +@@ -32832,10 +32874,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1610" ++ "referenced_type" : "type-1527" + }, + { +- "referenced_type" : "type-1608" ++ "referenced_type" : "type-1525" + }, + { + "default_arg" : true, +@@ -32852,10 +32894,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1610" ++ "referenced_type" : "type-1527" + }, + { +- "referenced_type" : "type-1608" ++ "referenced_type" : "type-1525" + }, + { + "default_arg" : true, +@@ -32872,7 +32914,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1610" ++ "referenced_type" : "type-1527" + } + ], + "return_type" : "type-81", +@@ -32885,7 +32927,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1610" ++ "referenced_type" : "type-1527" + } + ], + "return_type" : "type-81", +@@ -32898,7 +32940,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1610" ++ "referenced_type" : "type-1527" + } + ], + "return_type" : "type-81", +@@ -33008,7 +33050,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1648" ++ "referenced_type" : "type-1562" + }, + { + "referenced_type" : "type-577" +@@ -33027,10 +33069,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1648" ++ "referenced_type" : "type-1562" + }, + { +- "referenced_type" : "type-1656" ++ "referenced_type" : "type-1569" + } + ], + "return_type" : "type-81", +@@ -33043,10 +33085,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1648" ++ "referenced_type" : "type-1562" + }, + { +- "referenced_type" : "type-1656" ++ "referenced_type" : "type-1569" + } + ], + "return_type" : "type-81", +@@ -33059,7 +33101,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1648" ++ "referenced_type" : "type-1562" + } + ], + "return_type" : "type-81", +@@ -33072,7 +33114,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1648" ++ "referenced_type" : "type-1562" + } + ], + "return_type" : "type-81", +@@ -33085,7 +33127,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1648" ++ "referenced_type" : "type-1562" + } + ], + "return_type" : "type-81", +@@ -33098,7 +33140,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1618" ++ "referenced_type" : "type-1534" + }, + { + "referenced_type" : "type-659" +@@ -33117,7 +33159,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1618" ++ "referenced_type" : "type-1534" + }, + { + "referenced_type" : "type-1" +@@ -33133,7 +33175,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1618" ++ "referenced_type" : "type-1534" + }, + { + "referenced_type" : "type-1" +@@ -33149,10 +33191,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1618" ++ "referenced_type" : "type-1534" + }, + { +- "referenced_type" : "type-1616" ++ "referenced_type" : "type-1532" + }, + { + "referenced_type" : "type-1" +@@ -33168,10 +33210,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1618" ++ "referenced_type" : "type-1534" + }, + { +- "referenced_type" : "type-1616" ++ "referenced_type" : "type-1532" + }, + { + "referenced_type" : "type-1" +@@ -33187,7 +33229,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1618" ++ "referenced_type" : "type-1534" + } + ], + "return_type" : "type-81", +@@ -33200,7 +33242,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1618" ++ "referenced_type" : "type-1534" + } + ], + "return_type" : "type-81", +@@ -33213,7 +33255,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1618" ++ "referenced_type" : "type-1534" + } + ], + "return_type" : "type-81", +@@ -33554,13 +33596,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11208" ++ "referenced_type" : "type-11160" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11219" ++ "referenced_type" : "type-11171" + } + ], + "return_type" : "type-12", +@@ -33573,7 +33615,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11208" ++ "referenced_type" : "type-11160" + }, + { + "referenced_type" : "type-5" +@@ -33589,7 +33631,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11208" ++ "referenced_type" : "type-11160" + }, + { + "referenced_type" : "type-5" +@@ -33598,7 +33640,7 @@ + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + } + ], + "return_type" : "type-81", +@@ -33611,7 +33653,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11208" ++ "referenced_type" : "type-11160" + }, + { + "referenced_type" : "type-5" +@@ -33620,13 +33662,13 @@ + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + } + ], + "return_type" : "type-81", +@@ -33639,7 +33681,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11208" ++ "referenced_type" : "type-11160" + }, + { + "referenced_type" : "type-5" +@@ -33648,19 +33690,19 @@ + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + } + ], + "return_type" : "type-81", +@@ -33673,7 +33715,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11208" ++ "referenced_type" : "type-11160" + }, + { + "referenced_type" : "type-5" +@@ -33682,25 +33724,25 @@ + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + } + ], + "return_type" : "type-81", +@@ -33713,7 +33755,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11208" ++ "referenced_type" : "type-11160" + }, + { + "referenced_type" : "type-5" +@@ -33722,31 +33764,31 @@ + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + } + ], + "return_type" : "type-81", +@@ -33759,7 +33801,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11208" ++ "referenced_type" : "type-11160" + }, + { + "referenced_type" : "type-5" +@@ -33768,37 +33810,37 @@ + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + } + ], + "return_type" : "type-81", +@@ -33811,7 +33853,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11208" ++ "referenced_type" : "type-11160" + }, + { + "referenced_type" : "type-5" +@@ -33820,43 +33862,43 @@ + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + } + ], + "return_type" : "type-81", +@@ -33869,7 +33911,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11208" ++ "referenced_type" : "type-11160" + }, + { + "referenced_type" : "type-5" +@@ -33878,49 +33920,49 @@ + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + } + ], + "return_type" : "type-81", +@@ -33933,10 +33975,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11208" ++ "referenced_type" : "type-11160" + }, + { +- "referenced_type" : "type-11211" ++ "referenced_type" : "type-11163" + }, + { + "referenced_type" : "type-5" +@@ -33952,7 +33994,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11208" ++ "referenced_type" : "type-11160" + } + ], + "return_type" : "type-81", +@@ -33965,7 +34007,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11208" ++ "referenced_type" : "type-11160" + } + ], + "return_type" : "type-81", +@@ -33979,7 +34021,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11208" ++ "referenced_type" : "type-11160" + }, + { + "referenced_type" : "type-5" +@@ -33988,10 +34030,10 @@ + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + }, + { +- "referenced_type" : "type-11218" ++ "referenced_type" : "type-11170" + } + ], + "return_type" : "type-81", +@@ -34004,7 +34046,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11208" ++ "referenced_type" : "type-11160" + }, + { + "referenced_type" : "type-5" +@@ -34020,10 +34062,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11208" ++ "referenced_type" : "type-11160" + }, + { +- "referenced_type" : "type-11200" ++ "referenced_type" : "type-11152" + } + ], + "return_type" : "type-81", +@@ -34036,7 +34078,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11208" ++ "referenced_type" : "type-11160" + }, + { + "referenced_type" : "type-5" +@@ -34055,7 +34097,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11208" ++ "referenced_type" : "type-11160" + }, + { + "referenced_type" : "type-741" +@@ -34074,7 +34116,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11208" ++ "referenced_type" : "type-11160" + }, + { + "referenced_type" : "type-741" +@@ -34083,7 +34125,7 @@ + "referenced_type" : "type-7" + }, + { +- "referenced_type" : "type-11202" ++ "referenced_type" : "type-11154" + } + ], + "return_type" : "type-81", +@@ -34096,7 +34138,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11208" ++ "referenced_type" : "type-11160" + }, + { + "referenced_type" : "type-741" +@@ -34115,7 +34157,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11208" ++ "referenced_type" : "type-11160" + }, + { + "referenced_type" : "type-741" +@@ -34124,7 +34166,7 @@ + "referenced_type" : "type-7" + }, + { +- "referenced_type" : "type-11202" ++ "referenced_type" : "type-11154" + } + ], + "return_type" : "type-81", +@@ -34137,7 +34179,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11208" ++ "referenced_type" : "type-11160" + } + ], + "return_type" : "type-81", +@@ -34150,7 +34192,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11208" ++ "referenced_type" : "type-11160" + } + ], + "return_type" : "type-81", +@@ -34162,7 +34204,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-11234" ++ "referenced_type" : "type-11186" + } + ], + "return_type" : "type-98", +@@ -34174,7 +34216,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-11234" ++ "referenced_type" : "type-11186" + } + ], + "return_type" : "type-12", +@@ -34186,7 +34228,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-11234" ++ "referenced_type" : "type-11186" + }, + { + "referenced_type" : "type-91" +@@ -34206,7 +34248,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3888" ++ "referenced_type" : "type-3840" + }, + { + "referenced_type" : "type-12" +@@ -34215,7 +34257,7 @@ + "referenced_type" : "type-12" + } + ], +- "return_type" : "type-3883", ++ "return_type" : "type-3835", + "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" + }, + { +@@ -34226,7 +34268,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3888" ++ "referenced_type" : "type-3840" + }, + { + "referenced_type" : "type-7" +@@ -34242,16 +34284,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3888" ++ "referenced_type" : "type-3840" + }, + { +- "referenced_type" : "type-11235" ++ "referenced_type" : "type-11187" + }, + { +- "referenced_type" : "type-11237" ++ "referenced_type" : "type-11189" + }, + { +- "referenced_type" : "type-11235" ++ "referenced_type" : "type-11187" + } + ], + "return_type" : "type-12", +@@ -34263,10 +34305,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-11234" ++ "referenced_type" : "type-11186" + }, + { +- "referenced_type" : "type-11235" ++ "referenced_type" : "type-11187" + } + ], + "return_type" : "type-81", +@@ -34280,10 +34322,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3888" ++ "referenced_type" : "type-3840" + }, + { +- "referenced_type" : "type-11235" ++ "referenced_type" : "type-11187" + } + ], + "return_type" : "type-81", +@@ -34297,10 +34339,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3888" ++ "referenced_type" : "type-3840" + }, + { +- "referenced_type" : "type-11235" ++ "referenced_type" : "type-11187" + } + ], + "return_type" : "type-81", +@@ -34314,10 +34356,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3888" ++ "referenced_type" : "type-3840" + } + ], +- "return_type" : "type-3889", ++ "return_type" : "type-3841", + "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" + }, + { +@@ -34327,7 +34369,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3888" ++ "referenced_type" : "type-3840" + } + ], + "return_type" : "type-12", +@@ -34341,7 +34383,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3888" ++ "referenced_type" : "type-3840" + } + ], + "return_type" : "type-81", +@@ -34355,7 +34397,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3888" ++ "referenced_type" : "type-3840" + } + ], + "return_type" : "type-81", +@@ -34368,13 +34410,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3888" ++ "referenced_type" : "type-3840" + }, + { + "referenced_type" : "type-793" + }, + { +- "referenced_type" : "type-3876" ++ "referenced_type" : "type-3828" + } + ], + "return_type" : "type-81", +@@ -34387,13 +34429,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3888" ++ "referenced_type" : "type-3840" + }, + { + "referenced_type" : "type-793" + }, + { +- "referenced_type" : "type-3876" ++ "referenced_type" : "type-3828" + } + ], + "return_type" : "type-81", +@@ -34406,7 +34448,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3888" ++ "referenced_type" : "type-3840" + } + ], + "return_type" : "type-81", +@@ -34419,7 +34461,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3888" ++ "referenced_type" : "type-3840" + } + ], + "return_type" : "type-81", +@@ -34433,7 +34475,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1894" ++ "referenced_type" : "type-1813" + } + ], + "return_type" : "type-81", +@@ -34447,7 +34489,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1894" ++ "referenced_type" : "type-1813" + } + ], + "return_type" : "type-81", +@@ -34456,7 +34498,7 @@ + { + "function_name" : "google::protobuf::DescriptorProto_ExtensionRange::descriptor", + "linker_set_key" : "_ZN6google8protobuf30DescriptorProto_ExtensionRange10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -34467,10 +34509,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1894" ++ "referenced_type" : "type-1813" + }, + { +- "referenced_type" : "type-1894" ++ "referenced_type" : "type-1813" + } + ], + "return_type" : "type-81", +@@ -34479,7 +34521,7 @@ + { + "function_name" : "google::protobuf::DescriptorProto_ExtensionRange::default_instance", + "linker_set_key" : "_ZN6google8protobuf30DescriptorProto_ExtensionRange16default_instanceEv", +- "return_type" : "type-2091", ++ "return_type" : "type-2024", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -34490,7 +34532,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1894" ++ "referenced_type" : "type-1813" + } + ], + "return_type" : "type-81", +@@ -34503,7 +34545,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1894" ++ "referenced_type" : "type-1813" + }, + { + "referenced_type" : "type-612" +@@ -34519,10 +34561,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1894" ++ "referenced_type" : "type-1813" + }, + { +- "referenced_type" : "type-1894" ++ "referenced_type" : "type-1813" + } + ], + "return_type" : "type-81", +@@ -34535,7 +34577,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1894" ++ "referenced_type" : "type-1813" + } + ], + "return_type" : "type-81", +@@ -34548,10 +34590,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1894" ++ "referenced_type" : "type-1813" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -34564,10 +34606,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1894" ++ "referenced_type" : "type-1813" + }, + { +- "referenced_type" : "type-2091" ++ "referenced_type" : "type-2024" + } + ], + "return_type" : "type-81", +@@ -34580,10 +34622,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1894" ++ "referenced_type" : "type-1813" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -34596,10 +34638,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1894" ++ "referenced_type" : "type-1813" + }, + { +- "referenced_type" : "type-2091" ++ "referenced_type" : "type-2024" + } + ], + "return_type" : "type-81", +@@ -34612,10 +34654,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1894" ++ "referenced_type" : "type-1813" + }, + { +- "referenced_type" : "type-2091" ++ "referenced_type" : "type-2024" + } + ], + "return_type" : "type-81", +@@ -34628,7 +34670,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1894" ++ "referenced_type" : "type-1813" + } + ], + "return_type" : "type-81", +@@ -34641,10 +34683,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1894" ++ "referenced_type" : "type-1813" + }, + { +- "referenced_type" : "type-2091" ++ "referenced_type" : "type-2024" + } + ], + "return_type" : "type-81", +@@ -34657,7 +34699,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1894" ++ "referenced_type" : "type-1813" + } + ], + "return_type" : "type-81", +@@ -34670,7 +34712,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1894" ++ "referenced_type" : "type-1813" + } + ], + "return_type" : "type-81", +@@ -34683,7 +34725,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1894" ++ "referenced_type" : "type-1813" + } + ], + "return_type" : "type-81", +@@ -34696,7 +34738,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1894" ++ "referenced_type" : "type-1813" + } + ], + "return_type" : "type-81", +@@ -34705,7 +34747,7 @@ + { + "function_name" : "google::protobuf::FieldOptions_JSType_descriptor", + "linker_set_key" : "_ZN6google8protobuf30FieldOptions_JSType_descriptorEv", +- "return_type" : "type-1980", ++ "return_type" : "type-1906", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -34762,19 +34804,19 @@ + { + "function_name" : "google::protobuf::FileOptions_OptimizeMode_descriptor", + "linker_set_key" : "_ZN6google8protobuf35FileOptions_OptimizeMode_descriptorEv", +- "return_type" : "type-1980", ++ "return_type" : "type-1906", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "function_name" : "google::protobuf::FieldDescriptorProto_Type_descriptor", + "linker_set_key" : "_ZN6google8protobuf36FieldDescriptorProto_Type_descriptorEv", +- "return_type" : "type-1980", ++ "return_type" : "type-1906", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "function_name" : "google::protobuf::FieldDescriptorProto_Label_descriptor", + "linker_set_key" : "_ZN6google8protobuf37FieldDescriptorProto_Label_descriptorEv", +- "return_type" : "type-1980", ++ "return_type" : "type-1906", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -34785,7 +34827,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1845" ++ "referenced_type" : "type-1758" + } + ], + "return_type" : "type-81", +@@ -34799,7 +34841,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1845" ++ "referenced_type" : "type-1758" + } + ], + "return_type" : "type-81", +@@ -34808,7 +34850,7 @@ + { + "function_name" : "google::protobuf::Any::descriptor", + "linker_set_key" : "_ZN6google8protobuf3Any10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/any.pb.h" + }, + { +@@ -34819,10 +34861,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1845" ++ "referenced_type" : "type-1758" + }, + { +- "referenced_type" : "type-1845" ++ "referenced_type" : "type-1758" + } + ], + "return_type" : "type-81", +@@ -34831,7 +34873,7 @@ + { + "function_name" : "google::protobuf::Any::default_instance", + "linker_set_key" : "_ZN6google8protobuf3Any16default_instanceEv", +- "return_type" : "type-2184", ++ "return_type" : "type-2115", + "source_file" : "/external/protobuf/src/google/protobuf/any.pb.h" + }, + { +@@ -34842,7 +34884,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1845" ++ "referenced_type" : "type-1758" + } + ], + "return_type" : "type-81", +@@ -34855,7 +34897,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1845" ++ "referenced_type" : "type-1758" + }, + { + "referenced_type" : "type-612" +@@ -34871,10 +34913,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1845" ++ "referenced_type" : "type-1758" + }, + { +- "referenced_type" : "type-1845" ++ "referenced_type" : "type-1758" + } + ], + "return_type" : "type-81", +@@ -34887,7 +34929,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1845" ++ "referenced_type" : "type-1758" + } + ], + "return_type" : "type-81", +@@ -34900,10 +34942,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1845" ++ "referenced_type" : "type-1758" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -34916,10 +34958,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1845" ++ "referenced_type" : "type-1758" + }, + { +- "referenced_type" : "type-2184" ++ "referenced_type" : "type-2115" + } + ], + "return_type" : "type-81", +@@ -34932,10 +34974,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1845" ++ "referenced_type" : "type-1758" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -34948,13 +34990,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1845" ++ "referenced_type" : "type-1758" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1870" ++ "referenced_type" : "type-1787" + } + ], + "return_type" : "type-81", +@@ -34967,10 +35009,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1845" ++ "referenced_type" : "type-1758" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -34983,10 +35025,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1845" ++ "referenced_type" : "type-1758" + }, + { +- "referenced_type" : "type-2184" ++ "referenced_type" : "type-2115" + } + ], + "return_type" : "type-81", +@@ -34999,10 +35041,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1845" ++ "referenced_type" : "type-1758" + }, + { +- "referenced_type" : "type-2184" ++ "referenced_type" : "type-2115" + } + ], + "return_type" : "type-81", +@@ -35015,7 +35057,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1845" ++ "referenced_type" : "type-1758" + } + ], + "return_type" : "type-81", +@@ -35028,10 +35070,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1845" ++ "referenced_type" : "type-1758" + }, + { +- "referenced_type" : "type-2184" ++ "referenced_type" : "type-2115" + } + ], + "return_type" : "type-81", +@@ -35044,7 +35086,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1845" ++ "referenced_type" : "type-1758" + } + ], + "return_type" : "type-81", +@@ -35057,7 +35099,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1845" ++ "referenced_type" : "type-1758" + } + ], + "return_type" : "type-81", +@@ -35070,7 +35112,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1845" ++ "referenced_type" : "type-1758" + } + ], + "return_type" : "type-81", +@@ -35083,7 +35125,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1845" ++ "referenced_type" : "type-1758" + } + ], + "return_type" : "type-81", +@@ -35097,7 +35139,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2341" ++ "referenced_type" : "type-2268" + } + ], + "return_type" : "type-81", +@@ -35111,7 +35153,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2341" ++ "referenced_type" : "type-2268" + } + ], + "return_type" : "type-81", +@@ -35120,7 +35162,7 @@ + { + "function_name" : "google::protobuf::Api::descriptor", + "linker_set_key" : "_ZN6google8protobuf3Api10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/api.pb.h" + }, + { +@@ -35131,10 +35173,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2341" ++ "referenced_type" : "type-2268" + }, + { +- "referenced_type" : "type-2341" ++ "referenced_type" : "type-2268" + } + ], + "return_type" : "type-81", +@@ -35143,7 +35185,7 @@ + { + "function_name" : "google::protobuf::Api::default_instance", + "linker_set_key" : "_ZN6google8protobuf3Api16default_instanceEv", +- "return_type" : "type-2507", ++ "return_type" : "type-2437", + "source_file" : "/external/protobuf/src/google/protobuf/api.pb.h" + }, + { +@@ -35154,7 +35196,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2341" ++ "referenced_type" : "type-2268" + } + ], + "return_type" : "type-81", +@@ -35167,7 +35209,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2341" ++ "referenced_type" : "type-2268" + }, + { + "referenced_type" : "type-612" +@@ -35183,10 +35225,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2341" ++ "referenced_type" : "type-2268" + }, + { +- "referenced_type" : "type-2341" ++ "referenced_type" : "type-2268" + } + ], + "return_type" : "type-81", +@@ -35199,7 +35241,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2341" ++ "referenced_type" : "type-2268" + } + ], + "return_type" : "type-81", +@@ -35212,10 +35254,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2341" ++ "referenced_type" : "type-2268" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -35228,10 +35270,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2341" ++ "referenced_type" : "type-2268" + }, + { +- "referenced_type" : "type-2507" ++ "referenced_type" : "type-2437" + } + ], + "return_type" : "type-81", +@@ -35244,10 +35286,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2341" ++ "referenced_type" : "type-2268" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -35260,10 +35302,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2341" ++ "referenced_type" : "type-2268" + }, + { +- "referenced_type" : "type-2507" ++ "referenced_type" : "type-2437" + } + ], + "return_type" : "type-81", +@@ -35276,10 +35318,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2341" ++ "referenced_type" : "type-2268" + }, + { +- "referenced_type" : "type-2507" ++ "referenced_type" : "type-2437" + } + ], + "return_type" : "type-81", +@@ -35292,7 +35334,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2341" ++ "referenced_type" : "type-2268" + } + ], + "return_type" : "type-81", +@@ -35305,10 +35347,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2341" ++ "referenced_type" : "type-2268" + }, + { +- "referenced_type" : "type-2507" ++ "referenced_type" : "type-2437" + } + ], + "return_type" : "type-81", +@@ -35321,7 +35363,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2341" ++ "referenced_type" : "type-2268" + } + ], + "return_type" : "type-81", +@@ -35334,7 +35376,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2341" ++ "referenced_type" : "type-2268" + } + ], + "return_type" : "type-81", +@@ -35347,7 +35389,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2341" ++ "referenced_type" : "type-2268" + } + ], + "return_type" : "type-81", +@@ -35360,7 +35402,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2341" ++ "referenced_type" : "type-2268" + } + ], + "return_type" : "type-81", +@@ -35392,7 +35434,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2497" ++ "referenced_type" : "type-2427" + } + ], + "return_type" : "type-81", +@@ -35406,7 +35448,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2497" ++ "referenced_type" : "type-2427" + } + ], + "return_type" : "type-81", +@@ -35415,7 +35457,7 @@ + { + "function_name" : "google::protobuf::Enum::descriptor", + "linker_set_key" : "_ZN6google8protobuf4Enum10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -35426,10 +35468,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2497" ++ "referenced_type" : "type-2427" + }, + { +- "referenced_type" : "type-2497" ++ "referenced_type" : "type-2427" + } + ], + "return_type" : "type-81", +@@ -35438,7 +35480,7 @@ + { + "function_name" : "google::protobuf::Enum::default_instance", + "linker_set_key" : "_ZN6google8protobuf4Enum16default_instanceEv", +- "return_type" : "type-2499", ++ "return_type" : "type-2429", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -35449,7 +35491,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2497" ++ "referenced_type" : "type-2427" + } + ], + "return_type" : "type-81", +@@ -35462,7 +35504,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2497" ++ "referenced_type" : "type-2427" + }, + { + "referenced_type" : "type-612" +@@ -35478,10 +35520,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2497" ++ "referenced_type" : "type-2427" + }, + { +- "referenced_type" : "type-2497" ++ "referenced_type" : "type-2427" + } + ], + "return_type" : "type-81", +@@ -35494,7 +35536,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2497" ++ "referenced_type" : "type-2427" + } + ], + "return_type" : "type-81", +@@ -35507,10 +35549,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2497" ++ "referenced_type" : "type-2427" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -35523,10 +35565,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2497" ++ "referenced_type" : "type-2427" + }, + { +- "referenced_type" : "type-2499" ++ "referenced_type" : "type-2429" + } + ], + "return_type" : "type-81", +@@ -35539,10 +35581,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2497" ++ "referenced_type" : "type-2427" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -35555,10 +35597,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2497" ++ "referenced_type" : "type-2427" + }, + { +- "referenced_type" : "type-2499" ++ "referenced_type" : "type-2429" + } + ], + "return_type" : "type-81", +@@ -35571,10 +35613,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2497" ++ "referenced_type" : "type-2427" + }, + { +- "referenced_type" : "type-2499" ++ "referenced_type" : "type-2429" + } + ], + "return_type" : "type-81", +@@ -35587,7 +35629,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2497" ++ "referenced_type" : "type-2427" + } + ], + "return_type" : "type-81", +@@ -35600,10 +35642,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2497" ++ "referenced_type" : "type-2427" + }, + { +- "referenced_type" : "type-2499" ++ "referenced_type" : "type-2429" + } + ], + "return_type" : "type-81", +@@ -35616,7 +35658,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2497" ++ "referenced_type" : "type-2427" + } + ], + "return_type" : "type-81", +@@ -35629,7 +35671,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2497" ++ "referenced_type" : "type-2427" + } + ], + "return_type" : "type-81", +@@ -35642,7 +35684,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2497" ++ "referenced_type" : "type-2427" + } + ], + "return_type" : "type-81", +@@ -35655,7 +35697,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2497" ++ "referenced_type" : "type-2427" + } + ], + "return_type" : "type-81", +@@ -35669,7 +35711,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2489" ++ "referenced_type" : "type-2419" + } + ], + "return_type" : "type-81", +@@ -35683,7 +35725,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2489" ++ "referenced_type" : "type-2419" + } + ], + "return_type" : "type-81", +@@ -35692,7 +35734,7 @@ + { + "function_name" : "google::protobuf::Type::descriptor", + "linker_set_key" : "_ZN6google8protobuf4Type10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -35703,10 +35745,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2489" ++ "referenced_type" : "type-2419" + }, + { +- "referenced_type" : "type-2489" ++ "referenced_type" : "type-2419" + } + ], + "return_type" : "type-81", +@@ -35715,7 +35757,7 @@ + { + "function_name" : "google::protobuf::Type::default_instance", + "linker_set_key" : "_ZN6google8protobuf4Type16default_instanceEv", +- "return_type" : "type-2491", ++ "return_type" : "type-2421", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -35726,7 +35768,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2489" ++ "referenced_type" : "type-2419" + } + ], + "return_type" : "type-81", +@@ -35739,7 +35781,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2489" ++ "referenced_type" : "type-2419" + }, + { + "referenced_type" : "type-612" +@@ -35755,10 +35797,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2489" ++ "referenced_type" : "type-2419" + }, + { +- "referenced_type" : "type-2489" ++ "referenced_type" : "type-2419" + } + ], + "return_type" : "type-81", +@@ -35771,7 +35813,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2489" ++ "referenced_type" : "type-2419" + } + ], + "return_type" : "type-81", +@@ -35784,10 +35826,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2489" ++ "referenced_type" : "type-2419" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -35800,10 +35842,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2489" ++ "referenced_type" : "type-2419" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + } + ], + "return_type" : "type-81", +@@ -35816,10 +35858,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2489" ++ "referenced_type" : "type-2419" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -35832,10 +35874,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2489" ++ "referenced_type" : "type-2419" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + } + ], + "return_type" : "type-81", +@@ -35848,10 +35890,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2489" ++ "referenced_type" : "type-2419" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + } + ], + "return_type" : "type-81", +@@ -35864,7 +35906,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2489" ++ "referenced_type" : "type-2419" + } + ], + "return_type" : "type-81", +@@ -35877,10 +35919,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2489" ++ "referenced_type" : "type-2419" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + } + ], + "return_type" : "type-81", +@@ -35893,7 +35935,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2489" ++ "referenced_type" : "type-2419" + } + ], + "return_type" : "type-81", +@@ -35906,7 +35948,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2489" ++ "referenced_type" : "type-2419" + } + ], + "return_type" : "type-81", +@@ -35919,7 +35961,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2489" ++ "referenced_type" : "type-2419" + } + ], + "return_type" : "type-81", +@@ -35932,7 +35974,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2489" ++ "referenced_type" : "type-2419" + } + ], + "return_type" : "type-81", +@@ -35947,7 +35989,7 @@ + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-6345" ++ "referenced_type" : "type-6297" + } + ], + "return_type" : "type-81", +@@ -35959,10 +36001,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-6410" ++ "referenced_type" : "type-6362" + }, + { +- "referenced_type" : "type-14880" ++ "referenced_type" : "type-14832" + } + ], + "return_type" : "type-12", +@@ -35977,7 +36019,7 @@ + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-6345" ++ "referenced_type" : "type-6297" + } + ], + "return_type" : "type-12", +@@ -35989,16 +36031,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-6410" ++ "referenced_type" : "type-6362" + }, + { +- "referenced_type" : "type-14953" ++ "referenced_type" : "type-14905" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-81", +@@ -36010,10 +36052,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-6410" ++ "referenced_type" : "type-6362" + }, + { +- "referenced_type" : "type-6345" ++ "referenced_type" : "type-6297" + } + ], + "return_type" : "type-81", +@@ -36028,7 +36070,7 @@ + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-6410" ++ "referenced_type" : "type-6362" + } + ], + "return_type" : "type-12", +@@ -36041,7 +36083,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { + "referenced_type" : "type-27" +@@ -36060,7 +36102,7 @@ + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-14880" ++ "referenced_type" : "type-14832" + } + ], + "return_type" : "type-12", +@@ -36076,7 +36118,7 @@ + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-14880" ++ "referenced_type" : "type-14832" + } + ], + "return_type" : "type-12", +@@ -36089,10 +36131,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { +- "referenced_type" : "type-6345" ++ "referenced_type" : "type-6297" + } + ], + "return_type" : "type-81", +@@ -36104,13 +36146,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-6410" ++ "referenced_type" : "type-6362" + }, + { +- "referenced_type" : "type-6410" ++ "referenced_type" : "type-6362" + }, + { +- "referenced_type" : "type-6345" ++ "referenced_type" : "type-6297" + } + ], + "return_type" : "type-81", +@@ -36122,10 +36164,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-6410" ++ "referenced_type" : "type-6362" + } + ], +- "return_type" : "type-17388", ++ "return_type" : "type-17340", + "source_file" : "/external/protobuf/src/google/protobuf/util/field_mask_util.h" + }, + { +@@ -36134,13 +36176,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-6410" ++ "referenced_type" : "type-6362" + }, + { +- "referenced_type" : "type-6410" ++ "referenced_type" : "type-6362" + }, + { +- "referenced_type" : "type-6345" ++ "referenced_type" : "type-6297" + } + ], + "return_type" : "type-81", +@@ -36153,7 +36195,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-14815" ++ "referenced_type" : "type-14767" + } + ], + "return_type" : "type-81", +@@ -36166,7 +36208,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-14815" ++ "referenced_type" : "type-14767" + } + ], + "return_type" : "type-81", +@@ -36179,7 +36221,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-14815" ++ "referenced_type" : "type-14767" + } + ], + "return_type" : "type-81", +@@ -36192,7 +36234,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-14815" ++ "referenced_type" : "type-14767" + } + ], + "return_type" : "type-81", +@@ -36204,10 +36246,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-15324" ++ "referenced_type" : "type-15276" + }, + { +- "referenced_type" : "type-24756" ++ "referenced_type" : "type-24712" + }, + { + "referenced_type" : "type-793" +@@ -36216,7 +36258,7 @@ + "referenced_type" : "type-741" + }, + { +- "referenced_type" : "type-24760" ++ "referenced_type" : "type-24719" + } + ], + "return_type" : "type-76", +@@ -36228,19 +36270,19 @@ + "parameters" : + [ + { +- "referenced_type" : "type-15324" ++ "referenced_type" : "type-15276" + }, + { +- "referenced_type" : "type-24756" ++ "referenced_type" : "type-24712" + }, + { +- "referenced_type" : "type-24756" ++ "referenced_type" : "type-24712" + }, + { +- "referenced_type" : "type-24752" ++ "referenced_type" : "type-24708" + }, + { +- "referenced_type" : "type-24760" ++ "referenced_type" : "type-24719" + } + ], + "return_type" : "type-76", +@@ -36252,10 +36294,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-15324" ++ "referenced_type" : "type-15276" + }, + { +- "referenced_type" : "type-24756" ++ "referenced_type" : "type-24712" + }, + { + "referenced_type" : "type-793" +@@ -36273,16 +36315,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-15324" ++ "referenced_type" : "type-15276" + }, + { +- "referenced_type" : "type-24756" ++ "referenced_type" : "type-24712" + }, + { +- "referenced_type" : "type-24756" ++ "referenced_type" : "type-24712" + }, + { +- "referenced_type" : "type-24752" ++ "referenced_type" : "type-24708" + } + ], + "return_type" : "type-76", +@@ -36294,10 +36336,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-12", +@@ -36310,13 +36352,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-81", +@@ -36329,10 +36371,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-81", +@@ -36345,10 +36387,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-12", +@@ -36361,10 +36403,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-81", +@@ -36377,10 +36419,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-81", +@@ -36394,22 +36436,22 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-25007" ++ "referenced_type" : "type-24976" + }, + { +- "referenced_type" : "type-24912" ++ "referenced_type" : "type-24879" + }, + { +- "referenced_type" : "type-25007" ++ "referenced_type" : "type-24976" + }, + { +- "referenced_type" : "type-24912" ++ "referenced_type" : "type-24879" + }, + { +- "referenced_type" : "type-25013" ++ "referenced_type" : "type-24982" + } + ], + "return_type" : "type-81", +@@ -36422,7 +36464,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-25001" ++ "referenced_type" : "type-24970" + } + ], + "return_type" : "type-81", +@@ -36435,7 +36477,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-25001" ++ "referenced_type" : "type-24970" + } + ], + "return_type" : "type-81", +@@ -36448,7 +36490,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-25001" ++ "referenced_type" : "type-24970" + } + ], + "return_type" : "type-81", +@@ -36461,7 +36503,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-25001" ++ "referenced_type" : "type-24970" + } + ], + "return_type" : "type-81", +@@ -36475,10 +36517,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-12", +@@ -36492,13 +36534,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-25012" ++ "referenced_type" : "type-24981" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-24903" ++ "referenced_type" : "type-24870" + }, + { + "referenced_type" : "type-12" +@@ -36514,16 +36556,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-25012" ++ "referenced_type" : "type-24981" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-24903" ++ "referenced_type" : "type-24870" + } + ], + "return_type" : "type-81", +@@ -36536,16 +36578,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-25012" ++ "referenced_type" : "type-24981" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-24903" ++ "referenced_type" : "type-24870" + } + ], + "return_type" : "type-81", +@@ -36558,16 +36600,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-25012" ++ "referenced_type" : "type-24981" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-24903" ++ "referenced_type" : "type-24870" + } + ], + "return_type" : "type-81", +@@ -36580,16 +36622,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-25012" ++ "referenced_type" : "type-24981" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-24903" ++ "referenced_type" : "type-24870" + } + ], + "return_type" : "type-81", +@@ -36602,16 +36644,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-25012" ++ "referenced_type" : "type-24981" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-24903" ++ "referenced_type" : "type-24870" + } + ], + "return_type" : "type-81", +@@ -36624,16 +36666,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-25012" ++ "referenced_type" : "type-24981" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-24903" ++ "referenced_type" : "type-24870" + } + ], + "return_type" : "type-81", +@@ -36647,10 +36689,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-25012" ++ "referenced_type" : "type-24981" + }, + { +- "referenced_type" : "type-1947" ++ "referenced_type" : "type-1871" + } + ], + "return_type" : "type-81", +@@ -36663,16 +36705,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-25012" ++ "referenced_type" : "type-24981" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-24903" ++ "referenced_type" : "type-24870" + } + ], + "return_type" : "type-81", +@@ -36686,10 +36728,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-25012" ++ "referenced_type" : "type-24981" + }, + { +- "referenced_type" : "type-24931" ++ "referenced_type" : "type-24900" + } + ], + "return_type" : "type-81", +@@ -36703,10 +36745,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-25012" ++ "referenced_type" : "type-24981" + }, + { +- "referenced_type" : "type-24903" ++ "referenced_type" : "type-24870" + }, + { + "referenced_type" : "type-12" +@@ -36722,7 +36764,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-25012" ++ "referenced_type" : "type-24981" + }, + { + "referenced_type" : "type-741" +@@ -36738,10 +36780,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-25012" ++ "referenced_type" : "type-24981" + }, + { +- "referenced_type" : "type-11208" ++ "referenced_type" : "type-11160" + } + ], + "return_type" : "type-81", +@@ -36754,7 +36796,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-25012" ++ "referenced_type" : "type-24981" + }, + { + "referenced_type" : "type-741" +@@ -36770,10 +36812,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-25012" ++ "referenced_type" : "type-24981" + }, + { +- "referenced_type" : "type-11208" ++ "referenced_type" : "type-11160" + } + ], + "return_type" : "type-81", +@@ -36786,7 +36828,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-25012" ++ "referenced_type" : "type-24981" + } + ], + "return_type" : "type-81", +@@ -36799,7 +36841,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-25012" ++ "referenced_type" : "type-24981" + } + ], + "return_type" : "type-81", +@@ -36812,7 +36854,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-25012" ++ "referenced_type" : "type-24981" + } + ], + "return_type" : "type-81", +@@ -36825,7 +36867,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-24903" ++ "referenced_type" : "type-24870" + } + ], + "return_type" : "type-12", +@@ -36838,7 +36880,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24999" ++ "referenced_type" : "type-24968" + } + ], + "return_type" : "type-81", +@@ -36851,7 +36893,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24999" ++ "referenced_type" : "type-24968" + } + ], + "return_type" : "type-81", +@@ -36864,7 +36906,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24999" ++ "referenced_type" : "type-24968" + } + ], + "return_type" : "type-81", +@@ -36877,7 +36919,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24999" ++ "referenced_type" : "type-24968" + } + ], + "return_type" : "type-81", +@@ -36890,7 +36932,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24999" ++ "referenced_type" : "type-24968" + } + ], + "return_type" : "type-81", +@@ -36903,10 +36945,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-25001" ++ "referenced_type" : "type-24970" + } + ], + "return_type" : "type-81", +@@ -36920,16 +36962,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -36948,19 +36990,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-25007" ++ "referenced_type" : "type-24976" + }, + { +- "referenced_type" : "type-25007" ++ "referenced_type" : "type-24976" + } + ], + "return_type" : "type-12", +@@ -36974,10 +37016,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-12", +@@ -36989,10 +37031,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-12", +@@ -37006,13 +37048,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], +- "return_type" : "type-24898", ++ "return_type" : "type-24865", + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h" + }, + { +@@ -37022,10 +37064,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-24909" ++ "referenced_type" : "type-24876" + } + ], + "return_type" : "type-81", +@@ -37039,19 +37081,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-25015" ++ "referenced_type" : "type-24984" + } + ], + "return_type" : "type-12", +@@ -37065,22 +37107,22 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1948" ++ "referenced_type" : "type-1872" + }, + { +- "referenced_type" : "type-1948" ++ "referenced_type" : "type-1872" + }, + { +- "referenced_type" : "type-25015" ++ "referenced_type" : "type-24984" + } + ], + "return_type" : "type-12", +@@ -37093,10 +37135,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-98" +@@ -37115,10 +37157,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-14815" ++ "referenced_type" : "type-14767" + } + ], + "return_type" : "type-81", +@@ -37131,10 +37173,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-25004" ++ "referenced_type" : "type-24973" + } + ], + "return_type" : "type-81", +@@ -37148,19 +37190,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-25003" ++ "referenced_type" : "type-24972" + }, + { +- "referenced_type" : "type-24903" ++ "referenced_type" : "type-24870" + } + ], + "return_type" : "type-12", +@@ -37172,10 +37214,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-12", +@@ -37189,16 +37231,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -37207,10 +37249,10 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-25019" ++ "referenced_type" : "type-24988" + } + ], +- "return_type" : "type-14816", ++ "return_type" : "type-14768", + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h" + }, + { +@@ -37221,22 +37263,22 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-25007" ++ "referenced_type" : "type-24976" + }, + { +- "referenced_type" : "type-25007" ++ "referenced_type" : "type-24976" + }, + { +- "referenced_type" : "type-25015" ++ "referenced_type" : "type-24984" + } + ], + "return_type" : "type-12", +@@ -37250,25 +37292,25 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-24903" ++ "referenced_type" : "type-24870" + }, + { +- "referenced_type" : "type-25021" ++ "referenced_type" : "type-24990" + }, + { +- "referenced_type" : "type-25021" ++ "referenced_type" : "type-24990" + } + ], + "return_type" : "type-12", +@@ -37281,10 +37323,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-24920" ++ "referenced_type" : "type-24887" + } + ], + "return_type" : "type-81", +@@ -37297,13 +37339,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-24898" ++ "referenced_type" : "type-24865" + } + ], + "return_type" : "type-81", +@@ -37316,10 +37358,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-24911" ++ "referenced_type" : "type-24878" + } + ], + "return_type" : "type-81", +@@ -37332,10 +37374,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-24913" ++ "referenced_type" : "type-24880" + } + ], + "return_type" : "type-81", +@@ -37348,13 +37390,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-25007" ++ "referenced_type" : "type-24976" + } + ], + "return_type" : "type-81", +@@ -37368,16 +37410,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -37386,7 +37428,7 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-25015" ++ "referenced_type" : "type-24984" + } + ], + "return_type" : "type-12", +@@ -37400,22 +37442,22 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-25007" ++ "referenced_type" : "type-24976" + }, + { +- "referenced_type" : "type-25007" ++ "referenced_type" : "type-24976" + }, + { +- "referenced_type" : "type-25015" ++ "referenced_type" : "type-24984" + } + ], + "return_type" : "type-12", +@@ -37428,13 +37470,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-25010" ++ "referenced_type" : "type-24979" + } + ], + "return_type" : "type-81", +@@ -37447,10 +37489,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + } + ], +- "return_type" : "type-24912", ++ "return_type" : "type-24879", + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h" + }, + { +@@ -37459,10 +37501,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-12", +@@ -37475,13 +37517,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-12", +@@ -37495,16 +37537,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-25015" ++ "referenced_type" : "type-24984" + } + ], + "return_type" : "type-12", +@@ -37518,22 +37560,22 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-24898" ++ "referenced_type" : "type-24865" + }, + { +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + }, + { +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + }, + { +- "referenced_type" : "type-24903" ++ "referenced_type" : "type-24870" + }, + { + "referenced_type" : "type-1" +@@ -37552,7 +37594,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24909" ++ "referenced_type" : "type-24876" + } + ], + "return_type" : "type-81", +@@ -37565,7 +37607,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24909" ++ "referenced_type" : "type-24876" + } + ], + "return_type" : "type-81", +@@ -37578,7 +37620,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24909" ++ "referenced_type" : "type-24876" + } + ], + "return_type" : "type-81", +@@ -37591,7 +37633,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24909" ++ "referenced_type" : "type-24876" + } + ], + "return_type" : "type-81", +@@ -37605,19 +37647,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-24903" ++ "referenced_type" : "type-24870" + } + ], + "return_type" : "type-12", +@@ -37631,13 +37673,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-3769" ++ "referenced_type" : "type-3721" + } + ], + "return_type" : "type-12", +@@ -37650,10 +37692,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + }, + { +- "referenced_type" : "type-24912" ++ "referenced_type" : "type-24879" + } + ], + "return_type" : "type-81", +@@ -37666,7 +37708,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + } + ], + "return_type" : "type-81", +@@ -37679,7 +37721,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + } + ], + "return_type" : "type-81", +@@ -37692,7 +37734,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + } + ], + "return_type" : "type-81", +@@ -37705,7 +37747,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24907" ++ "referenced_type" : "type-24874" + } + ], + "return_type" : "type-81", +@@ -37719,16 +37761,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-14821" ++ "referenced_type" : "type-14773" + }, + { +- "referenced_type" : "type-14828" ++ "referenced_type" : "type-14780" + }, + { +- "referenced_type" : "type-2008" ++ "referenced_type" : "type-1934" + }, + { +- "referenced_type" : "type-2008" ++ "referenced_type" : "type-1934" + } + ], + "return_type" : "type-12", +@@ -37742,10 +37784,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-14821" ++ "referenced_type" : "type-14773" + }, + { +- "referenced_type" : "type-14828" ++ "referenced_type" : "type-14780" + }, + { + "referenced_type" : "type-96" +@@ -37765,10 +37807,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-14821" ++ "referenced_type" : "type-14773" + }, + { +- "referenced_type" : "type-14828" ++ "referenced_type" : "type-14780" + }, + { + "referenced_type" : "type-98" +@@ -37788,10 +37830,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-14821" ++ "referenced_type" : "type-14773" + }, + { +- "referenced_type" : "type-14828" ++ "referenced_type" : "type-14780" + }, + { + "referenced_type" : "type-98" +@@ -37812,10 +37854,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-14821" ++ "referenced_type" : "type-14773" + }, + { +- "referenced_type" : "type-14828" ++ "referenced_type" : "type-14780" + }, + { + "referenced_type" : "type-96" +@@ -37835,10 +37877,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-14821" ++ "referenced_type" : "type-14773" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-98" +@@ -37857,7 +37899,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-14821" ++ "referenced_type" : "type-14773" + }, + { + "referenced_type" : "type-98" +@@ -37876,16 +37918,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-14821" ++ "referenced_type" : "type-14773" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -37894,10 +37936,10 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-14824" ++ "referenced_type" : "type-14776" + } + ], +- "return_type" : "type-14816", ++ "return_type" : "type-14768", + "source_file" : "/external/protobuf/src/google/protobuf/util/field_comparator.h" + }, + { +@@ -37907,7 +37949,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-14821" ++ "referenced_type" : "type-14773" + } + ], + "return_type" : "type-81", +@@ -37920,7 +37962,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-14821" ++ "referenced_type" : "type-14773" + } + ], + "return_type" : "type-81", +@@ -37933,7 +37975,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-14821" ++ "referenced_type" : "type-14773" + } + ], + "return_type" : "type-81", +@@ -37946,7 +37988,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-14821" ++ "referenced_type" : "type-14773" + } + ], + "return_type" : "type-81", +@@ -37959,7 +38001,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-14821" ++ "referenced_type" : "type-14773" + } + ], + "return_type" : "type-81", +@@ -37971,13 +38013,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-25183" ++ "referenced_type" : "type-25166" + }, + { +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + } + ], +- "return_type" : "type-15324", ++ "return_type" : "type-15276", + "source_file" : "/external/protobuf/src/google/protobuf/util/type_resolver_util.h" + }, + { +@@ -38098,10 +38140,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-25174" ++ "referenced_type" : "type-25154" + }, + { +- "referenced_type" : "type-4177" ++ "referenced_type" : "type-4129" + } + ], + "return_type" : "type-12", +@@ -38113,10 +38155,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-25174" ++ "referenced_type" : "type-25154" + }, + { +- "referenced_type" : "type-7811" ++ "referenced_type" : "type-7763" + } + ], + "return_type" : "type-12", +@@ -38125,7 +38167,7 @@ + { + "function_name" : "google::protobuf::util::TimeUtil::GetCurrentTime", + "linker_set_key" : "_ZN6google8protobuf4util8TimeUtil14GetCurrentTimeEv", +- "return_type" : "type-7806", ++ "return_type" : "type-7758", + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, + { +@@ -38134,7 +38176,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-4233" ++ "referenced_type" : "type-4185" + } + ], + "return_type" : "type-89", +@@ -38149,7 +38191,7 @@ + "referenced_type" : "type-89" + } + ], +- "return_type" : "type-4178", ++ "return_type" : "type-4130", + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, + { +@@ -38161,7 +38203,7 @@ + "referenced_type" : "type-192" + } + ], +- "return_type" : "type-7806", ++ "return_type" : "type-7758", + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, + { +@@ -38170,7 +38212,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-7865" ++ "referenced_type" : "type-7817" + } + ], + "return_type" : "type-192", +@@ -38182,7 +38224,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-4233" ++ "referenced_type" : "type-4185" + } + ], + "return_type" : "type-89", +@@ -38194,7 +38236,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-4233" ++ "referenced_type" : "type-4185" + } + ], + "return_type" : "type-89", +@@ -38206,10 +38248,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-4233" ++ "referenced_type" : "type-4185" + } + ], +- "return_type" : "type-27098", ++ "return_type" : "type-27097", + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, + { +@@ -38221,7 +38263,7 @@ + "referenced_type" : "type-89" + } + ], +- "return_type" : "type-4178", ++ "return_type" : "type-4130", + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, + { +@@ -38233,7 +38275,7 @@ + "referenced_type" : "type-89" + } + ], +- "return_type" : "type-4178", ++ "return_type" : "type-4130", + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, + { +@@ -38242,10 +38284,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-25168" ++ "referenced_type" : "type-25146" + } + ], +- "return_type" : "type-4178", ++ "return_type" : "type-4130", + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, + { +@@ -38257,7 +38299,7 @@ + "referenced_type" : "type-89" + } + ], +- "return_type" : "type-7806", ++ "return_type" : "type-7758", + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, + { +@@ -38266,7 +38308,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-7865" ++ "referenced_type" : "type-7817" + } + ], + "return_type" : "type-89", +@@ -38278,10 +38320,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-7865" ++ "referenced_type" : "type-7817" + } + ], +- "return_type" : "type-27099", ++ "return_type" : "type-27098", + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, + { +@@ -38290,10 +38332,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-25168" ++ "referenced_type" : "type-25146" + } + ], +- "return_type" : "type-7806", ++ "return_type" : "type-7758", + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, + { +@@ -38302,7 +38344,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-4233" ++ "referenced_type" : "type-4185" + } + ], + "return_type" : "type-89", +@@ -38317,7 +38359,7 @@ + "referenced_type" : "type-89" + } + ], +- "return_type" : "type-4178", ++ "return_type" : "type-4130", + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, + { +@@ -38326,7 +38368,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-4233" ++ "referenced_type" : "type-4185" + } + ], + "return_type" : "type-89", +@@ -38338,7 +38380,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-4233" ++ "referenced_type" : "type-4185" + } + ], + "return_type" : "type-89", +@@ -38353,7 +38395,7 @@ + "referenced_type" : "type-89" + } + ], +- "return_type" : "type-4178", ++ "return_type" : "type-4130", + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, + { +@@ -38365,7 +38407,7 @@ + "referenced_type" : "type-89" + } + ], +- "return_type" : "type-4178", ++ "return_type" : "type-4130", + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, + { +@@ -38377,7 +38419,7 @@ + "referenced_type" : "type-89" + } + ], +- "return_type" : "type-7806", ++ "return_type" : "type-7758", + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, + { +@@ -38386,7 +38428,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-7865" ++ "referenced_type" : "type-7817" + } + ], + "return_type" : "type-89", +@@ -38401,7 +38443,7 @@ + "referenced_type" : "type-89" + } + ], +- "return_type" : "type-7806", ++ "return_type" : "type-7758", + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, + { +@@ -38413,7 +38455,7 @@ + "referenced_type" : "type-89" + } + ], +- "return_type" : "type-7806", ++ "return_type" : "type-7758", + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, + { +@@ -38422,7 +38464,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-7865" ++ "referenced_type" : "type-7817" + } + ], + "return_type" : "type-89", +@@ -38434,7 +38476,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-7865" ++ "referenced_type" : "type-7817" + } + ], + "return_type" : "type-89", +@@ -38443,7 +38485,7 @@ + { + "function_name" : "google::protobuf::util::TimeUtil::GetEpoch", + "linker_set_key" : "_ZN6google8protobuf4util8TimeUtil8GetEpochEv", +- "return_type" : "type-7806", ++ "return_type" : "type-7758", + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, + { +@@ -38452,10 +38494,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-4233" ++ "referenced_type" : "type-4185" + } + ], +- "return_type" : "type-27100", ++ "return_type" : "type-27099", + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, + { +@@ -38464,10 +38506,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-7865" ++ "referenced_type" : "type-7817" + } + ], +- "return_type" : "type-27101", ++ "return_type" : "type-27100", + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, + { +@@ -38489,7 +38531,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24762" ++ "referenced_type" : "type-24721" + }, + { + "referenced_type" : "type-5" +@@ -38509,7 +38551,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19510" ++ "referenced_type" : "type-19462" + }, + { + "referenced_type" : "type-27" +@@ -38518,7 +38560,7 @@ + "referenced_type" : "type-12" + } + ], +- "return_type" : "type-2365", ++ "return_type" : "type-2293", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38529,10 +38571,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19510" ++ "referenced_type" : "type-19462" + }, + { +- "referenced_type" : "type-2407" ++ "referenced_type" : "type-2337" + } + ], + "return_type" : "type-12", +@@ -38546,13 +38588,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19510" ++ "referenced_type" : "type-19462" + }, + { +- "referenced_type" : "type-2365" ++ "referenced_type" : "type-2293" + } + ], +- "return_type" : "type-2492", ++ "return_type" : "type-2422", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38563,10 +38605,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19510" ++ "referenced_type" : "type-19462" + }, + { +- "referenced_type" : "type-2407" ++ "referenced_type" : "type-2337" + }, + { + "referenced_type" : "type-27" +@@ -38583,7 +38625,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19510" ++ "referenced_type" : "type-19462" + }, + { + "referenced_type" : "type-27" +@@ -38602,13 +38644,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19510" ++ "referenced_type" : "type-19462" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-19510", ++ "return_type" : "type-19462", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38619,7 +38661,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19510" ++ "referenced_type" : "type-19462" + }, + { + "referenced_type" : "type-27" +@@ -38639,7 +38681,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19510" ++ "referenced_type" : "type-19462" + }, + { + "referenced_type" : "type-27" +@@ -38655,10 +38697,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19508" ++ "referenced_type" : "type-19460" + }, + { +- "referenced_type" : "type-2365" ++ "referenced_type" : "type-2293" + } + ], + "return_type" : "type-81", +@@ -38671,7 +38713,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19508" ++ "referenced_type" : "type-19460" + }, + { + "referenced_type" : "type-1" +@@ -38687,7 +38729,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19508" ++ "referenced_type" : "type-19460" + }, + { + "referenced_type" : "type-1" +@@ -38703,10 +38745,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19508" ++ "referenced_type" : "type-19460" + } + ], +- "return_type" : "type-19508", ++ "return_type" : "type-19460", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38716,16 +38758,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19508" ++ "referenced_type" : "type-19460" + }, + { +- "referenced_type" : "type-15349" ++ "referenced_type" : "type-15301" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { +- "referenced_type" : "type-19510" ++ "referenced_type" : "type-19462" + } + ], + "return_type" : "type-81", +@@ -38738,16 +38780,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19508" ++ "referenced_type" : "type-19460" + }, + { +- "referenced_type" : "type-19508" ++ "referenced_type" : "type-19460" + }, + { +- "referenced_type" : "type-2365" ++ "referenced_type" : "type-2293" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { + "referenced_type" : "type-12" +@@ -38763,16 +38805,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19508" ++ "referenced_type" : "type-19460" + }, + { +- "referenced_type" : "type-15349" ++ "referenced_type" : "type-15301" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { +- "referenced_type" : "type-19510" ++ "referenced_type" : "type-19462" + } + ], + "return_type" : "type-81", +@@ -38785,16 +38827,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19508" ++ "referenced_type" : "type-19460" + }, + { +- "referenced_type" : "type-19508" ++ "referenced_type" : "type-19460" + }, + { +- "referenced_type" : "type-2365" ++ "referenced_type" : "type-2293" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { + "referenced_type" : "type-12" +@@ -38811,16 +38853,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19510" ++ "referenced_type" : "type-19462" + }, + { +- "referenced_type" : "type-2407" ++ "referenced_type" : "type-2337" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + } + ], +- "return_type" : "type-19510", ++ "return_type" : "type-19462", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38830,16 +38872,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19510" ++ "referenced_type" : "type-19462" + }, + { + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-15049" ++ "referenced_type" : "type-15001" + } + ], +- "return_type" : "type-19510", ++ "return_type" : "type-19462", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38850,16 +38892,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19510" ++ "referenced_type" : "type-19462" + }, + { +- "referenced_type" : "type-2407" ++ "referenced_type" : "type-2337" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + } + ], +- "return_type" : "type-19510", ++ "return_type" : "type-19462", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38870,7 +38912,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19510" ++ "referenced_type" : "type-19462" + } + ], + "return_type" : "type-81", +@@ -38884,19 +38926,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19510" ++ "referenced_type" : "type-19462" + }, + { +- "referenced_type" : "type-2407" ++ "referenced_type" : "type-2337" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { +- "referenced_type" : "type-15049" ++ "referenced_type" : "type-15001" + } + ], +- "return_type" : "type-19510", ++ "return_type" : "type-19462", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38907,13 +38949,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19510" ++ "referenced_type" : "type-19462" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-2365", ++ "return_type" : "type-2293", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38923,10 +38965,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19510" ++ "referenced_type" : "type-19462" + } + ], +- "return_type" : "type-19510", ++ "return_type" : "type-19462", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38937,10 +38979,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19510" ++ "referenced_type" : "type-19462" + }, + { +- "referenced_type" : "type-2407" ++ "referenced_type" : "type-2337" + } + ], + "return_type" : "type-81", +@@ -38953,10 +38995,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19510" ++ "referenced_type" : "type-19462" + } + ], +- "return_type" : "type-19510", ++ "return_type" : "type-19462", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38966,13 +39008,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19510" ++ "referenced_type" : "type-19462" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-19510", ++ "return_type" : "type-19462", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -38983,19 +39025,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19510" ++ "referenced_type" : "type-19462" + }, + { +- "referenced_type" : "type-15349" ++ "referenced_type" : "type-15301" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { + "referenced_type" : "type-66" + }, + { +- "referenced_type" : "type-15381" ++ "referenced_type" : "type-15333" + } + ], + "return_type" : "type-81", +@@ -39008,19 +39050,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19510" ++ "referenced_type" : "type-19462" + }, + { +- "referenced_type" : "type-15324" ++ "referenced_type" : "type-15276" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { + "referenced_type" : "type-66" + }, + { +- "referenced_type" : "type-15381" ++ "referenced_type" : "type-15333" + } + ], + "return_type" : "type-81", +@@ -39034,19 +39076,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19510" ++ "referenced_type" : "type-19462" + }, + { +- "referenced_type" : "type-15349" ++ "referenced_type" : "type-15301" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { + "referenced_type" : "type-66" + }, + { +- "referenced_type" : "type-15381" ++ "referenced_type" : "type-15333" + } + ], + "return_type" : "type-81", +@@ -39059,19 +39101,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19510" ++ "referenced_type" : "type-19462" + }, + { +- "referenced_type" : "type-15324" ++ "referenced_type" : "type-15276" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { + "referenced_type" : "type-66" + }, + { +- "referenced_type" : "type-15381" ++ "referenced_type" : "type-15333" + } + ], + "return_type" : "type-81", +@@ -39084,7 +39126,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19510" ++ "referenced_type" : "type-19462" + } + ], + "return_type" : "type-81", +@@ -39097,7 +39139,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19510" ++ "referenced_type" : "type-19462" + } + ], + "return_type" : "type-81", +@@ -39110,7 +39152,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19510" ++ "referenced_type" : "type-19462" + } + ], + "return_type" : "type-81", +@@ -39125,7 +39167,7 @@ + "referenced_type" : "type-56" + } + ], +- "return_type" : "type-27102", ++ "return_type" : "type-27101", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/utility.h" + }, + { +@@ -39137,7 +39179,7 @@ + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-27103", ++ "return_type" : "type-27102", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/utility.h" + }, + { +@@ -39161,13 +39203,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-15049" ++ "referenced_type" : "type-15001" + }, + { + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], + "return_type" : "type-81", +@@ -39182,7 +39224,7 @@ + "referenced_type" : "type-96" + } + ], +- "return_type" : "type-27104", ++ "return_type" : "type-27103", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/utility.h" + }, + { +@@ -39194,7 +39236,7 @@ + "referenced_type" : "type-98" + } + ], +- "return_type" : "type-27105", ++ "return_type" : "type-27104", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/utility.h" + }, + { +@@ -39203,7 +39245,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2184" ++ "referenced_type" : "type-2115" + } + ], + "return_type" : "type-12", +@@ -39230,7 +39272,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2184" ++ "referenced_type" : "type-2115" + } + ], + "return_type" : "type-89", +@@ -39242,7 +39284,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-24668" ++ "referenced_type" : "type-24631" + } + ], + "return_type" : "type-12", +@@ -39254,13 +39296,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2415" ++ "referenced_type" : "type-2345" + }, + { +- "referenced_type" : "type-24668" ++ "referenced_type" : "type-24631" + } + ], +- "return_type" : "type-2369", ++ "return_type" : "type-2297", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/utility.h" + }, + { +@@ -39269,7 +39311,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2184" ++ "referenced_type" : "type-2115" + } + ], + "return_type" : "type-98", +@@ -39281,10 +39323,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2184" ++ "referenced_type" : "type-2115" + } + ], +- "return_type" : "type-27106", ++ "return_type" : "type-27105", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/utility.h" + }, + { +@@ -39294,7 +39336,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19200" ++ "referenced_type" : "type-19152" + }, + { + "referenced_type" : "type-27" +@@ -39303,7 +39345,7 @@ + "referenced_type" : "type-12" + } + ], +- "return_type" : "type-19200", ++ "return_type" : "type-19152", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39313,13 +39355,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19200" ++ "referenced_type" : "type-19152" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-19200", ++ "return_type" : "type-19152", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39329,7 +39371,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19200" ++ "referenced_type" : "type-19152" + }, + { + "referenced_type" : "type-27" +@@ -39338,7 +39380,7 @@ + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-19200", ++ "return_type" : "type-19152", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39348,7 +39390,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19200" ++ "referenced_type" : "type-19152" + }, + { + "referenced_type" : "type-27" +@@ -39357,7 +39399,7 @@ + "referenced_type" : "type-96" + } + ], +- "return_type" : "type-19200", ++ "return_type" : "type-19152", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39367,7 +39409,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19200" ++ "referenced_type" : "type-19152" + }, + { + "referenced_type" : "type-27" +@@ -39376,7 +39418,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-19200", ++ "return_type" : "type-19152", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39386,7 +39428,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19200" ++ "referenced_type" : "type-19152" + }, + { + "referenced_type" : "type-27" +@@ -39395,7 +39437,7 @@ + "referenced_type" : "type-89" + } + ], +- "return_type" : "type-19200", ++ "return_type" : "type-19152", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39405,13 +39447,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19200" ++ "referenced_type" : "type-19152" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-19200", ++ "return_type" : "type-19152", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39422,7 +39464,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19200" ++ "referenced_type" : "type-19152" + }, + { + "referenced_type" : "type-27" +@@ -39438,7 +39480,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19200" ++ "referenced_type" : "type-19152" + }, + { + "referenced_type" : "type-27" +@@ -39447,7 +39489,7 @@ + "referenced_type" : "type-98" + } + ], +- "return_type" : "type-19200", ++ "return_type" : "type-19152", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39457,7 +39499,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19200" ++ "referenced_type" : "type-19152" + }, + { + "referenced_type" : "type-27" +@@ -39466,7 +39508,7 @@ + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-19200", ++ "return_type" : "type-19152", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39476,7 +39518,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19200" ++ "referenced_type" : "type-19152" + }, + { + "referenced_type" : "type-27" +@@ -39485,7 +39527,7 @@ + "referenced_type" : "type-4" + } + ], +- "return_type" : "type-19200", ++ "return_type" : "type-19152", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39495,7 +39537,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19200" ++ "referenced_type" : "type-19152" + }, + { + "referenced_type" : "type-27" +@@ -39504,7 +39546,7 @@ + "referenced_type" : "type-91" + } + ], +- "return_type" : "type-19200", ++ "return_type" : "type-19152", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39514,10 +39556,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19200" ++ "referenced_type" : "type-19152" + } + ], +- "return_type" : "type-19200", ++ "return_type" : "type-19152", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39527,10 +39569,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19200" ++ "referenced_type" : "type-19152" + } + ], +- "return_type" : "type-19200", ++ "return_type" : "type-19152", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39540,13 +39582,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19200" ++ "referenced_type" : "type-19152" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-19200", ++ "return_type" : "type-19152", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, + { +@@ -39556,7 +39598,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19200" ++ "referenced_type" : "type-19152" + } + ], + "return_type" : "type-81", +@@ -39569,7 +39611,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19200" ++ "referenced_type" : "type-19152" + } + ], + "return_type" : "type-81", +@@ -39582,7 +39624,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19200" ++ "referenced_type" : "type-19152" + } + ], + "return_type" : "type-81", +@@ -39596,7 +39638,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + }, + { + "referenced_type" : "type-27" +@@ -39613,10 +39655,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + }, + { +- "referenced_type" : "type-19338" ++ "referenced_type" : "type-19290" + } + ], + "return_type" : "type-76", +@@ -39630,7 +39672,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + } + ], + "return_type" : "type-76", +@@ -39644,10 +39686,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + }, + { +- "referenced_type" : "type-19338" ++ "referenced_type" : "type-19290" + } + ], + "return_type" : "type-76", +@@ -39660,7 +39702,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + } + ], + "return_type" : "type-76", +@@ -39674,7 +39716,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + } + ], + "return_type" : "type-76", +@@ -39688,7 +39730,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + } + ], + "return_type" : "type-76", +@@ -39702,10 +39744,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + }, + { +- "referenced_type" : "type-19338" ++ "referenced_type" : "type-19290" + } + ], + "return_type" : "type-76", +@@ -39719,10 +39761,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + }, + { +- "referenced_type" : "type-19338" ++ "referenced_type" : "type-19290" + } + ], + "return_type" : "type-76", +@@ -39736,7 +39778,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + }, + { + "referenced_type" : "type-27" +@@ -39753,7 +39795,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + }, + { + "referenced_type" : "type-27" +@@ -39770,10 +39812,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + }, + { +- "referenced_type" : "type-19338" ++ "referenced_type" : "type-19290" + } + ], + "return_type" : "type-76", +@@ -39787,7 +39829,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + } + ], + "return_type" : "type-81", +@@ -39801,10 +39843,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + }, + { +- "referenced_type" : "type-19338" ++ "referenced_type" : "type-19290" + } + ], + "return_type" : "type-76", +@@ -39818,10 +39860,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + } + ], +- "return_type" : "type-19338", ++ "return_type" : "type-19290", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h" + }, + { +@@ -39832,7 +39874,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + } + ], + "return_type" : "type-76", +@@ -39846,7 +39888,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + } + ], + "return_type" : "type-76", +@@ -39860,10 +39902,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + }, + { +- "referenced_type" : "type-19343" ++ "referenced_type" : "type-19295" + } + ], + "return_type" : "type-76", +@@ -39877,7 +39919,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + } + ], + "return_type" : "type-76", +@@ -39891,7 +39933,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + } + ], + "return_type" : "type-76", +@@ -39904,7 +39946,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + }, + { + "referenced_type" : "type-27" +@@ -39921,7 +39963,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + } + ], + "return_type" : "type-81", +@@ -39935,7 +39977,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + } + ], + "return_type" : "type-76", +@@ -39949,7 +39991,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + } + ], + "return_type" : "type-76", +@@ -39963,7 +40005,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + } + ], + "return_type" : "type-76", +@@ -39977,7 +40019,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + } + ], + "return_type" : "type-76", +@@ -39990,10 +40032,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], + "return_type" : "type-81", +@@ -40006,10 +40048,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], + "return_type" : "type-81", +@@ -40022,7 +40064,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + } + ], + "return_type" : "type-81", +@@ -40035,7 +40077,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + } + ], + "return_type" : "type-81", +@@ -40048,7 +40090,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19337" ++ "referenced_type" : "type-19289" + } + ], + "return_type" : "type-81", +@@ -40072,7 +40114,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-24668" ++ "referenced_type" : "type-24631" + } + ], + "return_type" : "type-12", +@@ -40087,7 +40129,7 @@ + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-24666", ++ "return_type" : "type-24629", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/utility.h" + }, + { +@@ -40099,10 +40141,10 @@ + "referenced_type" : "type-56" + }, + { +- "referenced_type" : "type-15395" ++ "referenced_type" : "type-15347" + } + ], +- "return_type" : "type-17395", ++ "return_type" : "type-17347", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/field_mask_utility.h" + }, + { +@@ -40111,13 +40153,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2492" ++ "referenced_type" : "type-2422" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-2365", ++ "return_type" : "type-2293", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/utility.h" + }, + { +@@ -40126,10 +40168,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2415" ++ "referenced_type" : "type-2345" + }, + { +- "referenced_type" : "type-24668" ++ "referenced_type" : "type-24631" + }, + { + "referenced_type" : "type-12" +@@ -40144,7 +40186,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + } + ], + "return_type" : "type-12", +@@ -40156,10 +40198,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2415" ++ "referenced_type" : "type-2345" + }, + { +- "referenced_type" : "type-24668" ++ "referenced_type" : "type-24631" + }, + { + "referenced_type" : "type-89" +@@ -40175,16 +40217,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19370" ++ "referenced_type" : "type-19322" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], + "return_type" : "type-76", +@@ -40197,16 +40239,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19370" ++ "referenced_type" : "type-19322" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], + "return_type" : "type-76", +@@ -40219,16 +40261,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19370" ++ "referenced_type" : "type-19322" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], + "return_type" : "type-76", +@@ -40241,16 +40283,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19370" ++ "referenced_type" : "type-19322" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], + "return_type" : "type-76", +@@ -40263,16 +40305,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19370" ++ "referenced_type" : "type-19322" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], + "return_type" : "type-76", +@@ -40285,16 +40327,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19370" ++ "referenced_type" : "type-19322" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], + "return_type" : "type-76", +@@ -40307,16 +40349,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19370" ++ "referenced_type" : "type-19322" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], + "return_type" : "type-76", +@@ -40329,16 +40371,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19370" ++ "referenced_type" : "type-19322" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], + "return_type" : "type-76", +@@ -40351,16 +40393,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19370" ++ "referenced_type" : "type-19322" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], + "return_type" : "type-76", +@@ -40373,16 +40415,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19370" ++ "referenced_type" : "type-19322" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], + "return_type" : "type-76", +@@ -40395,16 +40437,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19370" ++ "referenced_type" : "type-19322" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], + "return_type" : "type-76", +@@ -40424,16 +40466,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19370" ++ "referenced_type" : "type-19322" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], + "return_type" : "type-76", +@@ -40446,16 +40488,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19370" ++ "referenced_type" : "type-19322" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], + "return_type" : "type-76", +@@ -40468,10 +40510,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19388" ++ "referenced_type" : "type-19340" + } + ], +- "return_type" : "type-19479", ++ "return_type" : "type-19431", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h" + }, + { +@@ -40488,16 +40530,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19370" ++ "referenced_type" : "type-19322" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], + "return_type" : "type-76", +@@ -40510,16 +40552,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19370" ++ "referenced_type" : "type-19322" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], + "return_type" : "type-76", +@@ -40532,16 +40574,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19370" ++ "referenced_type" : "type-19322" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], + "return_type" : "type-76", +@@ -40555,16 +40597,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19478" ++ "referenced_type" : "type-19430" + }, + { + "referenced_type" : "type-612" + }, + { +- "referenced_type" : "type-15349" ++ "referenced_type" : "type-15301" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + } + ], + "return_type" : "type-81", +@@ -40577,16 +40619,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19478" ++ "referenced_type" : "type-19430" + }, + { + "referenced_type" : "type-612" + }, + { +- "referenced_type" : "type-15324" ++ "referenced_type" : "type-15276" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + } + ], + "return_type" : "type-81", +@@ -40600,16 +40642,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19478" ++ "referenced_type" : "type-19430" + }, + { + "referenced_type" : "type-612" + }, + { +- "referenced_type" : "type-15349" ++ "referenced_type" : "type-15301" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + } + ], + "return_type" : "type-81", +@@ -40622,16 +40664,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19478" ++ "referenced_type" : "type-19430" + }, + { + "referenced_type" : "type-612" + }, + { +- "referenced_type" : "type-15324" ++ "referenced_type" : "type-15276" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + } + ], + "return_type" : "type-81", +@@ -40644,7 +40686,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19478" ++ "referenced_type" : "type-19430" + } + ], + "return_type" : "type-81", +@@ -40657,7 +40699,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19478" ++ "referenced_type" : "type-19430" + } + ], + "return_type" : "type-81", +@@ -40670,7 +40712,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19478" ++ "referenced_type" : "type-19430" + } + ], + "return_type" : "type-81", +@@ -40683,13 +40725,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-19489", ++ "return_type" : "type-19441", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, + { +@@ -40700,7 +40742,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + }, + { + "referenced_type" : "type-27" +@@ -40717,10 +40759,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + }, + { +- "referenced_type" : "type-2407" ++ "referenced_type" : "type-2337" + } + ], + "return_type" : "type-12", +@@ -40734,7 +40776,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + } + ], + "return_type" : "type-81", +@@ -40747,10 +40789,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + }, + { +- "referenced_type" : "type-15049" ++ "referenced_type" : "type-15001" + } + ], + "return_type" : "type-76", +@@ -40770,16 +40812,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + }, + { + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-15049" ++ "referenced_type" : "type-15001" + } + ], +- "return_type" : "type-19489", ++ "return_type" : "type-19441", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, + { +@@ -40789,10 +40831,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + }, + { +- "referenced_type" : "type-15049" ++ "referenced_type" : "type-15001" + } + ], + "return_type" : "type-76", +@@ -40805,10 +40847,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + }, + { +- "referenced_type" : "type-15049" ++ "referenced_type" : "type-15001" + } + ], + "return_type" : "type-76", +@@ -40821,10 +40863,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19524" ++ "referenced_type" : "type-19476" + } + ], +- "return_type" : "type-19500", ++ "return_type" : "type-19452", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, + { +@@ -40842,10 +40884,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + }, + { +- "referenced_type" : "type-2407" ++ "referenced_type" : "type-2337" + } + ], + "return_type" : "type-12", +@@ -40858,10 +40900,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + }, + { +- "referenced_type" : "type-15049" ++ "referenced_type" : "type-15001" + } + ], + "return_type" : "type-76", +@@ -40874,10 +40916,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + }, + { +- "referenced_type" : "type-15049" ++ "referenced_type" : "type-15001" + } + ], + "return_type" : "type-76", +@@ -40891,7 +40933,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + } + ], + "return_type" : "type-81", +@@ -40904,7 +40946,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19492" ++ "referenced_type" : "type-19444" + }, + { + "referenced_type" : "type-27" +@@ -40920,13 +40962,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19492" ++ "referenced_type" : "type-19444" + }, + { +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + }, + { +- "referenced_type" : "type-19503" ++ "referenced_type" : "type-19455" + }, + { + "referenced_type" : "type-12" +@@ -40945,13 +40987,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19492" ++ "referenced_type" : "type-19444" + }, + { +- "referenced_type" : "type-19492" ++ "referenced_type" : "type-19444" + }, + { +- "referenced_type" : "type-19503" ++ "referenced_type" : "type-19455" + }, + { + "referenced_type" : "type-12" +@@ -40970,13 +41012,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19492" ++ "referenced_type" : "type-19444" + }, + { +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + }, + { +- "referenced_type" : "type-19503" ++ "referenced_type" : "type-19455" + }, + { + "referenced_type" : "type-12" +@@ -40995,13 +41037,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19492" ++ "referenced_type" : "type-19444" + }, + { +- "referenced_type" : "type-19492" ++ "referenced_type" : "type-19444" + }, + { +- "referenced_type" : "type-19503" ++ "referenced_type" : "type-19455" + }, + { + "referenced_type" : "type-12" +@@ -41021,13 +41063,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + }, + { + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-19503" ++ "referenced_type" : "type-19455" + }, + { + "referenced_type" : "type-12" +@@ -41047,10 +41089,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + }, + { +- "referenced_type" : "type-2407" ++ "referenced_type" : "type-2337" + } + ], + "return_type" : "type-12", +@@ -41064,10 +41106,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + }, + { +- "referenced_type" : "type-2407" ++ "referenced_type" : "type-2337" + } + ], + "return_type" : "type-12", +@@ -41080,10 +41122,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + } + ], +- "return_type" : "type-19489", ++ "return_type" : "type-19441", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, + { +@@ -41094,10 +41136,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + }, + { +- "referenced_type" : "type-2407" ++ "referenced_type" : "type-2337" + } + ], + "return_type" : "type-12", +@@ -41110,7 +41152,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19495" ++ "referenced_type" : "type-19447" + }, + { + "referenced_type" : "type-27" +@@ -41126,13 +41168,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19495" ++ "referenced_type" : "type-19447" + }, + { + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-15049" ++ "referenced_type" : "type-15001" + } + ], + "return_type" : "type-81", +@@ -41145,7 +41187,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19495" ++ "referenced_type" : "type-19447" + } + ], + "return_type" : "type-81", +@@ -41159,10 +41201,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19495" ++ "referenced_type" : "type-19447" + }, + { +- "referenced_type" : "type-15049" ++ "referenced_type" : "type-15001" + } + ], + "return_type" : "type-81", +@@ -41176,7 +41218,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19495" ++ "referenced_type" : "type-19447" + } + ], + "return_type" : "type-81", +@@ -41189,7 +41231,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19495" ++ "referenced_type" : "type-19447" + } + ], + "return_type" : "type-12", +@@ -41202,7 +41244,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19495" ++ "referenced_type" : "type-19447" + }, + { + "referenced_type" : "type-27" +@@ -41218,10 +41260,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19495" ++ "referenced_type" : "type-19447" + }, + { +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + } + ], + "return_type" : "type-81", +@@ -41234,10 +41276,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19495" ++ "referenced_type" : "type-19447" + }, + { +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + } + ], + "return_type" : "type-81", +@@ -41250,7 +41292,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19495" ++ "referenced_type" : "type-19447" + } + ], + "return_type" : "type-81", +@@ -41263,7 +41305,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19495" ++ "referenced_type" : "type-19447" + } + ], + "return_type" : "type-81", +@@ -41276,10 +41318,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + } + ], +- "return_type" : "type-19489", ++ "return_type" : "type-19441", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, + { +@@ -41289,13 +41331,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-19489", ++ "return_type" : "type-19441", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, + { +@@ -41306,19 +41348,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + }, + { +- "referenced_type" : "type-15349" ++ "referenced_type" : "type-15301" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { + "referenced_type" : "type-66" + }, + { +- "referenced_type" : "type-15381" ++ "referenced_type" : "type-15333" + } + ], + "return_type" : "type-81", +@@ -41331,23 +41373,23 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + }, + { +- "referenced_type" : "type-15324" ++ "referenced_type" : "type-15276" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { + "referenced_type" : "type-66" + }, + { +- "referenced_type" : "type-15381" ++ "referenced_type" : "type-15333" + }, + { + "default_arg" : true, +- "referenced_type" : "type-19688" ++ "referenced_type" : "type-19640" + } + ], + "return_type" : "type-81", +@@ -41361,19 +41403,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + }, + { +- "referenced_type" : "type-15349" ++ "referenced_type" : "type-15301" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { + "referenced_type" : "type-66" + }, + { +- "referenced_type" : "type-15381" ++ "referenced_type" : "type-15333" + } + ], + "return_type" : "type-81", +@@ -41386,23 +41428,23 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + }, + { +- "referenced_type" : "type-15324" ++ "referenced_type" : "type-15276" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { + "referenced_type" : "type-66" + }, + { +- "referenced_type" : "type-15381" ++ "referenced_type" : "type-15333" + }, + { + "default_arg" : true, +- "referenced_type" : "type-19688" ++ "referenced_type" : "type-19640" + } + ], + "return_type" : "type-81", +@@ -41415,7 +41457,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + } + ], + "return_type" : "type-81", +@@ -41428,7 +41470,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + } + ], + "return_type" : "type-81", +@@ -41441,7 +41483,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19489" ++ "referenced_type" : "type-19441" + } + ], + "return_type" : "type-81", +@@ -41454,7 +41496,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15354" ++ "referenced_type" : "type-15306" + }, + { + "referenced_type" : "type-27" +@@ -41463,7 +41505,7 @@ + "referenced_type" : "type-12" + } + ], +- "return_type" : "type-15354", ++ "return_type" : "type-15306", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h" + }, + { +@@ -41473,13 +41515,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15354" ++ "referenced_type" : "type-15306" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-15354", ++ "return_type" : "type-15306", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h" + }, + { +@@ -41489,7 +41531,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15354" ++ "referenced_type" : "type-15306" + }, + { + "referenced_type" : "type-27" +@@ -41498,7 +41540,7 @@ + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-15354", ++ "return_type" : "type-15306", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h" + }, + { +@@ -41508,7 +41550,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15354" ++ "referenced_type" : "type-15306" + }, + { + "referenced_type" : "type-27" +@@ -41517,7 +41559,7 @@ + "referenced_type" : "type-96" + } + ], +- "return_type" : "type-15354", ++ "return_type" : "type-15306", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h" + }, + { +@@ -41527,7 +41569,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15354" ++ "referenced_type" : "type-15306" + }, + { + "referenced_type" : "type-27" +@@ -41536,7 +41578,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-15354", ++ "return_type" : "type-15306", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h" + }, + { +@@ -41546,7 +41588,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15354" ++ "referenced_type" : "type-15306" + }, + { + "referenced_type" : "type-27" +@@ -41555,7 +41597,7 @@ + "referenced_type" : "type-89" + } + ], +- "return_type" : "type-15354", ++ "return_type" : "type-15306", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h" + }, + { +@@ -41565,13 +41607,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15354" ++ "referenced_type" : "type-15306" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-15354", ++ "return_type" : "type-15306", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h" + }, + { +@@ -41581,7 +41623,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15354" ++ "referenced_type" : "type-15306" + }, + { + "referenced_type" : "type-27" +@@ -41590,7 +41632,7 @@ + "referenced_type" : "type-98" + } + ], +- "return_type" : "type-15354", ++ "return_type" : "type-15306", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h" + }, + { +@@ -41600,7 +41642,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15354" ++ "referenced_type" : "type-15306" + }, + { + "referenced_type" : "type-27" +@@ -41609,7 +41651,7 @@ + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-15354", ++ "return_type" : "type-15306", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h" + }, + { +@@ -41619,7 +41661,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15354" ++ "referenced_type" : "type-15306" + }, + { + "referenced_type" : "type-27" +@@ -41628,7 +41670,7 @@ + "referenced_type" : "type-4" + } + ], +- "return_type" : "type-15354", ++ "return_type" : "type-15306", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h" + }, + { +@@ -41638,7 +41680,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15354" ++ "referenced_type" : "type-15306" + }, + { + "referenced_type" : "type-27" +@@ -41647,7 +41689,7 @@ + "referenced_type" : "type-91" + } + ], +- "return_type" : "type-15354", ++ "return_type" : "type-15306", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h" + }, + { +@@ -41657,13 +41699,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2407" ++ "referenced_type" : "type-2337" + }, + { +- "referenced_type" : "type-15349" ++ "referenced_type" : "type-15301" + } + ], +- "return_type" : "type-15044", ++ "return_type" : "type-14996", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h" + }, + { +@@ -41674,13 +41716,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15354" ++ "referenced_type" : "type-15306" + }, + { + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-15049" ++ "referenced_type" : "type-15001" + } + ], + "return_type" : "type-81", +@@ -41694,10 +41736,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15354" ++ "referenced_type" : "type-15306" + }, + { +- "referenced_type" : "type-15231" ++ "referenced_type" : "type-15183" + } + ], + "return_type" : "type-81", +@@ -41710,10 +41752,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15354" ++ "referenced_type" : "type-15306" + }, + { +- "referenced_type" : "type-15198" ++ "referenced_type" : "type-15150" + } + ], + "return_type" : "type-81", +@@ -41726,13 +41768,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2407" ++ "referenced_type" : "type-2337" + }, + { +- "referenced_type" : "type-15349" ++ "referenced_type" : "type-15301" + } + ], +- "return_type" : "type-15044", ++ "return_type" : "type-14996", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h" + }, + { +@@ -41743,10 +41785,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15231" ++ "referenced_type" : "type-15183" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], + "return_type" : "type-81", +@@ -41760,16 +41802,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15231" ++ "referenced_type" : "type-15183" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { +- "referenced_type" : "type-15349" ++ "referenced_type" : "type-15301" + } + ], +- "return_type" : "type-2492", ++ "return_type" : "type-2422", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h" + }, + { +@@ -41779,10 +41821,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15231" ++ "referenced_type" : "type-15183" + }, + { +- "referenced_type" : "type-15349" ++ "referenced_type" : "type-15301" + } + ], + "return_type" : "type-81", +@@ -41795,10 +41837,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15231" ++ "referenced_type" : "type-15183" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], + "return_type" : "type-81", +@@ -41811,13 +41853,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15231" ++ "referenced_type" : "type-15183" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-15231", ++ "return_type" : "type-15183", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h" + }, + { +@@ -41827,28 +41869,28 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15231" ++ "referenced_type" : "type-15183" + }, + { +- "referenced_type" : "type-15183" ++ "referenced_type" : "type-15135" + }, + { +- "referenced_type" : "type-2492" ++ "referenced_type" : "type-2422" + }, + { +- "referenced_type" : "type-15234" ++ "referenced_type" : "type-15186" + }, + { +- "referenced_type" : "type-15049" ++ "referenced_type" : "type-15001" + }, + { + "referenced_type" : "type-12" + }, + { +- "referenced_type" : "type-15178" ++ "referenced_type" : "type-15130" + }, + { +- "referenced_type" : "type-15199" ++ "referenced_type" : "type-15151" + } + ], + "return_type" : "type-81", +@@ -41861,28 +41903,28 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15231" ++ "referenced_type" : "type-15183" + }, + { +- "referenced_type" : "type-15183" ++ "referenced_type" : "type-15135" + }, + { +- "referenced_type" : "type-2492" ++ "referenced_type" : "type-2422" + }, + { +- "referenced_type" : "type-15234" ++ "referenced_type" : "type-15186" + }, + { +- "referenced_type" : "type-15049" ++ "referenced_type" : "type-15001" + }, + { + "referenced_type" : "type-12" + }, + { +- "referenced_type" : "type-15178" ++ "referenced_type" : "type-15130" + }, + { +- "referenced_type" : "type-15199" ++ "referenced_type" : "type-15151" + } + ], + "return_type" : "type-81", +@@ -41895,10 +41937,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15354" ++ "referenced_type" : "type-15306" + } + ], +- "return_type" : "type-15354", ++ "return_type" : "type-15306", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h" + }, + { +@@ -41908,10 +41950,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15354" ++ "referenced_type" : "type-15306" + } + ], +- "return_type" : "type-15354", ++ "return_type" : "type-15306", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h" + }, + { +@@ -41921,13 +41963,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15354" ++ "referenced_type" : "type-15306" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-15354", ++ "return_type" : "type-15306", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h" + }, + { +@@ -41938,7 +41980,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15354" ++ "referenced_type" : "type-15306" + } + ], + "return_type" : "type-81", +@@ -41951,16 +41993,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15354" ++ "referenced_type" : "type-15306" + }, + { +- "referenced_type" : "type-15324" ++ "referenced_type" : "type-15276" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], + "return_type" : "type-81", +@@ -41973,16 +42015,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15354" ++ "referenced_type" : "type-15306" + }, + { +- "referenced_type" : "type-15324" ++ "referenced_type" : "type-15276" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], + "return_type" : "type-81", +@@ -41995,7 +42037,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15354" ++ "referenced_type" : "type-15306" + } + ], + "return_type" : "type-81", +@@ -42008,7 +42050,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15354" ++ "referenced_type" : "type-15306" + } + ], + "return_type" : "type-81", +@@ -42021,7 +42063,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15354" ++ "referenced_type" : "type-15306" + } + ], + "return_type" : "type-81", +@@ -42033,10 +42075,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2415" ++ "referenced_type" : "type-2345" + }, + { +- "referenced_type" : "type-24668" ++ "referenced_type" : "type-24631" + }, + { + "referenced_type" : "type-98" +@@ -42051,16 +42093,16 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2415" ++ "referenced_type" : "type-2345" + }, + { +- "referenced_type" : "type-24668" ++ "referenced_type" : "type-24631" + }, + { +- "referenced_type" : "type-24668" ++ "referenced_type" : "type-24631" + } + ], +- "return_type" : "type-27107", ++ "return_type" : "type-27106", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/utility.h" + }, + { +@@ -42069,13 +42111,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2500" ++ "referenced_type" : "type-2430" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-2374", ++ "return_type" : "type-2302", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/utility.h" + }, + { +@@ -42084,13 +42126,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2492" ++ "referenced_type" : "type-2422" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-2365", ++ "return_type" : "type-2293", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/utility.h" + }, + { +@@ -42102,7 +42144,7 @@ + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-15398" ++ "referenced_type" : "type-15350" + } + ], + "return_type" : "type-76", +@@ -42114,13 +42156,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2500" ++ "referenced_type" : "type-2430" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-2374", ++ "return_type" : "type-2302", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/utility.h" + }, + { +@@ -42129,10 +42171,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2407" ++ "referenced_type" : "type-2337" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + } + ], + "return_type" : "type-12", +@@ -42145,10 +42187,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24642" ++ "referenced_type" : "type-24610" + } + ], +- "return_type" : "type-15343", ++ "return_type" : "type-15295", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/type_info_test_helper.h" + }, + { +@@ -42158,10 +42200,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24642" ++ "referenced_type" : "type-24610" + }, + { +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + } + ], + "return_type" : "type-81", +@@ -42174,13 +42216,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24642" ++ "referenced_type" : "type-24610" + }, + { +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + } + ], + "return_type" : "type-81", +@@ -42193,10 +42235,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24642" ++ "referenced_type" : "type-24610" + }, + { +- "referenced_type" : "type-24648" ++ "referenced_type" : "type-24614" + } + ], + "return_type" : "type-81", +@@ -42209,16 +42251,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24642" ++ "referenced_type" : "type-24610" + }, + { + "referenced_type" : "type-612" + }, + { +- "referenced_type" : "type-24490" ++ "referenced_type" : "type-24467" + } + ], +- "return_type" : "type-19478", ++ "return_type" : "type-19430", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/type_info_test_helper.h" + }, + { +@@ -42228,22 +42270,22 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24642" ++ "referenced_type" : "type-24610" + }, + { +- "referenced_type" : "type-24490" ++ "referenced_type" : "type-24467" + }, + { + "referenced_type" : "type-66" + }, + { +- "referenced_type" : "type-15381" ++ "referenced_type" : "type-15333" + }, + { +- "referenced_type" : "type-19688" ++ "referenced_type" : "type-19640" + } + ], +- "return_type" : "type-19489", ++ "return_type" : "type-19441", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/type_info_test_helper.h" + }, + { +@@ -42253,16 +42295,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-24642" ++ "referenced_type" : "type-24610" + }, + { +- "referenced_type" : "type-24490" ++ "referenced_type" : "type-24467" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], +- "return_type" : "type-15354", ++ "return_type" : "type-15306", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/type_info_test_helper.h" + }, + { +@@ -42271,10 +42313,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-15324" ++ "referenced_type" : "type-15276" + } + ], +- "return_type" : "type-15343", ++ "return_type" : "type-15295", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/type_info.h" + }, + { +@@ -42687,7 +42729,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4399" ++ "referenced_type" : "type-4351" + } + ], + "return_type" : "type-81", +@@ -42701,7 +42743,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4399" ++ "referenced_type" : "type-4351" + } + ], + "return_type" : "type-81", +@@ -42710,7 +42752,7 @@ + { + "function_name" : "google::protobuf::Empty::descriptor", + "linker_set_key" : "_ZN6google8protobuf5Empty10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/empty.pb.h" + }, + { +@@ -42721,10 +42763,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4399" ++ "referenced_type" : "type-4351" + }, + { +- "referenced_type" : "type-4399" ++ "referenced_type" : "type-4351" + } + ], + "return_type" : "type-81", +@@ -42737,10 +42779,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4399" ++ "referenced_type" : "type-4351" + }, + { +- "referenced_type" : "type-4399" ++ "referenced_type" : "type-4351" + } + ], + "return_type" : "type-81", +@@ -42749,7 +42791,7 @@ + { + "function_name" : "google::protobuf::Empty::default_instance", + "linker_set_key" : "_ZN6google8protobuf5Empty16default_instanceEv", +- "return_type" : "type-4445", ++ "return_type" : "type-4397", + "source_file" : "/external/protobuf/src/google/protobuf/empty.pb.h" + }, + { +@@ -42760,7 +42802,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4399" ++ "referenced_type" : "type-4351" + } + ], + "return_type" : "type-81", +@@ -42773,7 +42815,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4399" ++ "referenced_type" : "type-4351" + }, + { + "referenced_type" : "type-612" +@@ -42789,10 +42831,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4399" ++ "referenced_type" : "type-4351" + }, + { +- "referenced_type" : "type-4399" ++ "referenced_type" : "type-4351" + } + ], + "return_type" : "type-81", +@@ -42805,7 +42847,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4399" ++ "referenced_type" : "type-4351" + } + ], + "return_type" : "type-81", +@@ -42818,10 +42860,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4399" ++ "referenced_type" : "type-4351" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -42834,10 +42876,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4399" ++ "referenced_type" : "type-4351" + }, + { +- "referenced_type" : "type-4445" ++ "referenced_type" : "type-4397" + } + ], + "return_type" : "type-81", +@@ -42863,10 +42905,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4399" ++ "referenced_type" : "type-4351" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -42879,10 +42921,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4399" ++ "referenced_type" : "type-4351" + }, + { +- "referenced_type" : "type-4445" ++ "referenced_type" : "type-4397" + } + ], + "return_type" : "type-81", +@@ -42896,7 +42938,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4399" ++ "referenced_type" : "type-4351" + }, + { + "referenced_type" : "type-288" +@@ -42912,10 +42954,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4399" ++ "referenced_type" : "type-4351" + }, + { +- "referenced_type" : "type-4445" ++ "referenced_type" : "type-4397" + } + ], + "return_type" : "type-81", +@@ -42928,7 +42970,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4399" ++ "referenced_type" : "type-4351" + } + ], + "return_type" : "type-81", +@@ -42942,7 +42984,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4399" ++ "referenced_type" : "type-4351" + }, + { + "referenced_type" : "type-288" +@@ -42958,10 +43000,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4399" ++ "referenced_type" : "type-4351" + }, + { +- "referenced_type" : "type-4445" ++ "referenced_type" : "type-4397" + } + ], + "return_type" : "type-81", +@@ -42974,7 +43016,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4399" ++ "referenced_type" : "type-4351" + } + ], + "return_type" : "type-81", +@@ -42987,7 +43029,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4399" ++ "referenced_type" : "type-4351" + } + ], + "return_type" : "type-81", +@@ -43000,7 +43042,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4399" ++ "referenced_type" : "type-4351" + } + ], + "return_type" : "type-81", +@@ -43013,7 +43055,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4399" ++ "referenced_type" : "type-4351" + } + ], + "return_type" : "type-81", +@@ -43027,7 +43069,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2363" ++ "referenced_type" : "type-2291" + } + ], + "return_type" : "type-81", +@@ -43041,7 +43083,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2363" ++ "referenced_type" : "type-2291" + } + ], + "return_type" : "type-81", +@@ -43050,7 +43092,7 @@ + { + "function_name" : "google::protobuf::Field::descriptor", + "linker_set_key" : "_ZN6google8protobuf5Field10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -43061,10 +43103,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2363" ++ "referenced_type" : "type-2291" + }, + { +- "referenced_type" : "type-2363" ++ "referenced_type" : "type-2291" + } + ], + "return_type" : "type-81", +@@ -43073,7 +43115,7 @@ + { + "function_name" : "google::protobuf::Field::default_instance", + "linker_set_key" : "_ZN6google8protobuf5Field16default_instanceEv", +- "return_type" : "type-2407", ++ "return_type" : "type-2337", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -43084,7 +43126,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2363" ++ "referenced_type" : "type-2291" + } + ], + "return_type" : "type-81", +@@ -43097,7 +43139,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2363" ++ "referenced_type" : "type-2291" + }, + { + "referenced_type" : "type-612" +@@ -43113,10 +43155,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2363" ++ "referenced_type" : "type-2291" + }, + { +- "referenced_type" : "type-2363" ++ "referenced_type" : "type-2291" + } + ], + "return_type" : "type-81", +@@ -43129,7 +43171,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2363" ++ "referenced_type" : "type-2291" + } + ], + "return_type" : "type-81", +@@ -43142,10 +43184,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2363" ++ "referenced_type" : "type-2291" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -43158,10 +43200,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2363" ++ "referenced_type" : "type-2291" + }, + { +- "referenced_type" : "type-2407" ++ "referenced_type" : "type-2337" + } + ], + "return_type" : "type-81", +@@ -43174,10 +43216,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2363" ++ "referenced_type" : "type-2291" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -43190,10 +43232,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2363" ++ "referenced_type" : "type-2291" + }, + { +- "referenced_type" : "type-2407" ++ "referenced_type" : "type-2337" + } + ], + "return_type" : "type-81", +@@ -43206,10 +43248,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2363" ++ "referenced_type" : "type-2291" + }, + { +- "referenced_type" : "type-2407" ++ "referenced_type" : "type-2337" + } + ], + "return_type" : "type-81", +@@ -43222,7 +43264,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2363" ++ "referenced_type" : "type-2291" + } + ], + "return_type" : "type-81", +@@ -43235,10 +43277,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2363" ++ "referenced_type" : "type-2291" + }, + { +- "referenced_type" : "type-2407" ++ "referenced_type" : "type-2337" + } + ], + "return_type" : "type-81", +@@ -43251,7 +43293,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2363" ++ "referenced_type" : "type-2291" + } + ], + "return_type" : "type-81", +@@ -43264,7 +43306,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2363" ++ "referenced_type" : "type-2291" + } + ], + "return_type" : "type-81", +@@ -43277,7 +43319,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2363" ++ "referenced_type" : "type-2291" + } + ], + "return_type" : "type-81", +@@ -43290,7 +43332,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2363" ++ "referenced_type" : "type-2291" + } + ], + "return_type" : "type-81", +@@ -43304,7 +43346,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2350" ++ "referenced_type" : "type-2277" + } + ], + "return_type" : "type-81", +@@ -43318,7 +43360,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2350" ++ "referenced_type" : "type-2277" + } + ], + "return_type" : "type-81", +@@ -43327,7 +43369,7 @@ + { + "function_name" : "google::protobuf::Mixin::descriptor", + "linker_set_key" : "_ZN6google8protobuf5Mixin10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/api.pb.h" + }, + { +@@ -43338,10 +43380,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2350" ++ "referenced_type" : "type-2277" + }, + { +- "referenced_type" : "type-2350" ++ "referenced_type" : "type-2277" + } + ], + "return_type" : "type-81", +@@ -43350,7 +43392,7 @@ + { + "function_name" : "google::protobuf::Mixin::default_instance", + "linker_set_key" : "_ZN6google8protobuf5Mixin16default_instanceEv", +- "return_type" : "type-2382", ++ "return_type" : "type-2310", + "source_file" : "/external/protobuf/src/google/protobuf/api.pb.h" + }, + { +@@ -43361,7 +43403,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2350" ++ "referenced_type" : "type-2277" + } + ], + "return_type" : "type-81", +@@ -43374,7 +43416,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2350" ++ "referenced_type" : "type-2277" + }, + { + "referenced_type" : "type-612" +@@ -43390,10 +43432,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2350" ++ "referenced_type" : "type-2277" + }, + { +- "referenced_type" : "type-2350" ++ "referenced_type" : "type-2277" + } + ], + "return_type" : "type-81", +@@ -43406,7 +43448,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2350" ++ "referenced_type" : "type-2277" + } + ], + "return_type" : "type-81", +@@ -43419,10 +43461,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2350" ++ "referenced_type" : "type-2277" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -43435,10 +43477,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2350" ++ "referenced_type" : "type-2277" + }, + { +- "referenced_type" : "type-2382" ++ "referenced_type" : "type-2310" + } + ], + "return_type" : "type-81", +@@ -43451,10 +43493,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2350" ++ "referenced_type" : "type-2277" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -43467,10 +43509,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2350" ++ "referenced_type" : "type-2277" + }, + { +- "referenced_type" : "type-2382" ++ "referenced_type" : "type-2310" + } + ], + "return_type" : "type-81", +@@ -43483,10 +43525,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2350" ++ "referenced_type" : "type-2277" + }, + { +- "referenced_type" : "type-2382" ++ "referenced_type" : "type-2310" + } + ], + "return_type" : "type-81", +@@ -43499,7 +43541,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2350" ++ "referenced_type" : "type-2277" + } + ], + "return_type" : "type-81", +@@ -43512,10 +43554,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2350" ++ "referenced_type" : "type-2277" + }, + { +- "referenced_type" : "type-2382" ++ "referenced_type" : "type-2310" + } + ], + "return_type" : "type-81", +@@ -43528,7 +43570,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2350" ++ "referenced_type" : "type-2277" + } + ], + "return_type" : "type-81", +@@ -43541,7 +43583,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2350" ++ "referenced_type" : "type-2277" + } + ], + "return_type" : "type-81", +@@ -43554,7 +43596,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2350" ++ "referenced_type" : "type-2277" + } + ], + "return_type" : "type-81", +@@ -43567,7 +43609,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2350" ++ "referenced_type" : "type-2277" + } + ], + "return_type" : "type-81", +@@ -43581,7 +43623,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7226" ++ "referenced_type" : "type-7178" + } + ], + "return_type" : "type-81", +@@ -43595,7 +43637,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7226" ++ "referenced_type" : "type-7178" + } + ], + "return_type" : "type-81", +@@ -43609,7 +43651,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7226" ++ "referenced_type" : "type-7178" + } + ], + "return_type" : "type-81", +@@ -43618,7 +43660,7 @@ + { + "function_name" : "google::protobuf::Value::descriptor", + "linker_set_key" : "_ZN6google8protobuf5Value10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/struct.pb.h" + }, + { +@@ -43629,10 +43671,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7226" ++ "referenced_type" : "type-7178" + }, + { +- "referenced_type" : "type-7226" ++ "referenced_type" : "type-7178" + } + ], + "return_type" : "type-81", +@@ -43641,7 +43683,7 @@ + { + "function_name" : "google::protobuf::Value::default_instance", + "linker_set_key" : "_ZN6google8protobuf5Value16default_instanceEv", +- "return_type" : "type-7289", ++ "return_type" : "type-7241", + "source_file" : "/external/protobuf/src/google/protobuf/struct.pb.h" + }, + { +@@ -43652,7 +43694,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7226" ++ "referenced_type" : "type-7178" + } + ], + "return_type" : "type-81", +@@ -43665,7 +43707,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7226" ++ "referenced_type" : "type-7178" + }, + { + "referenced_type" : "type-612" +@@ -43681,10 +43723,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7226" ++ "referenced_type" : "type-7178" + }, + { +- "referenced_type" : "type-7226" ++ "referenced_type" : "type-7178" + } + ], + "return_type" : "type-81", +@@ -43697,7 +43739,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7226" ++ "referenced_type" : "type-7178" + } + ], + "return_type" : "type-81", +@@ -43710,10 +43752,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7226" ++ "referenced_type" : "type-7178" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -43726,10 +43768,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7226" ++ "referenced_type" : "type-7178" + }, + { +- "referenced_type" : "type-7289" ++ "referenced_type" : "type-7241" + } + ], + "return_type" : "type-81", +@@ -43742,10 +43784,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7226" ++ "referenced_type" : "type-7178" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -43758,10 +43800,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7226" ++ "referenced_type" : "type-7178" + }, + { +- "referenced_type" : "type-7289" ++ "referenced_type" : "type-7241" + } + ], + "return_type" : "type-81", +@@ -43774,10 +43816,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7226" ++ "referenced_type" : "type-7178" + }, + { +- "referenced_type" : "type-7289" ++ "referenced_type" : "type-7241" + } + ], + "return_type" : "type-81", +@@ -43790,7 +43832,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7226" ++ "referenced_type" : "type-7178" + } + ], + "return_type" : "type-81", +@@ -43803,10 +43845,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7226" ++ "referenced_type" : "type-7178" + }, + { +- "referenced_type" : "type-7289" ++ "referenced_type" : "type-7241" + } + ], + "return_type" : "type-81", +@@ -43819,7 +43861,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7226" ++ "referenced_type" : "type-7178" + } + ], + "return_type" : "type-81", +@@ -43832,7 +43874,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7226" ++ "referenced_type" : "type-7178" + } + ], + "return_type" : "type-81", +@@ -43845,7 +43887,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7226" ++ "referenced_type" : "type-7178" + } + ], + "return_type" : "type-81", +@@ -43858,7 +43900,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7226" ++ "referenced_type" : "type-7178" + } + ], + "return_type" : "type-81", +@@ -43908,7 +43950,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2348" ++ "referenced_type" : "type-2275" + } + ], + "return_type" : "type-81", +@@ -43922,7 +43964,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2348" ++ "referenced_type" : "type-2275" + } + ], + "return_type" : "type-81", +@@ -43931,7 +43973,7 @@ + { + "function_name" : "google::protobuf::Method::descriptor", + "linker_set_key" : "_ZN6google8protobuf6Method10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/api.pb.h" + }, + { +@@ -43942,10 +43984,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2348" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2348" ++ "referenced_type" : "type-2275" + } + ], + "return_type" : "type-81", +@@ -43954,7 +43996,7 @@ + { + "function_name" : "google::protobuf::Method::default_instance", + "linker_set_key" : "_ZN6google8protobuf6Method16default_instanceEv", +- "return_type" : "type-2378", ++ "return_type" : "type-2306", + "source_file" : "/external/protobuf/src/google/protobuf/api.pb.h" + }, + { +@@ -43965,7 +44007,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2348" ++ "referenced_type" : "type-2275" + } + ], + "return_type" : "type-81", +@@ -43978,7 +44020,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2348" ++ "referenced_type" : "type-2275" + }, + { + "referenced_type" : "type-612" +@@ -43994,10 +44036,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2348" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2348" ++ "referenced_type" : "type-2275" + } + ], + "return_type" : "type-81", +@@ -44010,7 +44052,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2348" ++ "referenced_type" : "type-2275" + } + ], + "return_type" : "type-81", +@@ -44023,10 +44065,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2348" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -44039,10 +44081,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2348" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2378" ++ "referenced_type" : "type-2306" + } + ], + "return_type" : "type-81", +@@ -44055,10 +44097,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2348" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -44071,10 +44113,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2348" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2378" ++ "referenced_type" : "type-2306" + } + ], + "return_type" : "type-81", +@@ -44087,10 +44129,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2348" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2378" ++ "referenced_type" : "type-2306" + } + ], + "return_type" : "type-81", +@@ -44103,7 +44145,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2348" ++ "referenced_type" : "type-2275" + } + ], + "return_type" : "type-81", +@@ -44116,10 +44158,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2348" ++ "referenced_type" : "type-2275" + }, + { +- "referenced_type" : "type-2378" ++ "referenced_type" : "type-2306" + } + ], + "return_type" : "type-81", +@@ -44132,7 +44174,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2348" ++ "referenced_type" : "type-2275" + } + ], + "return_type" : "type-81", +@@ -44145,7 +44187,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2348" ++ "referenced_type" : "type-2275" + } + ], + "return_type" : "type-81", +@@ -44158,7 +44200,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2348" ++ "referenced_type" : "type-2275" + } + ], + "return_type" : "type-81", +@@ -44171,7 +44213,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2348" ++ "referenced_type" : "type-2275" + } + ], + "return_type" : "type-81", +@@ -44185,7 +44227,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2367" ++ "referenced_type" : "type-2295" + } + ], + "return_type" : "type-81", +@@ -44199,7 +44241,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2367" ++ "referenced_type" : "type-2295" + } + ], + "return_type" : "type-81", +@@ -44208,7 +44250,7 @@ + { + "function_name" : "google::protobuf::Option::descriptor", + "linker_set_key" : "_ZN6google8protobuf6Option10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -44219,10 +44261,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2367" ++ "referenced_type" : "type-2295" + }, + { +- "referenced_type" : "type-2367" ++ "referenced_type" : "type-2295" + } + ], + "return_type" : "type-81", +@@ -44231,7 +44273,7 @@ + { + "function_name" : "google::protobuf::Option::default_instance", + "linker_set_key" : "_ZN6google8protobuf6Option16default_instanceEv", +- "return_type" : "type-2370", ++ "return_type" : "type-2298", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -44242,7 +44284,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2367" ++ "referenced_type" : "type-2295" + } + ], + "return_type" : "type-81", +@@ -44255,7 +44297,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2367" ++ "referenced_type" : "type-2295" + }, + { + "referenced_type" : "type-612" +@@ -44271,10 +44313,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2367" ++ "referenced_type" : "type-2295" + }, + { +- "referenced_type" : "type-2367" ++ "referenced_type" : "type-2295" + } + ], + "return_type" : "type-81", +@@ -44287,7 +44329,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2367" ++ "referenced_type" : "type-2295" + } + ], + "return_type" : "type-81", +@@ -44300,10 +44342,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2367" ++ "referenced_type" : "type-2295" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -44316,10 +44358,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2367" ++ "referenced_type" : "type-2295" + }, + { +- "referenced_type" : "type-2370" ++ "referenced_type" : "type-2298" + } + ], + "return_type" : "type-81", +@@ -44332,10 +44374,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2367" ++ "referenced_type" : "type-2295" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -44348,10 +44390,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2367" ++ "referenced_type" : "type-2295" + }, + { +- "referenced_type" : "type-2370" ++ "referenced_type" : "type-2298" + } + ], + "return_type" : "type-81", +@@ -44364,10 +44406,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2367" ++ "referenced_type" : "type-2295" + }, + { +- "referenced_type" : "type-2370" ++ "referenced_type" : "type-2298" + } + ], + "return_type" : "type-81", +@@ -44380,7 +44422,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2367" ++ "referenced_type" : "type-2295" + } + ], + "return_type" : "type-81", +@@ -44393,10 +44435,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2367" ++ "referenced_type" : "type-2295" + }, + { +- "referenced_type" : "type-2370" ++ "referenced_type" : "type-2298" + } + ], + "return_type" : "type-81", +@@ -44409,7 +44451,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2367" ++ "referenced_type" : "type-2295" + } + ], + "return_type" : "type-81", +@@ -44422,7 +44464,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2367" ++ "referenced_type" : "type-2295" + } + ], + "return_type" : "type-81", +@@ -44435,7 +44477,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2367" ++ "referenced_type" : "type-2295" + } + ], + "return_type" : "type-81", +@@ -44448,7 +44490,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2367" ++ "referenced_type" : "type-2295" + } + ], + "return_type" : "type-81", +@@ -44666,7 +44708,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7217" ++ "referenced_type" : "type-7169" + } + ], + "return_type" : "type-81", +@@ -44680,7 +44722,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7217" ++ "referenced_type" : "type-7169" + } + ], + "return_type" : "type-81", +@@ -44689,7 +44731,7 @@ + { + "function_name" : "google::protobuf::Struct::descriptor", + "linker_set_key" : "_ZN6google8protobuf6Struct10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/struct.pb.h" + }, + { +@@ -44700,10 +44742,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7217" ++ "referenced_type" : "type-7169" + }, + { +- "referenced_type" : "type-7217" ++ "referenced_type" : "type-7169" + } + ], + "return_type" : "type-81", +@@ -44712,7 +44754,7 @@ + { + "function_name" : "google::protobuf::Struct::default_instance", + "linker_set_key" : "_ZN6google8protobuf6Struct16default_instanceEv", +- "return_type" : "type-7280", ++ "return_type" : "type-7232", + "source_file" : "/external/protobuf/src/google/protobuf/struct.pb.h" + }, + { +@@ -44723,7 +44765,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7217" ++ "referenced_type" : "type-7169" + } + ], + "return_type" : "type-81", +@@ -44736,7 +44778,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7217" ++ "referenced_type" : "type-7169" + }, + { + "referenced_type" : "type-612" +@@ -44752,10 +44794,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7217" ++ "referenced_type" : "type-7169" + }, + { +- "referenced_type" : "type-7217" ++ "referenced_type" : "type-7169" + } + ], + "return_type" : "type-81", +@@ -44768,7 +44810,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7217" ++ "referenced_type" : "type-7169" + } + ], + "return_type" : "type-81", +@@ -44781,10 +44823,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7217" ++ "referenced_type" : "type-7169" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -44797,10 +44839,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7217" ++ "referenced_type" : "type-7169" + }, + { +- "referenced_type" : "type-7280" ++ "referenced_type" : "type-7232" + } + ], + "return_type" : "type-81", +@@ -44813,10 +44855,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7217" ++ "referenced_type" : "type-7169" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -44829,10 +44871,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7217" ++ "referenced_type" : "type-7169" + }, + { +- "referenced_type" : "type-7280" ++ "referenced_type" : "type-7232" + } + ], + "return_type" : "type-81", +@@ -44845,10 +44887,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7217" ++ "referenced_type" : "type-7169" + }, + { +- "referenced_type" : "type-7280" ++ "referenced_type" : "type-7232" + } + ], + "return_type" : "type-81", +@@ -44861,7 +44903,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7217" ++ "referenced_type" : "type-7169" + } + ], + "return_type" : "type-81", +@@ -44874,10 +44916,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7217" ++ "referenced_type" : "type-7169" + }, + { +- "referenced_type" : "type-7280" ++ "referenced_type" : "type-7232" + } + ], + "return_type" : "type-81", +@@ -44890,7 +44932,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7217" ++ "referenced_type" : "type-7169" + } + ], + "return_type" : "type-81", +@@ -44903,7 +44945,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7217" ++ "referenced_type" : "type-7169" + } + ], + "return_type" : "type-81", +@@ -44916,7 +44958,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7217" ++ "referenced_type" : "type-7169" + } + ], + "return_type" : "type-81", +@@ -44929,7 +44971,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7217" ++ "referenced_type" : "type-7169" + } + ], + "return_type" : "type-81", +@@ -45005,10 +45047,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-6942" ++ "referenced_type" : "type-6894" + } + ], + "return_type" : "type-12", +@@ -45021,7 +45063,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-81", +@@ -45034,7 +45076,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { + "referenced_type" : "type-472" +@@ -45050,7 +45092,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { + "referenced_type" : "type-1" +@@ -45066,10 +45108,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-6942" ++ "referenced_type" : "type-6894" + } + ], + "return_type" : "type-12", +@@ -45082,7 +45124,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { + "referenced_type" : "type-612" +@@ -45098,7 +45140,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { + "referenced_type" : "type-1" +@@ -45114,7 +45156,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-81", +@@ -45127,10 +45169,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -45143,10 +45185,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -45159,7 +45201,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-81", +@@ -45172,7 +45214,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-81", +@@ -45185,7 +45227,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-81", +@@ -45198,7 +45240,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7103" ++ "referenced_type" : "type-7055" + } + ], + "return_type" : "type-81", +@@ -45211,7 +45253,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7103" ++ "referenced_type" : "type-7055" + } + ], + "return_type" : "type-81", +@@ -45224,7 +45266,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7103" ++ "referenced_type" : "type-7055" + } + ], + "return_type" : "type-81", +@@ -45271,46 +45313,46 @@ + }, + { + "default_arg" : true, +- "referenced_type" : "type-7610" ++ "referenced_type" : "type-7562" + }, + { + "default_arg" : true, +- "referenced_type" : "type-7610" ++ "referenced_type" : "type-7562" + }, + { + "default_arg" : true, +- "referenced_type" : "type-7610" ++ "referenced_type" : "type-7562" + }, + { + "default_arg" : true, +- "referenced_type" : "type-7610" ++ "referenced_type" : "type-7562" + }, + { + "default_arg" : true, +- "referenced_type" : "type-7610" ++ "referenced_type" : "type-7562" + }, + { + "default_arg" : true, +- "referenced_type" : "type-7610" ++ "referenced_type" : "type-7562" + }, + { + "default_arg" : true, +- "referenced_type" : "type-7610" ++ "referenced_type" : "type-7562" + }, + { + "default_arg" : true, +- "referenced_type" : "type-7610" ++ "referenced_type" : "type-7562" + }, + { + "default_arg" : true, +- "referenced_type" : "type-7610" ++ "referenced_type" : "type-7562" + }, + { + "default_arg" : true, +- "referenced_type" : "type-7610" ++ "referenced_type" : "type-7562" + } + ], +- "return_type" : "type-10223", ++ "return_type" : "type-10175", + "source_file" : "/external/protobuf/src/google/protobuf/stubs/substitute.h" + }, + { +@@ -45465,50 +45507,50 @@ + "parameters" : + [ + { +- "referenced_type" : "type-7617" ++ "referenced_type" : "type-7569" + }, + { + "referenced_type" : "type-5" + }, + { + "default_arg" : true, +- "referenced_type" : "type-7610" ++ "referenced_type" : "type-7562" + }, + { + "default_arg" : true, +- "referenced_type" : "type-7610" ++ "referenced_type" : "type-7562" + }, + { + "default_arg" : true, +- "referenced_type" : "type-7610" ++ "referenced_type" : "type-7562" + }, + { + "default_arg" : true, +- "referenced_type" : "type-7610" ++ "referenced_type" : "type-7562" + }, + { + "default_arg" : true, +- "referenced_type" : "type-7610" ++ "referenced_type" : "type-7562" + }, + { + "default_arg" : true, +- "referenced_type" : "type-7610" ++ "referenced_type" : "type-7562" + }, + { + "default_arg" : true, +- "referenced_type" : "type-7610" ++ "referenced_type" : "type-7562" + }, + { + "default_arg" : true, +- "referenced_type" : "type-7610" ++ "referenced_type" : "type-7562" + }, + { + "default_arg" : true, +- "referenced_type" : "type-7610" ++ "referenced_type" : "type-7562" + }, + { + "default_arg" : true, +- "referenced_type" : "type-7610" ++ "referenced_type" : "type-7562" + } + ], + "return_type" : "type-81", +@@ -45834,7 +45876,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4177" ++ "referenced_type" : "type-4129" + } + ], + "return_type" : "type-81", +@@ -45848,7 +45890,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4177" ++ "referenced_type" : "type-4129" + } + ], + "return_type" : "type-81", +@@ -45857,7 +45899,7 @@ + { + "function_name" : "google::protobuf::Duration::descriptor", + "linker_set_key" : "_ZN6google8protobuf8Duration10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/duration.pb.h" + }, + { +@@ -45868,10 +45910,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4177" ++ "referenced_type" : "type-4129" + }, + { +- "referenced_type" : "type-4177" ++ "referenced_type" : "type-4129" + } + ], + "return_type" : "type-81", +@@ -45880,7 +45922,7 @@ + { + "function_name" : "google::protobuf::Duration::default_instance", + "linker_set_key" : "_ZN6google8protobuf8Duration16default_instanceEv", +- "return_type" : "type-4233", ++ "return_type" : "type-4185", + "source_file" : "/external/protobuf/src/google/protobuf/duration.pb.h" + }, + { +@@ -45891,7 +45933,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4177" ++ "referenced_type" : "type-4129" + } + ], + "return_type" : "type-81", +@@ -45904,7 +45946,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4177" ++ "referenced_type" : "type-4129" + }, + { + "referenced_type" : "type-612" +@@ -45920,10 +45962,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4177" ++ "referenced_type" : "type-4129" + }, + { +- "referenced_type" : "type-4177" ++ "referenced_type" : "type-4129" + } + ], + "return_type" : "type-81", +@@ -45936,7 +45978,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4177" ++ "referenced_type" : "type-4129" + } + ], + "return_type" : "type-81", +@@ -45949,10 +45991,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4177" ++ "referenced_type" : "type-4129" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -45965,10 +46007,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4177" ++ "referenced_type" : "type-4129" + }, + { +- "referenced_type" : "type-4233" ++ "referenced_type" : "type-4185" + } + ], + "return_type" : "type-81", +@@ -45981,10 +46023,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4177" ++ "referenced_type" : "type-4129" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -45997,10 +46039,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4177" ++ "referenced_type" : "type-4129" + }, + { +- "referenced_type" : "type-4233" ++ "referenced_type" : "type-4185" + } + ], + "return_type" : "type-81", +@@ -46013,10 +46055,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4177" ++ "referenced_type" : "type-4129" + }, + { +- "referenced_type" : "type-4233" ++ "referenced_type" : "type-4185" + } + ], + "return_type" : "type-81", +@@ -46029,7 +46071,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4177" ++ "referenced_type" : "type-4129" + } + ], + "return_type" : "type-81", +@@ -46042,10 +46084,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4177" ++ "referenced_type" : "type-4129" + }, + { +- "referenced_type" : "type-4233" ++ "referenced_type" : "type-4185" + } + ], + "return_type" : "type-81", +@@ -46058,7 +46100,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4177" ++ "referenced_type" : "type-4129" + } + ], + "return_type" : "type-81", +@@ -46071,7 +46113,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4177" ++ "referenced_type" : "type-4129" + } + ], + "return_type" : "type-81", +@@ -46084,7 +46126,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4177" ++ "referenced_type" : "type-4129" + } + ], + "return_type" : "type-81", +@@ -46097,7 +46139,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4177" ++ "referenced_type" : "type-4129" + } + ], + "return_type" : "type-81", +@@ -46110,10 +46152,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11358" ++ "referenced_type" : "type-11310" + } + ], +- "return_type" : "type-13531", ++ "return_type" : "type-13483", + "source_file" : "/external/protobuf/src/google/protobuf/compiler/importer.h" + }, + { +@@ -46123,7 +46165,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11358" ++ "referenced_type" : "type-11310" + } + ], + "return_type" : "type-81", +@@ -46136,7 +46178,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11358" ++ "referenced_type" : "type-11310" + } + ], + "return_type" : "type-81", +@@ -46149,7 +46191,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11358" ++ "referenced_type" : "type-11310" + } + ], + "return_type" : "type-81", +@@ -46163,10 +46205,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11372" ++ "referenced_type" : "type-11324" + }, + { +- "referenced_type" : "type-11245" ++ "referenced_type" : "type-11197" + } + ], + "return_type" : "type-793", +@@ -46180,13 +46222,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11372" ++ "referenced_type" : "type-11324" + }, + { +- "referenced_type" : "type-11245" ++ "referenced_type" : "type-11197" + }, + { +- "referenced_type" : "type-11239" ++ "referenced_type" : "type-11191" + } + ], + "return_type" : "type-793", +@@ -46199,10 +46241,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11372" ++ "referenced_type" : "type-11324" + } + ], +- "return_type" : "type-13532", ++ "return_type" : "type-13484", + "source_file" : "/external/protobuf/src/google/protobuf/compiler/importer.h" + }, + { +@@ -46212,19 +46254,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11372" ++ "referenced_type" : "type-11324" + }, + { +- "referenced_type" : "type-11245" ++ "referenced_type" : "type-11197" + }, + { +- "referenced_type" : "type-11239" ++ "referenced_type" : "type-11191" + }, + { +- "referenced_type" : "type-11239" ++ "referenced_type" : "type-11191" + } + ], +- "return_type" : "type-11373", ++ "return_type" : "type-11325", + "source_file" : "/external/protobuf/src/google/protobuf/compiler/importer.h" + }, + { +@@ -46234,13 +46276,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11372" ++ "referenced_type" : "type-11324" + }, + { +- "referenced_type" : "type-11245" ++ "referenced_type" : "type-11197" + }, + { +- "referenced_type" : "type-11239" ++ "referenced_type" : "type-11191" + } + ], + "return_type" : "type-12", +@@ -46253,10 +46295,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11372" ++ "referenced_type" : "type-11324" + }, + { +- "referenced_type" : "type-11245" ++ "referenced_type" : "type-11197" + } + ], + "return_type" : "type-793", +@@ -46269,13 +46311,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11372" ++ "referenced_type" : "type-11324" + }, + { +- "referenced_type" : "type-11245" ++ "referenced_type" : "type-11197" + }, + { +- "referenced_type" : "type-11245" ++ "referenced_type" : "type-11197" + } + ], + "return_type" : "type-81", +@@ -46288,7 +46330,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11372" ++ "referenced_type" : "type-11324" + } + ], + "return_type" : "type-81", +@@ -46301,7 +46343,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11372" ++ "referenced_type" : "type-11324" + } + ], + "return_type" : "type-81", +@@ -46314,7 +46356,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11372" ++ "referenced_type" : "type-11324" + } + ], + "return_type" : "type-81", +@@ -46327,7 +46369,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11372" ++ "referenced_type" : "type-11324" + } + ], + "return_type" : "type-81", +@@ -46340,7 +46382,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11372" ++ "referenced_type" : "type-11324" + } + ], + "return_type" : "type-81", +@@ -46353,13 +46395,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11340" ++ "referenced_type" : "type-11292" + }, + { +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + }, + { +- "referenced_type" : "type-2055" ++ "referenced_type" : "type-1985" + }, + { + "referenced_type" : "type-1" +@@ -46378,7 +46420,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11340" ++ "referenced_type" : "type-11292" + } + ], + "return_type" : "type-81", +@@ -46391,7 +46433,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11340" ++ "referenced_type" : "type-11292" + } + ], + "return_type" : "type-81", +@@ -46404,7 +46446,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11340" ++ "referenced_type" : "type-11292" + } + ], + "return_type" : "type-81", +@@ -46417,7 +46459,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11340" ++ "referenced_type" : "type-11292" + } + ], + "return_type" : "type-81", +@@ -46430,7 +46472,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11340" ++ "referenced_type" : "type-11292" + } + ], + "return_type" : "type-81", +@@ -46443,7 +46485,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11360" ++ "referenced_type" : "type-11312" + } + ], + "return_type" : "type-81", +@@ -46456,7 +46498,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11360" ++ "referenced_type" : "type-11312" + } + ], + "return_type" : "type-81", +@@ -46469,7 +46511,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11360" ++ "referenced_type" : "type-11312" + } + ], + "return_type" : "type-81", +@@ -46482,13 +46524,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11363" ++ "referenced_type" : "type-11315" + }, + { +- "referenced_type" : "type-11245" ++ "referenced_type" : "type-11197" + }, + { +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-12", +@@ -46501,13 +46543,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11363" ++ "referenced_type" : "type-11315" + }, + { +- "referenced_type" : "type-11245" ++ "referenced_type" : "type-11197" + }, + { +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-12", +@@ -46520,22 +46562,22 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11364" ++ "referenced_type" : "type-11316" + }, + { +- "referenced_type" : "type-11245" ++ "referenced_type" : "type-11197" + }, + { +- "referenced_type" : "type-11245" ++ "referenced_type" : "type-11197" + }, + { +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + }, + { +- "referenced_type" : "type-2055" ++ "referenced_type" : "type-1985" + }, + { +- "referenced_type" : "type-11245" ++ "referenced_type" : "type-11197" + } + ], + "return_type" : "type-81", +@@ -46548,22 +46590,22 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11364" ++ "referenced_type" : "type-11316" + }, + { +- "referenced_type" : "type-11245" ++ "referenced_type" : "type-11197" + }, + { +- "referenced_type" : "type-11245" ++ "referenced_type" : "type-11197" + }, + { +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + }, + { +- "referenced_type" : "type-2055" ++ "referenced_type" : "type-1985" + }, + { +- "referenced_type" : "type-11245" ++ "referenced_type" : "type-11197" + } + ], + "return_type" : "type-81", +@@ -46576,10 +46618,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11364" ++ "referenced_type" : "type-11316" + }, + { +- "referenced_type" : "type-11363" ++ "referenced_type" : "type-11315" + } + ], + "return_type" : "type-81", +@@ -46592,10 +46634,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11364" ++ "referenced_type" : "type-11316" + }, + { +- "referenced_type" : "type-11363" ++ "referenced_type" : "type-11315" + } + ], + "return_type" : "type-81", +@@ -46608,7 +46650,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11364" ++ "referenced_type" : "type-11316" + } + ], + "return_type" : "type-81", +@@ -46621,7 +46663,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11364" ++ "referenced_type" : "type-11316" + } + ], + "return_type" : "type-81", +@@ -46634,7 +46676,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11364" ++ "referenced_type" : "type-11316" + } + ], + "return_type" : "type-81", +@@ -46647,16 +46689,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11363" ++ "referenced_type" : "type-11315" + }, + { +- "referenced_type" : "type-11245" ++ "referenced_type" : "type-11197" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-12", +@@ -46669,10 +46711,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11363" ++ "referenced_type" : "type-11315" + }, + { +- "referenced_type" : "type-11358" ++ "referenced_type" : "type-11310" + } + ], + "return_type" : "type-81", +@@ -46685,10 +46727,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11363" ++ "referenced_type" : "type-11315" + }, + { +- "referenced_type" : "type-11358" ++ "referenced_type" : "type-11310" + } + ], + "return_type" : "type-81", +@@ -46701,7 +46743,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11363" ++ "referenced_type" : "type-11315" + } + ], + "return_type" : "type-81", +@@ -46714,7 +46756,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11363" ++ "referenced_type" : "type-11315" + } + ], + "return_type" : "type-81", +@@ -46727,7 +46769,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11363" ++ "referenced_type" : "type-11315" + } + ], + "return_type" : "type-81", +@@ -46741,13 +46783,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-2196" ++ "referenced_type" : "type-2127" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-12", +@@ -46761,25 +46803,25 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-1898" ++ "referenced_type" : "type-1817" + }, + { +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-12", +@@ -46793,7 +46835,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { + "referenced_type" : "type-5" +@@ -46810,25 +46852,25 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-2086" ++ "referenced_type" : "type-2019" + }, + { +- "referenced_type" : "type-2071" ++ "referenced_type" : "type-2003" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-12", +@@ -46842,7 +46884,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { + "referenced_type" : "type-495" +@@ -46854,10 +46896,10 @@ + "referenced_type" : "type-486" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-12", +@@ -46871,19 +46913,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + }, + { +- "referenced_type" : "type-11349" ++ "referenced_type" : "type-11301" + } + ], + "return_type" : "type-12", +@@ -46897,16 +46939,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-12", +@@ -46920,10 +46962,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-1884" ++ "referenced_type" : "type-1802" + } + ], + "return_type" : "type-12", +@@ -46937,7 +46979,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { + "referenced_type" : "type-97" +@@ -46957,10 +46999,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-11388" ++ "referenced_type" : "type-11340" + }, + { + "referenced_type" : "type-5" +@@ -46977,16 +47019,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-12", +@@ -47000,13 +47042,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + } + ], + "return_type" : "type-12", +@@ -47020,7 +47062,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + } + ], + "return_type" : "type-81", +@@ -47034,7 +47076,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { + "referenced_type" : "type-129" +@@ -47054,16 +47096,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-1882" ++ "referenced_type" : "type-1800" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-12", +@@ -47077,16 +47119,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-12", +@@ -47100,7 +47142,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + } + ], + "return_type" : "type-81", +@@ -47114,7 +47156,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { + "referenced_type" : "type-91" +@@ -47137,16 +47179,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-11500" ++ "referenced_type" : "type-11452" + }, + { +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + }, + { +- "referenced_type" : "type-2071" ++ "referenced_type" : "type-2003" + } + ], + "return_type" : "type-81", +@@ -47159,13 +47201,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11495" ++ "referenced_type" : "type-11447" + }, + { +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + }, + { +- "referenced_type" : "type-2055" ++ "referenced_type" : "type-1985" + } + ], + "return_type" : "type-81", +@@ -47179,10 +47221,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11495" ++ "referenced_type" : "type-11447" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + } + ], + "return_type" : "type-81", +@@ -47195,10 +47237,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11495" ++ "referenced_type" : "type-11447" + }, + { +- "referenced_type" : "type-3886" ++ "referenced_type" : "type-3838" + } + ], + "return_type" : "type-81", +@@ -47211,7 +47253,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11495" ++ "referenced_type" : "type-11447" + }, + { + "referenced_type" : "type-1" +@@ -47227,10 +47269,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11495" ++ "referenced_type" : "type-11447" + }, + { +- "referenced_type" : "type-3886" ++ "referenced_type" : "type-3838" + } + ], + "return_type" : "type-81", +@@ -47243,10 +47285,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11495" ++ "referenced_type" : "type-11447" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + } + ], + "return_type" : "type-81", +@@ -47259,10 +47301,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11495" ++ "referenced_type" : "type-11447" + }, + { +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + } + ], + "return_type" : "type-81", +@@ -47275,10 +47317,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11495" ++ "referenced_type" : "type-11447" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + } + ], + "return_type" : "type-81", +@@ -47291,10 +47333,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11495" ++ "referenced_type" : "type-11447" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { + "referenced_type" : "type-1" +@@ -47310,10 +47352,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11495" ++ "referenced_type" : "type-11447" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { + "referenced_type" : "type-1" +@@ -47332,10 +47374,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11495" ++ "referenced_type" : "type-11447" + }, + { +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + } + ], + "return_type" : "type-81", +@@ -47348,10 +47390,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11495" ++ "referenced_type" : "type-11447" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + } + ], + "return_type" : "type-81", +@@ -47364,10 +47406,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11495" ++ "referenced_type" : "type-11447" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { + "referenced_type" : "type-1" +@@ -47383,10 +47425,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11495" ++ "referenced_type" : "type-11447" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { + "referenced_type" : "type-1" +@@ -47405,7 +47447,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11495" ++ "referenced_type" : "type-11447" + } + ], + "return_type" : "type-81", +@@ -47418,7 +47460,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11495" ++ "referenced_type" : "type-11447" + } + ], + "return_type" : "type-81", +@@ -47432,10 +47474,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-11388" ++ "referenced_type" : "type-11340" + }, + { + "referenced_type" : "type-5" +@@ -47452,16 +47494,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-1906" ++ "referenced_type" : "type-1825" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-12", +@@ -47475,16 +47517,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-12", +@@ -47498,16 +47540,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-12", +@@ -47521,25 +47563,25 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + }, + { +- "referenced_type" : "type-2071" ++ "referenced_type" : "type-2003" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-12", +@@ -47553,16 +47595,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-1886" ++ "referenced_type" : "type-1804" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-12", +@@ -47576,16 +47618,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-1882" ++ "referenced_type" : "type-1800" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-12", +@@ -47599,19 +47641,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + }, + { + "referenced_type" : "type-41" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-12", +@@ -47625,13 +47667,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + } + ], + "return_type" : "type-12", +@@ -47645,16 +47687,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-1910" ++ "referenced_type" : "type-1830" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-12", +@@ -47668,16 +47710,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-1882" ++ "referenced_type" : "type-1800" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-12", +@@ -47691,16 +47733,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-1914" ++ "referenced_type" : "type-1834" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-12", +@@ -47714,7 +47756,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { + "referenced_type" : "type-129" +@@ -47734,13 +47776,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + } + ], + "return_type" : "type-12", +@@ -47754,10 +47796,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-11388" ++ "referenced_type" : "type-11340" + } + ], + "return_type" : "type-12", +@@ -47771,16 +47813,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-12", +@@ -47794,16 +47836,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-1886" ++ "referenced_type" : "type-1804" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-12", +@@ -47817,10 +47859,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + } + ], + "return_type" : "type-12", +@@ -47834,16 +47876,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-12", +@@ -47857,16 +47899,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-12", +@@ -47880,16 +47922,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-1886" ++ "referenced_type" : "type-1804" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-12", +@@ -47903,13 +47945,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + } + ], + "return_type" : "type-12", +@@ -47923,13 +47965,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11494" ++ "referenced_type" : "type-11446" + } + ], + "return_type" : "type-12", +@@ -47943,10 +47985,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-11388" ++ "referenced_type" : "type-11340" + } + ], + "return_type" : "type-12", +@@ -47960,16 +48002,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-1906" ++ "referenced_type" : "type-1825" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-12", +@@ -47983,25 +48025,25 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + }, + { +- "referenced_type" : "type-2071" ++ "referenced_type" : "type-2003" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-11496" ++ "referenced_type" : "type-11448" + }, + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-12", +@@ -48015,13 +48057,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { + "referenced_type" : "type-5" + }, + { +- "referenced_type" : "type-11494" ++ "referenced_type" : "type-11446" + } + ], + "return_type" : "type-12", +@@ -48034,13 +48076,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-3888" ++ "referenced_type" : "type-3840" + }, + { +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-12", +@@ -48054,7 +48096,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { + "referenced_type" : "type-5" +@@ -48071,7 +48113,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { + "referenced_type" : "type-5" +@@ -48091,10 +48133,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-11394" ++ "referenced_type" : "type-11346" + } + ], + "return_type" : "type-81", +@@ -48108,7 +48150,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { + "referenced_type" : "type-1" +@@ -48117,7 +48159,7 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-11394" ++ "referenced_type" : "type-11346" + } + ], + "return_type" : "type-81", +@@ -48131,13 +48173,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + }, + { +- "referenced_type" : "type-2194" ++ "referenced_type" : "type-2125" + }, + { +- "referenced_type" : "type-11388" ++ "referenced_type" : "type-11340" + } + ], + "return_type" : "type-12", +@@ -48150,7 +48192,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + } + ], + "return_type" : "type-81", +@@ -48163,7 +48205,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + } + ], + "return_type" : "type-81", +@@ -48176,7 +48218,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + } + ], + "return_type" : "type-81", +@@ -48189,7 +48231,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11346" ++ "referenced_type" : "type-11298" + } + ], + "return_type" : "type-81", +@@ -48202,10 +48244,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11366" ++ "referenced_type" : "type-11318" + }, + { +- "referenced_type" : "type-11245" ++ "referenced_type" : "type-11197" + } + ], + "return_type" : "type-81", +@@ -48218,7 +48260,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11366" ++ "referenced_type" : "type-11318" + } + ], + "return_type" : "type-81", +@@ -48231,13 +48273,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11366" ++ "referenced_type" : "type-11318" + }, + { +- "referenced_type" : "type-11245" ++ "referenced_type" : "type-11197" + } + ], +- "return_type" : "type-1959", ++ "return_type" : "type-1884", + "source_file" : "/external/protobuf/src/google/protobuf/compiler/importer.h" + }, + { +@@ -48247,13 +48289,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11366" ++ "referenced_type" : "type-11318" + }, + { +- "referenced_type" : "type-11358" ++ "referenced_type" : "type-11310" + }, + { +- "referenced_type" : "type-11360" ++ "referenced_type" : "type-11312" + } + ], + "return_type" : "type-81", +@@ -48266,13 +48308,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11366" ++ "referenced_type" : "type-11318" + }, + { +- "referenced_type" : "type-11358" ++ "referenced_type" : "type-11310" + }, + { +- "referenced_type" : "type-11360" ++ "referenced_type" : "type-11312" + } + ], + "return_type" : "type-81", +@@ -48285,7 +48327,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11366" ++ "referenced_type" : "type-11318" + } + ], + "return_type" : "type-81", +@@ -48298,7 +48340,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11366" ++ "referenced_type" : "type-11318" + } + ], + "return_type" : "type-81", +@@ -48633,13 +48675,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1980" ++ "referenced_type" : "type-1906" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-6435", ++ "return_type" : "type-6387", + "source_file" : "/external/protobuf/src/google/protobuf/generated_enum_reflection.h" + }, + { +@@ -48663,7 +48705,7 @@ + "referenced_type" : "type-612" + }, + { +- "referenced_type" : "type-1936" ++ "referenced_type" : "type-1859" + } + ], + "return_type" : "type-12", +@@ -48675,10 +48717,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-1", +@@ -48693,10 +48735,10 @@ + "referenced_type" : "type-4" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { + "referenced_type" : "type-612" +@@ -48718,7 +48760,7 @@ + "referenced_type" : "type-4" + }, + { +- "referenced_type" : "type-1936" ++ "referenced_type" : "type-1859" + } + ], + "return_type" : "type-12", +@@ -48733,7 +48775,7 @@ + "referenced_type" : "type-612" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-12", +@@ -48745,10 +48787,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-1", +@@ -48760,10 +48802,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-1", +@@ -48775,7 +48817,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1948" ++ "referenced_type" : "type-1872" + }, + { + "referenced_type" : "type-619" +@@ -48790,7 +48832,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1948" ++ "referenced_type" : "type-1872" + } + ], + "return_type" : "type-1", +@@ -48802,7 +48844,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { + "referenced_type" : "type-1" +@@ -48823,7 +48865,7 @@ + "referenced_type" : "type-612" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-12", +@@ -48839,10 +48881,10 @@ + "referenced_type" : "type-4" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { + "referenced_type" : "type-612" +@@ -48857,10 +48899,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { + "referenced_type" : "type-619" +@@ -48875,7 +48917,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1948" ++ "referenced_type" : "type-1872" + }, + { + "referenced_type" : "type-618" +@@ -48899,7 +48941,7 @@ + "referenced_type" : "type-599" + }, + { +- "referenced_type" : "type-1936" ++ "referenced_type" : "type-1859" + }, + { + "referenced_type" : "type-486" +@@ -48914,7 +48956,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1948" ++ "referenced_type" : "type-1872" + }, + { + "referenced_type" : "type-619" +@@ -48929,7 +48971,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1948" ++ "referenced_type" : "type-1872" + } + ], + "return_type" : "type-1", +@@ -48941,10 +48983,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { + "referenced_type" : "type-619" +@@ -48959,7 +49001,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1948" ++ "referenced_type" : "type-1872" + }, + { + "referenced_type" : "type-618" +@@ -48974,7 +49016,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-1", +@@ -48992,7 +49034,7 @@ + "referenced_type" : "type-4" + }, + { +- "referenced_type" : "type-1936" ++ "referenced_type" : "type-1859" + } + ], + "return_type" : "type-12", +@@ -49005,10 +49047,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2578" ++ "referenced_type" : "type-2510" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -49021,13 +49063,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2578" ++ "referenced_type" : "type-2510" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2584" ++ "referenced_type" : "type-2515" + } + ], + "return_type" : "type-81", +@@ -49040,7 +49082,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2578" ++ "referenced_type" : "type-2510" + }, + { + "referenced_type" : "type-1045" +@@ -49059,7 +49101,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2578" ++ "referenced_type" : "type-2510" + }, + { + "referenced_type" : "type-1045" +@@ -49097,10 +49139,10 @@ + "referenced_type" : "type-597" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-2153" ++ "referenced_type" : "type-2084" + } + ], + "return_type" : "type-431", +@@ -49194,10 +49236,10 @@ + "referenced_type" : "type-612" + }, + { +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + }, + { +- "referenced_type" : "type-1936" ++ "referenced_type" : "type-1859" + } + ], + "return_type" : "type-12", +@@ -49349,10 +49391,10 @@ + "referenced_type" : "type-597" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-2153" ++ "referenced_type" : "type-2084" + } + ], + "return_type" : "type-431", +@@ -49393,10 +49435,10 @@ + "referenced_type" : "type-597" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-2153" ++ "referenced_type" : "type-2084" + } + ], + "return_type" : "type-431", +@@ -49453,10 +49495,10 @@ + "referenced_type" : "type-612" + }, + { +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + }, + { +- "referenced_type" : "type-1936" ++ "referenced_type" : "type-1859" + } + ], + "return_type" : "type-12", +@@ -49478,7 +49520,7 @@ + "referenced_type" : "type-591" + }, + { +- "referenced_type" : "type-4491" ++ "referenced_type" : "type-4443" + } + ], + "return_type" : "type-12", +@@ -49717,7 +49759,7 @@ + "referenced_type" : "type-597" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-431" +@@ -49743,7 +49785,7 @@ + "referenced_type" : "type-591" + }, + { +- "referenced_type" : "type-4491" ++ "referenced_type" : "type-4443" + } + ], + "return_type" : "type-12", +@@ -49816,7 +49858,7 @@ + "referenced_type" : "type-591" + }, + { +- "referenced_type" : "type-4491" ++ "referenced_type" : "type-4443" + } + ], + "return_type" : "type-12", +@@ -49976,7 +50018,7 @@ + "referenced_type" : "type-597" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-629", +@@ -50767,7 +50809,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4285" ++ "referenced_type" : "type-4237" + } + ], + "return_type" : "type-81", +@@ -50781,7 +50823,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4285" ++ "referenced_type" : "type-4237" + } + ], + "return_type" : "type-81", +@@ -50794,7 +50836,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4285" ++ "referenced_type" : "type-4237" + } + ], + "return_type" : "type-566", +@@ -50807,7 +50849,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4285" ++ "referenced_type" : "type-4237" + } + ], + "return_type" : "type-81", +@@ -50820,7 +50862,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4285" ++ "referenced_type" : "type-4237" + } + ], + "return_type" : "type-81", +@@ -50833,7 +50875,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4285" ++ "referenced_type" : "type-4237" + } + ], + "return_type" : "type-81", +@@ -50846,10 +50888,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7598" ++ "referenced_type" : "type-7550" + } + ], +- "return_type" : "type-7200", ++ "return_type" : "type-7152", + "source_file" : "/external/protobuf/src/google/protobuf/map_field_lite.h" + }, + { +@@ -50860,10 +50902,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7598" ++ "referenced_type" : "type-7550" + } + ], +- "return_type" : "type-7200", ++ "return_type" : "type-7152", + "source_file" : "/external/protobuf/src/google/protobuf/map_field_lite.h" + }, + { +@@ -50873,10 +50915,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7598" ++ "referenced_type" : "type-7550" + }, + { +- "referenced_type" : "type-7598" ++ "referenced_type" : "type-7550" + } + ], + "return_type" : "type-81", +@@ -50889,7 +50931,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7598" ++ "referenced_type" : "type-7550" + } + ], + "return_type" : "type-81", +@@ -50902,10 +50944,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7598" ++ "referenced_type" : "type-7550" + }, + { +- "referenced_type" : "type-7196" ++ "referenced_type" : "type-7148" + } + ], + "return_type" : "type-81", +@@ -50918,7 +50960,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7598" ++ "referenced_type" : "type-7550" + } + ], + "return_type" : "type-81", +@@ -50931,7 +50973,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7598" ++ "referenced_type" : "type-7550" + } + ], + "return_type" : "type-81", +@@ -50943,7 +50985,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-12", +@@ -50955,7 +50997,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-81", +@@ -50967,13 +51009,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-7018" ++ "referenced_type" : "type-6970" + }, + { +- "referenced_type" : "type-7045" ++ "referenced_type" : "type-6997" + } + ], + "return_type" : "type-81", +@@ -50985,10 +51027,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-81", +@@ -51000,7 +51042,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-81", +@@ -51012,10 +51054,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-81", +@@ -51091,10 +51133,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1980" ++ "referenced_type" : "type-1906" + }, + { +- "referenced_type" : "type-6435" ++ "referenced_type" : "type-6387" + }, + { + "referenced_type" : "type-129" +@@ -51697,10 +51739,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6789" ++ "referenced_type" : "type-6741" + } + ], +- "return_type" : "type-6576", ++ "return_type" : "type-6528", + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, + { +@@ -51710,10 +51752,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6789" ++ "referenced_type" : "type-6741" + }, + { +- "referenced_type" : "type-4360" ++ "referenced_type" : "type-4312" + } + ], + "return_type" : "type-12", +@@ -51726,13 +51768,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6789" ++ "referenced_type" : "type-6741" + }, + { +- "referenced_type" : "type-4360" ++ "referenced_type" : "type-4312" + }, + { +- "referenced_type" : "type-4361" ++ "referenced_type" : "type-4313" + } + ], + "return_type" : "type-12", +@@ -51745,10 +51787,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6789" ++ "referenced_type" : "type-6741" + }, + { +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + } + ], + "return_type" : "type-81", +@@ -51761,10 +51803,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6789" ++ "referenced_type" : "type-6741" + }, + { +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + }, + { + "referenced_type" : "type-288" +@@ -51780,10 +51822,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6789" ++ "referenced_type" : "type-6741" + }, + { +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + } + ], + "return_type" : "type-81", +@@ -51796,10 +51838,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6789" ++ "referenced_type" : "type-6741" + }, + { +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + }, + { + "referenced_type" : "type-288" +@@ -51815,7 +51857,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6789" ++ "referenced_type" : "type-6741" + } + ], + "return_type" : "type-81", +@@ -51828,7 +51870,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6789" ++ "referenced_type" : "type-6741" + } + ], + "return_type" : "type-81", +@@ -51841,7 +51883,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6789" ++ "referenced_type" : "type-6741" + } + ], + "return_type" : "type-81", +@@ -51898,10 +51940,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2584" ++ "referenced_type" : "type-2515" + }, + { +- "referenced_type" : "type-2576" ++ "referenced_type" : "type-2508" + } + ], + "return_type" : "type-12", +@@ -52028,14 +52070,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1880" ++ "referenced_type" : "type-1798" + }, + { + "default_arg" : true, + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1878", ++ "return_type" : "type-1796", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -52044,10 +52086,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2069" ++ "referenced_type" : "type-2001" + }, + { +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + } + ], + "return_type" : "type-81", +@@ -52059,7 +52101,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + }, + { + "referenced_type" : "type-288" +@@ -52074,14 +52116,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1884" ++ "referenced_type" : "type-1802" + }, + { + "default_arg" : true, + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1882", ++ "return_type" : "type-1800", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -52090,10 +52132,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2075" ++ "referenced_type" : "type-2007" + }, + { +- "referenced_type" : "type-1882" ++ "referenced_type" : "type-1800" + } + ], + "return_type" : "type-81", +@@ -52105,7 +52147,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1882" ++ "referenced_type" : "type-1800" + }, + { + "referenced_type" : "type-288" +@@ -52120,14 +52162,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + }, + { + "default_arg" : true, + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1874", ++ "return_type" : "type-1792", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -52136,10 +52178,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2064" ++ "referenced_type" : "type-1996" + }, + { +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-81", +@@ -52151,7 +52193,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + }, + { + "referenced_type" : "type-288" +@@ -52166,14 +52208,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1916" ++ "referenced_type" : "type-1836" + }, + { + "default_arg" : true, + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1914", ++ "return_type" : "type-1834", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -52182,10 +52224,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2117" ++ "referenced_type" : "type-2050" + }, + { +- "referenced_type" : "type-1914" ++ "referenced_type" : "type-1834" + } + ], + "return_type" : "type-81", +@@ -52197,7 +52239,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1914" ++ "referenced_type" : "type-1834" + }, + { + "referenced_type" : "type-288" +@@ -52212,14 +52254,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1892" ++ "referenced_type" : "type-1811" + }, + { + "default_arg" : true, + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1890", ++ "return_type" : "type-1809", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -52228,10 +52270,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2085" ++ "referenced_type" : "type-2018" + }, + { +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + } + ], + "return_type" : "type-81", +@@ -52243,7 +52285,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + }, + { + "referenced_type" : "type-288" +@@ -52258,14 +52300,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1900" ++ "referenced_type" : "type-1819" + }, + { + "default_arg" : true, + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1898", ++ "return_type" : "type-1817", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -52274,10 +52316,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2096" ++ "referenced_type" : "type-2029" + }, + { +- "referenced_type" : "type-1898" ++ "referenced_type" : "type-1817" + } + ], + "return_type" : "type-81", +@@ -52289,7 +52331,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1898" ++ "referenced_type" : "type-1817" + }, + { + "referenced_type" : "type-288" +@@ -52304,14 +52346,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1912" ++ "referenced_type" : "type-1832" + }, + { + "default_arg" : true, + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1910", ++ "return_type" : "type-1830", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -52320,10 +52362,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2112" ++ "referenced_type" : "type-2045" + }, + { +- "referenced_type" : "type-1910" ++ "referenced_type" : "type-1830" + } + ], + "return_type" : "type-81", +@@ -52335,7 +52377,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1910" ++ "referenced_type" : "type-1830" + }, + { + "referenced_type" : "type-288" +@@ -52350,14 +52392,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1888" ++ "referenced_type" : "type-1807" + }, + { + "default_arg" : true, + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1886", ++ "return_type" : "type-1804", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -52366,10 +52408,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2080" ++ "referenced_type" : "type-2013" + }, + { +- "referenced_type" : "type-1886" ++ "referenced_type" : "type-1804" + } + ], + "return_type" : "type-81", +@@ -52381,7 +52423,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1886" ++ "referenced_type" : "type-1804" + }, + { + "referenced_type" : "type-288" +@@ -52396,14 +52438,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1924" ++ "referenced_type" : "type-1845" + }, + { + "default_arg" : true, + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1922", ++ "return_type" : "type-1843", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -52412,10 +52454,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2128" ++ "referenced_type" : "type-2061" + }, + { +- "referenced_type" : "type-1922" ++ "referenced_type" : "type-1843" + } + ], + "return_type" : "type-81", +@@ -52427,7 +52469,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1922" ++ "referenced_type" : "type-1843" + }, + { + "referenced_type" : "type-288" +@@ -52442,14 +52484,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1908" ++ "referenced_type" : "type-1828" + }, + { + "default_arg" : true, + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1906", ++ "return_type" : "type-1825", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -52458,10 +52500,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2107" ++ "referenced_type" : "type-2040" + }, + { +- "referenced_type" : "type-1906" ++ "referenced_type" : "type-1825" + } + ], + "return_type" : "type-81", +@@ -52473,7 +52515,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1906" ++ "referenced_type" : "type-1825" + }, + { + "referenced_type" : "type-288" +@@ -52488,14 +52530,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1928" ++ "referenced_type" : "type-1849" + }, + { + "default_arg" : true, + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1926", ++ "return_type" : "type-1847", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -52504,10 +52546,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2136" ++ "referenced_type" : "type-2067" + }, + { +- "referenced_type" : "type-1926" ++ "referenced_type" : "type-1847" + } + ], + "return_type" : "type-81", +@@ -52519,7 +52561,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1926" ++ "referenced_type" : "type-1847" + }, + { + "referenced_type" : "type-288" +@@ -52534,14 +52576,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1920" ++ "referenced_type" : "type-1841" + }, + { + "default_arg" : true, + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1918", ++ "return_type" : "type-1839", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -52550,10 +52592,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2122" ++ "referenced_type" : "type-2055" + }, + { +- "referenced_type" : "type-1918" ++ "referenced_type" : "type-1839" + } + ], + "return_type" : "type-81", +@@ -52565,7 +52607,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1918" ++ "referenced_type" : "type-1839" + }, + { + "referenced_type" : "type-288" +@@ -52580,14 +52622,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1904" ++ "referenced_type" : "type-1823" + }, + { + "default_arg" : true, + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1902", ++ "return_type" : "type-1821", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -52596,10 +52638,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2101" ++ "referenced_type" : "type-2034" + }, + { +- "referenced_type" : "type-1902" ++ "referenced_type" : "type-1821" + } + ], + "return_type" : "type-81", +@@ -52611,7 +52653,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1902" ++ "referenced_type" : "type-1821" + }, + { + "referenced_type" : "type-288" +@@ -52626,14 +52668,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1896" ++ "referenced_type" : "type-1815" + }, + { + "default_arg" : true, + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1894", ++ "return_type" : "type-1813", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -52642,10 +52684,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2091" ++ "referenced_type" : "type-2024" + }, + { +- "referenced_type" : "type-1894" ++ "referenced_type" : "type-1813" + } + ], + "return_type" : "type-81", +@@ -52657,7 +52699,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1894" ++ "referenced_type" : "type-1813" + }, + { + "referenced_type" : "type-288" +@@ -52672,14 +52714,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2365" ++ "referenced_type" : "type-2293" + }, + { + "default_arg" : true, + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-2363", ++ "return_type" : "type-2291", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -52688,10 +52730,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2407" ++ "referenced_type" : "type-2337" + }, + { +- "referenced_type" : "type-2363" ++ "referenced_type" : "type-2291" + } + ], + "return_type" : "type-81", +@@ -52703,7 +52745,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2363" ++ "referenced_type" : "type-2291" + }, + { + "referenced_type" : "type-288" +@@ -52718,14 +52760,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2381" ++ "referenced_type" : "type-2309" + }, + { + "default_arg" : true, + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-2350", ++ "return_type" : "type-2277", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -52734,10 +52776,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2382" ++ "referenced_type" : "type-2310" + }, + { +- "referenced_type" : "type-2350" ++ "referenced_type" : "type-2277" + } + ], + "return_type" : "type-81", +@@ -52749,7 +52791,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2350" ++ "referenced_type" : "type-2277" + }, + { + "referenced_type" : "type-288" +@@ -52764,14 +52806,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-7394" ++ "referenced_type" : "type-7346" + }, + { + "default_arg" : true, + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-7226", ++ "return_type" : "type-7178", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -52780,10 +52822,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-7289" ++ "referenced_type" : "type-7241" + }, + { +- "referenced_type" : "type-7226" ++ "referenced_type" : "type-7178" + } + ], + "return_type" : "type-81", +@@ -52795,7 +52837,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-7226" ++ "referenced_type" : "type-7178" + }, + { + "referenced_type" : "type-288" +@@ -52810,14 +52852,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2377" ++ "referenced_type" : "type-2305" + }, + { + "default_arg" : true, + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-2348", ++ "return_type" : "type-2275", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -52826,10 +52868,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2378" ++ "referenced_type" : "type-2306" + }, + { +- "referenced_type" : "type-2348" ++ "referenced_type" : "type-2275" + } + ], + "return_type" : "type-81", +@@ -52841,7 +52883,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2348" ++ "referenced_type" : "type-2275" + }, + { + "referenced_type" : "type-288" +@@ -52856,14 +52898,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2297" + }, + { + "default_arg" : true, + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-2367", ++ "return_type" : "type-2295", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -52872,10 +52914,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2370" ++ "referenced_type" : "type-2298" + }, + { +- "referenced_type" : "type-2367" ++ "referenced_type" : "type-2295" + } + ], + "return_type" : "type-81", +@@ -52887,7 +52929,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2367" ++ "referenced_type" : "type-2295" + }, + { + "referenced_type" : "type-288" +@@ -52902,14 +52944,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + }, + { + "default_arg" : true, + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1842", ++ "return_type" : "type-1754", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -52918,7 +52960,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-201", +@@ -52930,10 +52972,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-81", +@@ -52945,7 +52987,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { + "referenced_type" : "type-288" +@@ -52960,7 +53002,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-288", +@@ -52972,14 +53014,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2374" ++ "referenced_type" : "type-2302" + }, + { + "default_arg" : true, + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-2372", ++ "return_type" : "type-2300", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -52988,10 +53030,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2420" ++ "referenced_type" : "type-2350" + }, + { +- "referenced_type" : "type-2372" ++ "referenced_type" : "type-2300" + } + ], + "return_type" : "type-81", +@@ -53003,7 +53045,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-2372" ++ "referenced_type" : "type-2300" + }, + { + "referenced_type" : "type-288" +@@ -53018,14 +53060,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-7220" ++ "referenced_type" : "type-7172" + }, + { + "default_arg" : true, + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-7223", ++ "return_type" : "type-7175", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -53034,10 +53076,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-7396" ++ "referenced_type" : "type-7348" + }, + { +- "referenced_type" : "type-7223" ++ "referenced_type" : "type-7175" + } + ], + "return_type" : "type-81", +@@ -53049,7 +53091,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-7223" ++ "referenced_type" : "type-7175" + }, + { + "referenced_type" : "type-288" +@@ -53064,14 +53106,14 @@ + "parameters" : + [ + { +- "referenced_type" : "type-6436" ++ "referenced_type" : "type-6388" + }, + { + "default_arg" : true, + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-6429", ++ "return_type" : "type-6381", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -53095,7 +53137,7 @@ + "parameters" : + [ + { +- "referenced_type" : "type-6429" ++ "referenced_type" : "type-6381" + }, + { + "referenced_type" : "type-288" +@@ -53143,7 +53185,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-1686" ] ++ "template_args" : [ "type-1600" ] + }, + { + "function_name" : "google::protobuf::internal::arena_delete_object", +@@ -53174,7 +53216,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h", +- "template_args" : [ "type-4358" ] ++ "template_args" : [ "type-4310" ] + }, + { + "access" : "protected", +@@ -53276,12 +53318,12 @@ + "referenced_type" : "type-566" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h", +- "template_args" : [ "type-4358" ] ++ "template_args" : [ "type-4310" ] + }, + { + "access" : "protected", +@@ -53294,12 +53336,12 @@ + "referenced_type" : "type-566" + }, + { +- "referenced_type" : "type-7223" ++ "referenced_type" : "type-7175" + } + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h", +- "template_args" : [ "type-7580" ] ++ "template_args" : [ "type-7532" ] + }, + { + "access" : "protected", +@@ -53312,7 +53354,7 @@ + "referenced_type" : "type-566" + }, + { +- "referenced_type" : "type-6902" ++ "referenced_type" : "type-6854" + } + ], + "return_type" : "type-81", +@@ -53330,7 +53372,7 @@ + "referenced_type" : "type-566" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-81", +@@ -53348,7 +53390,7 @@ + "referenced_type" : "type-566" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { + "referenced_type" : "type-288" +@@ -53359,7 +53401,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h", +- "template_args" : [ "type-4358" ] ++ "template_args" : [ "type-4310" ] + }, + { + "access" : "protected", +@@ -53372,7 +53414,7 @@ + "referenced_type" : "type-566" + }, + { +- "referenced_type" : "type-7223" ++ "referenced_type" : "type-7175" + }, + { + "referenced_type" : "type-288" +@@ -53383,7 +53425,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h", +- "template_args" : [ "type-7580" ] ++ "template_args" : [ "type-7532" ] + }, + { + "access" : "protected", +@@ -53396,7 +53438,7 @@ + "referenced_type" : "type-566" + }, + { +- "referenced_type" : "type-6902" ++ "referenced_type" : "type-6854" + }, + { + "referenced_type" : "type-288" +@@ -53420,7 +53462,7 @@ + "referenced_type" : "type-566" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { + "referenced_type" : "type-288" +@@ -53477,7 +53519,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6967" ++ "referenced_type" : "type-6919" + } + ], + "return_type" : "type-81", +@@ -53490,7 +53532,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6967" ++ "referenced_type" : "type-6919" + } + ], + "return_type" : "type-81", +@@ -53503,7 +53545,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6967" ++ "referenced_type" : "type-6919" + } + ], + "return_type" : "type-81", +@@ -53520,7 +53562,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-4244" ] ++ "template_args" : [ "type-4196" ] + }, + { + "function_name" : "google::protobuf::internal::arena_destruct_object", +@@ -53624,7 +53666,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-1677" ] ++ "template_args" : [ "type-1591" ] + }, + { + "function_name" : "google::protobuf::internal::arena_destruct_object", +@@ -53650,7 +53692,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-4271" ] ++ "template_args" : [ "type-4223" ] + }, + { + "function_name" : "google::protobuf::internal::arena_destruct_object", +@@ -53676,7 +53718,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-1688" ] ++ "template_args" : [ "type-1602" ] + }, + { + "function_name" : "google::protobuf::internal::arena_destruct_object", +@@ -53689,7 +53731,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-1674" ] ++ "template_args" : [ "type-1587" ] + }, + { + "function_name" : "google::protobuf::internal::arena_destruct_object", +@@ -53702,7 +53744,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-1683" ] ++ "template_args" : [ "type-1597" ] + }, + { + "function_name" : "google::protobuf::internal::arena_destruct_object", +@@ -53715,7 +53757,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-1679" ] ++ "template_args" : [ "type-1593" ] + }, + { + "function_name" : "google::protobuf::internal::arena_destruct_object", +@@ -53728,7 +53770,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-1698" ] ++ "template_args" : [ "type-1612" ] + }, + { + "function_name" : "google::protobuf::internal::arena_destruct_object", +@@ -53741,7 +53783,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-1706" ] ++ "template_args" : [ "type-1620" ] + }, + { + "function_name" : "google::protobuf::internal::arena_destruct_object", +@@ -53754,7 +53796,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-1704" ] ++ "template_args" : [ "type-1618" ] + }, + { + "function_name" : "google::protobuf::internal::arena_destruct_object", +@@ -53767,7 +53809,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-1716" ] ++ "template_args" : [ "type-1630" ] + }, + { + "function_name" : "google::protobuf::internal::arena_destruct_object", +@@ -53780,7 +53822,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-1690" ] ++ "template_args" : [ "type-1604" ] + }, + { + "function_name" : "google::protobuf::internal::arena_destruct_object", +@@ -53793,7 +53835,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-1735" ] ++ "template_args" : [ "type-1648" ] + }, + { + "function_name" : "google::protobuf::internal::arena_destruct_object", +@@ -53806,7 +53848,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-1685" ] ++ "template_args" : [ "type-1599" ] + }, + { + "function_name" : "google::protobuf::internal::arena_destruct_object", +@@ -53819,7 +53861,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-1702" ] ++ "template_args" : [ "type-1616" ] + }, + { + "function_name" : "google::protobuf::internal::arena_destruct_object", +@@ -53832,7 +53874,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-1696" ] ++ "template_args" : [ "type-1610" ] + }, + { + "function_name" : "google::protobuf::internal::arena_destruct_object", +@@ -53845,7 +53887,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-6513" ] ++ "template_args" : [ "type-6465" ] + }, + { + "function_name" : "google::protobuf::internal::arena_destruct_object", +@@ -53858,7 +53900,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-7205" ] ++ "template_args" : [ "type-7157" ] + }, + { + "function_name" : "google::protobuf::internal::arena_destruct_object", +@@ -53871,7 +53913,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-2296" ] ++ "template_args" : [ "type-2223" ] + }, + { + "function_name" : "google::protobuf::internal::arena_destruct_object", +@@ -53884,7 +53926,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-2288" ] ++ "template_args" : [ "type-2217" ] + }, + { + "function_name" : "google::protobuf::internal::arena_destruct_object", +@@ -53897,7 +53939,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-7215" ] ++ "template_args" : [ "type-7167" ] + }, + { + "function_name" : "google::protobuf::internal::arena_destruct_object", +@@ -53910,7 +53952,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-4256" ] ++ "template_args" : [ "type-4208" ] + }, + { + "function_name" : "google::protobuf::internal::arena_destruct_object", +@@ -53923,7 +53965,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-2284" ] ++ "template_args" : [ "type-2213" ] + }, + { + "function_name" : "google::protobuf::internal::arena_destruct_object", +@@ -53936,7 +53978,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-2286" ] ++ "template_args" : [ "type-2215" ] + }, + { + "function_name" : "google::protobuf::internal::arena_destruct_object", +@@ -53949,7 +53991,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-6504" ] ++ "template_args" : [ "type-6456" ] + }, + { + "function_name" : "google::protobuf::internal::arena_destruct_object", +@@ -53962,7 +54004,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-7238" ] ++ "template_args" : [ "type-7190" ] + }, + { + "function_name" : "google::protobuf::internal::arena_destruct_object", +@@ -53975,7 +54017,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-2299" ] ++ "template_args" : [ "type-2226" ] + }, + { + "function_name" : "google::protobuf::internal::arena_destruct_object", +@@ -53988,7 +54030,7 @@ + ], + "return_type" : "type-81", + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-1738" ] ++ "template_args" : [ "type-1651" ] + }, + { + "function_name" : "google::protobuf::internal::arena_destruct_object", +@@ -54035,13 +54077,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2002" ++ "referenced_type" : "type-1928" + }, + { +- "referenced_type" : "type-2002" ++ "referenced_type" : "type-1928" + } + ], + "return_type" : "type-12", +@@ -54113,10 +54155,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + }, + { + "referenced_type" : "type-507" +@@ -54147,7 +54189,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-6479", ++ "return_type" : "type-6431", + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, + { +@@ -54156,10 +54198,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + }, + { + "referenced_type" : "type-507" +@@ -54184,7 +54226,7 @@ + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-6479", ++ "return_type" : "type-6431", + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, + { +@@ -54194,13 +54236,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6479" ++ "referenced_type" : "type-6431" + }, + { +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + }, + { + "referenced_type" : "type-507" +@@ -54215,10 +54257,10 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + }, + { +- "referenced_type" : "type-2153" ++ "referenced_type" : "type-2084" + }, + { + "referenced_type" : "type-1" +@@ -54241,13 +54283,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6479" ++ "referenced_type" : "type-6431" + }, + { +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + }, + { + "referenced_type" : "type-507" +@@ -54268,10 +54310,10 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + }, + { +- "referenced_type" : "type-2153" ++ "referenced_type" : "type-2084" + }, + { + "referenced_type" : "type-1" +@@ -54294,13 +54336,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6479" ++ "referenced_type" : "type-6431" + }, + { +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + }, + { + "referenced_type" : "type-507" +@@ -54315,10 +54357,10 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + }, + { +- "referenced_type" : "type-2153" ++ "referenced_type" : "type-2084" + }, + { + "referenced_type" : "type-1" +@@ -54341,13 +54383,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6479" ++ "referenced_type" : "type-6431" + }, + { +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + }, + { + "referenced_type" : "type-507" +@@ -54368,10 +54410,10 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + }, + { +- "referenced_type" : "type-2153" ++ "referenced_type" : "type-2084" + }, + { + "referenced_type" : "type-1" +@@ -54394,7 +54436,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6479" ++ "referenced_type" : "type-6431" + } + ], + "return_type" : "type-81", +@@ -54407,7 +54449,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6479" ++ "referenced_type" : "type-6431" + } + ], + "return_type" : "type-81", +@@ -54420,7 +54462,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6479" ++ "referenced_type" : "type-6431" + } + ], + "return_type" : "type-81", +@@ -54433,7 +54475,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2278" ++ "referenced_type" : "type-2207" + }, + { + "referenced_type" : "type-612" +@@ -54449,7 +54491,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2278" ++ "referenced_type" : "type-2207" + }, + { + "referenced_type" : "type-1" +@@ -54468,7 +54510,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2278" ++ "referenced_type" : "type-2207" + }, + { + "referenced_type" : "type-612" +@@ -54714,10 +54756,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7600" ++ "referenced_type" : "type-7552" + } + ], +- "return_type" : "type-7200", ++ "return_type" : "type-7152", + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, + { +@@ -54727,10 +54769,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7600" ++ "referenced_type" : "type-7552" + }, + { +- "referenced_type" : "type-4360" ++ "referenced_type" : "type-4312" + } + ], + "return_type" : "type-12", +@@ -54744,10 +54786,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7600" ++ "referenced_type" : "type-7552" + } + ], +- "return_type" : "type-7200", ++ "return_type" : "type-7152", + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, + { +@@ -54757,13 +54799,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7600" ++ "referenced_type" : "type-7552" + }, + { +- "referenced_type" : "type-4360" ++ "referenced_type" : "type-4312" + }, + { +- "referenced_type" : "type-4361" ++ "referenced_type" : "type-4313" + } + ], + "return_type" : "type-12", +@@ -54776,10 +54818,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7600" ++ "referenced_type" : "type-7552" + }, + { +- "referenced_type" : "type-7598" ++ "referenced_type" : "type-7550" + } + ], + "return_type" : "type-81", +@@ -54792,7 +54834,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7600" ++ "referenced_type" : "type-7552" + } + ], + "return_type" : "type-81", +@@ -54805,10 +54847,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7600" ++ "referenced_type" : "type-7552" + }, + { +- "referenced_type" : "type-7196" ++ "referenced_type" : "type-7148" + } + ], + "return_type" : "type-81", +@@ -54821,7 +54863,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7600" ++ "referenced_type" : "type-7552" + } + ], + "return_type" : "type-81", +@@ -54834,7 +54876,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7600" ++ "referenced_type" : "type-7552" + } + ], + "return_type" : "type-81", +@@ -54866,7 +54908,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11066" ++ "referenced_type" : "type-11018" + } + ], + "return_type" : "type-81", +@@ -54880,7 +54922,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11066" ++ "referenced_type" : "type-11018" + } + ], + "return_type" : "type-81", +@@ -54889,7 +54931,7 @@ + { + "function_name" : "google::protobuf::BoolValue::descriptor", + "linker_set_key" : "_ZN6google8protobuf9BoolValue10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -54900,10 +54942,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11066" ++ "referenced_type" : "type-11018" + }, + { +- "referenced_type" : "type-11066" ++ "referenced_type" : "type-11018" + } + ], + "return_type" : "type-81", +@@ -54916,10 +54958,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11066" ++ "referenced_type" : "type-11018" + }, + { +- "referenced_type" : "type-11066" ++ "referenced_type" : "type-11018" + } + ], + "return_type" : "type-81", +@@ -54928,7 +54970,7 @@ + { + "function_name" : "google::protobuf::BoolValue::default_instance", + "linker_set_key" : "_ZN6google8protobuf9BoolValue16default_instanceEv", +- "return_type" : "type-11161", ++ "return_type" : "type-11113", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -54939,7 +54981,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11066" ++ "referenced_type" : "type-11018" + } + ], + "return_type" : "type-81", +@@ -54952,7 +54994,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11066" ++ "referenced_type" : "type-11018" + }, + { + "referenced_type" : "type-612" +@@ -54968,10 +55010,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11066" ++ "referenced_type" : "type-11018" + }, + { +- "referenced_type" : "type-11066" ++ "referenced_type" : "type-11018" + } + ], + "return_type" : "type-81", +@@ -54984,7 +55026,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11066" ++ "referenced_type" : "type-11018" + } + ], + "return_type" : "type-81", +@@ -54997,10 +55039,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11066" ++ "referenced_type" : "type-11018" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -55013,10 +55055,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11066" ++ "referenced_type" : "type-11018" + }, + { +- "referenced_type" : "type-11161" ++ "referenced_type" : "type-11113" + } + ], + "return_type" : "type-81", +@@ -55042,10 +55084,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11066" ++ "referenced_type" : "type-11018" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -55058,10 +55100,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11066" ++ "referenced_type" : "type-11018" + }, + { +- "referenced_type" : "type-11161" ++ "referenced_type" : "type-11113" + } + ], + "return_type" : "type-81", +@@ -55075,7 +55117,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11066" ++ "referenced_type" : "type-11018" + }, + { + "referenced_type" : "type-288" +@@ -55091,10 +55133,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11066" ++ "referenced_type" : "type-11018" + }, + { +- "referenced_type" : "type-11161" ++ "referenced_type" : "type-11113" + } + ], + "return_type" : "type-81", +@@ -55107,7 +55149,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11066" ++ "referenced_type" : "type-11018" + } + ], + "return_type" : "type-81", +@@ -55121,7 +55163,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11066" ++ "referenced_type" : "type-11018" + }, + { + "referenced_type" : "type-288" +@@ -55137,10 +55179,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11066" ++ "referenced_type" : "type-11018" + }, + { +- "referenced_type" : "type-11161" ++ "referenced_type" : "type-11113" + } + ], + "return_type" : "type-81", +@@ -55153,7 +55195,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11066" ++ "referenced_type" : "type-11018" + } + ], + "return_type" : "type-81", +@@ -55166,7 +55208,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11066" ++ "referenced_type" : "type-11018" + } + ], + "return_type" : "type-81", +@@ -55179,7 +55221,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11066" ++ "referenced_type" : "type-11018" + } + ], + "return_type" : "type-81", +@@ -55192,7 +55234,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11066" ++ "referenced_type" : "type-11018" + } + ], + "return_type" : "type-81", +@@ -55212,7 +55254,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2372" ++ "referenced_type" : "type-2300" + } + ], + "return_type" : "type-81", +@@ -55226,7 +55268,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2372" ++ "referenced_type" : "type-2300" + } + ], + "return_type" : "type-81", +@@ -55235,7 +55277,7 @@ + { + "function_name" : "google::protobuf::EnumValue::descriptor", + "linker_set_key" : "_ZN6google8protobuf9EnumValue10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -55246,10 +55288,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2372" ++ "referenced_type" : "type-2300" + }, + { +- "referenced_type" : "type-2372" ++ "referenced_type" : "type-2300" + } + ], + "return_type" : "type-81", +@@ -55258,7 +55300,7 @@ + { + "function_name" : "google::protobuf::EnumValue::default_instance", + "linker_set_key" : "_ZN6google8protobuf9EnumValue16default_instanceEv", +- "return_type" : "type-2420", ++ "return_type" : "type-2350", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -55269,7 +55311,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2372" ++ "referenced_type" : "type-2300" + } + ], + "return_type" : "type-81", +@@ -55282,7 +55324,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2372" ++ "referenced_type" : "type-2300" + }, + { + "referenced_type" : "type-612" +@@ -55298,10 +55340,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2372" ++ "referenced_type" : "type-2300" + }, + { +- "referenced_type" : "type-2372" ++ "referenced_type" : "type-2300" + } + ], + "return_type" : "type-81", +@@ -55314,7 +55356,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2372" ++ "referenced_type" : "type-2300" + } + ], + "return_type" : "type-81", +@@ -55327,10 +55369,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2372" ++ "referenced_type" : "type-2300" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -55343,10 +55385,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2372" ++ "referenced_type" : "type-2300" + }, + { +- "referenced_type" : "type-2420" ++ "referenced_type" : "type-2350" + } + ], + "return_type" : "type-81", +@@ -55359,10 +55401,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2372" ++ "referenced_type" : "type-2300" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -55375,10 +55417,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2372" ++ "referenced_type" : "type-2300" + }, + { +- "referenced_type" : "type-2420" ++ "referenced_type" : "type-2350" + } + ], + "return_type" : "type-81", +@@ -55391,10 +55433,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2372" ++ "referenced_type" : "type-2300" + }, + { +- "referenced_type" : "type-2420" ++ "referenced_type" : "type-2350" + } + ], + "return_type" : "type-81", +@@ -55407,7 +55449,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2372" ++ "referenced_type" : "type-2300" + } + ], + "return_type" : "type-81", +@@ -55420,10 +55462,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2372" ++ "referenced_type" : "type-2300" + }, + { +- "referenced_type" : "type-2420" ++ "referenced_type" : "type-2350" + } + ], + "return_type" : "type-81", +@@ -55436,7 +55478,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2372" ++ "referenced_type" : "type-2300" + } + ], + "return_type" : "type-81", +@@ -55449,7 +55491,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2372" ++ "referenced_type" : "type-2300" + } + ], + "return_type" : "type-81", +@@ -55462,7 +55504,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2372" ++ "referenced_type" : "type-2300" + } + ], + "return_type" : "type-81", +@@ -55475,7 +55517,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2372" ++ "referenced_type" : "type-2300" + } + ], + "return_type" : "type-81", +@@ -55489,7 +55531,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6345" ++ "referenced_type" : "type-6297" + } + ], + "return_type" : "type-81", +@@ -55503,7 +55545,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6345" ++ "referenced_type" : "type-6297" + } + ], + "return_type" : "type-81", +@@ -55512,7 +55554,7 @@ + { + "function_name" : "google::protobuf::FieldMask::descriptor", + "linker_set_key" : "_ZN6google8protobuf9FieldMask10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/field_mask.pb.h" + }, + { +@@ -55523,10 +55565,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6345" ++ "referenced_type" : "type-6297" + }, + { +- "referenced_type" : "type-6345" ++ "referenced_type" : "type-6297" + } + ], + "return_type" : "type-81", +@@ -55535,7 +55577,7 @@ + { + "function_name" : "google::protobuf::FieldMask::default_instance", + "linker_set_key" : "_ZN6google8protobuf9FieldMask16default_instanceEv", +- "return_type" : "type-6410", ++ "return_type" : "type-6362", + "source_file" : "/external/protobuf/src/google/protobuf/field_mask.pb.h" + }, + { +@@ -55546,7 +55588,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6345" ++ "referenced_type" : "type-6297" + } + ], + "return_type" : "type-81", +@@ -55559,7 +55601,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6345" ++ "referenced_type" : "type-6297" + }, + { + "referenced_type" : "type-612" +@@ -55575,10 +55617,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6345" ++ "referenced_type" : "type-6297" + }, + { +- "referenced_type" : "type-6345" ++ "referenced_type" : "type-6297" + } + ], + "return_type" : "type-81", +@@ -55591,7 +55633,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6345" ++ "referenced_type" : "type-6297" + } + ], + "return_type" : "type-81", +@@ -55604,10 +55646,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6345" ++ "referenced_type" : "type-6297" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -55620,10 +55662,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6345" ++ "referenced_type" : "type-6297" + }, + { +- "referenced_type" : "type-6410" ++ "referenced_type" : "type-6362" + } + ], + "return_type" : "type-81", +@@ -55636,10 +55678,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6345" ++ "referenced_type" : "type-6297" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -55652,10 +55694,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6345" ++ "referenced_type" : "type-6297" + }, + { +- "referenced_type" : "type-6410" ++ "referenced_type" : "type-6362" + } + ], + "return_type" : "type-81", +@@ -55668,10 +55710,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6345" ++ "referenced_type" : "type-6297" + }, + { +- "referenced_type" : "type-6410" ++ "referenced_type" : "type-6362" + } + ], + "return_type" : "type-81", +@@ -55684,7 +55726,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6345" ++ "referenced_type" : "type-6297" + } + ], + "return_type" : "type-81", +@@ -55697,10 +55739,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6345" ++ "referenced_type" : "type-6297" + }, + { +- "referenced_type" : "type-6410" ++ "referenced_type" : "type-6362" + } + ], + "return_type" : "type-81", +@@ -55713,7 +55755,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6345" ++ "referenced_type" : "type-6297" + } + ], + "return_type" : "type-81", +@@ -55726,7 +55768,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6345" ++ "referenced_type" : "type-6297" + } + ], + "return_type" : "type-81", +@@ -55739,7 +55781,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6345" ++ "referenced_type" : "type-6297" + } + ], + "return_type" : "type-81", +@@ -55752,7 +55794,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6345" ++ "referenced_type" : "type-6297" + } + ], + "return_type" : "type-81", +@@ -55766,7 +55808,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7233" ++ "referenced_type" : "type-7185" + } + ], + "return_type" : "type-81", +@@ -55780,7 +55822,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7233" ++ "referenced_type" : "type-7185" + } + ], + "return_type" : "type-81", +@@ -55789,7 +55831,7 @@ + { + "function_name" : "google::protobuf::ListValue::descriptor", + "linker_set_key" : "_ZN6google8protobuf9ListValue10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/struct.pb.h" + }, + { +@@ -55800,10 +55842,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7233" ++ "referenced_type" : "type-7185" + }, + { +- "referenced_type" : "type-7233" ++ "referenced_type" : "type-7185" + } + ], + "return_type" : "type-81", +@@ -55812,7 +55854,7 @@ + { + "function_name" : "google::protobuf::ListValue::default_instance", + "linker_set_key" : "_ZN6google8protobuf9ListValue16default_instanceEv", +- "return_type" : "type-7282", ++ "return_type" : "type-7234", + "source_file" : "/external/protobuf/src/google/protobuf/struct.pb.h" + }, + { +@@ -55823,7 +55865,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7233" ++ "referenced_type" : "type-7185" + } + ], + "return_type" : "type-81", +@@ -55836,7 +55878,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7233" ++ "referenced_type" : "type-7185" + }, + { + "referenced_type" : "type-612" +@@ -55852,10 +55894,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7233" ++ "referenced_type" : "type-7185" + }, + { +- "referenced_type" : "type-7233" ++ "referenced_type" : "type-7185" + } + ], + "return_type" : "type-81", +@@ -55868,7 +55910,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7233" ++ "referenced_type" : "type-7185" + } + ], + "return_type" : "type-81", +@@ -55881,10 +55923,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7233" ++ "referenced_type" : "type-7185" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -55897,10 +55939,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7233" ++ "referenced_type" : "type-7185" + }, + { +- "referenced_type" : "type-7282" ++ "referenced_type" : "type-7234" + } + ], + "return_type" : "type-81", +@@ -55913,10 +55955,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7233" ++ "referenced_type" : "type-7185" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -55929,10 +55971,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7233" ++ "referenced_type" : "type-7185" + }, + { +- "referenced_type" : "type-7282" ++ "referenced_type" : "type-7234" + } + ], + "return_type" : "type-81", +@@ -55945,10 +55987,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7233" ++ "referenced_type" : "type-7185" + }, + { +- "referenced_type" : "type-7282" ++ "referenced_type" : "type-7234" + } + ], + "return_type" : "type-81", +@@ -55961,7 +56003,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7233" ++ "referenced_type" : "type-7185" + } + ], + "return_type" : "type-81", +@@ -55974,10 +56016,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7233" ++ "referenced_type" : "type-7185" + }, + { +- "referenced_type" : "type-7282" ++ "referenced_type" : "type-7234" + } + ], + "return_type" : "type-81", +@@ -55990,7 +56032,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7233" ++ "referenced_type" : "type-7185" + } + ], + "return_type" : "type-81", +@@ -56003,7 +56045,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7233" ++ "referenced_type" : "type-7185" + } + ], + "return_type" : "type-81", +@@ -56016,7 +56058,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7233" ++ "referenced_type" : "type-7185" + } + ], + "return_type" : "type-81", +@@ -56029,7 +56071,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7233" ++ "referenced_type" : "type-7185" + } + ], + "return_type" : "type-81", +@@ -56121,7 +56163,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7811" ++ "referenced_type" : "type-7763" + } + ], + "return_type" : "type-81", +@@ -56135,7 +56177,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7811" ++ "referenced_type" : "type-7763" + } + ], + "return_type" : "type-81", +@@ -56144,7 +56186,7 @@ + { + "function_name" : "google::protobuf::Timestamp::descriptor", + "linker_set_key" : "_ZN6google8protobuf9Timestamp10descriptorEv", +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/timestamp.pb.h" + }, + { +@@ -56155,10 +56197,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7811" ++ "referenced_type" : "type-7763" + }, + { +- "referenced_type" : "type-7811" ++ "referenced_type" : "type-7763" + } + ], + "return_type" : "type-81", +@@ -56171,10 +56213,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7811" ++ "referenced_type" : "type-7763" + }, + { +- "referenced_type" : "type-7811" ++ "referenced_type" : "type-7763" + } + ], + "return_type" : "type-81", +@@ -56183,7 +56225,7 @@ + { + "function_name" : "google::protobuf::Timestamp::default_instance", + "linker_set_key" : "_ZN6google8protobuf9Timestamp16default_instanceEv", +- "return_type" : "type-7865", ++ "return_type" : "type-7817", + "source_file" : "/external/protobuf/src/google/protobuf/timestamp.pb.h" + }, + { +@@ -56194,7 +56236,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7811" ++ "referenced_type" : "type-7763" + } + ], + "return_type" : "type-81", +@@ -56207,7 +56249,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7811" ++ "referenced_type" : "type-7763" + }, + { + "referenced_type" : "type-612" +@@ -56223,10 +56265,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7811" ++ "referenced_type" : "type-7763" + }, + { +- "referenced_type" : "type-7811" ++ "referenced_type" : "type-7763" + } + ], + "return_type" : "type-81", +@@ -56239,7 +56281,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7811" ++ "referenced_type" : "type-7763" + } + ], + "return_type" : "type-81", +@@ -56252,10 +56294,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7811" ++ "referenced_type" : "type-7763" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -56268,10 +56310,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7811" ++ "referenced_type" : "type-7763" + }, + { +- "referenced_type" : "type-7865" ++ "referenced_type" : "type-7817" + } + ], + "return_type" : "type-81", +@@ -56297,10 +56339,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7811" ++ "referenced_type" : "type-7763" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-81", +@@ -56313,10 +56355,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7811" ++ "referenced_type" : "type-7763" + }, + { +- "referenced_type" : "type-7865" ++ "referenced_type" : "type-7817" + } + ], + "return_type" : "type-81", +@@ -56330,7 +56372,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7811" ++ "referenced_type" : "type-7763" + }, + { + "referenced_type" : "type-288" +@@ -56346,10 +56388,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7811" ++ "referenced_type" : "type-7763" + }, + { +- "referenced_type" : "type-7865" ++ "referenced_type" : "type-7817" + } + ], + "return_type" : "type-81", +@@ -56362,7 +56404,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7811" ++ "referenced_type" : "type-7763" + } + ], + "return_type" : "type-81", +@@ -56376,7 +56418,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7811" ++ "referenced_type" : "type-7763" + }, + { + "referenced_type" : "type-288" +@@ -56392,10 +56434,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7811" ++ "referenced_type" : "type-7763" + }, + { +- "referenced_type" : "type-7865" ++ "referenced_type" : "type-7817" + } + ], + "return_type" : "type-81", +@@ -56408,7 +56450,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7811" ++ "referenced_type" : "type-7763" + } + ], + "return_type" : "type-81", +@@ -56421,7 +56463,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7811" ++ "referenced_type" : "type-7763" + } + ], + "return_type" : "type-81", +@@ -56434,7 +56476,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7811" ++ "referenced_type" : "type-7763" + } + ], + "return_type" : "type-81", +@@ -56447,7 +56489,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7811" ++ "referenced_type" : "type-7763" + } + ], + "return_type" : "type-81", +@@ -56459,13 +56501,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-4234" ++ "referenced_type" : "type-4186" + }, + { + "referenced_type" : "type-98" + } + ], +- "return_type" : "type-4234", ++ "return_type" : "type-4186", + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, + { +@@ -56474,13 +56516,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-4234" ++ "referenced_type" : "type-4186" + }, + { + "referenced_type" : "type-89" + } + ], +- "return_type" : "type-4234", ++ "return_type" : "type-4186", + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, + { +@@ -56489,10 +56531,10 @@ + "parameters" : + [ + { +- "referenced_type" : "type-4233" ++ "referenced_type" : "type-4185" + }, + { +- "referenced_type" : "type-4233" ++ "referenced_type" : "type-4185" + } + ], + "return_type" : "type-89", +@@ -56534,13 +56576,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-4234" ++ "referenced_type" : "type-4186" + }, + { +- "referenced_type" : "type-4233" ++ "referenced_type" : "type-4185" + } + ], +- "return_type" : "type-4234", ++ "return_type" : "type-4186", + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, + { +@@ -56549,13 +56591,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-7866" ++ "referenced_type" : "type-7818" + }, + { +- "referenced_type" : "type-4233" ++ "referenced_type" : "type-4185" + } + ], +- "return_type" : "type-7866", ++ "return_type" : "type-7818", + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, + { +@@ -56564,13 +56606,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-4234" ++ "referenced_type" : "type-4186" + }, + { + "referenced_type" : "type-98" + } + ], +- "return_type" : "type-4234", ++ "return_type" : "type-4186", + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, + { +@@ -56579,13 +56621,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-4234" ++ "referenced_type" : "type-4186" + }, + { + "referenced_type" : "type-89" + } + ], +- "return_type" : "type-4234", ++ "return_type" : "type-4186", + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, + { +@@ -56594,13 +56636,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-7865" ++ "referenced_type" : "type-7817" + }, + { +- "referenced_type" : "type-7865" ++ "referenced_type" : "type-7817" + } + ], +- "return_type" : "type-4178", ++ "return_type" : "type-4130", + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, + { +@@ -56609,13 +56651,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-4234" ++ "referenced_type" : "type-4186" + }, + { +- "referenced_type" : "type-4233" ++ "referenced_type" : "type-4185" + } + ], +- "return_type" : "type-4234", ++ "return_type" : "type-4186", + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, + { +@@ -56624,13 +56666,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-7866" ++ "referenced_type" : "type-7818" + }, + { +- "referenced_type" : "type-4233" ++ "referenced_type" : "type-4185" + } + ], +- "return_type" : "type-7866", ++ "return_type" : "type-7818", + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, + { +@@ -56639,13 +56681,13 @@ + "parameters" : + [ + { +- "referenced_type" : "type-4234" ++ "referenced_type" : "type-4186" + }, + { +- "referenced_type" : "type-4233" ++ "referenced_type" : "type-4185" + } + ], +- "return_type" : "type-4234", ++ "return_type" : "type-4186", + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, + { +@@ -56655,10 +56697,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11130" ++ "referenced_type" : "type-11082" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -56668,7 +56710,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11130" ++ "referenced_type" : "type-11082" + } + ], + "return_type" : "type-12", +@@ -56682,7 +56724,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11130" ++ "referenced_type" : "type-11082" + }, + { + "referenced_type" : "type-1" +@@ -56698,7 +56740,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11130" ++ "referenced_type" : "type-11082" + }, + { + "referenced_type" : "type-619" +@@ -56714,7 +56756,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11130" ++ "referenced_type" : "type-11082" + }, + { + "referenced_type" : "type-618" +@@ -56730,13 +56772,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11130" ++ "referenced_type" : "type-11082" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-11068", ++ "return_type" : "type-11020", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -56746,7 +56788,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11130" ++ "referenced_type" : "type-11082" + } + ], + "return_type" : "type-1", +@@ -56760,16 +56802,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-3678" ++ "referenced_type" : "type-3630" + }, + { +- "referenced_type" : "type-3730" ++ "referenced_type" : "type-3682" + }, + { + "referenced_type" : "type-12" +@@ -56785,10 +56827,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + } + ], +- "return_type" : "type-4640", ++ "return_type" : "type-4592", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -56799,10 +56841,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + } + ], + "return_type" : "type-81", +@@ -56815,13 +56857,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], +- "return_type" : "type-2003", ++ "return_type" : "type-1929", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -56831,13 +56873,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], +- "return_type" : "type-1999", ++ "return_type" : "type-1925", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -56848,10 +56890,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { +- "referenced_type" : "type-3731" ++ "referenced_type" : "type-3683" + } + ], + "return_type" : "type-81", +@@ -56864,13 +56906,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-2003", ++ "return_type" : "type-1929", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -56880,10 +56922,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { +- "referenced_type" : "type-3677" ++ "referenced_type" : "type-3629" + } + ], + "return_type" : "type-12", +@@ -56896,13 +56938,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], +- "return_type" : "type-1980", ++ "return_type" : "type-1906", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -56912,13 +56954,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], +- "return_type" : "type-2008", ++ "return_type" : "type-1934", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -56928,13 +56970,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], +- "return_type" : "type-2003", ++ "return_type" : "type-1929", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -56944,13 +56986,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -56960,13 +57002,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { +- "referenced_type" : "type-3730" ++ "referenced_type" : "type-3682" + } + ], +- "return_type" : "type-4641", ++ "return_type" : "type-4593", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -56976,13 +57018,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], +- "return_type" : "type-2003", ++ "return_type" : "type-1929", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -56992,13 +57034,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], +- "return_type" : "type-2003", ++ "return_type" : "type-1929", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -57008,13 +57050,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], +- "return_type" : "type-2003", ++ "return_type" : "type-1929", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -57024,13 +57066,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], +- "return_type" : "type-2003", ++ "return_type" : "type-1929", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -57040,13 +57082,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-2029", ++ "return_type" : "type-1959", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -57056,13 +57098,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-2027", ++ "return_type" : "type-1957", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -57072,10 +57114,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { +- "referenced_type" : "type-1878" ++ "referenced_type" : "type-1796" + } + ], + "return_type" : "type-81", +@@ -57088,10 +57130,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11101" ++ "referenced_type" : "type-11053" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -57101,7 +57143,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11101" ++ "referenced_type" : "type-11053" + } + ], + "return_type" : "type-12", +@@ -57115,7 +57157,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11101" ++ "referenced_type" : "type-11053" + }, + { + "referenced_type" : "type-1" +@@ -57131,7 +57173,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11101" ++ "referenced_type" : "type-11053" + }, + { + "referenced_type" : "type-619" +@@ -57147,7 +57189,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11101" ++ "referenced_type" : "type-11053" + }, + { + "referenced_type" : "type-618" +@@ -57163,13 +57205,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11101" ++ "referenced_type" : "type-11053" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-11061", ++ "return_type" : "type-11013", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -57179,7 +57221,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11101" ++ "referenced_type" : "type-11053" + } + ], + "return_type" : "type-1", +@@ -57192,10 +57234,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11113" ++ "referenced_type" : "type-11065" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -57205,7 +57247,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11113" ++ "referenced_type" : "type-11065" + } + ], + "return_type" : "type-12", +@@ -57219,7 +57261,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11113" ++ "referenced_type" : "type-11065" + }, + { + "referenced_type" : "type-1" +@@ -57235,7 +57277,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11113" ++ "referenced_type" : "type-11065" + }, + { + "referenced_type" : "type-619" +@@ -57251,7 +57293,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11113" ++ "referenced_type" : "type-11065" + }, + { + "referenced_type" : "type-618" +@@ -57267,13 +57309,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11113" ++ "referenced_type" : "type-11065" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-11064", ++ "return_type" : "type-11016", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -57283,7 +57325,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11113" ++ "referenced_type" : "type-11065" + } + ], + "return_type" : "type-1", +@@ -57296,10 +57338,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11105" ++ "referenced_type" : "type-11057" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -57309,7 +57351,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11105" ++ "referenced_type" : "type-11057" + } + ], + "return_type" : "type-12", +@@ -57323,7 +57365,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11105" ++ "referenced_type" : "type-11057" + }, + { + "referenced_type" : "type-1" +@@ -57339,7 +57381,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11105" ++ "referenced_type" : "type-11057" + }, + { + "referenced_type" : "type-619" +@@ -57355,7 +57397,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11105" ++ "referenced_type" : "type-11057" + }, + { + "referenced_type" : "type-618" +@@ -57371,13 +57413,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11105" ++ "referenced_type" : "type-11057" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-11062", ++ "return_type" : "type-11014", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -57387,7 +57429,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11105" ++ "referenced_type" : "type-11057" + } + ], + "return_type" : "type-1", +@@ -57400,13 +57442,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -57422,13 +57464,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-1", +@@ -57441,13 +57483,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -57463,13 +57505,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-545", +@@ -57483,13 +57525,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-537", +@@ -57503,13 +57545,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-531", +@@ -57523,13 +57565,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-506", +@@ -57543,13 +57585,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-517", +@@ -57563,13 +57605,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-511", +@@ -57583,13 +57625,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-525", +@@ -57603,10 +57645,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + } + ], +- "return_type" : "type-2153", ++ "return_type" : "type-2084", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { +@@ -57617,19 +57659,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-2033" ++ "referenced_type" : "type-1962" + }, + { +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + } + ], + "return_type" : "type-201", +@@ -57642,13 +57684,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -57664,13 +57706,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-494", +@@ -57684,13 +57726,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-493", +@@ -57704,13 +57746,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-492", +@@ -57724,13 +57766,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-486", +@@ -57744,13 +57786,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-488", +@@ -57764,13 +57806,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-487", +@@ -57784,13 +57826,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-491", +@@ -57804,13 +57846,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -57830,13 +57872,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], +- "return_type" : "type-6946", ++ "return_type" : "type-6898", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { +@@ -57847,13 +57889,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-12" +@@ -57870,16 +57912,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], +- "return_type" : "type-4284", ++ "return_type" : "type-4236", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { +@@ -57890,16 +57932,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], +- "return_type" : "type-4284", ++ "return_type" : "type-4236", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { +@@ -57909,16 +57951,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7690" ++ "referenced_type" : "type-7642" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-3870", ++ "return_type" : "type-3822", + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, + { +@@ -57928,16 +57970,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7690" ++ "referenced_type" : "type-7642" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-3879", ++ "return_type" : "type-3831", + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, + { +@@ -57947,13 +57989,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3724" ++ "referenced_type" : "type-3676" + }, + { +- "referenced_type" : "type-7631" ++ "referenced_type" : "type-7583" + } + ], +- "return_type" : "type-10224", ++ "return_type" : "type-10176", + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, + { +@@ -57963,13 +58005,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3724" ++ "referenced_type" : "type-3676" + }, + { + "referenced_type" : "type-96" + } + ], +- "return_type" : "type-10225", ++ "return_type" : "type-10177", + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, + { +@@ -57979,13 +58021,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3724" ++ "referenced_type" : "type-3676" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-10226", ++ "return_type" : "type-10178", + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, + { +@@ -57995,13 +58037,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3724" ++ "referenced_type" : "type-3676" + }, + { + "referenced_type" : "type-89" + } + ], +- "return_type" : "type-10227", ++ "return_type" : "type-10179", + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, + { +@@ -58011,13 +58053,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3724" ++ "referenced_type" : "type-3676" + }, + { + "referenced_type" : "type-98" + } + ], +- "return_type" : "type-10228", ++ "return_type" : "type-10180", + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, + { +@@ -58027,13 +58069,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3724" ++ "referenced_type" : "type-3676" + }, + { +- "referenced_type" : "type-7631" ++ "referenced_type" : "type-7583" + } + ], +- "return_type" : "type-10229", ++ "return_type" : "type-10181", + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, + { +@@ -58043,13 +58085,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3724" ++ "referenced_type" : "type-3676" + }, + { + "referenced_type" : "type-4" + } + ], +- "return_type" : "type-10230", ++ "return_type" : "type-10182", + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, + { +@@ -58059,13 +58101,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3724" ++ "referenced_type" : "type-3676" + }, + { + "referenced_type" : "type-91" + } + ], +- "return_type" : "type-10231", ++ "return_type" : "type-10183", + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, + { +@@ -58075,19 +58117,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3724" ++ "referenced_type" : "type-3676" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], +- "return_type" : "type-10232", ++ "return_type" : "type-10184", + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, + { +@@ -58097,10 +58139,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3724" ++ "referenced_type" : "type-3676" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { + "referenced_type" : "type-1" +@@ -58112,7 +58154,7 @@ + "referenced_type" : "type-12" + } + ], +- "return_type" : "type-10233", ++ "return_type" : "type-10185", + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, + { +@@ -58122,10 +58164,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3724" ++ "referenced_type" : "type-3676" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { + "referenced_type" : "type-1" +@@ -58137,7 +58179,7 @@ + "referenced_type" : "type-12" + } + ], +- "return_type" : "type-10234", ++ "return_type" : "type-10186", + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, + { +@@ -58147,13 +58189,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3724" ++ "referenced_type" : "type-3676" + }, + { + "referenced_type" : "type-12" + } + ], +- "return_type" : "type-10235", ++ "return_type" : "type-10187", + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, + { +@@ -58163,16 +58205,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-3724" ++ "referenced_type" : "type-3676" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-7631" ++ "referenced_type" : "type-7583" + } + ], +- "return_type" : "type-10236", ++ "return_type" : "type-10188", + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, + { +@@ -58183,19 +58225,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7685" ++ "referenced_type" : "type-7637" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-7686" ++ "referenced_type" : "type-7638" + } + ], + "return_type" : "type-81", +@@ -58208,13 +58250,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7685" ++ "referenced_type" : "type-7637" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-7625" ++ "referenced_type" : "type-7577" + } + ], + "return_type" : "type-12", +@@ -58228,19 +58270,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7685" ++ "referenced_type" : "type-7637" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-7686" ++ "referenced_type" : "type-7638" + } + ], + "return_type" : "type-81", +@@ -58254,22 +58296,22 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7685" ++ "referenced_type" : "type-7637" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-7686" ++ "referenced_type" : "type-7638" + } + ], + "return_type" : "type-81", +@@ -58282,10 +58324,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7685" ++ "referenced_type" : "type-7637" + }, + { +- "referenced_type" : "type-1948" ++ "referenced_type" : "type-1872" + }, + { + "referenced_type" : "type-741" +@@ -58302,13 +58344,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7685" ++ "referenced_type" : "type-7637" + }, + { +- "referenced_type" : "type-1948" ++ "referenced_type" : "type-1872" + }, + { +- "referenced_type" : "type-7686" ++ "referenced_type" : "type-7638" + } + ], + "return_type" : "type-81", +@@ -58321,19 +58363,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7685" ++ "referenced_type" : "type-7637" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-7625" ++ "referenced_type" : "type-7577" + } + ], + "return_type" : "type-81", +@@ -58347,19 +58389,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7685" ++ "referenced_type" : "type-7637" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-7686" ++ "referenced_type" : "type-7638" + } + ], + "return_type" : "type-81", +@@ -58372,13 +58414,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7685" ++ "referenced_type" : "type-7637" + }, + { +- "referenced_type" : "type-1948" ++ "referenced_type" : "type-1872" + }, + { +- "referenced_type" : "type-7625" ++ "referenced_type" : "type-7577" + } + ], + "return_type" : "type-12", +@@ -58391,10 +58433,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7685" ++ "referenced_type" : "type-7637" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { + "referenced_type" : "type-741" +@@ -58411,13 +58453,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7685" ++ "referenced_type" : "type-7637" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-7686" ++ "referenced_type" : "type-7638" + } + ], + "return_type" : "type-81", +@@ -58431,13 +58473,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7685" ++ "referenced_type" : "type-7637" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-7686" ++ "referenced_type" : "type-7638" + } + ], + "return_type" : "type-12", +@@ -58450,10 +58492,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11097" ++ "referenced_type" : "type-11049" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -58463,7 +58505,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11097" ++ "referenced_type" : "type-11049" + } + ], + "return_type" : "type-12", +@@ -58477,7 +58519,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11097" ++ "referenced_type" : "type-11049" + }, + { + "referenced_type" : "type-1" +@@ -58493,7 +58535,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11097" ++ "referenced_type" : "type-11049" + }, + { + "referenced_type" : "type-619" +@@ -58509,7 +58551,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11097" ++ "referenced_type" : "type-11049" + }, + { + "referenced_type" : "type-618" +@@ -58525,13 +58567,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11097" ++ "referenced_type" : "type-11049" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-11060", ++ "return_type" : "type-11012", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -58541,7 +58583,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11097" ++ "referenced_type" : "type-11049" + } + ], + "return_type" : "type-1", +@@ -58554,10 +58596,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1976" ++ "referenced_type" : "type-1902" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -58567,7 +58609,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1976" ++ "referenced_type" : "type-1902" + } + ], + "return_type" : "type-12", +@@ -58581,7 +58623,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1976" ++ "referenced_type" : "type-1902" + }, + { + "referenced_type" : "type-1" +@@ -58597,7 +58639,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1976" ++ "referenced_type" : "type-1902" + }, + { + "referenced_type" : "type-619" +@@ -58613,7 +58655,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1976" ++ "referenced_type" : "type-1902" + }, + { + "referenced_type" : "type-618" +@@ -58629,13 +58671,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1976" ++ "referenced_type" : "type-1902" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1693", ++ "return_type" : "type-1607", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -58645,7 +58687,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1976" ++ "referenced_type" : "type-1902" + } + ], + "return_type" : "type-1", +@@ -58658,10 +58700,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2010" ++ "referenced_type" : "type-1936" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -58671,7 +58713,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2010" ++ "referenced_type" : "type-1936" + } + ], + "return_type" : "type-12", +@@ -58685,7 +58727,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2010" ++ "referenced_type" : "type-1936" + }, + { + "referenced_type" : "type-1" +@@ -58701,7 +58743,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2010" ++ "referenced_type" : "type-1936" + }, + { + "referenced_type" : "type-619" +@@ -58717,7 +58759,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2010" ++ "referenced_type" : "type-1936" + }, + { + "referenced_type" : "type-618" +@@ -58733,13 +58775,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2010" ++ "referenced_type" : "type-1936" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1711", ++ "return_type" : "type-1625", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -58749,7 +58791,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2010" ++ "referenced_type" : "type-1936" + } + ], + "return_type" : "type-1", +@@ -59290,10 +59332,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11126" ++ "referenced_type" : "type-11078" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -59303,7 +59345,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11126" ++ "referenced_type" : "type-11078" + } + ], + "return_type" : "type-12", +@@ -59317,7 +59359,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11126" ++ "referenced_type" : "type-11078" + }, + { + "referenced_type" : "type-1" +@@ -59333,7 +59375,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11126" ++ "referenced_type" : "type-11078" + }, + { + "referenced_type" : "type-619" +@@ -59349,7 +59391,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11126" ++ "referenced_type" : "type-11078" + }, + { + "referenced_type" : "type-618" +@@ -59365,13 +59407,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11126" ++ "referenced_type" : "type-11078" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-11067", ++ "return_type" : "type-11019", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -59381,7 +59423,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11126" ++ "referenced_type" : "type-11078" + } + ], + "return_type" : "type-1", +@@ -59394,10 +59436,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11117" ++ "referenced_type" : "type-11069" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -59407,7 +59449,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11117" ++ "referenced_type" : "type-11069" + } + ], + "return_type" : "type-12", +@@ -59421,7 +59463,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11117" ++ "referenced_type" : "type-11069" + }, + { + "referenced_type" : "type-1" +@@ -59437,7 +59479,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11117" ++ "referenced_type" : "type-11069" + }, + { + "referenced_type" : "type-619" +@@ -59453,7 +59495,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11117" ++ "referenced_type" : "type-11069" + }, + { + "referenced_type" : "type-618" +@@ -59469,13 +59511,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11117" ++ "referenced_type" : "type-11069" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-11065", ++ "return_type" : "type-11017", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -59485,7 +59527,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11117" ++ "referenced_type" : "type-11069" + } + ], + "return_type" : "type-1", +@@ -59498,10 +59540,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11109" ++ "referenced_type" : "type-11061" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -59511,7 +59553,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11109" ++ "referenced_type" : "type-11061" + } + ], + "return_type" : "type-12", +@@ -59525,7 +59567,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11109" ++ "referenced_type" : "type-11061" + }, + { + "referenced_type" : "type-1" +@@ -59541,7 +59583,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11109" ++ "referenced_type" : "type-11061" + }, + { + "referenced_type" : "type-619" +@@ -59557,7 +59599,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11109" ++ "referenced_type" : "type-11061" + }, + { + "referenced_type" : "type-618" +@@ -59573,13 +59615,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11109" ++ "referenced_type" : "type-11061" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-11063", ++ "return_type" : "type-11015", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -59589,7 +59631,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11109" ++ "referenced_type" : "type-11061" + } + ], + "return_type" : "type-1", +@@ -59602,10 +59644,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2005" ++ "referenced_type" : "type-1931" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -59615,7 +59657,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2005" ++ "referenced_type" : "type-1931" + } + ], + "return_type" : "type-12", +@@ -59629,7 +59671,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2005" ++ "referenced_type" : "type-1931" + }, + { + "referenced_type" : "type-1" +@@ -59645,7 +59687,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2005" ++ "referenced_type" : "type-1931" + }, + { + "referenced_type" : "type-619" +@@ -59661,7 +59703,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2005" ++ "referenced_type" : "type-1931" + }, + { + "referenced_type" : "type-618" +@@ -59677,13 +59719,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2005" ++ "referenced_type" : "type-1931" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1680", ++ "return_type" : "type-1594", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -59693,7 +59735,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2005" ++ "referenced_type" : "type-1931" + } + ], + "return_type" : "type-1", +@@ -59706,7 +59748,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1947" ++ "referenced_type" : "type-1871" + }, + { + "referenced_type" : "type-619" +@@ -59722,7 +59764,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1947" ++ "referenced_type" : "type-1871" + }, + { + "referenced_type" : "type-618" +@@ -59738,10 +59780,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1992" ++ "referenced_type" : "type-1918" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -59751,7 +59793,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1992" ++ "referenced_type" : "type-1918" + } + ], + "return_type" : "type-12", +@@ -59765,7 +59807,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1992" ++ "referenced_type" : "type-1918" + }, + { + "referenced_type" : "type-1" +@@ -59781,7 +59823,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1992" ++ "referenced_type" : "type-1918" + }, + { + "referenced_type" : "type-619" +@@ -59797,7 +59839,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1992" ++ "referenced_type" : "type-1918" + }, + { + "referenced_type" : "type-618" +@@ -59813,13 +59855,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1992" ++ "referenced_type" : "type-1918" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1707", ++ "return_type" : "type-1621", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -59829,7 +59871,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1992" ++ "referenced_type" : "type-1918" + } + ], + "return_type" : "type-1", +@@ -59842,10 +59884,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2476" ++ "referenced_type" : "type-2406" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/source_context.pb.h" + }, + { +@@ -59855,7 +59897,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2476" ++ "referenced_type" : "type-2406" + } + ], + "return_type" : "type-12", +@@ -59869,7 +59911,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2476" ++ "referenced_type" : "type-2406" + }, + { + "referenced_type" : "type-1" +@@ -59885,7 +59927,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2476" ++ "referenced_type" : "type-2406" + }, + { + "referenced_type" : "type-619" +@@ -59901,7 +59943,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2476" ++ "referenced_type" : "type-2406" + }, + { + "referenced_type" : "type-618" +@@ -59917,13 +59959,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2476" ++ "referenced_type" : "type-2406" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-2344", ++ "return_type" : "type-2271", + "source_file" : "/external/protobuf/src/google/protobuf/source_context.pb.h" + }, + { +@@ -59933,7 +59975,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2476" ++ "referenced_type" : "type-2406" + } + ], + "return_type" : "type-1", +@@ -59946,13 +59988,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], +- "return_type" : "type-1959", ++ "return_type" : "type-1884", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -59962,13 +60004,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], +- "return_type" : "type-2003", ++ "return_type" : "type-1929", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -59978,13 +60020,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], +- "return_type" : "type-1999", ++ "return_type" : "type-1925", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -59994,13 +60036,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], +- "return_type" : "type-2048", ++ "return_type" : "type-1978", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -60010,13 +60052,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + }, + { +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { +- "referenced_type" : "type-3746" ++ "referenced_type" : "type-3698" + } + ], + "return_type" : "type-81", +@@ -60029,13 +60071,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], +- "return_type" : "type-1990", ++ "return_type" : "type-1916", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -60045,13 +60087,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], +- "return_type" : "type-1980", ++ "return_type" : "type-1906", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -60061,13 +60103,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], +- "return_type" : "type-2008", ++ "return_type" : "type-1934", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -60077,13 +60119,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], +- "return_type" : "type-2003", ++ "return_type" : "type-1929", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -60093,10 +60135,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], + "return_type" : "type-12", +@@ -60110,13 +60152,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + }, + { +- "referenced_type" : "type-2064" ++ "referenced_type" : "type-1996" + } + ], +- "return_type" : "type-1959", ++ "return_type" : "type-1884", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -60126,16 +60168,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + }, + { +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-2003", ++ "return_type" : "type-1929", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -60145,13 +60187,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -60162,10 +60204,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], + "return_type" : "type-12", +@@ -60178,13 +60220,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], +- "return_type" : "type-1959", ++ "return_type" : "type-1884", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -60195,10 +60237,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], + "return_type" : "type-12", +@@ -60212,10 +60254,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], + "return_type" : "type-12", +@@ -60229,10 +60271,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + }, + { +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { + "referenced_type" : "type-1" +@@ -60249,16 +60291,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1980" ++ "referenced_type" : "type-1906" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-3678" ++ "referenced_type" : "type-3630" + }, + { +- "referenced_type" : "type-3730" ++ "referenced_type" : "type-3682" + } + ], + "return_type" : "type-81", +@@ -60271,10 +60313,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1980" ++ "referenced_type" : "type-1906" + } + ], +- "return_type" : "type-4642", ++ "return_type" : "type-4594", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -60284,13 +60326,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1980" ++ "referenced_type" : "type-1906" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], +- "return_type" : "type-2008", ++ "return_type" : "type-1934", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -60301,10 +60343,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1980" ++ "referenced_type" : "type-1906" + }, + { +- "referenced_type" : "type-3731" ++ "referenced_type" : "type-3683" + } + ], + "return_type" : "type-81", +@@ -60317,13 +60359,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1980" ++ "referenced_type" : "type-1906" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-2008", ++ "return_type" : "type-1934", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -60333,10 +60375,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1980" ++ "referenced_type" : "type-1906" + }, + { +- "referenced_type" : "type-3677" ++ "referenced_type" : "type-3629" + } + ], + "return_type" : "type-12", +@@ -60349,13 +60391,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1980" ++ "referenced_type" : "type-1906" + }, + { +- "referenced_type" : "type-3730" ++ "referenced_type" : "type-3682" + } + ], +- "return_type" : "type-4643", ++ "return_type" : "type-4595", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -60366,13 +60408,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1980" ++ "referenced_type" : "type-1906" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-2008", ++ "return_type" : "type-1934", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -60382,10 +60424,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1980" ++ "referenced_type" : "type-1906" + }, + { +- "referenced_type" : "type-1882" ++ "referenced_type" : "type-1800" + } + ], + "return_type" : "type-81", +@@ -60398,10 +60440,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1959" ++ "referenced_type" : "type-1884" + } + ], +- "return_type" : "type-4644", ++ "return_type" : "type-4596", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -60411,10 +60453,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1959" ++ "referenced_type" : "type-1884" + }, + { +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-81", +@@ -60427,13 +60469,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1959" ++ "referenced_type" : "type-1884" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], +- "return_type" : "type-1990", ++ "return_type" : "type-1916", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -60443,10 +60485,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1959" ++ "referenced_type" : "type-1884" + }, + { +- "referenced_type" : "type-3677" ++ "referenced_type" : "type-3629" + } + ], + "return_type" : "type-12", +@@ -60459,13 +60501,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1959" ++ "referenced_type" : "type-1884" + }, + { +- "referenced_type" : "type-3743" ++ "referenced_type" : "type-3695" + }, + { +- "referenced_type" : "type-3677" ++ "referenced_type" : "type-3629" + } + ], + "return_type" : "type-12", +@@ -60478,13 +60520,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1959" ++ "referenced_type" : "type-1884" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], +- "return_type" : "type-1980", ++ "return_type" : "type-1906", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -60494,13 +60536,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1959" ++ "referenced_type" : "type-1884" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], +- "return_type" : "type-2008", ++ "return_type" : "type-1934", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -60510,13 +60552,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1959" ++ "referenced_type" : "type-1884" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], +- "return_type" : "type-2003", ++ "return_type" : "type-1929", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -60526,10 +60568,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1959" ++ "referenced_type" : "type-1884" + }, + { +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-81", +@@ -60542,13 +60584,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1959" ++ "referenced_type" : "type-1884" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], +- "return_type" : "type-1974", ++ "return_type" : "type-1900", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -60558,13 +60600,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1959" ++ "referenced_type" : "type-1884" + }, + { +- "referenced_type" : "type-3730" ++ "referenced_type" : "type-3682" + } + ], +- "return_type" : "type-4645", ++ "return_type" : "type-4597", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -60574,13 +60616,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1959" ++ "referenced_type" : "type-1884" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], +- "return_type" : "type-2003", ++ "return_type" : "type-1929", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -60590,13 +60632,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1959" ++ "referenced_type" : "type-1884" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], +- "return_type" : "type-2003", ++ "return_type" : "type-1929", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -60606,10 +60648,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1959" ++ "referenced_type" : "type-1884" + }, + { +- "referenced_type" : "type-1874" ++ "referenced_type" : "type-1792" + } + ], + "return_type" : "type-81", +@@ -60622,10 +60664,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2017" ++ "referenced_type" : "type-1943" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -60635,7 +60677,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2017" ++ "referenced_type" : "type-1943" + } + ], + "return_type" : "type-12", +@@ -60649,7 +60691,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2017" ++ "referenced_type" : "type-1943" + }, + { + "referenced_type" : "type-1" +@@ -60665,7 +60707,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2017" ++ "referenced_type" : "type-1943" + }, + { + "referenced_type" : "type-619" +@@ -60681,7 +60723,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2017" ++ "referenced_type" : "type-1943" + }, + { + "referenced_type" : "type-618" +@@ -60697,13 +60739,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2017" ++ "referenced_type" : "type-1943" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1699", ++ "return_type" : "type-1613", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -60713,7 +60755,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2017" ++ "referenced_type" : "type-1943" + } + ], + "return_type" : "type-1", +@@ -60726,10 +60768,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1986" ++ "referenced_type" : "type-1912" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -60739,7 +60781,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1986" ++ "referenced_type" : "type-1912" + } + ], + "return_type" : "type-12", +@@ -60753,7 +60795,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1986" ++ "referenced_type" : "type-1912" + }, + { + "referenced_type" : "type-1" +@@ -60769,7 +60811,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1986" ++ "referenced_type" : "type-1912" + }, + { + "referenced_type" : "type-619" +@@ -60785,7 +60827,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1986" ++ "referenced_type" : "type-1912" + }, + { + "referenced_type" : "type-618" +@@ -60801,13 +60843,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1986" ++ "referenced_type" : "type-1912" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1709", ++ "return_type" : "type-1623", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -60817,7 +60859,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1986" ++ "referenced_type" : "type-1912" + } + ], + "return_type" : "type-1", +@@ -60830,10 +60872,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2015" ++ "referenced_type" : "type-1941" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -60843,7 +60885,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2015" ++ "referenced_type" : "type-1941" + } + ], + "return_type" : "type-12", +@@ -60857,7 +60899,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2015" ++ "referenced_type" : "type-1941" + }, + { + "referenced_type" : "type-1" +@@ -60873,7 +60915,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2015" ++ "referenced_type" : "type-1941" + }, + { + "referenced_type" : "type-619" +@@ -60889,7 +60931,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2015" ++ "referenced_type" : "type-1941" + }, + { + "referenced_type" : "type-618" +@@ -60905,13 +60947,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2015" ++ "referenced_type" : "type-1941" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1713", ++ "return_type" : "type-1627", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -60921,7 +60963,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2015" ++ "referenced_type" : "type-1941" + } + ], + "return_type" : "type-1", +@@ -60934,10 +60976,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1880" ++ "referenced_type" : "type-1798" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -60947,7 +60989,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1880" ++ "referenced_type" : "type-1798" + } + ], + "return_type" : "type-12", +@@ -60961,7 +61003,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1880" ++ "referenced_type" : "type-1798" + }, + { + "referenced_type" : "type-1" +@@ -60977,7 +61019,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1880" ++ "referenced_type" : "type-1798" + }, + { + "referenced_type" : "type-619" +@@ -60993,7 +61035,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1880" ++ "referenced_type" : "type-1798" + }, + { + "referenced_type" : "type-618" +@@ -61009,13 +61051,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1880" ++ "referenced_type" : "type-1798" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1878", ++ "return_type" : "type-1796", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -61025,7 +61067,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1880" ++ "referenced_type" : "type-1798" + } + ], + "return_type" : "type-1", +@@ -61039,19 +61081,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2035" ++ "referenced_type" : "type-1964" + }, + { +- "referenced_type" : "type-3678" ++ "referenced_type" : "type-3630" + }, + { +- "referenced_type" : "type-3730" ++ "referenced_type" : "type-3682" + } + ], + "return_type" : "type-81", +@@ -61064,10 +61106,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], +- "return_type" : "type-4646", ++ "return_type" : "type-4598", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -61078,10 +61120,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + } + ], + "return_type" : "type-81", +@@ -61095,10 +61137,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-3731" ++ "referenced_type" : "type-3683" + } + ], + "return_type" : "type-81", +@@ -61111,10 +61153,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-3677" ++ "referenced_type" : "type-3629" + } + ], + "return_type" : "type-12", +@@ -61128,13 +61170,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-12" + } + ], +- "return_type" : "type-4647", ++ "return_type" : "type-4599", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -61144,13 +61186,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-3730" ++ "referenced_type" : "type-3682" + } + ], +- "return_type" : "type-4648", ++ "return_type" : "type-4600", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -61161,10 +61203,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], +- "return_type" : "type-4649", ++ "return_type" : "type-4601", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -61174,10 +61216,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-1890" ++ "referenced_type" : "type-1809" + } + ], + "return_type" : "type-81", +@@ -61190,7 +61232,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-12", +@@ -61203,7 +61245,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-12", +@@ -61217,16 +61259,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1999" ++ "referenced_type" : "type-1925" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-3678" ++ "referenced_type" : "type-3630" + }, + { +- "referenced_type" : "type-3730" ++ "referenced_type" : "type-3682" + } + ], + "return_type" : "type-81", +@@ -61239,10 +61281,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1999" ++ "referenced_type" : "type-1925" + } + ], +- "return_type" : "type-4650", ++ "return_type" : "type-4602", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -61253,10 +61295,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1999" ++ "referenced_type" : "type-1925" + }, + { +- "referenced_type" : "type-3731" ++ "referenced_type" : "type-3683" + } + ], + "return_type" : "type-81", +@@ -61269,10 +61311,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1999" ++ "referenced_type" : "type-1925" + }, + { +- "referenced_type" : "type-3677" ++ "referenced_type" : "type-3629" + } + ], + "return_type" : "type-12", +@@ -61285,13 +61327,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1999" ++ "referenced_type" : "type-1925" + }, + { +- "referenced_type" : "type-3730" ++ "referenced_type" : "type-3682" + } + ], +- "return_type" : "type-4651", ++ "return_type" : "type-4603", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -61301,10 +61343,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1999" ++ "referenced_type" : "type-1925" + }, + { +- "referenced_type" : "type-1898" ++ "referenced_type" : "type-1817" + } + ], + "return_type" : "type-81", +@@ -61317,7 +61359,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1938" ++ "referenced_type" : "type-1863" + } + ], + "return_type" : "type-1", +@@ -61330,7 +61372,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1938" ++ "referenced_type" : "type-1863" + } + ], + "return_type" : "type-1", +@@ -61343,10 +61385,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1982" ++ "referenced_type" : "type-1908" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -61356,7 +61398,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1982" ++ "referenced_type" : "type-1908" + } + ], + "return_type" : "type-12", +@@ -61370,7 +61412,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1982" ++ "referenced_type" : "type-1908" + }, + { + "referenced_type" : "type-1" +@@ -61386,7 +61428,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1982" ++ "referenced_type" : "type-1908" + }, + { + "referenced_type" : "type-619" +@@ -61402,7 +61444,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1982" ++ "referenced_type" : "type-1908" + }, + { + "referenced_type" : "type-618" +@@ -61418,13 +61460,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1982" ++ "referenced_type" : "type-1908" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1691", ++ "return_type" : "type-1605", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -61434,7 +61476,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1982" ++ "referenced_type" : "type-1908" + } + ], + "return_type" : "type-1", +@@ -61448,16 +61490,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2048" ++ "referenced_type" : "type-1978" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-3678" ++ "referenced_type" : "type-3630" + }, + { +- "referenced_type" : "type-3730" ++ "referenced_type" : "type-3682" + } + ], + "return_type" : "type-81", +@@ -61470,10 +61512,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2048" ++ "referenced_type" : "type-1978" + } + ], +- "return_type" : "type-4652", ++ "return_type" : "type-4604", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -61484,10 +61526,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2048" ++ "referenced_type" : "type-1978" + }, + { +- "referenced_type" : "type-3731" ++ "referenced_type" : "type-3683" + } + ], + "return_type" : "type-81", +@@ -61500,10 +61542,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2048" ++ "referenced_type" : "type-1978" + }, + { +- "referenced_type" : "type-3677" ++ "referenced_type" : "type-3629" + } + ], + "return_type" : "type-12", +@@ -61516,13 +61558,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2048" ++ "referenced_type" : "type-1978" + }, + { +- "referenced_type" : "type-3730" ++ "referenced_type" : "type-3682" + } + ], +- "return_type" : "type-4653", ++ "return_type" : "type-4605", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -61532,10 +61574,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2048" ++ "referenced_type" : "type-1978" + }, + { +- "referenced_type" : "type-1910" ++ "referenced_type" : "type-1830" + } + ], + "return_type" : "type-81", +@@ -61548,10 +61590,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2217" ++ "referenced_type" : "type-2148" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -61561,7 +61603,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2217" ++ "referenced_type" : "type-2148" + } + ], + "return_type" : "type-12", +@@ -61575,7 +61617,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2217" ++ "referenced_type" : "type-2148" + }, + { + "referenced_type" : "type-1" +@@ -61591,7 +61633,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2217" ++ "referenced_type" : "type-2148" + }, + { + "referenced_type" : "type-619" +@@ -61607,7 +61649,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2217" ++ "referenced_type" : "type-2148" + }, + { + "referenced_type" : "type-618" +@@ -61623,13 +61665,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2217" ++ "referenced_type" : "type-2148" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-2213", ++ "return_type" : "type-2144", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -61639,7 +61681,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2217" ++ "referenced_type" : "type-2148" + } + ], + "return_type" : "type-1", +@@ -61652,10 +61694,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2267" ++ "referenced_type" : "type-2196" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -61665,7 +61707,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2267" ++ "referenced_type" : "type-2196" + } + ], + "return_type" : "type-12", +@@ -61679,7 +61721,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2267" ++ "referenced_type" : "type-2196" + }, + { + "referenced_type" : "type-1" +@@ -61695,7 +61737,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2267" ++ "referenced_type" : "type-2196" + }, + { + "referenced_type" : "type-619" +@@ -61711,7 +61753,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2267" ++ "referenced_type" : "type-2196" + }, + { + "referenced_type" : "type-618" +@@ -61727,13 +61769,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2267" ++ "referenced_type" : "type-2196" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-2263", ++ "return_type" : "type-2192", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -61743,7 +61785,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2267" ++ "referenced_type" : "type-2196" + } + ], + "return_type" : "type-1", +@@ -61757,13 +61799,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1990" ++ "referenced_type" : "type-1916" + }, + { +- "referenced_type" : "type-3678" ++ "referenced_type" : "type-3630" + }, + { +- "referenced_type" : "type-3730" ++ "referenced_type" : "type-3682" + } + ], + "return_type" : "type-81", +@@ -61776,10 +61818,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1990" ++ "referenced_type" : "type-1916" + } + ], +- "return_type" : "type-4654", ++ "return_type" : "type-4606", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -61790,10 +61832,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1990" ++ "referenced_type" : "type-1916" + }, + { +- "referenced_type" : "type-3731" ++ "referenced_type" : "type-3683" + } + ], + "return_type" : "type-81", +@@ -61806,13 +61848,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1990" ++ "referenced_type" : "type-1916" + }, + { +- "referenced_type" : "type-3689" ++ "referenced_type" : "type-3641" + } + ], +- "return_type" : "type-2048", ++ "return_type" : "type-1978", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -61822,10 +61864,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1990" ++ "referenced_type" : "type-1916" + }, + { +- "referenced_type" : "type-3677" ++ "referenced_type" : "type-3629" + } + ], + "return_type" : "type-12", +@@ -61838,13 +61880,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1990" ++ "referenced_type" : "type-1916" + }, + { +- "referenced_type" : "type-3730" ++ "referenced_type" : "type-3682" + } + ], +- "return_type" : "type-4655", ++ "return_type" : "type-4607", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -61854,10 +61896,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1990" ++ "referenced_type" : "type-1916" + }, + { +- "referenced_type" : "type-1886" ++ "referenced_type" : "type-1804" + } + ], + "return_type" : "type-81", +@@ -61870,10 +61912,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1884" ++ "referenced_type" : "type-1802" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -61883,7 +61925,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1884" ++ "referenced_type" : "type-1802" + } + ], + "return_type" : "type-12", +@@ -61897,7 +61939,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1884" ++ "referenced_type" : "type-1802" + }, + { + "referenced_type" : "type-1" +@@ -61913,7 +61955,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1884" ++ "referenced_type" : "type-1802" + }, + { + "referenced_type" : "type-619" +@@ -61929,7 +61971,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1884" ++ "referenced_type" : "type-1802" + }, + { + "referenced_type" : "type-618" +@@ -61945,13 +61987,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1884" ++ "referenced_type" : "type-1802" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1882", ++ "return_type" : "type-1800", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -61961,7 +62003,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1884" ++ "referenced_type" : "type-1802" + } + ], + "return_type" : "type-1", +@@ -61975,16 +62017,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2008" ++ "referenced_type" : "type-1934" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-3678" ++ "referenced_type" : "type-3630" + }, + { +- "referenced_type" : "type-3730" ++ "referenced_type" : "type-3682" + } + ], + "return_type" : "type-81", +@@ -61997,10 +62039,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2008" ++ "referenced_type" : "type-1934" + } + ], +- "return_type" : "type-4656", ++ "return_type" : "type-4608", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -62011,10 +62053,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2008" ++ "referenced_type" : "type-1934" + }, + { +- "referenced_type" : "type-3731" ++ "referenced_type" : "type-3683" + } + ], + "return_type" : "type-81", +@@ -62027,10 +62069,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2008" ++ "referenced_type" : "type-1934" + }, + { +- "referenced_type" : "type-3677" ++ "referenced_type" : "type-3629" + } + ], + "return_type" : "type-12", +@@ -62043,13 +62085,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2008" ++ "referenced_type" : "type-1934" + }, + { +- "referenced_type" : "type-3730" ++ "referenced_type" : "type-3682" + } + ], +- "return_type" : "type-4657", ++ "return_type" : "type-4609", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -62059,10 +62101,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2008" ++ "referenced_type" : "type-1934" + }, + { +- "referenced_type" : "type-1906" ++ "referenced_type" : "type-1825" + } + ], + "return_type" : "type-81", +@@ -62075,10 +62117,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -62088,7 +62130,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-12", +@@ -62102,7 +62144,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + }, + { + "referenced_type" : "type-1" +@@ -62118,7 +62160,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + }, + { + "referenced_type" : "type-619" +@@ -62134,7 +62176,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + }, + { + "referenced_type" : "type-618" +@@ -62150,13 +62192,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1874", ++ "return_type" : "type-1792", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -62166,7 +62208,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1876" ++ "referenced_type" : "type-1794" + } + ], + "return_type" : "type-1", +@@ -62179,10 +62221,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1916" ++ "referenced_type" : "type-1836" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -62192,7 +62234,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1916" ++ "referenced_type" : "type-1836" + } + ], + "return_type" : "type-12", +@@ -62206,7 +62248,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1916" ++ "referenced_type" : "type-1836" + }, + { + "referenced_type" : "type-1" +@@ -62222,7 +62264,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1916" ++ "referenced_type" : "type-1836" + }, + { + "referenced_type" : "type-619" +@@ -62238,7 +62280,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1916" ++ "referenced_type" : "type-1836" + }, + { + "referenced_type" : "type-618" +@@ -62254,13 +62296,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1916" ++ "referenced_type" : "type-1836" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1914", ++ "return_type" : "type-1834", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -62270,7 +62312,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1916" ++ "referenced_type" : "type-1836" + } + ], + "return_type" : "type-1", +@@ -62283,10 +62325,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1892" ++ "referenced_type" : "type-1811" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -62296,7 +62338,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1892" ++ "referenced_type" : "type-1811" + } + ], + "return_type" : "type-12", +@@ -62310,7 +62352,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1892" ++ "referenced_type" : "type-1811" + }, + { + "referenced_type" : "type-1" +@@ -62326,7 +62368,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1892" ++ "referenced_type" : "type-1811" + }, + { + "referenced_type" : "type-619" +@@ -62342,7 +62384,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1892" ++ "referenced_type" : "type-1811" + }, + { + "referenced_type" : "type-618" +@@ -62358,13 +62400,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1892" ++ "referenced_type" : "type-1811" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1890", ++ "return_type" : "type-1809", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -62374,7 +62416,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1892" ++ "referenced_type" : "type-1811" + } + ], + "return_type" : "type-1", +@@ -62387,10 +62429,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1900" ++ "referenced_type" : "type-1819" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -62400,7 +62442,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1900" ++ "referenced_type" : "type-1819" + } + ], + "return_type" : "type-12", +@@ -62414,7 +62456,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1900" ++ "referenced_type" : "type-1819" + }, + { + "referenced_type" : "type-1" +@@ -62430,7 +62472,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1900" ++ "referenced_type" : "type-1819" + }, + { + "referenced_type" : "type-619" +@@ -62446,7 +62488,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1900" ++ "referenced_type" : "type-1819" + }, + { + "referenced_type" : "type-618" +@@ -62462,13 +62504,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1900" ++ "referenced_type" : "type-1819" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1898", ++ "return_type" : "type-1817", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -62478,7 +62520,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1900" ++ "referenced_type" : "type-1819" + } + ], + "return_type" : "type-1", +@@ -62491,10 +62533,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1912" ++ "referenced_type" : "type-1832" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -62504,7 +62546,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1912" ++ "referenced_type" : "type-1832" + } + ], + "return_type" : "type-12", +@@ -62518,7 +62560,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1912" ++ "referenced_type" : "type-1832" + }, + { + "referenced_type" : "type-1" +@@ -62534,7 +62576,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1912" ++ "referenced_type" : "type-1832" + }, + { + "referenced_type" : "type-619" +@@ -62550,7 +62592,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1912" ++ "referenced_type" : "type-1832" + }, + { + "referenced_type" : "type-618" +@@ -62566,13 +62608,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1912" ++ "referenced_type" : "type-1832" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1910", ++ "return_type" : "type-1830", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -62582,7 +62624,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1912" ++ "referenced_type" : "type-1832" + } + ], + "return_type" : "type-1", +@@ -62595,10 +62637,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1888" ++ "referenced_type" : "type-1807" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -62608,7 +62650,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1888" ++ "referenced_type" : "type-1807" + } + ], + "return_type" : "type-12", +@@ -62622,7 +62664,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1888" ++ "referenced_type" : "type-1807" + }, + { + "referenced_type" : "type-1" +@@ -62638,7 +62680,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1888" ++ "referenced_type" : "type-1807" + }, + { + "referenced_type" : "type-619" +@@ -62654,7 +62696,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1888" ++ "referenced_type" : "type-1807" + }, + { + "referenced_type" : "type-618" +@@ -62670,13 +62712,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1888" ++ "referenced_type" : "type-1807" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1886", ++ "return_type" : "type-1804", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -62686,7 +62728,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1888" ++ "referenced_type" : "type-1807" + } + ], + "return_type" : "type-1", +@@ -62699,10 +62741,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1924" ++ "referenced_type" : "type-1845" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -62712,7 +62754,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1924" ++ "referenced_type" : "type-1845" + } + ], + "return_type" : "type-12", +@@ -62726,7 +62768,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1924" ++ "referenced_type" : "type-1845" + }, + { + "referenced_type" : "type-1" +@@ -62742,7 +62784,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1924" ++ "referenced_type" : "type-1845" + }, + { + "referenced_type" : "type-619" +@@ -62758,7 +62800,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1924" ++ "referenced_type" : "type-1845" + }, + { + "referenced_type" : "type-618" +@@ -62774,13 +62816,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1924" ++ "referenced_type" : "type-1845" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1922", ++ "return_type" : "type-1843", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -62790,7 +62832,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1924" ++ "referenced_type" : "type-1845" + } + ], + "return_type" : "type-1", +@@ -62803,10 +62845,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1908" ++ "referenced_type" : "type-1828" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -62816,7 +62858,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1908" ++ "referenced_type" : "type-1828" + } + ], + "return_type" : "type-12", +@@ -62830,7 +62872,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1908" ++ "referenced_type" : "type-1828" + }, + { + "referenced_type" : "type-1" +@@ -62846,7 +62888,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1908" ++ "referenced_type" : "type-1828" + }, + { + "referenced_type" : "type-619" +@@ -62862,7 +62904,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1908" ++ "referenced_type" : "type-1828" + }, + { + "referenced_type" : "type-618" +@@ -62878,13 +62920,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1908" ++ "referenced_type" : "type-1828" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1906", ++ "return_type" : "type-1825", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -62894,7 +62936,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1908" ++ "referenced_type" : "type-1828" + } + ], + "return_type" : "type-1", +@@ -62907,10 +62949,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1928" ++ "referenced_type" : "type-1849" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -62920,7 +62962,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1928" ++ "referenced_type" : "type-1849" + } + ], + "return_type" : "type-12", +@@ -62934,7 +62976,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1928" ++ "referenced_type" : "type-1849" + }, + { + "referenced_type" : "type-1" +@@ -62950,7 +62992,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1928" ++ "referenced_type" : "type-1849" + }, + { + "referenced_type" : "type-619" +@@ -62966,7 +63008,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1928" ++ "referenced_type" : "type-1849" + }, + { + "referenced_type" : "type-618" +@@ -62982,13 +63024,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1928" ++ "referenced_type" : "type-1849" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1926", ++ "return_type" : "type-1847", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -62998,7 +63040,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1928" ++ "referenced_type" : "type-1849" + } + ], + "return_type" : "type-1", +@@ -63011,10 +63053,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1920" ++ "referenced_type" : "type-1841" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -63024,7 +63066,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1920" ++ "referenced_type" : "type-1841" + } + ], + "return_type" : "type-12", +@@ -63038,7 +63080,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1920" ++ "referenced_type" : "type-1841" + }, + { + "referenced_type" : "type-1" +@@ -63054,7 +63096,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1920" ++ "referenced_type" : "type-1841" + }, + { + "referenced_type" : "type-619" +@@ -63071,7 +63113,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1920" ++ "referenced_type" : "type-1841" + } + ], + "return_type" : "type-1", +@@ -63084,7 +63126,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1920" ++ "referenced_type" : "type-1841" + }, + { + "referenced_type" : "type-618" +@@ -63100,13 +63142,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1920" ++ "referenced_type" : "type-1841" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1918", ++ "return_type" : "type-1839", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -63116,7 +63158,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1920" ++ "referenced_type" : "type-1841" + } + ], + "return_type" : "type-1", +@@ -63129,10 +63171,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1904" ++ "referenced_type" : "type-1823" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -63142,7 +63184,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1904" ++ "referenced_type" : "type-1823" + } + ], + "return_type" : "type-12", +@@ -63156,7 +63198,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1904" ++ "referenced_type" : "type-1823" + }, + { + "referenced_type" : "type-1" +@@ -63172,7 +63214,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1904" ++ "referenced_type" : "type-1823" + }, + { + "referenced_type" : "type-619" +@@ -63188,7 +63230,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1904" ++ "referenced_type" : "type-1823" + }, + { + "referenced_type" : "type-618" +@@ -63204,13 +63246,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1904" ++ "referenced_type" : "type-1823" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1902", ++ "return_type" : "type-1821", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -63220,7 +63262,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1904" ++ "referenced_type" : "type-1823" + } + ], + "return_type" : "type-1", +@@ -63233,7 +63275,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1589" ++ "referenced_type" : "type-1507" + } + ], + "return_type" : "type-89", +@@ -63246,7 +63288,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11185" ++ "referenced_type" : "type-11137" + } + ], + "return_type" : "type-89", +@@ -63259,7 +63301,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1641" ++ "referenced_type" : "type-1554" + } + ], + "return_type" : "type-89", +@@ -63298,7 +63340,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1595" ++ "referenced_type" : "type-1513" + } + ], + "return_type" : "type-89", +@@ -63311,7 +63353,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11195" ++ "referenced_type" : "type-11147" + } + ], + "return_type" : "type-89", +@@ -63324,7 +63366,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1644" ++ "referenced_type" : "type-1558" + } + ], + "return_type" : "type-89", +@@ -63337,7 +63379,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1604" ++ "referenced_type" : "type-1521" + } + ], + "return_type" : "type-89", +@@ -63350,7 +63392,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1647" ++ "referenced_type" : "type-1561" + } + ], + "return_type" : "type-89", +@@ -63363,7 +63405,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1626" ++ "referenced_type" : "type-1542" + } + ], + "return_type" : "type-89", +@@ -63376,7 +63418,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1612" ++ "referenced_type" : "type-1529" + } + ], + "return_type" : "type-89", +@@ -63389,7 +63431,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1650" ++ "referenced_type" : "type-1564" + } + ], + "return_type" : "type-89", +@@ -63402,7 +63444,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1620" ++ "referenced_type" : "type-1538" + } + ], + "return_type" : "type-89", +@@ -63415,7 +63457,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1652" ++ "referenced_type" : "type-1566" + } + ], + "return_type" : "type-89", +@@ -63428,7 +63470,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1655" ++ "referenced_type" : "type-1568" + } + ], + "return_type" : "type-89", +@@ -63441,10 +63483,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1896" ++ "referenced_type" : "type-1815" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -63454,7 +63496,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1896" ++ "referenced_type" : "type-1815" + } + ], + "return_type" : "type-12", +@@ -63468,7 +63510,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1896" ++ "referenced_type" : "type-1815" + }, + { + "referenced_type" : "type-1" +@@ -63484,7 +63526,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1896" ++ "referenced_type" : "type-1815" + }, + { + "referenced_type" : "type-619" +@@ -63500,7 +63542,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1896" ++ "referenced_type" : "type-1815" + }, + { + "referenced_type" : "type-618" +@@ -63516,13 +63558,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1896" ++ "referenced_type" : "type-1815" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1894", ++ "return_type" : "type-1813", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -63532,7 +63574,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-1896" ++ "referenced_type" : "type-1815" + } + ], + "return_type" : "type-1", +@@ -63545,10 +63587,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2162" ++ "referenced_type" : "type-2093" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/any.pb.h" + }, + { +@@ -63558,7 +63600,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2162" ++ "referenced_type" : "type-2093" + } + ], + "return_type" : "type-12", +@@ -63572,7 +63614,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2162" ++ "referenced_type" : "type-2093" + }, + { + "referenced_type" : "type-1" +@@ -63588,7 +63630,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2162" ++ "referenced_type" : "type-2093" + }, + { + "referenced_type" : "type-619" +@@ -63604,7 +63646,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2162" ++ "referenced_type" : "type-2093" + }, + { + "referenced_type" : "type-618" +@@ -63620,13 +63662,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2162" ++ "referenced_type" : "type-2093" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-1845", ++ "return_type" : "type-1758", + "source_file" : "/external/protobuf/src/google/protobuf/any.pb.h" + }, + { +@@ -63636,7 +63678,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2162" ++ "referenced_type" : "type-2093" + } + ], + "return_type" : "type-1", +@@ -63649,10 +63691,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2162" ++ "referenced_type" : "type-2093" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-12", +@@ -63665,10 +63707,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2446" ++ "referenced_type" : "type-2376" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/api.pb.h" + }, + { +@@ -63678,7 +63720,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2446" ++ "referenced_type" : "type-2376" + } + ], + "return_type" : "type-12", +@@ -63692,7 +63734,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2446" ++ "referenced_type" : "type-2376" + }, + { + "referenced_type" : "type-1" +@@ -63708,7 +63750,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2446" ++ "referenced_type" : "type-2376" + }, + { + "referenced_type" : "type-619" +@@ -63724,7 +63766,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2446" ++ "referenced_type" : "type-2376" + }, + { + "referenced_type" : "type-618" +@@ -63740,13 +63782,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2446" ++ "referenced_type" : "type-2376" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-2341", ++ "return_type" : "type-2268", + "source_file" : "/external/protobuf/src/google/protobuf/api.pb.h" + }, + { +@@ -63756,7 +63798,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2446" ++ "referenced_type" : "type-2376" + } + ], + "return_type" : "type-1", +@@ -63769,10 +63811,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2500" ++ "referenced_type" : "type-2430" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -63782,7 +63824,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2500" ++ "referenced_type" : "type-2430" + } + ], + "return_type" : "type-12", +@@ -63796,7 +63838,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2500" ++ "referenced_type" : "type-2430" + }, + { + "referenced_type" : "type-1" +@@ -63812,7 +63854,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2500" ++ "referenced_type" : "type-2430" + }, + { + "referenced_type" : "type-619" +@@ -63828,7 +63870,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2500" ++ "referenced_type" : "type-2430" + }, + { + "referenced_type" : "type-618" +@@ -63844,13 +63886,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2500" ++ "referenced_type" : "type-2430" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-2497", ++ "return_type" : "type-2427", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -63860,7 +63902,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2500" ++ "referenced_type" : "type-2430" + } + ], + "return_type" : "type-1", +@@ -63873,10 +63915,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2492" ++ "referenced_type" : "type-2422" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -63886,7 +63928,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2492" ++ "referenced_type" : "type-2422" + } + ], + "return_type" : "type-12", +@@ -63900,7 +63942,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2492" ++ "referenced_type" : "type-2422" + }, + { + "referenced_type" : "type-1" +@@ -63916,7 +63958,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2492" ++ "referenced_type" : "type-2422" + }, + { + "referenced_type" : "type-619" +@@ -63932,7 +63974,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2492" ++ "referenced_type" : "type-2422" + }, + { + "referenced_type" : "type-618" +@@ -63948,13 +63990,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2492" ++ "referenced_type" : "type-2422" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-2489", ++ "return_type" : "type-2419", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -63964,7 +64006,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2492" ++ "referenced_type" : "type-2422" + } + ], + "return_type" : "type-1", +@@ -63978,13 +64020,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-14826" ++ "referenced_type" : "type-14778" + }, + { + "referenced_type" : "type-12" + } + ], +- "return_type" : "type-14816", ++ "return_type" : "type-14768", + "source_file" : "/external/protobuf/src/google/protobuf/util/field_comparator.h" + }, + { +@@ -64023,10 +64065,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19684" ++ "referenced_type" : "type-19636" + } + ], +- "return_type" : "type-21922", ++ "return_type" : "type-21874", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -64037,10 +64079,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19370" ++ "referenced_type" : "type-19322" + }, + { +- "referenced_type" : "type-2365" ++ "referenced_type" : "type-2293" + }, + { + "referenced_type" : "type-27" +@@ -64049,10 +64091,10 @@ + "referenced_type" : "type-4" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], +- "return_type" : "type-15017", ++ "return_type" : "type-14969", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h" + }, + { +@@ -64063,16 +64105,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19370" ++ "referenced_type" : "type-19322" + }, + { +- "referenced_type" : "type-2365" ++ "referenced_type" : "type-2293" + }, + { + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], + "return_type" : "type-76", +@@ -64085,13 +64127,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19370" ++ "referenced_type" : "type-19322" + }, + { + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], + "return_type" : "type-76", +@@ -64105,13 +64147,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19370" ++ "referenced_type" : "type-19322" + }, + { +- "referenced_type" : "type-2365" ++ "referenced_type" : "type-2293" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], + "return_type" : "type-76", +@@ -64125,10 +64167,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19370" ++ "referenced_type" : "type-19322" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { + "referenced_type" : "type-27" +@@ -64140,7 +64182,7 @@ + "referenced_type" : "type-12" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], + "return_type" : "type-76", +@@ -64154,16 +64196,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19370" ++ "referenced_type" : "type-19322" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + }, + { + "referenced_type" : "type-4" + } + ], +- "return_type" : "type-2365", ++ "return_type" : "type-2293", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h" + }, + { +@@ -64174,13 +64216,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19370" ++ "referenced_type" : "type-19322" + }, + { +- "referenced_type" : "type-2491" ++ "referenced_type" : "type-2421" + } + ], +- "return_type" : "type-21924", ++ "return_type" : "type-21876", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h" + }, + { +@@ -64191,16 +64233,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19370" ++ "referenced_type" : "type-19322" + }, + { +- "referenced_type" : "type-2365" ++ "referenced_type" : "type-2293" + }, + { + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], + "return_type" : "type-76", +@@ -64214,13 +64256,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19370" ++ "referenced_type" : "type-19322" + }, + { +- "referenced_type" : "type-2407" ++ "referenced_type" : "type-2337" + } + ], +- "return_type" : "type-19386", ++ "return_type" : "type-19338", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h" + }, + { +@@ -64231,7 +64273,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19370" ++ "referenced_type" : "type-19322" + }, + { + "referenced_type" : "type-27" +@@ -64251,10 +64293,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19370" ++ "referenced_type" : "type-19322" + }, + { +- "referenced_type" : "type-2407" ++ "referenced_type" : "type-2337" + } + ], + "return_type" : "type-12", +@@ -64268,10 +64310,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19370" ++ "referenced_type" : "type-19322" + }, + { +- "referenced_type" : "type-2365" ++ "referenced_type" : "type-2293" + }, + { + "referenced_type" : "type-27" +@@ -64280,10 +64322,10 @@ + "referenced_type" : "type-4" + }, + { +- "referenced_type" : "type-15345" ++ "referenced_type" : "type-15297" + } + ], +- "return_type" : "type-15017", ++ "return_type" : "type-14969", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h" + }, + { +@@ -64294,13 +64336,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15051" ++ "referenced_type" : "type-15003" + }, + { + "referenced_type" : "type-27" + }, + { +- "referenced_type" : "type-14998" ++ "referenced_type" : "type-14950" + } + ], + "return_type" : "type-12", +@@ -64314,10 +64356,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15051" ++ "referenced_type" : "type-15003" + } + ], +- "return_type" : "type-15023", ++ "return_type" : "type-14975", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h", + "template_args" : [ "type-98" ] + }, +@@ -64329,10 +64371,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15051" ++ "referenced_type" : "type-15003" + } + ], +- "return_type" : "type-15025", ++ "return_type" : "type-14977", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h", + "template_args" : [ "type-96" ] + }, +@@ -64344,10 +64386,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15051" ++ "referenced_type" : "type-15003" + } + ], +- "return_type" : "type-15013", ++ "return_type" : "type-14965", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h", + "template_args" : [ "type-1" ] + }, +@@ -64359,10 +64401,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15051" ++ "referenced_type" : "type-15003" + } + ], +- "return_type" : "type-15017", ++ "return_type" : "type-14969", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h", + "template_args" : [ "type-4" ] + }, +@@ -64374,10 +64416,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15051" ++ "referenced_type" : "type-15003" + } + ], +- "return_type" : "type-15019", ++ "return_type" : "type-14971", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h", + "template_args" : [ "type-89" ] + }, +@@ -64389,10 +64431,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15051" ++ "referenced_type" : "type-15003" + } + ], +- "return_type" : "type-15021", ++ "return_type" : "type-14973", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h", + "template_args" : [ "type-91" ] + }, +@@ -64404,13 +64446,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15051" ++ "referenced_type" : "type-15003" + }, + { +- "referenced_type" : "type-15071" ++ "referenced_type" : "type-15023" + } + ], +- "return_type" : "type-15029", ++ "return_type" : "type-14981", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h", + "template_args" : [ "type-12" ] + }, +@@ -64422,13 +64464,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15051" ++ "referenced_type" : "type-15003" + }, + { +- "referenced_type" : "type-15065" ++ "referenced_type" : "type-15017" + } + ], +- "return_type" : "type-15023", ++ "return_type" : "type-14975", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h", + "template_args" : [ "type-98" ] + }, +@@ -64440,13 +64482,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15051" ++ "referenced_type" : "type-15003" + }, + { +- "referenced_type" : "type-15068" ++ "referenced_type" : "type-15020" + } + ], +- "return_type" : "type-15025", ++ "return_type" : "type-14977", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h", + "template_args" : [ "type-96" ] + }, +@@ -64458,13 +64500,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15051" ++ "referenced_type" : "type-15003" + }, + { +- "referenced_type" : "type-15054" ++ "referenced_type" : "type-15006" + } + ], +- "return_type" : "type-15013", ++ "return_type" : "type-14965", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h", + "template_args" : [ "type-1" ] + }, +@@ -64476,13 +64518,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15051" ++ "referenced_type" : "type-15003" + }, + { +- "referenced_type" : "type-15056" ++ "referenced_type" : "type-15008" + } + ], +- "return_type" : "type-15017", ++ "return_type" : "type-14969", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h", + "template_args" : [ "type-4" ] + }, +@@ -64494,13 +64536,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15051" ++ "referenced_type" : "type-15003" + }, + { +- "referenced_type" : "type-15059" ++ "referenced_type" : "type-15011" + } + ], +- "return_type" : "type-15019", ++ "return_type" : "type-14971", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h", + "template_args" : [ "type-89" ] + }, +@@ -64512,13 +64554,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15051" ++ "referenced_type" : "type-15003" + }, + { +- "referenced_type" : "type-15062" ++ "referenced_type" : "type-15014" + } + ], +- "return_type" : "type-15021", ++ "return_type" : "type-14973", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h", + "template_args" : [ "type-91" ] + }, +@@ -64529,13 +64571,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15051" ++ "referenced_type" : "type-15003" + }, + { + "referenced_type" : "type-27" + } + ], +- "return_type" : "type-17396", ++ "return_type" : "type-17348", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, + { +@@ -64545,10 +64587,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15051" ++ "referenced_type" : "type-15003" + } + ], +- "return_type" : "type-15029", ++ "return_type" : "type-14981", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, + { +@@ -64558,13 +64600,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15051" ++ "referenced_type" : "type-15003" + }, + { +- "referenced_type" : "type-2500" ++ "referenced_type" : "type-2430" + } + ], +- "return_type" : "type-15013", ++ "return_type" : "type-14965", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, + { +@@ -64574,10 +64616,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15051" ++ "referenced_type" : "type-15003" + } + ], +- "return_type" : "type-15031", ++ "return_type" : "type-14983", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, + { +@@ -64587,10 +64629,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15051" ++ "referenced_type" : "type-15003" + } + ], +- "return_type" : "type-15025", ++ "return_type" : "type-14977", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, + { +@@ -64600,10 +64642,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15051" ++ "referenced_type" : "type-15003" + } + ], +- "return_type" : "type-15013", ++ "return_type" : "type-14965", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, + { +@@ -64613,10 +64655,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15051" ++ "referenced_type" : "type-15003" + } + ], +- "return_type" : "type-15019", ++ "return_type" : "type-14971", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, + { +@@ -64626,10 +64668,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15051" ++ "referenced_type" : "type-15003" + } + ], +- "return_type" : "type-15023", ++ "return_type" : "type-14975", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, + { +@@ -64639,10 +64681,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15051" ++ "referenced_type" : "type-15003" + } + ], +- "return_type" : "type-15031", ++ "return_type" : "type-14983", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, + { +@@ -64652,10 +64694,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15051" ++ "referenced_type" : "type-15003" + } + ], +- "return_type" : "type-15017", ++ "return_type" : "type-14969", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, + { +@@ -64665,10 +64707,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-15051" ++ "referenced_type" : "type-15003" + } + ], +- "return_type" : "type-15021", ++ "return_type" : "type-14973", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, + { +@@ -64717,10 +64759,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4429" ++ "referenced_type" : "type-4381" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/empty.pb.h" + }, + { +@@ -64730,7 +64772,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4429" ++ "referenced_type" : "type-4381" + } + ], + "return_type" : "type-12", +@@ -64744,7 +64786,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4429" ++ "referenced_type" : "type-4381" + }, + { + "referenced_type" : "type-1" +@@ -64760,7 +64802,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4429" ++ "referenced_type" : "type-4381" + }, + { + "referenced_type" : "type-619" +@@ -64776,7 +64818,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4429" ++ "referenced_type" : "type-4381" + }, + { + "referenced_type" : "type-618" +@@ -64792,13 +64834,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4429" ++ "referenced_type" : "type-4381" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-4399", ++ "return_type" : "type-4351", + "source_file" : "/external/protobuf/src/google/protobuf/empty.pb.h" + }, + { +@@ -64808,7 +64850,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4429" ++ "referenced_type" : "type-4381" + } + ], + "return_type" : "type-1", +@@ -64821,10 +64863,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2365" ++ "referenced_type" : "type-2293" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -64834,7 +64876,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2365" ++ "referenced_type" : "type-2293" + } + ], + "return_type" : "type-12", +@@ -64848,7 +64890,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2365" ++ "referenced_type" : "type-2293" + }, + { + "referenced_type" : "type-1" +@@ -64864,7 +64906,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2365" ++ "referenced_type" : "type-2293" + }, + { + "referenced_type" : "type-619" +@@ -64880,7 +64922,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2365" ++ "referenced_type" : "type-2293" + }, + { + "referenced_type" : "type-618" +@@ -64896,13 +64938,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2365" ++ "referenced_type" : "type-2293" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-2363", ++ "return_type" : "type-2291", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -64912,7 +64954,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2365" ++ "referenced_type" : "type-2293" + } + ], + "return_type" : "type-1", +@@ -64925,10 +64967,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2381" ++ "referenced_type" : "type-2309" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/api.pb.h" + }, + { +@@ -64938,7 +64980,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2381" ++ "referenced_type" : "type-2309" + } + ], + "return_type" : "type-12", +@@ -64952,7 +64994,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2381" ++ "referenced_type" : "type-2309" + }, + { + "referenced_type" : "type-1" +@@ -64968,7 +65010,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2381" ++ "referenced_type" : "type-2309" + }, + { + "referenced_type" : "type-619" +@@ -64984,7 +65026,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2381" ++ "referenced_type" : "type-2309" + }, + { + "referenced_type" : "type-618" +@@ -65000,13 +65042,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2381" ++ "referenced_type" : "type-2309" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-2350", ++ "return_type" : "type-2277", + "source_file" : "/external/protobuf/src/google/protobuf/api.pb.h" + }, + { +@@ -65016,7 +65058,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2381" ++ "referenced_type" : "type-2309" + } + ], + "return_type" : "type-1", +@@ -65029,10 +65071,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7394" ++ "referenced_type" : "type-7346" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/struct.pb.h" + }, + { +@@ -65042,7 +65084,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7394" ++ "referenced_type" : "type-7346" + } + ], + "return_type" : "type-12", +@@ -65056,7 +65098,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7394" ++ "referenced_type" : "type-7346" + }, + { + "referenced_type" : "type-1" +@@ -65072,7 +65114,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7394" ++ "referenced_type" : "type-7346" + }, + { + "referenced_type" : "type-619" +@@ -65088,7 +65130,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7394" ++ "referenced_type" : "type-7346" + }, + { + "referenced_type" : "type-618" +@@ -65104,13 +65146,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7394" ++ "referenced_type" : "type-7346" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-7226", ++ "return_type" : "type-7178", + "source_file" : "/external/protobuf/src/google/protobuf/struct.pb.h" + }, + { +@@ -65120,7 +65162,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7394" ++ "referenced_type" : "type-7346" + } + ], + "return_type" : "type-1", +@@ -65133,10 +65175,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2377" ++ "referenced_type" : "type-2305" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/api.pb.h" + }, + { +@@ -65146,7 +65188,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2377" ++ "referenced_type" : "type-2305" + } + ], + "return_type" : "type-12", +@@ -65160,7 +65202,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2377" ++ "referenced_type" : "type-2305" + }, + { + "referenced_type" : "type-1" +@@ -65176,7 +65218,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2377" ++ "referenced_type" : "type-2305" + }, + { + "referenced_type" : "type-619" +@@ -65192,7 +65234,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2377" ++ "referenced_type" : "type-2305" + }, + { + "referenced_type" : "type-618" +@@ -65208,13 +65250,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2377" ++ "referenced_type" : "type-2305" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-2348", ++ "return_type" : "type-2275", + "source_file" : "/external/protobuf/src/google/protobuf/api.pb.h" + }, + { +@@ -65224,7 +65266,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2377" ++ "referenced_type" : "type-2305" + } + ], + "return_type" : "type-1", +@@ -65237,10 +65279,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2297" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -65250,7 +65292,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2297" + } + ], + "return_type" : "type-12", +@@ -65264,7 +65306,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2297" + }, + { + "referenced_type" : "type-1" +@@ -65280,7 +65322,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2297" + }, + { + "referenced_type" : "type-619" +@@ -65296,7 +65338,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2297" + }, + { + "referenced_type" : "type-618" +@@ -65312,13 +65354,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2297" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-2367", ++ "return_type" : "type-2295", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -65328,7 +65370,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2369" ++ "referenced_type" : "type-2297" + } + ], + "return_type" : "type-1", +@@ -65341,10 +65383,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7591" ++ "referenced_type" : "type-7543" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/struct.pb.h" + }, + { +@@ -65354,7 +65396,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7591" ++ "referenced_type" : "type-7543" + } + ], + "return_type" : "type-12", +@@ -65368,7 +65410,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7591" ++ "referenced_type" : "type-7543" + }, + { + "referenced_type" : "type-1" +@@ -65384,7 +65426,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7591" ++ "referenced_type" : "type-7543" + }, + { + "referenced_type" : "type-619" +@@ -65400,7 +65442,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7591" ++ "referenced_type" : "type-7543" + }, + { + "referenced_type" : "type-618" +@@ -65416,13 +65458,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7591" ++ "referenced_type" : "type-7543" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-7217", ++ "return_type" : "type-7169", + "source_file" : "/external/protobuf/src/google/protobuf/struct.pb.h" + }, + { +@@ -65432,7 +65474,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7591" ++ "referenced_type" : "type-7543" + } + ], + "return_type" : "type-1", +@@ -65445,10 +65487,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + } + ], +- "return_type" : "type-10238", ++ "return_type" : "type-10190", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { +@@ -65458,10 +65500,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + } + ], +- "return_type" : "type-7143", ++ "return_type" : "type-7095", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { +@@ -65471,7 +65513,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + } + ], + "return_type" : "type-12", +@@ -65485,7 +65527,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + }, + { + "referenced_type" : "type-1" +@@ -65501,10 +65543,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + } + ], +- "return_type" : "type-10239", ++ "return_type" : "type-10191", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { +@@ -65514,7 +65556,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + } + ], + "return_type" : "type-81", +@@ -65527,7 +65569,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + } + ], + "return_type" : "type-81", +@@ -65540,10 +65582,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + } + ], +- "return_type" : "type-10240", ++ "return_type" : "type-10192", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { +@@ -65553,10 +65595,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + }, + { +- "referenced_type" : "type-6944" ++ "referenced_type" : "type-6896" + } + ], + "return_type" : "type-12", +@@ -65569,10 +65611,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + }, + { +- "referenced_type" : "type-6940" ++ "referenced_type" : "type-6892" + } + ], + "return_type" : "type-81", +@@ -65585,7 +65627,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + }, + { + "referenced_type" : "type-619" +@@ -65601,10 +65643,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + } + ], +- "return_type" : "type-7144", ++ "return_type" : "type-7096", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { +@@ -65614,10 +65656,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + }, + { +- "referenced_type" : "type-6944" ++ "referenced_type" : "type-6896" + } + ], + "return_type" : "type-12", +@@ -65630,7 +65672,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + }, + { + "referenced_type" : "type-1" +@@ -65646,7 +65688,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + }, + { + "referenced_type" : "type-1" +@@ -65662,7 +65704,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + } + ], + "return_type" : "type-1", +@@ -65675,7 +65717,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + } + ], + "return_type" : "type-1", +@@ -65714,10 +65756,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4215" ++ "referenced_type" : "type-4167" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/duration.pb.h" + }, + { +@@ -65727,7 +65769,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4215" ++ "referenced_type" : "type-4167" + } + ], + "return_type" : "type-12", +@@ -65741,7 +65783,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4215" ++ "referenced_type" : "type-4167" + }, + { + "referenced_type" : "type-1" +@@ -65757,7 +65799,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4215" ++ "referenced_type" : "type-4167" + }, + { + "referenced_type" : "type-619" +@@ -65773,7 +65815,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4215" ++ "referenced_type" : "type-4167" + }, + { + "referenced_type" : "type-618" +@@ -65789,13 +65831,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4215" ++ "referenced_type" : "type-4167" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-4177", ++ "return_type" : "type-4129", + "source_file" : "/external/protobuf/src/google/protobuf/duration.pb.h" + }, + { +@@ -65805,7 +65847,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4215" ++ "referenced_type" : "type-4167" + } + ], + "return_type" : "type-1", +@@ -65818,13 +65860,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11504" ++ "referenced_type" : "type-11456" + }, + { +- "referenced_type" : "type-2056" ++ "referenced_type" : "type-1986" + }, + { +- "referenced_type" : "type-2055" ++ "referenced_type" : "type-1985" + }, + { + "referenced_type" : "type-129" +@@ -65843,16 +65885,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11494" ++ "referenced_type" : "type-11446" + }, + { +- "referenced_type" : "type-11388" ++ "referenced_type" : "type-11340" + }, + { +- "referenced_type" : "type-11388" ++ "referenced_type" : "type-11340" + }, + { +- "referenced_type" : "type-11497" ++ "referenced_type" : "type-11449" + } + ], + "return_type" : "type-81", +@@ -65866,10 +65908,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2580" ++ "referenced_type" : "type-2512" + }, + { +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + } + ], + "return_type" : "type-12", +@@ -65882,10 +65924,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2580" ++ "referenced_type" : "type-2512" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-12", +@@ -65904,10 +65946,10 @@ + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { +- "referenced_type" : "type-2153" ++ "referenced_type" : "type-2084" + } + ], + "return_type" : "type-472", +@@ -65942,13 +65984,13 @@ + "referenced_type" : "type-601" + }, + { +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + }, + { +- "referenced_type" : "type-4488" ++ "referenced_type" : "type-4440" + } + ], + "return_type" : "type-81", +@@ -66664,7 +66706,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4274" ++ "referenced_type" : "type-4226" + } + ], + "return_type" : "type-574", +@@ -66678,7 +66720,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4274" ++ "referenced_type" : "type-4226" + } + ], + "return_type" : "type-81", +@@ -66691,7 +66733,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4274" ++ "referenced_type" : "type-4226" + } + ], + "return_type" : "type-1", +@@ -66705,7 +66747,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4274" ++ "referenced_type" : "type-4226" + } + ], + "return_type" : "type-201", +@@ -66719,7 +66761,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4274" ++ "referenced_type" : "type-4226" + } + ], + "return_type" : "type-81", +@@ -66733,7 +66775,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4274" ++ "referenced_type" : "type-4226" + } + ], + "return_type" : "type-81", +@@ -66747,7 +66789,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4274" ++ "referenced_type" : "type-4226" + } + ], + "return_type" : "type-1", +@@ -66761,7 +66803,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4274" ++ "referenced_type" : "type-4226" + } + ], + "return_type" : "type-81", +@@ -66775,10 +66817,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7593" ++ "referenced_type" : "type-7545" + } + ], +- "return_type" : "type-7308", ++ "return_type" : "type-7260", + "source_file" : "/external/protobuf/src/google/protobuf/map_field_lite.h" + }, + { +@@ -66788,7 +66830,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7593" ++ "referenced_type" : "type-7545" + } + ], + "return_type" : "type-1", +@@ -66801,10 +66843,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7593" ++ "referenced_type" : "type-7545" + } + ], +- "return_type" : "type-7308", ++ "return_type" : "type-7260", + "source_file" : "/external/protobuf/src/google/protobuf/map_field_lite.h" + }, + { +@@ -66814,10 +66856,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7593" ++ "referenced_type" : "type-7545" + } + ], +- "return_type" : "type-7225", ++ "return_type" : "type-7177", + "source_file" : "/external/protobuf/src/google/protobuf/map_field_lite.h" + }, + { +@@ -66827,10 +66869,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6791" ++ "referenced_type" : "type-6743" + }, + { +- "referenced_type" : "type-4360" ++ "referenced_type" : "type-4312" + } + ], + "return_type" : "type-12", +@@ -66844,10 +66886,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6791" ++ "referenced_type" : "type-6743" + }, + { +- "referenced_type" : "type-4286" ++ "referenced_type" : "type-4238" + } + ], + "return_type" : "type-81", +@@ -66861,7 +66903,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6791" ++ "referenced_type" : "type-6743" + } + ], + "return_type" : "type-1", +@@ -66875,7 +66917,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6791" ++ "referenced_type" : "type-6743" + } + ], + "return_type" : "type-81", +@@ -66889,7 +66931,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6791" ++ "referenced_type" : "type-6743" + } + ], + "return_type" : "type-81", +@@ -66902,7 +66944,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6791" ++ "referenced_type" : "type-6743" + } + ], + "return_type" : "type-1", +@@ -66915,10 +66957,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6791" ++ "referenced_type" : "type-6743" + } + ], +- "return_type" : "type-6792", ++ "return_type" : "type-6744", + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, + { +@@ -66929,13 +66971,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6776" ++ "referenced_type" : "type-6728" + }, + { +- "referenced_type" : "type-4286" ++ "referenced_type" : "type-4238" + }, + { +- "referenced_type" : "type-4288" ++ "referenced_type" : "type-4240" + } + ], + "return_type" : "type-81", +@@ -66948,13 +66990,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6776" ++ "referenced_type" : "type-6728" + }, + { +- "referenced_type" : "type-4288" ++ "referenced_type" : "type-4240" + }, + { +- "referenced_type" : "type-4288" ++ "referenced_type" : "type-4240" + } + ], + "return_type" : "type-12", +@@ -66968,10 +67010,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6776" ++ "referenced_type" : "type-6728" + }, + { +- "referenced_type" : "type-4286" ++ "referenced_type" : "type-4238" + } + ], + "return_type" : "type-81", +@@ -66985,10 +67027,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6776" ++ "referenced_type" : "type-6728" + }, + { +- "referenced_type" : "type-4286" ++ "referenced_type" : "type-4238" + } + ], + "return_type" : "type-81", +@@ -67002,10 +67044,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6776" ++ "referenced_type" : "type-6728" + }, + { +- "referenced_type" : "type-4286" ++ "referenced_type" : "type-4238" + } + ], + "return_type" : "type-81", +@@ -67018,10 +67060,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6776" ++ "referenced_type" : "type-6728" + }, + { +- "referenced_type" : "type-4286" ++ "referenced_type" : "type-4238" + } + ], + "return_type" : "type-81", +@@ -67034,10 +67076,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6776" ++ "referenced_type" : "type-6728" + }, + { +- "referenced_type" : "type-4286" ++ "referenced_type" : "type-4238" + } + ], + "return_type" : "type-81", +@@ -67051,13 +67093,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7312" ++ "referenced_type" : "type-7264" + }, + { +- "referenced_type" : "type-4286" ++ "referenced_type" : "type-4238" + }, + { +- "referenced_type" : "type-4288" ++ "referenced_type" : "type-4240" + } + ], + "return_type" : "type-81", +@@ -67070,13 +67112,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7312" ++ "referenced_type" : "type-7264" + }, + { +- "referenced_type" : "type-4288" ++ "referenced_type" : "type-4240" + }, + { +- "referenced_type" : "type-4288" ++ "referenced_type" : "type-4240" + } + ], + "return_type" : "type-12", +@@ -67090,10 +67132,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7312" ++ "referenced_type" : "type-7264" + }, + { +- "referenced_type" : "type-4286" ++ "referenced_type" : "type-4238" + } + ], + "return_type" : "type-81", +@@ -67107,10 +67149,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7312" ++ "referenced_type" : "type-7264" + }, + { +- "referenced_type" : "type-4286" ++ "referenced_type" : "type-4238" + } + ], + "return_type" : "type-81", +@@ -67124,10 +67166,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7312" ++ "referenced_type" : "type-7264" + }, + { +- "referenced_type" : "type-4286" ++ "referenced_type" : "type-4238" + } + ], + "return_type" : "type-81", +@@ -67140,10 +67182,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7312" ++ "referenced_type" : "type-7264" + }, + { +- "referenced_type" : "type-4286" ++ "referenced_type" : "type-4238" + } + ], + "return_type" : "type-81", +@@ -67156,10 +67198,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7312" ++ "referenced_type" : "type-7264" + }, + { +- "referenced_type" : "type-4286" ++ "referenced_type" : "type-4238" + } + ], + "return_type" : "type-81", +@@ -67172,20 +67214,20 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "default_arg" : true, +- "referenced_type" : "type-2153" ++ "referenced_type" : "type-2084" + } + ], +- "return_type" : "type-1842", ++ "return_type" : "type-1754", + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, + { +@@ -67195,13 +67237,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-81", +@@ -67214,20 +67256,20 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "default_arg" : true, +- "referenced_type" : "type-2153" ++ "referenced_type" : "type-2084" + } + ], +- "return_type" : "type-1871", ++ "return_type" : "type-1789", + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, + { +@@ -67237,13 +67279,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-6485" ++ "referenced_type" : "type-6437" + } + ], + "return_type" : "type-81", +@@ -67256,13 +67298,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-81", +@@ -67275,16 +67317,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-6484" ++ "referenced_type" : "type-6436" + } + ], + "return_type" : "type-81", +@@ -67297,16 +67339,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], +- "return_type" : "type-1842", ++ "return_type" : "type-1754", + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, + { +@@ -67316,13 +67358,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -67338,13 +67380,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-1", +@@ -67357,13 +67399,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -67379,13 +67421,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -67405,16 +67447,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-4360" ++ "referenced_type" : "type-4312" + } + ], + "return_type" : "type-12", +@@ -67428,16 +67470,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-4360" ++ "referenced_type" : "type-4312" + } + ], + "return_type" : "type-12", +@@ -67450,20 +67492,20 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "default_arg" : true, +- "referenced_type" : "type-2153" ++ "referenced_type" : "type-2084" + } + ], +- "return_type" : "type-1842", ++ "return_type" : "type-1754", + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, + { +@@ -67473,20 +67515,20 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "default_arg" : true, +- "referenced_type" : "type-2153" ++ "referenced_type" : "type-2084" + } + ], +- "return_type" : "type-1842", ++ "return_type" : "type-1754", + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, + { +@@ -67497,16 +67539,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-1999" ++ "referenced_type" : "type-1925" + } + ], + "return_type" : "type-81", +@@ -67519,13 +67561,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -67541,19 +67583,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-2008", ++ "return_type" : "type-1934", + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, + { +@@ -67563,13 +67605,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -67588,19 +67630,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-2008" ++ "referenced_type" : "type-1934" + } + ], + "return_type" : "type-81", +@@ -67613,13 +67655,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -67635,13 +67677,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -67657,13 +67699,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -67679,13 +67721,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], +- "return_type" : "type-1948", ++ "return_type" : "type-1872", + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, + { +@@ -67695,13 +67737,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -67720,13 +67762,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -67745,13 +67787,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -67771,10 +67813,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + } + ], +- "return_type" : "type-2153", ++ "return_type" : "type-2084", + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, + { +@@ -67784,13 +67826,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -67806,19 +67848,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-7149", ++ "return_type" : "type-7101", + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, + { +@@ -67828,13 +67870,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -67850,13 +67892,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -67873,19 +67915,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-2033" ++ "referenced_type" : "type-1962" + }, + { +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + } + ], + "return_type" : "type-201", +@@ -67898,13 +67940,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -67923,19 +67965,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-6435" ++ "referenced_type" : "type-6387" + } + ], + "return_type" : "type-81", +@@ -67948,13 +67990,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -67973,13 +68015,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -67998,19 +68040,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-1871", ++ "return_type" : "type-1789", + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, + { +@@ -68020,19 +68062,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-6429" ++ "referenced_type" : "type-6381" + } + ], +- "return_type" : "type-6435", ++ "return_type" : "type-6387", + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, + { +@@ -68042,16 +68084,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-81", +@@ -68065,22 +68107,22 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-2033" ++ "referenced_type" : "type-1962" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + } + ], + "return_type" : "type-167", +@@ -68093,16 +68135,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-81", +@@ -68116,13 +68158,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -68138,13 +68180,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -68160,13 +68202,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], +- "return_type" : "type-1936", ++ "return_type" : "type-1859", + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, + { +@@ -68177,13 +68219,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -68199,13 +68241,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -68225,19 +68267,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-4360" ++ "referenced_type" : "type-4312" + }, + { +- "referenced_type" : "type-4361" ++ "referenced_type" : "type-4313" + } + ], + "return_type" : "type-12", +@@ -68250,19 +68292,19 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-1842", ++ "return_type" : "type-1754", + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, + { +@@ -68272,16 +68314,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-1999" ++ "referenced_type" : "type-1925" + } + ], +- "return_type" : "type-2003", ++ "return_type" : "type-1929", + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, + { +@@ -68292,22 +68334,22 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-2033" ++ "referenced_type" : "type-1962" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + } + ], + "return_type" : "type-201", +@@ -68320,13 +68362,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-6435" ++ "referenced_type" : "type-6387" + } + ], +- "return_type" : "type-2003", ++ "return_type" : "type-1929", + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, + { +@@ -68336,7 +68378,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + } + ], + "return_type" : "type-12", +@@ -68350,20 +68392,20 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "default_arg" : true, +- "referenced_type" : "type-2153" ++ "referenced_type" : "type-2084" + } + ], +- "return_type" : "type-1842", ++ "return_type" : "type-1754", + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, + { +@@ -68373,13 +68415,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { + "referenced_type" : "type-1" + } + ], +- "return_type" : "type-2003", ++ "return_type" : "type-1929", + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, + { +@@ -68389,22 +68431,22 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" + }, + { +- "referenced_type" : "type-6429" ++ "referenced_type" : "type-6381" + } + ], +- "return_type" : "type-6435", ++ "return_type" : "type-6387", + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, + { +@@ -68415,13 +68457,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -68441,16 +68483,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-81", +@@ -68463,13 +68505,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + } + ], + "return_type" : "type-81", +@@ -68483,16 +68525,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], +- "return_type" : "type-4284", ++ "return_type" : "type-4236", + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, + { +@@ -68502,13 +68544,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-12" +@@ -68524,16 +68566,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-2008" ++ "referenced_type" : "type-1934" + } + ], + "return_type" : "type-81", +@@ -68546,13 +68588,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-12", +@@ -68565,16 +68607,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], +- "return_type" : "type-2008", ++ "return_type" : "type-1934", + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, + { +@@ -68585,16 +68627,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], +- "return_type" : "type-4285", ++ "return_type" : "type-4237", + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, + { +@@ -68605,13 +68647,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-1", +@@ -68624,13 +68666,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-12" +@@ -68646,16 +68688,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-2008" ++ "referenced_type" : "type-1934" + } + ], + "return_type" : "type-81", +@@ -68668,13 +68710,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-96" +@@ -68690,13 +68732,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -68712,13 +68754,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-89" +@@ -68734,13 +68776,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-96", +@@ -68753,13 +68795,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-1", +@@ -68772,13 +68814,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-89", +@@ -68791,13 +68833,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-12", +@@ -68811,16 +68853,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], +- "return_type" : "type-4284", ++ "return_type" : "type-4236", + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, + { +@@ -68830,13 +68872,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-96" +@@ -68852,13 +68894,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-1" +@@ -68874,13 +68916,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-89" +@@ -68896,13 +68938,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-98" +@@ -68918,16 +68960,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-6435" ++ "referenced_type" : "type-6387" + } + ], + "return_type" : "type-81", +@@ -68940,13 +68982,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-4" +@@ -68962,13 +69004,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-91" +@@ -68984,13 +69026,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-1", +@@ -69003,13 +69045,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-98", +@@ -69022,16 +69064,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], +- "return_type" : "type-7153", ++ "return_type" : "type-7105", + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, + { +@@ -69041,13 +69083,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-4", +@@ -69060,13 +69102,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-91", +@@ -69079,13 +69121,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-98" +@@ -69101,16 +69143,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { +- "referenced_type" : "type-6435" ++ "referenced_type" : "type-6387" + } + ], + "return_type" : "type-81", +@@ -69123,13 +69165,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-4" +@@ -69145,13 +69187,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + }, + { + "referenced_type" : "type-91" +@@ -69167,10 +69209,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1871" ++ "referenced_type" : "type-1789" + } + ], + "return_type" : "type-1", +@@ -69184,16 +69226,16 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-4299" ++ "referenced_type" : "type-4251" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-1842" ++ "referenced_type" : "type-1754" + }, + { +- "referenced_type" : "type-2003" ++ "referenced_type" : "type-1929" + } + ], + "return_type" : "type-81", +@@ -69206,10 +69248,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7595" ++ "referenced_type" : "type-7547" + }, + { +- "referenced_type" : "type-4360" ++ "referenced_type" : "type-4312" + } + ], + "return_type" : "type-12", +@@ -69223,10 +69265,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7595" ++ "referenced_type" : "type-7547" + } + ], +- "return_type" : "type-7308", ++ "return_type" : "type-7260", + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, + { +@@ -69237,10 +69279,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7595" ++ "referenced_type" : "type-7547" + }, + { +- "referenced_type" : "type-4286" ++ "referenced_type" : "type-4238" + } + ], + "return_type" : "type-81", +@@ -69254,7 +69296,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7595" ++ "referenced_type" : "type-7547" + } + ], + "return_type" : "type-81", +@@ -69268,7 +69310,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7595" ++ "referenced_type" : "type-7547" + } + ], + "return_type" : "type-1", +@@ -69282,7 +69324,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7595" ++ "referenced_type" : "type-7547" + } + ], + "return_type" : "type-81", +@@ -69296,7 +69338,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7595" ++ "referenced_type" : "type-7547" + } + ], + "return_type" : "type-81", +@@ -69309,7 +69351,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7595" ++ "referenced_type" : "type-7547" + } + ], + "return_type" : "type-1", +@@ -69322,10 +69364,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7595" ++ "referenced_type" : "type-7547" + } + ], +- "return_type" : "type-7308", ++ "return_type" : "type-7260", + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, + { +@@ -69335,10 +69377,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11122" ++ "referenced_type" : "type-11074" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -69348,7 +69390,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11122" ++ "referenced_type" : "type-11074" + } + ], + "return_type" : "type-12", +@@ -69362,7 +69404,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11122" ++ "referenced_type" : "type-11074" + }, + { + "referenced_type" : "type-1" +@@ -69378,7 +69420,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11122" ++ "referenced_type" : "type-11074" + }, + { + "referenced_type" : "type-619" +@@ -69394,7 +69436,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11122" ++ "referenced_type" : "type-11074" + }, + { + "referenced_type" : "type-618" +@@ -69410,13 +69452,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11122" ++ "referenced_type" : "type-11074" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-11066", ++ "return_type" : "type-11018", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -69426,7 +69468,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-11122" ++ "referenced_type" : "type-11074" + } + ], + "return_type" : "type-1", +@@ -69439,10 +69481,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2374" ++ "referenced_type" : "type-2302" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -69452,7 +69494,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2374" ++ "referenced_type" : "type-2302" + } + ], + "return_type" : "type-12", +@@ -69466,7 +69508,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2374" ++ "referenced_type" : "type-2302" + }, + { + "referenced_type" : "type-1" +@@ -69482,7 +69524,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2374" ++ "referenced_type" : "type-2302" + }, + { + "referenced_type" : "type-619" +@@ -69498,7 +69540,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2374" ++ "referenced_type" : "type-2302" + }, + { + "referenced_type" : "type-618" +@@ -69514,13 +69556,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2374" ++ "referenced_type" : "type-2302" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-2372", ++ "return_type" : "type-2300", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -69530,7 +69572,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-2374" ++ "referenced_type" : "type-2302" + } + ], + "return_type" : "type-1", +@@ -69543,10 +69585,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6394" ++ "referenced_type" : "type-6346" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/field_mask.pb.h" + }, + { +@@ -69556,7 +69598,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6394" ++ "referenced_type" : "type-6346" + } + ], + "return_type" : "type-12", +@@ -69570,7 +69612,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6394" ++ "referenced_type" : "type-6346" + }, + { + "referenced_type" : "type-1" +@@ -69586,7 +69628,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6394" ++ "referenced_type" : "type-6346" + }, + { + "referenced_type" : "type-619" +@@ -69602,7 +69644,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6394" ++ "referenced_type" : "type-6346" + }, + { + "referenced_type" : "type-618" +@@ -69618,13 +69660,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6394" ++ "referenced_type" : "type-6346" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-6345", ++ "return_type" : "type-6297", + "source_file" : "/external/protobuf/src/google/protobuf/field_mask.pb.h" + }, + { +@@ -69634,7 +69676,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-6394" ++ "referenced_type" : "type-6346" + } + ], + "return_type" : "type-1", +@@ -69647,10 +69689,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7606" ++ "referenced_type" : "type-7558" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/struct.pb.h" + }, + { +@@ -69660,7 +69702,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7606" ++ "referenced_type" : "type-7558" + } + ], + "return_type" : "type-12", +@@ -69674,7 +69716,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7606" ++ "referenced_type" : "type-7558" + }, + { + "referenced_type" : "type-1" +@@ -69690,7 +69732,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7606" ++ "referenced_type" : "type-7558" + }, + { + "referenced_type" : "type-619" +@@ -69706,7 +69748,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7606" ++ "referenced_type" : "type-7558" + }, + { + "referenced_type" : "type-618" +@@ -69722,13 +69764,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7606" ++ "referenced_type" : "type-7558" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-7233", ++ "return_type" : "type-7185", + "source_file" : "/external/protobuf/src/google/protobuf/struct.pb.h" + }, + { +@@ -69738,7 +69780,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7606" ++ "referenced_type" : "type-7558" + } + ], + "return_type" : "type-1", +@@ -69751,10 +69793,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7846" ++ "referenced_type" : "type-7798" + } + ], +- "return_type" : "type-2139", ++ "return_type" : "type-2070", + "source_file" : "/external/protobuf/src/google/protobuf/timestamp.pb.h" + }, + { +@@ -69764,7 +69806,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7846" ++ "referenced_type" : "type-7798" + } + ], + "return_type" : "type-12", +@@ -69778,7 +69820,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7846" ++ "referenced_type" : "type-7798" + }, + { + "referenced_type" : "type-1" +@@ -69794,7 +69836,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7846" ++ "referenced_type" : "type-7798" + }, + { + "referenced_type" : "type-619" +@@ -69810,7 +69852,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7846" ++ "referenced_type" : "type-7798" + }, + { + "referenced_type" : "type-618" +@@ -69826,13 +69868,13 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7846" ++ "referenced_type" : "type-7798" + }, + { + "referenced_type" : "type-288" + } + ], +- "return_type" : "type-7811", ++ "return_type" : "type-7763", + "source_file" : "/external/protobuf/src/google/protobuf/timestamp.pb.h" + }, + { +@@ -69842,7 +69884,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7846" ++ "referenced_type" : "type-7798" + } + ], + "return_type" : "type-1", +@@ -69855,10 +69897,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-19684" ++ "referenced_type" : "type-19636" + } + ], +- "return_type" : "type-21925", ++ "return_type" : "type-21877", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, + { +@@ -69868,10 +69910,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7600" ++ "referenced_type" : "type-7552" + } + ], +- "return_type" : "type-7200", ++ "return_type" : "type-7152", + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, + { +@@ -69882,10 +69924,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7600" ++ "referenced_type" : "type-7552" + } + ], +- "return_type" : "type-7200", ++ "return_type" : "type-7152", + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, + { +@@ -69895,10 +69937,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7600" ++ "referenced_type" : "type-7552" + }, + { +- "referenced_type" : "type-7598" ++ "referenced_type" : "type-7550" + } + ], + "return_type" : "type-81", +@@ -69911,7 +69953,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7600" ++ "referenced_type" : "type-7552" + } + ], + "return_type" : "type-81", +@@ -69924,10 +69966,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7600" ++ "referenced_type" : "type-7552" + }, + { +- "referenced_type" : "type-7196" ++ "referenced_type" : "type-7148" + } + ], + "return_type" : "type-81", +@@ -69941,10 +69983,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7595" ++ "referenced_type" : "type-7547" + } + ], +- "return_type" : "type-7308", ++ "return_type" : "type-7260", + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, + { +@@ -69954,7 +69996,7 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7595" ++ "referenced_type" : "type-7547" + } + ], + "return_type" : "type-1", +@@ -69967,10 +70009,10 @@ + [ + { + "is_this_ptr" : true, +- "referenced_type" : "type-7595" ++ "referenced_type" : "type-7547" + } + ], +- "return_type" : "type-7308", ++ "return_type" : "type-7260", + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + } + ], +@@ -69980,7 +70022,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf10BytesValue17default_instance_E", + "name" : "google::protobuf::BytesValue::default_instance_", +- "referenced_type" : "type-11068", ++ "referenced_type" : "type-11020", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -69993,7 +70035,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf10FloatValue17default_instance_E", + "name" : "google::protobuf::FloatValue::default_instance_", +- "referenced_type" : "type-11061", ++ "referenced_type" : "type-11013", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -70006,7 +70048,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf10Int32Value17default_instance_E", + "name" : "google::protobuf::Int32Value::default_instance_", +- "referenced_type" : "type-11064", ++ "referenced_type" : "type-11016", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -70019,7 +70061,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf10Int64Value17default_instance_E", + "name" : "google::protobuf::Int64Value::default_instance_", +- "referenced_type" : "type-11062", ++ "referenced_type" : "type-11014", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -70230,7 +70272,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf11DoubleValue17default_instance_E", + "name" : "google::protobuf::DoubleValue::default_instance_", +- "referenced_type" : "type-11060", ++ "referenced_type" : "type-11012", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -70243,7 +70285,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf11EnumOptions17default_instance_E", + "name" : "google::protobuf::EnumOptions::default_instance_", +- "referenced_type" : "type-1693", ++ "referenced_type" : "type-1607", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -70267,26 +70309,26 @@ + { + "linker_set_key" : "_ZN6google8protobuf11FileOptions12LITE_RUNTIMEE", + "name" : "google::protobuf::FileOptions::LITE_RUNTIME", +- "referenced_type" : "type-2208", ++ "referenced_type" : "type-2139", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf11FileOptions16OptimizeMode_MAXE", + "name" : "google::protobuf::FileOptions::OptimizeMode_MAX", +- "referenced_type" : "type-2208", ++ "referenced_type" : "type-2139", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf11FileOptions16OptimizeMode_MINE", + "name" : "google::protobuf::FileOptions::OptimizeMode_MIN", +- "referenced_type" : "type-2208", ++ "referenced_type" : "type-2139", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf11FileOptions17default_instance_E", + "name" : "google::protobuf::FileOptions::default_instance_", +- "referenced_type" : "type-1711", ++ "referenced_type" : "type-1625", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -70388,13 +70430,13 @@ + { + "linker_set_key" : "_ZN6google8protobuf11FileOptions5SPEEDE", + "name" : "google::protobuf::FileOptions::SPEED", +- "referenced_type" : "type-2208", ++ "referenced_type" : "type-2139", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf11FileOptions9CODE_SIZEE", + "name" : "google::protobuf::FileOptions::CODE_SIZE", +- "referenced_type" : "type-2208", ++ "referenced_type" : "type-2139", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -70407,7 +70449,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf11StringValue17default_instance_E", + "name" : "google::protobuf::StringValue::default_instance_", +- "referenced_type" : "type-11067", ++ "referenced_type" : "type-11019", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -70420,7 +70462,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf11UInt32Value17default_instance_E", + "name" : "google::protobuf::UInt32Value::default_instance_", +- "referenced_type" : "type-11065", ++ "referenced_type" : "type-11017", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -70433,7 +70475,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf11UInt64Value17default_instance_E", + "name" : "google::protobuf::UInt64Value::default_instance_", +- "referenced_type" : "type-11063", ++ "referenced_type" : "type-11015", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -70451,19 +70493,19 @@ + { + "linker_set_key" : "_ZN6google8protobuf12FieldOptions10JSType_MAXE", + "name" : "google::protobuf::FieldOptions::JSType_MAX", +- "referenced_type" : "type-2210", ++ "referenced_type" : "type-2141", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf12FieldOptions10JSType_MINE", + "name" : "google::protobuf::FieldOptions::JSType_MIN", +- "referenced_type" : "type-2210", ++ "referenced_type" : "type-2141", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf12FieldOptions12STRING_PIECEE", + "name" : "google::protobuf::FieldOptions::STRING_PIECE", +- "referenced_type" : "type-2209", ++ "referenced_type" : "type-2140", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -70494,7 +70536,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf12FieldOptions17default_instance_E", + "name" : "google::protobuf::FieldOptions::default_instance_", +- "referenced_type" : "type-1680", ++ "referenced_type" : "type-1594", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -70530,50 +70572,50 @@ + { + "linker_set_key" : "_ZN6google8protobuf12FieldOptions4CORDE", + "name" : "google::protobuf::FieldOptions::CORD", +- "referenced_type" : "type-2209", ++ "referenced_type" : "type-2140", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf12FieldOptions6STRINGE", + "name" : "google::protobuf::FieldOptions::STRING", +- "referenced_type" : "type-2209", ++ "referenced_type" : "type-2140", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf12FieldOptions9CType_MAXE", + "name" : "google::protobuf::FieldOptions::CType_MAX", +- "referenced_type" : "type-2209", ++ "referenced_type" : "type-2140", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf12FieldOptions9CType_MINE", + "name" : "google::protobuf::FieldOptions::CType_MIN", +- "referenced_type" : "type-2209", ++ "referenced_type" : "type-2140", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf12FieldOptions9JS_NORMALE", + "name" : "google::protobuf::FieldOptions::JS_NORMAL", +- "referenced_type" : "type-2210", ++ "referenced_type" : "type-2141", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf12FieldOptions9JS_NUMBERE", + "name" : "google::protobuf::FieldOptions::JS_NUMBER", +- "referenced_type" : "type-2210", ++ "referenced_type" : "type-2141", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf12FieldOptions9JS_STRINGE", + "name" : "google::protobuf::FieldOptions::JS_STRING", +- "referenced_type" : "type-2210", ++ "referenced_type" : "type-2141", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf13MethodOptions17default_instance_E", + "name" : "google::protobuf::MethodOptions::default_instance_", +- "referenced_type" : "type-1707", ++ "referenced_type" : "type-1621", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -70592,7 +70634,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf13SourceContext17default_instance_E", + "name" : "google::protobuf::SourceContext::default_instance_", +- "referenced_type" : "type-2344", ++ "referenced_type" : "type-2271", + "source_file" : "/external/protobuf/src/google/protobuf/source_context.pb.h" + }, + { +@@ -70605,7 +70647,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf14MessageOptions17default_instance_E", + "name" : "google::protobuf::MessageOptions::default_instance_", +- "referenced_type" : "type-1699", ++ "referenced_type" : "type-1613", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -70642,7 +70684,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf14ServiceOptions17default_instance_E", + "name" : "google::protobuf::ServiceOptions::default_instance_", +- "referenced_type" : "type-1709", ++ "referenced_type" : "type-1623", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -70661,7 +70703,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf14SourceCodeInfo17default_instance_E", + "name" : "google::protobuf::SourceCodeInfo::default_instance_", +- "referenced_type" : "type-1713", ++ "referenced_type" : "type-1627", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -70680,7 +70722,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf15DescriptorProto17default_instance_E", + "name" : "google::protobuf::DescriptorProto::default_instance_", +- "referenced_type" : "type-1878", ++ "referenced_type" : "type-1796", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -70747,28 +70789,28 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf15FieldDescriptor11kTypeToNameE", + "name" : "google::protobuf::FieldDescriptor::kTypeToName", +- "referenced_type" : "type-2039", ++ "referenced_type" : "type-1968", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf15FieldDescriptor12kLabelToNameE", + "name" : "google::protobuf::FieldDescriptor::kLabelToName", +- "referenced_type" : "type-2043", ++ "referenced_type" : "type-1972", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf15FieldDescriptor14kCppTypeToNameE", + "name" : "google::protobuf::FieldDescriptor::kCppTypeToName", +- "referenced_type" : "type-2041", ++ "referenced_type" : "type-1970", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf15FieldDescriptor17kTypeToCppTypeMapE", + "name" : "google::protobuf::FieldDescriptor::kTypeToCppTypeMap", +- "referenced_type" : "type-2037", ++ "referenced_type" : "type-1966", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -70787,7 +70829,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf16EnumValueOptions17default_instance_E", + "name" : "google::protobuf::EnumValueOptions::default_instance_", +- "referenced_type" : "type-1691", ++ "referenced_type" : "type-1605", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -70812,14 +70854,14 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf17FileDescriptorSet17default_instance_E", + "name" : "google::protobuf::FileDescriptorSet::default_instance_", +- "referenced_type" : "type-2213", ++ "referenced_type" : "type-2144", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf17GeneratedCodeInfo17default_instance_E", + "name" : "google::protobuf::GeneratedCodeInfo::default_instance_", +- "referenced_type" : "type-2263", ++ "referenced_type" : "type-2192", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -70838,7 +70880,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf19EnumDescriptorProto17default_instance_E", + "name" : "google::protobuf::EnumDescriptorProto::default_instance_", +- "referenced_type" : "type-1882", ++ "referenced_type" : "type-1800", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -70863,7 +70905,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf19FileDescriptorProto17default_instance_E", + "name" : "google::protobuf::FileDescriptorProto::default_instance_", +- "referenced_type" : "type-1874", ++ "referenced_type" : "type-1792", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -70942,7 +70984,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf19UninterpretedOption17default_instance_E", + "name" : "google::protobuf::UninterpretedOption::default_instance_", +- "referenced_type" : "type-1914", ++ "referenced_type" : "type-1834", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -70984,115 +71026,115 @@ + { + "linker_set_key" : "_ZN6google8protobuf20FieldDescriptorProto10TYPE_BYTESE", + "name" : "google::protobuf::FieldDescriptorProto::TYPE_BYTES", +- "referenced_type" : "type-2206", ++ "referenced_type" : "type-2137", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf20FieldDescriptorProto10TYPE_FLOATE", + "name" : "google::protobuf::FieldDescriptorProto::TYPE_FLOAT", +- "referenced_type" : "type-2206", ++ "referenced_type" : "type-2137", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf20FieldDescriptorProto10TYPE_GROUPE", + "name" : "google::protobuf::FieldDescriptorProto::TYPE_GROUP", +- "referenced_type" : "type-2206", ++ "referenced_type" : "type-2137", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf20FieldDescriptorProto10TYPE_INT32E", + "name" : "google::protobuf::FieldDescriptorProto::TYPE_INT32", +- "referenced_type" : "type-2206", ++ "referenced_type" : "type-2137", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf20FieldDescriptorProto10TYPE_INT64E", + "name" : "google::protobuf::FieldDescriptorProto::TYPE_INT64", +- "referenced_type" : "type-2206", ++ "referenced_type" : "type-2137", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf20FieldDescriptorProto11TYPE_DOUBLEE", + "name" : "google::protobuf::FieldDescriptorProto::TYPE_DOUBLE", +- "referenced_type" : "type-2206", ++ "referenced_type" : "type-2137", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf20FieldDescriptorProto11TYPE_SINT32E", + "name" : "google::protobuf::FieldDescriptorProto::TYPE_SINT32", +- "referenced_type" : "type-2206", ++ "referenced_type" : "type-2137", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf20FieldDescriptorProto11TYPE_SINT64E", + "name" : "google::protobuf::FieldDescriptorProto::TYPE_SINT64", +- "referenced_type" : "type-2206", ++ "referenced_type" : "type-2137", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf20FieldDescriptorProto11TYPE_STRINGE", + "name" : "google::protobuf::FieldDescriptorProto::TYPE_STRING", +- "referenced_type" : "type-2206", ++ "referenced_type" : "type-2137", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf20FieldDescriptorProto11TYPE_UINT32E", + "name" : "google::protobuf::FieldDescriptorProto::TYPE_UINT32", +- "referenced_type" : "type-2206", ++ "referenced_type" : "type-2137", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf20FieldDescriptorProto11TYPE_UINT64E", + "name" : "google::protobuf::FieldDescriptorProto::TYPE_UINT64", +- "referenced_type" : "type-2206", ++ "referenced_type" : "type-2137", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf20FieldDescriptorProto12TYPE_FIXED32E", + "name" : "google::protobuf::FieldDescriptorProto::TYPE_FIXED32", +- "referenced_type" : "type-2206", ++ "referenced_type" : "type-2137", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf20FieldDescriptorProto12TYPE_FIXED64E", + "name" : "google::protobuf::FieldDescriptorProto::TYPE_FIXED64", +- "referenced_type" : "type-2206", ++ "referenced_type" : "type-2137", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf20FieldDescriptorProto12TYPE_MESSAGEE", + "name" : "google::protobuf::FieldDescriptorProto::TYPE_MESSAGE", +- "referenced_type" : "type-2206", ++ "referenced_type" : "type-2137", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf20FieldDescriptorProto13TYPE_SFIXED32E", + "name" : "google::protobuf::FieldDescriptorProto::TYPE_SFIXED32", +- "referenced_type" : "type-2206", ++ "referenced_type" : "type-2137", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf20FieldDescriptorProto13TYPE_SFIXED64E", + "name" : "google::protobuf::FieldDescriptorProto::TYPE_SFIXED64", +- "referenced_type" : "type-2206", ++ "referenced_type" : "type-2137", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf20FieldDescriptorProto14LABEL_OPTIONALE", + "name" : "google::protobuf::FieldDescriptorProto::LABEL_OPTIONAL", +- "referenced_type" : "type-2207", ++ "referenced_type" : "type-2138", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf20FieldDescriptorProto14LABEL_REPEATEDE", + "name" : "google::protobuf::FieldDescriptorProto::LABEL_REPEATED", +- "referenced_type" : "type-2207", ++ "referenced_type" : "type-2138", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf20FieldDescriptorProto14LABEL_REQUIREDE", + "name" : "google::protobuf::FieldDescriptorProto::LABEL_REQUIRED", +- "referenced_type" : "type-2207", ++ "referenced_type" : "type-2138", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -71123,7 +71165,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf20FieldDescriptorProto17default_instance_E", + "name" : "google::protobuf::FieldDescriptorProto::default_instance_", +- "referenced_type" : "type-1890", ++ "referenced_type" : "type-1809", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -71177,37 +71219,37 @@ + { + "linker_set_key" : "_ZN6google8protobuf20FieldDescriptorProto8Type_MAXE", + "name" : "google::protobuf::FieldDescriptorProto::Type_MAX", +- "referenced_type" : "type-2206", ++ "referenced_type" : "type-2137", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf20FieldDescriptorProto8Type_MINE", + "name" : "google::protobuf::FieldDescriptorProto::Type_MIN", +- "referenced_type" : "type-2206", ++ "referenced_type" : "type-2137", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf20FieldDescriptorProto9Label_MAXE", + "name" : "google::protobuf::FieldDescriptorProto::Label_MAX", +- "referenced_type" : "type-2207", ++ "referenced_type" : "type-2138", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf20FieldDescriptorProto9Label_MINE", + "name" : "google::protobuf::FieldDescriptorProto::Label_MIN", +- "referenced_type" : "type-2207", ++ "referenced_type" : "type-2138", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf20FieldDescriptorProto9TYPE_BOOLE", + "name" : "google::protobuf::FieldDescriptorProto::TYPE_BOOL", +- "referenced_type" : "type-2206", ++ "referenced_type" : "type-2137", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf20FieldDescriptorProto9TYPE_ENUME", + "name" : "google::protobuf::FieldDescriptorProto::TYPE_ENUM", +- "referenced_type" : "type-2206", ++ "referenced_type" : "type-2137", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -71220,7 +71262,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf20OneofDescriptorProto17default_instance_E", + "name" : "google::protobuf::OneofDescriptorProto::default_instance_", +- "referenced_type" : "type-1898", ++ "referenced_type" : "type-1817", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -71233,7 +71275,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf21MethodDescriptorProto17default_instance_E", + "name" : "google::protobuf::MethodDescriptorProto::default_instance_", +- "referenced_type" : "type-1910", ++ "referenced_type" : "type-1830", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -71276,7 +71318,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf22ServiceDescriptorProto17default_instance_E", + "name" : "google::protobuf::ServiceDescriptorProto::default_instance_", +- "referenced_type" : "type-1886", ++ "referenced_type" : "type-1804", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -71307,7 +71349,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf23SourceCodeInfo_Location17default_instance_E", + "name" : "google::protobuf::SourceCodeInfo_Location::default_instance_", +- "referenced_type" : "type-1922", ++ "referenced_type" : "type-1843", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -71338,7 +71380,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf24EnumValueDescriptorProto17default_instance_E", + "name" : "google::protobuf::EnumValueDescriptorProto::default_instance_", +- "referenced_type" : "type-1906", ++ "referenced_type" : "type-1825", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -71375,7 +71417,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf28GeneratedCodeInfo_Annotation17default_instance_E", + "name" : "google::protobuf::GeneratedCodeInfo_Annotation::default_instance_", +- "referenced_type" : "type-1926", ++ "referenced_type" : "type-1847", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -71394,7 +71436,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf28UninterpretedOption_NamePart17default_instance_E", + "name" : "google::protobuf::UninterpretedOption_NamePart::default_instance_", +- "referenced_type" : "type-1918", ++ "referenced_type" : "type-1839", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -71419,7 +71461,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf29DescriptorProto_ReservedRange17default_instance_E", + "name" : "google::protobuf::DescriptorProto_ReservedRange::default_instance_", +- "referenced_type" : "type-1902", ++ "referenced_type" : "type-1821", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -71445,7 +71487,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf30DescriptorProto_ExtensionRange17default_instance_E", + "name" : "google::protobuf::DescriptorProto_ExtensionRange::default_instance_", +- "referenced_type" : "type-1894", ++ "referenced_type" : "type-1813", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, + { +@@ -71458,7 +71500,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf3Any17default_instance_E", + "name" : "google::protobuf::Any::default_instance_", +- "referenced_type" : "type-1845", ++ "referenced_type" : "type-1758", + "source_file" : "/external/protobuf/src/google/protobuf/any.pb.h" + }, + { +@@ -71483,7 +71525,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf3Api17default_instance_E", + "name" : "google::protobuf::Api::default_instance_", +- "referenced_type" : "type-2341", ++ "referenced_type" : "type-2268", + "source_file" : "/external/protobuf/src/google/protobuf/api.pb.h" + }, + { +@@ -71532,7 +71574,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf4Enum17default_instance_E", + "name" : "google::protobuf::Enum::default_instance_", +- "referenced_type" : "type-2497", ++ "referenced_type" : "type-2427", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -71569,7 +71611,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf4Type17default_instance_E", + "name" : "google::protobuf::Type::default_instance_", +- "referenced_type" : "type-2489", ++ "referenced_type" : "type-2419", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -71624,14 +71666,14 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf4util9converter23ProtoStreamObjectSource10renderers_E", + "name" : "google::protobuf::util::converter::ProtoStreamObjectSource::renderers_", +- "referenced_type" : "type-19389", ++ "referenced_type" : "type-19341", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h" + }, + { + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf4util9converter23ProtoStreamObjectWriter10renderers_E", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter::renderers_", +- "referenced_type" : "type-19531", ++ "referenced_type" : "type-19483", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, + { +@@ -71645,109 +71687,109 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf5Empty17default_instance_E", + "name" : "google::protobuf::Empty::default_instance_", +- "referenced_type" : "type-4399", ++ "referenced_type" : "type-4351", + "source_file" : "/external/protobuf/src/google/protobuf/empty.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf5Field10TYPE_BYTESE", + "name" : "google::protobuf::Field::TYPE_BYTES", +- "referenced_type" : "type-2484", ++ "referenced_type" : "type-2414", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf5Field10TYPE_FLOATE", + "name" : "google::protobuf::Field::TYPE_FLOAT", +- "referenced_type" : "type-2484", ++ "referenced_type" : "type-2414", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf5Field10TYPE_GROUPE", + "name" : "google::protobuf::Field::TYPE_GROUP", +- "referenced_type" : "type-2484", ++ "referenced_type" : "type-2414", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf5Field10TYPE_INT32E", + "name" : "google::protobuf::Field::TYPE_INT32", +- "referenced_type" : "type-2484", ++ "referenced_type" : "type-2414", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf5Field10TYPE_INT64E", + "name" : "google::protobuf::Field::TYPE_INT64", +- "referenced_type" : "type-2484", ++ "referenced_type" : "type-2414", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf5Field11TYPE_DOUBLEE", + "name" : "google::protobuf::Field::TYPE_DOUBLE", +- "referenced_type" : "type-2484", ++ "referenced_type" : "type-2414", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf5Field11TYPE_SINT32E", + "name" : "google::protobuf::Field::TYPE_SINT32", +- "referenced_type" : "type-2484", ++ "referenced_type" : "type-2414", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf5Field11TYPE_SINT64E", + "name" : "google::protobuf::Field::TYPE_SINT64", +- "referenced_type" : "type-2484", ++ "referenced_type" : "type-2414", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf5Field11TYPE_STRINGE", + "name" : "google::protobuf::Field::TYPE_STRING", +- "referenced_type" : "type-2484", ++ "referenced_type" : "type-2414", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf5Field11TYPE_UINT32E", + "name" : "google::protobuf::Field::TYPE_UINT32", +- "referenced_type" : "type-2484", ++ "referenced_type" : "type-2414", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf5Field11TYPE_UINT64E", + "name" : "google::protobuf::Field::TYPE_UINT64", +- "referenced_type" : "type-2484", ++ "referenced_type" : "type-2414", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf5Field12TYPE_FIXED32E", + "name" : "google::protobuf::Field::TYPE_FIXED32", +- "referenced_type" : "type-2484", ++ "referenced_type" : "type-2414", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf5Field12TYPE_FIXED64E", + "name" : "google::protobuf::Field::TYPE_FIXED64", +- "referenced_type" : "type-2484", ++ "referenced_type" : "type-2414", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf5Field12TYPE_MESSAGEE", + "name" : "google::protobuf::Field::TYPE_MESSAGE", +- "referenced_type" : "type-2484", ++ "referenced_type" : "type-2414", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf5Field12TYPE_UNKNOWNE", + "name" : "google::protobuf::Field::TYPE_UNKNOWN", +- "referenced_type" : "type-2484", ++ "referenced_type" : "type-2414", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf5Field13TYPE_SFIXED32E", + "name" : "google::protobuf::Field::TYPE_SFIXED32", +- "referenced_type" : "type-2484", ++ "referenced_type" : "type-2414", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf5Field13TYPE_SFIXED64E", + "name" : "google::protobuf::Field::TYPE_SFIXED64", +- "referenced_type" : "type-2484", ++ "referenced_type" : "type-2414", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -71759,13 +71801,13 @@ + { + "linker_set_key" : "_ZN6google8protobuf5Field15Cardinality_MAXE", + "name" : "google::protobuf::Field::Cardinality_MAX", +- "referenced_type" : "type-2485", ++ "referenced_type" : "type-2415", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf5Field15Cardinality_MINE", + "name" : "google::protobuf::Field::Cardinality_MIN", +- "referenced_type" : "type-2485", ++ "referenced_type" : "type-2415", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -71784,7 +71826,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf5Field17default_instance_E", + "name" : "google::protobuf::Field::default_instance_", +- "referenced_type" : "type-2363", ++ "referenced_type" : "type-2291", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -71802,7 +71844,7 @@ + { + "linker_set_key" : "_ZN6google8protobuf5Field19CARDINALITY_UNKNOWNE", + "name" : "google::protobuf::Field::CARDINALITY_UNKNOWN", +- "referenced_type" : "type-2485", ++ "referenced_type" : "type-2415", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -71820,19 +71862,19 @@ + { + "linker_set_key" : "_ZN6google8protobuf5Field20CARDINALITY_OPTIONALE", + "name" : "google::protobuf::Field::CARDINALITY_OPTIONAL", +- "referenced_type" : "type-2485", ++ "referenced_type" : "type-2415", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf5Field20CARDINALITY_REPEATEDE", + "name" : "google::protobuf::Field::CARDINALITY_REPEATED", +- "referenced_type" : "type-2485", ++ "referenced_type" : "type-2415", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf5Field20CARDINALITY_REQUIREDE", + "name" : "google::protobuf::Field::CARDINALITY_REQUIRED", +- "referenced_type" : "type-2485", ++ "referenced_type" : "type-2415", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -71868,25 +71910,25 @@ + { + "linker_set_key" : "_ZN6google8protobuf5Field8Kind_MAXE", + "name" : "google::protobuf::Field::Kind_MAX", +- "referenced_type" : "type-2484", ++ "referenced_type" : "type-2414", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf5Field8Kind_MINE", + "name" : "google::protobuf::Field::Kind_MIN", +- "referenced_type" : "type-2484", ++ "referenced_type" : "type-2414", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf5Field9TYPE_BOOLE", + "name" : "google::protobuf::Field::TYPE_BOOL", +- "referenced_type" : "type-2484", ++ "referenced_type" : "type-2414", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf5Field9TYPE_ENUME", + "name" : "google::protobuf::Field::TYPE_ENUM", +- "referenced_type" : "type-2484", ++ "referenced_type" : "type-2414", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -71905,14 +71947,14 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf5Mixin17default_instance_E", + "name" : "google::protobuf::Mixin::default_instance_", +- "referenced_type" : "type-2350", ++ "referenced_type" : "type-2277", + "source_file" : "/external/protobuf/src/google/protobuf/api.pb.h" + }, + { + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf5Value17default_instance_E", + "name" : "google::protobuf::Value::default_instance_", +- "referenced_type" : "type-7226", ++ "referenced_type" : "type-7178", + "source_file" : "/external/protobuf/src/google/protobuf/struct.pb.h" + }, + { +@@ -71961,7 +72003,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf6Method17default_instance_E", + "name" : "google::protobuf::Method::default_instance_", +- "referenced_type" : "type-2348", ++ "referenced_type" : "type-2275", + "source_file" : "/external/protobuf/src/google/protobuf/api.pb.h" + }, + { +@@ -72010,7 +72052,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf6Option17default_instance_E", + "name" : "google::protobuf::Option::default_instance_", +- "referenced_type" : "type-2367", ++ "referenced_type" : "type-2295", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -72023,7 +72065,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf6Struct17default_instance_E", + "name" : "google::protobuf::Struct::default_instance_", +- "referenced_type" : "type-7217", ++ "referenced_type" : "type-7169", + "source_file" : "/external/protobuf/src/google/protobuf/struct.pb.h" + }, + { +@@ -72036,7 +72078,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf8Duration17default_instance_E", + "name" : "google::protobuf::Duration::default_instance_", +- "referenced_type" : "type-4177", ++ "referenced_type" : "type-4129", + "source_file" : "/external/protobuf/src/google/protobuf/duration.pb.h" + }, + { +@@ -72104,7 +72146,7 @@ + { + "linker_set_key" : "_ZN6google8protobuf8internal16kAnyFullTypeNameE", + "name" : "google::protobuf::internal::kAnyFullTypeName", +- "referenced_type" : "type-2183", ++ "referenced_type" : "type-2114", + "source_file" : "/external/protobuf/src/google/protobuf/any.h" + }, + { +@@ -72129,13 +72171,13 @@ + { + "linker_set_key" : "_ZN6google8protobuf8internal24kTypeGoogleApisComPrefixE", + "name" : "google::protobuf::internal::kTypeGoogleApisComPrefix", +- "referenced_type" : "type-2183", ++ "referenced_type" : "type-2114", + "source_file" : "/external/protobuf/src/google/protobuf/any.h" + }, + { + "linker_set_key" : "_ZN6google8protobuf8internal24kTypeGoogleProdComPrefixE", + "name" : "google::protobuf::internal::kTypeGoogleProdComPrefix", +- "referenced_type" : "type-2183", ++ "referenced_type" : "type-2114", + "source_file" : "/external/protobuf/src/google/protobuf/any.h" + }, + { +@@ -72222,7 +72264,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf8internal8MapEntryINSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEENS0_5ValueELNS1_14WireFormatLite9FieldTypeE9ELSC_11ELi0EE8offsets_E", + "name" : "google::protobuf::internal::MapEntry, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0>::offsets_", +- "referenced_type" : "type-4266", ++ "referenced_type" : "type-4218", + "source_file" : "/external/protobuf/src/google/protobuf/map_entry.h" + }, + { +@@ -72236,7 +72278,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf8internal9SingletonINS1_16MapFieldAccessorEE9instance_E", + "name" : "google::protobuf::internal::Singleton::instance_", +- "referenced_type" : "type-7008", ++ "referenced_type" : "type-6960", + "source_file" : "/external/protobuf/src/google/protobuf/stubs/singleton.h" + }, + { +@@ -72250,7 +72292,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf8internal9SingletonINS1_30RepeatedFieldPrimitiveAccessorIbEEE9instance_E", + "name" : "google::protobuf::internal::Singleton >::instance_", +- "referenced_type" : "type-6832", ++ "referenced_type" : "type-6784", + "source_file" : "/external/protobuf/src/google/protobuf/stubs/singleton.h" + }, + { +@@ -72264,7 +72306,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf8internal9SingletonINS1_30RepeatedFieldPrimitiveAccessorIdEEE9instance_E", + "name" : "google::protobuf::internal::Singleton >::instance_", +- "referenced_type" : "type-6827", ++ "referenced_type" : "type-6779", + "source_file" : "/external/protobuf/src/google/protobuf/stubs/singleton.h" + }, + { +@@ -72278,7 +72320,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf8internal9SingletonINS1_30RepeatedFieldPrimitiveAccessorIfEEE9instance_E", + "name" : "google::protobuf::internal::Singleton >::instance_", +- "referenced_type" : "type-6822", ++ "referenced_type" : "type-6774", + "source_file" : "/external/protobuf/src/google/protobuf/stubs/singleton.h" + }, + { +@@ -72292,7 +72334,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf8internal9SingletonINS1_30RepeatedFieldPrimitiveAccessorIiEEE9instance_E", + "name" : "google::protobuf::internal::Singleton >::instance_", +- "referenced_type" : "type-7011", ++ "referenced_type" : "type-6963", + "source_file" : "/external/protobuf/src/google/protobuf/stubs/singleton.h" + }, + { +@@ -72306,7 +72348,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf8internal9SingletonINS1_30RepeatedFieldPrimitiveAccessorIjEEE9instance_E", + "name" : "google::protobuf::internal::Singleton >::instance_", +- "referenced_type" : "type-6806", ++ "referenced_type" : "type-6758", + "source_file" : "/external/protobuf/src/google/protobuf/stubs/singleton.h" + }, + { +@@ -72320,7 +72362,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf8internal9SingletonINS1_30RepeatedFieldPrimitiveAccessorIxEEE9instance_E", + "name" : "google::protobuf::internal::Singleton >::instance_", +- "referenced_type" : "type-6811", ++ "referenced_type" : "type-6763", + "source_file" : "/external/protobuf/src/google/protobuf/stubs/singleton.h" + }, + { +@@ -72334,7 +72376,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf8internal9SingletonINS1_30RepeatedFieldPrimitiveAccessorIyEEE9instance_E", + "name" : "google::protobuf::internal::Singleton >::instance_", +- "referenced_type" : "type-6817", ++ "referenced_type" : "type-6769", + "source_file" : "/external/protobuf/src/google/protobuf/stubs/singleton.h" + }, + { +@@ -72348,7 +72390,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf8internal9SingletonINS1_30RepeatedPtrFieldStringAccessorEE9instance_E", + "name" : "google::protobuf::internal::Singleton::instance_", +- "referenced_type" : "type-6839", ++ "referenced_type" : "type-6791", + "source_file" : "/external/protobuf/src/google/protobuf/stubs/singleton.h" + }, + { +@@ -72362,14 +72404,14 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf8internal9SingletonINS1_31RepeatedPtrFieldMessageAccessorEE9instance_E", + "name" : "google::protobuf::internal::Singleton::instance_", +- "referenced_type" : "type-6844", ++ "referenced_type" : "type-6796", + "source_file" : "/external/protobuf/src/google/protobuf/stubs/singleton.h" + }, + { + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf9BoolValue17default_instance_E", + "name" : "google::protobuf::BoolValue::default_instance_", +- "referenced_type" : "type-11066", ++ "referenced_type" : "type-11018", + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, + { +@@ -72388,7 +72430,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf9EnumValue17default_instance_E", + "name" : "google::protobuf::EnumValue::default_instance_", +- "referenced_type" : "type-2372", ++ "referenced_type" : "type-2300", + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, + { +@@ -72407,7 +72449,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf9FieldMask17default_instance_E", + "name" : "google::protobuf::FieldMask::default_instance_", +- "referenced_type" : "type-6345", ++ "referenced_type" : "type-6297", + "source_file" : "/external/protobuf/src/google/protobuf/field_mask.pb.h" + }, + { +@@ -72420,7 +72462,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf9ListValue17default_instance_E", + "name" : "google::protobuf::ListValue::default_instance_", +- "referenced_type" : "type-7233", ++ "referenced_type" : "type-7185", + "source_file" : "/external/protobuf/src/google/protobuf/struct.pb.h" + }, + { +@@ -72433,7 +72475,7 @@ + "access" : "private", + "linker_set_key" : "_ZN6google8protobuf9Timestamp17default_instance_E", + "name" : "google::protobuf::Timestamp::default_instance_", +- "referenced_type" : "type-7811", ++ "referenced_type" : "type-7763", + "source_file" : "/external/protobuf/src/google/protobuf/timestamp.pb.h" + }, + { +@@ -72451,7 +72493,7 @@ + { + "linker_set_key" : "_ZZN6google8protobuf4util9converter23ProtoStreamObjectWriter7Options8DefaultsEvE8defaults", + "name" : "defaults", +- "referenced_type" : "type-19505", ++ "referenced_type" : "type-19457", + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + } + ], +@@ -72470,555 +72512,555 @@ + "alignment" : 4, + "linker_set_key" : "const char *const &", + "name" : "const char *const &", +- "referenced_type" : "type-3641", +- "self_type" : "type-3642", ++ "referenced_type" : "type-3593", ++ "self_type" : "type-3594", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-10043", +- "self_type" : "type-10045", ++ "referenced_type" : "type-10296", ++ "self_type" : "type-10298", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-10344", +- "self_type" : "type-10346", ++ "referenced_type" : "type-12642", ++ "self_type" : "type-12644", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-12690", +- "self_type" : "type-12692", ++ "referenced_type" : "type-12958", ++ "self_type" : "type-12957", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-13006", +- "self_type" : "type-13005", ++ "referenced_type" : "type-13209", ++ "self_type" : "type-13211", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-13257", +- "self_type" : "type-13259", ++ "referenced_type" : "type-13328", ++ "self_type" : "type-13330", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-13376", +- "self_type" : "type-13378", ++ "referenced_type" : "type-13587", ++ "self_type" : "type-13589", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-13635", +- "self_type" : "type-13637", ++ "referenced_type" : "type-15117", ++ "self_type" : "type-15119", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-15165", +- "self_type" : "type-15167", ++ "referenced_type" : "type-16498", ++ "self_type" : "type-16500", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-16546", +- "self_type" : "type-16548", ++ "referenced_type" : "type-16814", ++ "self_type" : "type-16813", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-16862", +- "self_type" : "type-16861", ++ "referenced_type" : "type-17065", ++ "self_type" : "type-17067", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-17113", +- "self_type" : "type-17115", ++ "referenced_type" : "type-17184", ++ "self_type" : "type-17186", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-17232", +- "self_type" : "type-17234", ++ "referenced_type" : "type-17451", ++ "self_type" : "type-17453", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-17499", +- "self_type" : "type-17501", ++ "referenced_type" : "type-18901", ++ "self_type" : "type-18903", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-18949", +- "self_type" : "type-18951", ++ "referenced_type" : "type-21030", ++ "self_type" : "type-21032", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-21078", +- "self_type" : "type-21080", ++ "referenced_type" : "type-21346", ++ "self_type" : "type-21345", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-21394", +- "self_type" : "type-21393", ++ "referenced_type" : "type-21597", ++ "self_type" : "type-21599", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-21645", +- "self_type" : "type-21647", ++ "referenced_type" : "type-21716", ++ "self_type" : "type-21718", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-21764", +- "self_type" : "type-21766", ++ "referenced_type" : "type-22023", ++ "self_type" : "type-22025", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-22028", +- "self_type" : "type-22030", ++ "referenced_type" : "type-23456", ++ "self_type" : "type-23458", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-23478", +- "self_type" : "type-23480", ++ "referenced_type" : "type-26299", ++ "self_type" : "type-26301", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-26256", +- "self_type" : "type-26258", ++ "referenced_type" : "type-26600", ++ "self_type" : "type-26599", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-26572", +- "self_type" : "type-26571", ++ "referenced_type" : "type-26847", ++ "self_type" : "type-26849", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-26823", +- "self_type" : "type-26825", ++ "referenced_type" : "type-26965", ++ "self_type" : "type-26967", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-26942", +- "self_type" : "type-26944", ++ "referenced_type" : "type-27212", ++ "self_type" : "type-27214", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-27213", +- "self_type" : "type-27215", ++ "referenced_type" : "type-28662", ++ "self_type" : "type-28664", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-28663", +- "self_type" : "type-28665", ++ "referenced_type" : "type-31402", ++ "self_type" : "type-31404", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-31403", +- "self_type" : "type-31405", ++ "referenced_type" : "type-31718", ++ "self_type" : "type-31717", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-31719", +- "self_type" : "type-31718", ++ "referenced_type" : "type-31969", ++ "self_type" : "type-31971", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-31970", +- "self_type" : "type-31972", ++ "referenced_type" : "type-32088", ++ "self_type" : "type-32090", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-32089", +- "self_type" : "type-32091", ++ "referenced_type" : "type-4201", ++ "self_type" : "type-4203", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-4249", +- "self_type" : "type-4251", ++ "referenced_type" : "type-6053", ++ "self_type" : "type-6055", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-6101", +- "self_type" : "type-6103", ++ "referenced_type" : "type-6374", ++ "self_type" : "type-6373", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-6422", +- "self_type" : "type-6421", ++ "referenced_type" : "type-6734", ++ "self_type" : "type-6736", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-6782", +- "self_type" : "type-6784", ++ "referenced_type" : "type-6910", ++ "self_type" : "type-6912", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-6958", +- "self_type" : "type-6960", ++ "referenced_type" : "type-7271", ++ "self_type" : "type-7273", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-7319", +- "self_type" : "type-7321", ++ "referenced_type" : "type-9310", ++ "self_type" : "type-9312", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-9358", +- "self_type" : "type-9360", ++ "referenced_type" : "type-9626", ++ "self_type" : "type-9625", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-9674", +- "self_type" : "type-9673", ++ "referenced_type" : "type-9877", ++ "self_type" : "type-9879", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::const_iterator &", + "name" : "const class google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-9925", +- "self_type" : "type-9927", ++ "referenced_type" : "type-9995", ++ "self_type" : "type-9997", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-10046", +- "self_type" : "type-10048", ++ "referenced_type" : "type-10299", ++ "self_type" : "type-10301", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-10347", +- "self_type" : "type-10349", ++ "referenced_type" : "type-12645", ++ "self_type" : "type-12647", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-12693", +- "self_type" : "type-12695", ++ "referenced_type" : "type-12960", ++ "self_type" : "type-12962", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-13008", +- "self_type" : "type-13010", ++ "referenced_type" : "type-13212", ++ "self_type" : "type-13214", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-13260", +- "self_type" : "type-13262", ++ "referenced_type" : "type-13331", ++ "self_type" : "type-13333", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-13379", +- "self_type" : "type-13381", ++ "referenced_type" : "type-13590", ++ "self_type" : "type-13592", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-13638", +- "self_type" : "type-13640", ++ "referenced_type" : "type-15120", ++ "self_type" : "type-15122", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-15168", +- "self_type" : "type-15170", ++ "referenced_type" : "type-16501", ++ "self_type" : "type-16503", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-16549", +- "self_type" : "type-16551", ++ "referenced_type" : "type-16816", ++ "self_type" : "type-16818", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-16864", +- "self_type" : "type-16866", ++ "referenced_type" : "type-17068", ++ "self_type" : "type-17070", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-17116", +- "self_type" : "type-17118", ++ "referenced_type" : "type-17187", ++ "self_type" : "type-17189", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-17235", +- "self_type" : "type-17237", ++ "referenced_type" : "type-17454", ++ "self_type" : "type-17456", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-17502", +- "self_type" : "type-17504", ++ "referenced_type" : "type-18904", ++ "self_type" : "type-18906", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-18952", +- "self_type" : "type-18954", ++ "referenced_type" : "type-21033", ++ "self_type" : "type-21035", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-21081", +- "self_type" : "type-21083", ++ "referenced_type" : "type-21348", ++ "self_type" : "type-21350", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-21396", +- "self_type" : "type-21398", ++ "referenced_type" : "type-21600", ++ "self_type" : "type-21602", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-21648", +- "self_type" : "type-21650", ++ "referenced_type" : "type-21719", ++ "self_type" : "type-21721", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-21767", +- "self_type" : "type-21769", ++ "referenced_type" : "type-22026", ++ "self_type" : "type-22028", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-22031", +- "self_type" : "type-22033", ++ "referenced_type" : "type-23459", ++ "self_type" : "type-23461", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-23481", +- "self_type" : "type-23483", ++ "referenced_type" : "type-26302", ++ "self_type" : "type-26304", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-26259", +- "self_type" : "type-26261", ++ "referenced_type" : "type-26602", ++ "self_type" : "type-26604", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-26574", +- "self_type" : "type-26576", ++ "referenced_type" : "type-26850", ++ "self_type" : "type-26852", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-26826", +- "self_type" : "type-26828", ++ "referenced_type" : "type-26968", ++ "self_type" : "type-26970", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-26945", +- "self_type" : "type-26947", ++ "referenced_type" : "type-27215", ++ "self_type" : "type-27217", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-27216", +- "self_type" : "type-27218", ++ "referenced_type" : "type-28665", ++ "self_type" : "type-28667", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-28666", +- "self_type" : "type-28668", ++ "referenced_type" : "type-31405", ++ "self_type" : "type-31407", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-31406", +- "self_type" : "type-31408", ++ "referenced_type" : "type-31720", ++ "self_type" : "type-31722", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-31721", +- "self_type" : "type-31723", ++ "referenced_type" : "type-31972", ++ "self_type" : "type-31974", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-31973", +- "self_type" : "type-31975", ++ "referenced_type" : "type-32091", ++ "self_type" : "type-32093", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-32092", +- "self_type" : "type-32094", ++ "referenced_type" : "type-4204", ++ "self_type" : "type-4206", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-4252", +- "self_type" : "type-4254", ++ "referenced_type" : "type-6056", ++ "self_type" : "type-6058", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-6104", +- "self_type" : "type-6106", ++ "referenced_type" : "type-6376", ++ "self_type" : "type-6378", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-6424", +- "self_type" : "type-6426", ++ "referenced_type" : "type-6737", ++ "self_type" : "type-6739", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-6785", +- "self_type" : "type-6787", ++ "referenced_type" : "type-6913", ++ "self_type" : "type-6915", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-6961", +- "self_type" : "type-6963", ++ "referenced_type" : "type-7274", ++ "self_type" : "type-7276", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-7322", +- "self_type" : "type-7324", ++ "referenced_type" : "type-9313", ++ "self_type" : "type-9315", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-9361", +- "self_type" : "type-9363", ++ "referenced_type" : "type-9628", ++ "self_type" : "type-9630", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-9676", +- "self_type" : "type-9678", ++ "referenced_type" : "type-9880", ++ "self_type" : "type-9882", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const class google::protobuf::Map::iterator &", + "name" : "const class google::protobuf::Map::iterator &", +- "referenced_type" : "type-9928", +- "self_type" : "type-9930", ++ "referenced_type" : "type-9998", ++ "self_type" : "type-10000", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { +@@ -73043,8 +73085,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Any &", + "name" : "const google::protobuf::Any &", +- "referenced_type" : "type-2163", +- "self_type" : "type-2184", ++ "referenced_type" : "type-2094", ++ "self_type" : "type-2115", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/any.pb.h" + }, +@@ -73052,8 +73094,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Any *const &", + "name" : "const google::protobuf::Any *const &", +- "referenced_type" : "type-2161", +- "self_type" : "type-2164", ++ "referenced_type" : "type-2092", ++ "self_type" : "type-2095", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -73061,8 +73103,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Api &", + "name" : "const google::protobuf::Api &", +- "referenced_type" : "type-2447", +- "self_type" : "type-2507", ++ "referenced_type" : "type-2377", ++ "self_type" : "type-2437", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/api.pb.h" + }, +@@ -73070,8 +73112,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Api *const &", + "name" : "const google::protobuf::Api *const &", +- "referenced_type" : "type-2445", +- "self_type" : "type-2448", ++ "referenced_type" : "type-2375", ++ "self_type" : "type-2378", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -73088,8 +73130,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::BoolValue &", + "name" : "const google::protobuf::BoolValue &", +- "referenced_type" : "type-11123", +- "self_type" : "type-11161", ++ "referenced_type" : "type-11075", ++ "self_type" : "type-11113", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, +@@ -73097,8 +73139,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::BoolValue *const &", + "name" : "const google::protobuf::BoolValue *const &", +- "referenced_type" : "type-11121", +- "self_type" : "type-11124", ++ "referenced_type" : "type-11073", ++ "self_type" : "type-11076", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -73106,8 +73148,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::BytesValue &", + "name" : "const google::protobuf::BytesValue &", +- "referenced_type" : "type-11131", +- "self_type" : "type-11165", ++ "referenced_type" : "type-11083", ++ "self_type" : "type-11117", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, +@@ -73115,8 +73157,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::BytesValue *const &", + "name" : "const google::protobuf::BytesValue *const &", +- "referenced_type" : "type-11129", +- "self_type" : "type-11132", ++ "referenced_type" : "type-11081", ++ "self_type" : "type-11084", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -73124,8 +73166,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DebugStringOptions &", + "name" : "const google::protobuf::DebugStringOptions &", +- "referenced_type" : "type-3729", +- "self_type" : "type-3730", ++ "referenced_type" : "type-3681", ++ "self_type" : "type-3682", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73133,8 +73175,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Descriptor *const &", + "name" : "const google::protobuf::Descriptor *const &", +- "referenced_type" : "type-3694", +- "self_type" : "type-3695", ++ "referenced_type" : "type-3646", ++ "self_type" : "type-3647", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -73142,8 +73184,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool &", + "name" : "const google::protobuf::DescriptorPool &", +- "referenced_type" : "type-1963", +- "self_type" : "type-3764", ++ "referenced_type" : "type-1888", ++ "self_type" : "type-3716", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -73151,8 +73193,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorProto &", + "name" : "const google::protobuf::DescriptorProto &", +- "referenced_type" : "type-1879", +- "self_type" : "type-2069", ++ "referenced_type" : "type-1797", ++ "self_type" : "type-2001", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -73160,8 +73202,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorProto *const &", + "name" : "const google::protobuf::DescriptorProto *const &", +- "referenced_type" : "type-4116", +- "self_type" : "type-4117", ++ "referenced_type" : "type-4068", ++ "self_type" : "type-4069", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -73169,8 +73211,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorProto_ExtensionRange &", + "name" : "const google::protobuf::DescriptorProto_ExtensionRange &", +- "referenced_type" : "type-1895", +- "self_type" : "type-2091", ++ "referenced_type" : "type-1814", ++ "self_type" : "type-2024", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -73178,8 +73220,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorProto_ExtensionRange *const &", + "name" : "const google::protobuf::DescriptorProto_ExtensionRange *const &", +- "referenced_type" : "type-4112", +- "self_type" : "type-4113", ++ "referenced_type" : "type-4064", ++ "self_type" : "type-4065", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -73187,8 +73229,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorProto_ReservedRange &", + "name" : "const google::protobuf::DescriptorProto_ReservedRange &", +- "referenced_type" : "type-1903", +- "self_type" : "type-2101", ++ "referenced_type" : "type-1822", ++ "self_type" : "type-2034", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -73196,8 +73238,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorProto_ReservedRange *const &", + "name" : "const google::protobuf::DescriptorProto_ReservedRange *const &", +- "referenced_type" : "type-4114", +- "self_type" : "type-4115", ++ "referenced_type" : "type-4066", ++ "self_type" : "type-4067", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -73205,8 +73247,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DoubleValue &", + "name" : "const google::protobuf::DoubleValue &", +- "referenced_type" : "type-11098", +- "self_type" : "type-11149", ++ "referenced_type" : "type-11050", ++ "self_type" : "type-11101", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, +@@ -73214,8 +73256,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DoubleValue *const &", + "name" : "const google::protobuf::DoubleValue *const &", +- "referenced_type" : "type-11096", +- "self_type" : "type-11099", ++ "referenced_type" : "type-11048", ++ "self_type" : "type-11051", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -73223,8 +73265,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Duration &", + "name" : "const google::protobuf::Duration &", +- "referenced_type" : "type-4216", +- "self_type" : "type-4233", ++ "referenced_type" : "type-4168", ++ "self_type" : "type-4185", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/duration.pb.h" + }, +@@ -73232,8 +73274,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Duration *const &", + "name" : "const google::protobuf::Duration *const &", +- "referenced_type" : "type-4214", +- "self_type" : "type-4218", ++ "referenced_type" : "type-4166", ++ "self_type" : "type-4170", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -73241,8 +73283,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Empty &", + "name" : "const google::protobuf::Empty &", +- "referenced_type" : "type-4430", +- "self_type" : "type-4445", ++ "referenced_type" : "type-4382", ++ "self_type" : "type-4397", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/empty.pb.h" + }, +@@ -73250,8 +73292,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Empty *const &", + "name" : "const google::protobuf::Empty *const &", +- "referenced_type" : "type-4428", +- "self_type" : "type-4431", ++ "referenced_type" : "type-4380", ++ "self_type" : "type-4383", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -73259,8 +73301,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Enum &", + "name" : "const google::protobuf::Enum &", +- "referenced_type" : "type-2498", +- "self_type" : "type-2499", ++ "referenced_type" : "type-2428", ++ "self_type" : "type-2429", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, +@@ -73268,8 +73310,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Enum *const &", + "name" : "const google::protobuf::Enum *const &", +- "referenced_type" : "type-7953", +- "self_type" : "type-7954", ++ "referenced_type" : "type-7905", ++ "self_type" : "type-7906", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -73277,8 +73319,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumDescriptorProto &", + "name" : "const google::protobuf::EnumDescriptorProto &", +- "referenced_type" : "type-1883", +- "self_type" : "type-2075", ++ "referenced_type" : "type-1801", ++ "self_type" : "type-2007", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -73286,8 +73328,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumDescriptorProto *const &", + "name" : "const google::protobuf::EnumDescriptorProto *const &", +- "referenced_type" : "type-4122", +- "self_type" : "type-4123", ++ "referenced_type" : "type-4074", ++ "self_type" : "type-4075", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -73295,8 +73337,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-12134", +- "self_type" : "type-12137", ++ "referenced_type" : "type-12086", ++ "self_type" : "type-12089", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73304,8 +73346,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-13202", +- "self_type" : "type-13205", ++ "referenced_type" : "type-13154", ++ "self_type" : "type-13157", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73313,8 +73355,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-14753", +- "self_type" : "type-14756", ++ "referenced_type" : "type-14705", ++ "self_type" : "type-14708", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73322,8 +73364,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-14844", +- "self_type" : "type-14847", ++ "referenced_type" : "type-14796", ++ "self_type" : "type-14799", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73331,8 +73373,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-15107", +- "self_type" : "type-15110", ++ "referenced_type" : "type-15059", ++ "self_type" : "type-15062", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73340,8 +73382,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-15206", +- "self_type" : "type-15210", ++ "referenced_type" : "type-15158", ++ "self_type" : "type-15162", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73349,8 +73391,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-15989", +- "self_type" : "type-15992", ++ "referenced_type" : "type-15941", ++ "self_type" : "type-15944", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73358,8 +73400,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-17058", +- "self_type" : "type-17061", ++ "referenced_type" : "type-17010", ++ "self_type" : "type-17013", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73367,8 +73409,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-18617", +- "self_type" : "type-18620", ++ "referenced_type" : "type-18569", ++ "self_type" : "type-18572", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73376,8 +73418,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-18701", +- "self_type" : "type-18704", ++ "referenced_type" : "type-18653", ++ "self_type" : "type-18656", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73385,8 +73427,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-18891", +- "self_type" : "type-18894", ++ "referenced_type" : "type-18843", ++ "self_type" : "type-18846", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73394,8 +73436,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-18988", +- "self_type" : "type-18992", ++ "referenced_type" : "type-18940", ++ "self_type" : "type-18944", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73403,8 +73445,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-19230", +- "self_type" : "type-19233", ++ "referenced_type" : "type-1903", ++ "self_type" : "type-1973", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73412,8 +73454,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-19561", +- "self_type" : "type-19564", ++ "referenced_type" : "type-19182", ++ "self_type" : "type-19185", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73421,8 +73463,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-19732", +- "self_type" : "type-19735", ++ "referenced_type" : "type-19513", ++ "self_type" : "type-19516", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73430,8 +73472,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-1977", +- "self_type" : "type-2044", ++ "referenced_type" : "type-19684", ++ "self_type" : "type-19687", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73439,8 +73481,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-19898", +- "self_type" : "type-19901", ++ "referenced_type" : "type-19850", ++ "self_type" : "type-19853", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73448,8 +73490,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-20521", +- "self_type" : "type-20524", ++ "referenced_type" : "type-20473", ++ "self_type" : "type-20476", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73457,8 +73499,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-21590", +- "self_type" : "type-21593", ++ "referenced_type" : "type-21542", ++ "self_type" : "type-21545", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73466,8 +73508,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-23146", +- "self_type" : "type-23149", ++ "referenced_type" : "type-23131", ++ "self_type" : "type-23134", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73475,8 +73517,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-23230", +- "self_type" : "type-23233", ++ "referenced_type" : "type-23219", ++ "self_type" : "type-23222", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73484,8 +73526,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-23420", +- "self_type" : "type-23423", ++ "referenced_type" : "type-23403", ++ "self_type" : "type-23406", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73493,8 +73535,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-23517", +- "self_type" : "type-23521", ++ "referenced_type" : "type-23495", ++ "self_type" : "type-23499", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73502,8 +73544,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-23751", +- "self_type" : "type-23754", ++ "referenced_type" : "type-23738", ++ "self_type" : "type-23741", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73511,8 +73553,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-24031", +- "self_type" : "type-24034", ++ "referenced_type" : "type-24030", ++ "self_type" : "type-24033", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73520,8 +73562,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-24199", +- "self_type" : "type-24202", ++ "referenced_type" : "type-24204", ++ "self_type" : "type-24207", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73529,8 +73571,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-24363", +- "self_type" : "type-24366", ++ "referenced_type" : "type-24344", ++ "self_type" : "type-24347", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73538,8 +73580,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-24504", +- "self_type" : "type-24507", ++ "referenced_type" : "type-24482", ++ "self_type" : "type-24485", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73547,8 +73589,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-24787", +- "self_type" : "type-24790", ++ "referenced_type" : "type-2455", ++ "self_type" : "type-2458", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73556,8 +73598,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-24943", +- "self_type" : "type-24946", ++ "referenced_type" : "type-24745", ++ "self_type" : "type-24748", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73565,8 +73607,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-25072", +- "self_type" : "type-25075", ++ "referenced_type" : "type-24911", ++ "self_type" : "type-24914", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73574,8 +73616,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-2525", +- "self_type" : "type-2528", ++ "referenced_type" : "type-25043", ++ "self_type" : "type-25046", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73583,8 +73625,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-25700", +- "self_type" : "type-25703", ++ "referenced_type" : "type-25751", ++ "self_type" : "type-25754", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73592,8 +73634,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-26768", +- "self_type" : "type-26771", ++ "referenced_type" : "type-26790", ++ "self_type" : "type-26793", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73601,8 +73643,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-28331", +- "self_type" : "type-28334", ++ "referenced_type" : "type-28330", ++ "self_type" : "type-28333", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73610,8 +73652,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-28415", +- "self_type" : "type-28418", ++ "referenced_type" : "type-28414", ++ "self_type" : "type-28417", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73619,8 +73661,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-28605", +- "self_type" : "type-28608", ++ "referenced_type" : "type-28604", ++ "self_type" : "type-28607", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73628,8 +73670,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-28702", +- "self_type" : "type-28706", ++ "referenced_type" : "type-28701", ++ "self_type" : "type-28705", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73637,8 +73679,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-28936", +- "self_type" : "type-28939", ++ "referenced_type" : "type-28935", ++ "self_type" : "type-28938", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73646,8 +73688,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-29216", +- "self_type" : "type-29219", ++ "referenced_type" : "type-29215", ++ "self_type" : "type-29218", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73655,8 +73697,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-29384", +- "self_type" : "type-29387", ++ "referenced_type" : "type-29383", ++ "self_type" : "type-29386", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73664,8 +73706,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-29548", +- "self_type" : "type-29551", ++ "referenced_type" : "type-29547", ++ "self_type" : "type-29550", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73673,8 +73715,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-29689", +- "self_type" : "type-29692", ++ "referenced_type" : "type-29688", ++ "self_type" : "type-29691", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73682,8 +73724,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-29966", +- "self_type" : "type-29969", ++ "referenced_type" : "type-29965", ++ "self_type" : "type-29968", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73691,8 +73733,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-30099", +- "self_type" : "type-30102", ++ "referenced_type" : "type-30098", ++ "self_type" : "type-30101", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73700,8 +73742,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-30217", +- "self_type" : "type-30220", ++ "referenced_type" : "type-30216", ++ "self_type" : "type-30219", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73709,8 +73751,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-30846", +- "self_type" : "type-30849", ++ "referenced_type" : "type-30845", ++ "self_type" : "type-30848", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73718,8 +73760,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-31915", +- "self_type" : "type-31918", ++ "referenced_type" : "type-31914", ++ "self_type" : "type-31917", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73727,8 +73769,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-3563", +- "self_type" : "type-3566", ++ "referenced_type" : "type-3515", ++ "self_type" : "type-3518", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73736,8 +73778,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-5541", +- "self_type" : "type-5544", ++ "referenced_type" : "type-5493", ++ "self_type" : "type-5496", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73745,8 +73787,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-6714", +- "self_type" : "type-6717", ++ "referenced_type" : "type-6666", ++ "self_type" : "type-6669", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73754,8 +73796,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-8800", +- "self_type" : "type-8803", ++ "referenced_type" : "type-8752", ++ "self_type" : "type-8755", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73763,8 +73805,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions &", + "name" : "const google::protobuf::EnumOptions &", +- "referenced_type" : "type-9870", +- "self_type" : "type-9873", ++ "referenced_type" : "type-9822", ++ "self_type" : "type-9825", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73772,8 +73814,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *const &", + "name" : "const google::protobuf::EnumOptions *const &", +- "referenced_type" : "type-4136", +- "self_type" : "type-4137", ++ "referenced_type" : "type-4088", ++ "self_type" : "type-4089", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -73781,8 +73823,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValue &", + "name" : "const google::protobuf::EnumValue &", +- "referenced_type" : "type-2373", +- "self_type" : "type-2420", ++ "referenced_type" : "type-2301", ++ "self_type" : "type-2350", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -73790,8 +73832,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValue *const &", + "name" : "const google::protobuf::EnumValue *const &", +- "referenced_type" : "type-7955", +- "self_type" : "type-7956", ++ "referenced_type" : "type-7907", ++ "self_type" : "type-7908", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -73799,8 +73841,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueDescriptorProto &", + "name" : "const google::protobuf::EnumValueDescriptorProto &", +- "referenced_type" : "type-1907", +- "self_type" : "type-2107", ++ "referenced_type" : "type-1827", ++ "self_type" : "type-2040", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -73808,8 +73850,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueDescriptorProto *const &", + "name" : "const google::protobuf::EnumValueDescriptorProto *const &", +- "referenced_type" : "type-4124", +- "self_type" : "type-4125", ++ "referenced_type" : "type-4076", ++ "self_type" : "type-4077", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -73817,8 +73859,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-12138", +- "self_type" : "type-12141", ++ "referenced_type" : "type-12090", ++ "self_type" : "type-12093", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73826,8 +73868,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-13206", +- "self_type" : "type-13209", ++ "referenced_type" : "type-13158", ++ "self_type" : "type-13161", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73835,8 +73877,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-14757", +- "self_type" : "type-14760", ++ "referenced_type" : "type-14709", ++ "self_type" : "type-14712", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73844,8 +73886,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-14848", +- "self_type" : "type-14851", ++ "referenced_type" : "type-14800", ++ "self_type" : "type-14803", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73853,8 +73895,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-15111", +- "self_type" : "type-15114", ++ "referenced_type" : "type-15063", ++ "self_type" : "type-15066", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73862,8 +73904,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-15211", +- "self_type" : "type-15214", ++ "referenced_type" : "type-15163", ++ "self_type" : "type-15166", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73871,8 +73913,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-15993", +- "self_type" : "type-15996", ++ "referenced_type" : "type-15945", ++ "self_type" : "type-15948", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73880,8 +73922,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-17062", +- "self_type" : "type-17065", ++ "referenced_type" : "type-17014", ++ "self_type" : "type-17017", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73889,8 +73931,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-18621", +- "self_type" : "type-18624", ++ "referenced_type" : "type-18573", ++ "self_type" : "type-18576", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73898,8 +73940,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-18705", +- "self_type" : "type-18708", ++ "referenced_type" : "type-18657", ++ "self_type" : "type-18660", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73907,8 +73949,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-18895", +- "self_type" : "type-18898", ++ "referenced_type" : "type-18847", ++ "self_type" : "type-18850", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73916,8 +73958,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-18993", +- "self_type" : "type-18996", ++ "referenced_type" : "type-18945", ++ "self_type" : "type-18948", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73925,8 +73967,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-19234", +- "self_type" : "type-19239", ++ "referenced_type" : "type-1909", ++ "self_type" : "type-1975", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73934,8 +73976,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-19565", +- "self_type" : "type-19568", ++ "referenced_type" : "type-19186", ++ "self_type" : "type-19191", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73943,8 +73985,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-19736", +- "self_type" : "type-19739", ++ "referenced_type" : "type-19517", ++ "self_type" : "type-19520", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73952,8 +73994,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-1983", +- "self_type" : "type-2046", ++ "referenced_type" : "type-19688", ++ "self_type" : "type-19691", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73961,8 +74003,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-19902", +- "self_type" : "type-19906", ++ "referenced_type" : "type-19854", ++ "self_type" : "type-19858", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73970,8 +74012,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-20525", +- "self_type" : "type-20528", ++ "referenced_type" : "type-20477", ++ "self_type" : "type-20480", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73979,8 +74021,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-21594", +- "self_type" : "type-21597", ++ "referenced_type" : "type-21546", ++ "self_type" : "type-21549", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73988,8 +74030,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-23150", +- "self_type" : "type-23153", ++ "referenced_type" : "type-23135", ++ "self_type" : "type-23138", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -73997,8 +74039,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-23234", +- "self_type" : "type-23237", ++ "referenced_type" : "type-23223", ++ "self_type" : "type-23226", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74006,8 +74048,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-23424", +- "self_type" : "type-23427", ++ "referenced_type" : "type-23407", ++ "self_type" : "type-23410", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74015,8 +74057,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-23522", +- "self_type" : "type-23525", ++ "referenced_type" : "type-23500", ++ "self_type" : "type-23503", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74024,8 +74066,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-23755", +- "self_type" : "type-23760", ++ "referenced_type" : "type-23742", ++ "self_type" : "type-23747", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74033,8 +74075,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-24035", +- "self_type" : "type-24038", ++ "referenced_type" : "type-24034", ++ "self_type" : "type-24037", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74042,8 +74084,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-24203", +- "self_type" : "type-24206", ++ "referenced_type" : "type-24208", ++ "self_type" : "type-24211", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74051,8 +74093,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-24367", +- "self_type" : "type-24371", ++ "referenced_type" : "type-24348", ++ "self_type" : "type-24352", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74060,8 +74102,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-24508", +- "self_type" : "type-24511", ++ "referenced_type" : "type-24486", ++ "self_type" : "type-24489", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74069,8 +74111,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-24791", +- "self_type" : "type-24794", ++ "referenced_type" : "type-2459", ++ "self_type" : "type-2462", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74078,8 +74120,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-24947", +- "self_type" : "type-24950", ++ "referenced_type" : "type-24749", ++ "self_type" : "type-24752", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74087,8 +74129,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-25076", +- "self_type" : "type-25079", ++ "referenced_type" : "type-24915", ++ "self_type" : "type-24918", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74096,8 +74138,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-2529", +- "self_type" : "type-2532", ++ "referenced_type" : "type-25047", ++ "self_type" : "type-25050", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74105,8 +74147,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-25704", +- "self_type" : "type-25707", ++ "referenced_type" : "type-25755", ++ "self_type" : "type-25758", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74114,8 +74156,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-26772", +- "self_type" : "type-26775", ++ "referenced_type" : "type-26794", ++ "self_type" : "type-26797", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74123,8 +74165,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-28335", +- "self_type" : "type-28338", ++ "referenced_type" : "type-28334", ++ "self_type" : "type-28337", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74132,8 +74174,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-28419", +- "self_type" : "type-28422", ++ "referenced_type" : "type-28418", ++ "self_type" : "type-28421", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74141,8 +74183,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-28609", +- "self_type" : "type-28612", ++ "referenced_type" : "type-28608", ++ "self_type" : "type-28611", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74150,8 +74192,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-28707", +- "self_type" : "type-28710", ++ "referenced_type" : "type-28706", ++ "self_type" : "type-28709", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74159,8 +74201,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-28940", +- "self_type" : "type-28945", ++ "referenced_type" : "type-28939", ++ "self_type" : "type-28944", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74168,8 +74210,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-29220", +- "self_type" : "type-29223", ++ "referenced_type" : "type-29219", ++ "self_type" : "type-29222", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74177,8 +74219,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-29388", +- "self_type" : "type-29391", ++ "referenced_type" : "type-29387", ++ "self_type" : "type-29390", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74186,8 +74228,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-29552", +- "self_type" : "type-29556", ++ "referenced_type" : "type-29551", ++ "self_type" : "type-29555", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74195,8 +74237,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-29693", +- "self_type" : "type-29696", ++ "referenced_type" : "type-29692", ++ "self_type" : "type-29695", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74204,8 +74246,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-29970", +- "self_type" : "type-29973", ++ "referenced_type" : "type-29969", ++ "self_type" : "type-29972", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74213,8 +74255,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-30103", +- "self_type" : "type-30106", ++ "referenced_type" : "type-30102", ++ "self_type" : "type-30105", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74222,8 +74264,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-30221", +- "self_type" : "type-30224", ++ "referenced_type" : "type-30220", ++ "self_type" : "type-30223", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74231,8 +74273,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-30850", +- "self_type" : "type-30853", ++ "referenced_type" : "type-30849", ++ "self_type" : "type-30852", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74240,8 +74282,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-31919", +- "self_type" : "type-31922", ++ "referenced_type" : "type-31918", ++ "self_type" : "type-31921", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74249,8 +74291,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-3567", +- "self_type" : "type-3570", ++ "referenced_type" : "type-3519", ++ "self_type" : "type-3522", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74258,8 +74300,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-5545", +- "self_type" : "type-5548", ++ "referenced_type" : "type-5497", ++ "self_type" : "type-5500", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74267,8 +74309,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-6718", +- "self_type" : "type-6721", ++ "referenced_type" : "type-6670", ++ "self_type" : "type-6673", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74276,8 +74318,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-8804", +- "self_type" : "type-8807", ++ "referenced_type" : "type-8756", ++ "self_type" : "type-8759", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74285,8 +74327,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions &", + "name" : "const google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-9874", +- "self_type" : "type-9877", ++ "referenced_type" : "type-9826", ++ "self_type" : "type-9829", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74294,8 +74336,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *const &", + "name" : "const google::protobuf::EnumValueOptions *const &", +- "referenced_type" : "type-4138", +- "self_type" : "type-4139", ++ "referenced_type" : "type-4090", ++ "self_type" : "type-4091", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -74303,8 +74345,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Field &", + "name" : "const google::protobuf::Field &", +- "referenced_type" : "type-2364", +- "self_type" : "type-2407", ++ "referenced_type" : "type-2292", ++ "self_type" : "type-2337", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -74312,8 +74354,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Field *const &", + "name" : "const google::protobuf::Field *const &", +- "referenced_type" : "type-7951", +- "self_type" : "type-7952", ++ "referenced_type" : "type-7903", ++ "self_type" : "type-7904", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -74321,8 +74363,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldDescriptor &", + "name" : "const google::protobuf::FieldDescriptor &", +- "referenced_type" : "type-2004", +- "self_type" : "type-14828", ++ "referenced_type" : "type-1930", ++ "self_type" : "type-14780", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/field_comparator.h" + }, +@@ -74330,8 +74372,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldDescriptor *const &", + "name" : "const google::protobuf::FieldDescriptor *const &", +- "referenced_type" : "type-3670", +- "self_type" : "type-3671", ++ "referenced_type" : "type-3622", ++ "self_type" : "type-3623", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -74339,8 +74381,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldDescriptor::Label &", + "name" : "const google::protobuf::FieldDescriptor::Label &", +- "referenced_type" : "type-3798", +- "self_type" : "type-3799", ++ "referenced_type" : "type-3750", ++ "self_type" : "type-3751", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -74348,8 +74390,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldDescriptor::Type &", + "name" : "const google::protobuf::FieldDescriptor::Type &", +- "referenced_type" : "type-2159", +- "self_type" : "type-2160", ++ "referenced_type" : "type-2090", ++ "self_type" : "type-2091", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -74357,8 +74399,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldDescriptorProto &", + "name" : "const google::protobuf::FieldDescriptorProto &", +- "referenced_type" : "type-1891", +- "self_type" : "type-2085", ++ "referenced_type" : "type-1810", ++ "self_type" : "type-2018", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -74366,8 +74408,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldDescriptorProto *const &", + "name" : "const google::protobuf::FieldDescriptorProto *const &", +- "referenced_type" : "type-4118", +- "self_type" : "type-4119", ++ "referenced_type" : "type-4070", ++ "self_type" : "type-4071", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -74375,8 +74417,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldDescriptorProto_Label &", + "name" : "const google::protobuf::FieldDescriptorProto_Label &", +- "referenced_type" : "type-2207", +- "self_type" : "type-3801", ++ "referenced_type" : "type-2138", ++ "self_type" : "type-3753", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -74384,8 +74426,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldDescriptorProto_Type &", + "name" : "const google::protobuf::FieldDescriptorProto_Type &", +- "referenced_type" : "type-2206", +- "self_type" : "type-3800", ++ "referenced_type" : "type-2137", ++ "self_type" : "type-3752", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -74393,8 +74435,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldMask &", + "name" : "const google::protobuf::FieldMask &", +- "referenced_type" : "type-6395", +- "self_type" : "type-6410", ++ "referenced_type" : "type-6347", ++ "self_type" : "type-6362", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/field_mask.pb.h" + }, +@@ -74402,8 +74444,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldMask *const &", + "name" : "const google::protobuf::FieldMask *const &", +- "referenced_type" : "type-6393", +- "self_type" : "type-6396", ++ "referenced_type" : "type-6345", ++ "self_type" : "type-6348", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -74411,8 +74453,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-12130", +- "self_type" : "type-12133", ++ "referenced_type" : "type-12082", ++ "self_type" : "type-12085", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74420,8 +74462,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-13198", +- "self_type" : "type-13201", ++ "referenced_type" : "type-13150", ++ "self_type" : "type-13153", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74429,8 +74471,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-14749", +- "self_type" : "type-14752", ++ "referenced_type" : "type-14701", ++ "self_type" : "type-14704", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74438,8 +74480,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-14840", +- "self_type" : "type-14843", ++ "referenced_type" : "type-14792", ++ "self_type" : "type-14795", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74447,8 +74489,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-15103", +- "self_type" : "type-15106", ++ "referenced_type" : "type-15055", ++ "self_type" : "type-15058", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74456,8 +74498,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-15201", +- "self_type" : "type-15205", ++ "referenced_type" : "type-15153", ++ "self_type" : "type-15157", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74465,8 +74507,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-15985", +- "self_type" : "type-15988", ++ "referenced_type" : "type-15937", ++ "self_type" : "type-15940", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74474,8 +74516,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-17054", +- "self_type" : "type-17057", ++ "referenced_type" : "type-17006", ++ "self_type" : "type-17009", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74483,8 +74525,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-18613", +- "self_type" : "type-18616", ++ "referenced_type" : "type-18565", ++ "self_type" : "type-18568", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74492,8 +74534,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-18697", +- "self_type" : "type-18700", ++ "referenced_type" : "type-18649", ++ "self_type" : "type-18652", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74501,8 +74543,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-18887", +- "self_type" : "type-18890", ++ "referenced_type" : "type-18839", ++ "self_type" : "type-18842", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74510,8 +74552,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-18983", +- "self_type" : "type-18987", ++ "referenced_type" : "type-18935", ++ "self_type" : "type-18939", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74519,8 +74561,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-19226", +- "self_type" : "type-19229", ++ "referenced_type" : "type-19178", ++ "self_type" : "type-19181", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74528,8 +74570,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-19557", +- "self_type" : "type-19560", ++ "referenced_type" : "type-1932", ++ "self_type" : "type-1963", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74537,8 +74579,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-19728", +- "self_type" : "type-19731", ++ "referenced_type" : "type-19509", ++ "self_type" : "type-19512", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74546,8 +74588,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-19892", +- "self_type" : "type-19897", ++ "referenced_type" : "type-19680", ++ "self_type" : "type-19683", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74555,8 +74597,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-2006", +- "self_type" : "type-2034", ++ "referenced_type" : "type-19844", ++ "self_type" : "type-19849", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74564,8 +74606,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-20517", +- "self_type" : "type-20520", ++ "referenced_type" : "type-20469", ++ "self_type" : "type-20472", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74573,8 +74615,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-21586", +- "self_type" : "type-21589", ++ "referenced_type" : "type-21538", ++ "self_type" : "type-21541", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74582,8 +74624,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-23142", +- "self_type" : "type-23145", ++ "referenced_type" : "type-23127", ++ "self_type" : "type-23130", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74591,8 +74633,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-23226", +- "self_type" : "type-23229", ++ "referenced_type" : "type-23213", ++ "self_type" : "type-23217", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74600,8 +74642,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-23416", +- "self_type" : "type-23419", ++ "referenced_type" : "type-23399", ++ "self_type" : "type-23402", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74609,8 +74651,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-23512", +- "self_type" : "type-23516", ++ "referenced_type" : "type-23490", ++ "self_type" : "type-23493", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74618,8 +74660,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-23747", +- "self_type" : "type-23750", ++ "referenced_type" : "type-23732", ++ "self_type" : "type-23735", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74627,8 +74669,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-24027", +- "self_type" : "type-24030", ++ "referenced_type" : "type-24026", ++ "self_type" : "type-24029", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74636,8 +74678,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-24195", +- "self_type" : "type-24198", ++ "referenced_type" : "type-24200", ++ "self_type" : "type-24203", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74645,8 +74687,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-24357", +- "self_type" : "type-24362", ++ "referenced_type" : "type-24340", ++ "self_type" : "type-24343", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74654,8 +74696,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-24499", +- "self_type" : "type-24502", ++ "referenced_type" : "type-24478", ++ "self_type" : "type-24481", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74663,8 +74705,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-24783", +- "self_type" : "type-24786", ++ "referenced_type" : "type-2451", ++ "self_type" : "type-2454", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74672,8 +74714,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-24939", +- "self_type" : "type-24942", ++ "referenced_type" : "type-24739", ++ "self_type" : "type-24742", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74681,8 +74723,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-25068", +- "self_type" : "type-25071", ++ "referenced_type" : "type-24907", ++ "self_type" : "type-24910", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74690,8 +74732,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-2521", +- "self_type" : "type-2524", ++ "referenced_type" : "type-25039", ++ "self_type" : "type-25042", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74699,8 +74741,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-25696", +- "self_type" : "type-25699", ++ "referenced_type" : "type-25747", ++ "self_type" : "type-25750", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74708,8 +74750,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-26764", +- "self_type" : "type-26767", ++ "referenced_type" : "type-26786", ++ "self_type" : "type-26789", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74717,8 +74759,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-28327", +- "self_type" : "type-28330", ++ "referenced_type" : "type-28326", ++ "self_type" : "type-28329", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74726,8 +74768,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-28411", +- "self_type" : "type-28414", ++ "referenced_type" : "type-28410", ++ "self_type" : "type-28413", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74735,8 +74777,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-28601", +- "self_type" : "type-28604", ++ "referenced_type" : "type-28600", ++ "self_type" : "type-28603", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74744,8 +74786,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-28697", +- "self_type" : "type-28701", ++ "referenced_type" : "type-28696", ++ "self_type" : "type-28700", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74753,8 +74795,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-28932", +- "self_type" : "type-28935", ++ "referenced_type" : "type-28931", ++ "self_type" : "type-28934", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74762,8 +74804,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-29212", +- "self_type" : "type-29215", ++ "referenced_type" : "type-29211", ++ "self_type" : "type-29214", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74771,8 +74813,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-29380", +- "self_type" : "type-29383", ++ "referenced_type" : "type-29379", ++ "self_type" : "type-29382", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74780,8 +74822,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-29542", +- "self_type" : "type-29547", ++ "referenced_type" : "type-29541", ++ "self_type" : "type-29546", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74789,8 +74831,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-29684", +- "self_type" : "type-29687", ++ "referenced_type" : "type-29683", ++ "self_type" : "type-29686", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74798,8 +74840,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-29962", +- "self_type" : "type-29965", ++ "referenced_type" : "type-29961", ++ "self_type" : "type-29964", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74807,8 +74849,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-30095", +- "self_type" : "type-30098", ++ "referenced_type" : "type-30094", ++ "self_type" : "type-30097", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74816,8 +74858,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-30213", +- "self_type" : "type-30216", ++ "referenced_type" : "type-30212", ++ "self_type" : "type-30215", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74825,8 +74867,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-30842", +- "self_type" : "type-30845", ++ "referenced_type" : "type-30841", ++ "self_type" : "type-30844", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74834,8 +74876,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-31911", +- "self_type" : "type-31914", ++ "referenced_type" : "type-31910", ++ "self_type" : "type-31913", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74843,8 +74885,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-3559", +- "self_type" : "type-3562", ++ "referenced_type" : "type-3511", ++ "self_type" : "type-3514", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74852,8 +74894,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-5537", +- "self_type" : "type-5540", ++ "referenced_type" : "type-5489", ++ "self_type" : "type-5492", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74861,8 +74903,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-6710", +- "self_type" : "type-6713", ++ "referenced_type" : "type-6662", ++ "self_type" : "type-6665", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74870,8 +74912,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-8796", +- "self_type" : "type-8799", ++ "referenced_type" : "type-8748", ++ "self_type" : "type-8751", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74879,8 +74921,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions &", + "name" : "const google::protobuf::FieldOptions &", +- "referenced_type" : "type-9866", +- "self_type" : "type-9869", ++ "referenced_type" : "type-9818", ++ "self_type" : "type-9821", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74888,8 +74930,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *const &", + "name" : "const google::protobuf::FieldOptions *const &", +- "referenced_type" : "type-4134", +- "self_type" : "type-4135", ++ "referenced_type" : "type-4086", ++ "self_type" : "type-4087", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -74897,8 +74939,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptor *const &", + "name" : "const google::protobuf::FileDescriptor *const &", +- "referenced_type" : "type-3667", +- "self_type" : "type-3669", ++ "referenced_type" : "type-3619", ++ "self_type" : "type-3621", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -74906,8 +74948,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorProto &", + "name" : "const google::protobuf::FileDescriptorProto &", +- "referenced_type" : "type-1875", +- "self_type" : "type-2064", ++ "referenced_type" : "type-1793", ++ "self_type" : "type-1996", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -74915,8 +74957,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorProto *const &", + "name" : "const google::protobuf::FileDescriptorProto *const &", +- "referenced_type" : "type-3995", +- "self_type" : "type-3994", ++ "referenced_type" : "type-3947", ++ "self_type" : "type-3946", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -74924,8 +74966,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorSet &", + "name" : "const google::protobuf::FileDescriptorSet &", +- "referenced_type" : "type-2215", +- "self_type" : "type-2216", ++ "referenced_type" : "type-2146", ++ "self_type" : "type-2147", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -74933,8 +74975,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorSet *const &", + "name" : "const google::protobuf::FileDescriptorSet *const &", +- "referenced_type" : "type-4110", +- "self_type" : "type-4111", ++ "referenced_type" : "type-4062", ++ "self_type" : "type-4063", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -74942,8 +74984,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-12150", +- "self_type" : "type-12159", ++ "referenced_type" : "type-12102", ++ "self_type" : "type-12111", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74951,8 +74993,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-13218", +- "self_type" : "type-13228", ++ "referenced_type" : "type-13170", ++ "self_type" : "type-13180", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74960,8 +75002,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-14770", +- "self_type" : "type-14779", ++ "referenced_type" : "type-14722", ++ "self_type" : "type-14731", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74969,8 +75011,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-14862", +- "self_type" : "type-14871", ++ "referenced_type" : "type-14814", ++ "self_type" : "type-14823", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74978,8 +75020,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-15126", +- "self_type" : "type-15135", ++ "referenced_type" : "type-15078", ++ "self_type" : "type-15087", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74987,8 +75029,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-15225", +- "self_type" : "type-15241", ++ "referenced_type" : "type-15177", ++ "self_type" : "type-15193", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -74996,8 +75038,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-16005", +- "self_type" : "type-16014", ++ "referenced_type" : "type-15957", ++ "self_type" : "type-15966", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75005,8 +75047,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-17074", +- "self_type" : "type-17084", ++ "referenced_type" : "type-17026", ++ "self_type" : "type-17036", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75014,8 +75056,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-18634", +- "self_type" : "type-18643", ++ "referenced_type" : "type-18586", ++ "self_type" : "type-18595", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75023,8 +75065,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-18719", +- "self_type" : "type-18728", ++ "referenced_type" : "type-18671", ++ "self_type" : "type-18680", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75032,8 +75074,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-18910", +- "self_type" : "type-18919", ++ "referenced_type" : "type-18862", ++ "self_type" : "type-18871", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75041,8 +75083,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-19007", +- "self_type" : "type-19017", ++ "referenced_type" : "type-18959", ++ "self_type" : "type-18969", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75050,8 +75092,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-19248", +- "self_type" : "type-19260", ++ "referenced_type" : "type-19200", ++ "self_type" : "type-19212", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75059,8 +75101,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-19577", +- "self_type" : "type-19588", ++ "referenced_type" : "type-1937", ++ "self_type" : "type-1982", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75068,8 +75110,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-19749", +- "self_type" : "type-19758", ++ "referenced_type" : "type-19529", ++ "self_type" : "type-19540", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75077,8 +75119,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-19917", +- "self_type" : "type-19928", ++ "referenced_type" : "type-19701", ++ "self_type" : "type-19710", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75086,8 +75128,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-2011", +- "self_type" : "type-2052", ++ "referenced_type" : "type-19869", ++ "self_type" : "type-19880", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75095,8 +75137,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-20537", +- "self_type" : "type-20546", ++ "referenced_type" : "type-20489", ++ "self_type" : "type-20498", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75104,8 +75146,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-21606", +- "self_type" : "type-21616", ++ "referenced_type" : "type-21558", ++ "self_type" : "type-21568", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75113,8 +75155,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-23163", +- "self_type" : "type-23172", ++ "referenced_type" : "type-23147", ++ "self_type" : "type-23156", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75122,8 +75164,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-23248", +- "self_type" : "type-23257", ++ "referenced_type" : "type-23237", ++ "self_type" : "type-23247", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75131,8 +75173,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-23439", +- "self_type" : "type-23448", ++ "referenced_type" : "type-23419", ++ "self_type" : "type-23428", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75140,8 +75182,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-23536", +- "self_type" : "type-23546", ++ "referenced_type" : "type-23514", ++ "self_type" : "type-23524", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75149,8 +75191,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-23769", +- "self_type" : "type-23781", ++ "referenced_type" : "type-23756", ++ "self_type" : "type-23769", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75158,8 +75200,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-24047", +- "self_type" : "type-24058", ++ "referenced_type" : "type-24046", ++ "self_type" : "type-24055", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75167,8 +75209,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-24216", +- "self_type" : "type-24225", ++ "referenced_type" : "type-24220", ++ "self_type" : "type-24229", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75176,8 +75218,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-24382", +- "self_type" : "type-24391", ++ "referenced_type" : "type-24363", ++ "self_type" : "type-24372", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75185,8 +75227,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-24522", +- "self_type" : "type-24532", ++ "referenced_type" : "type-24500", ++ "self_type" : "type-24509", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75194,8 +75236,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-24804", +- "self_type" : "type-24813", ++ "referenced_type" : "type-2471", ++ "self_type" : "type-2480", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75203,8 +75245,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-24959", +- "self_type" : "type-24968", ++ "referenced_type" : "type-24763", ++ "self_type" : "type-24773", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75212,8 +75254,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-25090", +- "self_type" : "type-25099", ++ "referenced_type" : "type-24927", ++ "self_type" : "type-24936", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75221,8 +75263,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-2541", +- "self_type" : "type-2550", ++ "referenced_type" : "type-25061", ++ "self_type" : "type-25071", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75230,8 +75272,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-25716", +- "self_type" : "type-25725", ++ "referenced_type" : "type-25767", ++ "self_type" : "type-25776", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75239,8 +75281,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-26784", +- "self_type" : "type-26794", ++ "referenced_type" : "type-26807", ++ "self_type" : "type-26816", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75248,8 +75290,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-28348", +- "self_type" : "type-28357", ++ "referenced_type" : "type-28347", ++ "self_type" : "type-28356", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75257,8 +75299,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-28433", +- "self_type" : "type-28442", ++ "referenced_type" : "type-28432", ++ "self_type" : "type-28441", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75266,8 +75308,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-28624", +- "self_type" : "type-28633", ++ "referenced_type" : "type-28623", ++ "self_type" : "type-28632", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75275,8 +75317,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-28721", +- "self_type" : "type-28731", ++ "referenced_type" : "type-28720", ++ "self_type" : "type-28730", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75284,8 +75326,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-28954", +- "self_type" : "type-28966", ++ "referenced_type" : "type-28953", ++ "self_type" : "type-28965", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75293,8 +75335,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-29232", +- "self_type" : "type-29243", ++ "referenced_type" : "type-29231", ++ "self_type" : "type-29242", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75302,8 +75344,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-29401", +- "self_type" : "type-29410", ++ "referenced_type" : "type-29400", ++ "self_type" : "type-29409", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75311,8 +75353,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-29567", +- "self_type" : "type-29576", ++ "referenced_type" : "type-29566", ++ "self_type" : "type-29575", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75320,8 +75362,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-29707", +- "self_type" : "type-29717", ++ "referenced_type" : "type-29706", ++ "self_type" : "type-29716", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75329,8 +75371,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-29983", +- "self_type" : "type-29992", ++ "referenced_type" : "type-29982", ++ "self_type" : "type-29991", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75338,8 +75380,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-30115", +- "self_type" : "type-30124", ++ "referenced_type" : "type-30114", ++ "self_type" : "type-30123", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75347,8 +75389,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-30235", +- "self_type" : "type-30244", ++ "referenced_type" : "type-30234", ++ "self_type" : "type-30243", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75356,8 +75398,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-30862", +- "self_type" : "type-30871", ++ "referenced_type" : "type-30861", ++ "self_type" : "type-30870", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75365,8 +75407,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-31931", +- "self_type" : "type-31941", ++ "referenced_type" : "type-31930", ++ "self_type" : "type-31940", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75374,8 +75416,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-3579", +- "self_type" : "type-3588", ++ "referenced_type" : "type-3531", ++ "self_type" : "type-3540", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75383,8 +75425,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-5557", +- "self_type" : "type-5566", ++ "referenced_type" : "type-5509", ++ "self_type" : "type-5518", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75392,8 +75434,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-6731", +- "self_type" : "type-6741", ++ "referenced_type" : "type-6683", ++ "self_type" : "type-6693", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75401,8 +75443,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-8816", +- "self_type" : "type-8825", ++ "referenced_type" : "type-8768", ++ "self_type" : "type-8777", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75410,8 +75452,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions &", + "name" : "const google::protobuf::FileOptions &", +- "referenced_type" : "type-9886", +- "self_type" : "type-9896", ++ "referenced_type" : "type-9838", ++ "self_type" : "type-9848", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -75419,8 +75461,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *const &", + "name" : "const google::protobuf::FileOptions *const &", +- "referenced_type" : "type-4130", +- "self_type" : "type-4131", ++ "referenced_type" : "type-4082", ++ "self_type" : "type-4083", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -75428,8 +75470,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FloatValue &", + "name" : "const google::protobuf::FloatValue &", +- "referenced_type" : "type-11102", +- "self_type" : "type-11151", ++ "referenced_type" : "type-11054", ++ "self_type" : "type-11103", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, +@@ -75437,8 +75479,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FloatValue *const &", + "name" : "const google::protobuf::FloatValue *const &", +- "referenced_type" : "type-11100", +- "self_type" : "type-11103", ++ "referenced_type" : "type-11052", ++ "self_type" : "type-11055", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -75446,8 +75488,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::GeneratedCodeInfo &", + "name" : "const google::protobuf::GeneratedCodeInfo &", +- "referenced_type" : "type-2265", +- "self_type" : "type-2266", ++ "referenced_type" : "type-2194", ++ "self_type" : "type-2195", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -75455,8 +75497,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::GeneratedCodeInfo *const &", + "name" : "const google::protobuf::GeneratedCodeInfo *const &", +- "referenced_type" : "type-4154", +- "self_type" : "type-4155", ++ "referenced_type" : "type-4106", ++ "self_type" : "type-4107", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -75464,8 +75506,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::GeneratedCodeInfo_Annotation &", + "name" : "const google::protobuf::GeneratedCodeInfo_Annotation &", +- "referenced_type" : "type-1927", +- "self_type" : "type-2136", ++ "referenced_type" : "type-1848", ++ "self_type" : "type-2067", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -75473,8 +75515,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::GeneratedCodeInfo_Annotation *const &", + "name" : "const google::protobuf::GeneratedCodeInfo_Annotation *const &", +- "referenced_type" : "type-4152", +- "self_type" : "type-4153", ++ "referenced_type" : "type-4104", ++ "self_type" : "type-4105", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -75482,8 +75524,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Int32Value &", + "name" : "const google::protobuf::Int32Value &", +- "referenced_type" : "type-11114", +- "self_type" : "type-11157", ++ "referenced_type" : "type-11066", ++ "self_type" : "type-11109", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, +@@ -75491,8 +75533,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Int32Value *const &", + "name" : "const google::protobuf::Int32Value *const &", +- "referenced_type" : "type-11112", +- "self_type" : "type-11115", ++ "referenced_type" : "type-11064", ++ "self_type" : "type-11067", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -75500,8 +75542,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Int64Value &", + "name" : "const google::protobuf::Int64Value &", +- "referenced_type" : "type-11106", +- "self_type" : "type-11153", ++ "referenced_type" : "type-11058", ++ "self_type" : "type-11105", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, +@@ -75509,8 +75551,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Int64Value *const &", + "name" : "const google::protobuf::Int64Value *const &", +- "referenced_type" : "type-11104", +- "self_type" : "type-11107", ++ "referenced_type" : "type-11056", ++ "self_type" : "type-11059", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -75518,8 +75560,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ListValue &", + "name" : "const google::protobuf::ListValue &", +- "referenced_type" : "type-7283", +- "self_type" : "type-7282", ++ "referenced_type" : "type-7235", ++ "self_type" : "type-7234", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite_inl.h" + }, +@@ -75527,8 +75569,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ListValue *const &", + "name" : "const google::protobuf::ListValue *const &", +- "referenced_type" : "type-7605", +- "self_type" : "type-7607", ++ "referenced_type" : "type-7557", ++ "self_type" : "type-7559", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -75536,8 +75578,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map::InnerMap::iterator_base::KeyValuePair> &", + "name" : "const google::protobuf::Map::InnerMap::iterator_base::KeyValuePair> &", +- "referenced_type" : "type-6656", +- "self_type" : "type-6659", ++ "referenced_type" : "type-6608", ++ "self_type" : "type-6611", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -75545,8 +75587,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map::InnerMap::iterator_base::KeyValuePair> &", + "name" : "const google::protobuf::Map::InnerMap::iterator_base::KeyValuePair> &", +- "referenced_type" : "type-6661", +- "self_type" : "type-6663", ++ "referenced_type" : "type-6613", ++ "self_type" : "type-6615", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -75554,8 +75596,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map::KeyValuePair &", + "name" : "const google::protobuf::Map::KeyValuePair &", +- "referenced_type" : "type-6579", +- "self_type" : "type-6580", ++ "referenced_type" : "type-6531", ++ "self_type" : "type-6532", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -75563,8 +75605,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map::MapAllocator::KeyValuePair> &", + "name" : "const google::protobuf::Map::MapAllocator::KeyValuePair> &", +- "referenced_type" : "type-6562", +- "self_type" : "type-6563", ++ "referenced_type" : "type-6514", ++ "self_type" : "type-6515", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -75572,8 +75614,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map::MapAllocator &", + "name" : "const google::protobuf::Map::MapAllocator &", +- "referenced_type" : "type-6617", +- "self_type" : "type-6618", ++ "referenced_type" : "type-6569", ++ "self_type" : "type-6570", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -75581,8 +75623,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map::MapAllocator *> > &", + "name" : "const google::protobuf::Map::MapAllocator *> > &", +- "referenced_type" : "type-6603", +- "self_type" : "type-6604", ++ "referenced_type" : "type-6555", ++ "self_type" : "type-6556", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -75590,8 +75632,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map::MapAllocator *> > &", + "name" : "const google::protobuf::Map::MapAllocator *> > &", +- "referenced_type" : "type-6568", +- "self_type" : "type-6569", ++ "referenced_type" : "type-6520", ++ "self_type" : "type-6521", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -75599,8 +75641,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map::const_iterator &", + "name" : "const google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-6681", +- "self_type" : "type-6682", ++ "referenced_type" : "type-6633", ++ "self_type" : "type-6634", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -75608,8 +75650,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map::iterator &", + "name" : "const google::protobuf::Map::iterator &", +- "referenced_type" : "type-6696", +- "self_type" : "type-6699", ++ "referenced_type" : "type-6648", ++ "self_type" : "type-6651", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -75617,8 +75659,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map::iterator_base &", + "name" : "const google::protobuf::Map::iterator_base &", +- "referenced_type" : "type-6671", +- "self_type" : "type-6673", ++ "referenced_type" : "type-6623", ++ "self_type" : "type-6625", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -75626,8 +75668,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map, Value>::InnerMap::iterator_base, Value>::KeyValuePair> &", + "name" : "const google::protobuf::Map, Value>::InnerMap::iterator_base, Value>::KeyValuePair> &", +- "referenced_type" : "type-7501", +- "self_type" : "type-7504", ++ "referenced_type" : "type-7453", ++ "self_type" : "type-7456", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -75635,8 +75677,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map, Value>::InnerMap::iterator_base, Value>::KeyValuePair> &", + "name" : "const google::protobuf::Map, Value>::InnerMap::iterator_base, Value>::KeyValuePair> &", +- "referenced_type" : "type-7506", +- "self_type" : "type-7508", ++ "referenced_type" : "type-7458", ++ "self_type" : "type-7460", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -75644,8 +75686,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map, Value>::KeyValuePair &", + "name" : "const google::protobuf::Map, Value>::KeyValuePair &", +- "referenced_type" : "type-7420", +- "self_type" : "type-7421", ++ "referenced_type" : "type-7372", ++ "self_type" : "type-7373", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -75653,8 +75695,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map, Value>::MapAllocator, Value>::KeyValuePair> &", + "name" : "const google::protobuf::Map, Value>::MapAllocator, Value>::KeyValuePair> &", +- "referenced_type" : "type-7401", +- "self_type" : "type-7402", ++ "referenced_type" : "type-7353", ++ "self_type" : "type-7354", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -75662,8 +75704,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map, Value>::MapAllocator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *> > &", + "name" : "const google::protobuf::Map, Value>::MapAllocator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *> > &", +- "referenced_type" : "type-7444", +- "self_type" : "type-7445", ++ "referenced_type" : "type-7396", ++ "self_type" : "type-7397", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -75671,8 +75713,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map, Value>::MapAllocator, std::allocator > *> &", + "name" : "const google::protobuf::Map, Value>::MapAllocator, std::allocator > *> &", +- "referenced_type" : "type-7460", +- "self_type" : "type-7461", ++ "referenced_type" : "type-7412", ++ "self_type" : "type-7413", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -75680,8 +75722,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map, Value>::MapAllocator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *> > &", + "name" : "const google::protobuf::Map, Value>::MapAllocator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *> > &", +- "referenced_type" : "type-7406", +- "self_type" : "type-7407", ++ "referenced_type" : "type-7358", ++ "self_type" : "type-7359", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -75689,8 +75731,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map, Value>::const_iterator &", + "name" : "const google::protobuf::Map, Value>::const_iterator &", +- "referenced_type" : "type-7526", +- "self_type" : "type-7527", ++ "referenced_type" : "type-7478", ++ "self_type" : "type-7479", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -75698,8 +75740,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map, Value>::iterator &", + "name" : "const google::protobuf::Map, Value>::iterator &", +- "referenced_type" : "type-7542", +- "self_type" : "type-7545", ++ "referenced_type" : "type-7494", ++ "self_type" : "type-7497", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -75707,8 +75749,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map, Value>::iterator_base &", + "name" : "const google::protobuf::Map, Value>::iterator_base &", +- "referenced_type" : "type-7516", +- "self_type" : "type-7518", ++ "referenced_type" : "type-7468", ++ "self_type" : "type-7470", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -75716,8 +75758,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map &", + "name" : "const google::protobuf::Map &", +- "referenced_type" : "type-6700", +- "self_type" : "type-6792", ++ "referenced_type" : "type-6652", ++ "self_type" : "type-6744", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, +@@ -75725,8 +75767,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map, std::allocator >, google::protobuf::Value> &", + "name" : "const google::protobuf::Map, std::allocator >, google::protobuf::Value> &", +- "referenced_type" : "type-7309", +- "self_type" : "type-7308", ++ "referenced_type" : "type-7261", ++ "self_type" : "type-7260", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map_field_lite.h" + }, +@@ -75734,8 +75776,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapIterator &", + "name" : "const google::protobuf::MapIterator &", +- "referenced_type" : "type-4287", +- "self_type" : "type-4288", ++ "referenced_type" : "type-4239", ++ "self_type" : "type-4240", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, +@@ -75743,8 +75785,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-10106", +- "self_type" : "type-10108", ++ "referenced_type" : "type-10058", ++ "self_type" : "type-10060", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -75752,8 +75794,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-10247", +- "self_type" : "type-10249", ++ "referenced_type" : "type-10199", ++ "self_type" : "type-10201", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -75761,8 +75803,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-10589", +- "self_type" : "type-10591", ++ "referenced_type" : "type-10541", ++ "self_type" : "type-10543", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -75770,8 +75812,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-10747", +- "self_type" : "type-10749", ++ "referenced_type" : "type-10699", ++ "self_type" : "type-10701", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -75779,8 +75821,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-10835", +- "self_type" : "type-10837", ++ "referenced_type" : "type-10787", ++ "self_type" : "type-10789", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -75788,8 +75830,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-10924", +- "self_type" : "type-10926", ++ "referenced_type" : "type-10876", ++ "self_type" : "type-10878", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -75797,8 +75839,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-11008", +- "self_type" : "type-11010", ++ "referenced_type" : "type-10960", ++ "self_type" : "type-10962", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -75806,8 +75848,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-11084", +- "self_type" : "type-11086", ++ "referenced_type" : "type-11036", ++ "self_type" : "type-11038", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -75815,8 +75857,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-11277", +- "self_type" : "type-11279", ++ "referenced_type" : "type-11229", ++ "self_type" : "type-11231", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -75824,8 +75866,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-11434", +- "self_type" : "type-11436", ++ "referenced_type" : "type-11386", ++ "self_type" : "type-11388", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -75833,8 +75875,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-11892", +- "self_type" : "type-11894", ++ "referenced_type" : "type-11844", ++ "self_type" : "type-11846", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -75842,8 +75884,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-12063", +- "self_type" : "type-12065", ++ "referenced_type" : "type-12015", ++ "self_type" : "type-12017", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -75851,8 +75893,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-12167", +- "self_type" : "type-12169", ++ "referenced_type" : "type-12119", ++ "self_type" : "type-12121", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -75860,8 +75902,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-12306", +- "self_type" : "type-12308", ++ "referenced_type" : "type-12258", ++ "self_type" : "type-12260", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -75869,8 +75911,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-12453", +- "self_type" : "type-12455", ++ "referenced_type" : "type-12405", ++ "self_type" : "type-12407", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -75878,8 +75920,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-12546", +- "self_type" : "type-12548", ++ "referenced_type" : "type-12498", ++ "self_type" : "type-12500", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -75887,8 +75929,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-12647", +- "self_type" : "type-12649", ++ "referenced_type" : "type-12599", ++ "self_type" : "type-12601", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -75896,8 +75938,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-12829", +- "self_type" : "type-12831", ++ "referenced_type" : "type-12781", ++ "self_type" : "type-12783", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -75905,8 +75947,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-12909", +- "self_type" : "type-12911", ++ "referenced_type" : "type-12861", ++ "self_type" : "type-12863", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -75914,8 +75956,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-12967", +- "self_type" : "type-12969", ++ "referenced_type" : "type-12919", ++ "self_type" : "type-12921", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -75923,8 +75965,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-13439", +- "self_type" : "type-13441", ++ "referenced_type" : "type-13391", ++ "self_type" : "type-13393", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -75932,8 +75974,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-13538", +- "self_type" : "type-13540", ++ "referenced_type" : "type-13490", ++ "self_type" : "type-13492", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -75941,8 +75983,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-13880", +- "self_type" : "type-13882", ++ "referenced_type" : "type-13832", ++ "self_type" : "type-13834", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -75950,8 +75992,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-14038", +- "self_type" : "type-14040", ++ "referenced_type" : "type-13990", ++ "self_type" : "type-13992", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -75959,8 +76001,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-14126", +- "self_type" : "type-14128", ++ "referenced_type" : "type-14078", ++ "self_type" : "type-14080", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -75968,8 +76010,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-14215", +- "self_type" : "type-14217", ++ "referenced_type" : "type-14167", ++ "self_type" : "type-14169", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -75977,8 +76019,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-14299", +- "self_type" : "type-14301", ++ "referenced_type" : "type-14251", ++ "self_type" : "type-14253", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -75986,8 +76028,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-14366", +- "self_type" : "type-14368", ++ "referenced_type" : "type-14318", ++ "self_type" : "type-14320", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -75995,8 +76037,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-14528", +- "self_type" : "type-14530", ++ "referenced_type" : "type-14480", ++ "self_type" : "type-14482", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76004,8 +76046,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-14653", +- "self_type" : "type-14655", ++ "referenced_type" : "type-14605", ++ "self_type" : "type-14607", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76013,8 +76055,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-14788", +- "self_type" : "type-14790", ++ "referenced_type" : "type-14740", ++ "self_type" : "type-14742", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76022,8 +76064,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-14886", +- "self_type" : "type-14888", ++ "referenced_type" : "type-14838", ++ "self_type" : "type-14840", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76031,8 +76073,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-15246", +- "self_type" : "type-15248", ++ "referenced_type" : "type-15198", ++ "self_type" : "type-15200", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76040,8 +76082,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-15749", +- "self_type" : "type-15751", ++ "referenced_type" : "type-15701", ++ "self_type" : "type-15703", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76049,8 +76091,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-15919", +- "self_type" : "type-15921", ++ "referenced_type" : "type-15871", ++ "self_type" : "type-15873", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76058,8 +76100,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-16022", +- "self_type" : "type-16024", ++ "referenced_type" : "type-15974", ++ "self_type" : "type-15976", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76067,8 +76109,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-16161", +- "self_type" : "type-16163", ++ "referenced_type" : "type-16113", ++ "self_type" : "type-16115", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76076,8 +76118,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-16310", +- "self_type" : "type-16312", ++ "referenced_type" : "type-16262", ++ "self_type" : "type-16264", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76085,8 +76127,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-16403", +- "self_type" : "type-16405", ++ "referenced_type" : "type-16355", ++ "self_type" : "type-16357", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76094,8 +76136,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-16503", +- "self_type" : "type-16505", ++ "referenced_type" : "type-16455", ++ "self_type" : "type-16457", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76103,8 +76145,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-16685", +- "self_type" : "type-16687", ++ "referenced_type" : "type-16637", ++ "self_type" : "type-16639", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76112,8 +76154,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-16765", +- "self_type" : "type-16767", ++ "referenced_type" : "type-16717", ++ "self_type" : "type-16719", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76121,8 +76163,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-16823", +- "self_type" : "type-16825", ++ "referenced_type" : "type-16775", ++ "self_type" : "type-16777", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76130,8 +76172,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-17295", +- "self_type" : "type-17297", ++ "referenced_type" : "type-17247", ++ "self_type" : "type-17249", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76139,8 +76181,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-17402", +- "self_type" : "type-17404", ++ "referenced_type" : "type-17354", ++ "self_type" : "type-17356", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76148,8 +76190,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-17744", +- "self_type" : "type-17746", ++ "referenced_type" : "type-17696", ++ "self_type" : "type-17698", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76157,8 +76199,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-17902", +- "self_type" : "type-17904", ++ "referenced_type" : "type-17854", ++ "self_type" : "type-17856", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76166,8 +76208,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-17990", +- "self_type" : "type-17992", ++ "referenced_type" : "type-17942", ++ "self_type" : "type-17944", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76175,8 +76217,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-18079", +- "self_type" : "type-18081", ++ "referenced_type" : "type-18031", ++ "self_type" : "type-18033", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76184,8 +76226,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-18163", +- "self_type" : "type-18165", ++ "referenced_type" : "type-18115", ++ "self_type" : "type-18117", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76193,8 +76235,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-18230", +- "self_type" : "type-18232", ++ "referenced_type" : "type-18182", ++ "self_type" : "type-18184", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76202,8 +76244,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-18392", +- "self_type" : "type-18394", ++ "referenced_type" : "type-18344", ++ "self_type" : "type-18346", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76211,8 +76253,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-18517", +- "self_type" : "type-18519", ++ "referenced_type" : "type-18469", ++ "self_type" : "type-18471", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76220,8 +76262,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-18652", +- "self_type" : "type-18654", ++ "referenced_type" : "type-18604", ++ "self_type" : "type-18606", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76229,8 +76271,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-18743", +- "self_type" : "type-18745", ++ "referenced_type" : "type-18695", ++ "self_type" : "type-18697", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76238,8 +76280,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-19022", +- "self_type" : "type-19024", ++ "referenced_type" : "type-18974", ++ "self_type" : "type-18976", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76247,8 +76289,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-19265", +- "self_type" : "type-19267", ++ "referenced_type" : "type-19217", ++ "self_type" : "type-19219", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76256,8 +76298,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-19416", +- "self_type" : "type-19418", ++ "referenced_type" : "type-19368", ++ "self_type" : "type-19370", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76265,8 +76307,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-19603", +- "self_type" : "type-19605", ++ "referenced_type" : "type-19555", ++ "self_type" : "type-19557", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76274,8 +76316,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-19774", +- "self_type" : "type-19776", ++ "referenced_type" : "type-19726", ++ "self_type" : "type-19728", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76283,8 +76325,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-19933", +- "self_type" : "type-19935", ++ "referenced_type" : "type-19885", ++ "self_type" : "type-19887", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76292,8 +76334,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-20282", +- "self_type" : "type-20284", ++ "referenced_type" : "type-20234", ++ "self_type" : "type-20236", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76301,8 +76343,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-20453", +- "self_type" : "type-20455", ++ "referenced_type" : "type-20405", ++ "self_type" : "type-20407", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76310,8 +76352,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-20554", +- "self_type" : "type-20556", ++ "referenced_type" : "type-20506", ++ "self_type" : "type-20508", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76319,8 +76361,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-20692", +- "self_type" : "type-20694", ++ "referenced_type" : "type-20644", ++ "self_type" : "type-20646", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76328,8 +76370,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-20841", +- "self_type" : "type-20843", ++ "referenced_type" : "type-2075", ++ "self_type" : "type-2078", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76337,8 +76379,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-20934", +- "self_type" : "type-20936", ++ "referenced_type" : "type-20793", ++ "self_type" : "type-20795", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76346,8 +76388,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-21035", +- "self_type" : "type-21037", ++ "referenced_type" : "type-20886", ++ "self_type" : "type-20888", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76355,8 +76397,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-21217", +- "self_type" : "type-21219", ++ "referenced_type" : "type-20987", ++ "self_type" : "type-20989", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76364,8 +76406,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-21297", +- "self_type" : "type-21299", ++ "referenced_type" : "type-21169", ++ "self_type" : "type-21171", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76373,8 +76415,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-21355", +- "self_type" : "type-21357", ++ "referenced_type" : "type-21249", ++ "self_type" : "type-21251", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76382,8 +76424,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-2144", +- "self_type" : "type-2147", ++ "referenced_type" : "type-21307", ++ "self_type" : "type-21309", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76391,8 +76433,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-21827", +- "self_type" : "type-21829", ++ "referenced_type" : "type-21779", ++ "self_type" : "type-21781", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76409,8 +76451,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-22273", +- "self_type" : "type-22275", ++ "referenced_type" : "type-22246", ++ "self_type" : "type-22248", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76418,8 +76460,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-22431", +- "self_type" : "type-22433", ++ "referenced_type" : "type-22378", ++ "self_type" : "type-22380", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76427,8 +76469,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-22519", +- "self_type" : "type-22521", ++ "referenced_type" : "type-22436", ++ "self_type" : "type-22438", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76436,8 +76478,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-22608", +- "self_type" : "type-22610", ++ "referenced_type" : "type-22517", ++ "self_type" : "type-22519", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76445,8 +76487,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-22692", +- "self_type" : "type-22694", ++ "referenced_type" : "type-22616", ++ "self_type" : "type-22618", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76454,8 +76496,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-22759", +- "self_type" : "type-22761", ++ "referenced_type" : "type-22702", ++ "self_type" : "type-22704", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76463,8 +76505,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-22921", +- "self_type" : "type-22923", ++ "referenced_type" : "type-22885", ++ "self_type" : "type-22887", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76472,8 +76514,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-23046", +- "self_type" : "type-23048", ++ "referenced_type" : "type-23028", ++ "self_type" : "type-23030", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76481,8 +76523,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-23181", +- "self_type" : "type-23183", ++ "referenced_type" : "type-23166", ++ "self_type" : "type-23168", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76490,8 +76532,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-23272", +- "self_type" : "type-23274", ++ "referenced_type" : "type-23264", ++ "self_type" : "type-23266", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76499,8 +76541,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-23551", +- "self_type" : "type-23553", ++ "referenced_type" : "type-23531", ++ "self_type" : "type-23533", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76508,8 +76550,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-23786", +- "self_type" : "type-23788", ++ "referenced_type" : "type-2363", ++ "self_type" : "type-2365", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76517,8 +76559,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-23916", +- "self_type" : "type-23918", ++ "referenced_type" : "type-23773", ++ "self_type" : "type-23777", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76526,8 +76568,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-24073", +- "self_type" : "type-24075", ++ "referenced_type" : "type-23917", ++ "self_type" : "type-23919", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76535,8 +76577,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-24241", +- "self_type" : "type-24243", ++ "referenced_type" : "type-24071", ++ "self_type" : "type-24073", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76544,8 +76586,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-2433", +- "self_type" : "type-2435", ++ "referenced_type" : "type-24245", ++ "self_type" : "type-24247", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76553,8 +76595,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-24396", +- "self_type" : "type-24398", ++ "referenced_type" : "type-24377", ++ "self_type" : "type-24379", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76562,8 +76604,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-24551", +- "self_type" : "type-24553", ++ "referenced_type" : "type-24521", ++ "self_type" : "type-24523", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76571,8 +76613,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-24687", +- "self_type" : "type-24689", ++ "referenced_type" : "type-24649", ++ "self_type" : "type-24651", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76580,8 +76622,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-24818", +- "self_type" : "type-24820", ++ "referenced_type" : "type-24778", ++ "self_type" : "type-24780", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76589,8 +76631,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-24977", +- "self_type" : "type-24979", ++ "referenced_type" : "type-2488", ++ "self_type" : "type-2490", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76598,8 +76640,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-25104", +- "self_type" : "type-25106", ++ "referenced_type" : "type-24944", ++ "self_type" : "type-24946", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76607,8 +76649,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-25202", +- "self_type" : "type-25204", ++ "referenced_type" : "type-25077", ++ "self_type" : "type-25079", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76616,8 +76658,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-25458", +- "self_type" : "type-25460", ++ "referenced_type" : "type-25202", ++ "self_type" : "type-25204", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76625,8 +76667,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-2556", +- "self_type" : "type-2558", ++ "referenced_type" : "type-25509", ++ "self_type" : "type-25511", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76634,8 +76676,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-25629", +- "self_type" : "type-25631", ++ "referenced_type" : "type-25680", ++ "self_type" : "type-25682", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76643,8 +76685,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-25733", +- "self_type" : "type-25735", ++ "referenced_type" : "type-25782", ++ "self_type" : "type-25784", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76652,8 +76694,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-25871", +- "self_type" : "type-25873", ++ "referenced_type" : "type-25922", ++ "self_type" : "type-25924", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76661,8 +76703,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-26019", +- "self_type" : "type-26021", ++ "referenced_type" : "type-26072", ++ "self_type" : "type-26074", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76670,8 +76712,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-26112", +- "self_type" : "type-26114", ++ "referenced_type" : "type-26157", ++ "self_type" : "type-26159", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76679,8 +76721,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-26213", +- "self_type" : "type-26215", ++ "referenced_type" : "type-26255", ++ "self_type" : "type-26257", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76688,8 +76730,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-26395", +- "self_type" : "type-26397", ++ "referenced_type" : "type-26437", ++ "self_type" : "type-26439", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76697,8 +76739,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-26475", +- "self_type" : "type-26477", ++ "referenced_type" : "type-26511", ++ "self_type" : "type-26513", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76706,8 +76748,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-26533", +- "self_type" : "type-26535", ++ "referenced_type" : "type-26558", ++ "self_type" : "type-26560", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76715,8 +76757,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-27005", +- "self_type" : "type-27007", ++ "referenced_type" : "type-27035", ++ "self_type" : "type-27037", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76724,8 +76766,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-27116", +- "self_type" : "type-27118", ++ "referenced_type" : "type-27115", ++ "self_type" : "type-27117", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76733,8 +76775,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-27458", +- "self_type" : "type-27460", ++ "referenced_type" : "type-27457", ++ "self_type" : "type-27459", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76742,8 +76784,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-27616", +- "self_type" : "type-27618", ++ "referenced_type" : "type-27615", ++ "self_type" : "type-27617", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76751,8 +76793,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-27704", +- "self_type" : "type-27706", ++ "referenced_type" : "type-27703", ++ "self_type" : "type-27705", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76760,8 +76802,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-27793", +- "self_type" : "type-27795", ++ "referenced_type" : "type-27792", ++ "self_type" : "type-27794", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76769,8 +76811,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-27877", +- "self_type" : "type-27879", ++ "referenced_type" : "type-27876", ++ "self_type" : "type-27878", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76778,8 +76820,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-27944", +- "self_type" : "type-27946", ++ "referenced_type" : "type-27943", ++ "self_type" : "type-27945", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76787,8 +76829,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-28106", +- "self_type" : "type-28108", ++ "referenced_type" : "type-28105", ++ "self_type" : "type-28107", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76796,8 +76838,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-28231", +- "self_type" : "type-28233", ++ "referenced_type" : "type-28230", ++ "self_type" : "type-28232", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76805,8 +76847,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-28366", +- "self_type" : "type-28368", ++ "referenced_type" : "type-28365", ++ "self_type" : "type-28367", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76814,8 +76856,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-28457", +- "self_type" : "type-28459", ++ "referenced_type" : "type-28456", ++ "self_type" : "type-28458", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76823,8 +76865,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-28736", +- "self_type" : "type-28738", ++ "referenced_type" : "type-28735", ++ "self_type" : "type-28737", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76832,8 +76874,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-28971", +- "self_type" : "type-28973", ++ "referenced_type" : "type-28970", ++ "self_type" : "type-28972", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76841,8 +76883,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-29101", +- "self_type" : "type-29103", ++ "referenced_type" : "type-29100", ++ "self_type" : "type-29102", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76850,8 +76892,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-29258", +- "self_type" : "type-29260", ++ "referenced_type" : "type-29257", ++ "self_type" : "type-29259", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76859,8 +76901,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-29426", +- "self_type" : "type-29428", ++ "referenced_type" : "type-29425", ++ "self_type" : "type-29427", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76868,8 +76910,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-29581", +- "self_type" : "type-29583", ++ "referenced_type" : "type-29580", ++ "self_type" : "type-29582", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76877,8 +76919,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-29736", +- "self_type" : "type-29738", ++ "referenced_type" : "type-29735", ++ "self_type" : "type-29737", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76886,8 +76928,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-29868", +- "self_type" : "type-29870", ++ "referenced_type" : "type-29867", ++ "self_type" : "type-29869", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76895,8 +76937,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-29997", +- "self_type" : "type-29999", ++ "referenced_type" : "type-29996", ++ "self_type" : "type-29998", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76904,8 +76946,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-30133", +- "self_type" : "type-30135", ++ "referenced_type" : "type-30132", ++ "self_type" : "type-30134", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76913,8 +76955,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-30249", +- "self_type" : "type-30251", ++ "referenced_type" : "type-30248", ++ "self_type" : "type-30250", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76922,8 +76964,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-30346", +- "self_type" : "type-30348", ++ "referenced_type" : "type-30345", ++ "self_type" : "type-30347", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76931,8 +76973,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-30604", +- "self_type" : "type-30606", ++ "referenced_type" : "type-30603", ++ "self_type" : "type-30605", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76940,8 +76982,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-30775", +- "self_type" : "type-30777", ++ "referenced_type" : "type-30774", ++ "self_type" : "type-30776", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76949,8 +76991,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-30879", +- "self_type" : "type-30881", ++ "referenced_type" : "type-30878", ++ "self_type" : "type-30880", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76958,8 +77000,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-31017", +- "self_type" : "type-31019", ++ "referenced_type" : "type-31016", ++ "self_type" : "type-31018", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76967,8 +77009,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-31166", +- "self_type" : "type-31168", ++ "referenced_type" : "type-31165", ++ "self_type" : "type-31167", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76976,8 +77018,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-31259", +- "self_type" : "type-31261", ++ "referenced_type" : "type-31258", ++ "self_type" : "type-31260", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76985,8 +77027,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-31360", +- "self_type" : "type-31362", ++ "referenced_type" : "type-31359", ++ "self_type" : "type-31361", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -76994,8 +77036,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-31542", +- "self_type" : "type-31544", ++ "referenced_type" : "type-31541", ++ "self_type" : "type-31543", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77003,8 +77045,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-31622", +- "self_type" : "type-31624", ++ "referenced_type" : "type-31621", ++ "self_type" : "type-31623", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77012,8 +77054,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-31680", +- "self_type" : "type-31682", ++ "referenced_type" : "type-31679", ++ "self_type" : "type-31681", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77021,8 +77063,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-32152", +- "self_type" : "type-32154", ++ "referenced_type" : "type-32151", ++ "self_type" : "type-32153", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77030,8 +77072,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-3309", +- "self_type" : "type-3311", ++ "referenced_type" : "type-3261", ++ "self_type" : "type-3263", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77039,8 +77081,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-3486", +- "self_type" : "type-3488", ++ "referenced_type" : "type-3438", ++ "self_type" : "type-3440", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77048,8 +77090,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-3596", +- "self_type" : "type-3598", ++ "referenced_type" : "type-3548", ++ "self_type" : "type-3550", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77057,8 +77099,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-3786", +- "self_type" : "type-3788", ++ "referenced_type" : "type-3738", ++ "self_type" : "type-3740", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77066,8 +77108,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-3956", +- "self_type" : "type-3958", ++ "referenced_type" : "type-3908", ++ "self_type" : "type-3910", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77075,8 +77117,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-4098", +- "self_type" : "type-4100", ++ "referenced_type" : "type-4050", ++ "self_type" : "type-4052", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77084,8 +77126,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-4202", +- "self_type" : "type-4204", ++ "referenced_type" : "type-4154", ++ "self_type" : "type-4156", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77093,8 +77135,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-4359", +- "self_type" : "type-4360", ++ "referenced_type" : "type-4311", ++ "self_type" : "type-4312", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77102,8 +77144,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-4416", +- "self_type" : "type-4418", ++ "referenced_type" : "type-4368", ++ "self_type" : "type-4370", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77111,8 +77153,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-4497", +- "self_type" : "type-4499", ++ "referenced_type" : "type-4449", ++ "self_type" : "type-4451", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77120,8 +77162,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-4663", +- "self_type" : "type-4665", ++ "referenced_type" : "type-4615", ++ "self_type" : "type-4617", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77129,8 +77171,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-5289", +- "self_type" : "type-5291", ++ "referenced_type" : "type-5241", ++ "self_type" : "type-5243", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77138,8 +77180,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-5466", +- "self_type" : "type-5468", ++ "referenced_type" : "type-5418", ++ "self_type" : "type-5420", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77147,8 +77189,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-5574", +- "self_type" : "type-5576", ++ "referenced_type" : "type-5526", ++ "self_type" : "type-5528", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77156,8 +77198,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-5715", +- "self_type" : "type-5717", ++ "referenced_type" : "type-5667", ++ "self_type" : "type-5669", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77165,8 +77207,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-5864", +- "self_type" : "type-5866", ++ "referenced_type" : "type-5816", ++ "self_type" : "type-5818", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77174,8 +77216,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-5957", +- "self_type" : "type-5959", ++ "referenced_type" : "type-5909", ++ "self_type" : "type-5911", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77183,8 +77225,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-6058", +- "self_type" : "type-6060", ++ "referenced_type" : "type-6010", ++ "self_type" : "type-6012", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77192,8 +77234,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-6240", +- "self_type" : "type-6242", ++ "referenced_type" : "type-6192", ++ "self_type" : "type-6194", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77201,8 +77243,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-6320", +- "self_type" : "type-6322", ++ "referenced_type" : "type-6272", ++ "self_type" : "type-6274", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77210,8 +77252,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-6381", +- "self_type" : "type-6383", ++ "referenced_type" : "type-6333", ++ "self_type" : "type-6335", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77219,8 +77261,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-7033", +- "self_type" : "type-7035", ++ "referenced_type" : "type-6985", ++ "self_type" : "type-6987", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77228,8 +77270,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-7159", +- "self_type" : "type-7161", ++ "referenced_type" : "type-7111", ++ "self_type" : "type-7113", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77237,8 +77279,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-7674", +- "self_type" : "type-7676", ++ "referenced_type" : "type-7626", ++ "self_type" : "type-7628", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77246,8 +77288,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-7832", +- "self_type" : "type-7834", ++ "referenced_type" : "type-7784", ++ "self_type" : "type-7786", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77255,8 +77297,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-7937", +- "self_type" : "type-7939", ++ "referenced_type" : "type-7889", ++ "self_type" : "type-7891", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77264,8 +77306,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-8025", +- "self_type" : "type-8027", ++ "referenced_type" : "type-7977", ++ "self_type" : "type-7979", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77273,8 +77315,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-8109", +- "self_type" : "type-8111", ++ "referenced_type" : "type-8061", ++ "self_type" : "type-8063", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77282,8 +77324,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-8563", +- "self_type" : "type-8565", ++ "referenced_type" : "type-8515", ++ "self_type" : "type-8517", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77291,8 +77333,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-8731", +- "self_type" : "type-8733", ++ "referenced_type" : "type-8683", ++ "self_type" : "type-8685", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77300,8 +77342,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-8833", +- "self_type" : "type-8835", ++ "referenced_type" : "type-8785", ++ "self_type" : "type-8787", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77309,8 +77351,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-8972", +- "self_type" : "type-8974", ++ "referenced_type" : "type-8924", ++ "self_type" : "type-8926", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77318,8 +77360,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-9121", +- "self_type" : "type-9123", ++ "referenced_type" : "type-9073", ++ "self_type" : "type-9075", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77327,8 +77369,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-9214", +- "self_type" : "type-9216", ++ "referenced_type" : "type-9166", ++ "self_type" : "type-9168", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77336,8 +77378,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-9315", +- "self_type" : "type-9317", ++ "referenced_type" : "type-9267", ++ "self_type" : "type-9269", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77345,8 +77387,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-9497", +- "self_type" : "type-9499", ++ "referenced_type" : "type-9449", ++ "self_type" : "type-9451", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77354,8 +77396,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-9577", +- "self_type" : "type-9579", ++ "referenced_type" : "type-9529", ++ "self_type" : "type-9531", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77363,8 +77405,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey &", + "name" : "const google::protobuf::MapKey &", +- "referenced_type" : "type-9635", +- "self_type" : "type-9637", ++ "referenced_type" : "type-9587", ++ "self_type" : "type-9589", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -77372,8 +77414,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapPair &", + "name" : "const google::protobuf::MapPair &", +- "referenced_type" : "type-6684", +- "self_type" : "type-6683", ++ "referenced_type" : "type-6636", ++ "self_type" : "type-6635", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -77381,8 +77423,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapPair, std::allocator >, google::protobuf::Value> &", + "name" : "const google::protobuf::MapPair, std::allocator >, google::protobuf::Value> &", +- "referenced_type" : "type-7529", +- "self_type" : "type-7528", ++ "referenced_type" : "type-7481", ++ "self_type" : "type-7480", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -77390,8 +77432,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapValueRef &", + "name" : "const google::protobuf::MapValueRef &", +- "referenced_type" : "type-4243", +- "self_type" : "type-4245", ++ "referenced_type" : "type-4195", ++ "self_type" : "type-4197", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -77399,8 +77441,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-10440", +- "self_type" : "type-10439", ++ "referenced_type" : "type-10392", ++ "self_type" : "type-10391", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77408,8 +77450,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-11172", +- "self_type" : "type-11171", ++ "referenced_type" : "type-11124", ++ "self_type" : "type-11123", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77417,8 +77459,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-11535", +- "self_type" : "type-11534", ++ "referenced_type" : "type-11487", ++ "self_type" : "type-11486", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77426,8 +77468,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-11547", +- "self_type" : "type-11546", ++ "referenced_type" : "type-11499", ++ "self_type" : "type-11498", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77435,8 +77477,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-1318", +- "self_type" : "type-1317", ++ "referenced_type" : "type-1230", ++ "self_type" : "type-1229", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77444,8 +77486,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-13731", +- "self_type" : "type-13730", ++ "referenced_type" : "type-13683", ++ "self_type" : "type-13682", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77453,8 +77495,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-14436", +- "self_type" : "type-14435", ++ "referenced_type" : "type-1384", ++ "self_type" : "type-1383", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77462,8 +77504,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-1467", +- "self_type" : "type-1466", ++ "referenced_type" : "type-1438", ++ "self_type" : "type-1437", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77471,8 +77513,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-15001", +- "self_type" : "type-15000", ++ "referenced_type" : "type-14388", ++ "self_type" : "type-14387", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77480,8 +77522,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-15124", +- "self_type" : "type-15123", ++ "referenced_type" : "type-1450", ++ "self_type" : "type-1449", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77489,8 +77531,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-1520", +- "self_type" : "type-1519", ++ "referenced_type" : "type-14953", ++ "self_type" : "type-14952", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77498,8 +77540,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-1532", +- "self_type" : "type-1531", ++ "referenced_type" : "type-15076", ++ "self_type" : "type-15075", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77507,8 +77549,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-17595", +- "self_type" : "type-17594", ++ "referenced_type" : "type-17547", ++ "self_type" : "type-17546", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77516,8 +77558,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-18300", +- "self_type" : "type-18299", ++ "referenced_type" : "type-1790", ++ "self_type" : "type-1789", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77525,8 +77567,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-1872", +- "self_type" : "type-1871", ++ "referenced_type" : "type-18252", ++ "self_type" : "type-18251", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77534,8 +77576,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-18820", +- "self_type" : "type-18819", ++ "referenced_type" : "type-18772", ++ "self_type" : "type-18771", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77543,8 +77585,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-18908", +- "self_type" : "type-18907", ++ "referenced_type" : "type-18860", ++ "self_type" : "type-18859", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77552,8 +77594,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-22124", +- "self_type" : "type-22123", ++ "referenced_type" : "type-22643", ++ "self_type" : "type-22642", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77561,8 +77603,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-22829", +- "self_type" : "type-22828", ++ "referenced_type" : "type-23657", ++ "self_type" : "type-23656", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77570,8 +77612,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-23349", +- "self_type" : "type-23348", ++ "referenced_type" : "type-24147", ++ "self_type" : "type-24146", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77579,8 +77621,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-23437", +- "self_type" : "type-23436", ++ "referenced_type" : "type-24239", ++ "self_type" : "type-24238", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77588,8 +77630,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-27309", +- "self_type" : "type-27308", ++ "referenced_type" : "type-2692", ++ "self_type" : "type-2691", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77597,8 +77639,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-2740", +- "self_type" : "type-2739", ++ "referenced_type" : "type-27308", ++ "self_type" : "type-27307", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77606,8 +77648,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-28014", +- "self_type" : "type-28013", ++ "referenced_type" : "type-28013", ++ "self_type" : "type-28012", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77615,8 +77657,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-28534", +- "self_type" : "type-28533", ++ "referenced_type" : "type-2846", ++ "self_type" : "type-2845", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77624,8 +77666,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-28622", +- "self_type" : "type-28621", ++ "referenced_type" : "type-28533", ++ "self_type" : "type-28532", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77633,8 +77675,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-2894", +- "self_type" : "type-2893", ++ "referenced_type" : "type-28621", ++ "self_type" : "type-28620", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77642,8 +77684,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-2948", +- "self_type" : "type-2947", ++ "referenced_type" : "type-2900", ++ "self_type" : "type-2899", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77651,8 +77693,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-2960", +- "self_type" : "type-2959", ++ "referenced_type" : "type-2912", ++ "self_type" : "type-2911", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77660,8 +77702,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-4720", +- "self_type" : "type-4719", ++ "referenced_type" : "type-4672", ++ "self_type" : "type-4671", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77678,8 +77720,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-4874", +- "self_type" : "type-4873", ++ "referenced_type" : "type-4826", ++ "self_type" : "type-4825", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77687,8 +77729,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-4928", +- "self_type" : "type-4927", ++ "referenced_type" : "type-4880", ++ "self_type" : "type-4879", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77696,8 +77738,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-4940", +- "self_type" : "type-4939", ++ "referenced_type" : "type-4892", ++ "self_type" : "type-4891", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77714,8 +77756,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-7499", +- "self_type" : "type-7498", ++ "referenced_type" : "type-7451", ++ "self_type" : "type-7450", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77723,8 +77765,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-812", +- "self_type" : "type-811", ++ "referenced_type" : "type-8102", ++ "self_type" : "type-8101", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77732,8 +77774,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-8150", +- "self_type" : "type-8149", ++ "referenced_type" : "type-812", ++ "self_type" : "type-811", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77741,8 +77783,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-8204", +- "self_type" : "type-8203", ++ "referenced_type" : "type-8156", ++ "self_type" : "type-8155", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77750,8 +77792,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message &", + "name" : "const google::protobuf::Message &", +- "referenced_type" : "type-8216", +- "self_type" : "type-8215", ++ "referenced_type" : "type-8168", ++ "self_type" : "type-8167", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77768,8 +77810,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message *&", + "name" : "const google::protobuf::Message *&", +- "referenced_type" : "type-2056", +- "self_type" : "type-7694", ++ "referenced_type" : "type-1986", ++ "self_type" : "type-7646", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -77777,8 +77819,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message *const &", + "name" : "const google::protobuf::Message *const &", +- "referenced_type" : "type-6489", +- "self_type" : "type-6488", ++ "referenced_type" : "type-6441", ++ "self_type" : "type-6440", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -77795,8 +77837,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-12128", +- "self_type" : "type-12127", ++ "referenced_type" : "type-12080", ++ "self_type" : "type-12079", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77804,8 +77846,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-13192", +- "self_type" : "type-13197", ++ "referenced_type" : "type-13144", ++ "self_type" : "type-13149", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77813,8 +77855,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-14744", +- "self_type" : "type-14748", ++ "referenced_type" : "type-14696", ++ "self_type" : "type-14700", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77822,8 +77864,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-14833", +- "self_type" : "type-14839", ++ "referenced_type" : "type-14785", ++ "self_type" : "type-14791", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77831,8 +77873,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-15097", +- "self_type" : "type-15102", ++ "referenced_type" : "type-15049", ++ "self_type" : "type-15054", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77840,8 +77882,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-15191", +- "self_type" : "type-15197", ++ "referenced_type" : "type-15143", ++ "self_type" : "type-15149", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77849,8 +77891,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-15983", +- "self_type" : "type-15982", ++ "referenced_type" : "type-15935", ++ "self_type" : "type-15934", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77858,8 +77900,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-17048", +- "self_type" : "type-17053", ++ "referenced_type" : "type-17000", ++ "self_type" : "type-17005", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77867,8 +77909,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-18608", +- "self_type" : "type-18612", ++ "referenced_type" : "type-18560", ++ "self_type" : "type-18564", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77876,8 +77918,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-18690", +- "self_type" : "type-18696", ++ "referenced_type" : "type-18642", ++ "self_type" : "type-18648", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77885,8 +77927,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-18881", +- "self_type" : "type-18886", ++ "referenced_type" : "type-18833", ++ "self_type" : "type-18838", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77894,8 +77936,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-18975", +- "self_type" : "type-18981", ++ "referenced_type" : "type-18927", ++ "self_type" : "type-18933", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77903,8 +77945,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-19215", +- "self_type" : "type-19222", ++ "referenced_type" : "type-19167", ++ "self_type" : "type-19174", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77912,8 +77954,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-19552", +- "self_type" : "type-19556", ++ "referenced_type" : "type-1944", ++ "self_type" : "type-1955", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77921,8 +77963,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-19721", +- "self_type" : "type-19725", ++ "referenced_type" : "type-19504", ++ "self_type" : "type-19508", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77930,8 +77972,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-19883", +- "self_type" : "type-19889", ++ "referenced_type" : "type-19673", ++ "self_type" : "type-19677", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77939,8 +77981,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-2018", +- "self_type" : "type-2026", ++ "referenced_type" : "type-19835", ++ "self_type" : "type-19841", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77948,8 +77990,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-20515", +- "self_type" : "type-20514", ++ "referenced_type" : "type-20467", ++ "self_type" : "type-20466", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77957,8 +77999,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-21580", +- "self_type" : "type-21585", ++ "referenced_type" : "type-21532", ++ "self_type" : "type-21537", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77966,8 +78008,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-23137", +- "self_type" : "type-23141", ++ "referenced_type" : "type-23122", ++ "self_type" : "type-23126", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77975,8 +78017,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-23219", +- "self_type" : "type-23225", ++ "referenced_type" : "type-23207", ++ "self_type" : "type-23212", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77984,8 +78026,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-23410", +- "self_type" : "type-23415", ++ "referenced_type" : "type-23393", ++ "self_type" : "type-23398", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -77993,8 +78035,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-23504", +- "self_type" : "type-23510", ++ "referenced_type" : "type-23482", ++ "self_type" : "type-23488", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78002,8 +78044,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-23736", +- "self_type" : "type-23743", ++ "referenced_type" : "type-23724", ++ "self_type" : "type-23730", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78011,8 +78053,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-24022", +- "self_type" : "type-24026", ++ "referenced_type" : "type-24019", ++ "self_type" : "type-24023", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78020,8 +78062,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-24188", +- "self_type" : "type-24192", ++ "referenced_type" : "type-24193", ++ "self_type" : "type-24197", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78029,8 +78071,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-24350", +- "self_type" : "type-24356", ++ "referenced_type" : "type-24333", ++ "self_type" : "type-24339", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78038,8 +78080,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-24492", +- "self_type" : "type-24496", ++ "referenced_type" : "type-24471", ++ "self_type" : "type-24475", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78047,8 +78089,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-24778", +- "self_type" : "type-24782", ++ "referenced_type" : "type-2449", ++ "self_type" : "type-2448", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78056,8 +78098,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-24934", +- "self_type" : "type-24938", ++ "referenced_type" : "type-24734", ++ "self_type" : "type-24738", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78065,8 +78107,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-25063", +- "self_type" : "type-25067", ++ "referenced_type" : "type-24902", ++ "self_type" : "type-24906", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78074,8 +78116,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-2519", +- "self_type" : "type-2518", ++ "referenced_type" : "type-25034", ++ "self_type" : "type-25038", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78083,8 +78125,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-25694", +- "self_type" : "type-25693", ++ "referenced_type" : "type-25745", ++ "self_type" : "type-25744", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78092,8 +78134,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-26758", +- "self_type" : "type-26763", ++ "referenced_type" : "type-26781", ++ "self_type" : "type-26785", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78101,8 +78143,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-28322", +- "self_type" : "type-28326", ++ "referenced_type" : "type-28321", ++ "self_type" : "type-28325", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78110,8 +78152,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-28404", +- "self_type" : "type-28410", ++ "referenced_type" : "type-28403", ++ "self_type" : "type-28409", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78119,8 +78161,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-28595", +- "self_type" : "type-28600", ++ "referenced_type" : "type-28594", ++ "self_type" : "type-28599", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78128,8 +78170,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-28689", +- "self_type" : "type-28695", ++ "referenced_type" : "type-28688", ++ "self_type" : "type-28694", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78137,8 +78179,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-28921", +- "self_type" : "type-28928", ++ "referenced_type" : "type-28920", ++ "self_type" : "type-28927", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78146,8 +78188,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-29207", +- "self_type" : "type-29211", ++ "referenced_type" : "type-29206", ++ "self_type" : "type-29210", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78155,8 +78197,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-29373", +- "self_type" : "type-29377", ++ "referenced_type" : "type-29372", ++ "self_type" : "type-29376", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78164,8 +78206,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-29535", +- "self_type" : "type-29541", ++ "referenced_type" : "type-29534", ++ "self_type" : "type-29540", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78173,8 +78215,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-29677", +- "self_type" : "type-29681", ++ "referenced_type" : "type-29676", ++ "self_type" : "type-29680", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78182,8 +78224,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-29957", +- "self_type" : "type-29961", ++ "referenced_type" : "type-29956", ++ "self_type" : "type-29960", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78191,8 +78233,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-30090", +- "self_type" : "type-30094", ++ "referenced_type" : "type-30089", ++ "self_type" : "type-30093", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78200,8 +78242,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-30208", +- "self_type" : "type-30212", ++ "referenced_type" : "type-30207", ++ "self_type" : "type-30211", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78209,8 +78251,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-30840", +- "self_type" : "type-30839", ++ "referenced_type" : "type-30839", ++ "self_type" : "type-30838", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78218,8 +78260,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-31905", +- "self_type" : "type-31910", ++ "referenced_type" : "type-31904", ++ "self_type" : "type-31909", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78227,8 +78269,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-3557", +- "self_type" : "type-3556", ++ "referenced_type" : "type-3509", ++ "self_type" : "type-3508", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78236,8 +78278,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-5535", +- "self_type" : "type-5534", ++ "referenced_type" : "type-5487", ++ "self_type" : "type-5486", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78245,8 +78287,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-6704", +- "self_type" : "type-6709", ++ "referenced_type" : "type-6656", ++ "self_type" : "type-6661", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78254,8 +78296,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-8794", +- "self_type" : "type-8793", ++ "referenced_type" : "type-8746", ++ "self_type" : "type-8745", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78263,8 +78305,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions &", + "name" : "const google::protobuf::MessageOptions &", +- "referenced_type" : "type-9860", +- "self_type" : "type-9865", ++ "referenced_type" : "type-9812", ++ "self_type" : "type-9817", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78272,8 +78314,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *const &", + "name" : "const google::protobuf::MessageOptions *const &", +- "referenced_type" : "type-4132", +- "self_type" : "type-4133", ++ "referenced_type" : "type-4084", ++ "self_type" : "type-4085", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -78281,8 +78323,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Method &", + "name" : "const google::protobuf::Method &", +- "referenced_type" : "type-2376", +- "self_type" : "type-2378", ++ "referenced_type" : "type-2304", ++ "self_type" : "type-2306", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -78290,8 +78332,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Method *const &", + "name" : "const google::protobuf::Method *const &", +- "referenced_type" : "type-2449", +- "self_type" : "type-2450", ++ "referenced_type" : "type-2379", ++ "self_type" : "type-2380", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -78299,8 +78341,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodDescriptorProto &", + "name" : "const google::protobuf::MethodDescriptorProto &", +- "referenced_type" : "type-1911", +- "self_type" : "type-2112", ++ "referenced_type" : "type-1831", ++ "self_type" : "type-2045", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -78308,8 +78350,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodDescriptorProto *const &", + "name" : "const google::protobuf::MethodDescriptorProto *const &", +- "referenced_type" : "type-4128", +- "self_type" : "type-4129", ++ "referenced_type" : "type-4080", ++ "self_type" : "type-4081", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -78317,8 +78359,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-12146", +- "self_type" : "type-12149", ++ "referenced_type" : "type-12098", ++ "self_type" : "type-12101", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78326,8 +78368,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-13214", +- "self_type" : "type-13217", ++ "referenced_type" : "type-13166", ++ "self_type" : "type-13169", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78335,8 +78377,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-14766", +- "self_type" : "type-14769", ++ "referenced_type" : "type-14718", ++ "self_type" : "type-14721", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78344,8 +78386,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-14856", +- "self_type" : "type-14859", ++ "referenced_type" : "type-14808", ++ "self_type" : "type-14811", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78353,8 +78395,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-15119", +- "self_type" : "type-15122", ++ "referenced_type" : "type-15071", ++ "self_type" : "type-15074", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78362,8 +78404,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-15220", +- "self_type" : "type-15224", ++ "referenced_type" : "type-15172", ++ "self_type" : "type-15176", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78371,8 +78413,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-16001", +- "self_type" : "type-16004", ++ "referenced_type" : "type-15953", ++ "self_type" : "type-15956", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78380,8 +78422,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-17070", +- "self_type" : "type-17073", ++ "referenced_type" : "type-17022", ++ "self_type" : "type-17025", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78389,8 +78431,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-18630", +- "self_type" : "type-18633", ++ "referenced_type" : "type-18582", ++ "self_type" : "type-18585", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78398,8 +78440,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-18713", +- "self_type" : "type-18716", ++ "referenced_type" : "type-18665", ++ "self_type" : "type-18668", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78407,8 +78449,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-18903", +- "self_type" : "type-18906", ++ "referenced_type" : "type-18855", ++ "self_type" : "type-18858", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78416,8 +78458,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-19002", +- "self_type" : "type-19006", ++ "referenced_type" : "type-18954", ++ "self_type" : "type-18958", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78425,8 +78467,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-19244", +- "self_type" : "type-19247", ++ "referenced_type" : "type-1919", ++ "self_type" : "type-1980", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78434,8 +78476,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-19573", +- "self_type" : "type-19576", ++ "referenced_type" : "type-19196", ++ "self_type" : "type-19199", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78443,8 +78485,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-19745", +- "self_type" : "type-19748", ++ "referenced_type" : "type-19525", ++ "self_type" : "type-19528", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78452,8 +78494,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-19912", +- "self_type" : "type-19915", ++ "referenced_type" : "type-19697", ++ "self_type" : "type-19700", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78461,8 +78503,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-1993", +- "self_type" : "type-2050", ++ "referenced_type" : "type-19864", ++ "self_type" : "type-19867", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78470,8 +78512,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-20533", +- "self_type" : "type-20536", ++ "referenced_type" : "type-20485", ++ "self_type" : "type-20488", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78479,8 +78521,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-21602", +- "self_type" : "type-21605", ++ "referenced_type" : "type-21554", ++ "self_type" : "type-21557", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78488,8 +78530,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-23159", +- "self_type" : "type-23162", ++ "referenced_type" : "type-23143", ++ "self_type" : "type-23146", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78497,8 +78539,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-23242", +- "self_type" : "type-23245", ++ "referenced_type" : "type-23232", ++ "self_type" : "type-23236", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78506,8 +78548,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-23432", +- "self_type" : "type-23435", ++ "referenced_type" : "type-23415", ++ "self_type" : "type-23418", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78515,8 +78557,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-23531", +- "self_type" : "type-23535", ++ "referenced_type" : "type-23509", ++ "self_type" : "type-23513", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78524,8 +78566,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-23765", +- "self_type" : "type-23768", ++ "referenced_type" : "type-23752", ++ "self_type" : "type-23755", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78533,8 +78575,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-24043", +- "self_type" : "type-24046", ++ "referenced_type" : "type-24042", ++ "self_type" : "type-24045", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78542,8 +78584,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-24212", +- "self_type" : "type-24215", ++ "referenced_type" : "type-24216", ++ "self_type" : "type-24219", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78551,8 +78593,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-24377", +- "self_type" : "type-24380", ++ "referenced_type" : "type-24358", ++ "self_type" : "type-24361", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78560,8 +78602,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-24518", +- "self_type" : "type-24521", ++ "referenced_type" : "type-24496", ++ "self_type" : "type-24499", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78569,8 +78611,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-24799", +- "self_type" : "type-24803", ++ "referenced_type" : "type-2467", ++ "self_type" : "type-2470", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78578,8 +78620,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-24955", +- "self_type" : "type-24958", ++ "referenced_type" : "type-24759", ++ "self_type" : "type-24762", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78587,8 +78629,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-25084", +- "self_type" : "type-25089", ++ "referenced_type" : "type-24923", ++ "self_type" : "type-24926", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78596,8 +78638,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-2537", +- "self_type" : "type-2540", ++ "referenced_type" : "type-25055", ++ "self_type" : "type-25060", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78605,8 +78647,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-25712", +- "self_type" : "type-25715", ++ "referenced_type" : "type-25763", ++ "self_type" : "type-25766", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78614,8 +78656,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-26780", +- "self_type" : "type-26783", ++ "referenced_type" : "type-26802", ++ "self_type" : "type-26805", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78623,8 +78665,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-28344", +- "self_type" : "type-28347", ++ "referenced_type" : "type-28343", ++ "self_type" : "type-28346", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78632,8 +78674,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-28427", +- "self_type" : "type-28430", ++ "referenced_type" : "type-28426", ++ "self_type" : "type-28429", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78641,8 +78683,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-28617", +- "self_type" : "type-28620", ++ "referenced_type" : "type-28616", ++ "self_type" : "type-28619", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78650,8 +78692,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-28716", +- "self_type" : "type-28720", ++ "referenced_type" : "type-28715", ++ "self_type" : "type-28719", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78659,8 +78701,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-28950", +- "self_type" : "type-28953", ++ "referenced_type" : "type-28949", ++ "self_type" : "type-28952", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78668,8 +78710,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-29228", +- "self_type" : "type-29231", ++ "referenced_type" : "type-29227", ++ "self_type" : "type-29230", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78677,8 +78719,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-29397", +- "self_type" : "type-29400", ++ "referenced_type" : "type-29396", ++ "self_type" : "type-29399", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78686,8 +78728,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-29562", +- "self_type" : "type-29565", ++ "referenced_type" : "type-29561", ++ "self_type" : "type-29564", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78695,8 +78737,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-29703", +- "self_type" : "type-29706", ++ "referenced_type" : "type-29702", ++ "self_type" : "type-29705", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78704,8 +78746,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-29978", +- "self_type" : "type-29982", ++ "referenced_type" : "type-29977", ++ "self_type" : "type-29981", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78713,8 +78755,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-30111", +- "self_type" : "type-30114", ++ "referenced_type" : "type-30110", ++ "self_type" : "type-30113", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78722,8 +78764,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-30229", +- "self_type" : "type-30234", ++ "referenced_type" : "type-30228", ++ "self_type" : "type-30233", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78731,8 +78773,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-30858", +- "self_type" : "type-30861", ++ "referenced_type" : "type-30857", ++ "self_type" : "type-30860", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78740,8 +78782,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-31927", +- "self_type" : "type-31930", ++ "referenced_type" : "type-31926", ++ "self_type" : "type-31929", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78749,8 +78791,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-3575", +- "self_type" : "type-3578", ++ "referenced_type" : "type-3527", ++ "self_type" : "type-3530", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78758,8 +78800,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-5553", +- "self_type" : "type-5556", ++ "referenced_type" : "type-5505", ++ "self_type" : "type-5508", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78767,8 +78809,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-6727", +- "self_type" : "type-6730", ++ "referenced_type" : "type-6679", ++ "self_type" : "type-6682", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78776,8 +78818,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-8812", +- "self_type" : "type-8815", ++ "referenced_type" : "type-8764", ++ "self_type" : "type-8767", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78785,8 +78827,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions &", + "name" : "const google::protobuf::MethodOptions &", +- "referenced_type" : "type-9882", +- "self_type" : "type-9885", ++ "referenced_type" : "type-9834", ++ "self_type" : "type-9837", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -78794,8 +78836,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *const &", + "name" : "const google::protobuf::MethodOptions *const &", +- "referenced_type" : "type-4142", +- "self_type" : "type-4143", ++ "referenced_type" : "type-4094", ++ "self_type" : "type-4095", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -78803,8 +78845,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Mixin &", + "name" : "const google::protobuf::Mixin &", +- "referenced_type" : "type-2380", +- "self_type" : "type-2382", ++ "referenced_type" : "type-2308", ++ "self_type" : "type-2310", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -78812,8 +78854,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Mixin *const &", + "name" : "const google::protobuf::Mixin *const &", +- "referenced_type" : "type-2451", +- "self_type" : "type-2452", ++ "referenced_type" : "type-2381", ++ "self_type" : "type-2382", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -78821,8 +78863,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::OneofDescriptorProto &", + "name" : "const google::protobuf::OneofDescriptorProto &", +- "referenced_type" : "type-1899", +- "self_type" : "type-2096", ++ "referenced_type" : "type-1818", ++ "self_type" : "type-2029", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -78830,8 +78872,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::OneofDescriptorProto *const &", + "name" : "const google::protobuf::OneofDescriptorProto *const &", +- "referenced_type" : "type-4120", +- "self_type" : "type-4121", ++ "referenced_type" : "type-4072", ++ "self_type" : "type-4073", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -78839,8 +78881,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Option &", + "name" : "const google::protobuf::Option &", +- "referenced_type" : "type-2368", +- "self_type" : "type-2370", ++ "referenced_type" : "type-2296", ++ "self_type" : "type-2298", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -78848,8 +78890,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Option *const &", + "name" : "const google::protobuf::Option *const &", +- "referenced_type" : "type-7957", +- "self_type" : "type-7958", ++ "referenced_type" : "type-7909", ++ "self_type" : "type-7910", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -78857,8 +78899,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-10160", +- "self_type" : "type-10159", ++ "referenced_type" : "type-10112", ++ "self_type" : "type-10111", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -78866,8 +78908,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-10268", +- "self_type" : "type-10267", ++ "referenced_type" : "type-10220", ++ "self_type" : "type-10219", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -78875,8 +78917,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-10314", +- "self_type" : "type-10313", ++ "referenced_type" : "type-10266", ++ "self_type" : "type-10265", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -78884,8 +78926,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-10671", +- "self_type" : "type-10670", ++ "referenced_type" : "type-10623", ++ "self_type" : "type-10622", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -78893,8 +78935,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-10772", +- "self_type" : "type-10771", ++ "referenced_type" : "type-10724", ++ "self_type" : "type-10723", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -78902,8 +78944,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-10864", +- "self_type" : "type-10863", ++ "referenced_type" : "type-10816", ++ "self_type" : "type-10815", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -78911,8 +78953,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-10975", +- "self_type" : "type-10974", ++ "referenced_type" : "type-10927", ++ "self_type" : "type-10926", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -78920,8 +78962,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-11027", +- "self_type" : "type-11026", ++ "referenced_type" : "type-10979", ++ "self_type" : "type-10978", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -78929,8 +78971,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-11141", +- "self_type" : "type-11140", ++ "referenced_type" : "type-11093", ++ "self_type" : "type-11092", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -78938,8 +78980,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-11327", +- "self_type" : "type-11326", ++ "referenced_type" : "type-11279", ++ "self_type" : "type-11278", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -78947,8 +78989,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-11485", +- "self_type" : "type-11484", ++ "referenced_type" : "type-11437", ++ "self_type" : "type-11436", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -78956,8 +78998,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-11917", +- "self_type" : "type-11916", ++ "referenced_type" : "type-11869", ++ "self_type" : "type-11868", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -78965,8 +79007,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-12090", +- "self_type" : "type-12089", ++ "referenced_type" : "type-12042", ++ "self_type" : "type-12041", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -78974,8 +79016,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-12371", +- "self_type" : "type-12370", ++ "referenced_type" : "type-12323", ++ "self_type" : "type-12322", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -78983,8 +79025,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-12472", +- "self_type" : "type-12471", ++ "referenced_type" : "type-12424", ++ "self_type" : "type-12423", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -78992,8 +79034,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-12612", +- "self_type" : "type-12611", ++ "referenced_type" : "type-12564", ++ "self_type" : "type-12563", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79001,8 +79043,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-12670", +- "self_type" : "type-12669", ++ "referenced_type" : "type-12622", ++ "self_type" : "type-12621", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79010,8 +79052,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-12850", +- "self_type" : "type-12849", ++ "referenced_type" : "type-12802", ++ "self_type" : "type-12801", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79019,8 +79061,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-12988", +- "self_type" : "type-12987", ++ "referenced_type" : "type-12940", ++ "self_type" : "type-12939", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79028,8 +79070,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-13493", +- "self_type" : "type-13492", ++ "referenced_type" : "type-13445", ++ "self_type" : "type-13444", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79037,8 +79079,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-13559", +- "self_type" : "type-13558", ++ "referenced_type" : "type-13511", ++ "self_type" : "type-13510", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79046,8 +79088,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-13605", +- "self_type" : "type-13604", ++ "referenced_type" : "type-13557", ++ "self_type" : "type-13556", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79055,8 +79097,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-13962", +- "self_type" : "type-13961", ++ "referenced_type" : "type-13914", ++ "self_type" : "type-13913", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79064,8 +79106,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-14063", +- "self_type" : "type-14062", ++ "referenced_type" : "type-14015", ++ "self_type" : "type-14014", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79073,8 +79115,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-14155", +- "self_type" : "type-14154", ++ "referenced_type" : "type-14107", ++ "self_type" : "type-14106", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79082,8 +79124,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-14266", +- "self_type" : "type-14265", ++ "referenced_type" : "type-14218", ++ "self_type" : "type-14217", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79091,8 +79133,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-14318", +- "self_type" : "type-14317", ++ "referenced_type" : "type-14270", ++ "self_type" : "type-14269", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79100,8 +79142,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-14405", +- "self_type" : "type-14404", ++ "referenced_type" : "type-14357", ++ "self_type" : "type-14356", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79109,8 +79151,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-14578", +- "self_type" : "type-14577", ++ "referenced_type" : "type-14530", ++ "self_type" : "type-14529", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79118,8 +79160,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-14705", +- "self_type" : "type-14704", ++ "referenced_type" : "type-14657", ++ "self_type" : "type-14656", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79127,8 +79169,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-14944", +- "self_type" : "type-14943", ++ "referenced_type" : "type-14896", ++ "self_type" : "type-14895", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79136,8 +79178,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-15148", +- "self_type" : "type-15147", ++ "referenced_type" : "type-15100", ++ "self_type" : "type-15099", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79145,8 +79187,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-15305", +- "self_type" : "type-15304", ++ "referenced_type" : "type-15257", ++ "self_type" : "type-15256", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79154,8 +79196,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-15773", +- "self_type" : "type-15772", ++ "referenced_type" : "type-15725", ++ "self_type" : "type-15724", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79163,8 +79205,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-15946", +- "self_type" : "type-15945", ++ "referenced_type" : "type-15898", ++ "self_type" : "type-15897", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79172,8 +79214,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16226", +- "self_type" : "type-16225", ++ "referenced_type" : "type-16178", ++ "self_type" : "type-16177", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79181,8 +79223,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16329", +- "self_type" : "type-16328", ++ "referenced_type" : "type-16281", ++ "self_type" : "type-16280", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79190,8 +79232,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16469", +- "self_type" : "type-16468", ++ "referenced_type" : "type-16421", ++ "self_type" : "type-16420", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79199,8 +79241,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16526", +- "self_type" : "type-16525", ++ "referenced_type" : "type-16478", ++ "self_type" : "type-16477", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79208,8 +79250,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16706", +- "self_type" : "type-16705", ++ "referenced_type" : "type-16658", ++ "self_type" : "type-16657", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79217,8 +79259,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16844", +- "self_type" : "type-16843", ++ "referenced_type" : "type-16796", ++ "self_type" : "type-16795", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79226,8 +79268,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17349", +- "self_type" : "type-17348", ++ "referenced_type" : "type-17301", ++ "self_type" : "type-17300", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79235,8 +79277,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17423", +- "self_type" : "type-17422", ++ "referenced_type" : "type-17375", ++ "self_type" : "type-17374", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79244,8 +79286,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17469", +- "self_type" : "type-17468", ++ "referenced_type" : "type-17421", ++ "self_type" : "type-17420", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79253,8 +79295,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17826", +- "self_type" : "type-17825", ++ "referenced_type" : "type-17778", ++ "self_type" : "type-17777", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79262,8 +79304,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17927", +- "self_type" : "type-17926", ++ "referenced_type" : "type-17879", ++ "self_type" : "type-17878", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79271,8 +79313,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18019", +- "self_type" : "type-18018", ++ "referenced_type" : "type-17971", ++ "self_type" : "type-17970", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79280,8 +79322,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18130", +- "self_type" : "type-18129", ++ "referenced_type" : "type-18082", ++ "self_type" : "type-18081", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79289,8 +79331,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18182", +- "self_type" : "type-18181", ++ "referenced_type" : "type-18134", ++ "self_type" : "type-18133", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79298,8 +79340,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18269", +- "self_type" : "type-18268", ++ "referenced_type" : "type-18221", ++ "self_type" : "type-18220", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79307,8 +79349,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18442", +- "self_type" : "type-18441", ++ "referenced_type" : "type-18394", ++ "self_type" : "type-18393", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79316,8 +79358,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18569", +- "self_type" : "type-18568", ++ "referenced_type" : "type-18521", ++ "self_type" : "type-18520", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79325,8 +79367,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18801", +- "self_type" : "type-18800", ++ "referenced_type" : "type-18753", ++ "self_type" : "type-18752", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79334,8 +79376,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18932", +- "self_type" : "type-18931", ++ "referenced_type" : "type-18884", ++ "self_type" : "type-18883", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79343,8 +79385,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19081", +- "self_type" : "type-19080", ++ "referenced_type" : "type-19033", ++ "self_type" : "type-19032", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79352,8 +79394,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19321", +- "self_type" : "type-19320", ++ "referenced_type" : "type-19273", ++ "self_type" : "type-19272", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79361,8 +79403,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19465", +- "self_type" : "type-19464", ++ "referenced_type" : "type-19417", ++ "self_type" : "type-19416", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79370,8 +79412,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19669", +- "self_type" : "type-19668", ++ "referenced_type" : "type-19621", ++ "self_type" : "type-19620", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79379,8 +79421,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19838", +- "self_type" : "type-19837", ++ "referenced_type" : "type-19790", ++ "self_type" : "type-19789", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79388,8 +79430,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19994", +- "self_type" : "type-19993", ++ "referenced_type" : "type-19946", ++ "self_type" : "type-19945", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79397,8 +79439,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-20307", +- "self_type" : "type-20306", ++ "referenced_type" : "type-20259", ++ "self_type" : "type-20258", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79406,8 +79448,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-20480", +- "self_type" : "type-20479", ++ "referenced_type" : "type-20432", ++ "self_type" : "type-20431", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79415,8 +79457,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-20757", +- "self_type" : "type-20756", ++ "referenced_type" : "type-20709", ++ "self_type" : "type-20708", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79424,8 +79466,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-20860", +- "self_type" : "type-20859", ++ "referenced_type" : "type-20812", ++ "self_type" : "type-20811", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79433,8 +79475,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-21000", +- "self_type" : "type-20999", ++ "referenced_type" : "type-20952", ++ "self_type" : "type-20951", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79442,8 +79484,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-21058", +- "self_type" : "type-21057", ++ "referenced_type" : "type-21010", ++ "self_type" : "type-21009", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79451,8 +79493,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-21238", +- "self_type" : "type-21237", ++ "referenced_type" : "type-2106", ++ "self_type" : "type-2105", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79460,8 +79502,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-21376", +- "self_type" : "type-21375", ++ "referenced_type" : "type-21190", ++ "self_type" : "type-21189", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79469,8 +79511,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-2176", +- "self_type" : "type-2175", ++ "referenced_type" : "type-21328", ++ "self_type" : "type-21327", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79478,8 +79520,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-21881", +- "self_type" : "type-21880", ++ "referenced_type" : "type-21833", ++ "self_type" : "type-21832", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79496,8 +79538,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-21998", +- "self_type" : "type-21997", ++ "referenced_type" : "type-21996", ++ "self_type" : "type-21995", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79505,8 +79547,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-22355", +- "self_type" : "type-22354", ++ "referenced_type" : "type-22322", ++ "self_type" : "type-22321", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79514,8 +79556,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-22456", +- "self_type" : "type-22455", ++ "referenced_type" : "type-22399", ++ "self_type" : "type-22398", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79523,8 +79565,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-22548", +- "self_type" : "type-22547", ++ "referenced_type" : "type-22467", ++ "self_type" : "type-22466", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79532,8 +79574,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-22659", +- "self_type" : "type-22658", ++ "referenced_type" : "type-22571", ++ "self_type" : "type-22570", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79541,8 +79583,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-22711", +- "self_type" : "type-22710", ++ "referenced_type" : "type-22636", ++ "self_type" : "type-22635", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79550,8 +79592,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-22798", +- "self_type" : "type-22797", ++ "referenced_type" : "type-22746", ++ "self_type" : "type-22745", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79559,8 +79601,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-22971", +- "self_type" : "type-22970", ++ "referenced_type" : "type-22938", ++ "self_type" : "type-22937", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79568,8 +79610,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23098", +- "self_type" : "type-23097", ++ "referenced_type" : "type-23083", ++ "self_type" : "type-23082", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79577,8 +79619,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23330", +- "self_type" : "type-23329", ++ "referenced_type" : "type-23325", ++ "self_type" : "type-23324", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79586,8 +79628,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23461", +- "self_type" : "type-23460", ++ "referenced_type" : "type-23439", ++ "self_type" : "type-23438", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79595,8 +79637,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23610", +- "self_type" : "type-23609", ++ "referenced_type" : "type-23591", ++ "self_type" : "type-23590", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79604,8 +79646,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23842", +- "self_type" : "type-23841", ++ "referenced_type" : "type-23831", ++ "self_type" : "type-23830", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79613,8 +79655,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23965", +- "self_type" : "type-23964", ++ "referenced_type" : "type-2396", ++ "self_type" : "type-2395", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79622,8 +79664,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24139", +- "self_type" : "type-24138", ++ "referenced_type" : "type-23969", ++ "self_type" : "type-23968", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79631,8 +79673,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24305", +- "self_type" : "type-24304", ++ "referenced_type" : "type-24135", ++ "self_type" : "type-24134", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79640,8 +79682,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24457", +- "self_type" : "type-24456", ++ "referenced_type" : "type-24306", ++ "self_type" : "type-24305", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79649,8 +79691,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24611", +- "self_type" : "type-24610", ++ "referenced_type" : "type-24436", ++ "self_type" : "type-24435", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79658,8 +79700,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-2464", +- "self_type" : "type-2463", ++ "referenced_type" : "type-24578", ++ "self_type" : "type-24577", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79667,8 +79709,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24739", +- "self_type" : "type-24738", ++ "referenced_type" : "type-24698", ++ "self_type" : "type-24697", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79676,8 +79718,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24873", +- "self_type" : "type-24872", ++ "referenced_type" : "type-24834", ++ "self_type" : "type-24833", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79685,8 +79727,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-25159", +- "self_type" : "type-25158", ++ "referenced_type" : "type-25135", ++ "self_type" : "type-25134", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79703,8 +79745,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-25483", +- "self_type" : "type-25482", ++ "referenced_type" : "type-25534", ++ "self_type" : "type-25533", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79712,8 +79754,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-25656", +- "self_type" : "type-25655", ++ "referenced_type" : "type-25705", ++ "self_type" : "type-25704", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79721,8 +79763,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-25936", +- "self_type" : "type-25935", ++ "referenced_type" : "type-25989", ++ "self_type" : "type-25988", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79730,8 +79772,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-26038", +- "self_type" : "type-26037", ++ "referenced_type" : "type-26091", ++ "self_type" : "type-26090", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79739,8 +79781,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-26178", +- "self_type" : "type-26177", ++ "referenced_type" : "type-26222", ++ "self_type" : "type-26221", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79748,8 +79790,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-26236", +- "self_type" : "type-26235", ++ "referenced_type" : "type-26278", ++ "self_type" : "type-26277", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79757,8 +79799,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-26416", +- "self_type" : "type-26415", ++ "referenced_type" : "type-26458", ++ "self_type" : "type-26457", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79766,8 +79808,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-26554", +- "self_type" : "type-26553", ++ "referenced_type" : "type-26581", ++ "self_type" : "type-26580", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79775,8 +79817,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-27059", +- "self_type" : "type-27058", ++ "referenced_type" : "type-27089", ++ "self_type" : "type-27088", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79784,8 +79826,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-27137", +- "self_type" : "type-27136", ++ "referenced_type" : "type-27136", ++ "self_type" : "type-27135", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79793,8 +79835,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-27183", +- "self_type" : "type-27182", ++ "referenced_type" : "type-27182", ++ "self_type" : "type-27181", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79802,8 +79844,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-27540", +- "self_type" : "type-27539", ++ "referenced_type" : "type-27539", ++ "self_type" : "type-27538", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79811,8 +79853,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-27641", +- "self_type" : "type-27640", ++ "referenced_type" : "type-27640", ++ "self_type" : "type-27639", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79820,8 +79862,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-27733", +- "self_type" : "type-27732", ++ "referenced_type" : "type-27732", ++ "self_type" : "type-27731", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79829,8 +79871,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-27844", +- "self_type" : "type-27843", ++ "referenced_type" : "type-27843", ++ "self_type" : "type-27842", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79838,8 +79880,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-27896", +- "self_type" : "type-27895", ++ "referenced_type" : "type-27895", ++ "self_type" : "type-27894", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79847,8 +79889,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-27983", +- "self_type" : "type-27982", ++ "referenced_type" : "type-27982", ++ "self_type" : "type-27981", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79856,8 +79898,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-28156", +- "self_type" : "type-28155", ++ "referenced_type" : "type-28155", ++ "self_type" : "type-28154", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79865,8 +79907,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-28283", +- "self_type" : "type-28282", ++ "referenced_type" : "type-28282", ++ "self_type" : "type-28281", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79874,8 +79916,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-28515", +- "self_type" : "type-28514", ++ "referenced_type" : "type-28514", ++ "self_type" : "type-28513", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79883,8 +79925,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-28646", +- "self_type" : "type-28645", ++ "referenced_type" : "type-28645", ++ "self_type" : "type-28644", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79892,8 +79934,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-28795", +- "self_type" : "type-28794", ++ "referenced_type" : "type-28794", ++ "self_type" : "type-28793", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79901,8 +79943,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29027", +- "self_type" : "type-29026", ++ "referenced_type" : "type-29026", ++ "self_type" : "type-29025", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79910,8 +79952,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29150", +- "self_type" : "type-29149", ++ "referenced_type" : "type-29149", ++ "self_type" : "type-29148", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79919,8 +79961,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29324", +- "self_type" : "type-29323", ++ "referenced_type" : "type-29323", ++ "self_type" : "type-29322", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79928,8 +79970,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29490", +- "self_type" : "type-29489", ++ "referenced_type" : "type-29489", ++ "self_type" : "type-29488", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79937,8 +79979,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29642", +- "self_type" : "type-29641", ++ "referenced_type" : "type-29641", ++ "self_type" : "type-29640", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79946,8 +79988,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29796", +- "self_type" : "type-29795", ++ "referenced_type" : "type-29795", ++ "self_type" : "type-29794", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79955,8 +79997,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29920", +- "self_type" : "type-29919", ++ "referenced_type" : "type-29919", ++ "self_type" : "type-29918", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79964,8 +80006,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-30052", +- "self_type" : "type-30051", ++ "referenced_type" : "type-30051", ++ "self_type" : "type-30050", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79973,8 +80015,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-30304", +- "self_type" : "type-30303", ++ "referenced_type" : "type-30303", ++ "self_type" : "type-30302", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79982,8 +80024,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-30398", +- "self_type" : "type-30397", ++ "referenced_type" : "type-30397", ++ "self_type" : "type-30396", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -79991,8 +80033,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-30629", +- "self_type" : "type-30628", ++ "referenced_type" : "type-30628", ++ "self_type" : "type-30627", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80000,8 +80042,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-30802", +- "self_type" : "type-30801", ++ "referenced_type" : "type-30801", ++ "self_type" : "type-30800", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80009,8 +80051,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-31082", +- "self_type" : "type-31081", ++ "referenced_type" : "type-31081", ++ "self_type" : "type-31080", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80018,8 +80060,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-31185", +- "self_type" : "type-31184", ++ "referenced_type" : "type-31184", ++ "self_type" : "type-31183", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80027,8 +80069,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-31325", +- "self_type" : "type-31324", ++ "referenced_type" : "type-31324", ++ "self_type" : "type-31323", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80036,8 +80078,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-31383", +- "self_type" : "type-31382", ++ "referenced_type" : "type-31382", ++ "self_type" : "type-31381", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80045,8 +80087,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-31563", +- "self_type" : "type-31562", ++ "referenced_type" : "type-31562", ++ "self_type" : "type-31561", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80054,8 +80096,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-31701", +- "self_type" : "type-31700", ++ "referenced_type" : "type-31700", ++ "self_type" : "type-31699", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80063,8 +80105,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-32206", +- "self_type" : "type-32205", ++ "referenced_type" : "type-32205", ++ "self_type" : "type-32204", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80072,8 +80114,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-3334", +- "self_type" : "type-3333", ++ "referenced_type" : "type-3286", ++ "self_type" : "type-3285", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80081,8 +80123,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-3513", +- "self_type" : "type-3512", ++ "referenced_type" : "type-3465", ++ "self_type" : "type-3464", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80090,8 +80132,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-3854", +- "self_type" : "type-3853", ++ "referenced_type" : "type-3806", ++ "self_type" : "type-3805", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80099,8 +80141,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-3975", +- "self_type" : "type-3974", ++ "referenced_type" : "type-3927", ++ "self_type" : "type-3926", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80108,8 +80150,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-4164", +- "self_type" : "type-4163", ++ "referenced_type" : "type-4116", ++ "self_type" : "type-4115", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80117,8 +80159,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-4227", +- "self_type" : "type-4226", ++ "referenced_type" : "type-4179", ++ "self_type" : "type-4178", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80126,8 +80168,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-4439", +- "self_type" : "type-4438", ++ "referenced_type" : "type-4391", ++ "self_type" : "type-4390", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80135,8 +80177,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-4684", +- "self_type" : "type-4683", ++ "referenced_type" : "type-4636", ++ "self_type" : "type-4635", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80144,8 +80186,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-5314", +- "self_type" : "type-5313", ++ "referenced_type" : "type-5266", ++ "self_type" : "type-5265", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80162,8 +80204,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-5493", +- "self_type" : "type-5492", ++ "referenced_type" : "type-5445", ++ "self_type" : "type-5444", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80171,8 +80213,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-5780", +- "self_type" : "type-5779", ++ "referenced_type" : "type-5732", ++ "self_type" : "type-5731", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80180,8 +80222,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-5883", +- "self_type" : "type-5882", ++ "referenced_type" : "type-5835", ++ "self_type" : "type-5834", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80189,8 +80231,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-6023", +- "self_type" : "type-6022", ++ "referenced_type" : "type-5975", ++ "self_type" : "type-5974", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80198,8 +80240,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-6081", +- "self_type" : "type-6080", ++ "referenced_type" : "type-6033", ++ "self_type" : "type-6032", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80207,8 +80249,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-6261", +- "self_type" : "type-6260", ++ "referenced_type" : "type-6213", ++ "self_type" : "type-6212", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80216,8 +80258,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-6404", +- "self_type" : "type-6403", ++ "referenced_type" : "type-6356", ++ "self_type" : "type-6355", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80225,8 +80267,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-7087", +- "self_type" : "type-7086", ++ "referenced_type" : "type-7039", ++ "self_type" : "type-7038", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80234,8 +80276,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-7180", +- "self_type" : "type-7179", ++ "referenced_type" : "type-7132", ++ "self_type" : "type-7131", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80243,8 +80285,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-7267", +- "self_type" : "type-7266", ++ "referenced_type" : "type-7219", ++ "self_type" : "type-7218", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80252,8 +80294,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-7756", +- "self_type" : "type-7755", ++ "referenced_type" : "type-7708", ++ "self_type" : "type-7707", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80261,8 +80303,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-7859", +- "self_type" : "type-7858", ++ "referenced_type" : "type-7811", ++ "self_type" : "type-7810", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80270,8 +80312,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-7966", +- "self_type" : "type-7965", ++ "referenced_type" : "type-7918", ++ "self_type" : "type-7917", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80279,8 +80321,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-8076", +- "self_type" : "type-8075", ++ "referenced_type" : "type-8028", ++ "self_type" : "type-8027", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80288,8 +80330,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-8128", +- "self_type" : "type-8127", ++ "referenced_type" : "type-8080", ++ "self_type" : "type-8079", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80297,8 +80339,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-8588", +- "self_type" : "type-8587", ++ "referenced_type" : "type-8540", ++ "self_type" : "type-8539", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80306,8 +80348,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-8758", +- "self_type" : "type-8757", ++ "referenced_type" : "type-8710", ++ "self_type" : "type-8709", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80315,8 +80357,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-9037", +- "self_type" : "type-9036", ++ "referenced_type" : "type-8989", ++ "self_type" : "type-8988", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80324,8 +80366,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-9140", +- "self_type" : "type-9139", ++ "referenced_type" : "type-9092", ++ "self_type" : "type-9091", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80333,8 +80375,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-9280", +- "self_type" : "type-9279", ++ "referenced_type" : "type-9232", ++ "self_type" : "type-9231", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80342,8 +80384,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-9338", +- "self_type" : "type-9337", ++ "referenced_type" : "type-9290", ++ "self_type" : "type-9289", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80351,8 +80393,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-9518", +- "self_type" : "type-9517", ++ "referenced_type" : "type-9470", ++ "self_type" : "type-9469", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80360,8 +80402,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-9656", +- "self_type" : "type-9655", ++ "referenced_type" : "type-9608", ++ "self_type" : "type-9607", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80369,8 +80411,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-10156", +- "self_type" : "type-10155", ++ "referenced_type" : "type-10108", ++ "self_type" : "type-10107", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80378,8 +80420,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-10666", +- "self_type" : "type-10665", ++ "referenced_type" : "type-10618", ++ "self_type" : "type-10617", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80387,8 +80429,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-10971", +- "self_type" : "type-10970", ++ "referenced_type" : "type-10923", ++ "self_type" : "type-10922", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80396,8 +80438,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-11322", +- "self_type" : "type-11321", ++ "referenced_type" : "type-11274", ++ "self_type" : "type-11273", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80405,8 +80447,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-11481", +- "self_type" : "type-11480", ++ "referenced_type" : "type-11433", ++ "self_type" : "type-11432", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80414,8 +80456,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-12367", +- "self_type" : "type-12366", ++ "referenced_type" : "type-12319", ++ "self_type" : "type-12318", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80423,8 +80465,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-13489", +- "self_type" : "type-13488", ++ "referenced_type" : "type-13441", ++ "self_type" : "type-13440", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80432,8 +80474,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-13957", +- "self_type" : "type-13956", ++ "referenced_type" : "type-13909", ++ "self_type" : "type-13908", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80441,8 +80483,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-14262", +- "self_type" : "type-14261", ++ "referenced_type" : "type-14214", ++ "self_type" : "type-14213", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80450,8 +80492,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-14573", +- "self_type" : "type-14572", ++ "referenced_type" : "type-14525", ++ "self_type" : "type-14524", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80459,8 +80501,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-14701", +- "self_type" : "type-14700", ++ "referenced_type" : "type-14653", ++ "self_type" : "type-14652", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80468,8 +80510,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-14940", +- "self_type" : "type-14939", ++ "referenced_type" : "type-14892", ++ "self_type" : "type-14891", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80477,8 +80519,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-15301", +- "self_type" : "type-15300", ++ "referenced_type" : "type-15253", ++ "self_type" : "type-15252", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80486,8 +80528,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16222", +- "self_type" : "type-16221", ++ "referenced_type" : "type-16174", ++ "self_type" : "type-16173", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80495,8 +80537,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17345", +- "self_type" : "type-17344", ++ "referenced_type" : "type-17297", ++ "self_type" : "type-17296", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80504,8 +80546,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17821", +- "self_type" : "type-17820", ++ "referenced_type" : "type-17773", ++ "self_type" : "type-17772", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80513,8 +80555,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18126", +- "self_type" : "type-18125", ++ "referenced_type" : "type-18078", ++ "self_type" : "type-18077", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80522,8 +80564,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18437", +- "self_type" : "type-18436", ++ "referenced_type" : "type-18389", ++ "self_type" : "type-18388", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80531,8 +80573,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18565", +- "self_type" : "type-18564", ++ "referenced_type" : "type-18517", ++ "self_type" : "type-18516", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80540,8 +80582,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18797", +- "self_type" : "type-18796", ++ "referenced_type" : "type-18749", ++ "self_type" : "type-18748", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80549,8 +80591,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19077", +- "self_type" : "type-19076", ++ "referenced_type" : "type-19029", ++ "self_type" : "type-19028", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80558,8 +80600,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19317", +- "self_type" : "type-19316", ++ "referenced_type" : "type-19269", ++ "self_type" : "type-19268", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80567,8 +80609,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19461", +- "self_type" : "type-19460", ++ "referenced_type" : "type-19413", ++ "self_type" : "type-19412", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80576,8 +80618,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19665", +- "self_type" : "type-19664", ++ "referenced_type" : "type-19617", ++ "self_type" : "type-19616", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80585,8 +80627,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19833", +- "self_type" : "type-19832", ++ "referenced_type" : "type-19785", ++ "self_type" : "type-19784", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80594,8 +80636,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19990", +- "self_type" : "type-19989", ++ "referenced_type" : "type-19942", ++ "self_type" : "type-19941", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80603,8 +80645,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-20753", +- "self_type" : "type-20752", ++ "referenced_type" : "type-20705", ++ "self_type" : "type-20704", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80612,8 +80654,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-21877", +- "self_type" : "type-21876", ++ "referenced_type" : "type-21829", ++ "self_type" : "type-21828", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80621,8 +80663,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-22350", +- "self_type" : "type-22349", ++ "referenced_type" : "type-22318", ++ "self_type" : "type-22317", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80630,8 +80672,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-22655", +- "self_type" : "type-22654", ++ "referenced_type" : "type-22566", ++ "self_type" : "type-22565", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80639,8 +80681,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-22966", +- "self_type" : "type-22965", ++ "referenced_type" : "type-22934", ++ "self_type" : "type-22933", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80648,8 +80690,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23094", +- "self_type" : "type-23093", ++ "referenced_type" : "type-23079", ++ "self_type" : "type-23078", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80657,8 +80699,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23326", +- "self_type" : "type-23325", ++ "referenced_type" : "type-23321", ++ "self_type" : "type-23320", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80666,8 +80708,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23606", +- "self_type" : "type-23605", ++ "referenced_type" : "type-23587", ++ "self_type" : "type-23586", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80675,8 +80717,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23838", +- "self_type" : "type-23837", ++ "referenced_type" : "type-23826", ++ "self_type" : "type-23825", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80684,8 +80726,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23961", +- "self_type" : "type-23960", ++ "referenced_type" : "type-23965", ++ "self_type" : "type-23964", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80693,8 +80735,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24135", +- "self_type" : "type-24134", ++ "referenced_type" : "type-24131", ++ "self_type" : "type-24130", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80702,8 +80744,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24300", +- "self_type" : "type-24299", ++ "referenced_type" : "type-24302", ++ "self_type" : "type-24301", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80711,8 +80753,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24453", +- "self_type" : "type-24452", ++ "referenced_type" : "type-24432", ++ "self_type" : "type-24431", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80720,8 +80762,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24607", +- "self_type" : "type-24606", ++ "referenced_type" : "type-24574", ++ "self_type" : "type-24573", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80729,8 +80771,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24734", +- "self_type" : "type-24733", ++ "referenced_type" : "type-24694", ++ "self_type" : "type-24693", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80738,8 +80780,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24869", +- "self_type" : "type-24868", ++ "referenced_type" : "type-24830", ++ "self_type" : "type-24829", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80747,8 +80789,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-25155", +- "self_type" : "type-25154", ++ "referenced_type" : "type-25131", ++ "self_type" : "type-25130", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80765,8 +80807,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-25932", +- "self_type" : "type-25931", ++ "referenced_type" : "type-25985", ++ "self_type" : "type-25984", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80774,8 +80816,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-27055", +- "self_type" : "type-27054", ++ "referenced_type" : "type-27085", ++ "self_type" : "type-27084", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80783,8 +80825,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-27535", +- "self_type" : "type-27534", ++ "referenced_type" : "type-27534", ++ "self_type" : "type-27533", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80792,8 +80834,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-27840", +- "self_type" : "type-27839", ++ "referenced_type" : "type-27839", ++ "self_type" : "type-27838", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80801,8 +80843,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-28151", +- "self_type" : "type-28150", ++ "referenced_type" : "type-28150", ++ "self_type" : "type-28149", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80810,8 +80852,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-28279", +- "self_type" : "type-28278", ++ "referenced_type" : "type-28278", ++ "self_type" : "type-28277", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80819,8 +80861,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-28511", +- "self_type" : "type-28510", ++ "referenced_type" : "type-28510", ++ "self_type" : "type-28509", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80828,8 +80870,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-28791", +- "self_type" : "type-28790", ++ "referenced_type" : "type-28790", ++ "self_type" : "type-28789", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80837,8 +80879,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29023", +- "self_type" : "type-29022", ++ "referenced_type" : "type-29022", ++ "self_type" : "type-29021", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80846,8 +80888,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29146", +- "self_type" : "type-29145", ++ "referenced_type" : "type-29145", ++ "self_type" : "type-29144", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80855,8 +80897,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29320", +- "self_type" : "type-29319", ++ "referenced_type" : "type-29319", ++ "self_type" : "type-29318", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80864,8 +80906,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29485", +- "self_type" : "type-29484", ++ "referenced_type" : "type-29484", ++ "self_type" : "type-29483", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80873,8 +80915,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29638", +- "self_type" : "type-29637", ++ "referenced_type" : "type-29637", ++ "self_type" : "type-29636", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80882,8 +80924,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29792", +- "self_type" : "type-29791", ++ "referenced_type" : "type-29791", ++ "self_type" : "type-29790", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80891,8 +80933,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29915", +- "self_type" : "type-29914", ++ "referenced_type" : "type-29914", ++ "self_type" : "type-29913", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80900,8 +80942,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-30048", +- "self_type" : "type-30047", ++ "referenced_type" : "type-30047", ++ "self_type" : "type-30046", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80909,8 +80951,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-30300", +- "self_type" : "type-30299", ++ "referenced_type" : "type-30299", ++ "self_type" : "type-30298", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80918,8 +80960,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-30394", +- "self_type" : "type-30393", ++ "referenced_type" : "type-30393", ++ "self_type" : "type-30392", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80927,8 +80969,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-31078", +- "self_type" : "type-31077", ++ "referenced_type" : "type-31077", ++ "self_type" : "type-31076", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80936,8 +80978,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-32202", +- "self_type" : "type-32201", ++ "referenced_type" : "type-32201", ++ "self_type" : "type-32200", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80945,8 +80987,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-3850", +- "self_type" : "type-3849", ++ "referenced_type" : "type-3802", ++ "self_type" : "type-3801", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80963,8 +81005,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-5776", +- "self_type" : "type-5775", ++ "referenced_type" : "type-5728", ++ "self_type" : "type-5727", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80972,8 +81014,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-7083", +- "self_type" : "type-7082", ++ "referenced_type" : "type-7035", ++ "self_type" : "type-7034", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80981,8 +81023,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-7751", +- "self_type" : "type-7750", ++ "referenced_type" : "type-7703", ++ "self_type" : "type-7702", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80990,8 +81032,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-8072", +- "self_type" : "type-8071", ++ "referenced_type" : "type-8024", ++ "self_type" : "type-8023", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -80999,8 +81041,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-9033", +- "self_type" : "type-9032", ++ "referenced_type" : "type-8985", ++ "self_type" : "type-8984", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81008,8 +81050,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-10152", +- "self_type" : "type-10151", ++ "referenced_type" : "type-10104", ++ "self_type" : "type-10103", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81017,8 +81059,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-10662", +- "self_type" : "type-10661", ++ "referenced_type" : "type-10614", ++ "self_type" : "type-10613", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81026,8 +81068,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-10966", +- "self_type" : "type-10965", ++ "referenced_type" : "type-10918", ++ "self_type" : "type-10917", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81035,8 +81077,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-11318", +- "self_type" : "type-11317", ++ "referenced_type" : "type-11270", ++ "self_type" : "type-11269", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81044,8 +81086,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-11477", +- "self_type" : "type-11476", ++ "referenced_type" : "type-11429", ++ "self_type" : "type-11428", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81053,8 +81095,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-12363", +- "self_type" : "type-12362", ++ "referenced_type" : "type-12315", ++ "self_type" : "type-12314", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81062,8 +81104,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-13485", +- "self_type" : "type-13484", ++ "referenced_type" : "type-13437", ++ "self_type" : "type-13436", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81071,8 +81113,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-13953", +- "self_type" : "type-13952", ++ "referenced_type" : "type-13905", ++ "self_type" : "type-13904", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81080,8 +81122,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-14257", +- "self_type" : "type-14256", ++ "referenced_type" : "type-14209", ++ "self_type" : "type-14208", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81089,8 +81131,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-14569", +- "self_type" : "type-14568", ++ "referenced_type" : "type-14521", ++ "self_type" : "type-14520", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81098,8 +81140,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-14697", +- "self_type" : "type-14696", ++ "referenced_type" : "type-14649", ++ "self_type" : "type-14648", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81107,8 +81149,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-14936", +- "self_type" : "type-14935", ++ "referenced_type" : "type-14888", ++ "self_type" : "type-14887", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81116,8 +81158,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-15297", +- "self_type" : "type-15296", ++ "referenced_type" : "type-15249", ++ "self_type" : "type-15248", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81125,8 +81167,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16218", +- "self_type" : "type-16217", ++ "referenced_type" : "type-16170", ++ "self_type" : "type-16169", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81134,8 +81176,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17341", +- "self_type" : "type-17340", ++ "referenced_type" : "type-17293", ++ "self_type" : "type-17292", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81143,8 +81185,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17817", +- "self_type" : "type-17816", ++ "referenced_type" : "type-17769", ++ "self_type" : "type-17768", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81152,8 +81194,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18121", +- "self_type" : "type-18120", ++ "referenced_type" : "type-18073", ++ "self_type" : "type-18072", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81161,8 +81203,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18433", +- "self_type" : "type-18432", ++ "referenced_type" : "type-18385", ++ "self_type" : "type-18384", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81170,8 +81212,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18561", +- "self_type" : "type-18560", ++ "referenced_type" : "type-18513", ++ "self_type" : "type-18512", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81179,8 +81221,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18793", +- "self_type" : "type-18792", ++ "referenced_type" : "type-18745", ++ "self_type" : "type-18744", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81188,8 +81230,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19073", +- "self_type" : "type-19072", ++ "referenced_type" : "type-19025", ++ "self_type" : "type-19024", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81197,8 +81239,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19312", +- "self_type" : "type-19311", ++ "referenced_type" : "type-19264", ++ "self_type" : "type-19263", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81206,8 +81248,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19457", +- "self_type" : "type-19456", ++ "referenced_type" : "type-19409", ++ "self_type" : "type-19408", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81215,8 +81257,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19661", +- "self_type" : "type-19660", ++ "referenced_type" : "type-19613", ++ "self_type" : "type-19612", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81224,8 +81266,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19829", +- "self_type" : "type-19828", ++ "referenced_type" : "type-19781", ++ "self_type" : "type-19780", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81233,8 +81275,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19986", +- "self_type" : "type-19985", ++ "referenced_type" : "type-19938", ++ "self_type" : "type-19937", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81242,8 +81284,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-20749", +- "self_type" : "type-20748", ++ "referenced_type" : "type-20701", ++ "self_type" : "type-20700", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81251,8 +81293,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-21873", +- "self_type" : "type-21872", ++ "referenced_type" : "type-21825", ++ "self_type" : "type-21824", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81260,8 +81302,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-22346", +- "self_type" : "type-22345", ++ "referenced_type" : "type-22314", ++ "self_type" : "type-22313", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81269,8 +81311,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-22650", +- "self_type" : "type-22649", ++ "referenced_type" : "type-22562", ++ "self_type" : "type-22561", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81278,8 +81320,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-22962", +- "self_type" : "type-22961", ++ "referenced_type" : "type-22930", ++ "self_type" : "type-22929", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81287,8 +81329,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23090", +- "self_type" : "type-23089", ++ "referenced_type" : "type-23074", ++ "self_type" : "type-23073", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81296,8 +81338,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23322", +- "self_type" : "type-23321", ++ "referenced_type" : "type-23317", ++ "self_type" : "type-23316", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81305,8 +81347,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23602", +- "self_type" : "type-23601", ++ "referenced_type" : "type-23583", ++ "self_type" : "type-23582", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81314,8 +81356,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23833", +- "self_type" : "type-23832", ++ "referenced_type" : "type-23822", ++ "self_type" : "type-23821", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81323,8 +81365,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23957", +- "self_type" : "type-23956", ++ "referenced_type" : "type-23961", ++ "self_type" : "type-23960", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81332,8 +81374,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24131", +- "self_type" : "type-24130", ++ "referenced_type" : "type-24127", ++ "self_type" : "type-24126", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81341,8 +81383,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24296", +- "self_type" : "type-24295", ++ "referenced_type" : "type-24298", ++ "self_type" : "type-24297", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81350,8 +81392,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24449", +- "self_type" : "type-24448", ++ "referenced_type" : "type-24428", ++ "self_type" : "type-24427", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81359,8 +81401,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24603", +- "self_type" : "type-24602", ++ "referenced_type" : "type-24568", ++ "self_type" : "type-24567", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81368,8 +81410,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24730", +- "self_type" : "type-24729", ++ "referenced_type" : "type-24690", ++ "self_type" : "type-24689", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81377,8 +81419,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24865", +- "self_type" : "type-24864", ++ "referenced_type" : "type-24826", ++ "self_type" : "type-24825", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81386,8 +81428,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-25151", +- "self_type" : "type-25150", ++ "referenced_type" : "type-25127", ++ "self_type" : "type-25126", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81395,8 +81437,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-25245", +- "self_type" : "type-25244", ++ "referenced_type" : "type-25246", ++ "self_type" : "type-25245", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81404,8 +81446,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-25928", +- "self_type" : "type-25927", ++ "referenced_type" : "type-25981", ++ "self_type" : "type-25980", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81413,8 +81455,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-27051", +- "self_type" : "type-27050", ++ "referenced_type" : "type-27081", ++ "self_type" : "type-27080", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81422,8 +81464,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-27531", +- "self_type" : "type-27530", ++ "referenced_type" : "type-27530", ++ "self_type" : "type-27529", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81431,8 +81473,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-27835", +- "self_type" : "type-27834", ++ "referenced_type" : "type-27834", ++ "self_type" : "type-27833", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81440,8 +81482,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-28147", +- "self_type" : "type-28146", ++ "referenced_type" : "type-28146", ++ "self_type" : "type-28145", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81449,8 +81491,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-28275", +- "self_type" : "type-28274", ++ "referenced_type" : "type-28274", ++ "self_type" : "type-28273", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81458,8 +81500,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-28507", +- "self_type" : "type-28506", ++ "referenced_type" : "type-28506", ++ "self_type" : "type-28505", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81467,8 +81509,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-28787", +- "self_type" : "type-28786", ++ "referenced_type" : "type-28786", ++ "self_type" : "type-28785", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81476,8 +81518,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29018", +- "self_type" : "type-29017", ++ "referenced_type" : "type-29017", ++ "self_type" : "type-29016", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81485,8 +81527,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29142", +- "self_type" : "type-29141", ++ "referenced_type" : "type-29141", ++ "self_type" : "type-29140", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81494,8 +81536,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29316", +- "self_type" : "type-29315", ++ "referenced_type" : "type-29315", ++ "self_type" : "type-29314", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81503,8 +81545,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29481", +- "self_type" : "type-29480", ++ "referenced_type" : "type-29480", ++ "self_type" : "type-29479", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81512,8 +81554,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29634", +- "self_type" : "type-29633", ++ "referenced_type" : "type-29633", ++ "self_type" : "type-29632", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81521,8 +81563,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29788", +- "self_type" : "type-29787", ++ "referenced_type" : "type-29787", ++ "self_type" : "type-29786", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81530,8 +81572,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29911", +- "self_type" : "type-29910", ++ "referenced_type" : "type-29910", ++ "self_type" : "type-29909", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81539,8 +81581,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-30044", +- "self_type" : "type-30043", ++ "referenced_type" : "type-30043", ++ "self_type" : "type-30042", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81548,8 +81590,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-30296", +- "self_type" : "type-30295", ++ "referenced_type" : "type-30295", ++ "self_type" : "type-30294", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81557,8 +81599,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-30389", +- "self_type" : "type-30388", ++ "referenced_type" : "type-30388", ++ "self_type" : "type-30387", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81566,8 +81608,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-31074", +- "self_type" : "type-31073", ++ "referenced_type" : "type-31073", ++ "self_type" : "type-31072", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81575,8 +81617,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-32198", +- "self_type" : "type-32197", ++ "referenced_type" : "type-32197", ++ "self_type" : "type-32196", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81584,8 +81626,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-3846", +- "self_type" : "type-3845", ++ "referenced_type" : "type-3798", ++ "self_type" : "type-3797", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81602,8 +81644,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-5772", +- "self_type" : "type-5771", ++ "referenced_type" : "type-5724", ++ "self_type" : "type-5723", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81611,8 +81653,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-7079", +- "self_type" : "type-7078", ++ "referenced_type" : "type-7031", ++ "self_type" : "type-7030", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81620,8 +81662,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-7747", +- "self_type" : "type-7746", ++ "referenced_type" : "type-7699", ++ "self_type" : "type-7698", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81629,8 +81671,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-8067", +- "self_type" : "type-8066", ++ "referenced_type" : "type-8019", ++ "self_type" : "type-8018", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81638,8 +81680,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-9029", +- "self_type" : "type-9028", ++ "referenced_type" : "type-8981", ++ "self_type" : "type-8980", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81647,8 +81689,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-14920", +- "self_type" : "type-14919", ++ "referenced_type" : "type-14872", ++ "self_type" : "type-14871", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81656,8 +81698,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-15281", +- "self_type" : "type-15280", ++ "referenced_type" : "type-15233", ++ "self_type" : "type-15232", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81665,8 +81707,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18777", +- "self_type" : "type-18776", ++ "referenced_type" : "type-18729", ++ "self_type" : "type-18728", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81674,8 +81716,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19057", +- "self_type" : "type-19056", ++ "referenced_type" : "type-19009", ++ "self_type" : "type-19008", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81683,8 +81725,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19296", +- "self_type" : "type-19295", ++ "referenced_type" : "type-19248", ++ "self_type" : "type-19247", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81692,8 +81734,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19643", +- "self_type" : "type-19642", ++ "referenced_type" : "type-19595", ++ "self_type" : "type-19594", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81701,8 +81743,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19812", +- "self_type" : "type-19811", ++ "referenced_type" : "type-19764", ++ "self_type" : "type-19763", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81710,8 +81752,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19969", +- "self_type" : "type-19968", ++ "referenced_type" : "type-19921", ++ "self_type" : "type-19920", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81719,8 +81761,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23306", +- "self_type" : "type-23305", ++ "referenced_type" : "type-23301", ++ "self_type" : "type-23300", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81728,8 +81770,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23586", +- "self_type" : "type-23585", ++ "referenced_type" : "type-23567", ++ "self_type" : "type-23566", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81737,8 +81779,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23817", +- "self_type" : "type-23816", ++ "referenced_type" : "type-23806", ++ "self_type" : "type-23805", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81746,8 +81788,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24113", +- "self_type" : "type-24112", ++ "referenced_type" : "type-24111", ++ "self_type" : "type-24110", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81755,8 +81797,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24279", +- "self_type" : "type-24278", ++ "referenced_type" : "type-24281", ++ "self_type" : "type-24280", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81764,8 +81806,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24432", +- "self_type" : "type-24431", ++ "referenced_type" : "type-24412", ++ "self_type" : "type-24411", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81773,8 +81815,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24585", +- "self_type" : "type-24584", ++ "referenced_type" : "type-24552", ++ "self_type" : "type-24551", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81782,8 +81824,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24849", +- "self_type" : "type-24848", ++ "referenced_type" : "type-24809", ++ "self_type" : "type-24808", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81791,8 +81833,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-25135", +- "self_type" : "type-25134", ++ "referenced_type" : "type-25111", ++ "self_type" : "type-25110", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81800,8 +81842,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-28491", +- "self_type" : "type-28490", ++ "referenced_type" : "type-28490", ++ "self_type" : "type-28489", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81809,8 +81851,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-28771", +- "self_type" : "type-28770", ++ "referenced_type" : "type-28770", ++ "self_type" : "type-28769", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81818,8 +81860,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29002", +- "self_type" : "type-29001", ++ "referenced_type" : "type-29001", ++ "self_type" : "type-29000", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81827,8 +81869,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29298", +- "self_type" : "type-29297", ++ "referenced_type" : "type-29297", ++ "self_type" : "type-29296", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81836,8 +81878,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29464", +- "self_type" : "type-29463", ++ "referenced_type" : "type-29463", ++ "self_type" : "type-29462", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81845,8 +81887,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29617", +- "self_type" : "type-29616", ++ "referenced_type" : "type-29616", ++ "self_type" : "type-29615", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81854,8 +81896,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29770", +- "self_type" : "type-29769", ++ "referenced_type" : "type-29769", ++ "self_type" : "type-29768", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81863,8 +81905,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-30028", +- "self_type" : "type-30027", ++ "referenced_type" : "type-30027", ++ "self_type" : "type-30026", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81872,8 +81914,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-30280", +- "self_type" : "type-30279", ++ "referenced_type" : "type-30279", ++ "self_type" : "type-30278", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81890,8 +81932,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-10140", +- "self_type" : "type-10139", ++ "referenced_type" : "type-10092", ++ "self_type" : "type-10091", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81899,8 +81941,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-10649", +- "self_type" : "type-10648", ++ "referenced_type" : "type-10601", ++ "self_type" : "type-10600", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81908,8 +81950,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-10954", +- "self_type" : "type-10953", ++ "referenced_type" : "type-10906", ++ "self_type" : "type-10905", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81917,8 +81959,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-11306", +- "self_type" : "type-11305", ++ "referenced_type" : "type-11258", ++ "self_type" : "type-11257", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81926,8 +81968,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-11465", +- "self_type" : "type-11464", ++ "referenced_type" : "type-11417", ++ "self_type" : "type-11416", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81935,8 +81977,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-12351", +- "self_type" : "type-12350", ++ "referenced_type" : "type-12303", ++ "self_type" : "type-12302", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81944,8 +81986,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-13473", +- "self_type" : "type-13472", ++ "referenced_type" : "type-13425", ++ "self_type" : "type-13424", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81953,8 +81995,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-13940", +- "self_type" : "type-13939", ++ "referenced_type" : "type-13892", ++ "self_type" : "type-13891", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81962,8 +82004,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-14245", +- "self_type" : "type-14244", ++ "referenced_type" : "type-14197", ++ "self_type" : "type-14196", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81971,8 +82013,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-14557", +- "self_type" : "type-14556", ++ "referenced_type" : "type-14509", ++ "self_type" : "type-14508", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81980,8 +82022,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-14685", +- "self_type" : "type-14684", ++ "referenced_type" : "type-14637", ++ "self_type" : "type-14636", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81989,8 +82031,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-14924", +- "self_type" : "type-14923", ++ "referenced_type" : "type-14876", ++ "self_type" : "type-14875", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -81998,8 +82040,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-15285", +- "self_type" : "type-15284", ++ "referenced_type" : "type-15237", ++ "self_type" : "type-15236", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82007,8 +82049,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16206", +- "self_type" : "type-16205", ++ "referenced_type" : "type-16158", ++ "self_type" : "type-16157", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82016,8 +82058,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17329", +- "self_type" : "type-17328", ++ "referenced_type" : "type-17281", ++ "self_type" : "type-17280", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82025,8 +82067,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17804", +- "self_type" : "type-17803", ++ "referenced_type" : "type-17756", ++ "self_type" : "type-17755", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82034,8 +82076,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18109", +- "self_type" : "type-18108", ++ "referenced_type" : "type-18061", ++ "self_type" : "type-18060", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82043,8 +82085,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18421", +- "self_type" : "type-18420", ++ "referenced_type" : "type-18373", ++ "self_type" : "type-18372", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82052,8 +82094,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18549", +- "self_type" : "type-18548", ++ "referenced_type" : "type-18501", ++ "self_type" : "type-18500", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82061,8 +82103,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18781", +- "self_type" : "type-18780", ++ "referenced_type" : "type-18733", ++ "self_type" : "type-18732", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82070,8 +82112,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19061", +- "self_type" : "type-19060", ++ "referenced_type" : "type-19013", ++ "self_type" : "type-19012", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82079,8 +82121,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19300", +- "self_type" : "type-19299", ++ "referenced_type" : "type-19252", ++ "self_type" : "type-19251", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82088,8 +82130,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19445", +- "self_type" : "type-19444", ++ "referenced_type" : "type-19397", ++ "self_type" : "type-19396", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82097,8 +82139,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19647", +- "self_type" : "type-19646", ++ "referenced_type" : "type-19599", ++ "self_type" : "type-19598", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82106,8 +82148,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19816", +- "self_type" : "type-19815", ++ "referenced_type" : "type-19768", ++ "self_type" : "type-19767", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82115,8 +82157,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19973", +- "self_type" : "type-19972", ++ "referenced_type" : "type-19925", ++ "self_type" : "type-19924", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82124,8 +82166,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-20737", +- "self_type" : "type-20736", ++ "referenced_type" : "type-20689", ++ "self_type" : "type-20688", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82133,8 +82175,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-21861", +- "self_type" : "type-21860", ++ "referenced_type" : "type-21813", ++ "self_type" : "type-21812", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82142,8 +82184,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-22333", +- "self_type" : "type-22332", ++ "referenced_type" : "type-22301", ++ "self_type" : "type-22300", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82151,8 +82193,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-22638", +- "self_type" : "type-22637", ++ "referenced_type" : "type-22550", ++ "self_type" : "type-22549", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82160,8 +82202,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-22950", +- "self_type" : "type-22949", ++ "referenced_type" : "type-22916", ++ "self_type" : "type-22915", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82169,8 +82211,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23078", +- "self_type" : "type-23077", ++ "referenced_type" : "type-23061", ++ "self_type" : "type-23060", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82178,8 +82220,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23310", +- "self_type" : "type-23309", ++ "referenced_type" : "type-23305", ++ "self_type" : "type-23304", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82187,8 +82229,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23590", +- "self_type" : "type-23589", ++ "referenced_type" : "type-23571", ++ "self_type" : "type-23570", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82196,8 +82238,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23821", +- "self_type" : "type-23820", ++ "referenced_type" : "type-23810", ++ "self_type" : "type-23809", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82205,8 +82247,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23945", +- "self_type" : "type-23944", ++ "referenced_type" : "type-23948", ++ "self_type" : "type-23947", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82214,8 +82256,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24117", +- "self_type" : "type-24116", ++ "referenced_type" : "type-24115", ++ "self_type" : "type-24114", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82223,8 +82265,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24283", +- "self_type" : "type-24282", ++ "referenced_type" : "type-24285", ++ "self_type" : "type-24284", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82232,8 +82274,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24436", +- "self_type" : "type-24435", ++ "referenced_type" : "type-24416", ++ "self_type" : "type-24415", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82241,8 +82283,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24589", +- "self_type" : "type-24588", ++ "referenced_type" : "type-24556", ++ "self_type" : "type-24555", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82250,8 +82292,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24716", +- "self_type" : "type-24715", ++ "referenced_type" : "type-24678", ++ "self_type" : "type-24677", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82259,8 +82301,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24853", +- "self_type" : "type-24852", ++ "referenced_type" : "type-24813", ++ "self_type" : "type-24812", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82268,8 +82310,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-25139", +- "self_type" : "type-25138", ++ "referenced_type" : "type-25115", ++ "self_type" : "type-25114", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82277,8 +82319,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-25233", +- "self_type" : "type-25232", ++ "referenced_type" : "type-25234", ++ "self_type" : "type-25233", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82286,8 +82328,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-25916", +- "self_type" : "type-25915", ++ "referenced_type" : "type-25967", ++ "self_type" : "type-25966", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82295,8 +82337,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-27039", +- "self_type" : "type-27038", ++ "referenced_type" : "type-27069", ++ "self_type" : "type-27068", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82304,8 +82346,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-27518", +- "self_type" : "type-27517", ++ "referenced_type" : "type-27517", ++ "self_type" : "type-27516", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82313,8 +82355,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-27823", +- "self_type" : "type-27822", ++ "referenced_type" : "type-27822", ++ "self_type" : "type-27821", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82322,8 +82364,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-28135", +- "self_type" : "type-28134", ++ "referenced_type" : "type-28134", ++ "self_type" : "type-28133", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82331,8 +82373,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-28263", +- "self_type" : "type-28262", ++ "referenced_type" : "type-28262", ++ "self_type" : "type-28261", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82340,8 +82382,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-28495", +- "self_type" : "type-28494", ++ "referenced_type" : "type-28494", ++ "self_type" : "type-28493", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82349,8 +82391,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-28775", +- "self_type" : "type-28774", ++ "referenced_type" : "type-28774", ++ "self_type" : "type-28773", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82358,8 +82400,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29006", +- "self_type" : "type-29005", ++ "referenced_type" : "type-29005", ++ "self_type" : "type-29004", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82367,8 +82409,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29130", +- "self_type" : "type-29129", ++ "referenced_type" : "type-29129", ++ "self_type" : "type-29128", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82376,8 +82418,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29302", +- "self_type" : "type-29301", ++ "referenced_type" : "type-29301", ++ "self_type" : "type-29300", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82385,8 +82427,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29468", +- "self_type" : "type-29467", ++ "referenced_type" : "type-29467", ++ "self_type" : "type-29466", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82394,8 +82436,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29621", +- "self_type" : "type-29620", ++ "referenced_type" : "type-29620", ++ "self_type" : "type-29619", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82403,8 +82445,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29774", +- "self_type" : "type-29773", ++ "referenced_type" : "type-29773", ++ "self_type" : "type-29772", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82412,8 +82454,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29897", +- "self_type" : "type-29896", ++ "referenced_type" : "type-29896", ++ "self_type" : "type-29895", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82421,8 +82463,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-30032", +- "self_type" : "type-30031", ++ "referenced_type" : "type-30031", ++ "self_type" : "type-30030", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82430,8 +82472,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-30284", +- "self_type" : "type-30283", ++ "referenced_type" : "type-30283", ++ "self_type" : "type-30282", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82439,8 +82481,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-30377", +- "self_type" : "type-30376", ++ "referenced_type" : "type-30376", ++ "self_type" : "type-30375", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82448,8 +82490,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-31062", +- "self_type" : "type-31061", ++ "referenced_type" : "type-31061", ++ "self_type" : "type-31060", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82457,8 +82499,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-32186", +- "self_type" : "type-32185", ++ "referenced_type" : "type-32185", ++ "self_type" : "type-32184", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82466,8 +82508,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-3834", +- "self_type" : "type-3833", ++ "referenced_type" : "type-3786", ++ "self_type" : "type-3785", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82484,8 +82526,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-5760", +- "self_type" : "type-5759", ++ "referenced_type" : "type-5712", ++ "self_type" : "type-5711", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82493,8 +82535,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-7067", +- "self_type" : "type-7066", ++ "referenced_type" : "type-7019", ++ "self_type" : "type-7018", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82502,8 +82544,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-7734", +- "self_type" : "type-7733", ++ "referenced_type" : "type-7686", ++ "self_type" : "type-7685", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82511,8 +82553,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-8055", +- "self_type" : "type-8054", ++ "referenced_type" : "type-8007", ++ "self_type" : "type-8006", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82520,8 +82562,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-9017", +- "self_type" : "type-9016", ++ "referenced_type" : "type-8969", ++ "self_type" : "type-8968", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82529,8 +82571,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-10144", +- "self_type" : "type-10143", ++ "referenced_type" : "type-10096", ++ "self_type" : "type-10095", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82538,8 +82580,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-10653", +- "self_type" : "type-10652", ++ "referenced_type" : "type-10605", ++ "self_type" : "type-10604", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82547,8 +82589,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-10958", +- "self_type" : "type-10957", ++ "referenced_type" : "type-10910", ++ "self_type" : "type-10909", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82556,8 +82598,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-11310", +- "self_type" : "type-11309", ++ "referenced_type" : "type-11262", ++ "self_type" : "type-11261", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82565,8 +82607,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-11469", +- "self_type" : "type-11468", ++ "referenced_type" : "type-11421", ++ "self_type" : "type-11420", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82574,8 +82616,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-12355", +- "self_type" : "type-12354", ++ "referenced_type" : "type-12307", ++ "self_type" : "type-12306", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82583,8 +82625,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-13477", +- "self_type" : "type-13476", ++ "referenced_type" : "type-13429", ++ "self_type" : "type-13428", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82592,8 +82634,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-13944", +- "self_type" : "type-13943", ++ "referenced_type" : "type-13896", ++ "self_type" : "type-13895", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82601,8 +82643,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-14249", +- "self_type" : "type-14248", ++ "referenced_type" : "type-14201", ++ "self_type" : "type-14200", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82610,8 +82652,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-14561", +- "self_type" : "type-14560", ++ "referenced_type" : "type-14513", ++ "self_type" : "type-14512", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82619,8 +82661,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-14689", +- "self_type" : "type-14688", ++ "referenced_type" : "type-14641", ++ "self_type" : "type-14640", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82628,8 +82670,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-14928", +- "self_type" : "type-14927", ++ "referenced_type" : "type-14880", ++ "self_type" : "type-14879", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82637,8 +82679,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-15289", +- "self_type" : "type-15288", ++ "referenced_type" : "type-15241", ++ "self_type" : "type-15240", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82646,8 +82688,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16210", +- "self_type" : "type-16209", ++ "referenced_type" : "type-16162", ++ "self_type" : "type-16161", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82655,8 +82697,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17333", +- "self_type" : "type-17332", ++ "referenced_type" : "type-17285", ++ "self_type" : "type-17284", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82664,8 +82706,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17808", +- "self_type" : "type-17807", ++ "referenced_type" : "type-17760", ++ "self_type" : "type-17759", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82673,8 +82715,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18113", +- "self_type" : "type-18112", ++ "referenced_type" : "type-18065", ++ "self_type" : "type-18064", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82682,8 +82724,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18425", +- "self_type" : "type-18424", ++ "referenced_type" : "type-18377", ++ "self_type" : "type-18376", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82691,8 +82733,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18553", +- "self_type" : "type-18552", ++ "referenced_type" : "type-18505", ++ "self_type" : "type-18504", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82700,8 +82742,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18785", +- "self_type" : "type-18784", ++ "referenced_type" : "type-18737", ++ "self_type" : "type-18736", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82709,8 +82751,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19065", +- "self_type" : "type-19064", ++ "referenced_type" : "type-19017", ++ "self_type" : "type-19016", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82718,8 +82760,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19304", +- "self_type" : "type-19303", ++ "referenced_type" : "type-19256", ++ "self_type" : "type-19255", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82727,8 +82769,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19449", +- "self_type" : "type-19448", ++ "referenced_type" : "type-19401", ++ "self_type" : "type-19400", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82736,8 +82778,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19653", +- "self_type" : "type-19652", ++ "referenced_type" : "type-19605", ++ "self_type" : "type-19604", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82745,8 +82787,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19820", +- "self_type" : "type-19819", ++ "referenced_type" : "type-19772", ++ "self_type" : "type-19771", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82754,8 +82796,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19977", +- "self_type" : "type-19976", ++ "referenced_type" : "type-19929", ++ "self_type" : "type-19928", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82763,8 +82805,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-20741", +- "self_type" : "type-20740", ++ "referenced_type" : "type-20693", ++ "self_type" : "type-20692", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82772,8 +82814,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-21865", +- "self_type" : "type-21864", ++ "referenced_type" : "type-21817", ++ "self_type" : "type-21816", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82781,8 +82823,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-22337", +- "self_type" : "type-22336", ++ "referenced_type" : "type-22306", ++ "self_type" : "type-22305", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82790,8 +82832,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-22642", +- "self_type" : "type-22641", ++ "referenced_type" : "type-22554", ++ "self_type" : "type-22553", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82799,8 +82841,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-22954", +- "self_type" : "type-22953", ++ "referenced_type" : "type-22921", ++ "self_type" : "type-22920", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82808,8 +82850,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23082", +- "self_type" : "type-23081", ++ "referenced_type" : "type-23065", ++ "self_type" : "type-23064", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82817,8 +82859,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23314", +- "self_type" : "type-23313", ++ "referenced_type" : "type-23309", ++ "self_type" : "type-23308", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82826,8 +82868,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23594", +- "self_type" : "type-23593", ++ "referenced_type" : "type-23575", ++ "self_type" : "type-23574", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82835,8 +82877,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23825", +- "self_type" : "type-23824", ++ "referenced_type" : "type-23814", ++ "self_type" : "type-23813", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82844,8 +82886,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23949", +- "self_type" : "type-23948", ++ "referenced_type" : "type-23953", ++ "self_type" : "type-23952", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82853,8 +82895,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24123", +- "self_type" : "type-24122", ++ "referenced_type" : "type-24119", ++ "self_type" : "type-24118", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82862,8 +82904,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24287", +- "self_type" : "type-24286", ++ "referenced_type" : "type-24289", ++ "self_type" : "type-24288", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82871,8 +82913,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24440", +- "self_type" : "type-24439", ++ "referenced_type" : "type-24420", ++ "self_type" : "type-24419", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82880,8 +82922,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24594", +- "self_type" : "type-24593", ++ "referenced_type" : "type-24560", ++ "self_type" : "type-24559", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82889,8 +82931,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24720", +- "self_type" : "type-24719", ++ "referenced_type" : "type-24682", ++ "self_type" : "type-24681", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82898,8 +82940,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24857", +- "self_type" : "type-24856", ++ "referenced_type" : "type-24817", ++ "self_type" : "type-24816", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82907,8 +82949,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-25143", +- "self_type" : "type-25142", ++ "referenced_type" : "type-25119", ++ "self_type" : "type-25118", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82916,8 +82958,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-25237", +- "self_type" : "type-25236", ++ "referenced_type" : "type-25238", ++ "self_type" : "type-25237", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82925,8 +82967,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-25920", +- "self_type" : "type-25919", ++ "referenced_type" : "type-25971", ++ "self_type" : "type-25970", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82934,8 +82976,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-27043", +- "self_type" : "type-27042", ++ "referenced_type" : "type-27073", ++ "self_type" : "type-27072", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82943,8 +82985,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-27522", +- "self_type" : "type-27521", ++ "referenced_type" : "type-27521", ++ "self_type" : "type-27520", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82952,8 +82994,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-27827", +- "self_type" : "type-27826", ++ "referenced_type" : "type-27826", ++ "self_type" : "type-27825", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82961,8 +83003,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-28139", +- "self_type" : "type-28138", ++ "referenced_type" : "type-28138", ++ "self_type" : "type-28137", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82970,8 +83012,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-28267", +- "self_type" : "type-28266", ++ "referenced_type" : "type-28266", ++ "self_type" : "type-28265", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82979,8 +83021,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-28499", +- "self_type" : "type-28498", ++ "referenced_type" : "type-28498", ++ "self_type" : "type-28497", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82988,8 +83030,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-28779", +- "self_type" : "type-28778", ++ "referenced_type" : "type-28778", ++ "self_type" : "type-28777", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -82997,8 +83039,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29010", +- "self_type" : "type-29009", ++ "referenced_type" : "type-29009", ++ "self_type" : "type-29008", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83006,8 +83048,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29134", +- "self_type" : "type-29133", ++ "referenced_type" : "type-29133", ++ "self_type" : "type-29132", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83015,8 +83057,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29308", +- "self_type" : "type-29307", ++ "referenced_type" : "type-29307", ++ "self_type" : "type-29306", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83024,8 +83066,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29472", +- "self_type" : "type-29471", ++ "referenced_type" : "type-29471", ++ "self_type" : "type-29470", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83033,8 +83075,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29625", +- "self_type" : "type-29624", ++ "referenced_type" : "type-29624", ++ "self_type" : "type-29623", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83042,8 +83084,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29779", +- "self_type" : "type-29778", ++ "referenced_type" : "type-29778", ++ "self_type" : "type-29777", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83051,8 +83093,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29901", +- "self_type" : "type-29900", ++ "referenced_type" : "type-29900", ++ "self_type" : "type-29899", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83060,8 +83102,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-30036", +- "self_type" : "type-30035", ++ "referenced_type" : "type-30035", ++ "self_type" : "type-30034", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83069,8 +83111,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-30288", +- "self_type" : "type-30287", ++ "referenced_type" : "type-30287", ++ "self_type" : "type-30286", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83078,8 +83120,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-30381", +- "self_type" : "type-30380", ++ "referenced_type" : "type-30380", ++ "self_type" : "type-30379", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83087,8 +83129,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-31066", +- "self_type" : "type-31065", ++ "referenced_type" : "type-31065", ++ "self_type" : "type-31064", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83096,8 +83138,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-32190", +- "self_type" : "type-32189", ++ "referenced_type" : "type-32189", ++ "self_type" : "type-32188", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83105,8 +83147,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-3838", +- "self_type" : "type-3837", ++ "referenced_type" : "type-3790", ++ "self_type" : "type-3789", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83123,8 +83165,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-5764", +- "self_type" : "type-5763", ++ "referenced_type" : "type-5716", ++ "self_type" : "type-5715", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83132,8 +83174,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-7071", +- "self_type" : "type-7070", ++ "referenced_type" : "type-7023", ++ "self_type" : "type-7022", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83141,8 +83183,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-7738", +- "self_type" : "type-7737", ++ "referenced_type" : "type-7690", ++ "self_type" : "type-7689", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83150,8 +83192,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-8059", +- "self_type" : "type-8058", ++ "referenced_type" : "type-8011", ++ "self_type" : "type-8010", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83159,8 +83201,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-9021", +- "self_type" : "type-9020", ++ "referenced_type" : "type-8973", ++ "self_type" : "type-8972", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83168,8 +83210,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-10148", +- "self_type" : "type-10147", ++ "referenced_type" : "type-10100", ++ "self_type" : "type-10099", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83177,8 +83219,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-10658", +- "self_type" : "type-10657", ++ "referenced_type" : "type-10610", ++ "self_type" : "type-10609", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83186,8 +83228,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-10962", +- "self_type" : "type-10961", ++ "referenced_type" : "type-10914", ++ "self_type" : "type-10913", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83195,8 +83237,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-11314", +- "self_type" : "type-11313", ++ "referenced_type" : "type-11266", ++ "self_type" : "type-11265", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83204,8 +83246,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-11473", +- "self_type" : "type-11472", ++ "referenced_type" : "type-11425", ++ "self_type" : "type-11424", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83213,8 +83255,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-12359", +- "self_type" : "type-12358", ++ "referenced_type" : "type-12311", ++ "self_type" : "type-12310", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83222,8 +83264,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-13481", +- "self_type" : "type-13480", ++ "referenced_type" : "type-13433", ++ "self_type" : "type-13432", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83231,8 +83273,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-13949", +- "self_type" : "type-13948", ++ "referenced_type" : "type-13901", ++ "self_type" : "type-13900", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83240,8 +83282,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-14253", +- "self_type" : "type-14252", ++ "referenced_type" : "type-14205", ++ "self_type" : "type-14204", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83249,8 +83291,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-14565", +- "self_type" : "type-14564", ++ "referenced_type" : "type-14517", ++ "self_type" : "type-14516", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83258,8 +83300,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-14693", +- "self_type" : "type-14692", ++ "referenced_type" : "type-14645", ++ "self_type" : "type-14644", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83267,8 +83309,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-14932", +- "self_type" : "type-14931", ++ "referenced_type" : "type-14884", ++ "self_type" : "type-14883", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83276,8 +83318,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-15293", +- "self_type" : "type-15292", ++ "referenced_type" : "type-15245", ++ "self_type" : "type-15244", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83285,8 +83327,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-16214", +- "self_type" : "type-16213", ++ "referenced_type" : "type-16166", ++ "self_type" : "type-16165", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83294,8 +83336,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17337", +- "self_type" : "type-17336", ++ "referenced_type" : "type-17289", ++ "self_type" : "type-17288", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83303,8 +83345,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-17813", +- "self_type" : "type-17812", ++ "referenced_type" : "type-17765", ++ "self_type" : "type-17764", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83312,8 +83354,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18117", +- "self_type" : "type-18116", ++ "referenced_type" : "type-18069", ++ "self_type" : "type-18068", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83321,8 +83363,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18429", +- "self_type" : "type-18428", ++ "referenced_type" : "type-18381", ++ "self_type" : "type-18380", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83330,8 +83372,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18557", +- "self_type" : "type-18556", ++ "referenced_type" : "type-18509", ++ "self_type" : "type-18508", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83339,8 +83381,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-18789", +- "self_type" : "type-18788", ++ "referenced_type" : "type-18741", ++ "self_type" : "type-18740", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83348,8 +83390,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19069", +- "self_type" : "type-19068", ++ "referenced_type" : "type-19021", ++ "self_type" : "type-19020", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83357,8 +83399,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19308", +- "self_type" : "type-19307", ++ "referenced_type" : "type-19260", ++ "self_type" : "type-19259", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83366,8 +83408,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19453", +- "self_type" : "type-19452", ++ "referenced_type" : "type-19405", ++ "self_type" : "type-19404", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83375,8 +83417,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19657", +- "self_type" : "type-19656", ++ "referenced_type" : "type-19609", ++ "self_type" : "type-19608", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83384,8 +83426,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19825", +- "self_type" : "type-19824", ++ "referenced_type" : "type-19777", ++ "self_type" : "type-19776", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83393,8 +83435,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-19981", +- "self_type" : "type-19980", ++ "referenced_type" : "type-19933", ++ "self_type" : "type-19932", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83402,8 +83444,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-20745", +- "self_type" : "type-20744", ++ "referenced_type" : "type-20697", ++ "self_type" : "type-20696", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83411,8 +83453,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-21869", +- "self_type" : "type-21868", ++ "referenced_type" : "type-21821", ++ "self_type" : "type-21820", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83420,8 +83462,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-22342", +- "self_type" : "type-22341", ++ "referenced_type" : "type-22310", ++ "self_type" : "type-22309", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83429,8 +83471,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-22646", +- "self_type" : "type-22645", ++ "referenced_type" : "type-22558", ++ "self_type" : "type-22557", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83438,8 +83480,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-22958", +- "self_type" : "type-22957", ++ "referenced_type" : "type-22925", ++ "self_type" : "type-22924", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83447,8 +83489,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23086", +- "self_type" : "type-23085", ++ "referenced_type" : "type-23070", ++ "self_type" : "type-23069", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83456,8 +83498,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23318", +- "self_type" : "type-23317", ++ "referenced_type" : "type-23313", ++ "self_type" : "type-23312", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83465,8 +83507,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23598", +- "self_type" : "type-23597", ++ "referenced_type" : "type-23579", ++ "self_type" : "type-23578", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83474,8 +83516,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23829", +- "self_type" : "type-23828", ++ "referenced_type" : "type-23818", ++ "self_type" : "type-23817", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83483,8 +83525,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-23953", +- "self_type" : "type-23952", ++ "referenced_type" : "type-23957", ++ "self_type" : "type-23956", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83492,8 +83534,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24127", +- "self_type" : "type-24126", ++ "referenced_type" : "type-24123", ++ "self_type" : "type-24122", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83501,8 +83543,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24292", +- "self_type" : "type-24291", ++ "referenced_type" : "type-24293", ++ "self_type" : "type-24292", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83510,8 +83552,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24444", +- "self_type" : "type-24443", ++ "referenced_type" : "type-24424", ++ "self_type" : "type-24423", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83519,8 +83561,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24598", +- "self_type" : "type-24597", ++ "referenced_type" : "type-24564", ++ "self_type" : "type-24563", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83528,8 +83570,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24724", +- "self_type" : "type-24723", ++ "referenced_type" : "type-24686", ++ "self_type" : "type-24685", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83537,8 +83579,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-24861", +- "self_type" : "type-24860", ++ "referenced_type" : "type-24822", ++ "self_type" : "type-24821", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83546,8 +83588,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-25147", +- "self_type" : "type-25146", ++ "referenced_type" : "type-25123", ++ "self_type" : "type-25122", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83555,8 +83597,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-25241", +- "self_type" : "type-25240", ++ "referenced_type" : "type-25242", ++ "self_type" : "type-25241", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83564,8 +83606,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-25924", +- "self_type" : "type-25923", ++ "referenced_type" : "type-25977", ++ "self_type" : "type-25976", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83573,8 +83615,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-27047", +- "self_type" : "type-27046", ++ "referenced_type" : "type-27077", ++ "self_type" : "type-27076", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83582,8 +83624,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-27527", +- "self_type" : "type-27526", ++ "referenced_type" : "type-27526", ++ "self_type" : "type-27525", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83591,8 +83633,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-27831", +- "self_type" : "type-27830", ++ "referenced_type" : "type-27830", ++ "self_type" : "type-27829", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83600,8 +83642,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-28143", +- "self_type" : "type-28142", ++ "referenced_type" : "type-28142", ++ "self_type" : "type-28141", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83609,8 +83651,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-28271", +- "self_type" : "type-28270", ++ "referenced_type" : "type-28270", ++ "self_type" : "type-28269", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83618,8 +83660,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-28503", +- "self_type" : "type-28502", ++ "referenced_type" : "type-28502", ++ "self_type" : "type-28501", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83627,8 +83669,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-28783", +- "self_type" : "type-28782", ++ "referenced_type" : "type-28782", ++ "self_type" : "type-28781", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83636,8 +83678,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29014", +- "self_type" : "type-29013", ++ "referenced_type" : "type-29013", ++ "self_type" : "type-29012", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83645,8 +83687,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29138", +- "self_type" : "type-29137", ++ "referenced_type" : "type-29137", ++ "self_type" : "type-29136", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83654,8 +83696,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29312", +- "self_type" : "type-29311", ++ "referenced_type" : "type-29311", ++ "self_type" : "type-29310", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83663,8 +83705,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29477", +- "self_type" : "type-29476", ++ "referenced_type" : "type-29476", ++ "self_type" : "type-29475", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83672,8 +83714,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29629", +- "self_type" : "type-29628", ++ "referenced_type" : "type-29628", ++ "self_type" : "type-29627", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83681,8 +83723,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29783", +- "self_type" : "type-29782", ++ "referenced_type" : "type-29782", ++ "self_type" : "type-29781", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83690,8 +83732,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-29905", +- "self_type" : "type-29904", ++ "referenced_type" : "type-29904", ++ "self_type" : "type-29903", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83699,8 +83741,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-30040", +- "self_type" : "type-30039", ++ "referenced_type" : "type-30039", ++ "self_type" : "type-30038", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83708,8 +83750,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-30292", +- "self_type" : "type-30291", ++ "referenced_type" : "type-30291", ++ "self_type" : "type-30290", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83717,8 +83759,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-30385", +- "self_type" : "type-30384", ++ "referenced_type" : "type-30384", ++ "self_type" : "type-30383", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83726,8 +83768,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-31070", +- "self_type" : "type-31069", ++ "referenced_type" : "type-31069", ++ "self_type" : "type-31068", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83735,8 +83777,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-32194", +- "self_type" : "type-32193", ++ "referenced_type" : "type-32193", ++ "self_type" : "type-32192", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83744,8 +83786,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-3842", +- "self_type" : "type-3841", ++ "referenced_type" : "type-3794", ++ "self_type" : "type-3793", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83762,8 +83804,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-5768", +- "self_type" : "type-5767", ++ "referenced_type" : "type-5720", ++ "self_type" : "type-5719", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83771,8 +83813,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-7075", +- "self_type" : "type-7074", ++ "referenced_type" : "type-7027", ++ "self_type" : "type-7026", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83780,8 +83822,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-7743", +- "self_type" : "type-7742", ++ "referenced_type" : "type-7695", ++ "self_type" : "type-7694", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83789,8 +83831,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-8063", +- "self_type" : "type-8062", ++ "referenced_type" : "type-8015", ++ "self_type" : "type-8014", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83798,8 +83840,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField &", + "name" : "const google::protobuf::RepeatedField &", +- "referenced_type" : "type-9025", +- "self_type" : "type-9024", ++ "referenced_type" : "type-8977", ++ "self_type" : "type-8976", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -83807,8 +83849,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-2067", +- "self_type" : "type-2222", ++ "referenced_type" : "type-1999", ++ "self_type" : "type-2151", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -83816,8 +83858,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-2089", +- "self_type" : "type-2231", ++ "referenced_type" : "type-2022", ++ "self_type" : "type-2160", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -83825,8 +83867,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-2099", +- "self_type" : "type-2233", ++ "referenced_type" : "type-2032", ++ "self_type" : "type-2162", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -83834,8 +83876,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-2073", +- "self_type" : "type-2223", ++ "referenced_type" : "type-2005", ++ "self_type" : "type-2152", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -83843,8 +83885,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-2418", +- "self_type" : "type-2501", ++ "referenced_type" : "type-2348", ++ "self_type" : "type-2431", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, +@@ -83852,8 +83894,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-2104", +- "self_type" : "type-2238", ++ "referenced_type" : "type-2037", ++ "self_type" : "type-2168", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -83861,8 +83903,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-2405", +- "self_type" : "type-2493", ++ "referenced_type" : "type-2335", ++ "self_type" : "type-2423", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, +@@ -83870,8 +83912,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-2083", +- "self_type" : "type-2226", ++ "referenced_type" : "type-2016", ++ "self_type" : "type-2155", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -83879,8 +83921,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-2062", +- "self_type" : "type-2220", ++ "referenced_type" : "type-1994", ++ "self_type" : "type-2149", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -83888,8 +83930,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-2134", +- "self_type" : "type-2268", ++ "referenced_type" : "type-2065", ++ "self_type" : "type-2197", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -83897,8 +83939,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-10114", +- "self_type" : "type-10113", ++ "referenced_type" : "type-10066", ++ "self_type" : "type-10065", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -83906,8 +83948,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-10255", +- "self_type" : "type-10254", ++ "referenced_type" : "type-10207", ++ "self_type" : "type-10206", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -83915,8 +83957,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-10755", +- "self_type" : "type-10754", ++ "referenced_type" : "type-10707", ++ "self_type" : "type-10706", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -83924,8 +83966,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-10843", +- "self_type" : "type-10842", ++ "referenced_type" : "type-10795", ++ "self_type" : "type-10794", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -83933,8 +83975,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-10933", +- "self_type" : "type-10932", ++ "referenced_type" : "type-10885", ++ "self_type" : "type-10884", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -83942,8 +83984,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-11016", +- "self_type" : "type-11015", ++ "referenced_type" : "type-10968", ++ "self_type" : "type-10967", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -83951,8 +83993,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-11092", +- "self_type" : "type-11091", ++ "referenced_type" : "type-11044", ++ "self_type" : "type-11043", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -83960,8 +84002,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-11285", +- "self_type" : "type-11284", ++ "referenced_type" : "type-11237", ++ "self_type" : "type-11236", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -83969,8 +84011,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-11442", +- "self_type" : "type-11441", ++ "referenced_type" : "type-11394", ++ "self_type" : "type-11393", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -83978,8 +84020,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-11901", +- "self_type" : "type-11900", ++ "referenced_type" : "type-11853", ++ "self_type" : "type-11852", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -83987,8 +84029,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-12071", +- "self_type" : "type-12070", ++ "referenced_type" : "type-12023", ++ "self_type" : "type-12022", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -83996,8 +84038,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-12180", +- "self_type" : "type-12179", ++ "referenced_type" : "type-12132", ++ "self_type" : "type-12131", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84005,8 +84047,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-12314", +- "self_type" : "type-12313", ++ "referenced_type" : "type-12266", ++ "self_type" : "type-12265", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84014,8 +84056,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-12461", +- "self_type" : "type-12460", ++ "referenced_type" : "type-12413", ++ "self_type" : "type-12412", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84023,8 +84065,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-12554", +- "self_type" : "type-12553", ++ "referenced_type" : "type-12506", ++ "self_type" : "type-12505", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84032,8 +84074,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-12655", +- "self_type" : "type-12654", ++ "referenced_type" : "type-12607", ++ "self_type" : "type-12606", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84041,8 +84083,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-12837", +- "self_type" : "type-12836", ++ "referenced_type" : "type-12789", ++ "self_type" : "type-12788", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84050,8 +84092,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-12917", +- "self_type" : "type-12916", ++ "referenced_type" : "type-12869", ++ "self_type" : "type-12868", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84059,8 +84101,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-12975", +- "self_type" : "type-12974", ++ "referenced_type" : "type-12927", ++ "self_type" : "type-12926", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84068,8 +84110,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-13049", +- "self_type" : "type-13048", ++ "referenced_type" : "type-13001", ++ "self_type" : "type-13000", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84077,8 +84119,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-13447", +- "self_type" : "type-13446", ++ "referenced_type" : "type-13399", ++ "self_type" : "type-13398", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84086,8 +84128,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-13546", +- "self_type" : "type-13545", ++ "referenced_type" : "type-13498", ++ "self_type" : "type-13497", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84095,8 +84137,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-14046", +- "self_type" : "type-14045", ++ "referenced_type" : "type-13998", ++ "self_type" : "type-13997", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84104,8 +84146,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-14134", +- "self_type" : "type-14133", ++ "referenced_type" : "type-14086", ++ "self_type" : "type-14085", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84113,8 +84155,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-14224", +- "self_type" : "type-14223", ++ "referenced_type" : "type-14176", ++ "self_type" : "type-14175", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84122,8 +84164,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-14307", +- "self_type" : "type-14306", ++ "referenced_type" : "type-14259", ++ "self_type" : "type-14258", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84131,8 +84173,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-14374", +- "self_type" : "type-14373", ++ "referenced_type" : "type-14326", ++ "self_type" : "type-14325", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84140,8 +84182,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-14536", +- "self_type" : "type-14535", ++ "referenced_type" : "type-14488", ++ "self_type" : "type-14487", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84149,8 +84191,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-14661", +- "self_type" : "type-14660", ++ "referenced_type" : "type-14613", ++ "self_type" : "type-14612", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84158,8 +84200,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-14803", +- "self_type" : "type-14802", ++ "referenced_type" : "type-14755", ++ "self_type" : "type-14754", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84167,8 +84209,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-14894", +- "self_type" : "type-14893", ++ "referenced_type" : "type-14846", ++ "self_type" : "type-14845", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84176,8 +84218,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-15255", +- "self_type" : "type-15254", ++ "referenced_type" : "type-15207", ++ "self_type" : "type-15206", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84185,8 +84227,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-15758", +- "self_type" : "type-15757", ++ "referenced_type" : "type-15710", ++ "self_type" : "type-15709", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84194,8 +84236,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-15927", +- "self_type" : "type-15926", ++ "referenced_type" : "type-15879", ++ "self_type" : "type-15878", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84203,8 +84245,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-16035", +- "self_type" : "type-16034", ++ "referenced_type" : "type-15987", ++ "self_type" : "type-15986", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84212,8 +84254,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-16169", +- "self_type" : "type-16168", ++ "referenced_type" : "type-16121", ++ "self_type" : "type-16120", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84221,8 +84263,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-16318", +- "self_type" : "type-16317", ++ "referenced_type" : "type-16270", ++ "self_type" : "type-16269", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84230,8 +84272,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-16411", +- "self_type" : "type-16410", ++ "referenced_type" : "type-16363", ++ "self_type" : "type-16362", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84239,8 +84281,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-16511", +- "self_type" : "type-16510", ++ "referenced_type" : "type-16463", ++ "self_type" : "type-16462", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84248,8 +84290,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-16693", +- "self_type" : "type-16692", ++ "referenced_type" : "type-16645", ++ "self_type" : "type-16644", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84257,8 +84299,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-16773", +- "self_type" : "type-16772", ++ "referenced_type" : "type-16725", ++ "self_type" : "type-16724", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84266,8 +84308,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-16831", +- "self_type" : "type-16830", ++ "referenced_type" : "type-16783", ++ "self_type" : "type-16782", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84275,8 +84317,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-16905", +- "self_type" : "type-16904", ++ "referenced_type" : "type-16857", ++ "self_type" : "type-16856", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84284,8 +84326,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-17303", +- "self_type" : "type-17302", ++ "referenced_type" : "type-17255", ++ "self_type" : "type-17254", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84293,8 +84335,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-17410", +- "self_type" : "type-17409", ++ "referenced_type" : "type-17362", ++ "self_type" : "type-17361", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84302,8 +84344,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-17910", +- "self_type" : "type-17909", ++ "referenced_type" : "type-17862", ++ "self_type" : "type-17861", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84311,8 +84353,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-17998", +- "self_type" : "type-17997", ++ "referenced_type" : "type-17950", ++ "self_type" : "type-17949", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84320,8 +84362,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-18088", +- "self_type" : "type-18087", ++ "referenced_type" : "type-18040", ++ "self_type" : "type-18039", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84329,8 +84371,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-18171", +- "self_type" : "type-18170", ++ "referenced_type" : "type-18123", ++ "self_type" : "type-18122", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84338,8 +84380,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-18238", +- "self_type" : "type-18237", ++ "referenced_type" : "type-18190", ++ "self_type" : "type-18189", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84347,8 +84389,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-18400", +- "self_type" : "type-18399", ++ "referenced_type" : "type-18352", ++ "self_type" : "type-18351", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84356,8 +84398,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-18525", +- "self_type" : "type-18524", ++ "referenced_type" : "type-18477", ++ "self_type" : "type-18476", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84365,8 +84407,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-18667", +- "self_type" : "type-18666", ++ "referenced_type" : "type-18619", ++ "self_type" : "type-18618", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84374,8 +84416,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-18751", +- "self_type" : "type-18750", ++ "referenced_type" : "type-18703", ++ "self_type" : "type-18702", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84383,8 +84425,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-19031", +- "self_type" : "type-19030", ++ "referenced_type" : "type-18983", ++ "self_type" : "type-18982", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84392,8 +84434,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-19273", +- "self_type" : "type-19272", ++ "referenced_type" : "type-19225", ++ "self_type" : "type-19224", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84401,8 +84443,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-19424", +- "self_type" : "type-19423", ++ "referenced_type" : "type-19376", ++ "self_type" : "type-19375", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84410,8 +84452,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-19612", +- "self_type" : "type-19611", ++ "referenced_type" : "type-19564", ++ "self_type" : "type-19563", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84419,8 +84461,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-19782", +- "self_type" : "type-19781", ++ "referenced_type" : "type-19734", ++ "self_type" : "type-19733", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84428,8 +84470,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-19942", +- "self_type" : "type-19941", ++ "referenced_type" : "type-19894", ++ "self_type" : "type-19893", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84437,8 +84479,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-20291", +- "self_type" : "type-20290", ++ "referenced_type" : "type-20243", ++ "self_type" : "type-20242", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84446,8 +84488,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-20461", +- "self_type" : "type-20460", ++ "referenced_type" : "type-20413", ++ "self_type" : "type-20412", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84455,8 +84497,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-20567", +- "self_type" : "type-20566", ++ "referenced_type" : "type-20519", ++ "self_type" : "type-20518", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84464,8 +84506,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-20700", +- "self_type" : "type-20699", ++ "referenced_type" : "type-20652", ++ "self_type" : "type-20651", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84473,8 +84515,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-20849", +- "self_type" : "type-20848", ++ "referenced_type" : "type-20801", ++ "self_type" : "type-20800", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84482,8 +84524,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-20942", +- "self_type" : "type-20941", ++ "referenced_type" : "type-2086", ++ "self_type" : "type-2085", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84491,8 +84533,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-21043", +- "self_type" : "type-21042", ++ "referenced_type" : "type-20894", ++ "self_type" : "type-20893", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84500,8 +84542,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-21225", +- "self_type" : "type-21224", ++ "referenced_type" : "type-20995", ++ "self_type" : "type-20994", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84509,8 +84551,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-21305", +- "self_type" : "type-21304", ++ "referenced_type" : "type-21177", ++ "self_type" : "type-21176", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84518,8 +84560,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-21363", +- "self_type" : "type-21362", ++ "referenced_type" : "type-21257", ++ "self_type" : "type-21256", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84527,8 +84569,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-21437", +- "self_type" : "type-21436", ++ "referenced_type" : "type-21315", ++ "self_type" : "type-21314", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84536,8 +84578,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-2155", +- "self_type" : "type-2154", ++ "referenced_type" : "type-21389", ++ "self_type" : "type-21388", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84545,8 +84587,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-21835", +- "self_type" : "type-21834", ++ "referenced_type" : "type-21787", ++ "self_type" : "type-21786", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84563,8 +84605,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-22439", +- "self_type" : "type-22438", ++ "referenced_type" : "type-22386", ++ "self_type" : "type-22385", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84572,8 +84614,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-22527", +- "self_type" : "type-22526", ++ "referenced_type" : "type-22444", ++ "self_type" : "type-22443", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84581,8 +84623,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-22617", +- "self_type" : "type-22616", ++ "referenced_type" : "type-22526", ++ "self_type" : "type-22525", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84590,8 +84632,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-22700", +- "self_type" : "type-22699", ++ "referenced_type" : "type-22624", ++ "self_type" : "type-22623", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84599,8 +84641,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-22767", +- "self_type" : "type-22766", ++ "referenced_type" : "type-22710", ++ "self_type" : "type-22709", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84608,8 +84650,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-22929", +- "self_type" : "type-22928", ++ "referenced_type" : "type-22893", ++ "self_type" : "type-22892", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84617,8 +84659,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-23054", +- "self_type" : "type-23053", ++ "referenced_type" : "type-23036", ++ "self_type" : "type-23035", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84626,8 +84668,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-23196", +- "self_type" : "type-23195", ++ "referenced_type" : "type-23182", ++ "self_type" : "type-23181", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84635,8 +84677,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-23280", +- "self_type" : "type-23279", ++ "referenced_type" : "type-23273", ++ "self_type" : "type-23272", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84644,8 +84686,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-23560", +- "self_type" : "type-23559", ++ "referenced_type" : "type-23541", ++ "self_type" : "type-23540", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84653,8 +84695,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-23794", +- "self_type" : "type-23793", ++ "referenced_type" : "type-2371", ++ "self_type" : "type-2370", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84662,8 +84704,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-23924", +- "self_type" : "type-23923", ++ "referenced_type" : "type-23783", ++ "self_type" : "type-23782", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84671,8 +84713,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-24082", +- "self_type" : "type-24081", ++ "referenced_type" : "type-23925", ++ "self_type" : "type-23924", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84680,8 +84722,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-24249", +- "self_type" : "type-24248", ++ "referenced_type" : "type-24080", ++ "self_type" : "type-24079", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84689,8 +84731,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-24405", +- "self_type" : "type-24404", ++ "referenced_type" : "type-24253", ++ "self_type" : "type-24252", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84698,8 +84740,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-2441", +- "self_type" : "type-2440", ++ "referenced_type" : "type-24386", ++ "self_type" : "type-24385", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84707,8 +84749,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-24560", +- "self_type" : "type-24559", ++ "referenced_type" : "type-24529", ++ "self_type" : "type-24528", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84716,8 +84758,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-24695", +- "self_type" : "type-24694", ++ "referenced_type" : "type-24657", ++ "self_type" : "type-24656", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84725,8 +84767,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-24826", +- "self_type" : "type-24825", ++ "referenced_type" : "type-24786", ++ "self_type" : "type-24785", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84734,8 +84776,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-24990", +- "self_type" : "type-24989", ++ "referenced_type" : "type-24959", ++ "self_type" : "type-24958", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84743,8 +84785,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-25112", +- "self_type" : "type-25111", ++ "referenced_type" : "type-2501", ++ "self_type" : "type-2500", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84752,8 +84794,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-25210", +- "self_type" : "type-25209", ++ "referenced_type" : "type-25085", ++ "self_type" : "type-25084", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84761,8 +84803,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-25467", +- "self_type" : "type-25466", ++ "referenced_type" : "type-25212", ++ "self_type" : "type-25211", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84770,8 +84812,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-25637", +- "self_type" : "type-25636", ++ "referenced_type" : "type-25518", ++ "self_type" : "type-25517", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84779,8 +84821,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-2569", +- "self_type" : "type-2568", ++ "referenced_type" : "type-25688", ++ "self_type" : "type-25687", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84788,8 +84830,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-25746", +- "self_type" : "type-25745", ++ "referenced_type" : "type-25795", ++ "self_type" : "type-25794", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84797,8 +84839,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-25879", +- "self_type" : "type-25878", ++ "referenced_type" : "type-25930", ++ "self_type" : "type-25929", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84806,8 +84848,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-26027", +- "self_type" : "type-26026", ++ "referenced_type" : "type-26080", ++ "self_type" : "type-26079", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84815,8 +84857,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-26120", +- "self_type" : "type-26119", ++ "referenced_type" : "type-26165", ++ "self_type" : "type-26164", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84824,8 +84866,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-26221", +- "self_type" : "type-26220", ++ "referenced_type" : "type-26263", ++ "self_type" : "type-26262", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84833,8 +84875,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-26403", +- "self_type" : "type-26402", ++ "referenced_type" : "type-26445", ++ "self_type" : "type-26444", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84842,8 +84884,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-26483", +- "self_type" : "type-26482", ++ "referenced_type" : "type-26519", ++ "self_type" : "type-26518", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84851,8 +84893,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-26541", +- "self_type" : "type-26540", ++ "referenced_type" : "type-26566", ++ "self_type" : "type-26565", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84860,8 +84902,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-26615", +- "self_type" : "type-26614", ++ "referenced_type" : "type-26639", ++ "self_type" : "type-26638", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84869,8 +84911,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-27013", +- "self_type" : "type-27012", ++ "referenced_type" : "type-27043", ++ "self_type" : "type-27042", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84878,8 +84920,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-27124", +- "self_type" : "type-27123", ++ "referenced_type" : "type-27123", ++ "self_type" : "type-27122", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84887,8 +84929,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-27624", +- "self_type" : "type-27623", ++ "referenced_type" : "type-27623", ++ "self_type" : "type-27622", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84896,8 +84938,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-27712", +- "self_type" : "type-27711", ++ "referenced_type" : "type-27711", ++ "self_type" : "type-27710", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84905,8 +84947,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-27802", +- "self_type" : "type-27801", ++ "referenced_type" : "type-27801", ++ "self_type" : "type-27800", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84914,8 +84956,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-27885", +- "self_type" : "type-27884", ++ "referenced_type" : "type-27884", ++ "self_type" : "type-27883", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84923,8 +84965,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-27952", +- "self_type" : "type-27951", ++ "referenced_type" : "type-27951", ++ "self_type" : "type-27950", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84932,8 +84974,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-28114", +- "self_type" : "type-28113", ++ "referenced_type" : "type-28113", ++ "self_type" : "type-28112", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84941,8 +84983,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-28239", +- "self_type" : "type-28238", ++ "referenced_type" : "type-28238", ++ "self_type" : "type-28237", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84950,8 +84992,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-28381", +- "self_type" : "type-28380", ++ "referenced_type" : "type-28380", ++ "self_type" : "type-28379", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84959,8 +85001,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-28465", +- "self_type" : "type-28464", ++ "referenced_type" : "type-28464", ++ "self_type" : "type-28463", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84968,8 +85010,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-28745", +- "self_type" : "type-28744", ++ "referenced_type" : "type-28744", ++ "self_type" : "type-28743", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84977,8 +85019,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-28979", +- "self_type" : "type-28978", ++ "referenced_type" : "type-28978", ++ "self_type" : "type-28977", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84986,8 +85028,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-29109", +- "self_type" : "type-29108", ++ "referenced_type" : "type-29108", ++ "self_type" : "type-29107", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -84995,8 +85037,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-29267", +- "self_type" : "type-29266", ++ "referenced_type" : "type-29266", ++ "self_type" : "type-29265", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85004,8 +85046,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-29434", +- "self_type" : "type-29433", ++ "referenced_type" : "type-29433", ++ "self_type" : "type-29432", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85013,8 +85055,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-29590", +- "self_type" : "type-29589", ++ "referenced_type" : "type-29589", ++ "self_type" : "type-29588", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85022,8 +85064,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-29745", +- "self_type" : "type-29744", ++ "referenced_type" : "type-29744", ++ "self_type" : "type-29743", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85031,8 +85073,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-29876", +- "self_type" : "type-29875", ++ "referenced_type" : "type-29875", ++ "self_type" : "type-29874", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85040,8 +85082,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-30005", +- "self_type" : "type-30004", ++ "referenced_type" : "type-30004", ++ "self_type" : "type-30003", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85049,8 +85091,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-30146", +- "self_type" : "type-30145", ++ "referenced_type" : "type-30145", ++ "self_type" : "type-30144", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85058,8 +85100,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-30257", +- "self_type" : "type-30256", ++ "referenced_type" : "type-30256", ++ "self_type" : "type-30255", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85067,8 +85109,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-30354", +- "self_type" : "type-30353", ++ "referenced_type" : "type-30353", ++ "self_type" : "type-30352", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85076,8 +85118,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-30613", +- "self_type" : "type-30612", ++ "referenced_type" : "type-30612", ++ "self_type" : "type-30611", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85085,8 +85127,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-30783", +- "self_type" : "type-30782", ++ "referenced_type" : "type-30782", ++ "self_type" : "type-30781", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85094,8 +85136,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-30892", +- "self_type" : "type-30891", ++ "referenced_type" : "type-30891", ++ "self_type" : "type-30890", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85103,8 +85145,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-31025", +- "self_type" : "type-31024", ++ "referenced_type" : "type-31024", ++ "self_type" : "type-31023", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85112,8 +85154,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-31174", +- "self_type" : "type-31173", ++ "referenced_type" : "type-31173", ++ "self_type" : "type-31172", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85121,8 +85163,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-31267", +- "self_type" : "type-31266", ++ "referenced_type" : "type-31266", ++ "self_type" : "type-31265", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85130,8 +85172,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-31368", +- "self_type" : "type-31367", ++ "referenced_type" : "type-31367", ++ "self_type" : "type-31366", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85139,8 +85181,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-31550", +- "self_type" : "type-31549", ++ "referenced_type" : "type-31549", ++ "self_type" : "type-31548", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85148,8 +85190,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-31630", +- "self_type" : "type-31629", ++ "referenced_type" : "type-31629", ++ "self_type" : "type-31628", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85157,8 +85199,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-31688", +- "self_type" : "type-31687", ++ "referenced_type" : "type-31687", ++ "self_type" : "type-31686", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85166,8 +85208,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-31762", +- "self_type" : "type-31761", ++ "referenced_type" : "type-31761", ++ "self_type" : "type-31760", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85175,8 +85217,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-32160", +- "self_type" : "type-32159", ++ "referenced_type" : "type-32159", ++ "self_type" : "type-32158", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85184,8 +85226,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-3318", +- "self_type" : "type-3317", ++ "referenced_type" : "type-3270", ++ "self_type" : "type-3269", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85193,8 +85235,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-3494", +- "self_type" : "type-3493", ++ "referenced_type" : "type-3446", ++ "self_type" : "type-3445", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85202,8 +85244,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-3609", +- "self_type" : "type-3608", ++ "referenced_type" : "type-3561", ++ "self_type" : "type-3560", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85211,8 +85253,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-3794", +- "self_type" : "type-3793", ++ "referenced_type" : "type-3746", ++ "self_type" : "type-3745", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85220,8 +85262,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-3964", +- "self_type" : "type-3963", ++ "referenced_type" : "type-3916", ++ "self_type" : "type-3915", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85229,8 +85271,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-4106", +- "self_type" : "type-4105", ++ "referenced_type" : "type-4058", ++ "self_type" : "type-4057", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85238,8 +85280,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-4210", +- "self_type" : "type-4209", ++ "referenced_type" : "type-4162", ++ "self_type" : "type-4161", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85247,8 +85289,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-4363", +- "self_type" : "type-4362", ++ "referenced_type" : "type-4315", ++ "self_type" : "type-4314", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85256,8 +85298,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-4424", +- "self_type" : "type-4423", ++ "referenced_type" : "type-4376", ++ "self_type" : "type-4375", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85265,8 +85307,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-4505", +- "self_type" : "type-4504", ++ "referenced_type" : "type-4457", ++ "self_type" : "type-4456", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85274,8 +85316,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-4671", +- "self_type" : "type-4670", ++ "referenced_type" : "type-4623", ++ "self_type" : "type-4622", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85283,8 +85325,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-5298", +- "self_type" : "type-5297", ++ "referenced_type" : "type-5250", ++ "self_type" : "type-5249", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85292,8 +85334,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-5474", +- "self_type" : "type-5473", ++ "referenced_type" : "type-5426", ++ "self_type" : "type-5425", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85301,8 +85343,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-5587", +- "self_type" : "type-5586", ++ "referenced_type" : "type-5539", ++ "self_type" : "type-5538", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85310,8 +85352,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-5723", +- "self_type" : "type-5722", ++ "referenced_type" : "type-5675", ++ "self_type" : "type-5674", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85319,8 +85361,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-5872", +- "self_type" : "type-5871", ++ "referenced_type" : "type-5824", ++ "self_type" : "type-5823", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85328,8 +85370,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-5965", +- "self_type" : "type-5964", ++ "referenced_type" : "type-5917", ++ "self_type" : "type-5916", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85337,8 +85379,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-6066", +- "self_type" : "type-6065", ++ "referenced_type" : "type-6018", ++ "self_type" : "type-6017", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85346,8 +85388,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-6248", +- "self_type" : "type-6247", ++ "referenced_type" : "type-6200", ++ "self_type" : "type-6199", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85355,8 +85397,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-6328", +- "self_type" : "type-6327", ++ "referenced_type" : "type-6280", ++ "self_type" : "type-6279", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85364,8 +85406,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-6389", +- "self_type" : "type-6388", ++ "referenced_type" : "type-6341", ++ "self_type" : "type-6340", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85373,8 +85415,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-6465", +- "self_type" : "type-6464", ++ "referenced_type" : "type-6417", ++ "self_type" : "type-6416", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85382,8 +85424,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-7041", +- "self_type" : "type-7040", ++ "referenced_type" : "type-6993", ++ "self_type" : "type-6992", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85391,8 +85433,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-7167", +- "self_type" : "type-7166", ++ "referenced_type" : "type-7119", ++ "self_type" : "type-7118", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85400,8 +85442,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-7840", +- "self_type" : "type-7839", ++ "referenced_type" : "type-7792", ++ "self_type" : "type-7791", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85409,8 +85451,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-7945", +- "self_type" : "type-7944", ++ "referenced_type" : "type-7897", ++ "self_type" : "type-7896", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85418,8 +85460,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-8034", +- "self_type" : "type-8033", ++ "referenced_type" : "type-7986", ++ "self_type" : "type-7985", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85427,8 +85469,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-8117", +- "self_type" : "type-8116", ++ "referenced_type" : "type-8069", ++ "self_type" : "type-8068", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85436,8 +85478,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-8572", +- "self_type" : "type-8571", ++ "referenced_type" : "type-8524", ++ "self_type" : "type-8523", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85445,8 +85487,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-8739", +- "self_type" : "type-8738", ++ "referenced_type" : "type-8691", ++ "self_type" : "type-8690", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85454,8 +85496,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-8846", +- "self_type" : "type-8845", ++ "referenced_type" : "type-8798", ++ "self_type" : "type-8797", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85463,8 +85505,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-8980", +- "self_type" : "type-8979", ++ "referenced_type" : "type-8932", ++ "self_type" : "type-8931", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85472,8 +85514,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-9129", +- "self_type" : "type-9128", ++ "referenced_type" : "type-9081", ++ "self_type" : "type-9080", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85481,8 +85523,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-9222", +- "self_type" : "type-9221", ++ "referenced_type" : "type-9174", ++ "self_type" : "type-9173", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85490,8 +85532,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-9323", +- "self_type" : "type-9322", ++ "referenced_type" : "type-9275", ++ "self_type" : "type-9274", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85499,8 +85541,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-9505", +- "self_type" : "type-9504", ++ "referenced_type" : "type-9457", ++ "self_type" : "type-9456", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85508,8 +85550,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-9585", +- "self_type" : "type-9584", ++ "referenced_type" : "type-9537", ++ "self_type" : "type-9536", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85517,8 +85559,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-9643", +- "self_type" : "type-9642", ++ "referenced_type" : "type-9595", ++ "self_type" : "type-9594", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85526,8 +85568,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-9717", +- "self_type" : "type-9716", ++ "referenced_type" : "type-9669", ++ "self_type" : "type-9668", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85535,8 +85577,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-2424", +- "self_type" : "type-2426", ++ "referenced_type" : "type-2354", ++ "self_type" : "type-2356", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -85544,8 +85586,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-2110", +- "self_type" : "type-2242", ++ "referenced_type" : "type-2043", ++ "self_type" : "type-2171", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -85553,8 +85595,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-2429", +- "self_type" : "type-2431", ++ "referenced_type" : "type-2359", ++ "self_type" : "type-2361", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -85562,8 +85604,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-2094", +- "self_type" : "type-2232", ++ "referenced_type" : "type-2027", ++ "self_type" : "type-2161", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -85571,8 +85613,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-2411", +- "self_type" : "type-2415", ++ "referenced_type" : "type-2343", ++ "self_type" : "type-2345", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -85580,8 +85622,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-2078", +- "self_type" : "type-2224", ++ "referenced_type" : "type-2011", ++ "self_type" : "type-2153", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -85589,8 +85631,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-2126", +- "self_type" : "type-2259", ++ "referenced_type" : "type-2059", ++ "self_type" : "type-2188", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -85598,8 +85640,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-2115", +- "self_type" : "type-2246", ++ "referenced_type" : "type-2048", ++ "self_type" : "type-2175", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -85607,8 +85649,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-2120", +- "self_type" : "type-2256", ++ "referenced_type" : "type-2053", ++ "self_type" : "type-2185", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -85616,8 +85658,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField &", + "name" : "const google::protobuf::RepeatedPtrField &", +- "referenced_type" : "type-7562", +- "self_type" : "type-7565", ++ "referenced_type" : "type-7514", ++ "self_type" : "type-7517", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -85625,8 +85667,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", +- "referenced_type" : "type-12175", +- "self_type" : "type-12174", ++ "referenced_type" : "type-12127", ++ "self_type" : "type-12126", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85634,8 +85676,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", +- "referenced_type" : "type-14798", +- "self_type" : "type-14797", ++ "referenced_type" : "type-14750", ++ "self_type" : "type-14749", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85643,8 +85685,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", +- "referenced_type" : "type-16030", +- "self_type" : "type-16029", ++ "referenced_type" : "type-15982", ++ "self_type" : "type-15981", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85652,8 +85694,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", +- "referenced_type" : "type-18662", +- "self_type" : "type-18661", ++ "referenced_type" : "type-18614", ++ "self_type" : "type-18613", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85661,8 +85703,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", +- "referenced_type" : "type-20562", +- "self_type" : "type-20561", ++ "referenced_type" : "type-20514", ++ "self_type" : "type-20513", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85670,8 +85712,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", +- "referenced_type" : "type-23191", +- "self_type" : "type-23190", ++ "referenced_type" : "type-23177", ++ "self_type" : "type-23176", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85679,8 +85721,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", +- "referenced_type" : "type-24985", +- "self_type" : "type-24984", ++ "referenced_type" : "type-24954", ++ "self_type" : "type-24953", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85688,8 +85730,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", +- "referenced_type" : "type-2564", +- "self_type" : "type-2563", ++ "referenced_type" : "type-2496", ++ "self_type" : "type-2495", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85697,8 +85739,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", +- "referenced_type" : "type-25741", +- "self_type" : "type-25740", ++ "referenced_type" : "type-25790", ++ "self_type" : "type-25789", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85706,8 +85748,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", +- "referenced_type" : "type-28376", +- "self_type" : "type-28375", ++ "referenced_type" : "type-28375", ++ "self_type" : "type-28374", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85715,8 +85757,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", +- "referenced_type" : "type-30141", +- "self_type" : "type-30140", ++ "referenced_type" : "type-30140", ++ "self_type" : "type-30139", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85724,8 +85766,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", +- "referenced_type" : "type-30887", +- "self_type" : "type-30886", ++ "referenced_type" : "type-30886", ++ "self_type" : "type-30885", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85733,8 +85775,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", +- "referenced_type" : "type-3604", +- "self_type" : "type-3603", ++ "referenced_type" : "type-3556", ++ "self_type" : "type-3555", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85742,8 +85784,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", +- "referenced_type" : "type-5582", +- "self_type" : "type-5581", ++ "referenced_type" : "type-5534", ++ "self_type" : "type-5533", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85760,8 +85802,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > > &", +- "referenced_type" : "type-8841", +- "self_type" : "type-8840", ++ "referenced_type" : "type-8793", ++ "self_type" : "type-8792", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -85769,8 +85811,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceDescriptorProto &", + "name" : "const google::protobuf::ServiceDescriptorProto &", +- "referenced_type" : "type-1887", +- "self_type" : "type-2080", ++ "referenced_type" : "type-1805", ++ "self_type" : "type-2013", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -85778,8 +85820,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceDescriptorProto *const &", + "name" : "const google::protobuf::ServiceDescriptorProto *const &", +- "referenced_type" : "type-4126", +- "self_type" : "type-4127", ++ "referenced_type" : "type-4078", ++ "self_type" : "type-4079", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -85787,8 +85829,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-12142", +- "self_type" : "type-12145", ++ "referenced_type" : "type-12094", ++ "self_type" : "type-12097", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85796,8 +85838,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-13210", +- "self_type" : "type-13213", ++ "referenced_type" : "type-13162", ++ "self_type" : "type-13165", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85805,8 +85847,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-14761", +- "self_type" : "type-14765", ++ "referenced_type" : "type-14713", ++ "self_type" : "type-14717", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85814,8 +85856,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-14852", +- "self_type" : "type-14855", ++ "referenced_type" : "type-14804", ++ "self_type" : "type-14807", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85823,8 +85865,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-15115", +- "self_type" : "type-15118", ++ "referenced_type" : "type-15067", ++ "self_type" : "type-15070", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85832,8 +85874,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-15215", +- "self_type" : "type-15219", ++ "referenced_type" : "type-15167", ++ "self_type" : "type-15171", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85841,8 +85883,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-15997", +- "self_type" : "type-16000", ++ "referenced_type" : "type-15949", ++ "self_type" : "type-15952", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85850,8 +85892,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-17066", +- "self_type" : "type-17069", ++ "referenced_type" : "type-17018", ++ "self_type" : "type-17021", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85859,8 +85901,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-18625", +- "self_type" : "type-18629", ++ "referenced_type" : "type-18577", ++ "self_type" : "type-18581", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85868,8 +85910,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-18709", +- "self_type" : "type-18712", ++ "referenced_type" : "type-18661", ++ "self_type" : "type-18664", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85877,8 +85919,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-18899", +- "self_type" : "type-18902", ++ "referenced_type" : "type-18851", ++ "self_type" : "type-18854", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85886,8 +85928,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-18997", +- "self_type" : "type-19001", ++ "referenced_type" : "type-18949", ++ "self_type" : "type-18953", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85895,8 +85937,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-19240", +- "self_type" : "type-19243", ++ "referenced_type" : "type-1913", ++ "self_type" : "type-1976", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85904,8 +85946,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-19569", +- "self_type" : "type-19572", ++ "referenced_type" : "type-19192", ++ "self_type" : "type-19195", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85913,8 +85955,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-19740", +- "self_type" : "type-19743", ++ "referenced_type" : "type-19521", ++ "self_type" : "type-19524", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85922,8 +85964,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-1987", +- "self_type" : "type-2047", ++ "referenced_type" : "type-19692", ++ "self_type" : "type-19695", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85931,8 +85973,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-19907", +- "self_type" : "type-19911", ++ "referenced_type" : "type-19859", ++ "self_type" : "type-19863", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85940,8 +85982,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-20529", +- "self_type" : "type-20532", ++ "referenced_type" : "type-20481", ++ "self_type" : "type-20484", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85949,8 +85991,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-21598", +- "self_type" : "type-21601", ++ "referenced_type" : "type-21550", ++ "self_type" : "type-21553", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85958,8 +86000,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-23154", +- "self_type" : "type-23158", ++ "referenced_type" : "type-23139", ++ "self_type" : "type-23142", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85967,8 +86009,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-23238", +- "self_type" : "type-23241", ++ "referenced_type" : "type-23227", ++ "self_type" : "type-23231", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85976,8 +86018,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-23428", +- "self_type" : "type-23431", ++ "referenced_type" : "type-23411", ++ "self_type" : "type-23414", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85985,8 +86027,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-23526", +- "self_type" : "type-23530", ++ "referenced_type" : "type-23504", ++ "self_type" : "type-23508", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -85994,8 +86036,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-23761", +- "self_type" : "type-23764", ++ "referenced_type" : "type-23748", ++ "self_type" : "type-23751", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86003,8 +86045,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-24039", +- "self_type" : "type-24042", ++ "referenced_type" : "type-24038", ++ "self_type" : "type-24041", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86012,8 +86054,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-24207", +- "self_type" : "type-24210", ++ "referenced_type" : "type-24212", ++ "self_type" : "type-24215", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86021,8 +86063,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-24372", +- "self_type" : "type-24376", ++ "referenced_type" : "type-24353", ++ "self_type" : "type-24357", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86030,8 +86072,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-24512", +- "self_type" : "type-24517", ++ "referenced_type" : "type-24490", ++ "self_type" : "type-24495", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86039,8 +86081,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-24795", +- "self_type" : "type-24798", ++ "referenced_type" : "type-2463", ++ "self_type" : "type-2466", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86048,8 +86090,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-24951", +- "self_type" : "type-24954", ++ "referenced_type" : "type-24753", ++ "self_type" : "type-24758", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86057,8 +86099,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-25080", +- "self_type" : "type-25083", ++ "referenced_type" : "type-24919", ++ "self_type" : "type-24922", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86066,8 +86108,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-2533", +- "self_type" : "type-2536", ++ "referenced_type" : "type-25051", ++ "self_type" : "type-25054", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86075,8 +86117,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-25708", +- "self_type" : "type-25711", ++ "referenced_type" : "type-25759", ++ "self_type" : "type-25762", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86084,8 +86126,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-26776", +- "self_type" : "type-26779", ++ "referenced_type" : "type-26798", ++ "self_type" : "type-26801", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86093,8 +86135,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-28339", +- "self_type" : "type-28343", ++ "referenced_type" : "type-28338", ++ "self_type" : "type-28342", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86102,8 +86144,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-28423", +- "self_type" : "type-28426", ++ "referenced_type" : "type-28422", ++ "self_type" : "type-28425", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86111,8 +86153,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-28613", +- "self_type" : "type-28616", ++ "referenced_type" : "type-28612", ++ "self_type" : "type-28615", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86120,8 +86162,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-28711", +- "self_type" : "type-28715", ++ "referenced_type" : "type-28710", ++ "self_type" : "type-28714", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86129,8 +86171,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-28946", +- "self_type" : "type-28949", ++ "referenced_type" : "type-28945", ++ "self_type" : "type-28948", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86138,8 +86180,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-29224", +- "self_type" : "type-29227", ++ "referenced_type" : "type-29223", ++ "self_type" : "type-29226", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86147,8 +86189,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-29392", +- "self_type" : "type-29395", ++ "referenced_type" : "type-29391", ++ "self_type" : "type-29394", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86156,8 +86198,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-29557", +- "self_type" : "type-29561", ++ "referenced_type" : "type-29556", ++ "self_type" : "type-29560", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86165,8 +86207,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-29697", +- "self_type" : "type-29702", ++ "referenced_type" : "type-29696", ++ "self_type" : "type-29701", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86174,8 +86216,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-29974", +- "self_type" : "type-29977", ++ "referenced_type" : "type-29973", ++ "self_type" : "type-29976", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86183,8 +86225,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-30107", +- "self_type" : "type-30110", ++ "referenced_type" : "type-30106", ++ "self_type" : "type-30109", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86192,8 +86234,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-30225", +- "self_type" : "type-30228", ++ "referenced_type" : "type-30224", ++ "self_type" : "type-30227", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86201,8 +86243,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-30854", +- "self_type" : "type-30857", ++ "referenced_type" : "type-30853", ++ "self_type" : "type-30856", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86210,8 +86252,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-31923", +- "self_type" : "type-31926", ++ "referenced_type" : "type-31922", ++ "self_type" : "type-31925", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86219,8 +86261,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-3571", +- "self_type" : "type-3574", ++ "referenced_type" : "type-3523", ++ "self_type" : "type-3526", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86228,8 +86270,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-5549", +- "self_type" : "type-5552", ++ "referenced_type" : "type-5501", ++ "self_type" : "type-5504", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86237,8 +86279,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-6722", +- "self_type" : "type-6725", ++ "referenced_type" : "type-6674", ++ "self_type" : "type-6677", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86246,8 +86288,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-8808", +- "self_type" : "type-8811", ++ "referenced_type" : "type-8760", ++ "self_type" : "type-8763", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86255,8 +86297,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions &", + "name" : "const google::protobuf::ServiceOptions &", +- "referenced_type" : "type-9878", +- "self_type" : "type-9881", ++ "referenced_type" : "type-9830", ++ "self_type" : "type-9833", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -86264,8 +86306,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *const &", + "name" : "const google::protobuf::ServiceOptions *const &", +- "referenced_type" : "type-4140", +- "self_type" : "type-4141", ++ "referenced_type" : "type-4092", ++ "self_type" : "type-4093", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -86273,8 +86315,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo &", + "name" : "const google::protobuf::SourceCodeInfo &", +- "referenced_type" : "type-2016", +- "self_type" : "type-2227", ++ "referenced_type" : "type-1942", ++ "self_type" : "type-2156", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -86282,8 +86324,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *const &", + "name" : "const google::protobuf::SourceCodeInfo *const &", +- "referenced_type" : "type-4148", +- "self_type" : "type-4149", ++ "referenced_type" : "type-4100", ++ "self_type" : "type-4101", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -86291,8 +86333,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo_Location &", + "name" : "const google::protobuf::SourceCodeInfo_Location &", +- "referenced_type" : "type-1923", +- "self_type" : "type-2128", ++ "referenced_type" : "type-1844", ++ "self_type" : "type-2061", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -86300,8 +86342,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo_Location *const &", + "name" : "const google::protobuf::SourceCodeInfo_Location *const &", +- "referenced_type" : "type-4146", +- "self_type" : "type-4147", ++ "referenced_type" : "type-4098", ++ "self_type" : "type-4099", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -86309,8 +86351,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceContext &", + "name" : "const google::protobuf::SourceContext &", +- "referenced_type" : "type-2474", +- "self_type" : "type-2475", ++ "referenced_type" : "type-2404", ++ "self_type" : "type-2405", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/source_context.pb.h" + }, +@@ -86318,8 +86360,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceContext *const &", + "name" : "const google::protobuf::SourceContext *const &", +- "referenced_type" : "type-4675", +- "self_type" : "type-4676", ++ "referenced_type" : "type-4627", ++ "self_type" : "type-4628", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -86336,8 +86378,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::StringValue &", + "name" : "const google::protobuf::StringValue &", +- "referenced_type" : "type-11127", +- "self_type" : "type-11163", ++ "referenced_type" : "type-11079", ++ "self_type" : "type-11115", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, +@@ -86345,8 +86387,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::StringValue *const &", + "name" : "const google::protobuf::StringValue *const &", +- "referenced_type" : "type-11125", +- "self_type" : "type-11128", ++ "referenced_type" : "type-11077", ++ "self_type" : "type-11080", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -86354,8 +86396,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Struct &", + "name" : "const google::protobuf::Struct &", +- "referenced_type" : "type-7281", +- "self_type" : "type-7280", ++ "referenced_type" : "type-7233", ++ "self_type" : "type-7232", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite_inl.h" + }, +@@ -86363,8 +86405,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Struct *const &", + "name" : "const google::protobuf::Struct *const &", +- "referenced_type" : "type-7590", +- "self_type" : "type-7592", ++ "referenced_type" : "type-7542", ++ "self_type" : "type-7544", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -86372,8 +86414,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::TextFormat::FieldValuePrinter *const &", + "name" : "const google::protobuf::TextFormat::FieldValuePrinter *const &", +- "referenced_type" : "type-7775", +- "self_type" : "type-7774", ++ "referenced_type" : "type-7727", ++ "self_type" : "type-7726", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -86381,8 +86423,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Timestamp &", + "name" : "const google::protobuf::Timestamp &", +- "referenced_type" : "type-7847", +- "self_type" : "type-7865", ++ "referenced_type" : "type-7799", ++ "self_type" : "type-7817", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/timestamp.pb.h" + }, +@@ -86390,8 +86432,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Timestamp *const &", + "name" : "const google::protobuf::Timestamp *const &", +- "referenced_type" : "type-7845", +- "self_type" : "type-7848", ++ "referenced_type" : "type-7797", ++ "self_type" : "type-7800", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -86399,8 +86441,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Type &", + "name" : "const google::protobuf::Type &", +- "referenced_type" : "type-2490", +- "self_type" : "type-2491", ++ "referenced_type" : "type-2420", ++ "self_type" : "type-2421", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, +@@ -86408,8 +86450,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Type *const &", + "name" : "const google::protobuf::Type *const &", +- "referenced_type" : "type-7949", +- "self_type" : "type-7950", ++ "referenced_type" : "type-7901", ++ "self_type" : "type-7902", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -86417,8 +86459,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::UInt32Value &", + "name" : "const google::protobuf::UInt32Value &", +- "referenced_type" : "type-11118", +- "self_type" : "type-11159", ++ "referenced_type" : "type-11070", ++ "self_type" : "type-11111", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, +@@ -86426,8 +86468,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::UInt32Value *const &", + "name" : "const google::protobuf::UInt32Value *const &", +- "referenced_type" : "type-11116", +- "self_type" : "type-11120", ++ "referenced_type" : "type-11068", ++ "self_type" : "type-11072", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -86435,8 +86477,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::UInt64Value &", + "name" : "const google::protobuf::UInt64Value &", +- "referenced_type" : "type-11110", +- "self_type" : "type-11155", ++ "referenced_type" : "type-11062", ++ "self_type" : "type-11107", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, +@@ -86444,8 +86486,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::UInt64Value *const &", + "name" : "const google::protobuf::UInt64Value *const &", +- "referenced_type" : "type-11108", +- "self_type" : "type-11111", ++ "referenced_type" : "type-11060", ++ "self_type" : "type-11063", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -86453,8 +86495,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::UninterpretedOption &", + "name" : "const google::protobuf::UninterpretedOption &", +- "referenced_type" : "type-1915", +- "self_type" : "type-2117", ++ "referenced_type" : "type-1835", ++ "self_type" : "type-2050", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -86462,8 +86504,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::UninterpretedOption *const &", + "name" : "const google::protobuf::UninterpretedOption *const &", +- "referenced_type" : "type-3804", +- "self_type" : "type-3805", ++ "referenced_type" : "type-3756", ++ "self_type" : "type-3757", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -86471,8 +86513,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::UninterpretedOption_NamePart &", + "name" : "const google::protobuf::UninterpretedOption_NamePart &", +- "referenced_type" : "type-1919", +- "self_type" : "type-2122", ++ "referenced_type" : "type-1840", ++ "self_type" : "type-2055", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -86480,8 +86522,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::UninterpretedOption_NamePart *const &", + "name" : "const google::protobuf::UninterpretedOption_NamePart *const &", +- "referenced_type" : "type-4144", +- "self_type" : "type-4145", ++ "referenced_type" : "type-4096", ++ "self_type" : "type-4097", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -86489,8 +86531,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::UnknownField &", + "name" : "const google::protobuf::UnknownField &", +- "referenced_type" : "type-1940", +- "self_type" : "type-1939", ++ "referenced_type" : "type-1865", ++ "self_type" : "type-1864", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -86498,8 +86540,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::UnknownFieldSet &", + "name" : "const google::protobuf::UnknownFieldSet &", +- "referenced_type" : "type-1937", +- "self_type" : "type-1948", ++ "referenced_type" : "type-1862", ++ "self_type" : "type-1872", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -86507,8 +86549,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Value &", + "name" : "const google::protobuf::Value &", +- "referenced_type" : "type-7290", +- "self_type" : "type-7289", ++ "referenced_type" : "type-7242", ++ "self_type" : "type-7241", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -86516,8 +86558,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Value *const &", + "name" : "const google::protobuf::Value *const &", +- "referenced_type" : "type-7603", +- "self_type" : "type-7604", ++ "referenced_type" : "type-7555", ++ "self_type" : "type-7556", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -86525,8 +86567,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::compiler::Parser::LocationRecorder &", + "name" : "const google::protobuf::compiler::Parser::LocationRecorder &", +- "referenced_type" : "type-11493", +- "self_type" : "type-11496", ++ "referenced_type" : "type-11445", ++ "self_type" : "type-11448", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/parser.h" + }, +@@ -86534,8 +86576,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::compiler::Parser::MapField &", + "name" : "const google::protobuf::compiler::Parser::MapField &", +- "referenced_type" : "type-11499", +- "self_type" : "type-11500", ++ "referenced_type" : "type-11451", ++ "self_type" : "type-11452", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/parser.h" + }, +@@ -86544,7 +86586,7 @@ + "linker_set_key" : "const google::protobuf::hash &", + "name" : "const google::protobuf::hash &", + "referenced_type" : "type-45", +- "self_type" : "type-3697", ++ "self_type" : "type-3649", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -86552,8 +86594,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::hash &", + "name" : "const google::protobuf::hash &", +- "referenced_type" : "type-3692", +- "self_type" : "type-4323", ++ "referenced_type" : "type-3644", ++ "self_type" : "type-4275", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -86561,8 +86603,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::hash &", + "name" : "const google::protobuf::hash &", +- "referenced_type" : "type-4260", +- "self_type" : "type-6561", ++ "referenced_type" : "type-4212", ++ "self_type" : "type-6513", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -86571,7 +86613,7 @@ + "linker_set_key" : "const google::protobuf::hash, std::allocator > > &", + "name" : "const google::protobuf::hash, std::allocator > > &", + "referenced_type" : "type-49", +- "self_type" : "type-3707", ++ "self_type" : "type-3659", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -86588,8 +86630,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::hash_map, google::protobuf::streq, std::allocator > > &", + "name" : "const google::protobuf::hash_map, google::protobuf::streq, std::allocator > > &", +- "referenced_type" : "type-3636", +- "self_type" : "type-3640", ++ "referenced_type" : "type-3588", ++ "self_type" : "type-3592", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -86597,8 +86639,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::hash_set, std::equal_to > &", + "name" : "const google::protobuf::hash_set, std::equal_to > &", +- "referenced_type" : "type-19860", +- "self_type" : "type-19861", ++ "referenced_type" : "type-19812", ++ "self_type" : "type-19813", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -86607,7 +86649,7 @@ + "linker_set_key" : "const google::protobuf::internal::ArenaStringPtr &", + "name" : "const google::protobuf::internal::ArenaStringPtr &", + "referenced_type" : "type-1046", +- "self_type" : "type-6491", ++ "self_type" : "type-6443", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -86651,8 +86693,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::InternalMetadataWithArena &", + "name" : "const google::protobuf::internal::InternalMetadataWithArena &", +- "referenced_type" : "type-1950", +- "self_type" : "type-6492", ++ "referenced_type" : "type-1874", ++ "self_type" : "type-6444", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -86660,8 +86702,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> &", + "name" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> &", +- "referenced_type" : "type-7221", +- "self_type" : "type-7396", ++ "referenced_type" : "type-7173", ++ "self_type" : "type-7348", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -86669,8 +86711,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *const &", + "name" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *const &", +- "referenced_type" : "type-7585", +- "self_type" : "type-7586", ++ "referenced_type" : "type-7537", ++ "self_type" : "type-7538", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -86678,8 +86720,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::MapEntryLite, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> &", + "name" : "const google::protobuf::internal::MapEntryLite, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> &", +- "referenced_type" : "type-7279", +- "self_type" : "type-7278", ++ "referenced_type" : "type-7231", ++ "self_type" : "type-7230", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite_inl.h" + }, +@@ -86687,8 +86729,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::MapEntryLite, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *const &", + "name" : "const google::protobuf::internal::MapEntryLite, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *const &", +- "referenced_type" : "type-7582", +- "self_type" : "type-7584", ++ "referenced_type" : "type-7534", ++ "self_type" : "type-7536", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -86696,8 +86738,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::MapField, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> &", + "name" : "const google::protobuf::internal::MapField, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> &", +- "referenced_type" : "type-7369", +- "self_type" : "type-7368", ++ "referenced_type" : "type-7321", ++ "self_type" : "type-7320", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -86705,8 +86747,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::MapField, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *const &", + "name" : "const google::protobuf::internal::MapField, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *const &", +- "referenced_type" : "type-7594", +- "self_type" : "type-7596", ++ "referenced_type" : "type-7546", ++ "self_type" : "type-7548", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -86714,8 +86756,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::MapFieldBase &", + "name" : "const google::protobuf::internal::MapFieldBase &", +- "referenced_type" : "type-4268", +- "self_type" : "type-6487", ++ "referenced_type" : "type-4220", ++ "self_type" : "type-6439", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -86723,8 +86765,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::MapFieldLite, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> &", + "name" : "const google::protobuf::internal::MapFieldLite, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> &", +- "referenced_type" : "type-7197", +- "self_type" : "type-7196", ++ "referenced_type" : "type-7149", ++ "self_type" : "type-7148", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -86741,8 +86783,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::RepeatedPtrIterator, std::allocator > > &", + "name" : "const google::protobuf::internal::RepeatedPtrIterator, std::allocator > > &", +- "referenced_type" : "type-3813", +- "self_type" : "type-3816", ++ "referenced_type" : "type-3765", ++ "self_type" : "type-3768", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -86750,8 +86792,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::RepeatedPtrIterator &", + "name" : "const google::protobuf::internal::RepeatedPtrIterator &", +- "referenced_type" : "type-6756", +- "self_type" : "type-6759", ++ "referenced_type" : "type-6708", ++ "self_type" : "type-6711", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -86759,8 +86801,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::RepeatedPtrIterator, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> > &", + "name" : "const google::protobuf::internal::RepeatedPtrIterator, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> > &", +- "referenced_type" : "type-7255", +- "self_type" : "type-7258", ++ "referenced_type" : "type-7207", ++ "self_type" : "type-7210", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -86768,8 +86810,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::RepeatedPtrIterator, std::allocator > > &", + "name" : "const google::protobuf::internal::RepeatedPtrIterator, std::allocator > > &", +- "referenced_type" : "type-3811", +- "self_type" : "type-3812", ++ "referenced_type" : "type-3763", ++ "self_type" : "type-3764", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -86777,8 +86819,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::RepeatedPtrOverPtrsIterator &", + "name" : "const google::protobuf::internal::RepeatedPtrOverPtrsIterator &", +- "referenced_type" : "type-7695", +- "self_type" : "type-7698", ++ "referenced_type" : "type-7647", ++ "self_type" : "type-7650", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -86786,8 +86828,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::io::GzipOutputStream::Options &", + "name" : "const google::protobuf::io::GzipOutputStream::Options &", +- "referenced_type" : "type-11192", +- "self_type" : "type-11193", ++ "referenced_type" : "type-11144", ++ "self_type" : "type-11145", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/gzip_stream.h" + }, +@@ -86795,8 +86837,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::io::Tokenizer::Token &", + "name" : "const google::protobuf::io::Tokenizer::Token &", +- "referenced_type" : "type-3887", +- "self_type" : "type-3886", ++ "referenced_type" : "type-3839", ++ "self_type" : "type-3838", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" + }, +@@ -86805,7 +86847,7 @@ + "linker_set_key" : "const google::protobuf::streq &", + "name" : "const google::protobuf::streq &", + "referenced_type" : "type-53", +- "self_type" : "type-3702", ++ "self_type" : "type-3654", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -86822,8 +86864,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::strings::internal::SubstituteArg &", + "name" : "const google::protobuf::strings::internal::SubstituteArg &", +- "referenced_type" : "type-3634", +- "self_type" : "type-7610", ++ "referenced_type" : "type-3586", ++ "self_type" : "type-7562", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/substitute.h" + }, +@@ -86849,8 +86891,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::FieldMaskUtil::MergeOptions &", + "name" : "const google::protobuf::util::FieldMaskUtil::MergeOptions &", +- "referenced_type" : "type-14951", +- "self_type" : "type-14953", ++ "referenced_type" : "type-14903", ++ "self_type" : "type-14905", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/field_mask_util.h" + }, +@@ -86858,8 +86900,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::JsonOptions &", + "name" : "const google::protobuf::util::JsonOptions &", +- "referenced_type" : "type-24759", +- "self_type" : "type-24760", ++ "referenced_type" : "type-24718", ++ "self_type" : "type-24719", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/json_util.h" + }, +@@ -86867,8 +86909,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::MessageDifferencer::MapKeyComparator *const &", + "name" : "const google::protobuf::util::MessageDifferencer::MapKeyComparator *const &", +- "referenced_type" : "type-24927", +- "self_type" : "type-24928", ++ "referenced_type" : "type-24896", ++ "self_type" : "type-24897", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -86876,8 +86918,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::MessageDifferencer::SpecificField &", + "name" : "const google::protobuf::util::MessageDifferencer::SpecificField &", +- "referenced_type" : "type-25002", +- "self_type" : "type-25003", ++ "referenced_type" : "type-24971", ++ "self_type" : "type-24972", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h" + }, +@@ -86894,8 +86936,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::StatusOr &", + "name" : "const google::protobuf::util::StatusOr &", +- "referenced_type" : "type-20006", +- "self_type" : "type-20007", ++ "referenced_type" : "type-19958", ++ "self_type" : "type-19959", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -86903,8 +86945,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::StatusOr &", + "name" : "const google::protobuf::util::StatusOr &", +- "referenced_type" : "type-15326", +- "self_type" : "type-20001", ++ "referenced_type" : "type-15278", ++ "self_type" : "type-19953", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -86912,8 +86954,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::converter::DataPiece &", + "name" : "const google::protobuf::util::converter::DataPiece &", +- "referenced_type" : "type-15048", +- "self_type" : "type-15049", ++ "referenced_type" : "type-15000", ++ "self_type" : "type-15001", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, +@@ -86921,8 +86963,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::converter::LocationTrackerInterface &", + "name" : "const google::protobuf::util::converter::LocationTrackerInterface &", +- "referenced_type" : "type-15384", +- "self_type" : "type-15386", ++ "referenced_type" : "type-15336", ++ "self_type" : "type-15338", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/error_listener.h" + }, +@@ -86930,8 +86972,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::converter::ProtoStreamObjectWriter::Options &", + "name" : "const google::protobuf::util::converter::ProtoStreamObjectWriter::Options &", +- "referenced_type" : "type-19504", +- "self_type" : "type-19688", ++ "referenced_type" : "type-19456", ++ "self_type" : "type-19640", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, +@@ -86947,274 +86989,274 @@ + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-10040", +- "self_type" : "type-10042", ++ "referenced_type" : "type-10293", ++ "self_type" : "type-10295", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-10341", +- "self_type" : "type-10343", ++ "referenced_type" : "type-12639", ++ "self_type" : "type-12641", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-12687", +- "self_type" : "type-12689", ++ "referenced_type" : "type-13031", ++ "self_type" : "type-13033", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-13079", +- "self_type" : "type-13081", ++ "referenced_type" : "type-13206", ++ "self_type" : "type-13208", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-13254", +- "self_type" : "type-13256", ++ "referenced_type" : "type-13325", ++ "self_type" : "type-13327", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-13373", +- "self_type" : "type-13375", ++ "referenced_type" : "type-13584", ++ "self_type" : "type-13586", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-13632", +- "self_type" : "type-13634", ++ "referenced_type" : "type-15114", ++ "self_type" : "type-15116", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-15162", +- "self_type" : "type-15164", ++ "referenced_type" : "type-16495", ++ "self_type" : "type-16497", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-16543", +- "self_type" : "type-16545", ++ "referenced_type" : "type-16887", ++ "self_type" : "type-16889", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-16935", +- "self_type" : "type-16937", ++ "referenced_type" : "type-17062", ++ "self_type" : "type-17064", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-17110", +- "self_type" : "type-17112", ++ "referenced_type" : "type-17181", ++ "self_type" : "type-17183", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-17229", +- "self_type" : "type-17231", ++ "referenced_type" : "type-17448", ++ "self_type" : "type-17450", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-17496", +- "self_type" : "type-17498", ++ "referenced_type" : "type-18898", ++ "self_type" : "type-18900", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-18946", +- "self_type" : "type-18948", ++ "referenced_type" : "type-21027", ++ "self_type" : "type-21029", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-21075", +- "self_type" : "type-21077", ++ "referenced_type" : "type-21419", ++ "self_type" : "type-21421", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-21467", +- "self_type" : "type-21469", ++ "referenced_type" : "type-21594", ++ "self_type" : "type-21596", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-21642", +- "self_type" : "type-21644", ++ "referenced_type" : "type-21713", ++ "self_type" : "type-21715", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-21761", +- "self_type" : "type-21763", ++ "referenced_type" : "type-22020", ++ "self_type" : "type-22022", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-22025", +- "self_type" : "type-22027", ++ "referenced_type" : "type-23453", ++ "self_type" : "type-23455", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-23475", +- "self_type" : "type-23477", ++ "referenced_type" : "type-26296", ++ "self_type" : "type-26298", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-26253", +- "self_type" : "type-26255", ++ "referenced_type" : "type-26669", ++ "self_type" : "type-26671", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-26645", +- "self_type" : "type-26647", ++ "referenced_type" : "type-26844", ++ "self_type" : "type-26846", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-26820", +- "self_type" : "type-26822", ++ "referenced_type" : "type-26962", ++ "self_type" : "type-26964", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-26939", +- "self_type" : "type-26941", ++ "referenced_type" : "type-27209", ++ "self_type" : "type-27211", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-27210", +- "self_type" : "type-27212", ++ "referenced_type" : "type-28659", ++ "self_type" : "type-28661", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-28660", +- "self_type" : "type-28662", ++ "referenced_type" : "type-31399", ++ "self_type" : "type-31401", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-31400", +- "self_type" : "type-31402", ++ "referenced_type" : "type-31791", ++ "self_type" : "type-31793", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-31792", +- "self_type" : "type-31794", ++ "referenced_type" : "type-31966", ++ "self_type" : "type-31968", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-31967", +- "self_type" : "type-31969", ++ "referenced_type" : "type-32085", ++ "self_type" : "type-32087", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-32086", +- "self_type" : "type-32088", ++ "referenced_type" : "type-4198", ++ "self_type" : "type-4200", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-4246", +- "self_type" : "type-4248", ++ "referenced_type" : "type-6050", ++ "self_type" : "type-6052", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-6098", +- "self_type" : "type-6100", ++ "referenced_type" : "type-6449", ++ "self_type" : "type-6451", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-6497", +- "self_type" : "type-6499", ++ "referenced_type" : "type-6731", ++ "self_type" : "type-6733", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-6779", +- "self_type" : "type-6781", ++ "referenced_type" : "type-6907", ++ "self_type" : "type-6909", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-6955", +- "self_type" : "type-6957", ++ "referenced_type" : "type-7268", ++ "self_type" : "type-7270", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-7316", +- "self_type" : "type-7318", ++ "referenced_type" : "type-9307", ++ "self_type" : "type-9309", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-9355", +- "self_type" : "type-9357", ++ "referenced_type" : "type-9699", ++ "self_type" : "type-9701", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-9747", +- "self_type" : "type-9749", ++ "referenced_type" : "type-9874", ++ "self_type" : "type-9876", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "linker_set_key" : "const iterator_base &", + "name" : "const iterator_base &", +- "referenced_type" : "type-9922", +- "self_type" : "type-9924", ++ "referenced_type" : "type-9992", ++ "self_type" : "type-9994", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { +@@ -87230,8 +87272,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> > &", + "name" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> > &", +- "referenced_type" : "type-13170", +- "self_type" : "type-13172", ++ "referenced_type" : "type-13122", ++ "self_type" : "type-13124", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87239,8 +87281,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> > &", + "name" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> > &", +- "referenced_type" : "type-17026", +- "self_type" : "type-17028", ++ "referenced_type" : "type-16978", ++ "self_type" : "type-16980", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87248,8 +87290,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> > &", + "name" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> > &", +- "referenced_type" : "type-21558", +- "self_type" : "type-21560", ++ "referenced_type" : "type-21510", ++ "self_type" : "type-21512", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87257,8 +87299,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> > &", + "name" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> > &", +- "referenced_type" : "type-26736", +- "self_type" : "type-26738", ++ "referenced_type" : "type-26758", ++ "self_type" : "type-26760", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87266,8 +87308,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> > &", + "name" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> > &", +- "referenced_type" : "type-31883", +- "self_type" : "type-31885", ++ "referenced_type" : "type-31882", ++ "self_type" : "type-31884", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87275,8 +87317,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> > &", + "name" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> > &", +- "referenced_type" : "type-6678", +- "self_type" : "type-6680", ++ "referenced_type" : "type-6630", ++ "self_type" : "type-6632", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87284,8 +87326,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> > &", + "name" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> > &", +- "referenced_type" : "type-9838", +- "self_type" : "type-9840", ++ "referenced_type" : "type-9790", ++ "self_type" : "type-9792", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87293,8 +87335,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", + "name" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", +- "referenced_type" : "type-10457", +- "self_type" : "type-10459", ++ "referenced_type" : "type-10409", ++ "self_type" : "type-10411", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87302,8 +87344,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", + "name" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", +- "referenced_type" : "type-13748", +- "self_type" : "type-13750", ++ "referenced_type" : "type-13700", ++ "self_type" : "type-13702", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87311,8 +87353,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", + "name" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", +- "referenced_type" : "type-17612", +- "self_type" : "type-17614", ++ "referenced_type" : "type-17564", ++ "self_type" : "type-17566", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87320,8 +87362,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", + "name" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", +- "referenced_type" : "type-22141", +- "self_type" : "type-22143", ++ "referenced_type" : "type-22140", ++ "self_type" : "type-22142", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87329,8 +87371,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", + "name" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", +- "referenced_type" : "type-27326", +- "self_type" : "type-27328", ++ "referenced_type" : "type-27325", ++ "self_type" : "type-27327", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87338,8 +87380,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", + "name" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", +- "referenced_type" : "type-7523", +- "self_type" : "type-7525", ++ "referenced_type" : "type-7475", ++ "self_type" : "type-7477", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87347,8 +87389,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> > &", + "name" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> > &", +- "referenced_type" : "type-13180", +- "self_type" : "type-13182", ++ "referenced_type" : "type-13132", ++ "self_type" : "type-13134", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87356,8 +87398,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> > &", + "name" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> > &", +- "referenced_type" : "type-17036", +- "self_type" : "type-17038", ++ "referenced_type" : "type-16988", ++ "self_type" : "type-16990", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87365,8 +87407,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> > &", + "name" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> > &", +- "referenced_type" : "type-21568", +- "self_type" : "type-21570", ++ "referenced_type" : "type-21520", ++ "self_type" : "type-21522", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87374,8 +87416,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> > &", + "name" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> > &", +- "referenced_type" : "type-26746", +- "self_type" : "type-26748", ++ "referenced_type" : "type-26768", ++ "self_type" : "type-26770", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87383,8 +87425,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> > &", + "name" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> > &", +- "referenced_type" : "type-31893", +- "self_type" : "type-31895", ++ "referenced_type" : "type-31892", ++ "self_type" : "type-31894", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87392,8 +87434,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> > &", + "name" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> > &", +- "referenced_type" : "type-6692", +- "self_type" : "type-6694", ++ "referenced_type" : "type-6644", ++ "self_type" : "type-6646", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87401,8 +87443,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> > &", + "name" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> > &", +- "referenced_type" : "type-9848", +- "self_type" : "type-9850", ++ "referenced_type" : "type-9800", ++ "self_type" : "type-9802", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87410,8 +87452,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", + "name" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", +- "referenced_type" : "type-10467", +- "self_type" : "type-10469", ++ "referenced_type" : "type-10419", ++ "self_type" : "type-10421", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87419,8 +87461,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", + "name" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", +- "referenced_type" : "type-13758", +- "self_type" : "type-13760", ++ "referenced_type" : "type-13710", ++ "self_type" : "type-13712", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87428,8 +87470,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", + "name" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", +- "referenced_type" : "type-15091", +- "self_type" : "type-15093", ++ "referenced_type" : "type-15043", ++ "self_type" : "type-15045", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87437,8 +87479,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", + "name" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", +- "referenced_type" : "type-17622", +- "self_type" : "type-17624", ++ "referenced_type" : "type-17574", ++ "self_type" : "type-17576", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87446,8 +87488,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", + "name" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", +- "referenced_type" : "type-18875", +- "self_type" : "type-18877", ++ "referenced_type" : "type-18827", ++ "self_type" : "type-18829", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87455,8 +87497,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", + "name" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", +- "referenced_type" : "type-22151", +- "self_type" : "type-22153", ++ "referenced_type" : "type-22150", ++ "self_type" : "type-22152", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87464,8 +87506,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", + "name" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", +- "referenced_type" : "type-23404", +- "self_type" : "type-23406", ++ "referenced_type" : "type-23387", ++ "self_type" : "type-23389", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87473,8 +87515,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", + "name" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", +- "referenced_type" : "type-27336", +- "self_type" : "type-27338", ++ "referenced_type" : "type-27335", ++ "self_type" : "type-27337", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87482,8 +87524,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", + "name" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", +- "referenced_type" : "type-28589", +- "self_type" : "type-28591", ++ "referenced_type" : "type-28588", ++ "self_type" : "type-28590", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87491,8 +87533,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", + "name" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> > &", +- "referenced_type" : "type-7537", +- "self_type" : "type-7539", ++ "referenced_type" : "type-7489", ++ "self_type" : "type-7491", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -87500,8 +87542,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-12255", +- "self_type" : "type-12257", ++ "referenced_type" : "type-12207", ++ "self_type" : "type-12209", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87509,8 +87551,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-16110", +- "self_type" : "type-16112", ++ "referenced_type" : "type-16062", ++ "self_type" : "type-16064", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87518,8 +87560,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-20642", +- "self_type" : "type-20644", ++ "referenced_type" : "type-20594", ++ "self_type" : "type-20596", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87527,8 +87569,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-25821", +- "self_type" : "type-25823", ++ "referenced_type" : "type-25872", ++ "self_type" : "type-25874", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87536,8 +87578,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-30967", +- "self_type" : "type-30969", ++ "referenced_type" : "type-30966", ++ "self_type" : "type-30968", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87545,8 +87587,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-3703", +- "self_type" : "type-3705", ++ "referenced_type" : "type-3655", ++ "self_type" : "type-3657", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87554,8 +87596,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-5663", +- "self_type" : "type-5665", ++ "referenced_type" : "type-5615", ++ "self_type" : "type-5617", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87563,8 +87605,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-8921", +- "self_type" : "type-8923", ++ "referenced_type" : "type-8873", ++ "self_type" : "type-8875", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87572,8 +87614,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator &)> > &", + "name" : "const std::allocator &)> > &", +- "referenced_type" : "type-10001", +- "self_type" : "type-10003", ++ "referenced_type" : "type-13286", ++ "self_type" : "type-13288", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87581,8 +87623,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator &)> > &", + "name" : "const std::allocator &)> > &", +- "referenced_type" : "type-13334", +- "self_type" : "type-13336", ++ "referenced_type" : "type-17142", ++ "self_type" : "type-17144", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87590,8 +87632,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator &)> > &", + "name" : "const std::allocator &)> > &", +- "referenced_type" : "type-17190", +- "self_type" : "type-17192", ++ "referenced_type" : "type-21674", ++ "self_type" : "type-21676", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87599,8 +87641,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator &)> > &", + "name" : "const std::allocator &)> > &", +- "referenced_type" : "type-21722", +- "self_type" : "type-21724", ++ "referenced_type" : "type-26922", ++ "self_type" : "type-26924", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87608,8 +87650,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator &)> > &", + "name" : "const std::allocator &)> > &", +- "referenced_type" : "type-26900", +- "self_type" : "type-26902", ++ "referenced_type" : "type-32046", ++ "self_type" : "type-32048", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87617,8 +87659,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator &)> > &", + "name" : "const std::allocator &)> > &", +- "referenced_type" : "type-32047", +- "self_type" : "type-32049", ++ "referenced_type" : "type-6861", ++ "self_type" : "type-6863", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87626,8 +87668,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator &)> > &", + "name" : "const std::allocator &)> > &", +- "referenced_type" : "type-6909", +- "self_type" : "type-6911", ++ "referenced_type" : "type-9953", ++ "self_type" : "type-9955", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87635,8 +87677,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-12743", +- "self_type" : "type-12745", ++ "referenced_type" : "type-12695", ++ "self_type" : "type-12697", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87644,8 +87686,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-16599", +- "self_type" : "type-16601", ++ "referenced_type" : "type-16551", ++ "self_type" : "type-16553", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87653,8 +87695,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-21131", +- "self_type" : "type-21133", ++ "referenced_type" : "type-21083", ++ "self_type" : "type-21085", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87662,8 +87704,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-26309", +- "self_type" : "type-26311", ++ "referenced_type" : "type-26353", ++ "self_type" : "type-26355", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87671,8 +87713,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-31456", +- "self_type" : "type-31458", ++ "referenced_type" : "type-31455", ++ "self_type" : "type-31457", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87680,8 +87722,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-4327", +- "self_type" : "type-4329", ++ "referenced_type" : "type-4279", ++ "self_type" : "type-4281", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87689,8 +87731,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-6154", +- "self_type" : "type-6156", ++ "referenced_type" : "type-6106", ++ "self_type" : "type-6108", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87698,8 +87740,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-9411", +- "self_type" : "type-9413", ++ "referenced_type" : "type-9363", ++ "self_type" : "type-9365", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87707,8 +87749,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-10007", +- "self_type" : "type-10009", ++ "referenced_type" : "type-13292", ++ "self_type" : "type-13294", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87716,8 +87758,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-13340", +- "self_type" : "type-13342", ++ "referenced_type" : "type-17148", ++ "self_type" : "type-17150", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87725,8 +87767,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-17196", +- "self_type" : "type-17198", ++ "referenced_type" : "type-21680", ++ "self_type" : "type-21682", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87734,8 +87776,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-21728", +- "self_type" : "type-21730", ++ "referenced_type" : "type-26928", ++ "self_type" : "type-26930", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87743,8 +87785,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-26906", +- "self_type" : "type-26908", ++ "referenced_type" : "type-32052", ++ "self_type" : "type-32054", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87752,8 +87794,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-32053", +- "self_type" : "type-32055", ++ "referenced_type" : "type-6867", ++ "self_type" : "type-6869", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87761,8 +87803,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator > &", + "name" : "const std::allocator > &", +- "referenced_type" : "type-6915", +- "self_type" : "type-6917", ++ "referenced_type" : "type-9959", ++ "self_type" : "type-9961", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87770,8 +87812,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > &", + "name" : "const std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > &", +- "referenced_type" : "type-19535", +- "self_type" : "type-19537", ++ "referenced_type" : "type-19487", ++ "self_type" : "type-19489", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87788,8 +87830,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > &", + "name" : "const std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > &", +- "referenced_type" : "type-29190", +- "self_type" : "type-29192", ++ "referenced_type" : "type-29189", ++ "self_type" : "type-29191", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87797,8 +87839,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > &", + "name" : "const std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > &", +- "referenced_type" : "type-19393", +- "self_type" : "type-19395", ++ "referenced_type" : "type-19345", ++ "self_type" : "type-19347", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87806,8 +87848,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > &", + "name" : "const std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > &", +- "referenced_type" : "type-23893", +- "self_type" : "type-23895", ++ "referenced_type" : "type-23895", ++ "self_type" : "type-23897", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87815,8 +87857,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > &", + "name" : "const std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > &", +- "referenced_type" : "type-29078", +- "self_type" : "type-29080", ++ "referenced_type" : "type-29077", ++ "self_type" : "type-29079", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87824,8 +87866,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> > &", + "name" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> > &", +- "referenced_type" : "type-12263", +- "self_type" : "type-12265", ++ "referenced_type" : "type-12215", ++ "self_type" : "type-12217", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87833,8 +87875,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> > &", + "name" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> > &", +- "referenced_type" : "type-16118", +- "self_type" : "type-16120", ++ "referenced_type" : "type-16070", ++ "self_type" : "type-16072", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87842,8 +87884,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> > &", + "name" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> > &", +- "referenced_type" : "type-20650", +- "self_type" : "type-20652", ++ "referenced_type" : "type-20602", ++ "self_type" : "type-20604", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87851,8 +87893,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> > &", + "name" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> > &", +- "referenced_type" : "type-25829", +- "self_type" : "type-25831", ++ "referenced_type" : "type-25880", ++ "self_type" : "type-25882", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87860,8 +87902,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> > &", + "name" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> > &", +- "referenced_type" : "type-30975", +- "self_type" : "type-30977", ++ "referenced_type" : "type-30974", ++ "self_type" : "type-30976", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87869,8 +87911,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> > &", + "name" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> > &", +- "referenced_type" : "type-3711", +- "self_type" : "type-3713", ++ "referenced_type" : "type-3663", ++ "self_type" : "type-3665", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87878,8 +87920,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> > &", + "name" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> > &", +- "referenced_type" : "type-5671", +- "self_type" : "type-5673", ++ "referenced_type" : "type-5623", ++ "self_type" : "type-5625", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87887,8 +87929,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> > &", + "name" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> > &", +- "referenced_type" : "type-8929", +- "self_type" : "type-8931", ++ "referenced_type" : "type-8881", ++ "self_type" : "type-8883", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87896,8 +87938,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> > &", + "name" : "const std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> > &", +- "referenced_type" : "type-11405", +- "self_type" : "type-11407", ++ "referenced_type" : "type-11357", ++ "self_type" : "type-11359", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87905,8 +87947,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> > &", + "name" : "const std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> > &", +- "referenced_type" : "type-14624", +- "self_type" : "type-14626", ++ "referenced_type" : "type-14576", ++ "self_type" : "type-14578", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87914,8 +87956,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> > &", + "name" : "const std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> > &", +- "referenced_type" : "type-18488", +- "self_type" : "type-18490", ++ "referenced_type" : "type-18440", ++ "self_type" : "type-18442", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87923,8 +87965,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> > &", + "name" : "const std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> > &", +- "referenced_type" : "type-23017", +- "self_type" : "type-23019", ++ "referenced_type" : "type-22989", ++ "self_type" : "type-22991", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87932,8 +87974,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> > &", + "name" : "const std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> > &", +- "referenced_type" : "type-28202", +- "self_type" : "type-28204", ++ "referenced_type" : "type-28201", ++ "self_type" : "type-28203", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87941,8 +87983,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, int> > &", + "name" : "const std::allocator, std::allocator >, int> > &", +- "referenced_type" : "type-15320", +- "self_type" : "type-15322", ++ "referenced_type" : "type-15272", ++ "self_type" : "type-15274", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87950,8 +87992,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, int> > &", + "name" : "const std::allocator, std::allocator >, int> > &", +- "referenced_type" : "type-19091", +- "self_type" : "type-19093", ++ "referenced_type" : "type-19043", ++ "self_type" : "type-19045", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87959,8 +88001,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, int> > &", + "name" : "const std::allocator, std::allocator >, int> > &", +- "referenced_type" : "type-23620", +- "self_type" : "type-23622", ++ "referenced_type" : "type-23602", ++ "self_type" : "type-23604", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87968,8 +88010,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, std::allocator >, int> > &", + "name" : "const std::allocator, std::allocator >, int> > &", +- "referenced_type" : "type-28805", +- "self_type" : "type-28807", ++ "referenced_type" : "type-28804", ++ "self_type" : "type-28806", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87977,8 +88019,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, google::protobuf::internal::ExtensionInfo> > &", + "name" : "const std::allocator, google::protobuf::internal::ExtensionInfo> > &", +- "referenced_type" : "type-10363", +- "self_type" : "type-10368", ++ "referenced_type" : "type-10315", ++ "self_type" : "type-10320", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87986,8 +88028,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, google::protobuf::internal::ExtensionInfo> > &", + "name" : "const std::allocator, google::protobuf::internal::ExtensionInfo> > &", +- "referenced_type" : "type-1311", +- "self_type" : "type-1313", ++ "referenced_type" : "type-1224", ++ "self_type" : "type-1226", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -87995,8 +88037,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, google::protobuf::internal::ExtensionInfo> > &", + "name" : "const std::allocator, google::protobuf::internal::ExtensionInfo> > &", +- "referenced_type" : "type-13654", +- "self_type" : "type-13659", ++ "referenced_type" : "type-13606", ++ "self_type" : "type-13611", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -88004,8 +88046,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, google::protobuf::internal::ExtensionInfo> > &", + "name" : "const std::allocator, google::protobuf::internal::ExtensionInfo> > &", +- "referenced_type" : "type-17518", +- "self_type" : "type-17523", ++ "referenced_type" : "type-17470", ++ "self_type" : "type-17475", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -88013,8 +88055,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, google::protobuf::internal::ExtensionInfo> > &", + "name" : "const std::allocator, google::protobuf::internal::ExtensionInfo> > &", +- "referenced_type" : "type-22047", +- "self_type" : "type-22052", ++ "referenced_type" : "type-22605", ++ "self_type" : "type-22608", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -88022,8 +88064,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, google::protobuf::internal::ExtensionInfo> > &", + "name" : "const std::allocator, google::protobuf::internal::ExtensionInfo> > &", +- "referenced_type" : "type-27232", +- "self_type" : "type-27237", ++ "referenced_type" : "type-2686", ++ "self_type" : "type-2688", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -88031,8 +88073,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, google::protobuf::internal::ExtensionInfo> > &", + "name" : "const std::allocator, google::protobuf::internal::ExtensionInfo> > &", +- "referenced_type" : "type-2734", +- "self_type" : "type-2736", ++ "referenced_type" : "type-27231", ++ "self_type" : "type-27236", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -88040,8 +88082,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, google::protobuf::internal::ExtensionInfo> > &", + "name" : "const std::allocator, google::protobuf::internal::ExtensionInfo> > &", +- "referenced_type" : "type-467", +- "self_type" : "type-469", ++ "referenced_type" : "type-4666", ++ "self_type" : "type-4668", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -88049,8 +88091,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, google::protobuf::internal::ExtensionInfo> > &", + "name" : "const std::allocator, google::protobuf::internal::ExtensionInfo> > &", +- "referenced_type" : "type-4714", +- "self_type" : "type-4716", ++ "referenced_type" : "type-467", ++ "self_type" : "type-469", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -88058,8 +88100,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::allocator, google::protobuf::internal::ExtensionInfo> > &", + "name" : "const std::allocator, google::protobuf::internal::ExtensionInfo> > &", +- "referenced_type" : "type-7344", +- "self_type" : "type-7370", ++ "referenced_type" : "type-7296", ++ "self_type" : "type-7322", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -88076,8 +88118,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-10089", +- "self_type" : "type-10091", ++ "referenced_type" : "type-10041", ++ "self_type" : "type-10043", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88085,8 +88127,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-10099", +- "self_type" : "type-10166", ++ "referenced_type" : "type-10051", ++ "self_type" : "type-10118", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88094,8 +88136,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-10172", +- "self_type" : "type-10174", ++ "referenced_type" : "type-10124", ++ "self_type" : "type-10126", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88103,8 +88145,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-10184", +- "self_type" : "type-10186", ++ "referenced_type" : "type-10136", ++ "self_type" : "type-10138", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88112,8 +88154,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-10278", +- "self_type" : "type-10280", ++ "referenced_type" : "type-10230", ++ "self_type" : "type-10232", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88121,8 +88163,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-10291", +- "self_type" : "type-10352", ++ "referenced_type" : "type-10243", ++ "self_type" : "type-10304", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88148,8 +88190,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-10533", +- "self_type" : "type-10535", ++ "referenced_type" : "type-10485", ++ "self_type" : "type-10487", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88157,8 +88199,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-10547", +- "self_type" : "type-10549", ++ "referenced_type" : "type-10499", ++ "self_type" : "type-10501", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88166,8 +88208,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-10715", +- "self_type" : "type-10717", ++ "referenced_type" : "type-10667", ++ "self_type" : "type-10669", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88175,8 +88217,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-10803", +- "self_type" : "type-10805", ++ "referenced_type" : "type-10755", ++ "self_type" : "type-10757", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88184,8 +88226,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-10879", +- "self_type" : "type-10882", ++ "referenced_type" : "type-10831", ++ "self_type" : "type-10834", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88193,8 +88235,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-10988", +- "self_type" : "type-10990", ++ "referenced_type" : "type-10940", ++ "self_type" : "type-10942", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88202,8 +88244,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-11043", +- "self_type" : "type-11045", ++ "referenced_type" : "type-10995", ++ "self_type" : "type-10997", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88211,8 +88253,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-11081", +- "self_type" : "type-11083", ++ "referenced_type" : "type-11033", ++ "self_type" : "type-11035", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88220,8 +88262,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-11176", +- "self_type" : "type-11178", ++ "referenced_type" : "type-11128", ++ "self_type" : "type-11130", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88229,8 +88271,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-11198", +- "self_type" : "type-11200", ++ "referenced_type" : "type-11150", ++ "self_type" : "type-11152", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88238,8 +88280,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-11224", +- "self_type" : "type-11226", ++ "referenced_type" : "type-11176", ++ "self_type" : "type-11178", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88247,8 +88289,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-11232", +- "self_type" : "type-11234", ++ "referenced_type" : "type-11184", ++ "self_type" : "type-11186", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88256,8 +88298,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-11243", +- "self_type" : "type-11245", ++ "referenced_type" : "type-11195", ++ "self_type" : "type-11197", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88265,8 +88307,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-11251", +- "self_type" : "type-11433", ++ "referenced_type" : "type-11203", ++ "self_type" : "type-11385", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88283,8 +88325,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-11392", +- "self_type" : "type-11394", ++ "referenced_type" : "type-11344", ++ "self_type" : "type-11346", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88292,8 +88334,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-11412", +- "self_type" : "type-11432", ++ "referenced_type" : "type-11364", ++ "self_type" : "type-11384", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88301,17 +88343,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-115", +- "self_type" : "type-117", ++ "referenced_type" : "type-11475", ++ "self_type" : "type-11482", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-11523", +- "self_type" : "type-11530", ++ "referenced_type" : "type-11494", ++ "self_type" : "type-11496", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88319,17 +88361,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-11542", +- "self_type" : "type-11544", ++ "referenced_type" : "type-115", ++ "self_type" : "type-117", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-11585", +- "self_type" : "type-11587", ++ "referenced_type" : "type-11537", ++ "self_type" : "type-11539", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88337,8 +88379,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-11597", +- "self_type" : "type-11599", ++ "referenced_type" : "type-11549", ++ "self_type" : "type-11551", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88346,8 +88388,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-11633", +- "self_type" : "type-11635", ++ "referenced_type" : "type-11585", ++ "self_type" : "type-11587", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88355,8 +88397,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-11666", +- "self_type" : "type-11668", ++ "referenced_type" : "type-11618", ++ "self_type" : "type-11620", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88364,8 +88406,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-11702", +- "self_type" : "type-11704", ++ "referenced_type" : "type-11654", ++ "self_type" : "type-11656", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88373,8 +88415,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-11759", +- "self_type" : "type-11770", ++ "referenced_type" : "type-11711", ++ "self_type" : "type-11722", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, +@@ -88382,8 +88424,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-12010", +- "self_type" : "type-12012", ++ "referenced_type" : "type-11962", ++ "self_type" : "type-11964", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88391,8 +88433,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-12023", +- "self_type" : "type-12025", ++ "referenced_type" : "type-11975", ++ "self_type" : "type-11977", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88400,8 +88442,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-12087", +- "self_type" : "type-12101", ++ "referenced_type" : "type-12039", ++ "self_type" : "type-12053", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88409,8 +88451,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-12120", +- "self_type" : "type-12122", ++ "referenced_type" : "type-1204", ++ "self_type" : "type-1206", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88418,8 +88460,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-12125", +- "self_type" : "type-12194", ++ "referenced_type" : "type-12072", ++ "self_type" : "type-12074", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88427,8 +88469,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-12213", +- "self_type" : "type-12228", ++ "referenced_type" : "type-12077", ++ "self_type" : "type-12146", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88436,8 +88478,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-12232", +- "self_type" : "type-12244", ++ "referenced_type" : "type-12165", ++ "self_type" : "type-12180", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88445,8 +88487,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1229", +- "self_type" : "type-1231", ++ "referenced_type" : "type-12184", ++ "self_type" : "type-12196", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88454,8 +88496,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1235", +- "self_type" : "type-1251", ++ "referenced_type" : "type-12326", ++ "self_type" : "type-12331", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88463,8 +88505,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-12374", +- "self_type" : "type-12379", ++ "referenced_type" : "type-12375", ++ "self_type" : "type-12377", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88472,8 +88514,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-12423", +- "self_type" : "type-12425", ++ "referenced_type" : "type-12402", ++ "self_type" : "type-12404", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88481,8 +88523,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-12450", +- "self_type" : "type-12452", ++ "referenced_type" : "type-12472", ++ "self_type" : "type-12474", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88490,8 +88532,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-12520", +- "self_type" : "type-12522", ++ "referenced_type" : "type-12475", ++ "self_type" : "type-12477", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88499,8 +88541,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-12523", +- "self_type" : "type-12525", ++ "referenced_type" : "type-12550", ++ "self_type" : "type-12558", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88508,8 +88550,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-12598", +- "self_type" : "type-12606", ++ "referenced_type" : "type-12579", ++ "self_type" : "type-12581", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88517,8 +88559,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-12627", +- "self_type" : "type-12629", ++ "referenced_type" : "type-12678", ++ "self_type" : "type-12680", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88526,8 +88568,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-12726", +- "self_type" : "type-12728", ++ "referenced_type" : "type-12722", ++ "self_type" : "type-12724", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88535,8 +88577,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-12770", +- "self_type" : "type-12772", ++ "referenced_type" : "type-12758", ++ "self_type" : "type-12760", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88544,8 +88586,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-12806", +- "self_type" : "type-12808", ++ "referenced_type" : "type-12779", ++ "self_type" : "type-12816", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88553,8 +88595,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-12827", +- "self_type" : "type-12864", ++ "referenced_type" : "type-12823", ++ "self_type" : "type-12825", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88562,8 +88604,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-12871", +- "self_type" : "type-12873", ++ "referenced_type" : "type-12830", ++ "self_type" : "type-12833", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88571,8 +88613,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-12878", +- "self_type" : "type-12881", ++ "referenced_type" : "type-12889", ++ "self_type" : "type-12891", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88580,8 +88622,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1289", +- "self_type" : "type-1291", ++ "referenced_type" : "type-12954", ++ "self_type" : "type-12956", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88589,8 +88631,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-12937", +- "self_type" : "type-12939", ++ "referenced_type" : "type-12969", ++ "self_type" : "type-12971", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88598,8 +88640,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-13002", +- "self_type" : "type-13004", ++ "referenced_type" : "type-12992", ++ "self_type" : "type-13035", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88607,8 +88649,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-13017", +- "self_type" : "type-13019", ++ "referenced_type" : "type-13040", ++ "self_type" : "type-13042", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88616,8 +88658,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-13040", +- "self_type" : "type-13083", ++ "referenced_type" : "type-13264", ++ "self_type" : "type-13263", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88625,8 +88667,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-13088", +- "self_type" : "type-13090", ++ "referenced_type" : "type-13374", ++ "self_type" : "type-13376", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88634,8 +88676,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-13312", +- "self_type" : "type-13311", ++ "referenced_type" : "type-13384", ++ "self_type" : "type-13451", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88643,8 +88685,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-13422", +- "self_type" : "type-13424", ++ "referenced_type" : "type-13457", ++ "self_type" : "type-13459", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88652,8 +88694,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-13432", +- "self_type" : "type-13499", ++ "referenced_type" : "type-13469", ++ "self_type" : "type-13471", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88661,8 +88703,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-13505", +- "self_type" : "type-13507", ++ "referenced_type" : "type-13521", ++ "self_type" : "type-13523", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88670,8 +88712,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-13517", +- "self_type" : "type-13519", ++ "referenced_type" : "type-13534", ++ "self_type" : "type-13595", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88679,8 +88721,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-13569", +- "self_type" : "type-13571", ++ "referenced_type" : "type-137", ++ "self_type" : "type-140", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88688,8 +88730,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-13582", +- "self_type" : "type-13643", ++ "referenced_type" : "type-1376", ++ "self_type" : "type-1378", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88697,8 +88739,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-137", +- "self_type" : "type-140", ++ "referenced_type" : "type-13776", ++ "self_type" : "type-13778", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88706,8 +88748,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1381", +- "self_type" : "type-1396", ++ "referenced_type" : "type-13790", ++ "self_type" : "type-13792", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88715,8 +88757,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-13824", +- "self_type" : "type-13826", ++ "referenced_type" : "type-1390", ++ "self_type" : "type-1418", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88724,8 +88766,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-13838", +- "self_type" : "type-13840", ++ "referenced_type" : "type-13958", ++ "self_type" : "type-13960", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88733,8 +88775,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-14006", +- "self_type" : "type-14008", ++ "referenced_type" : "type-14046", ++ "self_type" : "type-14048", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88742,8 +88784,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-14094", +- "self_type" : "type-14096", ++ "referenced_type" : "type-1409", ++ "self_type" : "type-1417", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88751,8 +88793,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-14170", +- "self_type" : "type-14173", ++ "referenced_type" : "type-14122", ++ "self_type" : "type-14125", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88760,8 +88802,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-14279", +- "self_type" : "type-14281", ++ "referenced_type" : "type-14231", ++ "self_type" : "type-14233", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88769,8 +88811,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-14334", +- "self_type" : "type-14336", ++ "referenced_type" : "type-1426", ++ "self_type" : "type-1433", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88778,8 +88820,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-14363", +- "self_type" : "type-14365", ++ "referenced_type" : "type-14286", ++ "self_type" : "type-14288", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88787,8 +88829,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-14440", +- "self_type" : "type-14442", ++ "referenced_type" : "type-14315", ++ "self_type" : "type-14317", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88796,8 +88838,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-14454", +- "self_type" : "type-14456", ++ "referenced_type" : "type-14392", ++ "self_type" : "type-14394", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88805,8 +88847,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-14476", +- "self_type" : "type-14478", ++ "referenced_type" : "type-14406", ++ "self_type" : "type-14408", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88814,8 +88856,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-14484", +- "self_type" : "type-14486", ++ "referenced_type" : "type-14428", ++ "self_type" : "type-14430", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88823,8 +88865,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-14495", +- "self_type" : "type-14497", ++ "referenced_type" : "type-14436", ++ "self_type" : "type-14438", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88832,8 +88874,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-14502", +- "self_type" : "type-14652", ++ "referenced_type" : "type-14447", ++ "self_type" : "type-14449", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88841,8 +88883,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1457", +- "self_type" : "type-1459", ++ "referenced_type" : "type-1445", ++ "self_type" : "type-1447", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88850,8 +88892,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-14616", +- "self_type" : "type-14618", ++ "referenced_type" : "type-14454", ++ "self_type" : "type-14604", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88859,8 +88901,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-14631", +- "self_type" : "type-14651", ++ "referenced_type" : "type-14568", ++ "self_type" : "type-14570", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88868,8 +88910,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-147", +- "self_type" : "type-150", ++ "referenced_type" : "type-14583", ++ "self_type" : "type-14603", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88877,8 +88919,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-14742", +- "self_type" : "type-14813", ++ "referenced_type" : "type-14694", ++ "self_type" : "type-14765", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88886,8 +88928,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1475", +- "self_type" : "type-1504", ++ "referenced_type" : "type-147", ++ "self_type" : "type-150", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88895,8 +88937,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-14783", +- "self_type" : "type-14914", ++ "referenced_type" : "type-14735", ++ "self_type" : "type-14866", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88904,8 +88946,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-14830", +- "self_type" : "type-14829", ++ "referenced_type" : "type-14782", ++ "self_type" : "type-14781", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88913,8 +88955,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15003", +- "self_type" : "type-15005", ++ "referenced_type" : "type-1488", ++ "self_type" : "type-1490", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88922,8 +88964,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15075", +- "self_type" : "type-15085", ++ "referenced_type" : "type-14955", ++ "self_type" : "type-14957", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88931,8 +88973,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1510", +- "self_type" : "type-1516", ++ "referenced_type" : "type-1500", ++ "self_type" : "type-1502", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88940,8 +88982,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15181", +- "self_type" : "type-15183", ++ "referenced_type" : "type-15027", ++ "self_type" : "type-15037", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88949,8 +88991,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1526", +- "self_type" : "type-1528", ++ "referenced_type" : "type-15133", ++ "self_type" : "type-15135", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88958,8 +89000,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15391", +- "self_type" : "type-15393", ++ "referenced_type" : "type-15343", ++ "self_type" : "type-15345", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88967,8 +89009,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15408", +- "self_type" : "type-15410", ++ "referenced_type" : "type-15360", ++ "self_type" : "type-15362", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88976,8 +89018,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15417", +- "self_type" : "type-15419", ++ "referenced_type" : "type-15369", ++ "self_type" : "type-15371", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88985,8 +89027,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15444", +- "self_type" : "type-15446", ++ "referenced_type" : "type-15396", ++ "self_type" : "type-15398", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -88994,8 +89036,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15456", +- "self_type" : "type-15458", ++ "referenced_type" : "type-15408", ++ "self_type" : "type-15410", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89003,8 +89045,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15492", +- "self_type" : "type-15494", ++ "referenced_type" : "type-15444", ++ "self_type" : "type-15446", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89012,8 +89054,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-155", +- "self_type" : "type-159", ++ "referenced_type" : "type-1547", ++ "self_type" : "type-1549", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89021,8 +89063,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15525", +- "self_type" : "type-15527", ++ "referenced_type" : "type-15477", ++ "self_type" : "type-15479", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89030,8 +89072,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15558", +- "self_type" : "type-15560", ++ "referenced_type" : "type-155", ++ "self_type" : "type-159", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89039,19 +89081,19 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15616", +- "self_type" : "type-15627", ++ "referenced_type" : "type-15510", ++ "self_type" : "type-15512", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1568", +- "self_type" : "type-1570", ++ "referenced_type" : "type-15568", ++ "self_type" : "type-15579", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, + { + "alignment" : 4, +@@ -89066,17 +89108,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15866", +- "self_type" : "type-15868", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "const std::basic_string, std::allocator > &", +- "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15879", +- "self_type" : "type-15881", ++ "referenced_type" : "type-15818", ++ "self_type" : "type-15820", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89084,8 +89117,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15943", +- "self_type" : "type-15957", ++ "referenced_type" : "type-15831", ++ "self_type" : "type-15833", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89093,8 +89126,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15975", +- "self_type" : "type-15977", ++ "referenced_type" : "type-15895", ++ "self_type" : "type-15909", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89102,8 +89135,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-15980", +- "self_type" : "type-16049", ++ "referenced_type" : "type-15927", ++ "self_type" : "type-15929", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89111,8 +89144,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16068", +- "self_type" : "type-16083", ++ "referenced_type" : "type-15932", ++ "self_type" : "type-16001", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89120,8 +89153,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16087", +- "self_type" : "type-16099", ++ "referenced_type" : "type-16020", ++ "self_type" : "type-16035", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89129,8 +89162,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16229", +- "self_type" : "type-16234", ++ "referenced_type" : "type-16039", ++ "self_type" : "type-16051", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89138,8 +89171,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16280", +- "self_type" : "type-16282", ++ "referenced_type" : "type-16181", ++ "self_type" : "type-16186", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89147,8 +89180,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16307", +- "self_type" : "type-16309", ++ "referenced_type" : "type-16232", ++ "self_type" : "type-16234", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89156,8 +89189,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1632", +- "self_type" : "type-1635", ++ "referenced_type" : "type-16259", ++ "self_type" : "type-16261", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89165,8 +89198,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16377", +- "self_type" : "type-16379", ++ "referenced_type" : "type-16329", ++ "self_type" : "type-16331", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89174,8 +89207,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16380", +- "self_type" : "type-16382", ++ "referenced_type" : "type-16332", ++ "self_type" : "type-16334", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89183,8 +89216,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16455", +- "self_type" : "type-16463", ++ "referenced_type" : "type-16407", ++ "self_type" : "type-16415", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89192,8 +89225,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16484", +- "self_type" : "type-16486", ++ "referenced_type" : "type-16436", ++ "self_type" : "type-16438", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89201,8 +89234,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16582", +- "self_type" : "type-16584", ++ "referenced_type" : "type-16534", ++ "self_type" : "type-16536", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89210,8 +89243,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16626", +- "self_type" : "type-16628", ++ "referenced_type" : "type-16578", ++ "self_type" : "type-16580", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89219,8 +89252,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16662", +- "self_type" : "type-16664", ++ "referenced_type" : "type-16614", ++ "self_type" : "type-16616", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89228,8 +89261,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16683", +- "self_type" : "type-16720", ++ "referenced_type" : "type-16635", ++ "self_type" : "type-16672", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89237,8 +89270,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1669", +- "self_type" : "type-1671", ++ "referenced_type" : "type-16679", ++ "self_type" : "type-16681", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89246,8 +89279,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16727", +- "self_type" : "type-16729", ++ "referenced_type" : "type-16686", ++ "self_type" : "type-16689", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89255,8 +89288,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16734", +- "self_type" : "type-16737", ++ "referenced_type" : "type-16745", ++ "self_type" : "type-16747", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89264,8 +89297,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16793", +- "self_type" : "type-16795", ++ "referenced_type" : "type-16810", ++ "self_type" : "type-16812", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89273,8 +89306,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16858", +- "self_type" : "type-16860", ++ "referenced_type" : "type-16825", ++ "self_type" : "type-16827", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89282,8 +89315,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16873", +- "self_type" : "type-16875", ++ "referenced_type" : "type-16848", ++ "self_type" : "type-16891", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89292,7 +89325,7 @@ + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", + "referenced_type" : "type-16896", +- "self_type" : "type-16939", ++ "self_type" : "type-16898", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89300,8 +89333,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-16944", +- "self_type" : "type-16946", ++ "referenced_type" : "type-170", ++ "self_type" : "type-172", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89309,8 +89342,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-170", +- "self_type" : "type-172", ++ "referenced_type" : "type-17120", ++ "self_type" : "type-17119", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89318,8 +89351,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17168", +- "self_type" : "type-17167", ++ "referenced_type" : "type-17230", ++ "self_type" : "type-17232", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89327,17 +89360,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1717", +- "self_type" : "type-1719", ++ "referenced_type" : "type-17240", ++ "self_type" : "type-17307", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17278", +- "self_type" : "type-17280", ++ "referenced_type" : "type-17313", ++ "self_type" : "type-17315", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89345,8 +89378,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17288", +- "self_type" : "type-17355", ++ "referenced_type" : "type-17325", ++ "self_type" : "type-17327", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89354,8 +89387,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17361", +- "self_type" : "type-17363", ++ "referenced_type" : "type-17385", ++ "self_type" : "type-17387", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89363,8 +89396,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17373", +- "self_type" : "type-17375", ++ "referenced_type" : "type-17398", ++ "self_type" : "type-17459", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89372,8 +89405,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17433", +- "self_type" : "type-17435", ++ "referenced_type" : "type-17640", ++ "self_type" : "type-17642", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89381,8 +89414,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17446", +- "self_type" : "type-17507", ++ "referenced_type" : "type-17654", ++ "self_type" : "type-17656", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89390,8 +89423,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17688", +- "self_type" : "type-17690", ++ "referenced_type" : "type-17822", ++ "self_type" : "type-17824", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89399,8 +89432,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17702", +- "self_type" : "type-17704", ++ "referenced_type" : "type-1785", ++ "self_type" : "type-1787", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89408,8 +89441,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17870", +- "self_type" : "type-17872", ++ "referenced_type" : "type-17910", ++ "self_type" : "type-17912", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89417,8 +89450,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-17958", +- "self_type" : "type-17960", ++ "referenced_type" : "type-17986", ++ "self_type" : "type-17989", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89435,8 +89468,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18034", +- "self_type" : "type-18037", ++ "referenced_type" : "type-18095", ++ "self_type" : "type-18097", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89444,8 +89477,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18143", +- "self_type" : "type-18145", ++ "referenced_type" : "type-18150", ++ "self_type" : "type-18152", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89453,8 +89486,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18198", +- "self_type" : "type-18200", ++ "referenced_type" : "type-18179", ++ "self_type" : "type-18181", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89462,8 +89495,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18227", +- "self_type" : "type-18229", ++ "referenced_type" : "type-18256", ++ "self_type" : "type-18258", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89471,8 +89504,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18304", +- "self_type" : "type-18306", ++ "referenced_type" : "type-18270", ++ "self_type" : "type-18272", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89480,8 +89513,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18318", +- "self_type" : "type-18320", ++ "referenced_type" : "type-18292", ++ "self_type" : "type-18294", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89489,8 +89522,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18340", +- "self_type" : "type-18342", ++ "referenced_type" : "type-18300", ++ "self_type" : "type-18302", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89498,8 +89531,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18348", +- "self_type" : "type-18350", ++ "referenced_type" : "type-18311", ++ "self_type" : "type-18313", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89507,8 +89540,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18359", +- "self_type" : "type-18361", ++ "referenced_type" : "type-18318", ++ "self_type" : "type-18468", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89516,8 +89549,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18366", +- "self_type" : "type-18516", ++ "referenced_type" : "type-18432", ++ "self_type" : "type-18434", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89525,8 +89558,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18480", +- "self_type" : "type-18482", ++ "referenced_type" : "type-18447", ++ "self_type" : "type-18467", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89534,8 +89567,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18495", +- "self_type" : "type-18515", ++ "referenced_type" : "type-18558", ++ "self_type" : "type-18628", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89543,8 +89576,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18606", +- "self_type" : "type-18676", ++ "referenced_type" : "type-18599", ++ "self_type" : "type-18723", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89552,17 +89585,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18647", +- "self_type" : "type-18771", ++ "referenced_type" : "type-1860", ++ "self_type" : "type-1880", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-1868", +- "self_type" : "type-1870", ++ "referenced_type" : "type-18639", ++ "self_type" : "type-18638", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89570,8 +89603,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18687", +- "self_type" : "type-18686", ++ "referenced_type" : "type-18774", ++ "self_type" : "type-18776", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89579,8 +89612,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18822", +- "self_type" : "type-18824", ++ "referenced_type" : "type-18811", ++ "self_type" : "type-18821", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89588,8 +89621,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18859", +- "self_type" : "type-18869", ++ "referenced_type" : "type-18917", ++ "self_type" : "type-18919", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89597,8 +89630,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-18965", +- "self_type" : "type-18967", ++ "referenced_type" : "type-19102", ++ "self_type" : "type-19104", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89606,8 +89639,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19150", +- "self_type" : "type-19152", ++ "referenced_type" : "type-19116", ++ "self_type" : "type-19118", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89615,8 +89648,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19164", +- "self_type" : "type-19166", ++ "referenced_type" : "type-19124", ++ "self_type" : "type-19126", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89624,8 +89657,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19172", +- "self_type" : "type-19174", ++ "referenced_type" : "type-19129", ++ "self_type" : "type-19131", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89633,8 +89666,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19177", +- "self_type" : "type-19179", ++ "referenced_type" : "type-193", ++ "self_type" : "type-195", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89642,8 +89675,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-193", +- "self_type" : "type-195", ++ "referenced_type" : "type-19304", ++ "self_type" : "type-19306", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89651,8 +89684,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19352", +- "self_type" : "type-19354", ++ "referenced_type" : "type-19309", ++ "self_type" : "type-19311", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89660,8 +89693,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19357", +- "self_type" : "type-19359", ++ "referenced_type" : "type-19338", ++ "self_type" : "type-19340", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89669,8 +89702,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19386", +- "self_type" : "type-19388", ++ "referenced_type" : "type-19471", ++ "self_type" : "type-19482", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89678,8 +89711,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19519", +- "self_type" : "type-19530", ++ "referenced_type" : "type-19474", ++ "self_type" : "type-19476", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89687,8 +89720,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19522", +- "self_type" : "type-19524", ++ "referenced_type" : "type-19646", ++ "self_type" : "type-19650", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89696,8 +89729,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19694", +- "self_type" : "type-19698", ++ "referenced_type" : "type-19660", ++ "self_type" : "type-19662", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89705,8 +89738,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19708", +- "self_type" : "type-19710", ++ "referenced_type" : "type-19820", ++ "self_type" : "type-19822", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89714,8 +89747,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19868", +- "self_type" : "type-19870", ++ "referenced_type" : "type-19916", ++ "self_type" : "type-19935", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89723,8 +89756,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-19964", +- "self_type" : "type-19983", ++ "referenced_type" : "type-20006", ++ "self_type" : "type-20008", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89732,8 +89765,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20054", +- "self_type" : "type-20056", ++ "referenced_type" : "type-20043", ++ "self_type" : "type-20045", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89741,26 +89774,26 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20091", +- "self_type" : "type-20093", ++ "referenced_type" : "type-20101", ++ "self_type" : "type-20112", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20149", +- "self_type" : "type-20160", ++ "referenced_type" : "type-20352", ++ "self_type" : "type-20354", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20400", +- "self_type" : "type-20402", ++ "referenced_type" : "type-20365", ++ "self_type" : "type-20367", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89768,8 +89801,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20413", +- "self_type" : "type-20415", ++ "referenced_type" : "type-20429", ++ "self_type" : "type-20443", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89777,8 +89810,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20477", +- "self_type" : "type-20491", ++ "referenced_type" : "type-20459", ++ "self_type" : "type-20461", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89786,8 +89819,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20507", +- "self_type" : "type-20509", ++ "referenced_type" : "type-20464", ++ "self_type" : "type-20533", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89795,8 +89828,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20512", +- "self_type" : "type-20581", ++ "referenced_type" : "type-20552", ++ "self_type" : "type-20567", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89804,8 +89837,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20600", +- "self_type" : "type-20615", ++ "referenced_type" : "type-20571", ++ "self_type" : "type-20583", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89813,8 +89846,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20619", +- "self_type" : "type-20631", ++ "referenced_type" : "type-207", ++ "self_type" : "type-209", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89822,8 +89855,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-207", +- "self_type" : "type-209", ++ "referenced_type" : "type-20712", ++ "self_type" : "type-20717", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89831,7 +89864,7 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20760", ++ "referenced_type" : "type-20763", + "self_type" : "type-20765", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" +@@ -89840,8 +89873,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20811", +- "self_type" : "type-20813", ++ "referenced_type" : "type-20790", ++ "self_type" : "type-20792", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89849,8 +89882,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20838", +- "self_type" : "type-20840", ++ "referenced_type" : "type-20860", ++ "self_type" : "type-20862", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89858,8 +89891,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20908", +- "self_type" : "type-20910", ++ "referenced_type" : "type-20863", ++ "self_type" : "type-20865", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89867,8 +89900,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20911", +- "self_type" : "type-20913", ++ "referenced_type" : "type-20938", ++ "self_type" : "type-20946", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89876,8 +89909,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-20986", +- "self_type" : "type-20994", ++ "referenced_type" : "type-20967", ++ "self_type" : "type-20969", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89885,8 +89918,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21015", +- "self_type" : "type-21017", ++ "referenced_type" : "type-21066", ++ "self_type" : "type-21068", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89894,8 +89927,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21114", +- "self_type" : "type-21116", ++ "referenced_type" : "type-21110", ++ "self_type" : "type-21112", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89903,8 +89936,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21158", +- "self_type" : "type-21160", ++ "referenced_type" : "type-21146", ++ "self_type" : "type-21148", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89912,8 +89945,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21194", +- "self_type" : "type-21196", ++ "referenced_type" : "type-21167", ++ "self_type" : "type-21204", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89921,8 +89954,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21215", +- "self_type" : "type-21252", ++ "referenced_type" : "type-21211", ++ "self_type" : "type-21213", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89930,8 +89963,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21259", +- "self_type" : "type-21261", ++ "referenced_type" : "type-21218", ++ "self_type" : "type-21221", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89939,8 +89972,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21266", +- "self_type" : "type-21269", ++ "referenced_type" : "type-21277", ++ "self_type" : "type-21279", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89948,8 +89981,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21325", +- "self_type" : "type-21327", ++ "referenced_type" : "type-21342", ++ "self_type" : "type-21344", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89957,8 +89990,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21390", +- "self_type" : "type-21392", ++ "referenced_type" : "type-21357", ++ "self_type" : "type-21359", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89966,8 +89999,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21405", +- "self_type" : "type-21407", ++ "referenced_type" : "type-21380", ++ "self_type" : "type-21423", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89976,7 +90009,7 @@ + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", + "referenced_type" : "type-21428", +- "self_type" : "type-21471", ++ "self_type" : "type-21430", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89984,8 +90017,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21476", +- "self_type" : "type-21478", ++ "referenced_type" : "type-21652", ++ "self_type" : "type-21651", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -89993,8 +90026,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21700", +- "self_type" : "type-21699", ++ "referenced_type" : "type-21762", ++ "self_type" : "type-21764", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90002,8 +90035,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21810", +- "self_type" : "type-21812", ++ "referenced_type" : "type-21772", ++ "self_type" : "type-21839", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90011,8 +90044,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21820", +- "self_type" : "type-21887", ++ "referenced_type" : "type-21845", ++ "self_type" : "type-21847", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90020,8 +90053,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21893", +- "self_type" : "type-21895", ++ "referenced_type" : "type-21857", ++ "self_type" : "type-21859", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90029,8 +90062,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21905", +- "self_type" : "type-21907", ++ "referenced_type" : "type-21887", ++ "self_type" : "type-21889", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90038,8 +90071,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21962", +- "self_type" : "type-21964", ++ "referenced_type" : "type-21901", ++ "self_type" : "type-21903", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90047,8 +90080,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-21975", +- "self_type" : "type-22036", ++ "referenced_type" : "type-21970", ++ "self_type" : "type-22031", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90056,8 +90089,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2218", +- "self_type" : "type-2240", ++ "referenced_type" : "type-21978", ++ "self_type" : "type-21986", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90065,8 +90098,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-22217", +- "self_type" : "type-22219", ++ "referenced_type" : "type-22038", ++ "self_type" : "type-22163", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90074,8 +90107,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-22231", +- "self_type" : "type-22233", ++ "referenced_type" : "type-22204", ++ "self_type" : "type-22206", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90083,8 +90116,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-22399", +- "self_type" : "type-22401", ++ "referenced_type" : "type-22216", ++ "self_type" : "type-22218", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90092,8 +90125,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-22487", +- "self_type" : "type-22489", ++ "referenced_type" : "type-22358", ++ "self_type" : "type-22360", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90101,8 +90134,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-22563", +- "self_type" : "type-22566", ++ "referenced_type" : "type-22417", ++ "self_type" : "type-22419", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90110,8 +90143,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-22672", +- "self_type" : "type-22674", ++ "referenced_type" : "type-22484", ++ "self_type" : "type-22486", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90119,8 +90152,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-22727", +- "self_type" : "type-22729", ++ "referenced_type" : "type-22510", ++ "self_type" : "type-22512", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90128,8 +90161,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-22756", +- "self_type" : "type-22758", ++ "referenced_type" : "type-22585", ++ "self_type" : "type-22587", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90137,8 +90170,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-22833", +- "self_type" : "type-22835", ++ "referenced_type" : "type-22656", ++ "self_type" : "type-22658", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90146,8 +90179,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-22847", +- "self_type" : "type-22849", ++ "referenced_type" : "type-22785", ++ "self_type" : "type-22787", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90155,8 +90188,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-22869", +- "self_type" : "type-22871", ++ "referenced_type" : "type-22802", ++ "self_type" : "type-22805", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90164,8 +90197,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-22877", +- "self_type" : "type-22879", ++ "referenced_type" : "type-22824", ++ "self_type" : "type-22826", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90173,8 +90206,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-22888", +- "self_type" : "type-22890", ++ "referenced_type" : "type-22836", ++ "self_type" : "type-22838", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90182,8 +90215,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-22895", +- "self_type" : "type-23045", ++ "referenced_type" : "type-22849", ++ "self_type" : "type-22852", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90191,8 +90224,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-23009", +- "self_type" : "type-23011", ++ "referenced_type" : "type-2287", ++ "self_type" : "type-2289", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90200,8 +90233,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-23024", +- "self_type" : "type-23044", ++ "referenced_type" : "type-22883", ++ "self_type" : "type-22967", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90209,8 +90242,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-23135", +- "self_type" : "type-23205", ++ "referenced_type" : "type-22982", ++ "self_type" : "type-22984", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90218,8 +90251,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-23176", +- "self_type" : "type-23300", ++ "referenced_type" : "type-23120", ++ "self_type" : "type-23192", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90227,8 +90260,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-23216", +- "self_type" : "type-23215", ++ "referenced_type" : "type-2313", ++ "self_type" : "type-2316", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90236,8 +90269,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-23351", +- "self_type" : "type-23353", ++ "referenced_type" : "type-23204", ++ "self_type" : "type-23203", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90245,8 +90278,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-23388", +- "self_type" : "type-23398", ++ "referenced_type" : "type-23341", ++ "self_type" : "type-23343", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90254,8 +90287,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-23494", +- "self_type" : "type-23496", ++ "referenced_type" : "type-23470", ++ "self_type" : "type-23472", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90263,8 +90296,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2359", +- "self_type" : "type-2361", ++ "referenced_type" : "type-23527", ++ "self_type" : "type-23539", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90272,8 +90305,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-23679", +- "self_type" : "type-23681", ++ "referenced_type" : "type-23664", ++ "self_type" : "type-23666", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90281,8 +90314,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-23693", +- "self_type" : "type-23695", ++ "referenced_type" : "type-23678", ++ "self_type" : "type-23682", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90290,8 +90323,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-23701", +- "self_type" : "type-23703", ++ "referenced_type" : "type-23689", ++ "self_type" : "type-23691", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90299,8 +90332,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-23706", +- "self_type" : "type-23708", ++ "referenced_type" : "type-23694", ++ "self_type" : "type-23696", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90308,8 +90341,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2386", +- "self_type" : "type-2392", ++ "referenced_type" : "type-23706", ++ "self_type" : "type-23909", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90317,8 +90350,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-23862", +- "self_type" : "type-23864", ++ "referenced_type" : "type-23855", ++ "self_type" : "type-23857", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90326,8 +90359,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-23867", +- "self_type" : "type-23869", ++ "referenced_type" : "type-23864", ++ "self_type" : "type-23866", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90335,8 +90368,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-23886", +- "self_type" : "type-23888", ++ "referenced_type" : "type-23888", ++ "self_type" : "type-23890", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90344,8 +90377,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-23994", +- "self_type" : "type-24000", ++ "referenced_type" : "type-2393", ++ "self_type" : "type-2413", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90353,8 +90386,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-23997", +- "self_type" : "type-23999", ++ "referenced_type" : "type-23985", ++ "self_type" : "type-24070", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90362,8 +90395,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-24161", +- "self_type" : "type-24165", ++ "referenced_type" : "type-23998", ++ "self_type" : "type-24000", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90371,8 +90404,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-24175", +- "self_type" : "type-24177", ++ "referenced_type" : "type-24177", ++ "self_type" : "type-24179", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90380,8 +90413,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-24335", +- "self_type" : "type-24337", ++ "referenced_type" : "type-24183", ++ "self_type" : "type-24185", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90389,8 +90422,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-24427", +- "self_type" : "type-24446", ++ "referenced_type" : "type-24323", ++ "self_type" : "type-24325", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90398,8 +90431,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-24488", +- "self_type" : "type-24490", ++ "referenced_type" : "type-2441", ++ "self_type" : "type-2443", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90407,8 +90440,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-24666", +- "self_type" : "type-24668", ++ "referenced_type" : "type-2446", ++ "self_type" : "type-2515", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90416,8 +90449,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-24669", +- "self_type" : "type-24674", ++ "referenced_type" : "type-24465", ++ "self_type" : "type-24467", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90425,8 +90458,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2467", +- "self_type" : "type-2483", ++ "referenced_type" : "type-24629", ++ "self_type" : "type-24631", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90434,8 +90467,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-24754", +- "self_type" : "type-24756", ++ "referenced_type" : "type-24710", ++ "self_type" : "type-24712", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90443,8 +90476,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-249", +- "self_type" : "type-251", ++ "referenced_type" : "type-24837", ++ "self_type" : "type-24842", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90452,8 +90485,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-24929", +- "self_type" : "type-24931", ++ "referenced_type" : "type-24898", ++ "self_type" : "type-24900", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90461,8 +90494,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-25056", +- "self_type" : "type-25174", ++ "referenced_type" : "type-249", ++ "self_type" : "type-251", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90470,8 +90503,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2511", +- "self_type" : "type-2513", ++ "referenced_type" : "type-25009", ++ "self_type" : "type-25019", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90479,8 +90512,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2516", +- "self_type" : "type-2584", ++ "referenced_type" : "type-25027", ++ "self_type" : "type-25154", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90488,8 +90521,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-25181", +- "self_type" : "type-25183", ++ "referenced_type" : "type-25164", ++ "self_type" : "type-25166", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90497,8 +90530,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-25269", +- "self_type" : "type-25271", ++ "referenced_type" : "type-2517", ++ "self_type" : "type-2519", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90506,17 +90539,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-25327", +- "self_type" : "type-25336", ++ "referenced_type" : "type-2525", ++ "self_type" : "type-2527", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-25576", +- "self_type" : "type-25578", ++ "referenced_type" : "type-25260", ++ "self_type" : "type-25263", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90524,8 +90557,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-25589", +- "self_type" : "type-25591", ++ "referenced_type" : "type-25299", ++ "self_type" : "type-25301", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90533,8 +90566,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-25653", +- "self_type" : "type-25667", ++ "referenced_type" : "type-2530", ++ "self_type" : "type-2532", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90542,17 +90575,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-25686", +- "self_type" : "type-25688", ++ "referenced_type" : "type-25303", ++ "self_type" : "type-25307", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-25691", +- "self_type" : "type-25760", ++ "referenced_type" : "type-25333", ++ "self_type" : "type-25335", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90560,8 +90593,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-25779", +- "self_type" : "type-25794", ++ "referenced_type" : "type-2539", ++ "self_type" : "type-2541", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90569,8 +90602,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-25798", +- "self_type" : "type-25810", ++ "referenced_type" : "type-2549", ++ "self_type" : "type-2551", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90578,8 +90611,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2590", +- "self_type" : "type-2592", ++ "referenced_type" : "type-25563", ++ "self_type" : "type-25583", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90587,8 +90620,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-25939", +- "self_type" : "type-25944", ++ "referenced_type" : "type-25629", ++ "self_type" : "type-25631", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90596,8 +90629,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2595", +- "self_type" : "type-2597", ++ "referenced_type" : "type-25642", ++ "self_type" : "type-25647", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90605,8 +90638,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-25989", +- "self_type" : "type-25991", ++ "referenced_type" : "type-2568", ++ "self_type" : "type-2570", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90614,8 +90647,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-26016", +- "self_type" : "type-26018", ++ "referenced_type" : "type-25708", ++ "self_type" : "type-25718", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90623,8 +90656,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2602", +- "self_type" : "type-2604", ++ "referenced_type" : "type-25737", ++ "self_type" : "type-25739", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90632,8 +90665,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-26086", +- "self_type" : "type-26088", ++ "referenced_type" : "type-25742", ++ "self_type" : "type-25810", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90641,8 +90674,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-26089", +- "self_type" : "type-26091", ++ "referenced_type" : "type-2580", ++ "self_type" : "type-2584", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90650,17 +90683,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2610", +- "self_type" : "type-2612", ++ "referenced_type" : "type-25847", ++ "self_type" : "type-25861", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-26164", +- "self_type" : "type-26172", ++ "referenced_type" : "type-2586", ++ "self_type" : "type-2588", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90668,8 +90701,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2617", +- "self_type" : "type-2619", ++ "referenced_type" : "type-25892", ++ "self_type" : "type-25903", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90677,8 +90710,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-26193", +- "self_type" : "type-26195", ++ "referenced_type" : "type-25974", ++ "self_type" : "type-25995", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90686,8 +90719,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2626", +- "self_type" : "type-2628", ++ "referenced_type" : "type-26042", ++ "self_type" : "type-26044", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90695,8 +90728,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-26292", +- "self_type" : "type-26294", ++ "referenced_type" : "type-26069", ++ "self_type" : "type-26071", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90704,8 +90737,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-263", +- "self_type" : "type-267", ++ "referenced_type" : "type-26138", ++ "self_type" : "type-26140", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90713,8 +90746,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2632", +- "self_type" : "type-2637", ++ "referenced_type" : "type-26154", ++ "self_type" : "type-26156", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "const std::basic_string, std::allocator > &", ++ "name" : "const std::basic_string, std::allocator > &", ++ "referenced_type" : "type-2619", ++ "self_type" : "type-2621", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90722,8 +90764,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-26336", +- "self_type" : "type-26338", ++ "referenced_type" : "type-26237", ++ "self_type" : "type-26239", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90731,7 +90773,7 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2634", ++ "referenced_type" : "type-2625", + "self_type" : "type-2636", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" +@@ -90740,8 +90782,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-26372", +- "self_type" : "type-26374", ++ "referenced_type" : "type-26271", ++ "self_type" : "type-26284", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90749,8 +90791,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-26393", +- "self_type" : "type-26430", ++ "referenced_type" : "type-263", ++ "self_type" : "type-267", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90758,8 +90800,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-26437", +- "self_type" : "type-26439", ++ "referenced_type" : "type-26336", ++ "self_type" : "type-26338", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90767,8 +90809,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2644", +- "self_type" : "type-2646", ++ "referenced_type" : "type-26368", ++ "self_type" : "type-26372", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90776,8 +90818,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-26444", +- "self_type" : "type-26447", ++ "referenced_type" : "type-26392", ++ "self_type" : "type-26421", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90785,8 +90827,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-26503", +- "self_type" : "type-26505", ++ "referenced_type" : "type-26397", ++ "self_type" : "type-26403", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90794,8 +90836,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2652", +- "self_type" : "type-2654", ++ "referenced_type" : "type-26414", ++ "self_type" : "type-26416", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90803,8 +90845,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-26568", +- "self_type" : "type-26570", ++ "referenced_type" : "type-26471", ++ "self_type" : "type-26473", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90812,8 +90854,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-26583", +- "self_type" : "type-26585", ++ "referenced_type" : "type-26480", ++ "self_type" : "type-26482", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90821,8 +90863,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-26606", +- "self_type" : "type-26649", ++ "referenced_type" : "type-26526", ++ "self_type" : "type-26528", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90830,8 +90872,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2661", +- "self_type" : "type-2663", ++ "referenced_type" : "type-26536", ++ "self_type" : "type-26538", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90839,8 +90881,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-26654", +- "self_type" : "type-26656", ++ "referenced_type" : "type-26578", ++ "self_type" : "type-26591", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90848,8 +90890,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2671", +- "self_type" : "type-2675", ++ "referenced_type" : "type-2659", ++ "self_type" : "type-2661", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90857,8 +90899,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-26878", +- "self_type" : "type-26877", ++ "referenced_type" : "type-26611", ++ "self_type" : "type-26613", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90866,8 +90908,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-269", +- "self_type" : "type-271", ++ "referenced_type" : "type-26633", ++ "self_type" : "type-26637", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90875,8 +90917,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2691", +- "self_type" : "type-2693", ++ "referenced_type" : "type-2666", ++ "self_type" : "type-2668", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90884,8 +90926,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-26988", +- "self_type" : "type-26990", ++ "referenced_type" : "type-26675", ++ "self_type" : "type-26677", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90893,8 +90935,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-26998", +- "self_type" : "type-27065", ++ "referenced_type" : "type-26858", ++ "self_type" : "type-26870", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90902,8 +90944,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2701", +- "self_type" : "type-2705", ++ "referenced_type" : "type-26898", ++ "self_type" : "type-26897", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90911,8 +90953,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2706", +- "self_type" : "type-2708", ++ "referenced_type" : "type-269", ++ "self_type" : "type-271", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90920,8 +90962,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-27071", +- "self_type" : "type-27073", ++ "referenced_type" : "type-26948", ++ "self_type" : "type-27018", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90929,8 +90971,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-27083", +- "self_type" : "type-27085", ++ "referenced_type" : "type-27013", ++ "self_type" : "type-27015", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90938,8 +90980,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2714", +- "self_type" : "type-2716", ++ "referenced_type" : "type-27023", ++ "self_type" : "type-27026", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90947,8 +90989,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-27147", +- "self_type" : "type-27149", ++ "referenced_type" : "type-27146", ++ "self_type" : "type-27148", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90956,8 +90998,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-27160", +- "self_type" : "type-27221", ++ "referenced_type" : "type-27159", ++ "self_type" : "type-27220", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90965,8 +91007,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-27402", +- "self_type" : "type-27404", ++ "referenced_type" : "type-27401", ++ "self_type" : "type-27403", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90974,8 +91016,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-27416", +- "self_type" : "type-27418", ++ "referenced_type" : "type-27415", ++ "self_type" : "type-27417", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90983,8 +91025,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-27584", +- "self_type" : "type-27586", ++ "referenced_type" : "type-27583", ++ "self_type" : "type-27585", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -90992,8 +91034,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-27672", +- "self_type" : "type-27674", ++ "referenced_type" : "type-27671", ++ "self_type" : "type-27673", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91001,8 +91043,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-27748", +- "self_type" : "type-27751", ++ "referenced_type" : "type-27747", ++ "self_type" : "type-27750", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91010,8 +91052,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-27857", +- "self_type" : "type-27859", ++ "referenced_type" : "type-27856", ++ "self_type" : "type-27858", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91019,8 +91061,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-27912", +- "self_type" : "type-27914", ++ "referenced_type" : "type-27911", ++ "self_type" : "type-27913", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91028,8 +91070,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-27941", +- "self_type" : "type-27943", ++ "referenced_type" : "type-27940", ++ "self_type" : "type-27942", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91037,8 +91079,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-28018", +- "self_type" : "type-28020", ++ "referenced_type" : "type-28017", ++ "self_type" : "type-28019", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91046,8 +91088,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-28032", +- "self_type" : "type-28034", ++ "referenced_type" : "type-28031", ++ "self_type" : "type-28033", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91055,8 +91097,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-28054", +- "self_type" : "type-28056", ++ "referenced_type" : "type-28053", ++ "self_type" : "type-28055", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91064,8 +91106,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-28062", +- "self_type" : "type-28064", ++ "referenced_type" : "type-28061", ++ "self_type" : "type-28063", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91073,8 +91115,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-28073", +- "self_type" : "type-28075", ++ "referenced_type" : "type-28072", ++ "self_type" : "type-28074", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91082,8 +91124,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-28080", +- "self_type" : "type-28230", ++ "referenced_type" : "type-28079", ++ "self_type" : "type-28229", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91091,8 +91133,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-28194", +- "self_type" : "type-28196", ++ "referenced_type" : "type-28193", ++ "self_type" : "type-28195", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91100,8 +91142,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-28209", +- "self_type" : "type-28229", ++ "referenced_type" : "type-28208", ++ "self_type" : "type-28228", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91109,8 +91151,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-28320", +- "self_type" : "type-28390", ++ "referenced_type" : "type-28319", ++ "self_type" : "type-28389", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91118,8 +91160,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-28361", +- "self_type" : "type-28485", ++ "referenced_type" : "type-28360", ++ "self_type" : "type-28484", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91127,8 +91169,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-28401", +- "self_type" : "type-28400", ++ "referenced_type" : "type-2838", ++ "self_type" : "type-2840", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91136,8 +91178,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-28536", +- "self_type" : "type-28538", ++ "referenced_type" : "type-28400", ++ "self_type" : "type-28399", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91145,8 +91187,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-28573", +- "self_type" : "type-28583", ++ "referenced_type" : "type-2852", ++ "self_type" : "type-2880", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91154,8 +91196,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-28679", +- "self_type" : "type-28681", ++ "referenced_type" : "type-28535", ++ "self_type" : "type-28537", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91163,8 +91205,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2886", +- "self_type" : "type-2888", ++ "referenced_type" : "type-28572", ++ "self_type" : "type-28582", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91172,8 +91214,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-28864", +- "self_type" : "type-28866", ++ "referenced_type" : "type-28678", ++ "self_type" : "type-28680", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91181,8 +91223,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-28878", +- "self_type" : "type-28880", ++ "referenced_type" : "type-2871", ++ "self_type" : "type-2879", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91190,8 +91232,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-28886", +- "self_type" : "type-28888", ++ "referenced_type" : "type-28863", ++ "self_type" : "type-28865", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91199,8 +91241,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-28891", +- "self_type" : "type-28893", ++ "referenced_type" : "type-28877", ++ "self_type" : "type-28879", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91208,8 +91250,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2900", +- "self_type" : "type-2928", ++ "referenced_type" : "type-2888", ++ "self_type" : "type-2895", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91217,8 +91259,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-29047", +- "self_type" : "type-29049", ++ "referenced_type" : "type-28885", ++ "self_type" : "type-28887", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91226,8 +91268,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-29052", +- "self_type" : "type-29054", ++ "referenced_type" : "type-28890", ++ "self_type" : "type-28892", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91235,8 +91277,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-29071", +- "self_type" : "type-29073", ++ "referenced_type" : "type-29046", ++ "self_type" : "type-29048", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91244,8 +91286,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-29179", +- "self_type" : "type-29185", ++ "referenced_type" : "type-29051", ++ "self_type" : "type-29053", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91253,8 +91295,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-29182", +- "self_type" : "type-29184", ++ "referenced_type" : "type-2907", ++ "self_type" : "type-2909", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91262,8 +91304,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2919", +- "self_type" : "type-2927", ++ "referenced_type" : "type-29070", ++ "self_type" : "type-29072", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91271,8 +91313,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-29346", +- "self_type" : "type-29350", ++ "referenced_type" : "type-29178", ++ "self_type" : "type-29184", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91280,8 +91322,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2936", +- "self_type" : "type-2943", ++ "referenced_type" : "type-29181", ++ "self_type" : "type-29183", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91289,8 +91331,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-29360", +- "self_type" : "type-29362", ++ "referenced_type" : "type-29345", ++ "self_type" : "type-29349", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91298,8 +91340,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-29520", +- "self_type" : "type-29522", ++ "referenced_type" : "type-29359", ++ "self_type" : "type-29361", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91307,8 +91349,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2955", +- "self_type" : "type-2957", ++ "referenced_type" : "type-2950", ++ "self_type" : "type-2952", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91316,8 +91358,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-29612", +- "self_type" : "type-29631", ++ "referenced_type" : "type-29519", ++ "self_type" : "type-29521", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91325,8 +91367,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-29673", +- "self_type" : "type-29675", ++ "referenced_type" : "type-29611", ++ "self_type" : "type-29630", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91334,8 +91376,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-29847", +- "self_type" : "type-29849", ++ "referenced_type" : "type-2962", ++ "self_type" : "type-2964", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91343,8 +91385,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-29850", +- "self_type" : "type-29855", ++ "referenced_type" : "type-29672", ++ "self_type" : "type-29674", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91352,8 +91394,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-29935", +- "self_type" : "type-29937", ++ "referenced_type" : "type-29846", ++ "self_type" : "type-29848", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91361,8 +91403,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-2998", +- "self_type" : "type-3000", ++ "referenced_type" : "type-29849", ++ "self_type" : "type-29854", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91370,8 +91412,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-30085", +- "self_type" : "type-30087", ++ "referenced_type" : "type-29934", ++ "self_type" : "type-29936", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91379,8 +91421,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3010", +- "self_type" : "type-3012", ++ "referenced_type" : "type-2998", ++ "self_type" : "type-3000", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91388,8 +91430,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-30201", +- "self_type" : "type-30318", ++ "referenced_type" : "type-30084", ++ "self_type" : "type-30086", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91397,8 +91439,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-30325", +- "self_type" : "type-30327", ++ "referenced_type" : "type-30200", ++ "self_type" : "type-30317", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91406,8 +91448,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-30413", +- "self_type" : "type-30415", ++ "referenced_type" : "type-3031", ++ "self_type" : "type-3033", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91415,8 +91457,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3046", +- "self_type" : "type-3048", ++ "referenced_type" : "type-30324", ++ "self_type" : "type-30326", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91424,26 +91466,26 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-30471", +- "self_type" : "type-30482", ++ "referenced_type" : "type-30412", ++ "self_type" : "type-30414", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-30722", +- "self_type" : "type-30724", ++ "referenced_type" : "type-30470", ++ "self_type" : "type-30481", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-30735", +- "self_type" : "type-30737", ++ "referenced_type" : "type-3068", ++ "self_type" : "type-3070", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91451,8 +91493,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3079", +- "self_type" : "type-3081", ++ "referenced_type" : "type-30721", ++ "self_type" : "type-30723", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91460,8 +91502,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-30799", +- "self_type" : "type-30813", ++ "referenced_type" : "type-30734", ++ "self_type" : "type-30736", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91469,8 +91511,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-30832", +- "self_type" : "type-30834", ++ "referenced_type" : "type-30798", ++ "self_type" : "type-30812", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91478,8 +91520,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-30837", +- "self_type" : "type-30906", ++ "referenced_type" : "type-30831", ++ "self_type" : "type-30833", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91487,8 +91529,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-30925", +- "self_type" : "type-30940", ++ "referenced_type" : "type-30836", ++ "self_type" : "type-30905", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91496,8 +91538,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-30944", +- "self_type" : "type-30956", ++ "referenced_type" : "type-30924", ++ "self_type" : "type-30939", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91505,8 +91547,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-31085", +- "self_type" : "type-31090", ++ "referenced_type" : "type-30943", ++ "self_type" : "type-30955", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91514,8 +91556,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-31136", +- "self_type" : "type-31138", ++ "referenced_type" : "type-31084", ++ "self_type" : "type-31089", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91523,8 +91565,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3116", +- "self_type" : "type-3118", ++ "referenced_type" : "type-31135", ++ "self_type" : "type-31137", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91532,8 +91574,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-31163", +- "self_type" : "type-31165", ++ "referenced_type" : "type-31162", ++ "self_type" : "type-31164", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91541,8 +91583,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-31233", +- "self_type" : "type-31235", ++ "referenced_type" : "type-31232", ++ "self_type" : "type-31234", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91550,8 +91592,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-31236", +- "self_type" : "type-31238", ++ "referenced_type" : "type-31235", ++ "self_type" : "type-31237", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91559,17 +91601,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-31311", +- "self_type" : "type-31319", ++ "referenced_type" : "type-3127", ++ "self_type" : "type-3138", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-31340", +- "self_type" : "type-31342", ++ "referenced_type" : "type-31310", ++ "self_type" : "type-31318", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91577,8 +91619,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-31439", +- "self_type" : "type-31441", ++ "referenced_type" : "type-31339", ++ "self_type" : "type-31341", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91586,8 +91628,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-31483", +- "self_type" : "type-31485", ++ "referenced_type" : "type-31438", ++ "self_type" : "type-31440", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91595,8 +91637,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-31519", +- "self_type" : "type-31521", ++ "referenced_type" : "type-31482", ++ "self_type" : "type-31484", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91604,8 +91646,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-31540", +- "self_type" : "type-31577", ++ "referenced_type" : "type-31518", ++ "self_type" : "type-31520", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91613,8 +91655,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-31584", +- "self_type" : "type-31586", ++ "referenced_type" : "type-31539", ++ "self_type" : "type-31576", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91622,8 +91664,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-31591", +- "self_type" : "type-31594", ++ "referenced_type" : "type-31583", ++ "self_type" : "type-31585", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91631,8 +91673,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-31650", +- "self_type" : "type-31652", ++ "referenced_type" : "type-31590", ++ "self_type" : "type-31593", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91640,8 +91682,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-31715", +- "self_type" : "type-31717", ++ "referenced_type" : "type-31649", ++ "self_type" : "type-31651", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91649,8 +91691,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-31730", +- "self_type" : "type-31732", ++ "referenced_type" : "type-31714", ++ "self_type" : "type-31716", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91658,17 +91700,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3175", +- "self_type" : "type-3186", ++ "referenced_type" : "type-31729", ++ "self_type" : "type-31731", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-31753", +- "self_type" : "type-31796", ++ "referenced_type" : "type-31752", ++ "self_type" : "type-31795", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91676,8 +91718,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-31801", +- "self_type" : "type-31803", ++ "referenced_type" : "type-31800", ++ "self_type" : "type-31802", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91685,8 +91727,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-32025", +- "self_type" : "type-32024", ++ "referenced_type" : "type-32024", ++ "self_type" : "type-32023", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91703,8 +91745,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-32135", +- "self_type" : "type-32137", ++ "referenced_type" : "type-32134", ++ "self_type" : "type-32136", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91712,8 +91754,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-32145", +- "self_type" : "type-32212", ++ "referenced_type" : "type-32144", ++ "self_type" : "type-32211", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91721,8 +91763,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-32218", +- "self_type" : "type-32220", ++ "referenced_type" : "type-32217", ++ "self_type" : "type-32219", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91730,8 +91772,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-32230", +- "self_type" : "type-32232", ++ "referenced_type" : "type-32229", ++ "self_type" : "type-32231", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91748,8 +91790,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3427", +- "self_type" : "type-3429", ++ "referenced_type" : "type-3379", ++ "self_type" : "type-3381", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91757,8 +91799,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3446", +- "self_type" : "type-3448", ++ "referenced_type" : "type-3398", ++ "self_type" : "type-3400", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91766,8 +91808,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3510", +- "self_type" : "type-3526", ++ "referenced_type" : "type-3462", ++ "self_type" : "type-3478", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91775,8 +91817,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3549", +- "self_type" : "type-3551", ++ "referenced_type" : "type-3501", ++ "self_type" : "type-3503", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91784,8 +91826,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3554", +- "self_type" : "type-3623", ++ "referenced_type" : "type-3506", ++ "self_type" : "type-3575", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91793,8 +91835,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3647", +- "self_type" : "type-3668", ++ "referenced_type" : "type-3599", ++ "self_type" : "type-3620", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91802,8 +91844,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3673", +- "self_type" : "type-3689", ++ "referenced_type" : "type-3625", ++ "self_type" : "type-3641", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91811,8 +91853,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3857", +- "self_type" : "type-3862", ++ "referenced_type" : "type-3809", ++ "self_type" : "type-3814", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91820,8 +91862,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-39", +- "self_type" : "type-42", ++ "referenced_type" : "type-3878", ++ "self_type" : "type-3880", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91829,8 +91871,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3926", +- "self_type" : "type-3928", ++ "referenced_type" : "type-39", ++ "self_type" : "type-42", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91838,8 +91880,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-3953", +- "self_type" : "type-3955", ++ "referenced_type" : "type-3905", ++ "self_type" : "type-3907", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91847,8 +91889,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-4072", +- "self_type" : "type-4074", ++ "referenced_type" : "type-4024", ++ "self_type" : "type-4026", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91856,8 +91898,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-4075", +- "self_type" : "type-4077", ++ "referenced_type" : "type-4027", ++ "self_type" : "type-4029", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91865,8 +91907,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-4150", +- "self_type" : "type-4158", ++ "referenced_type" : "type-4102", ++ "self_type" : "type-4110", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91874,8 +91916,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-4182", +- "self_type" : "type-4184", ++ "referenced_type" : "type-4134", ++ "self_type" : "type-4136", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91883,8 +91925,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-4301", +- "self_type" : "type-4303", ++ "referenced_type" : "type-4253", ++ "self_type" : "type-4255", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91892,8 +91934,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-434", +- "self_type" : "type-436", ++ "referenced_type" : "type-4307", ++ "self_type" : "type-4309", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91901,8 +91943,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-4355", +- "self_type" : "type-4357", ++ "referenced_type" : "type-434", ++ "self_type" : "type-436", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91910,8 +91952,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-4392", +- "self_type" : "type-4394", ++ "referenced_type" : "type-4344", ++ "self_type" : "type-4346", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91919,8 +91961,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-4414", +- "self_type" : "type-4453", ++ "referenced_type" : "type-4366", ++ "self_type" : "type-4405", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91928,8 +91970,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-4460", +- "self_type" : "type-4462", ++ "referenced_type" : "type-4412", ++ "self_type" : "type-4414", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91937,8 +91979,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-4466", +- "self_type" : "type-4469", ++ "referenced_type" : "type-4418", ++ "self_type" : "type-4421", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91946,8 +91988,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-4534", +- "self_type" : "type-4536", ++ "referenced_type" : "type-4486", ++ "self_type" : "type-4488", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91955,8 +91997,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-4540", +- "self_type" : "type-4552", ++ "referenced_type" : "type-4492", ++ "self_type" : "type-4504", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91964,8 +92006,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-4576", +- "self_type" : "type-4578", ++ "referenced_type" : "type-4528", ++ "self_type" : "type-4530", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91973,8 +92015,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-4694", +- "self_type" : "type-4696", ++ "referenced_type" : "type-4646", ++ "self_type" : "type-4648", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91982,8 +92024,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-4866", +- "self_type" : "type-4868", ++ "referenced_type" : "type-4818", ++ "self_type" : "type-4820", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -91991,8 +92033,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-4880", +- "self_type" : "type-4908", ++ "referenced_type" : "type-4832", ++ "self_type" : "type-4860", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92000,8 +92042,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-4899", +- "self_type" : "type-4907", ++ "referenced_type" : "type-4851", ++ "self_type" : "type-4859", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92009,8 +92051,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-4916", +- "self_type" : "type-4923", ++ "referenced_type" : "type-4868", ++ "self_type" : "type-4875", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92018,8 +92060,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-4935", +- "self_type" : "type-4937", ++ "referenced_type" : "type-4887", ++ "self_type" : "type-4889", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92027,8 +92069,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-4978", +- "self_type" : "type-4980", ++ "referenced_type" : "type-4930", ++ "self_type" : "type-4932", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92036,8 +92078,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-4990", +- "self_type" : "type-4992", ++ "referenced_type" : "type-4942", ++ "self_type" : "type-4944", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92045,8 +92087,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-5026", +- "self_type" : "type-5028", ++ "referenced_type" : "type-4978", ++ "self_type" : "type-4980", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92054,8 +92096,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-5059", +- "self_type" : "type-5061", ++ "referenced_type" : "type-5011", ++ "self_type" : "type-5013", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92063,8 +92105,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-5096", +- "self_type" : "type-5098", ++ "referenced_type" : "type-5048", ++ "self_type" : "type-5050", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92072,8 +92114,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-5155", +- "self_type" : "type-5166", ++ "referenced_type" : "type-5107", ++ "self_type" : "type-5118", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, +@@ -92081,8 +92123,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-5407", +- "self_type" : "type-5409", ++ "referenced_type" : "type-5359", ++ "self_type" : "type-5361", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92090,8 +92132,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-5426", +- "self_type" : "type-5428", ++ "referenced_type" : "type-5378", ++ "self_type" : "type-5380", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92099,8 +92141,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-5490", +- "self_type" : "type-5504", ++ "referenced_type" : "type-5442", ++ "self_type" : "type-5456", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92108,8 +92150,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-5527", +- "self_type" : "type-5529", ++ "referenced_type" : "type-5479", ++ "self_type" : "type-5481", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92117,8 +92159,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-5532", +- "self_type" : "type-5601", ++ "referenced_type" : "type-5484", ++ "self_type" : "type-5553", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92126,8 +92168,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-5621", +- "self_type" : "type-5636", ++ "referenced_type" : "type-5573", ++ "self_type" : "type-5588", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92135,8 +92177,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-5640", +- "self_type" : "type-5652", ++ "referenced_type" : "type-5592", ++ "self_type" : "type-5604", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92144,8 +92186,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-5783", +- "self_type" : "type-5788", ++ "referenced_type" : "type-5735", ++ "self_type" : "type-5740", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92153,8 +92195,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-5834", +- "self_type" : "type-5836", ++ "referenced_type" : "type-5786", ++ "self_type" : "type-5788", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92162,8 +92204,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-5861", +- "self_type" : "type-5863", ++ "referenced_type" : "type-5813", ++ "self_type" : "type-5815", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92171,8 +92213,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-5931", +- "self_type" : "type-5933", ++ "referenced_type" : "type-5883", ++ "self_type" : "type-5885", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92180,8 +92222,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-5934", +- "self_type" : "type-5936", ++ "referenced_type" : "type-5886", ++ "self_type" : "type-5888", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92189,8 +92231,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-6009", +- "self_type" : "type-6017", ++ "referenced_type" : "type-5961", ++ "self_type" : "type-5969", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92198,8 +92240,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-6038", +- "self_type" : "type-6040", ++ "referenced_type" : "type-5990", ++ "self_type" : "type-5992", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92207,8 +92249,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-6137", +- "self_type" : "type-6139", ++ "referenced_type" : "type-6089", ++ "self_type" : "type-6091", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92216,8 +92258,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-6181", +- "self_type" : "type-6183", ++ "referenced_type" : "type-6133", ++ "self_type" : "type-6135", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92225,8 +92267,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-6217", +- "self_type" : "type-6219", ++ "referenced_type" : "type-6169", ++ "self_type" : "type-6171", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92234,8 +92276,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-6238", +- "self_type" : "type-6275", ++ "referenced_type" : "type-6190", ++ "self_type" : "type-6227", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92243,8 +92285,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-6282", +- "self_type" : "type-6284", ++ "referenced_type" : "type-6234", ++ "self_type" : "type-6236", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92252,8 +92294,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-6289", +- "self_type" : "type-6292", ++ "referenced_type" : "type-6241", ++ "self_type" : "type-6244", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92261,8 +92303,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-6351", +- "self_type" : "type-6353", ++ "referenced_type" : "type-6303", ++ "self_type" : "type-6305", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92270,8 +92312,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-6418", +- "self_type" : "type-6420", ++ "referenced_type" : "type-6370", ++ "self_type" : "type-6372", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92279,8 +92321,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-6433", +- "self_type" : "type-6435", ++ "referenced_type" : "type-6385", ++ "self_type" : "type-6387", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92288,8 +92330,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-6456", +- "self_type" : "type-6516", ++ "referenced_type" : "type-6408", ++ "self_type" : "type-6468", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92297,8 +92339,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-6551", +- "self_type" : "type-6553", ++ "referenced_type" : "type-6503", ++ "self_type" : "type-6505", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92306,8 +92348,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-6870", +- "self_type" : "type-6869", ++ "referenced_type" : "type-6822", ++ "self_type" : "type-6821", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92315,8 +92357,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-7016", +- "self_type" : "type-7018", ++ "referenced_type" : "type-6968", ++ "self_type" : "type-6970", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92324,8 +92366,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-7026", +- "self_type" : "type-7093", ++ "referenced_type" : "type-6978", ++ "self_type" : "type-7045", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92333,8 +92375,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-7099", +- "self_type" : "type-7101", ++ "referenced_type" : "type-7051", ++ "self_type" : "type-7053", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92342,8 +92384,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-7117", +- "self_type" : "type-7119", ++ "referenced_type" : "type-7069", ++ "self_type" : "type-7071", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92351,8 +92393,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-7190", +- "self_type" : "type-7192", ++ "referenced_type" : "type-7142", ++ "self_type" : "type-7144", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92360,8 +92402,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-7213", +- "self_type" : "type-7329", ++ "referenced_type" : "type-7165", ++ "self_type" : "type-7281", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92387,8 +92429,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-7614", +- "self_type" : "type-7616", ++ "referenced_type" : "type-7566", ++ "self_type" : "type-7568", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92396,8 +92438,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-7629", +- "self_type" : "type-7631", ++ "referenced_type" : "type-7581", ++ "self_type" : "type-7583", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92405,8 +92447,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-7801", +- "self_type" : "type-7803", ++ "referenced_type" : "type-7753", ++ "self_type" : "type-7755", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92423,8 +92465,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-7905", +- "self_type" : "type-7907", ++ "referenced_type" : "type-7857", ++ "self_type" : "type-7859", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92432,8 +92474,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-7981", +- "self_type" : "type-7984", ++ "referenced_type" : "type-7933", ++ "self_type" : "type-7936", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92450,8 +92492,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-8089", +- "self_type" : "type-8091", ++ "referenced_type" : "type-8041", ++ "self_type" : "type-8043", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92459,8 +92501,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-8142", +- "self_type" : "type-8144", ++ "referenced_type" : "type-8094", ++ "self_type" : "type-8096", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92468,8 +92510,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-8156", +- "self_type" : "type-8184", ++ "referenced_type" : "type-8108", ++ "self_type" : "type-8136", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92477,8 +92519,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-8175", +- "self_type" : "type-8183", ++ "referenced_type" : "type-8127", ++ "self_type" : "type-8135", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92486,8 +92528,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-819", +- "self_type" : "type-821", ++ "referenced_type" : "type-8144", ++ "self_type" : "type-8151", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92495,8 +92537,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-8192", +- "self_type" : "type-8199", ++ "referenced_type" : "type-8163", ++ "self_type" : "type-8165", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92504,8 +92546,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-8211", +- "self_type" : "type-8213", ++ "referenced_type" : "type-819", ++ "self_type" : "type-821", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92513,8 +92555,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-8254", +- "self_type" : "type-8256", ++ "referenced_type" : "type-8206", ++ "self_type" : "type-8208", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92522,8 +92564,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-8266", +- "self_type" : "type-8268", ++ "referenced_type" : "type-8218", ++ "self_type" : "type-8220", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92531,8 +92573,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-8302", +- "self_type" : "type-8304", ++ "referenced_type" : "type-8254", ++ "self_type" : "type-8256", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92540,8 +92582,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-8335", +- "self_type" : "type-8337", ++ "referenced_type" : "type-8287", ++ "self_type" : "type-8289", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92549,8 +92591,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-8371", +- "self_type" : "type-8373", ++ "referenced_type" : "type-8323", ++ "self_type" : "type-8325", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92558,8 +92600,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-8430", +- "self_type" : "type-8441", ++ "referenced_type" : "type-8382", ++ "self_type" : "type-8393", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, +@@ -92567,8 +92609,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-866", +- "self_type" : "type-868", ++ "referenced_type" : "type-8633", ++ "self_type" : "type-8635", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92576,8 +92618,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-8681", +- "self_type" : "type-8683", ++ "referenced_type" : "type-8643", ++ "self_type" : "type-8645", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92585,8 +92627,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-8691", +- "self_type" : "type-8693", ++ "referenced_type" : "type-866", ++ "self_type" : "type-868", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92594,8 +92636,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-8755", +- "self_type" : "type-8769", ++ "referenced_type" : "type-8707", ++ "self_type" : "type-8721", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92603,8 +92645,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-8786", +- "self_type" : "type-8788", ++ "referenced_type" : "type-8738", ++ "self_type" : "type-8740", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92612,8 +92654,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-8791", +- "self_type" : "type-8860", ++ "referenced_type" : "type-8743", ++ "self_type" : "type-8812", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92621,8 +92663,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-8879", +- "self_type" : "type-8894", ++ "referenced_type" : "type-8831", ++ "self_type" : "type-8846", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92630,8 +92672,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-8898", +- "self_type" : "type-8910", ++ "referenced_type" : "type-8850", ++ "self_type" : "type-8862", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "const std::basic_string, std::allocator > &", ++ "name" : "const std::basic_string, std::allocator > &", ++ "referenced_type" : "type-8992", ++ "self_type" : "type-8997", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92648,7 +92699,7 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-9040", ++ "referenced_type" : "type-9043", + "self_type" : "type-9045", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" +@@ -92657,8 +92708,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-9091", +- "self_type" : "type-9093", ++ "referenced_type" : "type-9070", ++ "self_type" : "type-9072", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92666,8 +92717,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-9118", +- "self_type" : "type-9120", ++ "referenced_type" : "type-9140", ++ "self_type" : "type-9142", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92675,8 +92726,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-9188", +- "self_type" : "type-9190", ++ "referenced_type" : "type-9143", ++ "self_type" : "type-9145", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92684,8 +92735,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-9191", +- "self_type" : "type-9193", ++ "referenced_type" : "type-920", ++ "self_type" : "type-922", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92693,8 +92744,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-920", +- "self_type" : "type-922", ++ "referenced_type" : "type-9218", ++ "self_type" : "type-9226", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92702,8 +92753,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-9266", +- "self_type" : "type-9274", ++ "referenced_type" : "type-9247", ++ "self_type" : "type-9249", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92720,8 +92771,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-9295", +- "self_type" : "type-9297", ++ "referenced_type" : "type-932", ++ "self_type" : "type-934", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92729,8 +92780,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-932", +- "self_type" : "type-934", ++ "referenced_type" : "type-9346", ++ "self_type" : "type-9348", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92738,8 +92789,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-9394", +- "self_type" : "type-9396", ++ "referenced_type" : "type-9390", ++ "self_type" : "type-9392", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92756,8 +92807,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-9438", +- "self_type" : "type-9440", ++ "referenced_type" : "type-9426", ++ "self_type" : "type-9428", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92765,8 +92816,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-945", +- "self_type" : "type-947", ++ "referenced_type" : "type-9447", ++ "self_type" : "type-9484", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92774,8 +92825,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-9474", +- "self_type" : "type-9476", ++ "referenced_type" : "type-945", ++ "self_type" : "type-947", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92783,8 +92834,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-9495", +- "self_type" : "type-9532", ++ "referenced_type" : "type-9491", ++ "self_type" : "type-9493", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92792,8 +92843,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-9539", +- "self_type" : "type-9541", ++ "referenced_type" : "type-9498", ++ "self_type" : "type-9501", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92810,8 +92861,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-9546", +- "self_type" : "type-9549", ++ "referenced_type" : "type-9557", ++ "self_type" : "type-9559", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92819,8 +92870,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-9605", +- "self_type" : "type-9607", ++ "referenced_type" : "type-9622", ++ "self_type" : "type-9624", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92828,8 +92879,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-964", +- "self_type" : "type-966", ++ "referenced_type" : "type-9637", ++ "self_type" : "type-9639", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92837,8 +92888,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-9670", +- "self_type" : "type-9672", ++ "referenced_type" : "type-964", ++ "self_type" : "type-966", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92846,8 +92897,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-9685", +- "self_type" : "type-9687", ++ "referenced_type" : "type-9660", ++ "self_type" : "type-9703", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92856,16 +92907,7 @@ + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", + "referenced_type" : "type-9708", +- "self_type" : "type-9751", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "const std::basic_string, std::allocator > &", +- "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-9756", +- "self_type" : "type-9758", ++ "self_type" : "type-9710", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92882,8 +92924,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-995", +- "self_type" : "type-999", ++ "referenced_type" : "type-9931", ++ "self_type" : "type-9930", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92891,8 +92933,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > &", + "name" : "const std::basic_string, std::allocator > &", +- "referenced_type" : "type-9979", +- "self_type" : "type-9978", ++ "referenced_type" : "type-995", ++ "self_type" : "type-999", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -92900,8 +92942,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-10004", +- "self_type" : "type-10006", ++ "referenced_type" : "type-12692", ++ "self_type" : "type-12694", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -92909,8 +92951,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-12740", +- "self_type" : "type-12742", ++ "referenced_type" : "type-13289", ++ "self_type" : "type-13291", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -92918,8 +92960,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-13337", +- "self_type" : "type-13339", ++ "referenced_type" : "type-16548", ++ "self_type" : "type-16550", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -92927,8 +92969,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-16596", +- "self_type" : "type-16598", ++ "referenced_type" : "type-17145", ++ "self_type" : "type-17147", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -92936,8 +92978,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-17193", +- "self_type" : "type-17195", ++ "referenced_type" : "type-21080", ++ "self_type" : "type-21082", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -92945,8 +92987,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-21128", +- "self_type" : "type-21130", ++ "referenced_type" : "type-21677", ++ "self_type" : "type-21679", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -92954,8 +92996,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-21725", +- "self_type" : "type-21727", ++ "referenced_type" : "type-26350", ++ "self_type" : "type-26352", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -92963,8 +93005,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-26306", +- "self_type" : "type-26308", ++ "referenced_type" : "type-26925", ++ "self_type" : "type-26927", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -92972,8 +93014,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-26903", +- "self_type" : "type-26905", ++ "referenced_type" : "type-31452", ++ "self_type" : "type-31454", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -92981,8 +93023,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-31453", +- "self_type" : "type-31455", ++ "referenced_type" : "type-32049", ++ "self_type" : "type-32051", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -92990,8 +93032,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-32050", +- "self_type" : "type-32052", ++ "referenced_type" : "type-4276", ++ "self_type" : "type-4278", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -92999,8 +93041,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-4324", +- "self_type" : "type-4326", ++ "referenced_type" : "type-6103", ++ "self_type" : "type-6105", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93008,8 +93050,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-6151", +- "self_type" : "type-6153", ++ "referenced_type" : "type-6864", ++ "self_type" : "type-6866", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93017,8 +93059,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-6912", +- "self_type" : "type-6914", ++ "referenced_type" : "type-9360", ++ "self_type" : "type-9362", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93026,8 +93068,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-9408", +- "self_type" : "type-9410", ++ "referenced_type" : "type-9956", ++ "self_type" : "type-9958", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93035,8 +93077,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-13101", +- "self_type" : "type-13103", ++ "referenced_type" : "type-13053", ++ "self_type" : "type-13055", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -93044,8 +93086,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-16957", +- "self_type" : "type-16959", ++ "referenced_type" : "type-16909", ++ "self_type" : "type-16911", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -93053,8 +93095,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-21489", +- "self_type" : "type-21491", ++ "referenced_type" : "type-21441", ++ "self_type" : "type-21443", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -93062,8 +93104,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-26667", +- "self_type" : "type-26669", ++ "referenced_type" : "type-26688", ++ "self_type" : "type-26690", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -93071,8 +93113,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-31814", +- "self_type" : "type-31816", ++ "referenced_type" : "type-31813", ++ "self_type" : "type-31815", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -93080,8 +93122,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-6565", +- "self_type" : "type-6567", ++ "referenced_type" : "type-6517", ++ "self_type" : "type-6519", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -93089,8 +93131,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to &", + "name" : "const std::equal_to &", +- "referenced_type" : "type-9769", +- "self_type" : "type-9771", ++ "referenced_type" : "type-9721", ++ "self_type" : "type-9723", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -93098,8 +93140,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-10384", +- "self_type" : "type-10386", ++ "referenced_type" : "type-10336", ++ "self_type" : "type-10338", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -93107,8 +93149,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-11402", +- "self_type" : "type-11404", ++ "referenced_type" : "type-11354", ++ "self_type" : "type-11356", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93116,8 +93158,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-12260", +- "self_type" : "type-12262", ++ "referenced_type" : "type-12212", ++ "self_type" : "type-12214", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93125,8 +93167,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-13675", +- "self_type" : "type-13677", ++ "referenced_type" : "type-13627", ++ "self_type" : "type-13629", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -93134,8 +93176,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-14621", +- "self_type" : "type-14623", ++ "referenced_type" : "type-14573", ++ "self_type" : "type-14575", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93143,8 +93185,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-15317", +- "self_type" : "type-15319", ++ "referenced_type" : "type-15269", ++ "self_type" : "type-15271", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93152,8 +93194,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-16115", +- "self_type" : "type-16117", ++ "referenced_type" : "type-16067", ++ "self_type" : "type-16069", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93161,8 +93203,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-17539", +- "self_type" : "type-17541", ++ "referenced_type" : "type-17491", ++ "self_type" : "type-17493", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -93170,8 +93212,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-18485", +- "self_type" : "type-18487", ++ "referenced_type" : "type-18437", ++ "self_type" : "type-18439", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93179,8 +93221,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-19088", +- "self_type" : "type-19090", ++ "referenced_type" : "type-19040", ++ "self_type" : "type-19042", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93188,8 +93230,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-19390", +- "self_type" : "type-19392", ++ "referenced_type" : "type-19342", ++ "self_type" : "type-19344", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93197,8 +93239,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-19532", +- "self_type" : "type-19534", ++ "referenced_type" : "type-19484", ++ "self_type" : "type-19486", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93206,8 +93248,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-20647", +- "self_type" : "type-20649", ++ "referenced_type" : "type-20599", ++ "self_type" : "type-20601", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93215,8 +93257,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-22068", +- "self_type" : "type-22070", ++ "referenced_type" : "type-22066", ++ "self_type" : "type-22068", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -93224,8 +93266,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-23014", +- "self_type" : "type-23016", ++ "referenced_type" : "type-22986", ++ "self_type" : "type-22988", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93233,8 +93275,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-23617", +- "self_type" : "type-23619", ++ "referenced_type" : "type-23599", ++ "self_type" : "type-23601", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93242,8 +93284,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-23890", +- "self_type" : "type-23892", ++ "referenced_type" : "type-23892", ++ "self_type" : "type-23894", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93260,8 +93302,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-25826", +- "self_type" : "type-25828", ++ "referenced_type" : "type-25877", ++ "self_type" : "type-25879", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93269,8 +93311,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-27253", +- "self_type" : "type-27255", ++ "referenced_type" : "type-27252", ++ "self_type" : "type-27254", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -93278,8 +93320,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-28199", +- "self_type" : "type-28201", ++ "referenced_type" : "type-28198", ++ "self_type" : "type-28200", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93287,8 +93329,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-28802", +- "self_type" : "type-28804", ++ "referenced_type" : "type-28801", ++ "self_type" : "type-28803", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93296,8 +93338,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-29075", +- "self_type" : "type-29077", ++ "referenced_type" : "type-29074", ++ "self_type" : "type-29076", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93305,8 +93347,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-29187", +- "self_type" : "type-29189", ++ "referenced_type" : "type-29186", ++ "self_type" : "type-29188", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93314,8 +93356,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-30972", +- "self_type" : "type-30974", ++ "referenced_type" : "type-30971", ++ "self_type" : "type-30973", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93323,8 +93365,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-3708", +- "self_type" : "type-3710", ++ "referenced_type" : "type-3660", ++ "self_type" : "type-3662", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93332,8 +93374,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-5668", +- "self_type" : "type-5670", ++ "referenced_type" : "type-5620", ++ "self_type" : "type-5622", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93341,8 +93383,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-7403", +- "self_type" : "type-7405", ++ "referenced_type" : "type-7355", ++ "self_type" : "type-7357", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -93350,8 +93392,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to, std::allocator > > &", + "name" : "const std::equal_to, std::allocator > > &", +- "referenced_type" : "type-8926", +- "self_type" : "type-8928", ++ "referenced_type" : "type-8878", ++ "self_type" : "type-8880", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93359,8 +93401,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to > &", + "name" : "const std::equal_to > &", +- "referenced_type" : "type-10360", +- "self_type" : "type-10362", ++ "referenced_type" : "type-10312", ++ "self_type" : "type-10314", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93368,8 +93410,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to > &", + "name" : "const std::equal_to > &", +- "referenced_type" : "type-1308", +- "self_type" : "type-1310", ++ "referenced_type" : "type-1221", ++ "self_type" : "type-1223", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93377,8 +93419,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to > &", + "name" : "const std::equal_to > &", +- "referenced_type" : "type-13651", +- "self_type" : "type-13653", ++ "referenced_type" : "type-13603", ++ "self_type" : "type-13605", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93386,8 +93428,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to > &", + "name" : "const std::equal_to > &", +- "referenced_type" : "type-17515", +- "self_type" : "type-17517", ++ "referenced_type" : "type-17467", ++ "self_type" : "type-17469", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93395,8 +93437,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to > &", + "name" : "const std::equal_to > &", +- "referenced_type" : "type-22044", +- "self_type" : "type-22046", ++ "referenced_type" : "type-22598", ++ "self_type" : "type-22604", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93404,8 +93446,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to > &", + "name" : "const std::equal_to > &", +- "referenced_type" : "type-27229", +- "self_type" : "type-27231", ++ "referenced_type" : "type-2683", ++ "self_type" : "type-2685", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93413,8 +93455,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to > &", + "name" : "const std::equal_to > &", +- "referenced_type" : "type-2731", +- "self_type" : "type-2733", ++ "referenced_type" : "type-27228", ++ "self_type" : "type-27230", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93431,8 +93473,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to > &", + "name" : "const std::equal_to > &", +- "referenced_type" : "type-4711", +- "self_type" : "type-4713", ++ "referenced_type" : "type-4663", ++ "self_type" : "type-4665", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93440,8 +93482,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::equal_to > &", + "name" : "const std::equal_to > &", +- "referenced_type" : "type-7341", +- "self_type" : "type-7343", ++ "referenced_type" : "type-7293", ++ "self_type" : "type-7295", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -93449,8 +93491,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator > > &", + "name" : "const std::map, std::allocator > > &", +- "referenced_type" : "type-10691", +- "self_type" : "type-10693", ++ "referenced_type" : "type-10643", ++ "self_type" : "type-10645", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93458,8 +93500,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator > > &", + "name" : "const std::map, std::allocator > > &", +- "referenced_type" : "type-13982", +- "self_type" : "type-13984", ++ "referenced_type" : "type-13934", ++ "self_type" : "type-13936", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93467,8 +93509,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator > > &", + "name" : "const std::map, std::allocator > > &", +- "referenced_type" : "type-17846", +- "self_type" : "type-17848", ++ "referenced_type" : "type-17798", ++ "self_type" : "type-17800", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93476,8 +93518,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator > > &", + "name" : "const std::map, std::allocator > > &", +- "referenced_type" : "type-22375", +- "self_type" : "type-22377", ++ "referenced_type" : "type-22337", ++ "self_type" : "type-22339", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93485,8 +93527,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator > > &", + "name" : "const std::map, std::allocator > > &", +- "referenced_type" : "type-27560", +- "self_type" : "type-27562", ++ "referenced_type" : "type-27559", ++ "self_type" : "type-27561", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93494,8 +93536,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator > > &", + "name" : "const std::map, std::allocator > > &", +- "referenced_type" : "type-7777", +- "self_type" : "type-7779", ++ "referenced_type" : "type-7729", ++ "self_type" : "type-7731", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93503,8 +93545,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > > &", + "name" : "const std::map >, std::less, std::allocator > > > > &", +- "referenced_type" : "type-10703", +- "self_type" : "type-10705", ++ "referenced_type" : "type-10655", ++ "self_type" : "type-10657", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93512,8 +93554,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > > &", + "name" : "const std::map >, std::less, std::allocator > > > > &", +- "referenced_type" : "type-13994", +- "self_type" : "type-13996", ++ "referenced_type" : "type-13946", ++ "self_type" : "type-13948", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93521,8 +93563,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > > &", + "name" : "const std::map >, std::less, std::allocator > > > > &", +- "referenced_type" : "type-17858", +- "self_type" : "type-17860", ++ "referenced_type" : "type-17810", ++ "self_type" : "type-17812", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93530,8 +93572,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > > &", + "name" : "const std::map >, std::less, std::allocator > > > > &", +- "referenced_type" : "type-22387", +- "self_type" : "type-22389", ++ "referenced_type" : "type-22349", ++ "self_type" : "type-22351", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93539,8 +93581,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > > &", + "name" : "const std::map >, std::less, std::allocator > > > > &", +- "referenced_type" : "type-27572", +- "self_type" : "type-27574", ++ "referenced_type" : "type-27571", ++ "self_type" : "type-27573", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93548,8 +93590,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > > &", + "name" : "const std::map >, std::less, std::allocator > > > > &", +- "referenced_type" : "type-7789", +- "self_type" : "type-7791", ++ "referenced_type" : "type-7741", ++ "self_type" : "type-7743", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93557,8 +93599,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > > &", + "name" : "const std::map >, std::less, std::allocator > > > > &", +- "referenced_type" : "type-10697", +- "self_type" : "type-10699", ++ "referenced_type" : "type-10649", ++ "self_type" : "type-10651", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93566,8 +93608,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > > &", + "name" : "const std::map >, std::less, std::allocator > > > > &", +- "referenced_type" : "type-13988", +- "self_type" : "type-13990", ++ "referenced_type" : "type-13940", ++ "self_type" : "type-13942", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93575,8 +93617,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > > &", + "name" : "const std::map >, std::less, std::allocator > > > > &", +- "referenced_type" : "type-17852", +- "self_type" : "type-17854", ++ "referenced_type" : "type-17804", ++ "self_type" : "type-17806", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93584,8 +93626,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > > &", + "name" : "const std::map >, std::less, std::allocator > > > > &", +- "referenced_type" : "type-22381", +- "self_type" : "type-22383", ++ "referenced_type" : "type-22343", ++ "self_type" : "type-22345", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93593,8 +93635,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > > &", + "name" : "const std::map >, std::less, std::allocator > > > > &", +- "referenced_type" : "type-27566", +- "self_type" : "type-27568", ++ "referenced_type" : "type-27565", ++ "self_type" : "type-27567", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93602,8 +93644,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > > &", + "name" : "const std::map >, std::less, std::allocator > > > > &", +- "referenced_type" : "type-7783", +- "self_type" : "type-7785", ++ "referenced_type" : "type-7735", ++ "self_type" : "type-7737", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93611,8 +93653,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator > > &", + "name" : "const std::map, std::allocator > > &", +- "referenced_type" : "type-20014", +- "self_type" : "type-20016", ++ "referenced_type" : "type-19966", ++ "self_type" : "type-19968", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93620,8 +93662,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator > > &", + "name" : "const std::map, std::allocator > > &", +- "referenced_type" : "type-24474", +- "self_type" : "type-24476", ++ "referenced_type" : "type-24453", ++ "self_type" : "type-24455", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93629,8 +93671,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator > > &", + "name" : "const std::map, std::allocator > > &", +- "referenced_type" : "type-29659", +- "self_type" : "type-29661", ++ "referenced_type" : "type-29658", ++ "self_type" : "type-29660", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93638,8 +93680,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > &", + "name" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > &", +- "referenced_type" : "type-12492", +- "self_type" : "type-12494", ++ "referenced_type" : "type-12444", ++ "self_type" : "type-12446", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93647,8 +93689,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > &", + "name" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > &", +- "referenced_type" : "type-16349", +- "self_type" : "type-16351", ++ "referenced_type" : "type-16301", ++ "self_type" : "type-16303", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93656,8 +93698,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > &", + "name" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > &", +- "referenced_type" : "type-20880", +- "self_type" : "type-20882", ++ "referenced_type" : "type-20832", ++ "self_type" : "type-20834", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93665,8 +93707,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > &", + "name" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > &", +- "referenced_type" : "type-26058", +- "self_type" : "type-26060", ++ "referenced_type" : "type-26107", ++ "self_type" : "type-26109", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93674,8 +93716,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > &", + "name" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > &", +- "referenced_type" : "type-31205", +- "self_type" : "type-31207", ++ "referenced_type" : "type-31204", ++ "self_type" : "type-31206", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93683,8 +93725,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > &", + "name" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > &", +- "referenced_type" : "type-3996", +- "self_type" : "type-3998", ++ "referenced_type" : "type-3948", ++ "self_type" : "type-3950", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93692,8 +93734,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > &", + "name" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > &", +- "referenced_type" : "type-5903", +- "self_type" : "type-5905", ++ "referenced_type" : "type-5855", ++ "self_type" : "type-5857", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93701,8 +93743,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > &", + "name" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > &", +- "referenced_type" : "type-9160", +- "self_type" : "type-9162", ++ "referenced_type" : "type-9112", ++ "self_type" : "type-9114", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93710,8 +93752,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > > &", + "name" : "const std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > > &", +- "referenced_type" : "type-11209", +- "self_type" : "type-11211", ++ "referenced_type" : "type-11161", ++ "self_type" : "type-11163", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -93719,8 +93761,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > > &", + "name" : "const std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > > &", +- "referenced_type" : "type-14461", +- "self_type" : "type-14463", ++ "referenced_type" : "type-14413", ++ "self_type" : "type-14415", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -93728,8 +93770,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > > &", + "name" : "const std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > > &", +- "referenced_type" : "type-18325", +- "self_type" : "type-18327", ++ "referenced_type" : "type-18277", ++ "self_type" : "type-18279", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -93737,8 +93779,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > > &", + "name" : "const std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > > &", +- "referenced_type" : "type-22854", +- "self_type" : "type-22856", ++ "referenced_type" : "type-22810", ++ "self_type" : "type-22812", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -93746,8 +93788,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > > &", + "name" : "const std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > > &", +- "referenced_type" : "type-28039", +- "self_type" : "type-28041", ++ "referenced_type" : "type-28038", ++ "self_type" : "type-28040", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -93755,8 +93797,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > &", + "name" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > &", +- "referenced_type" : "type-12504", +- "self_type" : "type-12506", ++ "referenced_type" : "type-12456", ++ "self_type" : "type-12458", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93764,8 +93806,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > &", + "name" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > &", +- "referenced_type" : "type-16361", +- "self_type" : "type-16363", ++ "referenced_type" : "type-16313", ++ "self_type" : "type-16315", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93773,8 +93815,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > &", + "name" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > &", +- "referenced_type" : "type-20892", +- "self_type" : "type-20894", ++ "referenced_type" : "type-20844", ++ "self_type" : "type-20846", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93782,8 +93824,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > &", + "name" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > &", +- "referenced_type" : "type-26070", +- "self_type" : "type-26072", ++ "referenced_type" : "type-26119", ++ "self_type" : "type-26121", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93791,8 +93833,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > &", + "name" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > &", +- "referenced_type" : "type-31217", +- "self_type" : "type-31219", ++ "referenced_type" : "type-31216", ++ "self_type" : "type-31218", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93800,8 +93842,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > &", + "name" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > &", +- "referenced_type" : "type-4008", +- "self_type" : "type-4010", ++ "referenced_type" : "type-3960", ++ "self_type" : "type-3962", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93809,8 +93851,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > &", + "name" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > &", +- "referenced_type" : "type-5915", +- "self_type" : "type-5917", ++ "referenced_type" : "type-5867", ++ "self_type" : "type-5869", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93818,8 +93860,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > &", + "name" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > &", +- "referenced_type" : "type-9172", +- "self_type" : "type-9174", ++ "referenced_type" : "type-9124", ++ "self_type" : "type-9126", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93827,8 +93869,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::pair, std::less >, std::allocator, std::pair > > > &", + "name" : "const std::map, std::pair, std::less >, std::allocator, std::pair > > > &", +- "referenced_type" : "type-11515", +- "self_type" : "type-11517", ++ "referenced_type" : "type-11467", ++ "self_type" : "type-11469", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93836,8 +93878,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::pair, std::less >, std::allocator, std::pair > > > &", + "name" : "const std::map, std::pair, std::less >, std::allocator, std::pair > > > &", +- "referenced_type" : "type-14735", +- "self_type" : "type-14737", ++ "referenced_type" : "type-14687", ++ "self_type" : "type-14689", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93845,8 +93887,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::pair, std::less >, std::allocator, std::pair > > > &", + "name" : "const std::map, std::pair, std::less >, std::allocator, std::pair > > > &", +- "referenced_type" : "type-18599", +- "self_type" : "type-18601", ++ "referenced_type" : "type-18551", ++ "self_type" : "type-18553", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93854,8 +93896,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::pair, std::less >, std::allocator, std::pair > > > &", + "name" : "const std::map, std::pair, std::less >, std::allocator, std::pair > > > &", +- "referenced_type" : "type-23128", +- "self_type" : "type-23130", ++ "referenced_type" : "type-23113", ++ "self_type" : "type-23115", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93863,8 +93905,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::pair, std::less >, std::allocator, std::pair > > > &", + "name" : "const std::map, std::pair, std::less >, std::allocator, std::pair > > > &", +- "referenced_type" : "type-28313", +- "self_type" : "type-28315", ++ "referenced_type" : "type-28312", ++ "self_type" : "type-28314", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93872,8 +93914,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > &", + "name" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > &", +- "referenced_type" : "type-12495", +- "self_type" : "type-12497", ++ "referenced_type" : "type-12447", ++ "self_type" : "type-12449", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93881,8 +93923,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > &", + "name" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > &", +- "referenced_type" : "type-16352", +- "self_type" : "type-16354", ++ "referenced_type" : "type-16304", ++ "self_type" : "type-16306", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93890,8 +93932,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > &", + "name" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > &", +- "referenced_type" : "type-20883", +- "self_type" : "type-20885", ++ "referenced_type" : "type-20835", ++ "self_type" : "type-20837", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93899,8 +93941,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > &", + "name" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > &", +- "referenced_type" : "type-26061", +- "self_type" : "type-26063", ++ "referenced_type" : "type-26110", ++ "self_type" : "type-26112", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93908,8 +93950,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > &", + "name" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > &", +- "referenced_type" : "type-31208", +- "self_type" : "type-31210", ++ "referenced_type" : "type-31207", ++ "self_type" : "type-31209", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93917,8 +93959,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > &", + "name" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > &", +- "referenced_type" : "type-3999", +- "self_type" : "type-4001", ++ "referenced_type" : "type-3951", ++ "self_type" : "type-3953", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93926,8 +93968,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > &", + "name" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > &", +- "referenced_type" : "type-5906", +- "self_type" : "type-5908", ++ "referenced_type" : "type-5858", ++ "self_type" : "type-5860", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93935,8 +93977,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > &", + "name" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > &", +- "referenced_type" : "type-9163", +- "self_type" : "type-9165", ++ "referenced_type" : "type-9115", ++ "self_type" : "type-9117", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93944,8 +93986,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > &", + "name" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > &", +- "referenced_type" : "type-12507", +- "self_type" : "type-12509", ++ "referenced_type" : "type-12459", ++ "self_type" : "type-12461", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93953,8 +93995,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > &", + "name" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > &", +- "referenced_type" : "type-16364", +- "self_type" : "type-16366", ++ "referenced_type" : "type-16316", ++ "self_type" : "type-16318", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93962,8 +94004,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > &", + "name" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > &", +- "referenced_type" : "type-20895", +- "self_type" : "type-20897", ++ "referenced_type" : "type-20847", ++ "self_type" : "type-20849", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93971,8 +94013,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > &", + "name" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > &", +- "referenced_type" : "type-26073", +- "self_type" : "type-26075", ++ "referenced_type" : "type-26122", ++ "self_type" : "type-26124", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93980,8 +94022,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > &", + "name" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > &", +- "referenced_type" : "type-31220", +- "self_type" : "type-31222", ++ "referenced_type" : "type-31219", ++ "self_type" : "type-31221", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93989,8 +94031,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > &", + "name" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > &", +- "referenced_type" : "type-4011", +- "self_type" : "type-4013", ++ "referenced_type" : "type-3963", ++ "self_type" : "type-3965", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -93998,8 +94040,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > &", + "name" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > &", +- "referenced_type" : "type-5918", +- "self_type" : "type-5920", ++ "referenced_type" : "type-5870", ++ "self_type" : "type-5872", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94007,8 +94049,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > &", + "name" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > &", +- "referenced_type" : "type-9175", +- "self_type" : "type-9177", ++ "referenced_type" : "type-9127", ++ "self_type" : "type-9129", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94016,8 +94058,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-12218", +- "self_type" : "type-12220", ++ "referenced_type" : "type-12170", ++ "self_type" : "type-12172", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94025,8 +94067,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-16073", +- "self_type" : "type-16075", ++ "referenced_type" : "type-16025", ++ "self_type" : "type-16027", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94034,8 +94076,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-20605", +- "self_type" : "type-20607", ++ "referenced_type" : "type-20557", ++ "self_type" : "type-20559", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94043,8 +94085,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-25784", +- "self_type" : "type-25786", ++ "referenced_type" : "type-25834", ++ "self_type" : "type-25836", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94052,8 +94094,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-30930", +- "self_type" : "type-30932", ++ "referenced_type" : "type-30929", ++ "self_type" : "type-30931", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94061,8 +94103,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-3658", +- "self_type" : "type-3660", ++ "referenced_type" : "type-3610", ++ "self_type" : "type-3612", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94070,8 +94112,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-5626", +- "self_type" : "type-5628", ++ "referenced_type" : "type-5578", ++ "self_type" : "type-5580", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94079,8 +94121,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-8884", +- "self_type" : "type-8886", ++ "referenced_type" : "type-8836", ++ "self_type" : "type-8838", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94088,8 +94130,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &)> &", + "name" : "const std::pair &)> &", +- "referenced_type" : "type-13315", +- "self_type" : "type-13317", ++ "referenced_type" : "type-13267", ++ "self_type" : "type-13269", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94097,8 +94139,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &)> &", + "name" : "const std::pair &)> &", +- "referenced_type" : "type-17171", +- "self_type" : "type-17173", ++ "referenced_type" : "type-17123", ++ "self_type" : "type-17125", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94106,8 +94148,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &)> &", + "name" : "const std::pair &)> &", +- "referenced_type" : "type-21703", +- "self_type" : "type-21705", ++ "referenced_type" : "type-21655", ++ "self_type" : "type-21657", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94115,8 +94157,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &)> &", + "name" : "const std::pair &)> &", +- "referenced_type" : "type-26881", +- "self_type" : "type-26883", ++ "referenced_type" : "type-26901", ++ "self_type" : "type-26903", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94124,8 +94166,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &)> &", + "name" : "const std::pair &)> &", +- "referenced_type" : "type-32028", +- "self_type" : "type-32030", ++ "referenced_type" : "type-32027", ++ "self_type" : "type-32029", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94133,8 +94175,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &)> &", + "name" : "const std::pair &)> &", +- "referenced_type" : "type-6875", +- "self_type" : "type-6877", ++ "referenced_type" : "type-6827", ++ "self_type" : "type-6829", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94142,8 +94184,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &)> &", + "name" : "const std::pair &)> &", +- "referenced_type" : "type-9982", +- "self_type" : "type-9984", ++ "referenced_type" : "type-9934", ++ "self_type" : "type-9936", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94151,8 +94193,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-12211", +- "self_type" : "type-12215", ++ "referenced_type" : "type-12163", ++ "self_type" : "type-12167", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94160,8 +94202,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-16066", +- "self_type" : "type-16070", ++ "referenced_type" : "type-16018", ++ "self_type" : "type-16022", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94169,8 +94211,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-20598", +- "self_type" : "type-20602", ++ "referenced_type" : "type-20550", ++ "self_type" : "type-20554", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94178,8 +94220,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-25777", +- "self_type" : "type-25781", ++ "referenced_type" : "type-25829", ++ "self_type" : "type-25831", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94187,8 +94229,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-30923", +- "self_type" : "type-30927", ++ "referenced_type" : "type-30922", ++ "self_type" : "type-30926", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94196,8 +94238,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-3645", +- "self_type" : "type-3649", ++ "referenced_type" : "type-3597", ++ "self_type" : "type-3601", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94205,8 +94247,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-5619", +- "self_type" : "type-5623", ++ "referenced_type" : "type-5571", ++ "self_type" : "type-5575", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94214,8 +94256,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-8877", +- "self_type" : "type-8881", ++ "referenced_type" : "type-8829", ++ "self_type" : "type-8833", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94223,8 +94265,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-13319", +- "self_type" : "type-13321", ++ "referenced_type" : "type-13271", ++ "self_type" : "type-13273", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94232,8 +94274,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-17175", +- "self_type" : "type-17177", ++ "referenced_type" : "type-17127", ++ "self_type" : "type-17129", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94241,8 +94283,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-21707", +- "self_type" : "type-21709", ++ "referenced_type" : "type-21659", ++ "self_type" : "type-21661", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94250,8 +94292,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-26885", +- "self_type" : "type-26887", ++ "referenced_type" : "type-26905", ++ "self_type" : "type-26907", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94259,8 +94301,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-32032", +- "self_type" : "type-32034", ++ "referenced_type" : "type-32031", ++ "self_type" : "type-32033", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94268,8 +94310,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-6880", +- "self_type" : "type-6882", ++ "referenced_type" : "type-6832", ++ "self_type" : "type-6834", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94277,8 +94319,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-9986", +- "self_type" : "type-9988", ++ "referenced_type" : "type-9938", ++ "self_type" : "type-9940", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94286,8 +94328,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-11518", +- "self_type" : "type-11520", ++ "referenced_type" : "type-11470", ++ "self_type" : "type-11472", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94295,8 +94337,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-14738", +- "self_type" : "type-14740", ++ "referenced_type" : "type-14690", ++ "self_type" : "type-14692", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94304,8 +94346,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-18602", +- "self_type" : "type-18604", ++ "referenced_type" : "type-18554", ++ "self_type" : "type-18556", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94313,8 +94355,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-23131", +- "self_type" : "type-23133", ++ "referenced_type" : "type-23116", ++ "self_type" : "type-23118", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94322,8 +94364,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-28316", +- "self_type" : "type-28318", ++ "referenced_type" : "type-28315", ++ "self_type" : "type-28317", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94331,8 +94373,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-10288", +- "self_type" : "type-10298", ++ "referenced_type" : "type-10240", ++ "self_type" : "type-10250", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -94340,8 +94382,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-1297", +- "self_type" : "type-1299", ++ "referenced_type" : "type-1211", ++ "self_type" : "type-1213", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -94349,8 +94391,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-13579", +- "self_type" : "type-13589", ++ "referenced_type" : "type-13531", ++ "self_type" : "type-13541", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -94358,8 +94400,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-17443", +- "self_type" : "type-17453", ++ "referenced_type" : "type-17395", ++ "self_type" : "type-17405", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -94367,8 +94409,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-21972", +- "self_type" : "type-21982", ++ "referenced_type" : "type-22530", ++ "self_type" : "type-22538", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -94376,8 +94418,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-27157", +- "self_type" : "type-27167", ++ "referenced_type" : "type-2673", ++ "self_type" : "type-2675", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -94385,8 +94427,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-2721", +- "self_type" : "type-2723", ++ "referenced_type" : "type-27156", ++ "self_type" : "type-27166", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -94403,8 +94445,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-4701", +- "self_type" : "type-4703", ++ "referenced_type" : "type-4653", ++ "self_type" : "type-4655", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -94412,8 +94454,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-7247", +- "self_type" : "type-7249", ++ "referenced_type" : "type-7199", ++ "self_type" : "type-7201", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -94421,8 +94463,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-20023", +- "self_type" : "type-20025", ++ "referenced_type" : "type-19975", ++ "self_type" : "type-19977", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94430,8 +94472,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-24483", +- "self_type" : "type-24485", ++ "referenced_type" : "type-24460", ++ "self_type" : "type-24462", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94439,8 +94481,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-29668", +- "self_type" : "type-29670", ++ "referenced_type" : "type-29667", ++ "self_type" : "type-29669", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94448,8 +94490,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *> &", + "name" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *> &", +- "referenced_type" : "type-12396", +- "self_type" : "type-12398", ++ "referenced_type" : "type-12348", ++ "self_type" : "type-12350", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94457,8 +94499,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *> &", + "name" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *> &", +- "referenced_type" : "type-16253", +- "self_type" : "type-16255", ++ "referenced_type" : "type-16205", ++ "self_type" : "type-16207", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94466,8 +94508,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *> &", + "name" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *> &", +- "referenced_type" : "type-20784", +- "self_type" : "type-20786", ++ "referenced_type" : "type-20736", ++ "self_type" : "type-20738", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94475,8 +94517,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *> &", + "name" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *> &", +- "referenced_type" : "type-25962", +- "self_type" : "type-25964", ++ "referenced_type" : "type-26015", ++ "self_type" : "type-26017", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94484,8 +94526,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *> &", + "name" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *> &", +- "referenced_type" : "type-31109", +- "self_type" : "type-31111", ++ "referenced_type" : "type-31108", ++ "self_type" : "type-31110", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94493,8 +94535,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *> &", + "name" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *> &", +- "referenced_type" : "type-3899", +- "self_type" : "type-3901", ++ "referenced_type" : "type-3851", ++ "self_type" : "type-3853", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94502,8 +94544,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *> &", + "name" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *> &", +- "referenced_type" : "type-5807", +- "self_type" : "type-5809", ++ "referenced_type" : "type-5759", ++ "self_type" : "type-5761", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94511,8 +94553,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *> &", + "name" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *> &", +- "referenced_type" : "type-9064", +- "self_type" : "type-9066", ++ "referenced_type" : "type-9016", ++ "self_type" : "type-9018", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94520,8 +94562,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int> &", + "name" : "const std::pair, std::allocator >, int> &", +- "referenced_type" : "type-15377", +- "self_type" : "type-15379", ++ "referenced_type" : "type-15329", ++ "self_type" : "type-15331", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94529,8 +94571,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int> &", + "name" : "const std::pair, std::allocator >, int> &", +- "referenced_type" : "type-19139", +- "self_type" : "type-19141", ++ "referenced_type" : "type-19091", ++ "self_type" : "type-19093", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94538,8 +94580,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int> &", + "name" : "const std::pair, std::allocator >, int> &", +- "referenced_type" : "type-23668", +- "self_type" : "type-23670", ++ "referenced_type" : "type-23652", ++ "self_type" : "type-23654", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94547,8 +94589,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int> &", + "name" : "const std::pair, std::allocator >, int> &", +- "referenced_type" : "type-28853", +- "self_type" : "type-28855", ++ "referenced_type" : "type-28852", ++ "self_type" : "type-28854", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94556,8 +94598,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, std::pair > &", + "name" : "const std::pair, std::allocator >, std::pair > &", +- "referenced_type" : "type-12408", +- "self_type" : "type-12410", ++ "referenced_type" : "type-12360", ++ "self_type" : "type-12362", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94565,8 +94607,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, std::pair > &", + "name" : "const std::pair, std::allocator >, std::pair > &", +- "referenced_type" : "type-16265", +- "self_type" : "type-16267", ++ "referenced_type" : "type-16217", ++ "self_type" : "type-16219", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94574,8 +94616,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, std::pair > &", + "name" : "const std::pair, std::allocator >, std::pair > &", +- "referenced_type" : "type-20796", +- "self_type" : "type-20798", ++ "referenced_type" : "type-20748", ++ "self_type" : "type-20750", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94583,8 +94625,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, std::pair > &", + "name" : "const std::pair, std::allocator >, std::pair > &", +- "referenced_type" : "type-25974", +- "self_type" : "type-25976", ++ "referenced_type" : "type-26027", ++ "self_type" : "type-26029", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94592,8 +94634,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, std::pair > &", + "name" : "const std::pair, std::allocator >, std::pair > &", +- "referenced_type" : "type-31121", +- "self_type" : "type-31123", ++ "referenced_type" : "type-31120", ++ "self_type" : "type-31122", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94601,8 +94643,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, std::pair > &", + "name" : "const std::pair, std::allocator >, std::pair > &", +- "referenced_type" : "type-3911", +- "self_type" : "type-3913", ++ "referenced_type" : "type-3863", ++ "self_type" : "type-3865", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94610,8 +94652,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, std::pair > &", + "name" : "const std::pair, std::allocator >, std::pair > &", +- "referenced_type" : "type-5819", +- "self_type" : "type-5821", ++ "referenced_type" : "type-5771", ++ "self_type" : "type-5773", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94619,8 +94661,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, std::pair > &", + "name" : "const std::pair, std::allocator >, std::pair > &", +- "referenced_type" : "type-9076", +- "self_type" : "type-9078", ++ "referenced_type" : "type-9028", ++ "self_type" : "type-9030", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94628,8 +94670,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, const google::protobuf::FieldDescriptor *> &", + "name" : "const std::pair, const google::protobuf::FieldDescriptor *> &", +- "referenced_type" : "type-12224", +- "self_type" : "type-12226", ++ "referenced_type" : "type-12176", ++ "self_type" : "type-12178", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94637,8 +94679,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, const google::protobuf::FieldDescriptor *> &", + "name" : "const std::pair, const google::protobuf::FieldDescriptor *> &", +- "referenced_type" : "type-16079", +- "self_type" : "type-16081", ++ "referenced_type" : "type-16031", ++ "self_type" : "type-16033", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94646,8 +94688,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, const google::protobuf::FieldDescriptor *> &", + "name" : "const std::pair, const google::protobuf::FieldDescriptor *> &", +- "referenced_type" : "type-20611", +- "self_type" : "type-20613", ++ "referenced_type" : "type-20563", ++ "self_type" : "type-20565", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94655,8 +94697,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, const google::protobuf::FieldDescriptor *> &", + "name" : "const std::pair, const google::protobuf::FieldDescriptor *> &", +- "referenced_type" : "type-25790", +- "self_type" : "type-25792", ++ "referenced_type" : "type-25840", ++ "self_type" : "type-25842", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94664,8 +94706,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, const google::protobuf::FieldDescriptor *> &", + "name" : "const std::pair, const google::protobuf::FieldDescriptor *> &", +- "referenced_type" : "type-30936", +- "self_type" : "type-30938", ++ "referenced_type" : "type-30935", ++ "self_type" : "type-30937", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94673,8 +94715,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, const google::protobuf::FieldDescriptor *> &", + "name" : "const std::pair, const google::protobuf::FieldDescriptor *> &", +- "referenced_type" : "type-3664", +- "self_type" : "type-3666", ++ "referenced_type" : "type-3616", ++ "self_type" : "type-3618", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94682,8 +94724,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, const google::protobuf::FieldDescriptor *> &", + "name" : "const std::pair, const google::protobuf::FieldDescriptor *> &", +- "referenced_type" : "type-5632", +- "self_type" : "type-5634", ++ "referenced_type" : "type-5584", ++ "self_type" : "type-5586", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94691,8 +94733,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, const google::protobuf::FieldDescriptor *> &", + "name" : "const std::pair, const google::protobuf::FieldDescriptor *> &", +- "referenced_type" : "type-8890", +- "self_type" : "type-8892", ++ "referenced_type" : "type-8842", ++ "self_type" : "type-8844", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94700,8 +94742,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, google::protobuf::internal::ExtensionInfo> &", + "name" : "const std::pair, google::protobuf::internal::ExtensionInfo> &", +- "referenced_type" : "type-10922", +- "self_type" : "type-10927", ++ "referenced_type" : "type-10874", ++ "self_type" : "type-10879", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94709,8 +94751,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, google::protobuf::internal::ExtensionInfo> &", + "name" : "const std::pair, google::protobuf::internal::ExtensionInfo> &", +- "referenced_type" : "type-14213", +- "self_type" : "type-14218", ++ "referenced_type" : "type-1365", ++ "self_type" : "type-1367", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94718,8 +94760,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, google::protobuf::internal::ExtensionInfo> &", + "name" : "const std::pair, google::protobuf::internal::ExtensionInfo> &", +- "referenced_type" : "type-1446", +- "self_type" : "type-1448", ++ "referenced_type" : "type-14165", ++ "self_type" : "type-14170", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94727,8 +94769,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, google::protobuf::internal::ExtensionInfo> &", + "name" : "const std::pair, google::protobuf::internal::ExtensionInfo> &", +- "referenced_type" : "type-18077", +- "self_type" : "type-18082", ++ "referenced_type" : "type-18029", ++ "self_type" : "type-18034", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94736,8 +94778,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, google::protobuf::internal::ExtensionInfo> &", + "name" : "const std::pair, google::protobuf::internal::ExtensionInfo> &", +- "referenced_type" : "type-22606", +- "self_type" : "type-22611", ++ "referenced_type" : "type-23275", ++ "self_type" : "type-23281", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94745,8 +94787,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, google::protobuf::internal::ExtensionInfo> &", + "name" : "const std::pair, google::protobuf::internal::ExtensionInfo> &", +- "referenced_type" : "type-27791", +- "self_type" : "type-27796", ++ "referenced_type" : "type-27790", ++ "self_type" : "type-27795", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94754,8 +94796,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, google::protobuf::internal::ExtensionInfo> &", + "name" : "const std::pair, google::protobuf::internal::ExtensionInfo> &", +- "referenced_type" : "type-2875", +- "self_type" : "type-2877", ++ "referenced_type" : "type-2827", ++ "self_type" : "type-2829", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94763,8 +94805,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, google::protobuf::internal::ExtensionInfo> &", + "name" : "const std::pair, google::protobuf::internal::ExtensionInfo> &", +- "referenced_type" : "type-4855", +- "self_type" : "type-4857", ++ "referenced_type" : "type-4807", ++ "self_type" : "type-4809", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94781,8 +94823,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, google::protobuf::internal::ExtensionInfo> &", + "name" : "const std::pair, google::protobuf::internal::ExtensionInfo> &", +- "referenced_type" : "type-8023", +- "self_type" : "type-8028", ++ "referenced_type" : "type-7975", ++ "self_type" : "type-7980", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94790,8 +94832,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> &", + "name" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> &", +- "referenced_type" : "type-12402", +- "self_type" : "type-12404", ++ "referenced_type" : "type-12354", ++ "self_type" : "type-12356", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94799,8 +94841,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> &", + "name" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> &", +- "referenced_type" : "type-16259", +- "self_type" : "type-16261", ++ "referenced_type" : "type-16211", ++ "self_type" : "type-16213", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94808,8 +94850,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> &", + "name" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> &", +- "referenced_type" : "type-20790", +- "self_type" : "type-20792", ++ "referenced_type" : "type-20742", ++ "self_type" : "type-20744", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94817,8 +94859,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> &", + "name" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> &", +- "referenced_type" : "type-25968", +- "self_type" : "type-25970", ++ "referenced_type" : "type-26021", ++ "self_type" : "type-26023", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94826,8 +94868,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> &", + "name" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> &", +- "referenced_type" : "type-31115", +- "self_type" : "type-31117", ++ "referenced_type" : "type-31114", ++ "self_type" : "type-31116", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94835,8 +94877,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> &", + "name" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> &", +- "referenced_type" : "type-3905", +- "self_type" : "type-3907", ++ "referenced_type" : "type-3857", ++ "self_type" : "type-3859", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94844,8 +94886,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> &", + "name" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> &", +- "referenced_type" : "type-5813", +- "self_type" : "type-5815", ++ "referenced_type" : "type-5765", ++ "self_type" : "type-5767", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94853,8 +94895,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> &", + "name" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> &", +- "referenced_type" : "type-9070", +- "self_type" : "type-9072", ++ "referenced_type" : "type-9022", ++ "self_type" : "type-9024", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94862,8 +94904,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int>, std::pair > &", + "name" : "const std::pair, std::allocator >, int>, std::pair > &", +- "referenced_type" : "type-12414", +- "self_type" : "type-12416", ++ "referenced_type" : "type-12366", ++ "self_type" : "type-12368", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94871,8 +94913,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int>, std::pair > &", + "name" : "const std::pair, std::allocator >, int>, std::pair > &", +- "referenced_type" : "type-16271", +- "self_type" : "type-16273", ++ "referenced_type" : "type-16223", ++ "self_type" : "type-16225", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94880,8 +94922,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int>, std::pair > &", + "name" : "const std::pair, std::allocator >, int>, std::pair > &", +- "referenced_type" : "type-20802", +- "self_type" : "type-20804", ++ "referenced_type" : "type-20754", ++ "self_type" : "type-20756", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94889,8 +94931,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int>, std::pair > &", + "name" : "const std::pair, std::allocator >, int>, std::pair > &", +- "referenced_type" : "type-25980", +- "self_type" : "type-25982", ++ "referenced_type" : "type-26033", ++ "self_type" : "type-26035", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94898,8 +94940,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int>, std::pair > &", + "name" : "const std::pair, std::allocator >, int>, std::pair > &", +- "referenced_type" : "type-31127", +- "self_type" : "type-31129", ++ "referenced_type" : "type-31126", ++ "self_type" : "type-31128", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94907,8 +94949,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int>, std::pair > &", + "name" : "const std::pair, std::allocator >, int>, std::pair > &", +- "referenced_type" : "type-3917", +- "self_type" : "type-3919", ++ "referenced_type" : "type-3869", ++ "self_type" : "type-3871", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94916,8 +94958,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int>, std::pair > &", + "name" : "const std::pair, std::allocator >, int>, std::pair > &", +- "referenced_type" : "type-5825", +- "self_type" : "type-5827", ++ "referenced_type" : "type-5777", ++ "self_type" : "type-5779", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94925,8 +94967,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int>, std::pair > &", + "name" : "const std::pair, std::allocator >, int>, std::pair > &", +- "referenced_type" : "type-9082", +- "self_type" : "type-9084", ++ "referenced_type" : "type-9034", ++ "self_type" : "type-9036", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94934,8 +94976,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-12502", +- "self_type" : "type-12501", ++ "referenced_type" : "type-12454", ++ "self_type" : "type-12453", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94943,8 +94985,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-16359", +- "self_type" : "type-16358", ++ "referenced_type" : "type-16311", ++ "self_type" : "type-16310", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94952,8 +94994,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-20890", +- "self_type" : "type-20889", ++ "referenced_type" : "type-20842", ++ "self_type" : "type-20841", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94961,8 +95003,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-26068", +- "self_type" : "type-26067", ++ "referenced_type" : "type-26117", ++ "self_type" : "type-26116", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94970,8 +95012,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-31215", +- "self_type" : "type-31214", ++ "referenced_type" : "type-31214", ++ "self_type" : "type-31213", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94979,8 +95021,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-4006", +- "self_type" : "type-4005", ++ "referenced_type" : "type-3958", ++ "self_type" : "type-3957", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94988,8 +95030,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-5913", +- "self_type" : "type-5912", ++ "referenced_type" : "type-5865", ++ "self_type" : "type-5864", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -94997,8 +95039,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair &", + "name" : "const std::pair &", +- "referenced_type" : "type-9170", +- "self_type" : "type-9169", ++ "referenced_type" : "type-9122", ++ "self_type" : "type-9121", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -95006,8 +95048,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int> &", + "name" : "const std::pair, std::allocator >, int> &", +- "referenced_type" : "type-12498", +- "self_type" : "type-12500", ++ "referenced_type" : "type-12450", ++ "self_type" : "type-12452", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -95015,8 +95057,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int> &", + "name" : "const std::pair, std::allocator >, int> &", +- "referenced_type" : "type-16355", +- "self_type" : "type-16357", ++ "referenced_type" : "type-16307", ++ "self_type" : "type-16309", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -95024,8 +95066,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int> &", + "name" : "const std::pair, std::allocator >, int> &", +- "referenced_type" : "type-20886", +- "self_type" : "type-20888", ++ "referenced_type" : "type-20838", ++ "self_type" : "type-20840", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -95033,8 +95075,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int> &", + "name" : "const std::pair, std::allocator >, int> &", +- "referenced_type" : "type-26064", +- "self_type" : "type-26066", ++ "referenced_type" : "type-26113", ++ "self_type" : "type-26115", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -95042,8 +95084,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int> &", + "name" : "const std::pair, std::allocator >, int> &", +- "referenced_type" : "type-31211", +- "self_type" : "type-31213", ++ "referenced_type" : "type-31210", ++ "self_type" : "type-31212", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -95051,8 +95093,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int> &", + "name" : "const std::pair, std::allocator >, int> &", +- "referenced_type" : "type-4002", +- "self_type" : "type-4004", ++ "referenced_type" : "type-3954", ++ "self_type" : "type-3956", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -95060,8 +95102,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int> &", + "name" : "const std::pair, std::allocator >, int> &", +- "referenced_type" : "type-5909", +- "self_type" : "type-5911", ++ "referenced_type" : "type-5861", ++ "self_type" : "type-5863", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -95069,8 +95111,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair, std::allocator >, int> &", + "name" : "const std::pair, std::allocator >, int> &", +- "referenced_type" : "type-9166", +- "self_type" : "type-9168", ++ "referenced_type" : "type-9118", ++ "self_type" : "type-9120", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -95078,8 +95120,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > &", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > &", +- "referenced_type" : "type-13143", +- "self_type" : "type-13146", ++ "referenced_type" : "type-13095", ++ "self_type" : "type-13098", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -95087,8 +95129,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > &", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > &", +- "referenced_type" : "type-16999", +- "self_type" : "type-17002", ++ "referenced_type" : "type-16951", ++ "self_type" : "type-16954", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -95096,8 +95138,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > &", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > &", +- "referenced_type" : "type-21531", +- "self_type" : "type-21534", ++ "referenced_type" : "type-21483", ++ "self_type" : "type-21486", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -95105,8 +95147,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > &", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > &", +- "referenced_type" : "type-26709", +- "self_type" : "type-26712", ++ "referenced_type" : "type-26730", ++ "self_type" : "type-26733", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -95114,8 +95156,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > &", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > &", +- "referenced_type" : "type-31856", +- "self_type" : "type-31859", ++ "referenced_type" : "type-31855", ++ "self_type" : "type-31858", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -95123,8 +95165,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > &", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > &", +- "referenced_type" : "type-6640", +- "self_type" : "type-6643", ++ "referenced_type" : "type-6592", ++ "self_type" : "type-6595", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -95132,8 +95174,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > &", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > &", +- "referenced_type" : "type-9811", +- "self_type" : "type-9814", ++ "referenced_type" : "type-9763", ++ "self_type" : "type-9766", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -95141,8 +95183,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > &", + "name" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > &", +- "referenced_type" : "type-10421", +- "self_type" : "type-10424", ++ "referenced_type" : "type-10373", ++ "self_type" : "type-10376", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -95150,8 +95192,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > &", + "name" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > &", +- "referenced_type" : "type-13712", +- "self_type" : "type-13715", ++ "referenced_type" : "type-13664", ++ "self_type" : "type-13667", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -95159,8 +95201,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > &", + "name" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > &", +- "referenced_type" : "type-17576", +- "self_type" : "type-17579", ++ "referenced_type" : "type-17528", ++ "self_type" : "type-17531", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -95168,8 +95210,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > &", + "name" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > &", +- "referenced_type" : "type-22105", +- "self_type" : "type-22108", ++ "referenced_type" : "type-22104", ++ "self_type" : "type-22107", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -95177,8 +95219,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > &", + "name" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > &", +- "referenced_type" : "type-27290", +- "self_type" : "type-27293", ++ "referenced_type" : "type-27289", ++ "self_type" : "type-27292", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -95186,8 +95228,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > &", + "name" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > &", +- "referenced_type" : "type-7474", +- "self_type" : "type-7477", ++ "referenced_type" : "type-7426", ++ "self_type" : "type-7429", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -95195,8 +95237,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator > > > &", + "name" : "const std::set, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-24657", +- "self_type" : "type-24659", ++ "referenced_type" : "type-24620", ++ "self_type" : "type-24622", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -95204,8 +95246,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator > > > &", + "name" : "const std::set, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-29838", +- "self_type" : "type-29840", ++ "referenced_type" : "type-29837", ++ "self_type" : "type-29839", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -95213,8 +95255,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-24646", +- "self_type" : "type-24648", ++ "referenced_type" : "type-24612", ++ "self_type" : "type-24614", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/type_info_test_helper.h" + }, +@@ -95222,8 +95264,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-29827", +- "self_type" : "type-29829", ++ "referenced_type" : "type-29826", ++ "self_type" : "type-29828", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/type_info_test_helper.h" + }, +@@ -95231,8 +95273,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-13065", +- "self_type" : "type-13067", ++ "referenced_type" : "type-13017", ++ "self_type" : "type-13019", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -95240,8 +95282,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-16921", +- "self_type" : "type-16923", ++ "referenced_type" : "type-16873", ++ "self_type" : "type-16875", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -95249,8 +95291,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-21453", +- "self_type" : "type-21455", ++ "referenced_type" : "type-21405", ++ "self_type" : "type-21407", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -95258,8 +95300,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-25005", +- "self_type" : "type-25007", ++ "referenced_type" : "type-24974", ++ "self_type" : "type-24976", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h" + }, +@@ -95267,8 +95309,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-26631", +- "self_type" : "type-26633", ++ "referenced_type" : "type-26653", ++ "self_type" : "type-26656", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -95276,8 +95318,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-30157", +- "self_type" : "type-30159", ++ "referenced_type" : "type-30156", ++ "self_type" : "type-30158", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h" + }, +@@ -95285,8 +95327,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-31778", +- "self_type" : "type-31780", ++ "referenced_type" : "type-31777", ++ "self_type" : "type-31779", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -95294,8 +95336,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-6482", +- "self_type" : "type-6484", ++ "referenced_type" : "type-6434", ++ "self_type" : "type-6436", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -95303,8 +95345,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-9733", +- "self_type" : "type-9735", ++ "referenced_type" : "type-9685", ++ "self_type" : "type-9687", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -95312,8 +95354,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-12441", +- "self_type" : "type-12443", ++ "referenced_type" : "type-12393", ++ "self_type" : "type-12395", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -95321,8 +95363,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-16298", +- "self_type" : "type-16300", ++ "referenced_type" : "type-16250", ++ "self_type" : "type-16252", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -95330,8 +95372,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-20829", +- "self_type" : "type-20831", ++ "referenced_type" : "type-20781", ++ "self_type" : "type-20783", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -95339,8 +95381,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-26007", +- "self_type" : "type-26009", ++ "referenced_type" : "type-26060", ++ "self_type" : "type-26062", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -95348,8 +95390,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-31154", +- "self_type" : "type-31156", ++ "referenced_type" : "type-31153", ++ "self_type" : "type-31155", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -95357,8 +95399,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-3944", +- "self_type" : "type-3946", ++ "referenced_type" : "type-3896", ++ "self_type" : "type-3898", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -95366,8 +95408,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-5852", +- "self_type" : "type-5854", ++ "referenced_type" : "type-5804", ++ "self_type" : "type-5806", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -95375,8 +95417,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-9109", +- "self_type" : "type-9111", ++ "referenced_type" : "type-9061", ++ "self_type" : "type-9063", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -95384,8 +95426,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-24904", +- "self_type" : "type-24903", ++ "referenced_type" : "type-24871", ++ "self_type" : "type-24870", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -95393,8 +95435,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-30076", +- "self_type" : "type-30075", ++ "referenced_type" : "type-30075", ++ "self_type" : "type-30074", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -95402,8 +95444,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-11216", +- "self_type" : "type-11218", ++ "referenced_type" : "type-11168", ++ "self_type" : "type-11170", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -95411,8 +95453,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-12280", +- "self_type" : "type-12283", ++ "referenced_type" : "type-12232", ++ "self_type" : "type-12235", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -95420,8 +95462,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-14468", +- "self_type" : "type-14470", ++ "referenced_type" : "type-14420", ++ "self_type" : "type-14422", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -95429,8 +95471,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-16135", +- "self_type" : "type-16138", ++ "referenced_type" : "type-16087", ++ "self_type" : "type-16090", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -95438,8 +95480,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-18332", +- "self_type" : "type-18334", ++ "referenced_type" : "type-18284", ++ "self_type" : "type-18286", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -95447,8 +95489,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-20666", +- "self_type" : "type-20669", ++ "referenced_type" : "type-20618", ++ "self_type" : "type-20621", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -95456,8 +95498,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-22861", +- "self_type" : "type-22863", ++ "referenced_type" : "type-22815", ++ "self_type" : "type-22817", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -95465,8 +95507,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-25845", +- "self_type" : "type-25848", ++ "referenced_type" : "type-25898", ++ "self_type" : "type-25901", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -95474,8 +95516,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-28046", +- "self_type" : "type-28048", ++ "referenced_type" : "type-28045", ++ "self_type" : "type-28047", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -95483,8 +95525,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-30991", +- "self_type" : "type-30994", ++ "referenced_type" : "type-30990", ++ "self_type" : "type-30993", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -95492,8 +95534,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-3740", +- "self_type" : "type-3743", ++ "referenced_type" : "type-3692", ++ "self_type" : "type-3695", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -95501,8 +95543,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-5689", +- "self_type" : "type-5692", ++ "referenced_type" : "type-5641", ++ "self_type" : "type-5644", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -95510,8 +95552,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > &", + "name" : "const std::vector > &", +- "referenced_type" : "type-8946", +- "self_type" : "type-8949", ++ "referenced_type" : "type-8898", ++ "self_type" : "type-8901", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -95519,8 +95561,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-10167", +- "self_type" : "type-10169", ++ "referenced_type" : "type-10119", ++ "self_type" : "type-10121", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95528,8 +95570,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-10538", +- "self_type" : "type-10541", ++ "referenced_type" : "type-10490", ++ "self_type" : "type-10493", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95537,8 +95579,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-10685", +- "self_type" : "type-10687", ++ "referenced_type" : "type-10637", ++ "self_type" : "type-10639", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95546,8 +95588,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-11227", +- "self_type" : "type-11229", ++ "referenced_type" : "type-11179", ++ "self_type" : "type-11181", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95555,8 +95597,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-11385", +- "self_type" : "type-11387", ++ "referenced_type" : "type-11337", ++ "self_type" : "type-11339", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95564,8 +95606,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-11509", +- "self_type" : "type-11511", ++ "referenced_type" : "type-11461", ++ "self_type" : "type-11463", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95573,8 +95615,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-11671", +- "self_type" : "type-11676", ++ "referenced_type" : "type-11623", ++ "self_type" : "type-11628", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95582,8 +95624,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-12200", +- "self_type" : "type-12202", ++ "referenced_type" : "type-12152", ++ "self_type" : "type-12154", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95591,8 +95633,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-12486", +- "self_type" : "type-12488", ++ "referenced_type" : "type-12438", ++ "self_type" : "type-12440", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95600,8 +95642,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-12532", +- "self_type" : "type-12534", ++ "referenced_type" : "type-12484", ++ "self_type" : "type-12486", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, +@@ -95609,8 +95651,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-12637", +- "self_type" : "type-12640", ++ "referenced_type" : "type-12589", ++ "self_type" : "type-12592", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95618,8 +95660,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-12825", +- "self_type" : "type-12824", ++ "referenced_type" : "type-12777", ++ "self_type" : "type-12776", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95627,8 +95669,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-13304", +- "self_type" : "type-13306", ++ "referenced_type" : "type-13256", ++ "self_type" : "type-13258", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95636,8 +95678,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-13500", +- "self_type" : "type-13502", ++ "referenced_type" : "type-13452", ++ "self_type" : "type-13454", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95645,8 +95687,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-13829", +- "self_type" : "type-13832", ++ "referenced_type" : "type-13781", ++ "self_type" : "type-13784", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95654,8 +95696,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-13976", +- "self_type" : "type-13978", ++ "referenced_type" : "type-13928", ++ "self_type" : "type-13930", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95663,8 +95705,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-14479", +- "self_type" : "type-14481", ++ "referenced_type" : "type-14431", ++ "self_type" : "type-14433", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95672,8 +95714,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-14609", +- "self_type" : "type-14611", ++ "referenced_type" : "type-14561", ++ "self_type" : "type-14563", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95681,8 +95723,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-14729", +- "self_type" : "type-14731", ++ "referenced_type" : "type-14681", ++ "self_type" : "type-14683", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95690,8 +95732,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-14956", +- "self_type" : "type-14958", ++ "referenced_type" : "type-14908", ++ "self_type" : "type-14910", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95699,8 +95741,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-15171", +- "self_type" : "type-15173", ++ "referenced_type" : "type-15123", ++ "self_type" : "type-15125", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95708,8 +95750,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-15179", +- "self_type" : "type-15178", ++ "referenced_type" : "type-15131", ++ "self_type" : "type-15130", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -95717,8 +95759,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-15402", +- "self_type" : "type-15404", ++ "referenced_type" : "type-15354", ++ "self_type" : "type-15356", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95726,8 +95768,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-15530", +- "self_type" : "type-15535", ++ "referenced_type" : "type-15482", ++ "self_type" : "type-15487", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95735,8 +95777,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-1554", +- "self_type" : "type-1556", ++ "referenced_type" : "type-16007", ++ "self_type" : "type-16009", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95744,8 +95786,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-16055", +- "self_type" : "type-16057", ++ "referenced_type" : "type-16295", ++ "self_type" : "type-16297", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95753,8 +95795,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-16343", +- "self_type" : "type-16345", ++ "referenced_type" : "type-1631", ++ "self_type" : "type-1633", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95762,8 +95804,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-16389", +- "self_type" : "type-16391", ++ "referenced_type" : "type-16341", ++ "self_type" : "type-16343", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, +@@ -95771,8 +95813,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-16494", +- "self_type" : "type-16497", ++ "referenced_type" : "type-16446", ++ "self_type" : "type-16449", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95780,8 +95822,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-16681", +- "self_type" : "type-16680", ++ "referenced_type" : "type-16633", ++ "self_type" : "type-16632", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95789,8 +95831,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-17160", +- "self_type" : "type-17162", ++ "referenced_type" : "type-17112", ++ "self_type" : "type-17114", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95798,8 +95840,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-17356", +- "self_type" : "type-17358", ++ "referenced_type" : "type-17308", ++ "self_type" : "type-17310", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95807,8 +95849,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-17693", +- "self_type" : "type-17696", ++ "referenced_type" : "type-17645", ++ "self_type" : "type-17648", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95816,8 +95858,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-17840", +- "self_type" : "type-17842", ++ "referenced_type" : "type-17792", ++ "self_type" : "type-17794", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95825,8 +95867,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-18343", +- "self_type" : "type-18345", ++ "referenced_type" : "type-18295", ++ "self_type" : "type-18297", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95834,8 +95876,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-18473", +- "self_type" : "type-18475", ++ "referenced_type" : "type-18425", ++ "self_type" : "type-18427", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95843,8 +95885,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-18593", +- "self_type" : "type-18595", ++ "referenced_type" : "type-18545", ++ "self_type" : "type-18547", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95852,8 +95894,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-18811", +- "self_type" : "type-18813", ++ "referenced_type" : "type-18763", ++ "self_type" : "type-18765", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95861,8 +95903,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-18955", +- "self_type" : "type-18957", ++ "referenced_type" : "type-18907", ++ "self_type" : "type-18909", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95870,8 +95912,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-18963", +- "self_type" : "type-18962", ++ "referenced_type" : "type-18915", ++ "self_type" : "type-18914", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -95879,8 +95921,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-19158", +- "self_type" : "type-19160", ++ "referenced_type" : "type-19110", ++ "self_type" : "type-19112", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95888,8 +95930,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-19328", +- "self_type" : "type-19330", ++ "referenced_type" : "type-19280", ++ "self_type" : "type-19282", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95897,8 +95939,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-19347", +- "self_type" : "type-19349", ++ "referenced_type" : "type-19299", ++ "self_type" : "type-19301", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95906,8 +95948,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-19361", +- "self_type" : "type-19363", ++ "referenced_type" : "type-19313", ++ "self_type" : "type-19315", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95915,8 +95957,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-19699", +- "self_type" : "type-19701", ++ "referenced_type" : "type-19651", ++ "self_type" : "type-19653", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95933,8 +95975,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-19856", +- "self_type" : "type-19858", ++ "referenced_type" : "type-19808", ++ "self_type" : "type-19810", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95942,8 +95984,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-20011", +- "self_type" : "type-20013", ++ "referenced_type" : "type-19963", ++ "self_type" : "type-19965", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95951,8 +95993,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-20059", +- "self_type" : "type-20064", ++ "referenced_type" : "type-20011", ++ "self_type" : "type-20016", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95960,8 +96002,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-20587", +- "self_type" : "type-20589", ++ "referenced_type" : "type-20539", ++ "self_type" : "type-20541", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95969,8 +96011,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-20874", +- "self_type" : "type-20876", ++ "referenced_type" : "type-20826", ++ "self_type" : "type-20828", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -95978,8 +96020,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-20920", +- "self_type" : "type-20922", ++ "referenced_type" : "type-20872", ++ "self_type" : "type-20874", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, +@@ -95987,8 +96029,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-21025", +- "self_type" : "type-21028", ++ "referenced_type" : "type-20977", ++ "self_type" : "type-20980", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96005,8 +96047,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-21213", +- "self_type" : "type-21212", ++ "referenced_type" : "type-21165", ++ "self_type" : "type-21164", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96014,8 +96056,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-21692", +- "self_type" : "type-21694", ++ "referenced_type" : "type-21644", ++ "self_type" : "type-21646", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96023,8 +96065,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-21888", +- "self_type" : "type-21890", ++ "referenced_type" : "type-21840", ++ "self_type" : "type-21842", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96032,8 +96074,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-22222", +- "self_type" : "type-22225", ++ "referenced_type" : "type-21881", ++ "self_type" : "type-21883", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96041,8 +96083,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-22369", +- "self_type" : "type-22371", ++ "referenced_type" : "type-22209", ++ "self_type" : "type-22211", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96050,8 +96092,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-22872", +- "self_type" : "type-22874", ++ "referenced_type" : "type-22331", ++ "self_type" : "type-22333", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96059,8 +96101,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-23002", +- "self_type" : "type-23004", ++ "referenced_type" : "type-22829", ++ "self_type" : "type-22831", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96068,8 +96110,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-23122", +- "self_type" : "type-23124", ++ "referenced_type" : "type-22973", ++ "self_type" : "type-22976", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96077,8 +96119,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-23340", +- "self_type" : "type-23342", ++ "referenced_type" : "type-23107", ++ "self_type" : "type-23109", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96086,8 +96128,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-23484", +- "self_type" : "type-23486", ++ "referenced_type" : "type-23335", ++ "self_type" : "type-23337", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96095,26 +96137,26 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-23492", +- "self_type" : "type-23491", ++ "referenced_type" : "type-23462", ++ "self_type" : "type-23464", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-23687", +- "self_type" : "type-23689", ++ "referenced_type" : "type-23468", ++ "self_type" : "type-23467", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-23849", +- "self_type" : "type-23851", ++ "referenced_type" : "type-23672", ++ "self_type" : "type-23674", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96122,8 +96164,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-23857", +- "self_type" : "type-23859", ++ "referenced_type" : "type-23838", ++ "self_type" : "type-23840", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96131,8 +96173,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-23871", +- "self_type" : "type-23873", ++ "referenced_type" : "type-23849", ++ "self_type" : "type-23851", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96140,8 +96182,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-24166", +- "self_type" : "type-24168", ++ "referenced_type" : "type-23873", ++ "self_type" : "type-23875", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96149,8 +96191,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-24323", +- "self_type" : "type-24325", ++ "referenced_type" : "type-24168", ++ "self_type" : "type-24170", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96158,8 +96200,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-24471", +- "self_type" : "type-24473", ++ "referenced_type" : "type-24315", ++ "self_type" : "type-24317", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96167,8 +96209,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-24619", +- "self_type" : "type-24621", ++ "referenced_type" : "type-24450", ++ "self_type" : "type-24452", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96176,8 +96218,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-24726", +- "self_type" : "type-24750", ++ "referenced_type" : "type-24591", ++ "self_type" : "type-24593", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96185,8 +96227,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-24745", +- "self_type" : "type-24747", ++ "referenced_type" : "type-24633", ++ "self_type" : "type-24648", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96194,8 +96236,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-24881", +- "self_type" : "type-24883", ++ "referenced_type" : "type-24704", ++ "self_type" : "type-24706", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96203,8 +96245,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-25038", +- "self_type" : "type-25040", ++ "referenced_type" : "type-24845", ++ "self_type" : "type-24847", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96212,8 +96254,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-25171", +- "self_type" : "type-25173", ++ "referenced_type" : "type-25006", ++ "self_type" : "type-25008", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96221,8 +96263,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-25263", +- "self_type" : "type-25265", ++ "referenced_type" : "type-25151", ++ "self_type" : "type-25153", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96230,8 +96272,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-25766", +- "self_type" : "type-25768", ++ "referenced_type" : "type-25264", ++ "self_type" : "type-25266", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96239,17 +96281,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-26052", +- "self_type" : "type-26054", ++ "referenced_type" : "type-2544", ++ "self_type" : "type-2546", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-2607", +- "self_type" : "type-2609", ++ "referenced_type" : "type-2552", ++ "self_type" : "type-2554", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96257,17 +96299,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-26098", +- "self_type" : "type-26100", ++ "referenced_type" : "type-2578", ++ "self_type" : "type-2577", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-261", +- "self_type" : "type-260", ++ "referenced_type" : "type-25818", ++ "self_type" : "type-25820", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96275,8 +96317,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-26203", +- "self_type" : "type-26206", ++ "referenced_type" : "type-261", ++ "self_type" : "type-260", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96284,8 +96326,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-26391", +- "self_type" : "type-26390", ++ "referenced_type" : "type-26101", ++ "self_type" : "type-26103", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96293,26 +96335,26 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-2666", +- "self_type" : "type-2668", ++ "referenced_type" : "type-26135", ++ "self_type" : "type-26137", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-2676", +- "self_type" : "type-2678", ++ "referenced_type" : "type-26596", ++ "self_type" : "type-26598", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-26870", +- "self_type" : "type-26872", ++ "referenced_type" : "type-26650", ++ "self_type" : "type-26655", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96320,8 +96362,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-2699", +- "self_type" : "type-2698", ++ "referenced_type" : "type-26891", ++ "self_type" : "type-26893", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96329,8 +96371,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-27066", +- "self_type" : "type-27068", ++ "referenced_type" : "type-26946", ++ "self_type" : "type-26945", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96338,8 +96380,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-27407", +- "self_type" : "type-27410", ++ "referenced_type" : "type-27406", ++ "self_type" : "type-27409", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96347,8 +96389,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-27554", +- "self_type" : "type-27556", ++ "referenced_type" : "type-27553", ++ "self_type" : "type-27555", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96356,8 +96398,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-28057", +- "self_type" : "type-28059", ++ "referenced_type" : "type-28056", ++ "self_type" : "type-28058", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96365,8 +96407,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-28187", +- "self_type" : "type-28189", ++ "referenced_type" : "type-28186", ++ "self_type" : "type-28188", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96374,8 +96416,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-28307", +- "self_type" : "type-28309", ++ "referenced_type" : "type-28306", ++ "self_type" : "type-28308", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96383,8 +96425,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-28525", +- "self_type" : "type-28527", ++ "referenced_type" : "type-28524", ++ "self_type" : "type-28526", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96392,8 +96434,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-28669", +- "self_type" : "type-28671", ++ "referenced_type" : "type-28668", ++ "self_type" : "type-28670", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96401,8 +96443,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-28677", +- "self_type" : "type-28676", ++ "referenced_type" : "type-28676", ++ "self_type" : "type-28675", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -96410,8 +96452,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-28872", +- "self_type" : "type-28874", ++ "referenced_type" : "type-28871", ++ "self_type" : "type-28873", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96419,8 +96461,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-29034", +- "self_type" : "type-29036", ++ "referenced_type" : "type-29033", ++ "self_type" : "type-29035", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96428,8 +96470,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-29042", +- "self_type" : "type-29044", ++ "referenced_type" : "type-29041", ++ "self_type" : "type-29043", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96437,8 +96479,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-29056", +- "self_type" : "type-29058", ++ "referenced_type" : "type-29055", ++ "self_type" : "type-29057", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96446,8 +96488,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-29351", +- "self_type" : "type-29353", ++ "referenced_type" : "type-29350", ++ "self_type" : "type-29352", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96455,8 +96497,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-29508", +- "self_type" : "type-29510", ++ "referenced_type" : "type-29507", ++ "self_type" : "type-29509", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96464,8 +96506,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-29656", +- "self_type" : "type-29658", ++ "referenced_type" : "type-29655", ++ "self_type" : "type-29657", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96473,8 +96515,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-29804", +- "self_type" : "type-29806", ++ "referenced_type" : "type-29803", ++ "self_type" : "type-29805", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96482,8 +96524,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-29907", +- "self_type" : "type-29931", ++ "referenced_type" : "type-29906", ++ "self_type" : "type-29930", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96491,8 +96533,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-29926", +- "self_type" : "type-29928", ++ "referenced_type" : "type-29925", ++ "self_type" : "type-29927", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96500,8 +96542,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-30060", +- "self_type" : "type-30062", ++ "referenced_type" : "type-30059", ++ "self_type" : "type-30061", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96509,8 +96551,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-30188", +- "self_type" : "type-30190", ++ "referenced_type" : "type-30187", ++ "self_type" : "type-30189", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96518,8 +96560,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-30315", +- "self_type" : "type-30317", ++ "referenced_type" : "type-30314", ++ "self_type" : "type-30316", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96527,8 +96569,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-30407", +- "self_type" : "type-30409", ++ "referenced_type" : "type-3036", ++ "self_type" : "type-3041", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96536,8 +96578,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-3084", +- "self_type" : "type-3089", ++ "referenced_type" : "type-30406", ++ "self_type" : "type-30408", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96545,8 +96587,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-30912", +- "self_type" : "type-30914", ++ "referenced_type" : "type-30911", ++ "self_type" : "type-30913", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96554,8 +96596,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-31199", +- "self_type" : "type-31201", ++ "referenced_type" : "type-31198", ++ "self_type" : "type-31200", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96563,8 +96605,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-31245", +- "self_type" : "type-31247", ++ "referenced_type" : "type-31244", ++ "self_type" : "type-31246", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, +@@ -96572,8 +96614,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-31350", +- "self_type" : "type-31353", ++ "referenced_type" : "type-31349", ++ "self_type" : "type-31352", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96581,8 +96623,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-31538", +- "self_type" : "type-31537", ++ "referenced_type" : "type-31537", ++ "self_type" : "type-31536", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96590,8 +96632,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-32017", +- "self_type" : "type-32019", ++ "referenced_type" : "type-32016", ++ "self_type" : "type-32018", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96599,8 +96641,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-32213", +- "self_type" : "type-32215", ++ "referenced_type" : "type-32212", ++ "self_type" : "type-32214", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96608,8 +96650,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-3629", +- "self_type" : "type-3631", ++ "referenced_type" : "type-3581", ++ "self_type" : "type-3583", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96617,8 +96659,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-3989", +- "self_type" : "type-3991", ++ "referenced_type" : "type-3941", ++ "self_type" : "type-3943", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96626,8 +96668,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-4084", +- "self_type" : "type-4086", ++ "referenced_type" : "type-4036", ++ "self_type" : "type-4038", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, +@@ -96635,8 +96677,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-4192", +- "self_type" : "type-4195", ++ "referenced_type" : "type-4144", ++ "self_type" : "type-4147", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96644,8 +96686,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-4412", +- "self_type" : "type-4411", ++ "referenced_type" : "type-4364", ++ "self_type" : "type-4363", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96653,8 +96695,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-5064", +- "self_type" : "type-5069", ++ "referenced_type" : "type-5016", ++ "self_type" : "type-5021", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96662,8 +96704,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-5607", +- "self_type" : "type-5609", ++ "referenced_type" : "type-5559", ++ "self_type" : "type-5561", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96671,8 +96713,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-5897", +- "self_type" : "type-5899", ++ "referenced_type" : "type-5849", ++ "self_type" : "type-5851", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96680,8 +96722,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-5943", +- "self_type" : "type-5945", ++ "referenced_type" : "type-5895", ++ "self_type" : "type-5897", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, +@@ -96689,8 +96731,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-6048", +- "self_type" : "type-6051", ++ "referenced_type" : "type-6000", ++ "self_type" : "type-6003", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96698,8 +96740,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-6236", +- "self_type" : "type-6235", ++ "referenced_type" : "type-6188", ++ "self_type" : "type-6187", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96707,8 +96749,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-6855", +- "self_type" : "type-6857", ++ "referenced_type" : "type-6807", ++ "self_type" : "type-6809", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96716,8 +96758,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-7094", +- "self_type" : "type-7096", ++ "referenced_type" : "type-7046", ++ "self_type" : "type-7048", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96725,8 +96767,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-7619", +- "self_type" : "type-7621", ++ "referenced_type" : "type-7571", ++ "self_type" : "type-7573", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96734,8 +96776,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-7770", +- "self_type" : "type-7772", ++ "referenced_type" : "type-7722", ++ "self_type" : "type-7724", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96743,8 +96785,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-8340", +- "self_type" : "type-8345", ++ "referenced_type" : "type-8292", ++ "self_type" : "type-8297", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96761,8 +96803,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-882", +- "self_type" : "type-884", ++ "referenced_type" : "type-8818", ++ "self_type" : "type-8820", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96770,8 +96812,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-8866", +- "self_type" : "type-8868", ++ "referenced_type" : "type-882", ++ "self_type" : "type-884", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96779,8 +96821,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-9154", +- "self_type" : "type-9156", ++ "referenced_type" : "type-9106", ++ "self_type" : "type-9108", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96788,8 +96830,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-9200", +- "self_type" : "type-9202", ++ "referenced_type" : "type-9152", ++ "self_type" : "type-9154", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, +@@ -96797,8 +96839,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-9305", +- "self_type" : "type-9308", ++ "referenced_type" : "type-9257", ++ "self_type" : "type-9260", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96806,8 +96848,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-9493", +- "self_type" : "type-9492", ++ "referenced_type" : "type-9445", ++ "self_type" : "type-9444", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96833,8 +96875,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-993", +- "self_type" : "type-992", ++ "referenced_type" : "type-9923", ++ "self_type" : "type-9925", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96842,8 +96884,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > > &", +- "referenced_type" : "type-9971", +- "self_type" : "type-9973", ++ "referenced_type" : "type-993", ++ "self_type" : "type-992", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -96851,8 +96893,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector >, std::allocator > > > &", + "name" : "const std::vector >, std::allocator > > > &", +- "referenced_type" : "type-25008", +- "self_type" : "type-25010", ++ "referenced_type" : "type-24977", ++ "self_type" : "type-24979", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h" + }, +@@ -96860,8 +96902,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector >, std::allocator > > > &", + "name" : "const std::vector >, std::allocator > > > &", +- "referenced_type" : "type-30160", +- "self_type" : "type-30162", ++ "referenced_type" : "type-30159", ++ "self_type" : "type-30161", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h" + }, +@@ -96869,8 +96911,8 @@ + "alignment" : 4, + "linker_set_key" : "const timeval &", + "name" : "const timeval &", +- "referenced_type" : "type-25166", +- "self_type" : "type-25168", ++ "referenced_type" : "type-25143", ++ "self_type" : "type-25146", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, +@@ -96878,8 +96920,8 @@ + "alignment" : 4, + "linker_set_key" : "const timeval &", + "name" : "const timeval &", +- "referenced_type" : "type-30310", +- "self_type" : "type-30312", ++ "referenced_type" : "type-30309", ++ "self_type" : "type-30311", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, +@@ -96905,8 +96947,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Any &", + "name" : "google::protobuf::Any &", +- "referenced_type" : "type-1846", +- "self_type" : "type-2185", ++ "referenced_type" : "type-1759", ++ "self_type" : "type-2116", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/any.pb.h" + }, +@@ -96914,8 +96956,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Api &", + "name" : "google::protobuf::Api &", +- "referenced_type" : "type-2342", +- "self_type" : "type-2508", ++ "referenced_type" : "type-2269", ++ "self_type" : "type-2438", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/api.pb.h" + }, +@@ -96941,8 +96983,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::BoolValue &", + "name" : "google::protobuf::BoolValue &", +- "referenced_type" : "type-11054", +- "self_type" : "type-11162", ++ "referenced_type" : "type-11006", ++ "self_type" : "type-11114", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, +@@ -96950,8 +96992,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::BytesValue &", + "name" : "google::protobuf::BytesValue &", +- "referenced_type" : "type-11056", +- "self_type" : "type-11166", ++ "referenced_type" : "type-11008", ++ "self_type" : "type-11118", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, +@@ -96959,8 +97001,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorProto &", + "name" : "google::protobuf::DescriptorProto &", +- "referenced_type" : "type-1677", +- "self_type" : "type-2230", ++ "referenced_type" : "type-1591", ++ "self_type" : "type-2159", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -96968,8 +97010,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorProto_ExtensionRange &", + "name" : "google::protobuf::DescriptorProto_ExtensionRange &", +- "referenced_type" : "type-1696", +- "self_type" : "type-2228", ++ "referenced_type" : "type-1610", ++ "self_type" : "type-2157", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -96977,8 +97019,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorProto_ReservedRange &", + "name" : "google::protobuf::DescriptorProto_ReservedRange &", +- "referenced_type" : "type-1702", +- "self_type" : "type-2229", ++ "referenced_type" : "type-1616", ++ "self_type" : "type-2158", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -96986,8 +97028,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DoubleValue &", + "name" : "google::protobuf::DoubleValue &", +- "referenced_type" : "type-11048", +- "self_type" : "type-11150", ++ "referenced_type" : "type-11000", ++ "self_type" : "type-11102", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, +@@ -96995,8 +97037,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Duration &", + "name" : "google::protobuf::Duration &", +- "referenced_type" : "type-4178", +- "self_type" : "type-4234", ++ "referenced_type" : "type-4130", ++ "self_type" : "type-4186", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/duration.pb.h" + }, +@@ -97004,8 +97046,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Empty &", + "name" : "google::protobuf::Empty &", +- "referenced_type" : "type-4395", +- "self_type" : "type-4446", ++ "referenced_type" : "type-4347", ++ "self_type" : "type-4398", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/empty.pb.h" + }, +@@ -97013,8 +97055,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Enum &", + "name" : "google::protobuf::Enum &", +- "referenced_type" : "type-2495", +- "self_type" : "type-2496", ++ "referenced_type" : "type-2425", ++ "self_type" : "type-2426", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, +@@ -97022,8 +97064,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::EnumDescriptorProto &", + "name" : "google::protobuf::EnumDescriptorProto &", +- "referenced_type" : "type-1688", +- "self_type" : "type-2237", ++ "referenced_type" : "type-1602", ++ "self_type" : "type-2167", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -97031,8 +97073,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::EnumOptions &", + "name" : "google::protobuf::EnumOptions &", +- "referenced_type" : "type-1694", +- "self_type" : "type-2249", ++ "referenced_type" : "type-1608", ++ "self_type" : "type-2178", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -97040,8 +97082,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::EnumValue &", + "name" : "google::protobuf::EnumValue &", +- "referenced_type" : "type-2299", +- "self_type" : "type-2502", ++ "referenced_type" : "type-2226", ++ "self_type" : "type-2432", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, +@@ -97049,8 +97091,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::EnumValueDescriptorProto &", + "name" : "google::protobuf::EnumValueDescriptorProto &", +- "referenced_type" : "type-1690", +- "self_type" : "type-2239", ++ "referenced_type" : "type-1604", ++ "self_type" : "type-2169", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -97058,8 +97100,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::EnumValueOptions &", + "name" : "google::protobuf::EnumValueOptions &", +- "referenced_type" : "type-1692", +- "self_type" : "type-2250", ++ "referenced_type" : "type-1606", ++ "self_type" : "type-2179", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -97067,8 +97109,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Field &", + "name" : "google::protobuf::Field &", +- "referenced_type" : "type-2296", +- "self_type" : "type-2494", ++ "referenced_type" : "type-2223", ++ "self_type" : "type-2424", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, +@@ -97076,8 +97118,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::FieldDescriptorProto &", + "name" : "google::protobuf::FieldDescriptorProto &", +- "referenced_type" : "type-1679", +- "self_type" : "type-2235", ++ "referenced_type" : "type-1593", ++ "self_type" : "type-2164", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -97085,8 +97127,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::FieldMask &", + "name" : "google::protobuf::FieldMask &", +- "referenced_type" : "type-6346", +- "self_type" : "type-6411", ++ "referenced_type" : "type-6298", ++ "self_type" : "type-6363", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/field_mask.pb.h" + }, +@@ -97094,8 +97136,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::FieldOptions &", + "name" : "google::protobuf::FieldOptions &", +- "referenced_type" : "type-1681", +- "self_type" : "type-2248", ++ "referenced_type" : "type-1595", ++ "self_type" : "type-2177", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -97103,8 +97145,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::FileDescriptorProto &", + "name" : "google::protobuf::FileDescriptorProto &", +- "referenced_type" : "type-1674", +- "self_type" : "type-2221", ++ "referenced_type" : "type-1587", ++ "self_type" : "type-2150", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -97112,8 +97154,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::FileDescriptorSet &", + "name" : "google::protobuf::FileDescriptorSet &", +- "referenced_type" : "type-2211", +- "self_type" : "type-2212", ++ "referenced_type" : "type-2142", ++ "self_type" : "type-2143", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -97121,8 +97163,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::FileOptions &", + "name" : "google::protobuf::FileOptions &", +- "referenced_type" : "type-1712", +- "self_type" : "type-2245", ++ "referenced_type" : "type-1626", ++ "self_type" : "type-2174", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -97130,8 +97172,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::FloatValue &", + "name" : "google::protobuf::FloatValue &", +- "referenced_type" : "type-11049", +- "self_type" : "type-11152", ++ "referenced_type" : "type-11001", ++ "self_type" : "type-11104", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, +@@ -97139,8 +97181,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::GeneratedCodeInfo &", + "name" : "google::protobuf::GeneratedCodeInfo &", +- "referenced_type" : "type-2261", +- "self_type" : "type-2262", ++ "referenced_type" : "type-2190", ++ "self_type" : "type-2191", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -97148,8 +97190,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::GeneratedCodeInfo_Annotation &", + "name" : "google::protobuf::GeneratedCodeInfo_Annotation &", +- "referenced_type" : "type-1735", +- "self_type" : "type-2260", ++ "referenced_type" : "type-1648", ++ "self_type" : "type-2189", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -97157,8 +97199,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Int32Value &", + "name" : "google::protobuf::Int32Value &", +- "referenced_type" : "type-11052", +- "self_type" : "type-11158", ++ "referenced_type" : "type-11004", ++ "self_type" : "type-11110", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, +@@ -97166,8 +97208,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Int64Value &", + "name" : "google::protobuf::Int64Value &", +- "referenced_type" : "type-11050", +- "self_type" : "type-11154", ++ "referenced_type" : "type-11002", ++ "self_type" : "type-11106", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, +@@ -97175,8 +97217,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ListValue &", + "name" : "google::protobuf::ListValue &", +- "referenced_type" : "type-7234", +- "self_type" : "type-7336", ++ "referenced_type" : "type-7186", ++ "self_type" : "type-7288", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/struct.pb.h" + }, +@@ -97184,8 +97226,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap::iterator_base::KeyValuePair> &", + "name" : "google::protobuf::Map::InnerMap::iterator_base::KeyValuePair> &", +- "referenced_type" : "type-6657", +- "self_type" : "type-6667", ++ "referenced_type" : "type-6609", ++ "self_type" : "type-6619", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -97193,8 +97235,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap::iterator_base::KeyValuePair> &", + "name" : "google::protobuf::Map::InnerMap::iterator_base::KeyValuePair> &", +- "referenced_type" : "type-6651", +- "self_type" : "type-6664", ++ "referenced_type" : "type-6603", ++ "self_type" : "type-6616", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -97202,8 +97244,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::KeyValuePair &", + "name" : "google::protobuf::Map::KeyValuePair &", +- "referenced_type" : "type-6515", +- "self_type" : "type-6660", ++ "referenced_type" : "type-6467", ++ "self_type" : "type-6612", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -97211,8 +97253,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::const_iterator &", + "name" : "google::protobuf::Map::const_iterator &", +- "referenced_type" : "type-6674", +- "self_type" : "type-6687", ++ "referenced_type" : "type-6626", ++ "self_type" : "type-6639", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -97220,8 +97262,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::iterator &", + "name" : "google::protobuf::Map::iterator &", +- "referenced_type" : "type-6688", +- "self_type" : "type-6698", ++ "referenced_type" : "type-6640", ++ "self_type" : "type-6650", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -97229,8 +97271,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map, Value>::InnerMap::iterator_base, Value>::KeyValuePair> &", + "name" : "google::protobuf::Map, Value>::InnerMap::iterator_base, Value>::KeyValuePair> &", +- "referenced_type" : "type-7502", +- "self_type" : "type-7512", ++ "referenced_type" : "type-7454", ++ "self_type" : "type-7464", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -97238,8 +97280,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map, Value>::InnerMap::iterator_base, Value>::KeyValuePair> &", + "name" : "google::protobuf::Map, Value>::InnerMap::iterator_base, Value>::KeyValuePair> &", +- "referenced_type" : "type-7493", +- "self_type" : "type-7509", ++ "referenced_type" : "type-7445", ++ "self_type" : "type-7461", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -97247,8 +97289,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map, Value>::KeyValuePair &", + "name" : "google::protobuf::Map, Value>::KeyValuePair &", +- "referenced_type" : "type-7209", +- "self_type" : "type-7505", ++ "referenced_type" : "type-7161", ++ "self_type" : "type-7457", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -97256,8 +97298,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map, Value>::const_iterator &", + "name" : "google::protobuf::Map, Value>::const_iterator &", +- "referenced_type" : "type-7519", +- "self_type" : "type-7532", ++ "referenced_type" : "type-7471", ++ "self_type" : "type-7484", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -97265,8 +97307,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map, Value>::iterator &", + "name" : "google::protobuf::Map, Value>::iterator &", +- "referenced_type" : "type-7533", +- "self_type" : "type-7544", ++ "referenced_type" : "type-7485", ++ "self_type" : "type-7496", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -97274,8 +97316,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapIterator &", + "name" : "google::protobuf::MapIterator &", +- "referenced_type" : "type-4284", +- "self_type" : "type-4289", ++ "referenced_type" : "type-4236", ++ "self_type" : "type-4241", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, +@@ -97283,8 +97325,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapKey &", + "name" : "google::protobuf::MapKey &", +- "referenced_type" : "type-4256", +- "self_type" : "type-6645", ++ "referenced_type" : "type-4208", ++ "self_type" : "type-6597", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -97292,8 +97334,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapPair &", + "name" : "google::protobuf::MapPair &", +- "referenced_type" : "type-6507", +- "self_type" : "type-6695", ++ "referenced_type" : "type-6459", ++ "self_type" : "type-6647", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -97301,8 +97343,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapPair *&", + "name" : "google::protobuf::MapPair *&", +- "referenced_type" : "type-6506", +- "self_type" : "type-6647", ++ "referenced_type" : "type-6458", ++ "self_type" : "type-6599", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -97310,8 +97352,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapPair, std::allocator >, google::protobuf::Value> &", + "name" : "google::protobuf::MapPair, std::allocator >, google::protobuf::Value> &", +- "referenced_type" : "type-7212", +- "self_type" : "type-7540", ++ "referenced_type" : "type-7164", ++ "self_type" : "type-7492", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -97319,8 +97361,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *&", + "name" : "google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *&", +- "referenced_type" : "type-7211", +- "self_type" : "type-7488", ++ "referenced_type" : "type-7163", ++ "self_type" : "type-7440", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -97328,8 +97370,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef &", + "name" : "google::protobuf::MapValueRef &", +- "referenced_type" : "type-4244", +- "self_type" : "type-6702", ++ "referenced_type" : "type-4196", ++ "self_type" : "type-6654", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -97337,8 +97379,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message &", + "name" : "google::protobuf::Message &", +- "referenced_type" : "type-1686", +- "self_type" : "type-6755", ++ "referenced_type" : "type-1600", ++ "self_type" : "type-6707", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -97346,8 +97388,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *const &", + "name" : "google::protobuf::Message *const &", +- "referenced_type" : "type-4478", +- "self_type" : "type-4479", ++ "referenced_type" : "type-4430", ++ "self_type" : "type-4431", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -97355,8 +97397,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageOptions &", + "name" : "google::protobuf::MessageOptions &", +- "referenced_type" : "type-1700", +- "self_type" : "type-2247", ++ "referenced_type" : "type-1614", ++ "self_type" : "type-2176", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -97364,8 +97406,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Method &", + "name" : "google::protobuf::Method &", +- "referenced_type" : "type-2284", +- "self_type" : "type-2283", ++ "referenced_type" : "type-2213", ++ "self_type" : "type-2212", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/api.pb.h" + }, +@@ -97373,8 +97415,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MethodDescriptorProto &", + "name" : "google::protobuf::MethodDescriptorProto &", +- "referenced_type" : "type-1706", +- "self_type" : "type-2244", ++ "referenced_type" : "type-1620", ++ "self_type" : "type-2173", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -97382,8 +97424,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MethodOptions &", + "name" : "google::protobuf::MethodOptions &", +- "referenced_type" : "type-1708", +- "self_type" : "type-2252", ++ "referenced_type" : "type-1622", ++ "self_type" : "type-2181", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -97391,8 +97433,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Mixin &", + "name" : "google::protobuf::Mixin &", +- "referenced_type" : "type-2288", +- "self_type" : "type-2287", ++ "referenced_type" : "type-2217", ++ "self_type" : "type-2216", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/api.pb.h" + }, +@@ -97400,8 +97442,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::OneofDescriptorProto &", + "name" : "google::protobuf::OneofDescriptorProto &", +- "referenced_type" : "type-1698", +- "self_type" : "type-2236", ++ "referenced_type" : "type-1612", ++ "self_type" : "type-2166", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -97409,8 +97451,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Option &", + "name" : "google::protobuf::Option &", +- "referenced_type" : "type-2286", +- "self_type" : "type-2503", ++ "referenced_type" : "type-2215", ++ "self_type" : "type-2433", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, +@@ -97418,8 +97460,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ServiceDescriptorProto &", + "name" : "google::protobuf::ServiceDescriptorProto &", +- "referenced_type" : "type-1704", +- "self_type" : "type-2241", ++ "referenced_type" : "type-1618", ++ "self_type" : "type-2170", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -97427,8 +97469,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ServiceOptions &", + "name" : "google::protobuf::ServiceOptions &", +- "referenced_type" : "type-1710", +- "self_type" : "type-2251", ++ "referenced_type" : "type-1624", ++ "self_type" : "type-2180", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -97436,8 +97478,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::SourceCodeInfo &", + "name" : "google::protobuf::SourceCodeInfo &", +- "referenced_type" : "type-1714", +- "self_type" : "type-2258", ++ "referenced_type" : "type-1628", ++ "self_type" : "type-2187", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -97445,8 +97487,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::SourceCodeInfo_Location &", + "name" : "google::protobuf::SourceCodeInfo_Location &", +- "referenced_type" : "type-1716", +- "self_type" : "type-2257", ++ "referenced_type" : "type-1630", ++ "self_type" : "type-2186", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -97454,8 +97496,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::SourceContext &", + "name" : "google::protobuf::SourceContext &", +- "referenced_type" : "type-2345", +- "self_type" : "type-2473", ++ "referenced_type" : "type-2272", ++ "self_type" : "type-2403", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/source_context.pb.h" + }, +@@ -97463,8 +97505,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::StringValue &", + "name" : "google::protobuf::StringValue &", +- "referenced_type" : "type-11055", +- "self_type" : "type-11164", ++ "referenced_type" : "type-11007", ++ "self_type" : "type-11116", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, +@@ -97472,8 +97514,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Struct &", + "name" : "google::protobuf::Struct &", +- "referenced_type" : "type-7218", +- "self_type" : "type-7333", ++ "referenced_type" : "type-7170", ++ "self_type" : "type-7285", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/struct.pb.h" + }, +@@ -97481,8 +97523,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::TextFormat::Printer::TextGenerator &", + "name" : "google::protobuf::TextFormat::Printer::TextGenerator &", +- "referenced_type" : "type-10602", +- "self_type" : "type-10601", ++ "referenced_type" : "type-10554", ++ "self_type" : "type-10553", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, +@@ -97490,8 +97532,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::TextFormat::Printer::TextGenerator &", + "name" : "google::protobuf::TextFormat::Printer::TextGenerator &", +- "referenced_type" : "type-13893", +- "self_type" : "type-13892", ++ "referenced_type" : "type-13845", ++ "self_type" : "type-13844", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, +@@ -97499,8 +97541,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::TextFormat::Printer::TextGenerator &", + "name" : "google::protobuf::TextFormat::Printer::TextGenerator &", +- "referenced_type" : "type-17757", +- "self_type" : "type-17756", ++ "referenced_type" : "type-17709", ++ "self_type" : "type-17708", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, +@@ -97508,8 +97550,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::TextFormat::Printer::TextGenerator &", + "name" : "google::protobuf::TextFormat::Printer::TextGenerator &", +- "referenced_type" : "type-22286", +- "self_type" : "type-22285", ++ "referenced_type" : "type-22258", ++ "self_type" : "type-22257", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, +@@ -97517,8 +97559,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::TextFormat::Printer::TextGenerator &", + "name" : "google::protobuf::TextFormat::Printer::TextGenerator &", +- "referenced_type" : "type-27471", +- "self_type" : "type-27470", ++ "referenced_type" : "type-27470", ++ "self_type" : "type-27469", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, +@@ -97526,8 +97568,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::TextFormat::Printer::TextGenerator &", + "name" : "google::protobuf::TextFormat::Printer::TextGenerator &", +- "referenced_type" : "type-7687", +- "self_type" : "type-7686", ++ "referenced_type" : "type-7639", ++ "self_type" : "type-7638", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, +@@ -97535,8 +97577,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Timestamp &", + "name" : "google::protobuf::Timestamp &", +- "referenced_type" : "type-7806", +- "self_type" : "type-7866", ++ "referenced_type" : "type-7758", ++ "self_type" : "type-7818", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/timestamp.pb.h" + }, +@@ -97544,8 +97586,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Type &", + "name" : "google::protobuf::Type &", +- "referenced_type" : "type-2487", +- "self_type" : "type-2488", ++ "referenced_type" : "type-2417", ++ "self_type" : "type-2418", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, +@@ -97553,8 +97595,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::UInt32Value &", + "name" : "google::protobuf::UInt32Value &", +- "referenced_type" : "type-11053", +- "self_type" : "type-11160", ++ "referenced_type" : "type-11005", ++ "self_type" : "type-11112", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, +@@ -97562,8 +97604,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::UInt64Value &", + "name" : "google::protobuf::UInt64Value &", +- "referenced_type" : "type-11051", +- "self_type" : "type-11156", ++ "referenced_type" : "type-11003", ++ "self_type" : "type-11108", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h" + }, +@@ -97571,8 +97613,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::UninterpretedOption &", + "name" : "google::protobuf::UninterpretedOption &", +- "referenced_type" : "type-1683", +- "self_type" : "type-2255", ++ "referenced_type" : "type-1597", ++ "self_type" : "type-2184", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -97580,8 +97622,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::UninterpretedOption *const &", + "name" : "google::protobuf::UninterpretedOption *const &", +- "referenced_type" : "type-11446", +- "self_type" : "type-11447", ++ "referenced_type" : "type-11398", ++ "self_type" : "type-11399", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -97589,8 +97631,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::UninterpretedOption_NamePart &", + "name" : "google::protobuf::UninterpretedOption_NamePart &", +- "referenced_type" : "type-1685", +- "self_type" : "type-2254", ++ "referenced_type" : "type-1599", ++ "self_type" : "type-2183", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -97598,8 +97640,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::UnknownFieldSet &", + "name" : "google::protobuf::UnknownFieldSet &", +- "referenced_type" : "type-1739", +- "self_type" : "type-3742", ++ "referenced_type" : "type-1652", ++ "self_type" : "type-3694", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -97607,8 +97649,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Value &", + "name" : "google::protobuf::Value &", +- "referenced_type" : "type-7215", +- "self_type" : "type-7547", ++ "referenced_type" : "type-7167", ++ "self_type" : "type-7499", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -97616,8 +97658,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map &), google::protobuf::hash, google::protobuf::streq, std::allocator &)> > > &", + "name" : "google::protobuf::hash_map &), google::protobuf::hash, google::protobuf::streq, std::allocator &)> > > &", +- "referenced_type" : "type-6865", +- "self_type" : "type-6864", ++ "referenced_type" : "type-6817", ++ "self_type" : "type-6816", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -97625,8 +97667,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map, std::equal_to, std::allocator > > &", + "name" : "google::protobuf::hash_map, std::equal_to, std::allocator > > &", +- "referenced_type" : "type-6859", +- "self_type" : "type-6858", ++ "referenced_type" : "type-6811", ++ "self_type" : "type-6810", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -97634,8 +97676,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > > &", + "name" : "google::protobuf::hash_map, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > > &", +- "referenced_type" : "type-19525", +- "self_type" : "type-19702", ++ "referenced_type" : "type-19477", ++ "self_type" : "type-19654", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -97643,8 +97685,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > > &", + "name" : "google::protobuf::hash_map, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > > &", +- "referenced_type" : "type-19365", +- "self_type" : "type-19364", ++ "referenced_type" : "type-19317", ++ "self_type" : "type-19316", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -97652,8 +97694,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, const google::protobuf::SourceCodeInfo_Location *, google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> > > &", + "name" : "google::protobuf::hash_map, std::allocator >, const google::protobuf::SourceCodeInfo_Location *, google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> > > &", +- "referenced_type" : "type-3651", +- "self_type" : "type-3650", ++ "referenced_type" : "type-3603", ++ "self_type" : "type-3602", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -97671,7 +97713,7 @@ + "linker_set_key" : "google::protobuf::internal::ArenaStringPtr &", + "name" : "google::protobuf::internal::ArenaStringPtr &", + "referenced_type" : "type-1042", +- "self_type" : "type-7305", ++ "self_type" : "type-7257", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map_type_handler.h" + }, +@@ -97688,8 +97730,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> &", + "name" : "google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> &", +- "referenced_type" : "type-7222", +- "self_type" : "type-7254", ++ "referenced_type" : "type-7174", ++ "self_type" : "type-7206", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -97697,8 +97739,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *const &", + "name" : "google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *const &", +- "referenced_type" : "type-7587", +- "self_type" : "type-7588", ++ "referenced_type" : "type-7539", ++ "self_type" : "type-7540", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -97706,8 +97748,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapEntryLite, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> &", + "name" : "google::protobuf::internal::MapEntryLite, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> &", +- "referenced_type" : "type-7224", +- "self_type" : "type-7375", ++ "referenced_type" : "type-7176", ++ "self_type" : "type-7327", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -97715,8 +97757,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapField, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *const &", + "name" : "google::protobuf::internal::MapField, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *const &", +- "referenced_type" : "type-7599", +- "self_type" : "type-7602", ++ "referenced_type" : "type-7551", ++ "self_type" : "type-7554", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -97724,8 +97766,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::RepeatedPtrIterator, std::allocator > > &", + "name" : "google::protobuf::internal::RepeatedPtrIterator, std::allocator > > &", +- "referenced_type" : "type-3782", +- "self_type" : "type-3815", ++ "referenced_type" : "type-3734", ++ "self_type" : "type-3767", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -97733,8 +97775,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::RepeatedPtrIterator &", + "name" : "google::protobuf::internal::RepeatedPtrIterator &", +- "referenced_type" : "type-6749", +- "self_type" : "type-6758", ++ "referenced_type" : "type-6701", ++ "self_type" : "type-6710", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -97742,8 +97784,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::RepeatedPtrIterator, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> > &", + "name" : "google::protobuf::internal::RepeatedPtrIterator, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> > &", +- "referenced_type" : "type-7251", +- "self_type" : "type-7257", ++ "referenced_type" : "type-7203", ++ "self_type" : "type-7209", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -97751,8 +97793,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::RepeatedPtrOverPtrsIterator &", + "name" : "google::protobuf::internal::RepeatedPtrOverPtrsIterator &", +- "referenced_type" : "type-7665", +- "self_type" : "type-7697", ++ "referenced_type" : "type-7617", ++ "self_type" : "type-7649", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -97778,8 +97820,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::StatusOr &", + "name" : "google::protobuf::util::StatusOr &", +- "referenced_type" : "type-20003", +- "self_type" : "type-20005", ++ "referenced_type" : "type-19955", ++ "self_type" : "type-19957", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -97787,8 +97829,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::StatusOr &", + "name" : "google::protobuf::util::StatusOr &", +- "referenced_type" : "type-15325", +- "self_type" : "type-20002", ++ "referenced_type" : "type-15277", ++ "self_type" : "type-19954", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -97796,8 +97838,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::DataPiece &", + "name" : "google::protobuf::util::converter::DataPiece &", +- "referenced_type" : "type-15044", +- "self_type" : "type-15050", ++ "referenced_type" : "type-14996", ++ "self_type" : "type-15002", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, +@@ -97805,8 +97847,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::JsonObjectWriter::Element *const &", + "name" : "google::protobuf::util::converter::JsonObjectWriter::Element *const &", +- "referenced_type" : "type-19184", +- "self_type" : "type-19190", ++ "referenced_type" : "type-19136", ++ "self_type" : "type-19142", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -97814,8 +97856,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::LocationTrackerInterface &", + "name" : "google::protobuf::util::converter::LocationTrackerInterface &", +- "referenced_type" : "type-15385", +- "self_type" : "type-19602", ++ "referenced_type" : "type-15337", ++ "self_type" : "type-19554", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -97823,8 +97865,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Item *const &", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Item *const &", +- "referenced_type" : "type-19618", +- "self_type" : "type-19620", ++ "referenced_type" : "type-19570", ++ "self_type" : "type-19572", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -97832,8 +97874,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoWriter::ProtoElement &", + "name" : "google::protobuf::util::converter::ProtoWriter::ProtoElement &", +- "referenced_type" : "type-19509", +- "self_type" : "type-19591", ++ "referenced_type" : "type-19461", ++ "self_type" : "type-19543", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -97841,8 +97883,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoWriter::ProtoElement *const &", + "name" : "google::protobuf::util::converter::ProtoWriter::ProtoElement *const &", +- "referenced_type" : "type-19787", +- "self_type" : "type-19788", ++ "referenced_type" : "type-19739", ++ "self_type" : "type-19740", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -97850,8 +97892,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::StructuredObjectWriter::BaseElement *const &", + "name" : "google::protobuf::util::converter::StructuredObjectWriter::BaseElement *const &", +- "referenced_type" : "type-19616", +- "self_type" : "type-19617", ++ "referenced_type" : "type-19568", ++ "self_type" : "type-19569", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -97860,7 +97902,7 @@ + "linker_set_key" : "int &", + "name" : "int &", + "referenced_type" : "type-1", +- "self_type" : "type-4339", ++ "self_type" : "type-4291", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -97877,8 +97919,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-12035", +- "self_type" : "type-12034", ++ "referenced_type" : "type-11987", ++ "self_type" : "type-11986", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/int128.h" + }, +@@ -97886,8 +97928,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-12294", +- "self_type" : "type-12293", ++ "referenced_type" : "type-12246", ++ "self_type" : "type-12245", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/status.h" + }, +@@ -97895,8 +97937,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-12481", +- "self_type" : "type-12480", ++ "referenced_type" : "type-12433", ++ "self_type" : "type-12432", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" + }, +@@ -97913,8 +97955,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-15891", +- "self_type" : "type-15890", ++ "referenced_type" : "type-15843", ++ "self_type" : "type-15842", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/int128.h" + }, +@@ -97922,8 +97964,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-16149", +- "self_type" : "type-16148", ++ "referenced_type" : "type-16101", ++ "self_type" : "type-16100", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/status.h" + }, +@@ -97931,8 +97973,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-16338", +- "self_type" : "type-16337", ++ "referenced_type" : "type-16290", ++ "self_type" : "type-16289", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" + }, +@@ -97958,8 +98000,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-20425", +- "self_type" : "type-20424", ++ "referenced_type" : "type-20377", ++ "self_type" : "type-20376", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/int128.h" + }, +@@ -97967,8 +98009,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-20680", +- "self_type" : "type-20679", ++ "referenced_type" : "type-20632", ++ "self_type" : "type-20631", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/status.h" + }, +@@ -97976,8 +98018,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-20869", +- "self_type" : "type-20868", ++ "referenced_type" : "type-20821", ++ "self_type" : "type-20820", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" + }, +@@ -97985,8 +98027,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-2294", +- "self_type" : "type-2293", ++ "referenced_type" : "type-2328", ++ "self_type" : "type-2327", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/int128.h" + }, +@@ -97994,8 +98036,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-25170", +- "self_type" : "type-25169", ++ "referenced_type" : "type-25148", ++ "self_type" : "type-25147", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, +@@ -98003,44 +98045,44 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-25601", +- "self_type" : "type-25600", ++ "referenced_type" : "type-2522", ++ "self_type" : "type-2521", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/int128.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/status.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-25859", +- "self_type" : "type-25858", ++ "referenced_type" : "type-2536", ++ "self_type" : "type-2535", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/status.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-2586", +- "self_type" : "type-2585", ++ "referenced_type" : "type-25616", ++ "self_type" : "type-25615", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/status.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/int128.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-26047", +- "self_type" : "type-26046", ++ "referenced_type" : "type-25812", ++ "self_type" : "type-25811", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/status.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-2622", +- "self_type" : "type-2621", ++ "referenced_type" : "type-26293", ++ "self_type" : "type-26292", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/int128.h" + }, +@@ -98048,8 +98090,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-2640", +- "self_type" : "type-2639", ++ "referenced_type" : "type-26434", ++ "self_type" : "type-26433", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/status.h" + }, +@@ -98057,8 +98099,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-2658", +- "self_type" : "type-2657", ++ "referenced_type" : "type-26545", ++ "self_type" : "type-26544", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" + }, +@@ -98066,8 +98108,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-30314", +- "self_type" : "type-30313", ++ "referenced_type" : "type-30313", ++ "self_type" : "type-30312", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, +@@ -98075,8 +98117,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-30747", +- "self_type" : "type-30746", ++ "referenced_type" : "type-30746", ++ "self_type" : "type-30745", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/int128.h" + }, +@@ -98084,8 +98126,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-31005", +- "self_type" : "type-31004", ++ "referenced_type" : "type-31004", ++ "self_type" : "type-31003", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/status.h" + }, +@@ -98093,8 +98135,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-31194", +- "self_type" : "type-31193", ++ "referenced_type" : "type-31193", ++ "self_type" : "type-31192", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" + }, +@@ -98102,8 +98144,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3458", +- "self_type" : "type-3457", ++ "referenced_type" : "type-3410", ++ "self_type" : "type-3409", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/int128.h" + }, +@@ -98111,8 +98153,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3772", +- "self_type" : "type-3771", ++ "referenced_type" : "type-3724", ++ "self_type" : "type-3723", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/status.h" + }, +@@ -98120,8 +98162,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-3984", +- "self_type" : "type-3983", ++ "referenced_type" : "type-3936", ++ "self_type" : "type-3935", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" + }, +@@ -98129,8 +98171,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-5438", +- "self_type" : "type-5437", ++ "referenced_type" : "type-5390", ++ "self_type" : "type-5389", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/int128.h" + }, +@@ -98138,8 +98180,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-5703", +- "self_type" : "type-5702", ++ "referenced_type" : "type-5655", ++ "self_type" : "type-5654", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/status.h" + }, +@@ -98147,8 +98189,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-5892", +- "self_type" : "type-5891", ++ "referenced_type" : "type-5844", ++ "self_type" : "type-5843", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" + }, +@@ -98156,8 +98198,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-8703", +- "self_type" : "type-8702", ++ "referenced_type" : "type-8655", ++ "self_type" : "type-8654", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/int128.h" + }, +@@ -98165,8 +98207,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-8960", +- "self_type" : "type-8959", ++ "referenced_type" : "type-8912", ++ "self_type" : "type-8911", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/status.h" + }, +@@ -98174,8 +98216,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > &", + "name" : "std::basic_ostream > &", +- "referenced_type" : "type-9149", +- "self_type" : "type-9148", ++ "referenced_type" : "type-9101", ++ "self_type" : "type-9100", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" + }, +@@ -98210,8 +98252,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &", + "name" : "std::basic_string, std::allocator > &", +- "referenced_type" : "type-10431", +- "self_type" : "type-10430", ++ "referenced_type" : "type-10383", ++ "self_type" : "type-10382", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -98219,8 +98261,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &", + "name" : "std::basic_string, std::allocator > &", +- "referenced_type" : "type-13722", +- "self_type" : "type-13721", ++ "referenced_type" : "type-13674", ++ "self_type" : "type-13673", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -98228,8 +98270,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &", + "name" : "std::basic_string, std::allocator > &", +- "referenced_type" : "type-15089", +- "self_type" : "type-15088", ++ "referenced_type" : "type-15041", ++ "self_type" : "type-15040", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -98237,8 +98279,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &", + "name" : "std::basic_string, std::allocator > &", +- "referenced_type" : "type-17586", +- "self_type" : "type-17585", ++ "referenced_type" : "type-17538", ++ "self_type" : "type-17537", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -98246,8 +98288,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &", + "name" : "std::basic_string, std::allocator > &", +- "referenced_type" : "type-18873", +- "self_type" : "type-18872", ++ "referenced_type" : "type-18825", ++ "self_type" : "type-18824", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -98255,8 +98297,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &", + "name" : "std::basic_string, std::allocator > &", +- "referenced_type" : "type-19379", +- "self_type" : "type-19378", ++ "referenced_type" : "type-19331", ++ "self_type" : "type-19330", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/status_macros.h" + }, +@@ -98264,8 +98306,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &", + "name" : "std::basic_string, std::allocator > &", +- "referenced_type" : "type-22115", +- "self_type" : "type-22114", ++ "referenced_type" : "type-22116", ++ "self_type" : "type-22115", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -98273,8 +98315,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &", + "name" : "std::basic_string, std::allocator > &", +- "referenced_type" : "type-23402", +- "self_type" : "type-23401", ++ "referenced_type" : "type-23385", ++ "self_type" : "type-23384", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -98282,8 +98324,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &", + "name" : "std::basic_string, std::allocator > &", +- "referenced_type" : "type-23879", +- "self_type" : "type-23878", ++ "referenced_type" : "type-23881", ++ "self_type" : "type-23880", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/status_macros.h" + }, +@@ -98291,8 +98333,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &", + "name" : "std::basic_string, std::allocator > &", +- "referenced_type" : "type-27300", +- "self_type" : "type-27299", ++ "referenced_type" : "type-27299", ++ "self_type" : "type-27298", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -98300,8 +98342,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &", + "name" : "std::basic_string, std::allocator > &", +- "referenced_type" : "type-28587", +- "self_type" : "type-28586", ++ "referenced_type" : "type-28586", ++ "self_type" : "type-28585", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -98309,8 +98351,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &", + "name" : "std::basic_string, std::allocator > &", +- "referenced_type" : "type-29064", +- "self_type" : "type-29063", ++ "referenced_type" : "type-29063", ++ "self_type" : "type-29062", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/status_macros.h" + }, +@@ -98318,8 +98360,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > &", + "name" : "std::basic_string, std::allocator > &", +- "referenced_type" : "type-7486", +- "self_type" : "type-7485", ++ "referenced_type" : "type-7438", ++ "self_type" : "type-7437", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -98327,8 +98369,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *const &", + "name" : "std::basic_string, std::allocator > *const &", +- "referenced_type" : "type-12322", +- "self_type" : "type-12323", ++ "referenced_type" : "type-12274", ++ "self_type" : "type-12275", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -98336,8 +98378,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *const &", + "name" : "std::basic_string, std::allocator > *const &", +- "referenced_type" : "type-14898", +- "self_type" : "type-14899", ++ "referenced_type" : "type-14850", ++ "self_type" : "type-14851", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -98345,8 +98387,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *const &", + "name" : "std::basic_string, std::allocator > *const &", +- "referenced_type" : "type-16177", +- "self_type" : "type-16178", ++ "referenced_type" : "type-16129", ++ "self_type" : "type-16130", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -98354,8 +98396,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *const &", + "name" : "std::basic_string, std::allocator > *const &", +- "referenced_type" : "type-18755", +- "self_type" : "type-18756", ++ "referenced_type" : "type-18707", ++ "self_type" : "type-18708", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -98363,8 +98405,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *const &", + "name" : "std::basic_string, std::allocator > *const &", +- "referenced_type" : "type-20708", +- "self_type" : "type-20709", ++ "referenced_type" : "type-20660", ++ "self_type" : "type-20661", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -98372,8 +98414,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *const &", + "name" : "std::basic_string, std::allocator > *const &", +- "referenced_type" : "type-23284", +- "self_type" : "type-23285", ++ "referenced_type" : "type-23279", ++ "self_type" : "type-23280", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -98381,8 +98423,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *const &", + "name" : "std::basic_string, std::allocator > *const &", +- "referenced_type" : "type-25887", +- "self_type" : "type-25888", ++ "referenced_type" : "type-25938", ++ "self_type" : "type-25939", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -98390,8 +98432,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *const &", + "name" : "std::basic_string, std::allocator > *const &", +- "referenced_type" : "type-28469", +- "self_type" : "type-28470", ++ "referenced_type" : "type-28468", ++ "self_type" : "type-28469", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -98399,8 +98441,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *const &", + "name" : "std::basic_string, std::allocator > *const &", +- "referenced_type" : "type-31033", +- "self_type" : "type-31034", ++ "referenced_type" : "type-31032", ++ "self_type" : "type-31033", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -98408,8 +98450,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *const &", + "name" : "std::basic_string, std::allocator > *const &", +- "referenced_type" : "type-3802", +- "self_type" : "type-3803", ++ "referenced_type" : "type-3754", ++ "self_type" : "type-3755", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -98417,8 +98459,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *const &", + "name" : "std::basic_string, std::allocator > *const &", +- "referenced_type" : "type-5731", +- "self_type" : "type-5732", ++ "referenced_type" : "type-5683", ++ "self_type" : "type-5684", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -98426,8 +98468,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *const &", + "name" : "std::basic_string, std::allocator > *const &", +- "referenced_type" : "type-8988", +- "self_type" : "type-8989", ++ "referenced_type" : "type-8940", ++ "self_type" : "type-8941", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -98435,8 +98477,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > &", + "name" : "std::map, std::allocator > > &", +- "referenced_type" : "type-14808", +- "self_type" : "type-14807", ++ "referenced_type" : "type-14760", ++ "self_type" : "type-14759", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -98444,8 +98486,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > &", + "name" : "std::map, std::allocator > > &", +- "referenced_type" : "type-18672", +- "self_type" : "type-18671", ++ "referenced_type" : "type-18624", ++ "self_type" : "type-18623", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -98453,8 +98495,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > &", + "name" : "std::map, std::allocator > > &", +- "referenced_type" : "type-23201", +- "self_type" : "type-23200", ++ "referenced_type" : "type-23187", ++ "self_type" : "type-23186", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -98462,8 +98504,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > &", + "name" : "std::map, std::allocator > > &", +- "referenced_type" : "type-28386", +- "self_type" : "type-28385", ++ "referenced_type" : "type-28385", ++ "self_type" : "type-28384", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -98471,8 +98513,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > &", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > &", +- "referenced_type" : "type-12210", +- "self_type" : "type-12209", ++ "referenced_type" : "type-12162", ++ "self_type" : "type-12161", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -98480,8 +98522,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > &", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > &", +- "referenced_type" : "type-16065", +- "self_type" : "type-16064", ++ "referenced_type" : "type-16017", ++ "self_type" : "type-16016", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -98489,8 +98531,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > &", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > &", +- "referenced_type" : "type-20597", +- "self_type" : "type-20596", ++ "referenced_type" : "type-20549", ++ "self_type" : "type-20548", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -98498,8 +98540,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > &", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > &", +- "referenced_type" : "type-25776", +- "self_type" : "type-25775", ++ "referenced_type" : "type-25828", ++ "self_type" : "type-25827", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -98507,8 +98549,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > &", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > &", +- "referenced_type" : "type-30922", +- "self_type" : "type-30921", ++ "referenced_type" : "type-30921", ++ "self_type" : "type-30920", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -98516,8 +98558,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > &", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > &", +- "referenced_type" : "type-3644", +- "self_type" : "type-3643", ++ "referenced_type" : "type-3596", ++ "self_type" : "type-3595", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -98525,8 +98567,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > &", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > &", +- "referenced_type" : "type-5618", +- "self_type" : "type-5617", ++ "referenced_type" : "type-5570", ++ "self_type" : "type-5569", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -98534,8 +98576,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > &", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > &", +- "referenced_type" : "type-8876", +- "self_type" : "type-8875", ++ "referenced_type" : "type-8828", ++ "self_type" : "type-8827", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -98544,7 +98586,7 @@ + "linker_set_key" : "unsigned int &", + "name" : "unsigned int &", + "referenced_type" : "type-4", +- "self_type" : "type-19377", ++ "self_type" : "type-19329", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/status_macros.h" + }, +@@ -98561,8 +98603,8 @@ + "alignment" : 4, + "linker_set_key" : "void (*const &)(const std::__1::basic_string &)", + "name" : "void (*const &)(const std::__1::basic_string &)", +- "referenced_type" : "type-6883", +- "self_type" : "type-6884", ++ "referenced_type" : "type-6835", ++ "self_type" : "type-6836", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + } +@@ -98582,8 +98624,8 @@ + "alignment" : 4, + "linker_set_key" : "bool (*)(google::protobuf::StringPiece, bool *)", + "name" : "bool (*)(google::protobuf::StringPiece, bool *)", +- "referenced_type" : "type-15069", +- "self_type" : "type-15071", ++ "referenced_type" : "type-15021", ++ "self_type" : "type-15023", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, +@@ -98591,8 +98633,8 @@ + "alignment" : 4, + "linker_set_key" : "bool (*)(google::protobuf::StringPiece, double *)", + "name" : "bool (*)(google::protobuf::StringPiece, double *)", +- "referenced_type" : "type-15063", +- "self_type" : "type-15065", ++ "referenced_type" : "type-15015", ++ "self_type" : "type-15017", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, +@@ -98600,8 +98642,8 @@ + "alignment" : 4, + "linker_set_key" : "bool (*)(google::protobuf::StringPiece, float *)", + "name" : "bool (*)(google::protobuf::StringPiece, float *)", +- "referenced_type" : "type-15066", +- "self_type" : "type-15068", ++ "referenced_type" : "type-15018", ++ "self_type" : "type-15020", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, +@@ -98609,8 +98651,8 @@ + "alignment" : 4, + "linker_set_key" : "bool (*)(google::protobuf::StringPiece, int *)", + "name" : "bool (*)(google::protobuf::StringPiece, int *)", +- "referenced_type" : "type-15052", +- "self_type" : "type-15054", ++ "referenced_type" : "type-15004", ++ "self_type" : "type-15006", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, +@@ -98618,8 +98660,8 @@ + "alignment" : 4, + "linker_set_key" : "bool (*)(google::protobuf::StringPiece, long long *)", + "name" : "bool (*)(google::protobuf::StringPiece, long long *)", +- "referenced_type" : "type-15057", +- "self_type" : "type-15059", ++ "referenced_type" : "type-15009", ++ "self_type" : "type-15011", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, +@@ -98627,8 +98669,8 @@ + "alignment" : 4, + "linker_set_key" : "bool (*)(google::protobuf::StringPiece, unsigned int *)", + "name" : "bool (*)(google::protobuf::StringPiece, unsigned int *)", +- "referenced_type" : "type-15055", +- "self_type" : "type-15056", ++ "referenced_type" : "type-15007", ++ "self_type" : "type-15008", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, +@@ -98636,8 +98678,8 @@ + "alignment" : 4, + "linker_set_key" : "bool (*)(google::protobuf::StringPiece, unsigned long long *)", + "name" : "bool (*)(google::protobuf::StringPiece, unsigned long long *)", +- "referenced_type" : "type-15060", +- "self_type" : "type-15062", ++ "referenced_type" : "type-15012", ++ "self_type" : "type-15014", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, +@@ -98717,8 +98759,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Any *", + "name" : "const google::protobuf::Any *", +- "referenced_type" : "type-2163", +- "self_type" : "type-2162", ++ "referenced_type" : "type-2094", ++ "self_type" : "type-2093", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -98726,8 +98768,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Api *", + "name" : "const google::protobuf::Api *", +- "referenced_type" : "type-2447", +- "self_type" : "type-2446", ++ "referenced_type" : "type-2377", ++ "self_type" : "type-2376", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -98753,8 +98795,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::BoolValue *", + "name" : "const google::protobuf::BoolValue *", +- "referenced_type" : "type-11123", +- "self_type" : "type-11122", ++ "referenced_type" : "type-11075", ++ "self_type" : "type-11074", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -98762,8 +98804,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::BytesValue *", + "name" : "const google::protobuf::BytesValue *", +- "referenced_type" : "type-11131", +- "self_type" : "type-11130", ++ "referenced_type" : "type-11083", ++ "self_type" : "type-11082", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -98771,8 +98813,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Descriptor *", + "name" : "const google::protobuf::Descriptor *", +- "referenced_type" : "type-1975", +- "self_type" : "type-1974", ++ "referenced_type" : "type-1901", ++ "self_type" : "type-1900", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -98780,8 +98822,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Descriptor **", + "name" : "const google::protobuf::Descriptor **", +- "referenced_type" : "type-1974", +- "self_type" : "type-4267", ++ "referenced_type" : "type-1900", ++ "self_type" : "type-4219", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, +@@ -98789,8 +98831,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Descriptor::ExtensionRange *", + "name" : "const google::protobuf::Descriptor::ExtensionRange *", +- "referenced_type" : "type-2028", +- "self_type" : "type-2027", ++ "referenced_type" : "type-1958", ++ "self_type" : "type-1957", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -98798,8 +98840,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Descriptor::ReservedRange *", + "name" : "const google::protobuf::Descriptor::ReservedRange *", +- "referenced_type" : "type-2030", +- "self_type" : "type-2029", ++ "referenced_type" : "type-1960", ++ "self_type" : "type-1959", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -98807,8 +98849,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-10801", +- "self_type" : "type-10800", ++ "referenced_type" : "type-10753", ++ "self_type" : "type-10752", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -98816,8 +98858,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-11272", +- "self_type" : "type-11274", ++ "referenced_type" : "type-11224", ++ "self_type" : "type-11226", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -98825,8 +98867,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-11564", +- "self_type" : "type-11566", ++ "referenced_type" : "type-11516", ++ "self_type" : "type-11518", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -98834,8 +98876,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-11588", +- "self_type" : "type-11590", ++ "referenced_type" : "type-11540", ++ "self_type" : "type-11542", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -98843,8 +98885,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-1408", +- "self_type" : "type-1407", ++ "referenced_type" : "type-1327", ++ "self_type" : "type-1326", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -98852,8 +98894,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-14092", +- "self_type" : "type-14091", ++ "referenced_type" : "type-1394", ++ "self_type" : "type-1396", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -98861,8 +98903,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-14523", +- "self_type" : "type-14525", ++ "referenced_type" : "type-14044", ++ "self_type" : "type-14043", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -98870,8 +98912,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-1480", +- "self_type" : "type-1482", ++ "referenced_type" : "type-14475", ++ "self_type" : "type-14477", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -98879,8 +98921,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-15423", +- "self_type" : "type-15425", ++ "referenced_type" : "type-1467", ++ "self_type" : "type-1469", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -98888,8 +98930,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-1544", +- "self_type" : "type-1548", ++ "referenced_type" : "type-1491", ++ "self_type" : "type-1493", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -98897,8 +98939,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-15447", +- "self_type" : "type-15449", ++ "referenced_type" : "type-15375", ++ "self_type" : "type-15377", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -98906,8 +98948,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-1571", +- "self_type" : "type-1573", ++ "referenced_type" : "type-15399", ++ "self_type" : "type-15401", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -98915,8 +98957,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-17956", +- "self_type" : "type-17955", ++ "referenced_type" : "type-17908", ++ "self_type" : "type-17907", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -98924,8 +98966,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-18387", +- "self_type" : "type-18389", ++ "referenced_type" : "type-18339", ++ "self_type" : "type-18341", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -98933,17 +98975,17 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-19213", +- "self_type" : "type-19219", ++ "referenced_type" : "type-1888", ++ "self_type" : "type-1887", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-19538", +- "self_type" : "type-19542", ++ "referenced_type" : "type-19165", ++ "self_type" : "type-19171", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -98951,17 +98993,17 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-1963", +- "self_type" : "type-1962", ++ "referenced_type" : "type-19490", ++ "self_type" : "type-19494", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-22485", +- "self_type" : "type-22484", ++ "referenced_type" : "type-23009", ++ "self_type" : "type-23008", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -98969,8 +99011,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-22916", +- "self_type" : "type-22918", ++ "referenced_type" : "type-23767", ++ "self_type" : "type-23772", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -98978,8 +99020,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-23734", +- "self_type" : "type-23740", ++ "referenced_type" : "type-24584", ++ "self_type" : "type-24588", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -98987,8 +99029,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-24008", +- "self_type" : "type-24012", ++ "referenced_type" : "type-24843", ++ "self_type" : "type-24848", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -98996,8 +99038,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-27670", +- "self_type" : "type-27669", ++ "referenced_type" : "type-27669", ++ "self_type" : "type-27668", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -99005,8 +99047,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-28101", +- "self_type" : "type-28103", ++ "referenced_type" : "type-2789", ++ "self_type" : "type-2788", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -99014,8 +99056,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-2837", +- "self_type" : "type-2836", ++ "referenced_type" : "type-28100", ++ "self_type" : "type-28102", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -99023,8 +99065,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-28919", +- "self_type" : "type-28925", ++ "referenced_type" : "type-2856", ++ "self_type" : "type-2858", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -99032,8 +99074,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-2904", +- "self_type" : "type-2906", ++ "referenced_type" : "type-28918", ++ "self_type" : "type-28924", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -99041,8 +99083,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-29193", +- "self_type" : "type-29197", ++ "referenced_type" : "type-29192", ++ "self_type" : "type-29196", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -99050,8 +99092,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-2977", +- "self_type" : "type-2979", ++ "referenced_type" : "type-2929", ++ "self_type" : "type-2931", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -99059,8 +99101,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-3001", +- "self_type" : "type-3003", ++ "referenced_type" : "type-2953", ++ "self_type" : "type-2955", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -99068,8 +99110,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-4817", +- "self_type" : "type-4816", ++ "referenced_type" : "type-4769", ++ "self_type" : "type-4768", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -99077,8 +99119,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-4884", +- "self_type" : "type-4886", ++ "referenced_type" : "type-4836", ++ "self_type" : "type-4838", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -99086,8 +99128,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-4957", +- "self_type" : "type-4959", ++ "referenced_type" : "type-4909", ++ "self_type" : "type-4911", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -99095,8 +99137,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-4981", +- "self_type" : "type-4983", ++ "referenced_type" : "type-4933", ++ "self_type" : "type-4935", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -99122,8 +99164,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-7898", +- "self_type" : "type-7897", ++ "referenced_type" : "type-7850", ++ "self_type" : "type-7849", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -99131,8 +99173,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-8160", +- "self_type" : "type-8162", ++ "referenced_type" : "type-8112", ++ "self_type" : "type-8114", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -99140,8 +99182,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-8233", +- "self_type" : "type-8235", ++ "referenced_type" : "type-8185", ++ "self_type" : "type-8187", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -99149,8 +99191,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorPool *", + "name" : "const google::protobuf::DescriptorPool *", +- "referenced_type" : "type-8257", +- "self_type" : "type-8259", ++ "referenced_type" : "type-8209", ++ "self_type" : "type-8211", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -99176,8 +99218,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorProto *", + "name" : "const google::protobuf::DescriptorProto *", +- "referenced_type" : "type-1879", +- "self_type" : "type-1880", ++ "referenced_type" : "type-1797", ++ "self_type" : "type-1798", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -99185,8 +99227,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorProto_ExtensionRange *", + "name" : "const google::protobuf::DescriptorProto_ExtensionRange *", +- "referenced_type" : "type-1895", +- "self_type" : "type-1896", ++ "referenced_type" : "type-1814", ++ "self_type" : "type-1815", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -99194,8 +99236,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DescriptorProto_ReservedRange *", + "name" : "const google::protobuf::DescriptorProto_ReservedRange *", +- "referenced_type" : "type-1903", +- "self_type" : "type-1904", ++ "referenced_type" : "type-1822", ++ "self_type" : "type-1823", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -99203,8 +99245,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DoubleValue *", + "name" : "const google::protobuf::DoubleValue *", +- "referenced_type" : "type-11098", +- "self_type" : "type-11097", ++ "referenced_type" : "type-11050", ++ "self_type" : "type-11049", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -99212,8 +99254,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Duration *", + "name" : "const google::protobuf::Duration *", +- "referenced_type" : "type-4216", +- "self_type" : "type-4215", ++ "referenced_type" : "type-4168", ++ "self_type" : "type-4167", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -99221,8 +99263,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DynamicMessage::TypeInfo *", + "name" : "const google::protobuf::DynamicMessage::TypeInfo *", +- "referenced_type" : "type-12735", +- "self_type" : "type-12734", ++ "referenced_type" : "type-12687", ++ "self_type" : "type-12686", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -99230,8 +99272,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DynamicMessage::TypeInfo *", + "name" : "const google::protobuf::DynamicMessage::TypeInfo *", +- "referenced_type" : "type-16591", +- "self_type" : "type-16590", ++ "referenced_type" : "type-16543", ++ "self_type" : "type-16542", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -99239,8 +99281,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DynamicMessage::TypeInfo *", + "name" : "const google::protobuf::DynamicMessage::TypeInfo *", +- "referenced_type" : "type-21123", +- "self_type" : "type-21122", ++ "referenced_type" : "type-21075", ++ "self_type" : "type-21074", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -99248,8 +99290,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DynamicMessage::TypeInfo *", + "name" : "const google::protobuf::DynamicMessage::TypeInfo *", +- "referenced_type" : "type-26301", +- "self_type" : "type-26300", ++ "referenced_type" : "type-26345", ++ "self_type" : "type-26344", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -99257,8 +99299,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DynamicMessage::TypeInfo *", + "name" : "const google::protobuf::DynamicMessage::TypeInfo *", +- "referenced_type" : "type-31448", +- "self_type" : "type-31447", ++ "referenced_type" : "type-31447", ++ "self_type" : "type-31446", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -99266,8 +99308,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DynamicMessage::TypeInfo *", + "name" : "const google::protobuf::DynamicMessage::TypeInfo *", +- "referenced_type" : "type-4317", +- "self_type" : "type-4316", ++ "referenced_type" : "type-4269", ++ "self_type" : "type-4268", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -99275,8 +99317,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DynamicMessage::TypeInfo *", + "name" : "const google::protobuf::DynamicMessage::TypeInfo *", +- "referenced_type" : "type-6146", +- "self_type" : "type-6145", ++ "referenced_type" : "type-6098", ++ "self_type" : "type-6097", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -99284,8 +99326,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::DynamicMessage::TypeInfo *", + "name" : "const google::protobuf::DynamicMessage::TypeInfo *", +- "referenced_type" : "type-9403", +- "self_type" : "type-9402", ++ "referenced_type" : "type-9355", ++ "self_type" : "type-9354", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -99293,8 +99335,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Empty *", + "name" : "const google::protobuf::Empty *", +- "referenced_type" : "type-4430", +- "self_type" : "type-4429", ++ "referenced_type" : "type-4382", ++ "self_type" : "type-4381", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -99302,8 +99344,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Enum *", + "name" : "const google::protobuf::Enum *", +- "referenced_type" : "type-2498", +- "self_type" : "type-2500", ++ "referenced_type" : "type-2428", ++ "self_type" : "type-2430", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, +@@ -99311,8 +99353,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumDescriptor *", + "name" : "const google::protobuf::EnumDescriptor *", +- "referenced_type" : "type-1981", +- "self_type" : "type-1980", ++ "referenced_type" : "type-1907", ++ "self_type" : "type-1906", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99320,8 +99362,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumDescriptorProto *", + "name" : "const google::protobuf::EnumDescriptorProto *", +- "referenced_type" : "type-1883", +- "self_type" : "type-1884", ++ "referenced_type" : "type-1801", ++ "self_type" : "type-1802", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -99329,8 +99371,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-12134", +- "self_type" : "type-12136", ++ "referenced_type" : "type-12086", ++ "self_type" : "type-12088", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99338,8 +99380,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-13202", +- "self_type" : "type-13204", ++ "referenced_type" : "type-13154", ++ "self_type" : "type-13156", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99347,8 +99389,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-14753", +- "self_type" : "type-14755", ++ "referenced_type" : "type-14705", ++ "self_type" : "type-14707", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99356,8 +99398,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-14844", +- "self_type" : "type-14846", ++ "referenced_type" : "type-14796", ++ "self_type" : "type-14798", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99365,8 +99407,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-15107", +- "self_type" : "type-15109", ++ "referenced_type" : "type-15059", ++ "self_type" : "type-15061", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99374,8 +99416,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-15206", +- "self_type" : "type-15208", ++ "referenced_type" : "type-15158", ++ "self_type" : "type-15160", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99383,8 +99425,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-15989", +- "self_type" : "type-15991", ++ "referenced_type" : "type-15941", ++ "self_type" : "type-15943", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99392,8 +99434,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-17058", +- "self_type" : "type-17060", ++ "referenced_type" : "type-17010", ++ "self_type" : "type-17012", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99401,8 +99443,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-18617", +- "self_type" : "type-18619", ++ "referenced_type" : "type-18569", ++ "self_type" : "type-18571", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99410,8 +99452,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-18701", +- "self_type" : "type-18703", ++ "referenced_type" : "type-18653", ++ "self_type" : "type-18655", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99419,8 +99461,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-18891", +- "self_type" : "type-18893", ++ "referenced_type" : "type-18843", ++ "self_type" : "type-18845", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99428,8 +99470,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-18988", +- "self_type" : "type-18990", ++ "referenced_type" : "type-18940", ++ "self_type" : "type-18942", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99437,8 +99479,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-19230", +- "self_type" : "type-19232", ++ "referenced_type" : "type-1903", ++ "self_type" : "type-1902", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99446,8 +99488,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-19561", +- "self_type" : "type-19563", ++ "referenced_type" : "type-19182", ++ "self_type" : "type-19184", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99455,8 +99497,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-19732", +- "self_type" : "type-19734", ++ "referenced_type" : "type-19513", ++ "self_type" : "type-19515", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99464,8 +99506,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-1977", +- "self_type" : "type-1976", ++ "referenced_type" : "type-19684", ++ "self_type" : "type-19686", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99473,8 +99515,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-19898", +- "self_type" : "type-19900", ++ "referenced_type" : "type-19850", ++ "self_type" : "type-19852", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99482,8 +99524,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-20521", +- "self_type" : "type-20523", ++ "referenced_type" : "type-20473", ++ "self_type" : "type-20475", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99491,8 +99533,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-21590", +- "self_type" : "type-21592", ++ "referenced_type" : "type-21542", ++ "self_type" : "type-21544", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99500,8 +99542,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-23146", +- "self_type" : "type-23148", ++ "referenced_type" : "type-23131", ++ "self_type" : "type-23133", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99509,8 +99551,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-23230", +- "self_type" : "type-23232", ++ "referenced_type" : "type-23219", ++ "self_type" : "type-23221", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99518,8 +99560,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-23420", +- "self_type" : "type-23422", ++ "referenced_type" : "type-23403", ++ "self_type" : "type-23405", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99527,8 +99569,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-23517", +- "self_type" : "type-23519", ++ "referenced_type" : "type-23495", ++ "self_type" : "type-23497", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99536,8 +99578,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-23751", +- "self_type" : "type-23753", ++ "referenced_type" : "type-23738", ++ "self_type" : "type-23740", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99545,8 +99587,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-24031", +- "self_type" : "type-24033", ++ "referenced_type" : "type-24030", ++ "self_type" : "type-24032", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99554,8 +99596,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-24199", +- "self_type" : "type-24201", ++ "referenced_type" : "type-24204", ++ "self_type" : "type-24206", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99563,8 +99605,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-24363", +- "self_type" : "type-24365", ++ "referenced_type" : "type-24344", ++ "self_type" : "type-24346", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99572,8 +99614,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-24504", +- "self_type" : "type-24506", ++ "referenced_type" : "type-24482", ++ "self_type" : "type-24484", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99581,8 +99623,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-24787", +- "self_type" : "type-24789", ++ "referenced_type" : "type-2455", ++ "self_type" : "type-2457", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99590,8 +99632,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-24943", +- "self_type" : "type-24945", ++ "referenced_type" : "type-24745", ++ "self_type" : "type-24747", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99599,8 +99641,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-25072", +- "self_type" : "type-25074", ++ "referenced_type" : "type-24911", ++ "self_type" : "type-24913", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99608,8 +99650,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-2525", +- "self_type" : "type-2527", ++ "referenced_type" : "type-25043", ++ "self_type" : "type-25045", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99617,8 +99659,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-25700", +- "self_type" : "type-25702", ++ "referenced_type" : "type-25751", ++ "self_type" : "type-25753", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99626,8 +99668,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-26768", +- "self_type" : "type-26770", ++ "referenced_type" : "type-26790", ++ "self_type" : "type-26792", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99635,8 +99677,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-28331", +- "self_type" : "type-28333", ++ "referenced_type" : "type-28330", ++ "self_type" : "type-28332", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99644,8 +99686,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-28415", +- "self_type" : "type-28417", ++ "referenced_type" : "type-28414", ++ "self_type" : "type-28416", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99653,8 +99695,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-28605", +- "self_type" : "type-28607", ++ "referenced_type" : "type-28604", ++ "self_type" : "type-28606", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99662,8 +99704,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-28702", +- "self_type" : "type-28704", ++ "referenced_type" : "type-28701", ++ "self_type" : "type-28703", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99671,8 +99713,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-28936", +- "self_type" : "type-28938", ++ "referenced_type" : "type-28935", ++ "self_type" : "type-28937", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99680,8 +99722,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-29216", +- "self_type" : "type-29218", ++ "referenced_type" : "type-29215", ++ "self_type" : "type-29217", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99689,8 +99731,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-29384", +- "self_type" : "type-29386", ++ "referenced_type" : "type-29383", ++ "self_type" : "type-29385", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99698,8 +99740,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-29548", +- "self_type" : "type-29550", ++ "referenced_type" : "type-29547", ++ "self_type" : "type-29549", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99707,8 +99749,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-29689", +- "self_type" : "type-29691", ++ "referenced_type" : "type-29688", ++ "self_type" : "type-29690", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99716,8 +99758,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-29966", +- "self_type" : "type-29968", ++ "referenced_type" : "type-29965", ++ "self_type" : "type-29967", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99725,8 +99767,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-30099", +- "self_type" : "type-30101", ++ "referenced_type" : "type-30098", ++ "self_type" : "type-30100", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99734,8 +99776,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-30217", +- "self_type" : "type-30219", ++ "referenced_type" : "type-30216", ++ "self_type" : "type-30218", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99743,8 +99785,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-30846", +- "self_type" : "type-30848", ++ "referenced_type" : "type-30845", ++ "self_type" : "type-30847", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99752,8 +99794,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-31915", +- "self_type" : "type-31917", ++ "referenced_type" : "type-31914", ++ "self_type" : "type-31916", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99761,8 +99803,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-3563", +- "self_type" : "type-3565", ++ "referenced_type" : "type-3515", ++ "self_type" : "type-3517", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99770,8 +99812,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-5541", +- "self_type" : "type-5543", ++ "referenced_type" : "type-5493", ++ "self_type" : "type-5495", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99779,8 +99821,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-6714", +- "self_type" : "type-6716", ++ "referenced_type" : "type-6666", ++ "self_type" : "type-6668", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99788,8 +99830,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-8800", +- "self_type" : "type-8802", ++ "referenced_type" : "type-8752", ++ "self_type" : "type-8754", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99797,8 +99839,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumOptions *", + "name" : "const google::protobuf::EnumOptions *", +- "referenced_type" : "type-9870", +- "self_type" : "type-9872", ++ "referenced_type" : "type-9822", ++ "self_type" : "type-9824", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99806,8 +99848,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValue *", + "name" : "const google::protobuf::EnumValue *", +- "referenced_type" : "type-2373", +- "self_type" : "type-2374", ++ "referenced_type" : "type-2301", ++ "self_type" : "type-2302", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -99815,8 +99857,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueDescriptor *", + "name" : "const google::protobuf::EnumValueDescriptor *", +- "referenced_type" : "type-2009", +- "self_type" : "type-2008", ++ "referenced_type" : "type-1935", ++ "self_type" : "type-1934", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99824,8 +99866,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueDescriptorProto *", + "name" : "const google::protobuf::EnumValueDescriptorProto *", +- "referenced_type" : "type-1907", +- "self_type" : "type-1908", ++ "referenced_type" : "type-1827", ++ "self_type" : "type-1828", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -99833,8 +99875,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-12138", +- "self_type" : "type-12140", ++ "referenced_type" : "type-12090", ++ "self_type" : "type-12092", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99842,8 +99884,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-13206", +- "self_type" : "type-13208", ++ "referenced_type" : "type-13158", ++ "self_type" : "type-13160", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99851,8 +99893,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-14757", +- "self_type" : "type-14759", ++ "referenced_type" : "type-14709", ++ "self_type" : "type-14711", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99860,8 +99902,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-14848", +- "self_type" : "type-14850", ++ "referenced_type" : "type-14800", ++ "self_type" : "type-14802", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99869,8 +99911,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-15111", +- "self_type" : "type-15113", ++ "referenced_type" : "type-15063", ++ "self_type" : "type-15065", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99878,8 +99920,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-15211", +- "self_type" : "type-15213", ++ "referenced_type" : "type-15163", ++ "self_type" : "type-15165", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99887,8 +99929,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-15993", +- "self_type" : "type-15995", ++ "referenced_type" : "type-15945", ++ "self_type" : "type-15947", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99896,8 +99938,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-17062", +- "self_type" : "type-17064", ++ "referenced_type" : "type-17014", ++ "self_type" : "type-17016", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99905,8 +99947,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-18621", +- "self_type" : "type-18623", ++ "referenced_type" : "type-18573", ++ "self_type" : "type-18575", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99914,8 +99956,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-18705", +- "self_type" : "type-18707", ++ "referenced_type" : "type-18657", ++ "self_type" : "type-18659", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99923,8 +99965,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-18895", +- "self_type" : "type-18897", ++ "referenced_type" : "type-18847", ++ "self_type" : "type-18849", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99932,8 +99974,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-18993", +- "self_type" : "type-18995", ++ "referenced_type" : "type-18945", ++ "self_type" : "type-18947", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99941,8 +99983,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-19234", +- "self_type" : "type-19238", ++ "referenced_type" : "type-1909", ++ "self_type" : "type-1908", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99950,8 +99992,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-19565", +- "self_type" : "type-19567", ++ "referenced_type" : "type-19186", ++ "self_type" : "type-19190", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99959,8 +100001,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-19736", +- "self_type" : "type-19738", ++ "referenced_type" : "type-19517", ++ "self_type" : "type-19519", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99968,8 +100010,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-1983", +- "self_type" : "type-1982", ++ "referenced_type" : "type-19688", ++ "self_type" : "type-19690", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99977,8 +100019,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-19902", +- "self_type" : "type-19905", ++ "referenced_type" : "type-19854", ++ "self_type" : "type-19857", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99986,8 +100028,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-20525", +- "self_type" : "type-20527", ++ "referenced_type" : "type-20477", ++ "self_type" : "type-20479", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -99995,8 +100037,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-21594", +- "self_type" : "type-21596", ++ "referenced_type" : "type-21546", ++ "self_type" : "type-21548", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100004,8 +100046,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-23150", +- "self_type" : "type-23152", ++ "referenced_type" : "type-23135", ++ "self_type" : "type-23137", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100013,8 +100055,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-23234", +- "self_type" : "type-23236", ++ "referenced_type" : "type-23223", ++ "self_type" : "type-23225", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100022,8 +100064,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-23424", +- "self_type" : "type-23426", ++ "referenced_type" : "type-23407", ++ "self_type" : "type-23409", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100031,8 +100073,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-23522", +- "self_type" : "type-23524", ++ "referenced_type" : "type-23500", ++ "self_type" : "type-23502", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100040,8 +100082,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-23755", +- "self_type" : "type-23759", ++ "referenced_type" : "type-23742", ++ "self_type" : "type-23746", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100049,8 +100091,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-24035", +- "self_type" : "type-24037", ++ "referenced_type" : "type-24034", ++ "self_type" : "type-24036", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100058,8 +100100,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-24203", +- "self_type" : "type-24205", ++ "referenced_type" : "type-24208", ++ "self_type" : "type-24210", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100067,8 +100109,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-24367", +- "self_type" : "type-24370", ++ "referenced_type" : "type-24348", ++ "self_type" : "type-24351", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100076,8 +100118,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-24508", +- "self_type" : "type-24510", ++ "referenced_type" : "type-24486", ++ "self_type" : "type-24488", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100085,8 +100127,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-24791", +- "self_type" : "type-24793", ++ "referenced_type" : "type-2459", ++ "self_type" : "type-2461", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100094,8 +100136,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-24947", +- "self_type" : "type-24949", ++ "referenced_type" : "type-24749", ++ "self_type" : "type-24751", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100103,8 +100145,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-25076", +- "self_type" : "type-25078", ++ "referenced_type" : "type-24915", ++ "self_type" : "type-24917", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100112,8 +100154,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-2529", +- "self_type" : "type-2531", ++ "referenced_type" : "type-25047", ++ "self_type" : "type-25049", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100121,8 +100163,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-25704", +- "self_type" : "type-25706", ++ "referenced_type" : "type-25755", ++ "self_type" : "type-25757", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100130,8 +100172,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-26772", +- "self_type" : "type-26774", ++ "referenced_type" : "type-26794", ++ "self_type" : "type-26796", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100139,8 +100181,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-28335", +- "self_type" : "type-28337", ++ "referenced_type" : "type-28334", ++ "self_type" : "type-28336", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100148,8 +100190,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-28419", +- "self_type" : "type-28421", ++ "referenced_type" : "type-28418", ++ "self_type" : "type-28420", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100157,8 +100199,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-28609", +- "self_type" : "type-28611", ++ "referenced_type" : "type-28608", ++ "self_type" : "type-28610", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100166,8 +100208,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-28707", +- "self_type" : "type-28709", ++ "referenced_type" : "type-28706", ++ "self_type" : "type-28708", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100175,8 +100217,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-28940", +- "self_type" : "type-28944", ++ "referenced_type" : "type-28939", ++ "self_type" : "type-28943", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100184,8 +100226,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-29220", +- "self_type" : "type-29222", ++ "referenced_type" : "type-29219", ++ "self_type" : "type-29221", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100193,8 +100235,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-29388", +- "self_type" : "type-29390", ++ "referenced_type" : "type-29387", ++ "self_type" : "type-29389", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100202,8 +100244,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-29552", +- "self_type" : "type-29555", ++ "referenced_type" : "type-29551", ++ "self_type" : "type-29554", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100211,8 +100253,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-29693", +- "self_type" : "type-29695", ++ "referenced_type" : "type-29692", ++ "self_type" : "type-29694", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100220,8 +100262,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-29970", +- "self_type" : "type-29972", ++ "referenced_type" : "type-29969", ++ "self_type" : "type-29971", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100229,8 +100271,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-30103", +- "self_type" : "type-30105", ++ "referenced_type" : "type-30102", ++ "self_type" : "type-30104", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100238,8 +100280,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-30221", +- "self_type" : "type-30223", ++ "referenced_type" : "type-30220", ++ "self_type" : "type-30222", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100247,8 +100289,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-30850", +- "self_type" : "type-30852", ++ "referenced_type" : "type-30849", ++ "self_type" : "type-30851", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100256,8 +100298,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-31919", +- "self_type" : "type-31921", ++ "referenced_type" : "type-31918", ++ "self_type" : "type-31920", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100265,8 +100307,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-3567", +- "self_type" : "type-3569", ++ "referenced_type" : "type-3519", ++ "self_type" : "type-3521", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100274,8 +100316,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-5545", +- "self_type" : "type-5547", ++ "referenced_type" : "type-5497", ++ "self_type" : "type-5499", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100283,8 +100325,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-6718", +- "self_type" : "type-6720", ++ "referenced_type" : "type-6670", ++ "self_type" : "type-6672", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100292,8 +100334,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-8804", +- "self_type" : "type-8806", ++ "referenced_type" : "type-8756", ++ "self_type" : "type-8758", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100301,8 +100343,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::EnumValueOptions *", + "name" : "const google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-9874", +- "self_type" : "type-9876", ++ "referenced_type" : "type-9826", ++ "self_type" : "type-9828", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100310,8 +100352,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Field *", + "name" : "const google::protobuf::Field *", +- "referenced_type" : "type-2364", +- "self_type" : "type-2365", ++ "referenced_type" : "type-2292", ++ "self_type" : "type-2293", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -100319,8 +100361,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldDescriptor *", + "name" : "const google::protobuf::FieldDescriptor *", +- "referenced_type" : "type-10339", +- "self_type" : "type-10338", ++ "referenced_type" : "type-10291", ++ "self_type" : "type-10290", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -100328,8 +100370,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldDescriptor *", + "name" : "const google::protobuf::FieldDescriptor *", +- "referenced_type" : "type-1304", +- "self_type" : "type-1303", ++ "referenced_type" : "type-1217", ++ "self_type" : "type-1216", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -100337,8 +100379,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldDescriptor *", + "name" : "const google::protobuf::FieldDescriptor *", +- "referenced_type" : "type-13630", +- "self_type" : "type-13629", ++ "referenced_type" : "type-13582", ++ "self_type" : "type-13581", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -100346,8 +100388,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldDescriptor *", + "name" : "const google::protobuf::FieldDescriptor *", +- "referenced_type" : "type-17494", +- "self_type" : "type-17493", ++ "referenced_type" : "type-17446", ++ "self_type" : "type-17445", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -100355,8 +100397,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldDescriptor *", + "name" : "const google::protobuf::FieldDescriptor *", +- "referenced_type" : "type-2004", +- "self_type" : "type-2003", ++ "referenced_type" : "type-1930", ++ "self_type" : "type-1929", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100364,8 +100406,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldDescriptor *", + "name" : "const google::protobuf::FieldDescriptor *", +- "referenced_type" : "type-22023", +- "self_type" : "type-22022", ++ "referenced_type" : "type-22589", ++ "self_type" : "type-22588", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -100373,8 +100415,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldDescriptor *", + "name" : "const google::protobuf::FieldDescriptor *", +- "referenced_type" : "type-27208", +- "self_type" : "type-27207", ++ "referenced_type" : "type-2679", ++ "self_type" : "type-2678", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -100382,8 +100424,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldDescriptor *", + "name" : "const google::protobuf::FieldDescriptor *", +- "referenced_type" : "type-2727", +- "self_type" : "type-2726", ++ "referenced_type" : "type-27207", ++ "self_type" : "type-27206", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -100400,8 +100442,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldDescriptor *", + "name" : "const google::protobuf::FieldDescriptor *", +- "referenced_type" : "type-4707", +- "self_type" : "type-4706", ++ "referenced_type" : "type-4659", ++ "self_type" : "type-4658", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -100409,8 +100451,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldDescriptor *", + "name" : "const google::protobuf::FieldDescriptor *", +- "referenced_type" : "type-7314", +- "self_type" : "type-7313", ++ "referenced_type" : "type-7266", ++ "self_type" : "type-7265", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -100418,8 +100460,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldDescriptor **", + "name" : "const google::protobuf::FieldDescriptor **", +- "referenced_type" : "type-2003", +- "self_type" : "type-2002", ++ "referenced_type" : "type-1929", ++ "self_type" : "type-1928", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100427,8 +100469,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldDescriptorProto *", + "name" : "const google::protobuf::FieldDescriptorProto *", +- "referenced_type" : "type-1891", +- "self_type" : "type-1892", ++ "referenced_type" : "type-1810", ++ "self_type" : "type-1811", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -100436,8 +100478,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldMask *", + "name" : "const google::protobuf::FieldMask *", +- "referenced_type" : "type-6395", +- "self_type" : "type-6394", ++ "referenced_type" : "type-6347", ++ "self_type" : "type-6346", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -100445,8 +100487,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-12130", +- "self_type" : "type-12132", ++ "referenced_type" : "type-12082", ++ "self_type" : "type-12084", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100454,8 +100496,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-13198", +- "self_type" : "type-13200", ++ "referenced_type" : "type-13150", ++ "self_type" : "type-13152", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100463,8 +100505,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-14749", +- "self_type" : "type-14751", ++ "referenced_type" : "type-14701", ++ "self_type" : "type-14703", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100472,8 +100514,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-14840", +- "self_type" : "type-14842", ++ "referenced_type" : "type-14792", ++ "self_type" : "type-14794", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100481,8 +100523,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-15103", +- "self_type" : "type-15105", ++ "referenced_type" : "type-15055", ++ "self_type" : "type-15057", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100490,8 +100532,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-15201", +- "self_type" : "type-15204", ++ "referenced_type" : "type-15153", ++ "self_type" : "type-15156", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100499,8 +100541,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-15985", +- "self_type" : "type-15987", ++ "referenced_type" : "type-15937", ++ "self_type" : "type-15939", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100508,8 +100550,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-17054", +- "self_type" : "type-17056", ++ "referenced_type" : "type-17006", ++ "self_type" : "type-17008", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100517,8 +100559,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-18613", +- "self_type" : "type-18615", ++ "referenced_type" : "type-18565", ++ "self_type" : "type-18567", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100526,8 +100568,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-18697", +- "self_type" : "type-18699", ++ "referenced_type" : "type-18649", ++ "self_type" : "type-18651", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100535,8 +100577,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-18887", +- "self_type" : "type-18889", ++ "referenced_type" : "type-18839", ++ "self_type" : "type-18841", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100544,8 +100586,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-18983", +- "self_type" : "type-18986", ++ "referenced_type" : "type-18935", ++ "self_type" : "type-18938", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100553,8 +100595,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-19226", +- "self_type" : "type-19228", ++ "referenced_type" : "type-19178", ++ "self_type" : "type-19180", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100562,8 +100604,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-19557", +- "self_type" : "type-19559", ++ "referenced_type" : "type-1932", ++ "self_type" : "type-1931", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100571,8 +100613,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-19728", +- "self_type" : "type-19730", ++ "referenced_type" : "type-19509", ++ "self_type" : "type-19511", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100580,8 +100622,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-19892", +- "self_type" : "type-19896", ++ "referenced_type" : "type-19680", ++ "self_type" : "type-19682", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100589,8 +100631,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-2006", +- "self_type" : "type-2005", ++ "referenced_type" : "type-19844", ++ "self_type" : "type-19848", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100598,8 +100640,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-20517", +- "self_type" : "type-20519", ++ "referenced_type" : "type-20469", ++ "self_type" : "type-20471", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100607,8 +100649,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-21586", +- "self_type" : "type-21588", ++ "referenced_type" : "type-21538", ++ "self_type" : "type-21540", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100616,8 +100658,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-23142", +- "self_type" : "type-23144", ++ "referenced_type" : "type-23127", ++ "self_type" : "type-23129", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100625,8 +100667,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-23226", +- "self_type" : "type-23228", ++ "referenced_type" : "type-23213", ++ "self_type" : "type-23215", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100634,8 +100676,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-23416", +- "self_type" : "type-23418", ++ "referenced_type" : "type-23399", ++ "self_type" : "type-23401", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100643,8 +100685,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-23512", +- "self_type" : "type-23515", ++ "referenced_type" : "type-23490", ++ "self_type" : "type-23492", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100652,8 +100694,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-23747", +- "self_type" : "type-23749", ++ "referenced_type" : "type-23732", ++ "self_type" : "type-23734", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100661,8 +100703,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-24027", +- "self_type" : "type-24029", ++ "referenced_type" : "type-24026", ++ "self_type" : "type-24028", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100670,8 +100712,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-24195", +- "self_type" : "type-24197", ++ "referenced_type" : "type-24200", ++ "self_type" : "type-24202", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100679,8 +100721,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-24357", +- "self_type" : "type-24361", ++ "referenced_type" : "type-24340", ++ "self_type" : "type-24342", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100688,8 +100730,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-24499", +- "self_type" : "type-24501", ++ "referenced_type" : "type-24478", ++ "self_type" : "type-24480", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100697,8 +100739,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-24783", +- "self_type" : "type-24785", ++ "referenced_type" : "type-2451", ++ "self_type" : "type-2453", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100706,8 +100748,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-24939", +- "self_type" : "type-24941", ++ "referenced_type" : "type-24739", ++ "self_type" : "type-24741", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100715,8 +100757,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-25068", +- "self_type" : "type-25070", ++ "referenced_type" : "type-24907", ++ "self_type" : "type-24909", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100724,8 +100766,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-2521", +- "self_type" : "type-2523", ++ "referenced_type" : "type-25039", ++ "self_type" : "type-25041", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100733,8 +100775,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-25696", +- "self_type" : "type-25698", ++ "referenced_type" : "type-25747", ++ "self_type" : "type-25749", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100742,8 +100784,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-26764", +- "self_type" : "type-26766", ++ "referenced_type" : "type-26786", ++ "self_type" : "type-26788", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100751,8 +100793,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-28327", +- "self_type" : "type-28329", ++ "referenced_type" : "type-28326", ++ "self_type" : "type-28328", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100760,8 +100802,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-28411", +- "self_type" : "type-28413", ++ "referenced_type" : "type-28410", ++ "self_type" : "type-28412", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100769,8 +100811,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-28601", +- "self_type" : "type-28603", ++ "referenced_type" : "type-28600", ++ "self_type" : "type-28602", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100778,8 +100820,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-28697", +- "self_type" : "type-28700", ++ "referenced_type" : "type-28696", ++ "self_type" : "type-28699", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100787,8 +100829,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-28932", +- "self_type" : "type-28934", ++ "referenced_type" : "type-28931", ++ "self_type" : "type-28933", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100796,8 +100838,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-29212", +- "self_type" : "type-29214", ++ "referenced_type" : "type-29211", ++ "self_type" : "type-29213", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100805,8 +100847,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-29380", +- "self_type" : "type-29382", ++ "referenced_type" : "type-29379", ++ "self_type" : "type-29381", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100814,8 +100856,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-29542", +- "self_type" : "type-29546", ++ "referenced_type" : "type-29541", ++ "self_type" : "type-29545", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100823,8 +100865,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-29684", +- "self_type" : "type-29686", ++ "referenced_type" : "type-29683", ++ "self_type" : "type-29685", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100832,8 +100874,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-29962", +- "self_type" : "type-29964", ++ "referenced_type" : "type-29961", ++ "self_type" : "type-29963", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100841,8 +100883,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-30095", +- "self_type" : "type-30097", ++ "referenced_type" : "type-30094", ++ "self_type" : "type-30096", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100850,8 +100892,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-30213", +- "self_type" : "type-30215", ++ "referenced_type" : "type-30212", ++ "self_type" : "type-30214", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100859,8 +100901,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-30842", +- "self_type" : "type-30844", ++ "referenced_type" : "type-30841", ++ "self_type" : "type-30843", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100868,8 +100910,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-31911", +- "self_type" : "type-31913", ++ "referenced_type" : "type-31910", ++ "self_type" : "type-31912", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100877,8 +100919,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-3559", +- "self_type" : "type-3561", ++ "referenced_type" : "type-3511", ++ "self_type" : "type-3513", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100886,8 +100928,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-5537", +- "self_type" : "type-5539", ++ "referenced_type" : "type-5489", ++ "self_type" : "type-5491", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100895,8 +100937,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-6710", +- "self_type" : "type-6712", ++ "referenced_type" : "type-6662", ++ "self_type" : "type-6664", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100904,8 +100946,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-8796", +- "self_type" : "type-8798", ++ "referenced_type" : "type-8748", ++ "self_type" : "type-8750", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100913,8 +100955,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FieldOptions *", + "name" : "const google::protobuf::FieldOptions *", +- "referenced_type" : "type-9866", +- "self_type" : "type-9868", ++ "referenced_type" : "type-9818", ++ "self_type" : "type-9820", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100922,8 +100964,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptor *", + "name" : "const google::protobuf::FileDescriptor *", +- "referenced_type" : "type-1960", +- "self_type" : "type-1959", ++ "referenced_type" : "type-1885", ++ "self_type" : "type-1884", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100931,8 +100973,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptor **", + "name" : "const google::protobuf::FileDescriptor **", +- "referenced_type" : "type-1959", +- "self_type" : "type-1970", ++ "referenced_type" : "type-1884", ++ "self_type" : "type-1895", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100940,8 +100982,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorProto *", + "name" : "const google::protobuf::FileDescriptorProto *", +- "referenced_type" : "type-1875", +- "self_type" : "type-1876", ++ "referenced_type" : "type-1793", ++ "self_type" : "type-1794", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -100949,8 +100991,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorSet *", + "name" : "const google::protobuf::FileDescriptorSet *", +- "referenced_type" : "type-2215", +- "self_type" : "type-2217", ++ "referenced_type" : "type-2146", ++ "self_type" : "type-2148", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -100958,8 +101000,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-10023", +- "self_type" : "type-10025", ++ "referenced_type" : "type-10053", ++ "self_type" : "type-10055", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100967,8 +101009,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-10101", +- "self_type" : "type-10103", ++ "referenced_type" : "type-10194", ++ "self_type" : "type-10196", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100976,8 +101018,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-10242", +- "self_type" : "type-10244", ++ "referenced_type" : "type-10437", ++ "self_type" : "type-10439", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100985,8 +101027,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-10485", +- "self_type" : "type-10487", ++ "referenced_type" : "type-10515", ++ "self_type" : "type-10518", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -100994,8 +101036,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-10563", +- "self_type" : "type-10566", ++ "referenced_type" : "type-10684", ++ "self_type" : "type-10686", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101003,8 +101045,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-10732", +- "self_type" : "type-10734", ++ "referenced_type" : "type-10775", ++ "self_type" : "type-10777", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101012,8 +101054,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-10823", +- "self_type" : "type-10825", ++ "referenced_type" : "type-10867", ++ "self_type" : "type-10869", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101021,8 +101063,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-10915", +- "self_type" : "type-10917", ++ "referenced_type" : "type-10954", ++ "self_type" : "type-10956", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101030,8 +101072,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-11002", +- "self_type" : "type-11004", ++ "referenced_type" : "type-11028", ++ "self_type" : "type-11030", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101039,8 +101081,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-11076", +- "self_type" : "type-11078", ++ "referenced_type" : "type-11209", ++ "self_type" : "type-11211", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101048,8 +101090,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-11257", +- "self_type" : "type-11259", ++ "referenced_type" : "type-11371", ++ "self_type" : "type-11373", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101057,8 +101099,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-11419", +- "self_type" : "type-11421", ++ "referenced_type" : "type-11753", ++ "self_type" : "type-11752", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101066,8 +101108,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-11801", +- "self_type" : "type-11800", ++ "referenced_type" : "type-11988", ++ "self_type" : "type-11990", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101075,8 +101117,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-12036", +- "self_type" : "type-12038", ++ "referenced_type" : "type-12105", ++ "self_type" : "type-12107", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101084,8 +101126,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-12153", +- "self_type" : "type-12155", ++ "referenced_type" : "type-12229", ++ "self_type" : "type-12231", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101093,8 +101135,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-12277", +- "self_type" : "type-12279", ++ "referenced_type" : "type-12380", ++ "self_type" : "type-12382", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101102,8 +101144,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-12428", +- "self_type" : "type-12430", ++ "referenced_type" : "type-12491", ++ "self_type" : "type-12493", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101111,8 +101153,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-12539", +- "self_type" : "type-12541", ++ "referenced_type" : "type-12594", ++ "self_type" : "type-12596", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101120,8 +101162,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-12642", +- "self_type" : "type-12644", ++ "referenced_type" : "type-12717", ++ "self_type" : "type-12719", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101129,8 +101171,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-12765", +- "self_type" : "type-12767", ++ "referenced_type" : "type-12771", ++ "self_type" : "type-12773", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101138,8 +101180,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-12819", +- "self_type" : "type-12821", ++ "referenced_type" : "type-12836", ++ "self_type" : "type-12838", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101147,8 +101189,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-12884", +- "self_type" : "type-12886", ++ "referenced_type" : "type-12910", ++ "self_type" : "type-12913", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101156,8 +101198,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-12958", +- "self_type" : "type-12961", ++ "referenced_type" : "type-12986", ++ "self_type" : "type-12988", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101165,8 +101207,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-13034", +- "self_type" : "type-13036", ++ "referenced_type" : "type-13173", ++ "self_type" : "type-13176", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101174,8 +101216,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-13221", +- "self_type" : "type-13224", ++ "referenced_type" : "type-13308", ++ "self_type" : "type-13310", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101183,8 +101225,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-13356", +- "self_type" : "type-13358", ++ "referenced_type" : "type-13386", ++ "self_type" : "type-13388", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101192,8 +101234,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-13434", +- "self_type" : "type-13436", ++ "referenced_type" : "type-13485", ++ "self_type" : "type-13487", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101201,8 +101243,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-13533", +- "self_type" : "type-13535", ++ "referenced_type" : "type-13728", ++ "self_type" : "type-13730", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101210,8 +101252,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-13776", +- "self_type" : "type-13778", ++ "referenced_type" : "type-13806", ++ "self_type" : "type-13809", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101219,8 +101261,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-13854", +- "self_type" : "type-13857", ++ "referenced_type" : "type-13975", ++ "self_type" : "type-13977", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101228,8 +101270,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-14023", +- "self_type" : "type-14025", ++ "referenced_type" : "type-14066", ++ "self_type" : "type-14068", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101237,8 +101279,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-14114", +- "self_type" : "type-14116", ++ "referenced_type" : "type-14158", ++ "self_type" : "type-14160", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101246,8 +101288,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-14206", +- "self_type" : "type-14208", ++ "referenced_type" : "type-14245", ++ "self_type" : "type-14247", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101255,8 +101297,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-14293", +- "self_type" : "type-14295", ++ "referenced_type" : "type-14310", ++ "self_type" : "type-14312", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101264,8 +101306,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-14358", +- "self_type" : "type-14360", ++ "referenced_type" : "type-14460", ++ "self_type" : "type-14462", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101273,8 +101315,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-14508", +- "self_type" : "type-14510", ++ "referenced_type" : "type-14590", ++ "self_type" : "type-14592", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101282,8 +101324,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-14638", +- "self_type" : "type-14640", ++ "referenced_type" : "type-14725", ++ "self_type" : "type-14727", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101291,8 +101333,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-14773", +- "self_type" : "type-14775", ++ "referenced_type" : "type-14817", ++ "self_type" : "type-14819", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101300,8 +101342,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-14865", +- "self_type" : "type-14867", ++ "referenced_type" : "type-15081", ++ "self_type" : "type-15083", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101309,8 +101351,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-15129", +- "self_type" : "type-15131", ++ "referenced_type" : "type-15180", ++ "self_type" : "type-15189", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101318,8 +101360,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-15228", +- "self_type" : "type-15237", ++ "referenced_type" : "type-15610", ++ "self_type" : "type-15609", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101327,8 +101369,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-15658", +- "self_type" : "type-15657", ++ "referenced_type" : "type-15844", ++ "self_type" : "type-15846", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101336,8 +101378,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-15892", +- "self_type" : "type-15894", ++ "referenced_type" : "type-15960", ++ "self_type" : "type-15962", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101345,8 +101387,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-16008", +- "self_type" : "type-16010", ++ "referenced_type" : "type-16084", ++ "self_type" : "type-16086", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101354,8 +101396,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-16132", +- "self_type" : "type-16134", ++ "referenced_type" : "type-16237", ++ "self_type" : "type-16239", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101363,8 +101405,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-16285", +- "self_type" : "type-16287", ++ "referenced_type" : "type-16348", ++ "self_type" : "type-16350", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101372,8 +101414,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-16396", +- "self_type" : "type-16398", ++ "referenced_type" : "type-16450", ++ "self_type" : "type-16452", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101381,8 +101423,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-16498", +- "self_type" : "type-16500", ++ "referenced_type" : "type-16573", ++ "self_type" : "type-16575", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101390,8 +101432,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-16621", +- "self_type" : "type-16623", ++ "referenced_type" : "type-16627", ++ "self_type" : "type-16629", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101399,8 +101441,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-16675", +- "self_type" : "type-16677", ++ "referenced_type" : "type-16692", ++ "self_type" : "type-16694", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101408,8 +101450,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-16740", +- "self_type" : "type-16742", ++ "referenced_type" : "type-16766", ++ "self_type" : "type-16769", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101417,8 +101459,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-16814", +- "self_type" : "type-16817", ++ "referenced_type" : "type-16842", ++ "self_type" : "type-16844", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101426,8 +101468,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-16890", +- "self_type" : "type-16892", ++ "referenced_type" : "type-17029", ++ "self_type" : "type-17032", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101435,8 +101477,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-17077", +- "self_type" : "type-17080", ++ "referenced_type" : "type-17164", ++ "self_type" : "type-17166", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101444,8 +101486,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-17212", +- "self_type" : "type-17214", ++ "referenced_type" : "type-17242", ++ "self_type" : "type-17244", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101453,8 +101495,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-17290", +- "self_type" : "type-17292", ++ "referenced_type" : "type-17349", ++ "self_type" : "type-17351", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101462,8 +101504,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-17397", +- "self_type" : "type-17399", ++ "referenced_type" : "type-17592", ++ "self_type" : "type-17594", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101471,8 +101513,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-17640", +- "self_type" : "type-17642", ++ "referenced_type" : "type-17670", ++ "self_type" : "type-17673", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101480,8 +101522,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-17718", +- "self_type" : "type-17721", ++ "referenced_type" : "type-17839", ++ "self_type" : "type-17841", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101489,8 +101531,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-17887", +- "self_type" : "type-17889", ++ "referenced_type" : "type-17930", ++ "self_type" : "type-17932", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101498,8 +101540,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-17978", +- "self_type" : "type-17980", ++ "referenced_type" : "type-18022", ++ "self_type" : "type-18024", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101507,8 +101549,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-18070", +- "self_type" : "type-18072", ++ "referenced_type" : "type-18109", ++ "self_type" : "type-18111", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101516,8 +101558,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-18157", +- "self_type" : "type-18159", ++ "referenced_type" : "type-18174", ++ "self_type" : "type-18176", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101525,8 +101567,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-18222", +- "self_type" : "type-18224", ++ "referenced_type" : "type-18324", ++ "self_type" : "type-18326", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101534,8 +101576,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-18372", +- "self_type" : "type-18374", ++ "referenced_type" : "type-18454", ++ "self_type" : "type-18456", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101543,8 +101585,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-18502", +- "self_type" : "type-18504", ++ "referenced_type" : "type-18589", ++ "self_type" : "type-18591", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101552,8 +101594,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-18637", +- "self_type" : "type-18639", ++ "referenced_type" : "type-18674", ++ "self_type" : "type-18676", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101561,8 +101603,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-18722", +- "self_type" : "type-18724", ++ "referenced_type" : "type-18865", ++ "self_type" : "type-18867", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101570,8 +101612,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-18913", +- "self_type" : "type-18915", ++ "referenced_type" : "type-18962", ++ "self_type" : "type-18965", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101579,8 +101621,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-19010", +- "self_type" : "type-19013", ++ "referenced_type" : "type-19203", ++ "self_type" : "type-19205", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101588,8 +101630,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-19251", +- "self_type" : "type-19253", ++ "referenced_type" : "type-19360", ++ "self_type" : "type-19362", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101597,8 +101639,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-19408", +- "self_type" : "type-19410", ++ "referenced_type" : "type-1939", ++ "self_type" : "type-1938", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101606,8 +101648,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-19582", +- "self_type" : "type-19584", ++ "referenced_type" : "type-19534", ++ "self_type" : "type-19536", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101615,8 +101657,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-19752", +- "self_type" : "type-19754", ++ "referenced_type" : "type-19704", ++ "self_type" : "type-19706", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101624,8 +101666,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-19920", +- "self_type" : "type-19922", ++ "referenced_type" : "type-19872", ++ "self_type" : "type-19874", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101633,8 +101675,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-2013", +- "self_type" : "type-2012", ++ "referenced_type" : "type-20143", ++ "self_type" : "type-20142", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101642,8 +101684,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-20191", +- "self_type" : "type-20190", ++ "referenced_type" : "type-20378", ++ "self_type" : "type-20380", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101651,8 +101693,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-20426", +- "self_type" : "type-20428", ++ "referenced_type" : "type-20492", ++ "self_type" : "type-20494", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101660,8 +101702,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-20540", +- "self_type" : "type-20542", ++ "referenced_type" : "type-20615", ++ "self_type" : "type-20617", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101669,8 +101711,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-20663", +- "self_type" : "type-20665", ++ "referenced_type" : "type-20768", ++ "self_type" : "type-20770", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101678,8 +101720,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-20816", +- "self_type" : "type-20818", ++ "referenced_type" : "type-20879", ++ "self_type" : "type-20881", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101687,8 +101729,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-20927", +- "self_type" : "type-20929", ++ "referenced_type" : "type-20982", ++ "self_type" : "type-20984", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101696,8 +101738,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-21030", +- "self_type" : "type-21032", ++ "referenced_type" : "type-21105", ++ "self_type" : "type-21107", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101705,8 +101747,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-21153", +- "self_type" : "type-21155", ++ "referenced_type" : "type-21159", ++ "self_type" : "type-21161", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101714,8 +101756,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-21207", +- "self_type" : "type-21209", ++ "referenced_type" : "type-21224", ++ "self_type" : "type-21226", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101723,8 +101765,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-21272", +- "self_type" : "type-21274", ++ "referenced_type" : "type-21298", ++ "self_type" : "type-21301", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101732,8 +101774,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-21346", +- "self_type" : "type-21349", ++ "referenced_type" : "type-21374", ++ "self_type" : "type-21376", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101741,8 +101783,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-21422", +- "self_type" : "type-21424", ++ "referenced_type" : "type-21561", ++ "self_type" : "type-21564", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101750,8 +101792,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-21609", +- "self_type" : "type-21612", ++ "referenced_type" : "type-21696", ++ "self_type" : "type-21698", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101759,8 +101801,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-21744", +- "self_type" : "type-21746", ++ "referenced_type" : "type-21774", ++ "self_type" : "type-21776", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101768,8 +101810,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-21822", +- "self_type" : "type-21824", ++ "referenced_type" : "type-21921", ++ "self_type" : "type-21923", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101777,8 +101819,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-21926", +- "self_type" : "type-21928", ++ "referenced_type" : "type-22165", ++ "self_type" : "type-22167", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101786,8 +101828,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-22169", +- "self_type" : "type-22171", ++ "referenced_type" : "type-22227", ++ "self_type" : "type-22229", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101795,8 +101837,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-22247", +- "self_type" : "type-22250", ++ "referenced_type" : "type-22373", ++ "self_type" : "type-22375", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101804,8 +101846,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-22416", +- "self_type" : "type-22418", ++ "referenced_type" : "type-22429", ++ "self_type" : "type-22431", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101813,8 +101855,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-22507", +- "self_type" : "type-22509", ++ "referenced_type" : "type-22505", ++ "self_type" : "type-22507", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101822,8 +101864,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-22599", +- "self_type" : "type-22601", ++ "referenced_type" : "type-22609", ++ "self_type" : "type-22611", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101831,8 +101873,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-22686", +- "self_type" : "type-22688", ++ "referenced_type" : "type-22690", ++ "self_type" : "type-22692", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101840,8 +101882,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-22751", +- "self_type" : "type-22753", ++ "referenced_type" : "type-22864", ++ "self_type" : "type-22866", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101849,8 +101891,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-22901", +- "self_type" : "type-22903", ++ "referenced_type" : "type-23001", ++ "self_type" : "type-23003", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101858,8 +101900,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-23031", +- "self_type" : "type-23033", ++ "referenced_type" : "type-23150", ++ "self_type" : "type-23152", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101867,8 +101909,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-23166", +- "self_type" : "type-23168", ++ "referenced_type" : "type-23241", ++ "self_type" : "type-23243", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101876,8 +101918,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-23251", +- "self_type" : "type-23253", ++ "referenced_type" : "type-2329", ++ "self_type" : "type-2331", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101885,8 +101927,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-23442", +- "self_type" : "type-23444", ++ "referenced_type" : "type-23422", ++ "self_type" : "type-23424", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101894,8 +101936,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-23539", +- "self_type" : "type-23542", ++ "referenced_type" : "type-23517", ++ "self_type" : "type-23520", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101903,8 +101945,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-23772", +- "self_type" : "type-23774", ++ "referenced_type" : "type-23759", ++ "self_type" : "type-23761", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101912,8 +101954,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-23908", +- "self_type" : "type-23910", ++ "referenced_type" : "type-23912", ++ "self_type" : "type-23914", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101921,8 +101963,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-2399", +- "self_type" : "type-2401", ++ "referenced_type" : "type-24049", ++ "self_type" : "type-24051", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101930,8 +101972,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-24052", +- "self_type" : "type-24054", ++ "referenced_type" : "type-24223", ++ "self_type" : "type-24225", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101939,8 +101981,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-24219", +- "self_type" : "type-24221", ++ "referenced_type" : "type-24366", ++ "self_type" : "type-24368", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101948,8 +101990,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-24385", +- "self_type" : "type-24387", ++ "referenced_type" : "type-24503", ++ "self_type" : "type-24505", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101957,8 +101999,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-24526", +- "self_type" : "type-24528", ++ "referenced_type" : "type-24643", ++ "self_type" : "type-24645", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101966,8 +102008,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-24682", +- "self_type" : "type-24684", ++ "referenced_type" : "type-2474", ++ "self_type" : "type-2476", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101975,8 +102017,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-24807", +- "self_type" : "type-24809", ++ "referenced_type" : "type-24767", ++ "self_type" : "type-24769", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101984,8 +102026,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-24962", +- "self_type" : "type-24964", ++ "referenced_type" : "type-24930", ++ "self_type" : "type-24932", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -101993,8 +102035,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-25093", +- "self_type" : "type-25095", ++ "referenced_type" : "type-25065", ++ "self_type" : "type-25067", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102002,8 +102044,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-25195", +- "self_type" : "type-25197", ++ "referenced_type" : "type-25189", ++ "self_type" : "type-25192", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102011,8 +102053,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-25367", +- "self_type" : "type-25366", ++ "referenced_type" : "type-25420", ++ "self_type" : "type-25419", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102020,8 +102062,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-2544", +- "self_type" : "type-2546", ++ "referenced_type" : "type-25653", ++ "self_type" : "type-25655", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102029,8 +102071,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-25602", +- "self_type" : "type-25604", ++ "referenced_type" : "type-25770", ++ "self_type" : "type-25772", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102038,8 +102080,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-25719", +- "self_type" : "type-25721", ++ "referenced_type" : "type-25895", ++ "self_type" : "type-25897", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102047,8 +102089,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-25842", +- "self_type" : "type-25844", ++ "referenced_type" : "type-26049", ++ "self_type" : "type-26051", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102056,8 +102098,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-25994", +- "self_type" : "type-25996", ++ "referenced_type" : "type-26149", ++ "self_type" : "type-26151", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102065,8 +102107,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-26105", +- "self_type" : "type-26107", ++ "referenced_type" : "type-26248", ++ "self_type" : "type-26250", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102074,8 +102116,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-26208", +- "self_type" : "type-26210", ++ "referenced_type" : "type-26373", ++ "self_type" : "type-26375", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102083,8 +102125,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-26331", +- "self_type" : "type-26333", ++ "referenced_type" : "type-26427", ++ "self_type" : "type-26429", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102092,8 +102134,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-26385", +- "self_type" : "type-26387", ++ "referenced_type" : "type-26488", ++ "self_type" : "type-26490", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102101,8 +102143,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-26450", +- "self_type" : "type-26452", ++ "referenced_type" : "type-26551", ++ "self_type" : "type-26553", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102110,8 +102152,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-26524", +- "self_type" : "type-26527", ++ "referenced_type" : "type-26628", ++ "self_type" : "type-26630", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102119,8 +102161,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-26600", +- "self_type" : "type-26602", ++ "referenced_type" : "type-26810", ++ "self_type" : "type-26812", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102128,8 +102170,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-26787", +- "self_type" : "type-26790", ++ "referenced_type" : "type-26940", ++ "self_type" : "type-26942", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102137,8 +102179,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-26922", +- "self_type" : "type-26924", ++ "referenced_type" : "type-27029", ++ "self_type" : "type-27031", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102146,8 +102188,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-27000", +- "self_type" : "type-27002", ++ "referenced_type" : "type-27110", ++ "self_type" : "type-27112", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102155,8 +102197,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-27111", +- "self_type" : "type-27113", ++ "referenced_type" : "type-27353", ++ "self_type" : "type-27355", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102164,8 +102206,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-27354", +- "self_type" : "type-27356", ++ "referenced_type" : "type-27431", ++ "self_type" : "type-27434", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102173,8 +102215,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-27432", +- "self_type" : "type-27435", ++ "referenced_type" : "type-27600", ++ "self_type" : "type-27602", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102182,8 +102224,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-27601", +- "self_type" : "type-27603", ++ "referenced_type" : "type-27691", ++ "self_type" : "type-27693", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102191,8 +102233,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-27692", +- "self_type" : "type-27694", ++ "referenced_type" : "type-27783", ++ "self_type" : "type-27785", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102200,8 +102242,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-27784", +- "self_type" : "type-27786", ++ "referenced_type" : "type-27870", ++ "self_type" : "type-27872", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102209,8 +102251,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-27871", +- "self_type" : "type-27873", ++ "referenced_type" : "type-27935", ++ "self_type" : "type-27937", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102218,8 +102260,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-27936", +- "self_type" : "type-27938", ++ "referenced_type" : "type-28085", ++ "self_type" : "type-28087", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102227,8 +102269,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-28086", +- "self_type" : "type-28088", ++ "referenced_type" : "type-28215", ++ "self_type" : "type-28217", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102236,8 +102278,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-28216", +- "self_type" : "type-28218", ++ "referenced_type" : "type-28350", ++ "self_type" : "type-28352", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102245,8 +102287,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-28351", +- "self_type" : "type-28353", ++ "referenced_type" : "type-28435", ++ "self_type" : "type-28437", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102254,8 +102296,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-28436", +- "self_type" : "type-28438", ++ "referenced_type" : "type-28626", ++ "self_type" : "type-28628", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102263,8 +102305,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-28627", +- "self_type" : "type-28629", ++ "referenced_type" : "type-28723", ++ "self_type" : "type-28726", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102272,8 +102314,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-28724", +- "self_type" : "type-28727", ++ "referenced_type" : "type-28956", ++ "self_type" : "type-28958", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102281,8 +102323,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-28957", +- "self_type" : "type-28959", ++ "referenced_type" : "type-29092", ++ "self_type" : "type-29094", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102290,8 +102332,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-29093", +- "self_type" : "type-29095", ++ "referenced_type" : "type-29236", ++ "self_type" : "type-29238", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102299,8 +102341,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-29237", +- "self_type" : "type-29239", ++ "referenced_type" : "type-29403", ++ "self_type" : "type-29405", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102308,8 +102350,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-29404", +- "self_type" : "type-29406", ++ "referenced_type" : "type-29569", ++ "self_type" : "type-29571", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102317,8 +102359,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-29570", +- "self_type" : "type-29572", ++ "referenced_type" : "type-29710", ++ "self_type" : "type-29712", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102326,8 +102368,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-29711", +- "self_type" : "type-29713", ++ "referenced_type" : "type-29862", ++ "self_type" : "type-29864", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102335,8 +102377,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-29863", +- "self_type" : "type-29865", ++ "referenced_type" : "type-29985", ++ "self_type" : "type-29987", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102344,8 +102386,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-29986", +- "self_type" : "type-29988", ++ "referenced_type" : "type-30117", ++ "self_type" : "type-30119", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102353,8 +102395,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-30118", +- "self_type" : "type-30120", ++ "referenced_type" : "type-30237", ++ "self_type" : "type-30239", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102362,8 +102404,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-30238", +- "self_type" : "type-30240", ++ "referenced_type" : "type-30338", ++ "self_type" : "type-30340", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102371,8 +102413,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-30339", +- "self_type" : "type-30341", ++ "referenced_type" : "type-30512", ++ "self_type" : "type-30511", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102380,8 +102422,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-30513", +- "self_type" : "type-30512", ++ "referenced_type" : "type-30747", ++ "self_type" : "type-30749", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102389,8 +102431,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-30748", +- "self_type" : "type-30750", ++ "referenced_type" : "type-30864", ++ "self_type" : "type-30866", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102398,8 +102440,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-30865", +- "self_type" : "type-30867", ++ "referenced_type" : "type-30987", ++ "self_type" : "type-30989", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102407,8 +102449,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-30988", +- "self_type" : "type-30990", ++ "referenced_type" : "type-31140", ++ "self_type" : "type-31142", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102416,8 +102458,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-31141", +- "self_type" : "type-31143", ++ "referenced_type" : "type-31251", ++ "self_type" : "type-31253", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102425,8 +102467,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-31252", +- "self_type" : "type-31254", ++ "referenced_type" : "type-31354", ++ "self_type" : "type-31356", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102434,8 +102476,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-31355", +- "self_type" : "type-31357", ++ "referenced_type" : "type-31477", ++ "self_type" : "type-31479", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102443,8 +102485,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-31478", +- "self_type" : "type-31480", ++ "referenced_type" : "type-31531", ++ "self_type" : "type-31533", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102452,8 +102494,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-31532", +- "self_type" : "type-31534", ++ "referenced_type" : "type-31596", ++ "self_type" : "type-31598", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102461,8 +102503,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-31597", +- "self_type" : "type-31599", ++ "referenced_type" : "type-31670", ++ "self_type" : "type-31673", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102470,8 +102512,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-31671", +- "self_type" : "type-31674", ++ "referenced_type" : "type-3169", ++ "self_type" : "type-3168", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102479,8 +102521,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-31747", +- "self_type" : "type-31749", ++ "referenced_type" : "type-31746", ++ "self_type" : "type-31748", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102488,8 +102530,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-31934", +- "self_type" : "type-31937", ++ "referenced_type" : "type-31933", ++ "self_type" : "type-31936", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102497,8 +102539,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-32069", +- "self_type" : "type-32071", ++ "referenced_type" : "type-32068", ++ "self_type" : "type-32070", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102506,8 +102548,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-32147", +- "self_type" : "type-32149", ++ "referenced_type" : "type-32146", ++ "self_type" : "type-32148", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102515,8 +102557,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-3217", +- "self_type" : "type-3216", ++ "referenced_type" : "type-3411", ++ "self_type" : "type-3413", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102524,8 +102566,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-3459", +- "self_type" : "type-3461", ++ "referenced_type" : "type-3534", ++ "self_type" : "type-3536", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102533,8 +102575,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-3582", +- "self_type" : "type-3584", ++ "referenced_type" : "type-3689", ++ "self_type" : "type-3691", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102542,8 +102584,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-3737", +- "self_type" : "type-3739", ++ "referenced_type" : "type-3883", ++ "self_type" : "type-3885", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102551,8 +102593,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-3931", +- "self_type" : "type-3933", ++ "referenced_type" : "type-4043", ++ "self_type" : "type-4045", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102560,8 +102602,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-4091", +- "self_type" : "type-4093", ++ "referenced_type" : "type-4149", ++ "self_type" : "type-4151", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102569,8 +102611,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-4197", +- "self_type" : "type-4199", ++ "referenced_type" : "type-4302", ++ "self_type" : "type-4304", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102578,8 +102620,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-4350", +- "self_type" : "type-4352", ++ "referenced_type" : "type-4358", ++ "self_type" : "type-4360", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102587,8 +102629,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-4406", +- "self_type" : "type-4408", ++ "referenced_type" : "type-4424", ++ "self_type" : "type-4426", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102596,8 +102638,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-4472", +- "self_type" : "type-4474", ++ "referenced_type" : "type-4610", ++ "self_type" : "type-4612", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102605,8 +102647,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-4658", +- "self_type" : "type-4660", ++ "referenced_type" : "type-5149", ++ "self_type" : "type-5148", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102614,8 +102656,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-5197", +- "self_type" : "type-5196", ++ "referenced_type" : "type-5391", ++ "self_type" : "type-5393", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102623,8 +102665,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-5439", +- "self_type" : "type-5441", ++ "referenced_type" : "type-5512", ++ "self_type" : "type-5514", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102632,8 +102674,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-5560", +- "self_type" : "type-5562", ++ "referenced_type" : "type-5638", ++ "self_type" : "type-5640", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102641,8 +102683,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-5686", +- "self_type" : "type-5688", ++ "referenced_type" : "type-5791", ++ "self_type" : "type-5793", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102650,8 +102692,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-5839", +- "self_type" : "type-5841", ++ "referenced_type" : "type-5902", ++ "self_type" : "type-5904", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102659,8 +102701,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-5950", +- "self_type" : "type-5952", ++ "referenced_type" : "type-6005", ++ "self_type" : "type-6007", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102668,8 +102710,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-6053", +- "self_type" : "type-6055", ++ "referenced_type" : "type-6128", ++ "self_type" : "type-6130", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102677,8 +102719,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-6176", +- "self_type" : "type-6178", ++ "referenced_type" : "type-6182", ++ "self_type" : "type-6184", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102686,8 +102728,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-6230", +- "self_type" : "type-6232", ++ "referenced_type" : "type-6247", ++ "self_type" : "type-6249", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102695,8 +102737,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-6295", +- "self_type" : "type-6297", ++ "referenced_type" : "type-6324", ++ "self_type" : "type-6327", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102704,8 +102746,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-6372", +- "self_type" : "type-6375", ++ "referenced_type" : "type-6402", ++ "self_type" : "type-6404", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102713,8 +102755,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-6450", +- "self_type" : "type-6452", ++ "referenced_type" : "type-6686", ++ "self_type" : "type-6689", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102722,8 +102764,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-6734", +- "self_type" : "type-6737", ++ "referenced_type" : "type-6887", ++ "self_type" : "type-6889", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102731,8 +102773,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-6935", +- "self_type" : "type-6937", ++ "referenced_type" : "type-6980", ++ "self_type" : "type-6982", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102740,8 +102782,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-7028", +- "self_type" : "type-7030", ++ "referenced_type" : "type-7106", ++ "self_type" : "type-7108", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102749,8 +102791,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-7154", +- "self_type" : "type-7156", ++ "referenced_type" : "type-7507", ++ "self_type" : "type-7509", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102758,8 +102800,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-7555", +- "self_type" : "type-7557", ++ "referenced_type" : "type-7597", ++ "self_type" : "type-7600", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102767,8 +102809,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-7645", +- "self_type" : "type-7648", ++ "referenced_type" : "type-7771", ++ "self_type" : "type-7773", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102776,8 +102818,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-7819", +- "self_type" : "type-7821", ++ "referenced_type" : "type-7877", ++ "self_type" : "type-7879", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102785,8 +102827,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-7925", +- "self_type" : "type-7927", ++ "referenced_type" : "type-7968", ++ "self_type" : "type-7970", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102794,8 +102836,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-8016", +- "self_type" : "type-8018", ++ "referenced_type" : "type-8055", ++ "self_type" : "type-8057", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102803,8 +102845,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-8103", +- "self_type" : "type-8105", ++ "referenced_type" : "type-8424", ++ "self_type" : "type-8423", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102812,8 +102854,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-8472", +- "self_type" : "type-8471", ++ "referenced_type" : "type-8656", ++ "self_type" : "type-8658", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102821,8 +102863,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-8704", +- "self_type" : "type-8706", ++ "referenced_type" : "type-8771", ++ "self_type" : "type-8773", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102830,8 +102872,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-8819", +- "self_type" : "type-8821", ++ "referenced_type" : "type-8895", ++ "self_type" : "type-8897", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102839,8 +102881,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-8943", +- "self_type" : "type-8945", ++ "referenced_type" : "type-9048", ++ "self_type" : "type-9050", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102848,8 +102890,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-9096", +- "self_type" : "type-9098", ++ "referenced_type" : "type-9159", ++ "self_type" : "type-9161", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102857,8 +102899,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-9207", +- "self_type" : "type-9209", ++ "referenced_type" : "type-9262", ++ "self_type" : "type-9264", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102866,8 +102908,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-9310", +- "self_type" : "type-9312", ++ "referenced_type" : "type-9385", ++ "self_type" : "type-9387", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102875,8 +102917,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-9433", +- "self_type" : "type-9435", ++ "referenced_type" : "type-9439", ++ "self_type" : "type-9441", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102884,8 +102926,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-9487", +- "self_type" : "type-9489", ++ "referenced_type" : "type-9504", ++ "self_type" : "type-9506", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102893,8 +102935,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-9552", +- "self_type" : "type-9554", ++ "referenced_type" : "type-9578", ++ "self_type" : "type-9581", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102902,8 +102944,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-9626", +- "self_type" : "type-9629", ++ "referenced_type" : "type-9654", ++ "self_type" : "type-9656", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102911,8 +102953,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-9702", +- "self_type" : "type-9704", ++ "referenced_type" : "type-9841", ++ "self_type" : "type-9844", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102920,8 +102962,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileDescriptorTables *", + "name" : "const google::protobuf::FileDescriptorTables *", +- "referenced_type" : "type-9889", +- "self_type" : "type-9892", ++ "referenced_type" : "type-9975", ++ "self_type" : "type-9977", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102929,8 +102971,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-12150", +- "self_type" : "type-12152", ++ "referenced_type" : "type-12102", ++ "self_type" : "type-12104", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102938,8 +102980,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-13218", +- "self_type" : "type-13220", ++ "referenced_type" : "type-13170", ++ "self_type" : "type-13172", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102947,8 +102989,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-14770", +- "self_type" : "type-14772", ++ "referenced_type" : "type-14722", ++ "self_type" : "type-14724", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102956,8 +102998,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-14862", +- "self_type" : "type-14864", ++ "referenced_type" : "type-14814", ++ "self_type" : "type-14816", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102965,8 +103007,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-15126", +- "self_type" : "type-15128", ++ "referenced_type" : "type-15078", ++ "self_type" : "type-15080", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102974,8 +103016,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-15225", +- "self_type" : "type-15227", ++ "referenced_type" : "type-15177", ++ "self_type" : "type-15179", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102983,8 +103025,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-16005", +- "self_type" : "type-16007", ++ "referenced_type" : "type-15957", ++ "self_type" : "type-15959", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -102992,8 +103034,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-17074", +- "self_type" : "type-17076", ++ "referenced_type" : "type-17026", ++ "self_type" : "type-17028", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103001,8 +103043,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-18634", +- "self_type" : "type-18636", ++ "referenced_type" : "type-18586", ++ "self_type" : "type-18588", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103010,8 +103052,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-18719", +- "self_type" : "type-18721", ++ "referenced_type" : "type-18671", ++ "self_type" : "type-18673", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103019,8 +103061,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-18910", +- "self_type" : "type-18912", ++ "referenced_type" : "type-18862", ++ "self_type" : "type-18864", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103028,8 +103070,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-19007", +- "self_type" : "type-19009", ++ "referenced_type" : "type-18959", ++ "self_type" : "type-18961", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103037,8 +103079,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-19248", +- "self_type" : "type-19250", ++ "referenced_type" : "type-19200", ++ "self_type" : "type-19202", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103046,8 +103088,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-19577", +- "self_type" : "type-19579", ++ "referenced_type" : "type-1937", ++ "self_type" : "type-1936", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103055,8 +103097,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-19749", +- "self_type" : "type-19751", ++ "referenced_type" : "type-19529", ++ "self_type" : "type-19531", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103064,8 +103106,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-19917", +- "self_type" : "type-19919", ++ "referenced_type" : "type-19701", ++ "self_type" : "type-19703", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103073,8 +103115,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-2011", +- "self_type" : "type-2010", ++ "referenced_type" : "type-19869", ++ "self_type" : "type-19871", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103082,8 +103124,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-20537", +- "self_type" : "type-20539", ++ "referenced_type" : "type-20489", ++ "self_type" : "type-20491", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103091,8 +103133,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-21606", +- "self_type" : "type-21608", ++ "referenced_type" : "type-21558", ++ "self_type" : "type-21560", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103100,8 +103142,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-23163", +- "self_type" : "type-23165", ++ "referenced_type" : "type-23147", ++ "self_type" : "type-23149", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103109,8 +103151,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-23248", +- "self_type" : "type-23250", ++ "referenced_type" : "type-23237", ++ "self_type" : "type-23239", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103118,8 +103160,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-23439", +- "self_type" : "type-23441", ++ "referenced_type" : "type-23419", ++ "self_type" : "type-23421", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103127,8 +103169,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-23536", +- "self_type" : "type-23538", ++ "referenced_type" : "type-23514", ++ "self_type" : "type-23516", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103136,8 +103178,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-23769", +- "self_type" : "type-23771", ++ "referenced_type" : "type-23756", ++ "self_type" : "type-23758", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103145,8 +103187,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-24047", +- "self_type" : "type-24049", ++ "referenced_type" : "type-24046", ++ "self_type" : "type-24048", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103154,8 +103196,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-24216", +- "self_type" : "type-24218", ++ "referenced_type" : "type-24220", ++ "self_type" : "type-24222", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103163,8 +103205,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-24382", +- "self_type" : "type-24384", ++ "referenced_type" : "type-24363", ++ "self_type" : "type-24365", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103172,8 +103214,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-24522", +- "self_type" : "type-24525", ++ "referenced_type" : "type-24500", ++ "self_type" : "type-24502", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103181,8 +103223,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-24804", +- "self_type" : "type-24806", ++ "referenced_type" : "type-2471", ++ "self_type" : "type-2473", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103190,8 +103232,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-24959", +- "self_type" : "type-24961", ++ "referenced_type" : "type-24763", ++ "self_type" : "type-24766", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103199,8 +103241,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-25090", +- "self_type" : "type-25092", ++ "referenced_type" : "type-24927", ++ "self_type" : "type-24929", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103208,8 +103250,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-2541", +- "self_type" : "type-2543", ++ "referenced_type" : "type-25061", ++ "self_type" : "type-25064", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103217,8 +103259,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-25716", +- "self_type" : "type-25718", ++ "referenced_type" : "type-25767", ++ "self_type" : "type-25769", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103226,8 +103268,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-26784", +- "self_type" : "type-26786", ++ "referenced_type" : "type-26807", ++ "self_type" : "type-26809", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103235,8 +103277,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-28348", +- "self_type" : "type-28350", ++ "referenced_type" : "type-28347", ++ "self_type" : "type-28349", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103244,8 +103286,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-28433", +- "self_type" : "type-28435", ++ "referenced_type" : "type-28432", ++ "self_type" : "type-28434", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103253,8 +103295,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-28624", +- "self_type" : "type-28626", ++ "referenced_type" : "type-28623", ++ "self_type" : "type-28625", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103262,8 +103304,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-28721", +- "self_type" : "type-28723", ++ "referenced_type" : "type-28720", ++ "self_type" : "type-28722", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103271,8 +103313,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-28954", +- "self_type" : "type-28956", ++ "referenced_type" : "type-28953", ++ "self_type" : "type-28955", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103280,8 +103322,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-29232", +- "self_type" : "type-29234", ++ "referenced_type" : "type-29231", ++ "self_type" : "type-29233", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103289,8 +103331,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-29401", +- "self_type" : "type-29403", ++ "referenced_type" : "type-29400", ++ "self_type" : "type-29402", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103298,8 +103340,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-29567", +- "self_type" : "type-29569", ++ "referenced_type" : "type-29566", ++ "self_type" : "type-29568", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103307,8 +103349,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-29707", +- "self_type" : "type-29710", ++ "referenced_type" : "type-29706", ++ "self_type" : "type-29709", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103316,8 +103358,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-29983", +- "self_type" : "type-29985", ++ "referenced_type" : "type-29982", ++ "self_type" : "type-29984", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103325,8 +103367,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-30115", +- "self_type" : "type-30117", ++ "referenced_type" : "type-30114", ++ "self_type" : "type-30116", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103334,8 +103376,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-30235", +- "self_type" : "type-30237", ++ "referenced_type" : "type-30234", ++ "self_type" : "type-30236", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103343,8 +103385,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-30862", +- "self_type" : "type-30864", ++ "referenced_type" : "type-30861", ++ "self_type" : "type-30863", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103352,8 +103394,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-31931", +- "self_type" : "type-31933", ++ "referenced_type" : "type-31930", ++ "self_type" : "type-31932", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103361,8 +103403,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-3579", +- "self_type" : "type-3581", ++ "referenced_type" : "type-3531", ++ "self_type" : "type-3533", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103370,8 +103412,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-5557", +- "self_type" : "type-5559", ++ "referenced_type" : "type-5509", ++ "self_type" : "type-5511", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103379,8 +103421,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-6731", +- "self_type" : "type-6733", ++ "referenced_type" : "type-6683", ++ "self_type" : "type-6685", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103388,8 +103430,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-8816", +- "self_type" : "type-8818", ++ "referenced_type" : "type-8768", ++ "self_type" : "type-8770", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103397,8 +103439,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FileOptions *", + "name" : "const google::protobuf::FileOptions *", +- "referenced_type" : "type-9886", +- "self_type" : "type-9888", ++ "referenced_type" : "type-9838", ++ "self_type" : "type-9840", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103406,8 +103448,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::FloatValue *", + "name" : "const google::protobuf::FloatValue *", +- "referenced_type" : "type-11102", +- "self_type" : "type-11101", ++ "referenced_type" : "type-11054", ++ "self_type" : "type-11053", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -103415,8 +103457,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::GeneratedCodeInfo *", + "name" : "const google::protobuf::GeneratedCodeInfo *", +- "referenced_type" : "type-2265", +- "self_type" : "type-2267", ++ "referenced_type" : "type-2194", ++ "self_type" : "type-2196", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -103424,8 +103466,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::GeneratedCodeInfo_Annotation *", + "name" : "const google::protobuf::GeneratedCodeInfo_Annotation *", +- "referenced_type" : "type-1927", +- "self_type" : "type-1928", ++ "referenced_type" : "type-1848", ++ "self_type" : "type-1849", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -103433,8 +103475,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Int32Value *", + "name" : "const google::protobuf::Int32Value *", +- "referenced_type" : "type-11114", +- "self_type" : "type-11113", ++ "referenced_type" : "type-11066", ++ "self_type" : "type-11065", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -103442,8 +103484,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Int64Value *", + "name" : "const google::protobuf::Int64Value *", +- "referenced_type" : "type-11106", +- "self_type" : "type-11105", ++ "referenced_type" : "type-11058", ++ "self_type" : "type-11057", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -103451,8 +103493,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ListValue *", + "name" : "const google::protobuf::ListValue *", +- "referenced_type" : "type-7283", +- "self_type" : "type-7606", ++ "referenced_type" : "type-7235", ++ "self_type" : "type-7558", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -103460,8 +103502,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map::InnerMap *", + "name" : "const google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-6653", +- "self_type" : "type-6652", ++ "referenced_type" : "type-6605", ++ "self_type" : "type-6604", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -103469,8 +103511,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map::InnerMap::KeyCompare *", + "name" : "const google::protobuf::Map::InnerMap::KeyCompare *", +- "referenced_type" : "type-6649", +- "self_type" : "type-6650", ++ "referenced_type" : "type-6601", ++ "self_type" : "type-6602", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -103478,8 +103520,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map::InnerMap::Node *", + "name" : "const google::protobuf::Map::InnerMap::Node *", +- "referenced_type" : "type-6632", +- "self_type" : "type-6633", ++ "referenced_type" : "type-6584", ++ "self_type" : "type-6585", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -103487,8 +103529,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map::InnerMap::iterator_base::KeyValuePair> *", + "name" : "const google::protobuf::Map::InnerMap::iterator_base::KeyValuePair> *", +- "referenced_type" : "type-6656", +- "self_type" : "type-6666", ++ "referenced_type" : "type-6608", ++ "self_type" : "type-6618", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -103496,8 +103538,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map::InnerMap::iterator_base::KeyValuePair> *", + "name" : "const google::protobuf::Map::InnerMap::iterator_base::KeyValuePair> *", +- "referenced_type" : "type-6661", +- "self_type" : "type-6662", ++ "referenced_type" : "type-6613", ++ "self_type" : "type-6614", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -103505,8 +103547,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map::KeyValuePair *", + "name" : "const google::protobuf::Map::KeyValuePair *", +- "referenced_type" : "type-6579", +- "self_type" : "type-6644", ++ "referenced_type" : "type-6531", ++ "self_type" : "type-6596", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -103514,8 +103556,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map::const_iterator *", + "name" : "const google::protobuf::Map::const_iterator *", +- "referenced_type" : "type-6681", +- "self_type" : "type-6685", ++ "referenced_type" : "type-6633", ++ "self_type" : "type-6637", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -103523,8 +103565,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map::iterator *", + "name" : "const google::protobuf::Map::iterator *", +- "referenced_type" : "type-6696", +- "self_type" : "type-6697", ++ "referenced_type" : "type-6648", ++ "self_type" : "type-6649", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -103532,8 +103574,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map::iterator_base *", + "name" : "const google::protobuf::Map::iterator_base *", +- "referenced_type" : "type-6671", +- "self_type" : "type-6672", ++ "referenced_type" : "type-6623", ++ "self_type" : "type-6624", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -103541,8 +103583,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map, Value>::InnerMap *", + "name" : "const google::protobuf::Map, Value>::InnerMap *", +- "referenced_type" : "type-7495", +- "self_type" : "type-7494", ++ "referenced_type" : "type-7447", ++ "self_type" : "type-7446", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -103550,8 +103592,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map, Value>::InnerMap::KeyCompare *", + "name" : "const google::protobuf::Map, Value>::InnerMap::KeyCompare *", +- "referenced_type" : "type-7490", +- "self_type" : "type-7491", ++ "referenced_type" : "type-7442", ++ "self_type" : "type-7443", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -103559,8 +103601,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map, Value>::InnerMap::Node *", + "name" : "const google::protobuf::Map, Value>::InnerMap::Node *", +- "referenced_type" : "type-7480", +- "self_type" : "type-7481", ++ "referenced_type" : "type-7432", ++ "self_type" : "type-7433", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -103568,8 +103610,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map, Value>::InnerMap::iterator_base, Value>::KeyValuePair> *", + "name" : "const google::protobuf::Map, Value>::InnerMap::iterator_base, Value>::KeyValuePair> *", +- "referenced_type" : "type-7501", +- "self_type" : "type-7511", ++ "referenced_type" : "type-7453", ++ "self_type" : "type-7463", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -103577,8 +103619,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map, Value>::InnerMap::iterator_base, Value>::KeyValuePair> *", + "name" : "const google::protobuf::Map, Value>::InnerMap::iterator_base, Value>::KeyValuePair> *", +- "referenced_type" : "type-7506", +- "self_type" : "type-7507", ++ "referenced_type" : "type-7458", ++ "self_type" : "type-7459", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -103586,8 +103628,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map, Value>::KeyValuePair *", + "name" : "const google::protobuf::Map, Value>::KeyValuePair *", +- "referenced_type" : "type-7420", +- "self_type" : "type-7484", ++ "referenced_type" : "type-7372", ++ "self_type" : "type-7436", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -103595,8 +103637,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map, Value>::const_iterator *", + "name" : "const google::protobuf::Map, Value>::const_iterator *", +- "referenced_type" : "type-7526", +- "self_type" : "type-7530", ++ "referenced_type" : "type-7478", ++ "self_type" : "type-7482", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -103604,8 +103646,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map, Value>::iterator *", + "name" : "const google::protobuf::Map, Value>::iterator *", +- "referenced_type" : "type-7542", +- "self_type" : "type-7543", ++ "referenced_type" : "type-7494", ++ "self_type" : "type-7495", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -103613,8 +103655,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map, Value>::iterator_base *", + "name" : "const google::protobuf::Map, Value>::iterator_base *", +- "referenced_type" : "type-7516", +- "self_type" : "type-7517", ++ "referenced_type" : "type-7468", ++ "self_type" : "type-7469", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -103622,8 +103664,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map *", + "name" : "const google::protobuf::Map *", +- "referenced_type" : "type-6700", +- "self_type" : "type-6701", ++ "referenced_type" : "type-6652", ++ "self_type" : "type-6653", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -103631,8 +103673,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Map, std::allocator >, google::protobuf::Value> *", + "name" : "const google::protobuf::Map, std::allocator >, google::protobuf::Value> *", +- "referenced_type" : "type-7309", +- "self_type" : "type-7546", ++ "referenced_type" : "type-7261", ++ "self_type" : "type-7498", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -103640,8 +103682,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapIterator *", + "name" : "const google::protobuf::MapIterator *", +- "referenced_type" : "type-4287", +- "self_type" : "type-6778", ++ "referenced_type" : "type-4239", ++ "self_type" : "type-6730", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, +@@ -103649,8 +103691,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapKey *", + "name" : "const google::protobuf::MapKey *", +- "referenced_type" : "type-4359", +- "self_type" : "type-4384", ++ "referenced_type" : "type-4311", ++ "self_type" : "type-4336", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -103658,8 +103700,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapPair *", + "name" : "const google::protobuf::MapPair *", +- "referenced_type" : "type-6684", +- "self_type" : "type-6686", ++ "referenced_type" : "type-6636", ++ "self_type" : "type-6638", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -103667,8 +103709,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *", + "name" : "const google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *", +- "referenced_type" : "type-7529", +- "self_type" : "type-7531", ++ "referenced_type" : "type-7481", ++ "self_type" : "type-7483", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -103676,8 +103718,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MapValueRef *", + "name" : "const google::protobuf::MapValueRef *", +- "referenced_type" : "type-4243", +- "self_type" : "type-4242", ++ "referenced_type" : "type-4195", ++ "self_type" : "type-4194", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -103685,8 +103727,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Message *", + "name" : "const google::protobuf::Message *", +- "referenced_type" : "type-1872", +- "self_type" : "type-2056", ++ "referenced_type" : "type-1790", ++ "self_type" : "type-1986", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103703,8 +103745,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-12128", +- "self_type" : "type-12195", ++ "referenced_type" : "type-12080", ++ "self_type" : "type-12147", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103712,8 +103754,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-13192", +- "self_type" : "type-13194", ++ "referenced_type" : "type-13144", ++ "self_type" : "type-13146", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103721,8 +103763,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-14744", +- "self_type" : "type-14746", ++ "referenced_type" : "type-14696", ++ "self_type" : "type-14698", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103730,8 +103772,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-14833", +- "self_type" : "type-14835", ++ "referenced_type" : "type-14785", ++ "self_type" : "type-14787", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103739,8 +103781,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-15097", +- "self_type" : "type-15099", ++ "referenced_type" : "type-15049", ++ "self_type" : "type-15051", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103748,8 +103790,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-15191", +- "self_type" : "type-15193", ++ "referenced_type" : "type-15143", ++ "self_type" : "type-15145", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103757,8 +103799,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-15983", +- "self_type" : "type-16050", ++ "referenced_type" : "type-15935", ++ "self_type" : "type-16002", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103766,8 +103808,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-17048", +- "self_type" : "type-17050", ++ "referenced_type" : "type-17000", ++ "self_type" : "type-17002", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103775,8 +103817,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-18608", +- "self_type" : "type-18610", ++ "referenced_type" : "type-18560", ++ "self_type" : "type-18562", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103784,8 +103826,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-18690", +- "self_type" : "type-18692", ++ "referenced_type" : "type-18642", ++ "self_type" : "type-18644", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103793,8 +103835,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-18881", +- "self_type" : "type-18883", ++ "referenced_type" : "type-18833", ++ "self_type" : "type-18835", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103802,8 +103844,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-18975", +- "self_type" : "type-18977", ++ "referenced_type" : "type-18927", ++ "self_type" : "type-18929", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103811,8 +103853,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-19215", +- "self_type" : "type-19217", ++ "referenced_type" : "type-19167", ++ "self_type" : "type-19169", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103820,8 +103862,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-19552", +- "self_type" : "type-19554", ++ "referenced_type" : "type-1944", ++ "self_type" : "type-1943", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103829,8 +103871,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-19721", +- "self_type" : "type-19723", ++ "referenced_type" : "type-19504", ++ "self_type" : "type-19506", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103838,8 +103880,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-19883", +- "self_type" : "type-19885", ++ "referenced_type" : "type-19673", ++ "self_type" : "type-19675", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103847,8 +103889,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-2018", +- "self_type" : "type-2017", ++ "referenced_type" : "type-19835", ++ "self_type" : "type-19837", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103856,8 +103898,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-20515", +- "self_type" : "type-20582", ++ "referenced_type" : "type-20467", ++ "self_type" : "type-20534", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103865,8 +103907,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-21580", +- "self_type" : "type-21582", ++ "referenced_type" : "type-21532", ++ "self_type" : "type-21534", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103874,8 +103916,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-23137", +- "self_type" : "type-23139", ++ "referenced_type" : "type-23122", ++ "self_type" : "type-23124", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103883,8 +103925,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-23219", +- "self_type" : "type-23221", ++ "referenced_type" : "type-23207", ++ "self_type" : "type-23210", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103892,8 +103934,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-23410", +- "self_type" : "type-23412", ++ "referenced_type" : "type-23393", ++ "self_type" : "type-23395", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103901,8 +103943,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-23504", +- "self_type" : "type-23506", ++ "referenced_type" : "type-23482", ++ "self_type" : "type-23484", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103910,8 +103952,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-23736", +- "self_type" : "type-23738", ++ "referenced_type" : "type-23724", ++ "self_type" : "type-23726", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103919,8 +103961,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-24022", +- "self_type" : "type-24024", ++ "referenced_type" : "type-24019", ++ "self_type" : "type-24021", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103928,8 +103970,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-24188", +- "self_type" : "type-24190", ++ "referenced_type" : "type-24193", ++ "self_type" : "type-24195", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103937,8 +103979,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-24350", +- "self_type" : "type-24352", ++ "referenced_type" : "type-24333", ++ "self_type" : "type-24335", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103946,8 +103988,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-24492", +- "self_type" : "type-24494", ++ "referenced_type" : "type-24471", ++ "self_type" : "type-24473", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103955,8 +103997,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-24778", +- "self_type" : "type-24780", ++ "referenced_type" : "type-2449", ++ "self_type" : "type-2516", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103964,8 +104006,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-24934", +- "self_type" : "type-24936", ++ "referenced_type" : "type-24734", ++ "self_type" : "type-24736", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103973,8 +104015,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-25063", +- "self_type" : "type-25065", ++ "referenced_type" : "type-24902", ++ "self_type" : "type-24904", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103982,8 +104024,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-2519", +- "self_type" : "type-2587", ++ "referenced_type" : "type-25034", ++ "self_type" : "type-25036", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -103991,8 +104033,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-25694", +- "self_type" : "type-25761", ++ "referenced_type" : "type-25745", ++ "self_type" : "type-25813", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104000,8 +104042,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-26758", +- "self_type" : "type-26760", ++ "referenced_type" : "type-26781", ++ "self_type" : "type-26783", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104009,8 +104051,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-28322", +- "self_type" : "type-28324", ++ "referenced_type" : "type-28321", ++ "self_type" : "type-28323", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104018,8 +104060,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-28404", +- "self_type" : "type-28406", ++ "referenced_type" : "type-28403", ++ "self_type" : "type-28405", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104027,8 +104069,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-28595", +- "self_type" : "type-28597", ++ "referenced_type" : "type-28594", ++ "self_type" : "type-28596", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104036,8 +104078,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-28689", +- "self_type" : "type-28691", ++ "referenced_type" : "type-28688", ++ "self_type" : "type-28690", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104045,8 +104087,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-28921", +- "self_type" : "type-28923", ++ "referenced_type" : "type-28920", ++ "self_type" : "type-28922", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104054,8 +104096,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-29207", +- "self_type" : "type-29209", ++ "referenced_type" : "type-29206", ++ "self_type" : "type-29208", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104063,8 +104105,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-29373", +- "self_type" : "type-29375", ++ "referenced_type" : "type-29372", ++ "self_type" : "type-29374", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104072,8 +104114,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-29535", +- "self_type" : "type-29537", ++ "referenced_type" : "type-29534", ++ "self_type" : "type-29536", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104081,8 +104123,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-29677", +- "self_type" : "type-29679", ++ "referenced_type" : "type-29676", ++ "self_type" : "type-29678", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104090,8 +104132,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-29957", +- "self_type" : "type-29959", ++ "referenced_type" : "type-29956", ++ "self_type" : "type-29958", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104099,8 +104141,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-30090", +- "self_type" : "type-30092", ++ "referenced_type" : "type-30089", ++ "self_type" : "type-30091", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104108,8 +104150,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-30208", +- "self_type" : "type-30210", ++ "referenced_type" : "type-30207", ++ "self_type" : "type-30209", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104117,8 +104159,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-30840", +- "self_type" : "type-30907", ++ "referenced_type" : "type-30839", ++ "self_type" : "type-30906", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104126,8 +104168,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-31905", +- "self_type" : "type-31907", ++ "referenced_type" : "type-31904", ++ "self_type" : "type-31906", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104135,8 +104177,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-3557", +- "self_type" : "type-3624", ++ "referenced_type" : "type-3509", ++ "self_type" : "type-3576", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104144,8 +104186,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-5535", +- "self_type" : "type-5602", ++ "referenced_type" : "type-5487", ++ "self_type" : "type-5554", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104153,8 +104195,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-6704", +- "self_type" : "type-6706", ++ "referenced_type" : "type-6656", ++ "self_type" : "type-6658", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104162,8 +104204,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-8794", +- "self_type" : "type-8861", ++ "referenced_type" : "type-8746", ++ "self_type" : "type-8813", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104171,8 +104213,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MessageOptions *", + "name" : "const google::protobuf::MessageOptions *", +- "referenced_type" : "type-9860", +- "self_type" : "type-9862", ++ "referenced_type" : "type-9812", ++ "self_type" : "type-9814", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104180,8 +104222,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Method *", + "name" : "const google::protobuf::Method *", +- "referenced_type" : "type-2376", +- "self_type" : "type-2377", ++ "referenced_type" : "type-2304", ++ "self_type" : "type-2305", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -104189,8 +104231,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodDescriptor *", + "name" : "const google::protobuf::MethodDescriptor *", +- "referenced_type" : "type-2049", +- "self_type" : "type-2048", ++ "referenced_type" : "type-1979", ++ "self_type" : "type-1978", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104198,8 +104240,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodDescriptorProto *", + "name" : "const google::protobuf::MethodDescriptorProto *", +- "referenced_type" : "type-1911", +- "self_type" : "type-1912", ++ "referenced_type" : "type-1831", ++ "self_type" : "type-1832", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -104207,8 +104249,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-12146", +- "self_type" : "type-12148", ++ "referenced_type" : "type-12098", ++ "self_type" : "type-12100", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104216,8 +104258,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-13214", +- "self_type" : "type-13216", ++ "referenced_type" : "type-13166", ++ "self_type" : "type-13168", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104225,8 +104267,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-14766", +- "self_type" : "type-14768", ++ "referenced_type" : "type-14718", ++ "self_type" : "type-14720", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104234,8 +104276,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-14856", +- "self_type" : "type-14858", ++ "referenced_type" : "type-14808", ++ "self_type" : "type-14810", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104243,8 +104285,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-15119", +- "self_type" : "type-15121", ++ "referenced_type" : "type-15071", ++ "self_type" : "type-15073", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104252,8 +104294,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-15220", +- "self_type" : "type-15222", ++ "referenced_type" : "type-15172", ++ "self_type" : "type-15174", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104261,8 +104303,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-16001", +- "self_type" : "type-16003", ++ "referenced_type" : "type-15953", ++ "self_type" : "type-15955", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104270,8 +104312,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-17070", +- "self_type" : "type-17072", ++ "referenced_type" : "type-17022", ++ "self_type" : "type-17024", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104279,8 +104321,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-18630", +- "self_type" : "type-18632", ++ "referenced_type" : "type-18582", ++ "self_type" : "type-18584", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104288,8 +104330,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-18713", +- "self_type" : "type-18715", ++ "referenced_type" : "type-18665", ++ "self_type" : "type-18667", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104297,8 +104339,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-18903", +- "self_type" : "type-18905", ++ "referenced_type" : "type-18855", ++ "self_type" : "type-18857", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104306,8 +104348,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-19002", +- "self_type" : "type-19004", ++ "referenced_type" : "type-18954", ++ "self_type" : "type-18956", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104315,8 +104357,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-19244", +- "self_type" : "type-19246", ++ "referenced_type" : "type-1919", ++ "self_type" : "type-1918", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104324,8 +104366,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-19573", +- "self_type" : "type-19575", ++ "referenced_type" : "type-19196", ++ "self_type" : "type-19198", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104333,8 +104375,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-19745", +- "self_type" : "type-19747", ++ "referenced_type" : "type-19525", ++ "self_type" : "type-19527", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104342,8 +104384,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-19912", +- "self_type" : "type-19914", ++ "referenced_type" : "type-19697", ++ "self_type" : "type-19699", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104351,8 +104393,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-1993", +- "self_type" : "type-1992", ++ "referenced_type" : "type-19864", ++ "self_type" : "type-19866", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104360,8 +104402,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-20533", +- "self_type" : "type-20535", ++ "referenced_type" : "type-20485", ++ "self_type" : "type-20487", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104369,8 +104411,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-21602", +- "self_type" : "type-21604", ++ "referenced_type" : "type-21554", ++ "self_type" : "type-21556", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104378,8 +104420,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-23159", +- "self_type" : "type-23161", ++ "referenced_type" : "type-23143", ++ "self_type" : "type-23145", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104387,8 +104429,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-23242", +- "self_type" : "type-23244", ++ "referenced_type" : "type-23232", ++ "self_type" : "type-23235", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104396,8 +104438,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-23432", +- "self_type" : "type-23434", ++ "referenced_type" : "type-23415", ++ "self_type" : "type-23417", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104405,8 +104447,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-23531", +- "self_type" : "type-23533", ++ "referenced_type" : "type-23509", ++ "self_type" : "type-23511", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104414,8 +104456,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-23765", +- "self_type" : "type-23767", ++ "referenced_type" : "type-23752", ++ "self_type" : "type-23754", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104423,8 +104465,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-24043", +- "self_type" : "type-24045", ++ "referenced_type" : "type-24042", ++ "self_type" : "type-24044", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104432,8 +104474,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-24212", +- "self_type" : "type-24214", ++ "referenced_type" : "type-24216", ++ "self_type" : "type-24218", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104441,8 +104483,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-24377", +- "self_type" : "type-24379", ++ "referenced_type" : "type-24358", ++ "self_type" : "type-24360", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104450,8 +104492,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-24518", +- "self_type" : "type-24520", ++ "referenced_type" : "type-24496", ++ "self_type" : "type-24498", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104459,8 +104501,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-24799", +- "self_type" : "type-24802", ++ "referenced_type" : "type-2467", ++ "self_type" : "type-2469", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104468,8 +104510,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-24955", +- "self_type" : "type-24957", ++ "referenced_type" : "type-24759", ++ "self_type" : "type-24761", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104477,8 +104519,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-25084", +- "self_type" : "type-25086", ++ "referenced_type" : "type-24923", ++ "self_type" : "type-24925", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104486,8 +104528,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-2537", +- "self_type" : "type-2539", ++ "referenced_type" : "type-25055", ++ "self_type" : "type-25057", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104495,8 +104537,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-25712", +- "self_type" : "type-25714", ++ "referenced_type" : "type-25763", ++ "self_type" : "type-25765", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104504,8 +104546,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-26780", +- "self_type" : "type-26782", ++ "referenced_type" : "type-26802", ++ "self_type" : "type-26804", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104513,8 +104555,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-28344", +- "self_type" : "type-28346", ++ "referenced_type" : "type-28343", ++ "self_type" : "type-28345", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104522,8 +104564,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-28427", +- "self_type" : "type-28429", ++ "referenced_type" : "type-28426", ++ "self_type" : "type-28428", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104531,8 +104573,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-28617", +- "self_type" : "type-28619", ++ "referenced_type" : "type-28616", ++ "self_type" : "type-28618", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104540,8 +104582,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-28716", +- "self_type" : "type-28718", ++ "referenced_type" : "type-28715", ++ "self_type" : "type-28717", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104549,8 +104591,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-28950", +- "self_type" : "type-28952", ++ "referenced_type" : "type-28949", ++ "self_type" : "type-28951", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104558,8 +104600,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-29228", +- "self_type" : "type-29230", ++ "referenced_type" : "type-29227", ++ "self_type" : "type-29229", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104567,8 +104609,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-29397", +- "self_type" : "type-29399", ++ "referenced_type" : "type-29396", ++ "self_type" : "type-29398", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104576,8 +104618,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-29562", +- "self_type" : "type-29564", ++ "referenced_type" : "type-29561", ++ "self_type" : "type-29563", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104585,8 +104627,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-29703", +- "self_type" : "type-29705", ++ "referenced_type" : "type-29702", ++ "self_type" : "type-29704", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104594,8 +104636,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-29978", +- "self_type" : "type-29981", ++ "referenced_type" : "type-29977", ++ "self_type" : "type-29980", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104603,8 +104645,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-30111", +- "self_type" : "type-30113", ++ "referenced_type" : "type-30110", ++ "self_type" : "type-30112", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104612,8 +104654,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-30229", +- "self_type" : "type-30231", ++ "referenced_type" : "type-30228", ++ "self_type" : "type-30230", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104621,8 +104663,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-30858", +- "self_type" : "type-30860", ++ "referenced_type" : "type-30857", ++ "self_type" : "type-30859", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104630,8 +104672,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-31927", +- "self_type" : "type-31929", ++ "referenced_type" : "type-31926", ++ "self_type" : "type-31928", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104639,8 +104681,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-3575", +- "self_type" : "type-3577", ++ "referenced_type" : "type-3527", ++ "self_type" : "type-3529", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104648,8 +104690,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-5553", +- "self_type" : "type-5555", ++ "referenced_type" : "type-5505", ++ "self_type" : "type-5507", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104657,8 +104699,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-6727", +- "self_type" : "type-6729", ++ "referenced_type" : "type-6679", ++ "self_type" : "type-6681", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104666,8 +104708,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-8812", +- "self_type" : "type-8814", ++ "referenced_type" : "type-8764", ++ "self_type" : "type-8766", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104675,8 +104717,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::MethodOptions *", + "name" : "const google::protobuf::MethodOptions *", +- "referenced_type" : "type-9882", +- "self_type" : "type-9884", ++ "referenced_type" : "type-9834", ++ "self_type" : "type-9836", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104684,8 +104726,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Mixin *", + "name" : "const google::protobuf::Mixin *", +- "referenced_type" : "type-2380", +- "self_type" : "type-2381", ++ "referenced_type" : "type-2308", ++ "self_type" : "type-2309", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -104693,8 +104735,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::OneofDescriptor *", + "name" : "const google::protobuf::OneofDescriptor *", +- "referenced_type" : "type-2000", +- "self_type" : "type-1999", ++ "referenced_type" : "type-1926", ++ "self_type" : "type-1925", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -104702,8 +104744,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::OneofDescriptorProto *", + "name" : "const google::protobuf::OneofDescriptorProto *", +- "referenced_type" : "type-1899", +- "self_type" : "type-1900", ++ "referenced_type" : "type-1818", ++ "self_type" : "type-1819", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -104711,8 +104753,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Option *", + "name" : "const google::protobuf::Option *", +- "referenced_type" : "type-2368", +- "self_type" : "type-2369", ++ "referenced_type" : "type-2296", ++ "self_type" : "type-2297", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -104720,8 +104762,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Reflection *", + "name" : "const google::protobuf::Reflection *", +- "referenced_type" : "type-2141", +- "self_type" : "type-2140", ++ "referenced_type" : "type-2072", ++ "self_type" : "type-2071", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -104729,8 +104771,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-10160", +- "self_type" : "type-10162", ++ "referenced_type" : "type-10112", ++ "self_type" : "type-10114", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104738,8 +104780,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-10268", +- "self_type" : "type-10270", ++ "referenced_type" : "type-10220", ++ "self_type" : "type-10222", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104747,8 +104789,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-10314", +- "self_type" : "type-10316", ++ "referenced_type" : "type-10266", ++ "self_type" : "type-10268", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104756,8 +104798,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-10671", +- "self_type" : "type-10673", ++ "referenced_type" : "type-10623", ++ "self_type" : "type-10625", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104765,8 +104807,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-10772", +- "self_type" : "type-10774", ++ "referenced_type" : "type-10724", ++ "self_type" : "type-10726", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104774,8 +104816,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-10864", +- "self_type" : "type-10866", ++ "referenced_type" : "type-10816", ++ "self_type" : "type-10818", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104783,8 +104825,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-10975", +- "self_type" : "type-10977", ++ "referenced_type" : "type-10927", ++ "self_type" : "type-10929", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104792,8 +104834,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-11027", +- "self_type" : "type-11029", ++ "referenced_type" : "type-10979", ++ "self_type" : "type-10981", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104801,8 +104843,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-11141", +- "self_type" : "type-11145", ++ "referenced_type" : "type-11093", ++ "self_type" : "type-11097", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104810,8 +104852,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-11327", +- "self_type" : "type-11329", ++ "referenced_type" : "type-11279", ++ "self_type" : "type-11281", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104819,8 +104861,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-11485", +- "self_type" : "type-11487", ++ "referenced_type" : "type-11437", ++ "self_type" : "type-11439", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104828,8 +104870,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-11917", +- "self_type" : "type-11919", ++ "referenced_type" : "type-11869", ++ "self_type" : "type-11871", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104837,8 +104879,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-12090", +- "self_type" : "type-12092", ++ "referenced_type" : "type-12042", ++ "self_type" : "type-12044", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104846,8 +104888,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-12371", +- "self_type" : "type-12373", ++ "referenced_type" : "type-12323", ++ "self_type" : "type-12325", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104855,8 +104897,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-12472", +- "self_type" : "type-12474", ++ "referenced_type" : "type-12424", ++ "self_type" : "type-12426", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104864,8 +104906,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-12612", +- "self_type" : "type-12614", ++ "referenced_type" : "type-12564", ++ "self_type" : "type-12566", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104873,8 +104915,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-12670", +- "self_type" : "type-12672", ++ "referenced_type" : "type-12622", ++ "self_type" : "type-12624", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104882,8 +104924,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-12850", +- "self_type" : "type-12852", ++ "referenced_type" : "type-12802", ++ "self_type" : "type-12804", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104891,8 +104933,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-12988", +- "self_type" : "type-12990", ++ "referenced_type" : "type-12940", ++ "self_type" : "type-12942", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104900,8 +104942,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-13493", +- "self_type" : "type-13495", ++ "referenced_type" : "type-13445", ++ "self_type" : "type-13447", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104909,8 +104951,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-13559", +- "self_type" : "type-13561", ++ "referenced_type" : "type-13511", ++ "self_type" : "type-13513", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104918,8 +104960,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-13605", +- "self_type" : "type-13607", ++ "referenced_type" : "type-13557", ++ "self_type" : "type-13559", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104927,8 +104969,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-13962", +- "self_type" : "type-13964", ++ "referenced_type" : "type-13914", ++ "self_type" : "type-13916", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104936,8 +104978,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-14063", +- "self_type" : "type-14065", ++ "referenced_type" : "type-14015", ++ "self_type" : "type-14017", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104945,8 +104987,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-14155", +- "self_type" : "type-14157", ++ "referenced_type" : "type-14107", ++ "self_type" : "type-14109", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104954,8 +104996,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-14266", +- "self_type" : "type-14268", ++ "referenced_type" : "type-14218", ++ "self_type" : "type-14220", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104963,8 +105005,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-14318", +- "self_type" : "type-14320", ++ "referenced_type" : "type-14270", ++ "self_type" : "type-14272", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104972,8 +105014,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-14405", +- "self_type" : "type-14409", ++ "referenced_type" : "type-14357", ++ "self_type" : "type-14361", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104981,8 +105023,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-14578", +- "self_type" : "type-14580", ++ "referenced_type" : "type-14530", ++ "self_type" : "type-14532", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104990,8 +105032,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-14705", +- "self_type" : "type-14707", ++ "referenced_type" : "type-14657", ++ "self_type" : "type-14659", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -104999,8 +105041,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-14944", +- "self_type" : "type-14946", ++ "referenced_type" : "type-14896", ++ "self_type" : "type-14898", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105008,8 +105050,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-15148", +- "self_type" : "type-15150", ++ "referenced_type" : "type-15100", ++ "self_type" : "type-15102", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105017,8 +105059,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-15305", +- "self_type" : "type-15307", ++ "referenced_type" : "type-15257", ++ "self_type" : "type-15259", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105026,8 +105068,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-15773", +- "self_type" : "type-15775", ++ "referenced_type" : "type-15725", ++ "self_type" : "type-15727", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105035,8 +105077,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-15946", +- "self_type" : "type-15948", ++ "referenced_type" : "type-15898", ++ "self_type" : "type-15900", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105044,8 +105086,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16226", +- "self_type" : "type-16228", ++ "referenced_type" : "type-16178", ++ "self_type" : "type-16180", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105053,8 +105095,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16329", +- "self_type" : "type-16331", ++ "referenced_type" : "type-16281", ++ "self_type" : "type-16283", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105062,8 +105104,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16469", +- "self_type" : "type-16471", ++ "referenced_type" : "type-16421", ++ "self_type" : "type-16423", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105071,8 +105113,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16526", +- "self_type" : "type-16528", ++ "referenced_type" : "type-16478", ++ "self_type" : "type-16480", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105080,8 +105122,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16706", +- "self_type" : "type-16708", ++ "referenced_type" : "type-16658", ++ "self_type" : "type-16660", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105089,8 +105131,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16844", +- "self_type" : "type-16846", ++ "referenced_type" : "type-16796", ++ "self_type" : "type-16798", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105098,8 +105140,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17349", +- "self_type" : "type-17351", ++ "referenced_type" : "type-17301", ++ "self_type" : "type-17303", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105107,8 +105149,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17423", +- "self_type" : "type-17425", ++ "referenced_type" : "type-17375", ++ "self_type" : "type-17377", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105116,8 +105158,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17469", +- "self_type" : "type-17471", ++ "referenced_type" : "type-17421", ++ "self_type" : "type-17423", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105125,8 +105167,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17826", +- "self_type" : "type-17828", ++ "referenced_type" : "type-17778", ++ "self_type" : "type-17780", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105134,8 +105176,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17927", +- "self_type" : "type-17929", ++ "referenced_type" : "type-17879", ++ "self_type" : "type-17881", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105143,8 +105185,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18019", +- "self_type" : "type-18021", ++ "referenced_type" : "type-17971", ++ "self_type" : "type-17973", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105152,8 +105194,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18130", +- "self_type" : "type-18132", ++ "referenced_type" : "type-18082", ++ "self_type" : "type-18084", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105161,8 +105203,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18182", +- "self_type" : "type-18184", ++ "referenced_type" : "type-18134", ++ "self_type" : "type-18136", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105170,8 +105212,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18269", +- "self_type" : "type-18273", ++ "referenced_type" : "type-18221", ++ "self_type" : "type-18225", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105179,8 +105221,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18442", +- "self_type" : "type-18444", ++ "referenced_type" : "type-18394", ++ "self_type" : "type-18396", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105188,8 +105230,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18569", +- "self_type" : "type-18571", ++ "referenced_type" : "type-18521", ++ "self_type" : "type-18523", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105197,8 +105239,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18801", +- "self_type" : "type-18803", ++ "referenced_type" : "type-18753", ++ "self_type" : "type-18755", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105206,8 +105248,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18932", +- "self_type" : "type-18934", ++ "referenced_type" : "type-18884", ++ "self_type" : "type-18886", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105215,8 +105257,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19081", +- "self_type" : "type-19083", ++ "referenced_type" : "type-19033", ++ "self_type" : "type-19035", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105224,8 +105266,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19321", +- "self_type" : "type-19323", ++ "referenced_type" : "type-19273", ++ "self_type" : "type-19275", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105233,8 +105275,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19465", +- "self_type" : "type-19467", ++ "referenced_type" : "type-19417", ++ "self_type" : "type-19419", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105242,8 +105284,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19669", +- "self_type" : "type-19671", ++ "referenced_type" : "type-19621", ++ "self_type" : "type-19623", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105251,8 +105293,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19838", +- "self_type" : "type-19840", ++ "referenced_type" : "type-19790", ++ "self_type" : "type-19792", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105260,8 +105302,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19994", +- "self_type" : "type-19996", ++ "referenced_type" : "type-19946", ++ "self_type" : "type-19948", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105269,8 +105311,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-20307", +- "self_type" : "type-20309", ++ "referenced_type" : "type-20259", ++ "self_type" : "type-20261", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105278,8 +105320,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-20480", +- "self_type" : "type-20482", ++ "referenced_type" : "type-20432", ++ "self_type" : "type-20434", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105287,8 +105329,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-20757", +- "self_type" : "type-20759", ++ "referenced_type" : "type-20709", ++ "self_type" : "type-20711", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105296,8 +105338,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-20860", +- "self_type" : "type-20862", ++ "referenced_type" : "type-20812", ++ "self_type" : "type-20814", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105305,8 +105347,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-21000", +- "self_type" : "type-21002", ++ "referenced_type" : "type-20952", ++ "self_type" : "type-20954", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105314,8 +105356,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-21058", +- "self_type" : "type-21060", ++ "referenced_type" : "type-21010", ++ "self_type" : "type-21012", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105323,8 +105365,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-21238", +- "self_type" : "type-21240", ++ "referenced_type" : "type-2106", ++ "self_type" : "type-2108", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105332,8 +105374,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-21376", +- "self_type" : "type-21378", ++ "referenced_type" : "type-21190", ++ "self_type" : "type-21192", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105341,8 +105383,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-2176", +- "self_type" : "type-2178", ++ "referenced_type" : "type-21328", ++ "self_type" : "type-21330", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105350,8 +105392,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-21881", +- "self_type" : "type-21883", ++ "referenced_type" : "type-21833", ++ "self_type" : "type-21835", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105368,8 +105410,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-21998", +- "self_type" : "type-22000", ++ "referenced_type" : "type-21996", ++ "self_type" : "type-21998", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105377,8 +105419,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-22355", +- "self_type" : "type-22357", ++ "referenced_type" : "type-22322", ++ "self_type" : "type-22324", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105386,8 +105428,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-22456", +- "self_type" : "type-22458", ++ "referenced_type" : "type-22399", ++ "self_type" : "type-22401", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105395,8 +105437,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-22548", +- "self_type" : "type-22550", ++ "referenced_type" : "type-22467", ++ "self_type" : "type-22469", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105404,8 +105446,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-22659", +- "self_type" : "type-22661", ++ "referenced_type" : "type-22571", ++ "self_type" : "type-22573", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105413,8 +105455,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-22711", +- "self_type" : "type-22713", ++ "referenced_type" : "type-22636", ++ "self_type" : "type-22638", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105422,8 +105464,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-22798", +- "self_type" : "type-22802", ++ "referenced_type" : "type-22746", ++ "self_type" : "type-22748", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105431,8 +105473,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-22971", +- "self_type" : "type-22973", ++ "referenced_type" : "type-22938", ++ "self_type" : "type-22940", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105440,8 +105482,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23098", +- "self_type" : "type-23100", ++ "referenced_type" : "type-23083", ++ "self_type" : "type-23085", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105449,8 +105491,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23330", +- "self_type" : "type-23332", ++ "referenced_type" : "type-23325", ++ "self_type" : "type-23327", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105458,8 +105500,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23461", +- "self_type" : "type-23463", ++ "referenced_type" : "type-23439", ++ "self_type" : "type-23441", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105467,8 +105509,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23610", +- "self_type" : "type-23612", ++ "referenced_type" : "type-23591", ++ "self_type" : "type-23593", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105476,8 +105518,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23842", +- "self_type" : "type-23844", ++ "referenced_type" : "type-23831", ++ "self_type" : "type-23833", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105485,8 +105527,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23965", +- "self_type" : "type-23967", ++ "referenced_type" : "type-2396", ++ "self_type" : "type-2398", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105494,8 +105536,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24139", +- "self_type" : "type-24141", ++ "referenced_type" : "type-23969", ++ "self_type" : "type-23971", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105503,8 +105545,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24305", +- "self_type" : "type-24307", ++ "referenced_type" : "type-24135", ++ "self_type" : "type-24137", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105512,8 +105554,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24457", +- "self_type" : "type-24459", ++ "referenced_type" : "type-24306", ++ "self_type" : "type-24308", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105521,8 +105563,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24611", +- "self_type" : "type-24613", ++ "referenced_type" : "type-24436", ++ "self_type" : "type-24438", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105530,8 +105572,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-2464", +- "self_type" : "type-2466", ++ "referenced_type" : "type-24578", ++ "self_type" : "type-24580", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105539,8 +105581,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24739", +- "self_type" : "type-24741", ++ "referenced_type" : "type-24698", ++ "self_type" : "type-24700", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105548,8 +105590,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24873", +- "self_type" : "type-24875", ++ "referenced_type" : "type-24834", ++ "self_type" : "type-24836", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105557,8 +105599,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-25159", +- "self_type" : "type-25161", ++ "referenced_type" : "type-25135", ++ "self_type" : "type-25138", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105575,8 +105617,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-25483", +- "self_type" : "type-25485", ++ "referenced_type" : "type-25534", ++ "self_type" : "type-25536", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105584,8 +105626,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-25656", +- "self_type" : "type-25658", ++ "referenced_type" : "type-25705", ++ "self_type" : "type-25707", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105593,8 +105635,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-25936", +- "self_type" : "type-25938", ++ "referenced_type" : "type-25989", ++ "self_type" : "type-25991", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105602,8 +105644,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-26038", +- "self_type" : "type-26040", ++ "referenced_type" : "type-26091", ++ "self_type" : "type-26093", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105611,8 +105653,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-26178", +- "self_type" : "type-26180", ++ "referenced_type" : "type-26222", ++ "self_type" : "type-26224", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105620,8 +105662,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-26236", +- "self_type" : "type-26238", ++ "referenced_type" : "type-26278", ++ "self_type" : "type-26280", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105629,8 +105671,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-26416", +- "self_type" : "type-26418", ++ "referenced_type" : "type-26458", ++ "self_type" : "type-26460", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105638,8 +105680,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-26554", +- "self_type" : "type-26556", ++ "referenced_type" : "type-26581", ++ "self_type" : "type-26583", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105647,8 +105689,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-27059", +- "self_type" : "type-27061", ++ "referenced_type" : "type-27089", ++ "self_type" : "type-27091", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105656,8 +105698,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-27137", +- "self_type" : "type-27139", ++ "referenced_type" : "type-27136", ++ "self_type" : "type-27138", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105665,8 +105707,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-27183", +- "self_type" : "type-27185", ++ "referenced_type" : "type-27182", ++ "self_type" : "type-27184", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105674,8 +105716,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-27540", +- "self_type" : "type-27542", ++ "referenced_type" : "type-27539", ++ "self_type" : "type-27541", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105683,8 +105725,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-27641", +- "self_type" : "type-27643", ++ "referenced_type" : "type-27640", ++ "self_type" : "type-27642", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105692,8 +105734,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-27733", +- "self_type" : "type-27735", ++ "referenced_type" : "type-27732", ++ "self_type" : "type-27734", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105701,8 +105743,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-27844", +- "self_type" : "type-27846", ++ "referenced_type" : "type-27843", ++ "self_type" : "type-27845", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105710,8 +105752,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-27896", +- "self_type" : "type-27898", ++ "referenced_type" : "type-27895", ++ "self_type" : "type-27897", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105719,8 +105761,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-27983", +- "self_type" : "type-27987", ++ "referenced_type" : "type-27982", ++ "self_type" : "type-27986", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105728,8 +105770,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-28156", +- "self_type" : "type-28158", ++ "referenced_type" : "type-28155", ++ "self_type" : "type-28157", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105737,8 +105779,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-28283", +- "self_type" : "type-28285", ++ "referenced_type" : "type-28282", ++ "self_type" : "type-28284", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105746,8 +105788,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-28515", +- "self_type" : "type-28517", ++ "referenced_type" : "type-28514", ++ "self_type" : "type-28516", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105755,8 +105797,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-28646", +- "self_type" : "type-28648", ++ "referenced_type" : "type-28645", ++ "self_type" : "type-28647", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105764,8 +105806,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-28795", +- "self_type" : "type-28797", ++ "referenced_type" : "type-28794", ++ "self_type" : "type-28796", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105773,8 +105815,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29027", +- "self_type" : "type-29029", ++ "referenced_type" : "type-29026", ++ "self_type" : "type-29028", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105782,8 +105824,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29150", +- "self_type" : "type-29152", ++ "referenced_type" : "type-29149", ++ "self_type" : "type-29151", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105791,8 +105833,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29324", +- "self_type" : "type-29326", ++ "referenced_type" : "type-29323", ++ "self_type" : "type-29325", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105800,8 +105842,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29490", +- "self_type" : "type-29492", ++ "referenced_type" : "type-29489", ++ "self_type" : "type-29491", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105809,8 +105851,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29642", +- "self_type" : "type-29644", ++ "referenced_type" : "type-29641", ++ "self_type" : "type-29643", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105818,8 +105860,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29796", +- "self_type" : "type-29798", ++ "referenced_type" : "type-29795", ++ "self_type" : "type-29797", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105827,8 +105869,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29920", +- "self_type" : "type-29922", ++ "referenced_type" : "type-29919", ++ "self_type" : "type-29921", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105836,8 +105878,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-30052", +- "self_type" : "type-30054", ++ "referenced_type" : "type-30051", ++ "self_type" : "type-30053", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105845,8 +105887,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-30304", +- "self_type" : "type-30306", ++ "referenced_type" : "type-30303", ++ "self_type" : "type-30305", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105854,8 +105896,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-30398", +- "self_type" : "type-30400", ++ "referenced_type" : "type-30397", ++ "self_type" : "type-30399", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105863,8 +105905,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-30629", +- "self_type" : "type-30631", ++ "referenced_type" : "type-30628", ++ "self_type" : "type-30630", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105872,8 +105914,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-30802", +- "self_type" : "type-30804", ++ "referenced_type" : "type-30801", ++ "self_type" : "type-30803", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105881,8 +105923,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-31082", +- "self_type" : "type-31084", ++ "referenced_type" : "type-31081", ++ "self_type" : "type-31083", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105890,8 +105932,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-31185", +- "self_type" : "type-31187", ++ "referenced_type" : "type-31184", ++ "self_type" : "type-31186", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105899,8 +105941,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-31325", +- "self_type" : "type-31327", ++ "referenced_type" : "type-31324", ++ "self_type" : "type-31326", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105908,8 +105950,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-31383", +- "self_type" : "type-31385", ++ "referenced_type" : "type-31382", ++ "self_type" : "type-31384", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105917,8 +105959,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-31563", +- "self_type" : "type-31565", ++ "referenced_type" : "type-31562", ++ "self_type" : "type-31564", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105926,8 +105968,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-31701", +- "self_type" : "type-31703", ++ "referenced_type" : "type-31700", ++ "self_type" : "type-31702", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105935,8 +105977,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-32206", +- "self_type" : "type-32208", ++ "referenced_type" : "type-32205", ++ "self_type" : "type-32207", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105944,8 +105986,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-3334", +- "self_type" : "type-3336", ++ "referenced_type" : "type-3286", ++ "self_type" : "type-3288", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105953,8 +105995,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-3513", +- "self_type" : "type-3515", ++ "referenced_type" : "type-3465", ++ "self_type" : "type-3467", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105962,8 +106004,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-3854", +- "self_type" : "type-3856", ++ "referenced_type" : "type-3806", ++ "self_type" : "type-3808", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105971,8 +106013,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-3975", +- "self_type" : "type-3977", ++ "referenced_type" : "type-3927", ++ "self_type" : "type-3929", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105980,8 +106022,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-4164", +- "self_type" : "type-4166", ++ "referenced_type" : "type-4116", ++ "self_type" : "type-4118", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105989,8 +106031,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-4227", +- "self_type" : "type-4229", ++ "referenced_type" : "type-4179", ++ "self_type" : "type-4181", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -105998,8 +106040,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-4439", +- "self_type" : "type-4441", ++ "referenced_type" : "type-4391", ++ "self_type" : "type-4393", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106007,8 +106049,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-4684", +- "self_type" : "type-4686", ++ "referenced_type" : "type-4636", ++ "self_type" : "type-4638", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106016,8 +106058,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-5314", +- "self_type" : "type-5316", ++ "referenced_type" : "type-5266", ++ "self_type" : "type-5268", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106034,8 +106076,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-5493", +- "self_type" : "type-5495", ++ "referenced_type" : "type-5445", ++ "self_type" : "type-5447", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106043,8 +106085,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-5780", +- "self_type" : "type-5782", ++ "referenced_type" : "type-5732", ++ "self_type" : "type-5734", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106052,8 +106094,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-5883", +- "self_type" : "type-5885", ++ "referenced_type" : "type-5835", ++ "self_type" : "type-5837", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106061,8 +106103,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-6023", +- "self_type" : "type-6025", ++ "referenced_type" : "type-5975", ++ "self_type" : "type-5977", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106070,8 +106112,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-6081", +- "self_type" : "type-6083", ++ "referenced_type" : "type-6033", ++ "self_type" : "type-6035", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106079,8 +106121,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-6261", +- "self_type" : "type-6263", ++ "referenced_type" : "type-6213", ++ "self_type" : "type-6215", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106088,8 +106130,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-6404", +- "self_type" : "type-6406", ++ "referenced_type" : "type-6356", ++ "self_type" : "type-6358", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106097,8 +106139,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-7087", +- "self_type" : "type-7089", ++ "referenced_type" : "type-7039", ++ "self_type" : "type-7041", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106106,8 +106148,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-7180", +- "self_type" : "type-7182", ++ "referenced_type" : "type-7132", ++ "self_type" : "type-7134", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106115,8 +106157,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-7267", +- "self_type" : "type-7269", ++ "referenced_type" : "type-7219", ++ "self_type" : "type-7221", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106124,8 +106166,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-7756", +- "self_type" : "type-7758", ++ "referenced_type" : "type-7708", ++ "self_type" : "type-7710", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106133,8 +106175,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-7859", +- "self_type" : "type-7861", ++ "referenced_type" : "type-7811", ++ "self_type" : "type-7813", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106142,8 +106184,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-7966", +- "self_type" : "type-7968", ++ "referenced_type" : "type-7918", ++ "self_type" : "type-7920", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106151,8 +106193,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-8076", +- "self_type" : "type-8078", ++ "referenced_type" : "type-8028", ++ "self_type" : "type-8030", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106160,8 +106202,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-8128", +- "self_type" : "type-8130", ++ "referenced_type" : "type-8080", ++ "self_type" : "type-8082", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106169,8 +106211,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-8588", +- "self_type" : "type-8590", ++ "referenced_type" : "type-8540", ++ "self_type" : "type-8542", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106178,8 +106220,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-8758", +- "self_type" : "type-8760", ++ "referenced_type" : "type-8710", ++ "self_type" : "type-8712", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106187,8 +106229,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-9037", +- "self_type" : "type-9039", ++ "referenced_type" : "type-8989", ++ "self_type" : "type-8991", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106196,8 +106238,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-9140", +- "self_type" : "type-9142", ++ "referenced_type" : "type-9092", ++ "self_type" : "type-9094", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106205,8 +106247,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-9280", +- "self_type" : "type-9282", ++ "referenced_type" : "type-9232", ++ "self_type" : "type-9234", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106214,8 +106256,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-9338", +- "self_type" : "type-9340", ++ "referenced_type" : "type-9290", ++ "self_type" : "type-9292", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106223,8 +106265,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-9518", +- "self_type" : "type-9520", ++ "referenced_type" : "type-9470", ++ "self_type" : "type-9472", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106232,8 +106274,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-9656", +- "self_type" : "type-9658", ++ "referenced_type" : "type-9608", ++ "self_type" : "type-9610", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106241,8 +106283,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-10156", +- "self_type" : "type-10158", ++ "referenced_type" : "type-10108", ++ "self_type" : "type-10110", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106250,8 +106292,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-10666", +- "self_type" : "type-10669", ++ "referenced_type" : "type-10618", ++ "self_type" : "type-10621", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106259,8 +106301,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-10971", +- "self_type" : "type-10973", ++ "referenced_type" : "type-10923", ++ "self_type" : "type-10925", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106268,8 +106310,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-11322", +- "self_type" : "type-11325", ++ "referenced_type" : "type-11274", ++ "self_type" : "type-11277", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106277,8 +106319,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-11481", +- "self_type" : "type-11483", ++ "referenced_type" : "type-11433", ++ "self_type" : "type-11435", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106286,8 +106328,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-12367", +- "self_type" : "type-12369", ++ "referenced_type" : "type-12319", ++ "self_type" : "type-12321", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106295,8 +106337,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-13489", +- "self_type" : "type-13491", ++ "referenced_type" : "type-13441", ++ "self_type" : "type-13443", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106304,8 +106346,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-13957", +- "self_type" : "type-13960", ++ "referenced_type" : "type-13909", ++ "self_type" : "type-13912", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106313,8 +106355,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-14262", +- "self_type" : "type-14264", ++ "referenced_type" : "type-14214", ++ "self_type" : "type-14216", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106322,8 +106364,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-14573", +- "self_type" : "type-14576", ++ "referenced_type" : "type-14525", ++ "self_type" : "type-14528", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106331,8 +106373,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-14701", +- "self_type" : "type-14703", ++ "referenced_type" : "type-14653", ++ "self_type" : "type-14655", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106340,8 +106382,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-14940", +- "self_type" : "type-14942", ++ "referenced_type" : "type-14892", ++ "self_type" : "type-14894", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106349,8 +106391,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-15301", +- "self_type" : "type-15303", ++ "referenced_type" : "type-15253", ++ "self_type" : "type-15255", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106358,8 +106400,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16222", +- "self_type" : "type-16224", ++ "referenced_type" : "type-16174", ++ "self_type" : "type-16176", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106367,8 +106409,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17345", +- "self_type" : "type-17347", ++ "referenced_type" : "type-17297", ++ "self_type" : "type-17299", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106376,8 +106418,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17821", +- "self_type" : "type-17824", ++ "referenced_type" : "type-17773", ++ "self_type" : "type-17776", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106385,8 +106427,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18126", +- "self_type" : "type-18128", ++ "referenced_type" : "type-18078", ++ "self_type" : "type-18080", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106394,8 +106436,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18437", +- "self_type" : "type-18440", ++ "referenced_type" : "type-18389", ++ "self_type" : "type-18392", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106403,8 +106445,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18565", +- "self_type" : "type-18567", ++ "referenced_type" : "type-18517", ++ "self_type" : "type-18519", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106412,8 +106454,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18797", +- "self_type" : "type-18799", ++ "referenced_type" : "type-18749", ++ "self_type" : "type-18751", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106421,8 +106463,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19077", +- "self_type" : "type-19079", ++ "referenced_type" : "type-19029", ++ "self_type" : "type-19031", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106430,8 +106472,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19317", +- "self_type" : "type-19319", ++ "referenced_type" : "type-19269", ++ "self_type" : "type-19271", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106439,8 +106481,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19461", +- "self_type" : "type-19463", ++ "referenced_type" : "type-19413", ++ "self_type" : "type-19415", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106448,8 +106490,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19665", +- "self_type" : "type-19667", ++ "referenced_type" : "type-19617", ++ "self_type" : "type-19619", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106457,8 +106499,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19833", +- "self_type" : "type-19836", ++ "referenced_type" : "type-19785", ++ "self_type" : "type-19788", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106466,8 +106508,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19990", +- "self_type" : "type-19992", ++ "referenced_type" : "type-19942", ++ "self_type" : "type-19944", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106475,8 +106517,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-20753", +- "self_type" : "type-20755", ++ "referenced_type" : "type-20705", ++ "self_type" : "type-20707", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106484,8 +106526,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-21877", +- "self_type" : "type-21879", ++ "referenced_type" : "type-21829", ++ "self_type" : "type-21831", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106493,8 +106535,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-22350", +- "self_type" : "type-22353", ++ "referenced_type" : "type-22318", ++ "self_type" : "type-22320", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106502,8 +106544,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-22655", +- "self_type" : "type-22657", ++ "referenced_type" : "type-22566", ++ "self_type" : "type-22569", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106511,8 +106553,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-22966", +- "self_type" : "type-22969", ++ "referenced_type" : "type-22934", ++ "self_type" : "type-22936", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106520,8 +106562,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23094", +- "self_type" : "type-23096", ++ "referenced_type" : "type-23079", ++ "self_type" : "type-23081", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106529,8 +106571,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23326", +- "self_type" : "type-23328", ++ "referenced_type" : "type-23321", ++ "self_type" : "type-23323", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106538,8 +106580,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23606", +- "self_type" : "type-23608", ++ "referenced_type" : "type-23587", ++ "self_type" : "type-23589", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106547,8 +106589,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23838", +- "self_type" : "type-23840", ++ "referenced_type" : "type-23826", ++ "self_type" : "type-23829", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106556,8 +106598,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23961", +- "self_type" : "type-23963", ++ "referenced_type" : "type-23965", ++ "self_type" : "type-23967", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106565,8 +106607,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24135", +- "self_type" : "type-24137", ++ "referenced_type" : "type-24131", ++ "self_type" : "type-24133", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106574,8 +106616,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24300", +- "self_type" : "type-24303", ++ "referenced_type" : "type-24302", ++ "self_type" : "type-24304", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106583,8 +106625,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24453", +- "self_type" : "type-24455", ++ "referenced_type" : "type-24432", ++ "self_type" : "type-24434", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106592,8 +106634,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24607", +- "self_type" : "type-24609", ++ "referenced_type" : "type-24574", ++ "self_type" : "type-24576", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106601,8 +106643,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24734", +- "self_type" : "type-24736", ++ "referenced_type" : "type-24694", ++ "self_type" : "type-24696", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106610,8 +106652,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24869", +- "self_type" : "type-24871", ++ "referenced_type" : "type-24830", ++ "self_type" : "type-24832", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106619,8 +106661,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-25155", +- "self_type" : "type-25157", ++ "referenced_type" : "type-25131", ++ "self_type" : "type-25133", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106637,8 +106679,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-25932", +- "self_type" : "type-25934", ++ "referenced_type" : "type-25985", ++ "self_type" : "type-25987", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106646,8 +106688,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-27055", +- "self_type" : "type-27057", ++ "referenced_type" : "type-27085", ++ "self_type" : "type-27087", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106655,8 +106697,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-27535", +- "self_type" : "type-27538", ++ "referenced_type" : "type-27534", ++ "self_type" : "type-27537", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106664,8 +106706,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-27840", +- "self_type" : "type-27842", ++ "referenced_type" : "type-27839", ++ "self_type" : "type-27841", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106673,8 +106715,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-28151", +- "self_type" : "type-28154", ++ "referenced_type" : "type-28150", ++ "self_type" : "type-28153", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106682,8 +106724,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-28279", +- "self_type" : "type-28281", ++ "referenced_type" : "type-28278", ++ "self_type" : "type-28280", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106691,8 +106733,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-28511", +- "self_type" : "type-28513", ++ "referenced_type" : "type-28510", ++ "self_type" : "type-28512", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106700,8 +106742,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-28791", +- "self_type" : "type-28793", ++ "referenced_type" : "type-28790", ++ "self_type" : "type-28792", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106709,8 +106751,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29023", +- "self_type" : "type-29025", ++ "referenced_type" : "type-29022", ++ "self_type" : "type-29024", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106718,8 +106760,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29146", +- "self_type" : "type-29148", ++ "referenced_type" : "type-29145", ++ "self_type" : "type-29147", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106727,8 +106769,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29320", +- "self_type" : "type-29322", ++ "referenced_type" : "type-29319", ++ "self_type" : "type-29321", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106736,8 +106778,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29485", +- "self_type" : "type-29488", ++ "referenced_type" : "type-29484", ++ "self_type" : "type-29487", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106745,8 +106787,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29638", +- "self_type" : "type-29640", ++ "referenced_type" : "type-29637", ++ "self_type" : "type-29639", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106754,8 +106796,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29792", +- "self_type" : "type-29794", ++ "referenced_type" : "type-29791", ++ "self_type" : "type-29793", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106763,8 +106805,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29915", +- "self_type" : "type-29917", ++ "referenced_type" : "type-29914", ++ "self_type" : "type-29916", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106772,8 +106814,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-30048", +- "self_type" : "type-30050", ++ "referenced_type" : "type-30047", ++ "self_type" : "type-30049", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106781,8 +106823,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-30300", +- "self_type" : "type-30302", ++ "referenced_type" : "type-30299", ++ "self_type" : "type-30301", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106790,8 +106832,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-30394", +- "self_type" : "type-30396", ++ "referenced_type" : "type-30393", ++ "self_type" : "type-30395", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106799,8 +106841,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-31078", +- "self_type" : "type-31080", ++ "referenced_type" : "type-31077", ++ "self_type" : "type-31079", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106808,8 +106850,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-32202", +- "self_type" : "type-32204", ++ "referenced_type" : "type-32201", ++ "self_type" : "type-32203", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106817,8 +106859,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-3850", +- "self_type" : "type-3852", ++ "referenced_type" : "type-3802", ++ "self_type" : "type-3804", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106835,8 +106877,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-5776", +- "self_type" : "type-5778", ++ "referenced_type" : "type-5728", ++ "self_type" : "type-5730", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106844,8 +106886,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-7083", +- "self_type" : "type-7085", ++ "referenced_type" : "type-7035", ++ "self_type" : "type-7037", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106853,8 +106895,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-7751", +- "self_type" : "type-7754", ++ "referenced_type" : "type-7703", ++ "self_type" : "type-7706", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106862,8 +106904,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-8072", +- "self_type" : "type-8074", ++ "referenced_type" : "type-8024", ++ "self_type" : "type-8026", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106871,8 +106913,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-9033", +- "self_type" : "type-9035", ++ "referenced_type" : "type-8985", ++ "self_type" : "type-8987", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106880,8 +106922,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-10152", +- "self_type" : "type-10154", ++ "referenced_type" : "type-10104", ++ "self_type" : "type-10106", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106889,8 +106931,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-10662", +- "self_type" : "type-10664", ++ "referenced_type" : "type-10614", ++ "self_type" : "type-10616", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106898,8 +106940,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-10966", +- "self_type" : "type-10969", ++ "referenced_type" : "type-10918", ++ "self_type" : "type-10921", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106907,8 +106949,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-11318", +- "self_type" : "type-11320", ++ "referenced_type" : "type-11270", ++ "self_type" : "type-11272", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106916,8 +106958,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-11477", +- "self_type" : "type-11479", ++ "referenced_type" : "type-11429", ++ "self_type" : "type-11431", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106925,8 +106967,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-12363", +- "self_type" : "type-12365", ++ "referenced_type" : "type-12315", ++ "self_type" : "type-12317", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106934,8 +106976,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-13485", +- "self_type" : "type-13487", ++ "referenced_type" : "type-13437", ++ "self_type" : "type-13439", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106943,8 +106985,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-13953", +- "self_type" : "type-13955", ++ "referenced_type" : "type-13905", ++ "self_type" : "type-13907", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106952,8 +106994,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-14257", +- "self_type" : "type-14260", ++ "referenced_type" : "type-14209", ++ "self_type" : "type-14212", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106961,8 +107003,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-14569", +- "self_type" : "type-14571", ++ "referenced_type" : "type-14521", ++ "self_type" : "type-14523", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106970,8 +107012,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-14697", +- "self_type" : "type-14699", ++ "referenced_type" : "type-14649", ++ "self_type" : "type-14651", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106979,8 +107021,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-14936", +- "self_type" : "type-14938", ++ "referenced_type" : "type-14888", ++ "self_type" : "type-14890", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106988,8 +107030,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-15297", +- "self_type" : "type-15299", ++ "referenced_type" : "type-15249", ++ "self_type" : "type-15251", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -106997,8 +107039,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16218", +- "self_type" : "type-16220", ++ "referenced_type" : "type-16170", ++ "self_type" : "type-16172", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107006,8 +107048,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17341", +- "self_type" : "type-17343", ++ "referenced_type" : "type-17293", ++ "self_type" : "type-17295", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107015,8 +107057,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17817", +- "self_type" : "type-17819", ++ "referenced_type" : "type-17769", ++ "self_type" : "type-17771", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107024,8 +107066,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18121", +- "self_type" : "type-18124", ++ "referenced_type" : "type-18073", ++ "self_type" : "type-18076", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107033,8 +107075,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18433", +- "self_type" : "type-18435", ++ "referenced_type" : "type-18385", ++ "self_type" : "type-18387", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107042,8 +107084,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18561", +- "self_type" : "type-18563", ++ "referenced_type" : "type-18513", ++ "self_type" : "type-18515", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107051,8 +107093,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18793", +- "self_type" : "type-18795", ++ "referenced_type" : "type-18745", ++ "self_type" : "type-18747", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107060,8 +107102,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19073", +- "self_type" : "type-19075", ++ "referenced_type" : "type-19025", ++ "self_type" : "type-19027", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107069,8 +107111,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19312", +- "self_type" : "type-19315", ++ "referenced_type" : "type-19264", ++ "self_type" : "type-19267", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107078,8 +107120,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19457", +- "self_type" : "type-19459", ++ "referenced_type" : "type-19409", ++ "self_type" : "type-19411", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107087,8 +107129,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19661", +- "self_type" : "type-19663", ++ "referenced_type" : "type-19613", ++ "self_type" : "type-19615", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107096,8 +107138,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19829", +- "self_type" : "type-19831", ++ "referenced_type" : "type-19781", ++ "self_type" : "type-19783", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107105,8 +107147,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19986", +- "self_type" : "type-19988", ++ "referenced_type" : "type-19938", ++ "self_type" : "type-19940", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107114,8 +107156,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-20749", +- "self_type" : "type-20751", ++ "referenced_type" : "type-20701", ++ "self_type" : "type-20703", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107123,8 +107165,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-21873", +- "self_type" : "type-21875", ++ "referenced_type" : "type-21825", ++ "self_type" : "type-21827", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107132,8 +107174,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-22346", +- "self_type" : "type-22348", ++ "referenced_type" : "type-22314", ++ "self_type" : "type-22316", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107141,8 +107183,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-22650", +- "self_type" : "type-22653", ++ "referenced_type" : "type-22562", ++ "self_type" : "type-22564", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107150,8 +107192,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-22962", +- "self_type" : "type-22964", ++ "referenced_type" : "type-22930", ++ "self_type" : "type-22932", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107159,8 +107201,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23090", +- "self_type" : "type-23092", ++ "referenced_type" : "type-23074", ++ "self_type" : "type-23076", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107168,8 +107210,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23322", +- "self_type" : "type-23324", ++ "referenced_type" : "type-23317", ++ "self_type" : "type-23319", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107177,8 +107219,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23602", +- "self_type" : "type-23604", ++ "referenced_type" : "type-23583", ++ "self_type" : "type-23585", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107186,8 +107228,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23833", +- "self_type" : "type-23836", ++ "referenced_type" : "type-23822", ++ "self_type" : "type-23824", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107195,8 +107237,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23957", +- "self_type" : "type-23959", ++ "referenced_type" : "type-23961", ++ "self_type" : "type-23963", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107204,8 +107246,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24131", +- "self_type" : "type-24133", ++ "referenced_type" : "type-24127", ++ "self_type" : "type-24129", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107213,8 +107255,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24296", +- "self_type" : "type-24298", ++ "referenced_type" : "type-24298", ++ "self_type" : "type-24300", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107222,8 +107264,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24449", +- "self_type" : "type-24451", ++ "referenced_type" : "type-24428", ++ "self_type" : "type-24430", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107231,8 +107273,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24603", +- "self_type" : "type-24605", ++ "referenced_type" : "type-24568", ++ "self_type" : "type-24572", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107240,8 +107282,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24730", +- "self_type" : "type-24732", ++ "referenced_type" : "type-24690", ++ "self_type" : "type-24692", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107249,8 +107291,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24865", +- "self_type" : "type-24867", ++ "referenced_type" : "type-24826", ++ "self_type" : "type-24828", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107258,8 +107300,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-25151", +- "self_type" : "type-25153", ++ "referenced_type" : "type-25127", ++ "self_type" : "type-25129", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107267,8 +107309,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-25245", +- "self_type" : "type-25247", ++ "referenced_type" : "type-25246", ++ "self_type" : "type-25248", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107276,8 +107318,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-25928", +- "self_type" : "type-25930", ++ "referenced_type" : "type-25981", ++ "self_type" : "type-25983", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107285,8 +107327,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-27051", +- "self_type" : "type-27053", ++ "referenced_type" : "type-27081", ++ "self_type" : "type-27083", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107294,8 +107336,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-27531", +- "self_type" : "type-27533", ++ "referenced_type" : "type-27530", ++ "self_type" : "type-27532", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107303,8 +107345,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-27835", +- "self_type" : "type-27838", ++ "referenced_type" : "type-27834", ++ "self_type" : "type-27837", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107312,8 +107354,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-28147", +- "self_type" : "type-28149", ++ "referenced_type" : "type-28146", ++ "self_type" : "type-28148", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107321,8 +107363,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-28275", +- "self_type" : "type-28277", ++ "referenced_type" : "type-28274", ++ "self_type" : "type-28276", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107330,8 +107372,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-28507", +- "self_type" : "type-28509", ++ "referenced_type" : "type-28506", ++ "self_type" : "type-28508", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107339,8 +107381,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-28787", +- "self_type" : "type-28789", ++ "referenced_type" : "type-28786", ++ "self_type" : "type-28788", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107348,8 +107390,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29018", +- "self_type" : "type-29021", ++ "referenced_type" : "type-29017", ++ "self_type" : "type-29020", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107357,8 +107399,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29142", +- "self_type" : "type-29144", ++ "referenced_type" : "type-29141", ++ "self_type" : "type-29143", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107366,8 +107408,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29316", +- "self_type" : "type-29318", ++ "referenced_type" : "type-29315", ++ "self_type" : "type-29317", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107375,8 +107417,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29481", +- "self_type" : "type-29483", ++ "referenced_type" : "type-29480", ++ "self_type" : "type-29482", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107384,8 +107426,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29634", +- "self_type" : "type-29636", ++ "referenced_type" : "type-29633", ++ "self_type" : "type-29635", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107393,8 +107435,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29788", +- "self_type" : "type-29790", ++ "referenced_type" : "type-29787", ++ "self_type" : "type-29789", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107402,8 +107444,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29911", +- "self_type" : "type-29913", ++ "referenced_type" : "type-29910", ++ "self_type" : "type-29912", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107411,8 +107453,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-30044", +- "self_type" : "type-30046", ++ "referenced_type" : "type-30043", ++ "self_type" : "type-30045", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107420,8 +107462,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-30296", +- "self_type" : "type-30298", ++ "referenced_type" : "type-30295", ++ "self_type" : "type-30297", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107429,8 +107471,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-30389", +- "self_type" : "type-30391", ++ "referenced_type" : "type-30388", ++ "self_type" : "type-30390", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107438,8 +107480,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-31074", +- "self_type" : "type-31076", ++ "referenced_type" : "type-31073", ++ "self_type" : "type-31075", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107447,8 +107489,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-32198", +- "self_type" : "type-32200", ++ "referenced_type" : "type-32197", ++ "self_type" : "type-32199", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107456,8 +107498,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-3846", +- "self_type" : "type-3848", ++ "referenced_type" : "type-3798", ++ "self_type" : "type-3800", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107474,8 +107516,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-5772", +- "self_type" : "type-5774", ++ "referenced_type" : "type-5724", ++ "self_type" : "type-5726", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107483,8 +107525,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-7079", +- "self_type" : "type-7081", ++ "referenced_type" : "type-7031", ++ "self_type" : "type-7033", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107492,8 +107534,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-7747", +- "self_type" : "type-7749", ++ "referenced_type" : "type-7699", ++ "self_type" : "type-7701", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107501,8 +107543,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-8067", +- "self_type" : "type-8070", ++ "referenced_type" : "type-8019", ++ "self_type" : "type-8022", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107510,8 +107552,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-9029", +- "self_type" : "type-9031", ++ "referenced_type" : "type-8981", ++ "self_type" : "type-8983", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107519,8 +107561,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-14920", +- "self_type" : "type-14922", ++ "referenced_type" : "type-14872", ++ "self_type" : "type-14874", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107528,8 +107570,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-15281", +- "self_type" : "type-15283", ++ "referenced_type" : "type-15233", ++ "self_type" : "type-15235", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107537,8 +107579,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18777", +- "self_type" : "type-18779", ++ "referenced_type" : "type-18729", ++ "self_type" : "type-18731", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107546,8 +107588,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19057", +- "self_type" : "type-19059", ++ "referenced_type" : "type-19009", ++ "self_type" : "type-19011", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107555,8 +107597,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19296", +- "self_type" : "type-19298", ++ "referenced_type" : "type-19248", ++ "self_type" : "type-19250", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107564,8 +107606,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19643", +- "self_type" : "type-19645", ++ "referenced_type" : "type-19595", ++ "self_type" : "type-19597", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107573,8 +107615,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19812", +- "self_type" : "type-19814", ++ "referenced_type" : "type-19764", ++ "self_type" : "type-19766", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107582,8 +107624,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19969", +- "self_type" : "type-19971", ++ "referenced_type" : "type-19921", ++ "self_type" : "type-19923", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107591,8 +107633,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23306", +- "self_type" : "type-23308", ++ "referenced_type" : "type-23301", ++ "self_type" : "type-23303", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107600,8 +107642,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23586", +- "self_type" : "type-23588", ++ "referenced_type" : "type-23567", ++ "self_type" : "type-23569", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107609,8 +107651,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23817", +- "self_type" : "type-23819", ++ "referenced_type" : "type-23806", ++ "self_type" : "type-23808", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107618,8 +107660,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24113", +- "self_type" : "type-24115", ++ "referenced_type" : "type-24111", ++ "self_type" : "type-24113", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107627,8 +107669,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24279", +- "self_type" : "type-24281", ++ "referenced_type" : "type-24281", ++ "self_type" : "type-24283", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107636,8 +107678,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24432", +- "self_type" : "type-24434", ++ "referenced_type" : "type-24412", ++ "self_type" : "type-24414", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107645,8 +107687,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24585", +- "self_type" : "type-24587", ++ "referenced_type" : "type-24552", ++ "self_type" : "type-24554", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107654,8 +107696,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24849", +- "self_type" : "type-24851", ++ "referenced_type" : "type-24809", ++ "self_type" : "type-24811", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107663,8 +107705,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-25135", +- "self_type" : "type-25137", ++ "referenced_type" : "type-25111", ++ "self_type" : "type-25113", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107672,8 +107714,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-28491", +- "self_type" : "type-28493", ++ "referenced_type" : "type-28490", ++ "self_type" : "type-28492", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107681,8 +107723,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-28771", +- "self_type" : "type-28773", ++ "referenced_type" : "type-28770", ++ "self_type" : "type-28772", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107690,8 +107732,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29002", +- "self_type" : "type-29004", ++ "referenced_type" : "type-29001", ++ "self_type" : "type-29003", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107699,8 +107741,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29298", +- "self_type" : "type-29300", ++ "referenced_type" : "type-29297", ++ "self_type" : "type-29299", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107708,8 +107750,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29464", +- "self_type" : "type-29466", ++ "referenced_type" : "type-29463", ++ "self_type" : "type-29465", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107717,8 +107759,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29617", +- "self_type" : "type-29619", ++ "referenced_type" : "type-29616", ++ "self_type" : "type-29618", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107726,8 +107768,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29770", +- "self_type" : "type-29772", ++ "referenced_type" : "type-29769", ++ "self_type" : "type-29771", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107735,8 +107777,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-30028", +- "self_type" : "type-30030", ++ "referenced_type" : "type-30027", ++ "self_type" : "type-30029", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107744,8 +107786,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-30280", +- "self_type" : "type-30282", ++ "referenced_type" : "type-30279", ++ "self_type" : "type-30281", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107762,8 +107804,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-10140", +- "self_type" : "type-10142", ++ "referenced_type" : "type-10092", ++ "self_type" : "type-10094", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107771,8 +107813,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-10649", +- "self_type" : "type-10651", ++ "referenced_type" : "type-10601", ++ "self_type" : "type-10603", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107780,8 +107822,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-10954", +- "self_type" : "type-10956", ++ "referenced_type" : "type-10906", ++ "self_type" : "type-10908", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107789,8 +107831,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-11306", +- "self_type" : "type-11308", ++ "referenced_type" : "type-11258", ++ "self_type" : "type-11260", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107798,8 +107840,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-11465", +- "self_type" : "type-11467", ++ "referenced_type" : "type-11417", ++ "self_type" : "type-11419", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107807,8 +107849,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-12351", +- "self_type" : "type-12353", ++ "referenced_type" : "type-12303", ++ "self_type" : "type-12305", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107816,8 +107858,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-13473", +- "self_type" : "type-13475", ++ "referenced_type" : "type-13425", ++ "self_type" : "type-13427", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107825,8 +107867,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-13940", +- "self_type" : "type-13942", ++ "referenced_type" : "type-13892", ++ "self_type" : "type-13894", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107834,8 +107876,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-14245", +- "self_type" : "type-14247", ++ "referenced_type" : "type-14197", ++ "self_type" : "type-14199", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107843,8 +107885,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-14557", +- "self_type" : "type-14559", ++ "referenced_type" : "type-14509", ++ "self_type" : "type-14511", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107852,8 +107894,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-14685", +- "self_type" : "type-14687", ++ "referenced_type" : "type-14637", ++ "self_type" : "type-14639", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107861,8 +107903,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-14924", +- "self_type" : "type-14926", ++ "referenced_type" : "type-14876", ++ "self_type" : "type-14878", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107870,8 +107912,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-15285", +- "self_type" : "type-15287", ++ "referenced_type" : "type-15237", ++ "self_type" : "type-15239", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107879,8 +107921,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16206", +- "self_type" : "type-16208", ++ "referenced_type" : "type-16158", ++ "self_type" : "type-16160", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107888,8 +107930,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17329", +- "self_type" : "type-17331", ++ "referenced_type" : "type-17281", ++ "self_type" : "type-17283", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107897,8 +107939,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17804", +- "self_type" : "type-17806", ++ "referenced_type" : "type-17756", ++ "self_type" : "type-17758", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107906,8 +107948,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18109", +- "self_type" : "type-18111", ++ "referenced_type" : "type-18061", ++ "self_type" : "type-18063", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107915,8 +107957,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18421", +- "self_type" : "type-18423", ++ "referenced_type" : "type-18373", ++ "self_type" : "type-18375", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107924,8 +107966,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18549", +- "self_type" : "type-18551", ++ "referenced_type" : "type-18501", ++ "self_type" : "type-18503", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107933,8 +107975,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18781", +- "self_type" : "type-18783", ++ "referenced_type" : "type-18733", ++ "self_type" : "type-18735", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107942,8 +107984,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19061", +- "self_type" : "type-19063", ++ "referenced_type" : "type-19013", ++ "self_type" : "type-19015", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107951,8 +107993,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19300", +- "self_type" : "type-19302", ++ "referenced_type" : "type-19252", ++ "self_type" : "type-19254", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107960,8 +108002,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19445", +- "self_type" : "type-19447", ++ "referenced_type" : "type-19397", ++ "self_type" : "type-19399", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107969,8 +108011,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19647", +- "self_type" : "type-19649", ++ "referenced_type" : "type-19599", ++ "self_type" : "type-19601", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107978,8 +108020,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19816", +- "self_type" : "type-19818", ++ "referenced_type" : "type-19768", ++ "self_type" : "type-19770", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107987,8 +108029,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19973", +- "self_type" : "type-19975", ++ "referenced_type" : "type-19925", ++ "self_type" : "type-19927", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -107996,8 +108038,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-20737", +- "self_type" : "type-20739", ++ "referenced_type" : "type-20689", ++ "self_type" : "type-20691", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108005,8 +108047,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-21861", +- "self_type" : "type-21863", ++ "referenced_type" : "type-21813", ++ "self_type" : "type-21815", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108014,8 +108056,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-22333", +- "self_type" : "type-22335", ++ "referenced_type" : "type-22301", ++ "self_type" : "type-22304", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108023,8 +108065,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-22638", +- "self_type" : "type-22640", ++ "referenced_type" : "type-22550", ++ "self_type" : "type-22552", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108032,8 +108074,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-22950", +- "self_type" : "type-22952", ++ "referenced_type" : "type-22916", ++ "self_type" : "type-22919", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108041,8 +108083,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23078", +- "self_type" : "type-23080", ++ "referenced_type" : "type-23061", ++ "self_type" : "type-23063", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108050,8 +108092,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23310", +- "self_type" : "type-23312", ++ "referenced_type" : "type-23305", ++ "self_type" : "type-23307", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108059,8 +108101,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23590", +- "self_type" : "type-23592", ++ "referenced_type" : "type-23571", ++ "self_type" : "type-23573", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108068,8 +108110,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23821", +- "self_type" : "type-23823", ++ "referenced_type" : "type-23810", ++ "self_type" : "type-23812", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108077,8 +108119,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23945", +- "self_type" : "type-23947", ++ "referenced_type" : "type-23948", ++ "self_type" : "type-23951", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108086,8 +108128,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24117", +- "self_type" : "type-24119", ++ "referenced_type" : "type-24115", ++ "self_type" : "type-24117", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108095,8 +108137,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24283", +- "self_type" : "type-24285", ++ "referenced_type" : "type-24285", ++ "self_type" : "type-24287", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108104,8 +108146,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24436", +- "self_type" : "type-24438", ++ "referenced_type" : "type-24416", ++ "self_type" : "type-24418", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108113,8 +108155,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24589", +- "self_type" : "type-24592", ++ "referenced_type" : "type-24556", ++ "self_type" : "type-24558", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108122,8 +108164,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24716", +- "self_type" : "type-24718", ++ "referenced_type" : "type-24678", ++ "self_type" : "type-24680", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108131,8 +108173,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24853", +- "self_type" : "type-24855", ++ "referenced_type" : "type-24813", ++ "self_type" : "type-24815", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108140,8 +108182,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-25139", +- "self_type" : "type-25141", ++ "referenced_type" : "type-25115", ++ "self_type" : "type-25117", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108149,8 +108191,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-25233", +- "self_type" : "type-25235", ++ "referenced_type" : "type-25234", ++ "self_type" : "type-25236", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108158,8 +108200,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-25916", +- "self_type" : "type-25918", ++ "referenced_type" : "type-25967", ++ "self_type" : "type-25969", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108167,8 +108209,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-27039", +- "self_type" : "type-27041", ++ "referenced_type" : "type-27069", ++ "self_type" : "type-27071", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108176,8 +108218,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-27518", +- "self_type" : "type-27520", ++ "referenced_type" : "type-27517", ++ "self_type" : "type-27519", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108185,8 +108227,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-27823", +- "self_type" : "type-27825", ++ "referenced_type" : "type-27822", ++ "self_type" : "type-27824", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108194,8 +108236,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-28135", +- "self_type" : "type-28137", ++ "referenced_type" : "type-28134", ++ "self_type" : "type-28136", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108203,8 +108245,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-28263", +- "self_type" : "type-28265", ++ "referenced_type" : "type-28262", ++ "self_type" : "type-28264", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108212,8 +108254,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-28495", +- "self_type" : "type-28497", ++ "referenced_type" : "type-28494", ++ "self_type" : "type-28496", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108221,8 +108263,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-28775", +- "self_type" : "type-28777", ++ "referenced_type" : "type-28774", ++ "self_type" : "type-28776", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108230,8 +108272,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29006", +- "self_type" : "type-29008", ++ "referenced_type" : "type-29005", ++ "self_type" : "type-29007", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108239,8 +108281,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29130", +- "self_type" : "type-29132", ++ "referenced_type" : "type-29129", ++ "self_type" : "type-29131", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108248,8 +108290,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29302", +- "self_type" : "type-29304", ++ "referenced_type" : "type-29301", ++ "self_type" : "type-29303", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108257,8 +108299,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29468", +- "self_type" : "type-29470", ++ "referenced_type" : "type-29467", ++ "self_type" : "type-29469", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108266,8 +108308,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29621", +- "self_type" : "type-29623", ++ "referenced_type" : "type-29620", ++ "self_type" : "type-29622", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108275,8 +108317,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29774", +- "self_type" : "type-29777", ++ "referenced_type" : "type-29773", ++ "self_type" : "type-29776", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108284,8 +108326,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29897", +- "self_type" : "type-29899", ++ "referenced_type" : "type-29896", ++ "self_type" : "type-29898", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108293,8 +108335,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-30032", +- "self_type" : "type-30034", ++ "referenced_type" : "type-30031", ++ "self_type" : "type-30033", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108302,8 +108344,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-30284", +- "self_type" : "type-30286", ++ "referenced_type" : "type-30283", ++ "self_type" : "type-30285", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108311,8 +108353,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-30377", +- "self_type" : "type-30379", ++ "referenced_type" : "type-30376", ++ "self_type" : "type-30378", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108320,8 +108362,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-31062", +- "self_type" : "type-31064", ++ "referenced_type" : "type-31061", ++ "self_type" : "type-31063", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108329,8 +108371,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-32186", +- "self_type" : "type-32188", ++ "referenced_type" : "type-32185", ++ "self_type" : "type-32187", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108338,8 +108380,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-3834", +- "self_type" : "type-3836", ++ "referenced_type" : "type-3786", ++ "self_type" : "type-3788", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108356,8 +108398,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-5760", +- "self_type" : "type-5762", ++ "referenced_type" : "type-5712", ++ "self_type" : "type-5714", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108365,8 +108407,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-7067", +- "self_type" : "type-7069", ++ "referenced_type" : "type-7019", ++ "self_type" : "type-7021", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108374,8 +108416,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-7734", +- "self_type" : "type-7736", ++ "referenced_type" : "type-7686", ++ "self_type" : "type-7688", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108383,8 +108425,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-8055", +- "self_type" : "type-8057", ++ "referenced_type" : "type-8007", ++ "self_type" : "type-8009", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108392,8 +108434,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-9017", +- "self_type" : "type-9019", ++ "referenced_type" : "type-8969", ++ "self_type" : "type-8971", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108401,8 +108443,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-10144", +- "self_type" : "type-10146", ++ "referenced_type" : "type-10096", ++ "self_type" : "type-10098", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108410,8 +108452,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-10653", +- "self_type" : "type-10656", ++ "referenced_type" : "type-10605", ++ "self_type" : "type-10608", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108419,8 +108461,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-10958", +- "self_type" : "type-10960", ++ "referenced_type" : "type-10910", ++ "self_type" : "type-10912", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108428,8 +108470,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-11310", +- "self_type" : "type-11312", ++ "referenced_type" : "type-11262", ++ "self_type" : "type-11264", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108437,8 +108479,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-11469", +- "self_type" : "type-11471", ++ "referenced_type" : "type-11421", ++ "self_type" : "type-11423", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108446,8 +108488,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-12355", +- "self_type" : "type-12357", ++ "referenced_type" : "type-12307", ++ "self_type" : "type-12309", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108455,8 +108497,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-13477", +- "self_type" : "type-13479", ++ "referenced_type" : "type-13429", ++ "self_type" : "type-13431", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108464,8 +108506,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-13944", +- "self_type" : "type-13947", ++ "referenced_type" : "type-13896", ++ "self_type" : "type-13899", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108473,8 +108515,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-14249", +- "self_type" : "type-14251", ++ "referenced_type" : "type-14201", ++ "self_type" : "type-14203", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108482,8 +108524,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-14561", +- "self_type" : "type-14563", ++ "referenced_type" : "type-14513", ++ "self_type" : "type-14515", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108491,8 +108533,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-14689", +- "self_type" : "type-14691", ++ "referenced_type" : "type-14641", ++ "self_type" : "type-14643", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108500,8 +108542,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-14928", +- "self_type" : "type-14930", ++ "referenced_type" : "type-14880", ++ "self_type" : "type-14882", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108509,8 +108551,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-15289", +- "self_type" : "type-15291", ++ "referenced_type" : "type-15241", ++ "self_type" : "type-15243", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108518,8 +108560,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16210", +- "self_type" : "type-16212", ++ "referenced_type" : "type-16162", ++ "self_type" : "type-16164", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108527,8 +108569,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17333", +- "self_type" : "type-17335", ++ "referenced_type" : "type-17285", ++ "self_type" : "type-17287", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108536,8 +108578,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17808", +- "self_type" : "type-17811", ++ "referenced_type" : "type-17760", ++ "self_type" : "type-17763", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108545,8 +108587,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18113", +- "self_type" : "type-18115", ++ "referenced_type" : "type-18065", ++ "self_type" : "type-18067", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108554,8 +108596,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18425", +- "self_type" : "type-18427", ++ "referenced_type" : "type-18377", ++ "self_type" : "type-18379", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108563,8 +108605,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18553", +- "self_type" : "type-18555", ++ "referenced_type" : "type-18505", ++ "self_type" : "type-18507", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108572,8 +108614,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18785", +- "self_type" : "type-18787", ++ "referenced_type" : "type-18737", ++ "self_type" : "type-18739", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108581,8 +108623,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19065", +- "self_type" : "type-19067", ++ "referenced_type" : "type-19017", ++ "self_type" : "type-19019", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108590,8 +108632,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19304", +- "self_type" : "type-19306", ++ "referenced_type" : "type-19256", ++ "self_type" : "type-19258", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108599,8 +108641,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19449", +- "self_type" : "type-19451", ++ "referenced_type" : "type-19401", ++ "self_type" : "type-19403", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108608,8 +108650,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19653", +- "self_type" : "type-19655", ++ "referenced_type" : "type-19605", ++ "self_type" : "type-19607", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108617,8 +108659,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19820", +- "self_type" : "type-19822", ++ "referenced_type" : "type-19772", ++ "self_type" : "type-19774", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108626,8 +108668,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19977", +- "self_type" : "type-19979", ++ "referenced_type" : "type-19929", ++ "self_type" : "type-19931", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108635,8 +108677,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-20741", +- "self_type" : "type-20743", ++ "referenced_type" : "type-20693", ++ "self_type" : "type-20695", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108644,8 +108686,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-21865", +- "self_type" : "type-21867", ++ "referenced_type" : "type-21817", ++ "self_type" : "type-21819", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108653,8 +108695,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-22337", +- "self_type" : "type-22340", ++ "referenced_type" : "type-22306", ++ "self_type" : "type-22308", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108662,8 +108704,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-22642", +- "self_type" : "type-22644", ++ "referenced_type" : "type-22554", ++ "self_type" : "type-22556", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108671,8 +108713,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-22954", +- "self_type" : "type-22956", ++ "referenced_type" : "type-22921", ++ "self_type" : "type-22923", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108680,8 +108722,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23082", +- "self_type" : "type-23084", ++ "referenced_type" : "type-23065", ++ "self_type" : "type-23068", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108689,8 +108731,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23314", +- "self_type" : "type-23316", ++ "referenced_type" : "type-23309", ++ "self_type" : "type-23311", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108698,8 +108740,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23594", +- "self_type" : "type-23596", ++ "referenced_type" : "type-23575", ++ "self_type" : "type-23577", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108707,8 +108749,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23825", +- "self_type" : "type-23827", ++ "referenced_type" : "type-23814", ++ "self_type" : "type-23816", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108716,8 +108758,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23949", +- "self_type" : "type-23951", ++ "referenced_type" : "type-23953", ++ "self_type" : "type-23955", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108725,8 +108767,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24123", +- "self_type" : "type-24125", ++ "referenced_type" : "type-24119", ++ "self_type" : "type-24121", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108734,8 +108776,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24287", +- "self_type" : "type-24289", ++ "referenced_type" : "type-24289", ++ "self_type" : "type-24291", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108743,8 +108785,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24440", +- "self_type" : "type-24442", ++ "referenced_type" : "type-24420", ++ "self_type" : "type-24422", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108752,8 +108794,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24594", +- "self_type" : "type-24596", ++ "referenced_type" : "type-24560", ++ "self_type" : "type-24562", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108761,8 +108803,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24720", +- "self_type" : "type-24722", ++ "referenced_type" : "type-24682", ++ "self_type" : "type-24684", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108770,8 +108812,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24857", +- "self_type" : "type-24859", ++ "referenced_type" : "type-24817", ++ "self_type" : "type-24820", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108779,8 +108821,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-25143", +- "self_type" : "type-25145", ++ "referenced_type" : "type-25119", ++ "self_type" : "type-25121", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108788,8 +108830,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-25237", +- "self_type" : "type-25239", ++ "referenced_type" : "type-25238", ++ "self_type" : "type-25240", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108797,8 +108839,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-25920", +- "self_type" : "type-25922", ++ "referenced_type" : "type-25971", ++ "self_type" : "type-25973", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108806,8 +108848,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-27043", +- "self_type" : "type-27045", ++ "referenced_type" : "type-27073", ++ "self_type" : "type-27075", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108815,8 +108857,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-27522", +- "self_type" : "type-27525", ++ "referenced_type" : "type-27521", ++ "self_type" : "type-27524", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108824,8 +108866,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-27827", +- "self_type" : "type-27829", ++ "referenced_type" : "type-27826", ++ "self_type" : "type-27828", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108833,8 +108875,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-28139", +- "self_type" : "type-28141", ++ "referenced_type" : "type-28138", ++ "self_type" : "type-28140", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108842,8 +108884,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-28267", +- "self_type" : "type-28269", ++ "referenced_type" : "type-28266", ++ "self_type" : "type-28268", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108851,8 +108893,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-28499", +- "self_type" : "type-28501", ++ "referenced_type" : "type-28498", ++ "self_type" : "type-28500", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108860,8 +108902,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-28779", +- "self_type" : "type-28781", ++ "referenced_type" : "type-28778", ++ "self_type" : "type-28780", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108869,8 +108911,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29010", +- "self_type" : "type-29012", ++ "referenced_type" : "type-29009", ++ "self_type" : "type-29011", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108878,8 +108920,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29134", +- "self_type" : "type-29136", ++ "referenced_type" : "type-29133", ++ "self_type" : "type-29135", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108887,8 +108929,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29308", +- "self_type" : "type-29310", ++ "referenced_type" : "type-29307", ++ "self_type" : "type-29309", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108896,8 +108938,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29472", +- "self_type" : "type-29474", ++ "referenced_type" : "type-29471", ++ "self_type" : "type-29473", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108905,8 +108947,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29625", +- "self_type" : "type-29627", ++ "referenced_type" : "type-29624", ++ "self_type" : "type-29626", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108914,8 +108956,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29779", +- "self_type" : "type-29781", ++ "referenced_type" : "type-29778", ++ "self_type" : "type-29780", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108923,8 +108965,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29901", +- "self_type" : "type-29903", ++ "referenced_type" : "type-29900", ++ "self_type" : "type-29902", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108932,8 +108974,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-30036", +- "self_type" : "type-30038", ++ "referenced_type" : "type-30035", ++ "self_type" : "type-30037", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108941,8 +108983,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-30288", +- "self_type" : "type-30290", ++ "referenced_type" : "type-30287", ++ "self_type" : "type-30289", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108950,8 +108992,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-30381", +- "self_type" : "type-30383", ++ "referenced_type" : "type-30380", ++ "self_type" : "type-30382", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108959,8 +109001,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-31066", +- "self_type" : "type-31068", ++ "referenced_type" : "type-31065", ++ "self_type" : "type-31067", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108968,8 +109010,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-32190", +- "self_type" : "type-32192", ++ "referenced_type" : "type-32189", ++ "self_type" : "type-32191", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108977,8 +109019,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-3838", +- "self_type" : "type-3840", ++ "referenced_type" : "type-3790", ++ "self_type" : "type-3792", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -108995,8 +109037,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-5764", +- "self_type" : "type-5766", ++ "referenced_type" : "type-5716", ++ "self_type" : "type-5718", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109004,8 +109046,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-7071", +- "self_type" : "type-7073", ++ "referenced_type" : "type-7023", ++ "self_type" : "type-7025", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109013,8 +109055,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-7738", +- "self_type" : "type-7741", ++ "referenced_type" : "type-7690", ++ "self_type" : "type-7693", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109022,8 +109064,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-8059", +- "self_type" : "type-8061", ++ "referenced_type" : "type-8011", ++ "self_type" : "type-8013", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109031,8 +109073,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-9021", +- "self_type" : "type-9023", ++ "referenced_type" : "type-8973", ++ "self_type" : "type-8975", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109040,8 +109082,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-10148", +- "self_type" : "type-10150", ++ "referenced_type" : "type-10100", ++ "self_type" : "type-10102", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109049,8 +109091,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-10658", +- "self_type" : "type-10660", ++ "referenced_type" : "type-10610", ++ "self_type" : "type-10612", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109058,8 +109100,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-10962", +- "self_type" : "type-10964", ++ "referenced_type" : "type-10914", ++ "self_type" : "type-10916", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109067,8 +109109,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-11314", +- "self_type" : "type-11316", ++ "referenced_type" : "type-11266", ++ "self_type" : "type-11268", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109076,8 +109118,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-11473", +- "self_type" : "type-11475", ++ "referenced_type" : "type-11425", ++ "self_type" : "type-11427", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109085,8 +109127,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-12359", +- "self_type" : "type-12361", ++ "referenced_type" : "type-12311", ++ "self_type" : "type-12313", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109094,8 +109136,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-13481", +- "self_type" : "type-13483", ++ "referenced_type" : "type-13433", ++ "self_type" : "type-13435", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109103,8 +109145,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-13949", +- "self_type" : "type-13951", ++ "referenced_type" : "type-13901", ++ "self_type" : "type-13903", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109112,8 +109154,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-14253", +- "self_type" : "type-14255", ++ "referenced_type" : "type-14205", ++ "self_type" : "type-14207", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109121,8 +109163,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-14565", +- "self_type" : "type-14567", ++ "referenced_type" : "type-14517", ++ "self_type" : "type-14519", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109130,8 +109172,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-14693", +- "self_type" : "type-14695", ++ "referenced_type" : "type-14645", ++ "self_type" : "type-14647", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109139,8 +109181,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-14932", +- "self_type" : "type-14934", ++ "referenced_type" : "type-14884", ++ "self_type" : "type-14886", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109148,8 +109190,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-15293", +- "self_type" : "type-15295", ++ "referenced_type" : "type-15245", ++ "self_type" : "type-15247", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109157,8 +109199,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-16214", +- "self_type" : "type-16216", ++ "referenced_type" : "type-16166", ++ "self_type" : "type-16168", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109166,8 +109208,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17337", +- "self_type" : "type-17339", ++ "referenced_type" : "type-17289", ++ "self_type" : "type-17291", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109175,8 +109217,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-17813", +- "self_type" : "type-17815", ++ "referenced_type" : "type-17765", ++ "self_type" : "type-17767", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109184,8 +109226,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18117", +- "self_type" : "type-18119", ++ "referenced_type" : "type-18069", ++ "self_type" : "type-18071", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109193,8 +109235,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18429", +- "self_type" : "type-18431", ++ "referenced_type" : "type-18381", ++ "self_type" : "type-18383", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109202,8 +109244,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18557", +- "self_type" : "type-18559", ++ "referenced_type" : "type-18509", ++ "self_type" : "type-18511", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109211,8 +109253,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-18789", +- "self_type" : "type-18791", ++ "referenced_type" : "type-18741", ++ "self_type" : "type-18743", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109220,8 +109262,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19069", +- "self_type" : "type-19071", ++ "referenced_type" : "type-19021", ++ "self_type" : "type-19023", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109229,8 +109271,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19308", +- "self_type" : "type-19310", ++ "referenced_type" : "type-19260", ++ "self_type" : "type-19262", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109238,8 +109280,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19453", +- "self_type" : "type-19455", ++ "referenced_type" : "type-19405", ++ "self_type" : "type-19407", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109247,8 +109289,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19657", +- "self_type" : "type-19659", ++ "referenced_type" : "type-19609", ++ "self_type" : "type-19611", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109256,8 +109298,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19825", +- "self_type" : "type-19827", ++ "referenced_type" : "type-19777", ++ "self_type" : "type-19779", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109265,8 +109307,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-19981", +- "self_type" : "type-19984", ++ "referenced_type" : "type-19933", ++ "self_type" : "type-19936", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109274,8 +109316,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-20745", +- "self_type" : "type-20747", ++ "referenced_type" : "type-20697", ++ "self_type" : "type-20699", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109283,8 +109325,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-21869", +- "self_type" : "type-21871", ++ "referenced_type" : "type-21821", ++ "self_type" : "type-21823", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109292,8 +109334,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-22342", +- "self_type" : "type-22344", ++ "referenced_type" : "type-22310", ++ "self_type" : "type-22312", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109301,8 +109343,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-22646", +- "self_type" : "type-22648", ++ "referenced_type" : "type-22558", ++ "self_type" : "type-22560", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109310,8 +109352,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-22958", +- "self_type" : "type-22960", ++ "referenced_type" : "type-22925", ++ "self_type" : "type-22928", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109319,8 +109361,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23086", +- "self_type" : "type-23088", ++ "referenced_type" : "type-23070", ++ "self_type" : "type-23072", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109328,8 +109370,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23318", +- "self_type" : "type-23320", ++ "referenced_type" : "type-23313", ++ "self_type" : "type-23315", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109337,8 +109379,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23598", +- "self_type" : "type-23600", ++ "referenced_type" : "type-23579", ++ "self_type" : "type-23581", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109346,8 +109388,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23829", +- "self_type" : "type-23831", ++ "referenced_type" : "type-23818", ++ "self_type" : "type-23820", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109355,8 +109397,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-23953", +- "self_type" : "type-23955", ++ "referenced_type" : "type-23957", ++ "self_type" : "type-23959", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109364,8 +109406,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24127", +- "self_type" : "type-24129", ++ "referenced_type" : "type-24123", ++ "self_type" : "type-24125", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109373,8 +109415,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24292", +- "self_type" : "type-24294", ++ "referenced_type" : "type-24293", ++ "self_type" : "type-24295", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109382,8 +109424,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24444", +- "self_type" : "type-24447", ++ "referenced_type" : "type-24424", ++ "self_type" : "type-24426", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109391,8 +109433,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24598", +- "self_type" : "type-24601", ++ "referenced_type" : "type-24564", ++ "self_type" : "type-24566", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109400,8 +109442,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24724", +- "self_type" : "type-24728", ++ "referenced_type" : "type-24686", ++ "self_type" : "type-24688", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109409,8 +109451,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-24861", +- "self_type" : "type-24863", ++ "referenced_type" : "type-24822", ++ "self_type" : "type-24824", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109418,8 +109460,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-25147", +- "self_type" : "type-25149", ++ "referenced_type" : "type-25123", ++ "self_type" : "type-25125", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109427,8 +109469,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-25241", +- "self_type" : "type-25243", ++ "referenced_type" : "type-25242", ++ "self_type" : "type-25244", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109436,8 +109478,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-25924", +- "self_type" : "type-25926", ++ "referenced_type" : "type-25977", ++ "self_type" : "type-25979", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109445,8 +109487,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-27047", +- "self_type" : "type-27049", ++ "referenced_type" : "type-27077", ++ "self_type" : "type-27079", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109454,8 +109496,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-27527", +- "self_type" : "type-27529", ++ "referenced_type" : "type-27526", ++ "self_type" : "type-27528", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109463,8 +109505,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-27831", +- "self_type" : "type-27833", ++ "referenced_type" : "type-27830", ++ "self_type" : "type-27832", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109472,8 +109514,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-28143", +- "self_type" : "type-28145", ++ "referenced_type" : "type-28142", ++ "self_type" : "type-28144", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109481,8 +109523,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-28271", +- "self_type" : "type-28273", ++ "referenced_type" : "type-28270", ++ "self_type" : "type-28272", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109490,8 +109532,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-28503", +- "self_type" : "type-28505", ++ "referenced_type" : "type-28502", ++ "self_type" : "type-28504", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109499,8 +109541,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-28783", +- "self_type" : "type-28785", ++ "referenced_type" : "type-28782", ++ "self_type" : "type-28784", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109508,8 +109550,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29014", +- "self_type" : "type-29016", ++ "referenced_type" : "type-29013", ++ "self_type" : "type-29015", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109517,8 +109559,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29138", +- "self_type" : "type-29140", ++ "referenced_type" : "type-29137", ++ "self_type" : "type-29139", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109526,8 +109568,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29312", +- "self_type" : "type-29314", ++ "referenced_type" : "type-29311", ++ "self_type" : "type-29313", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109535,8 +109577,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29477", +- "self_type" : "type-29479", ++ "referenced_type" : "type-29476", ++ "self_type" : "type-29478", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109544,8 +109586,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29629", +- "self_type" : "type-29632", ++ "referenced_type" : "type-29628", ++ "self_type" : "type-29631", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109553,8 +109595,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29783", +- "self_type" : "type-29786", ++ "referenced_type" : "type-29782", ++ "self_type" : "type-29785", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109562,8 +109604,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-29905", +- "self_type" : "type-29909", ++ "referenced_type" : "type-29904", ++ "self_type" : "type-29908", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109571,8 +109613,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-30040", +- "self_type" : "type-30042", ++ "referenced_type" : "type-30039", ++ "self_type" : "type-30041", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109580,8 +109622,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-30292", +- "self_type" : "type-30294", ++ "referenced_type" : "type-30291", ++ "self_type" : "type-30293", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109589,8 +109631,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-30385", +- "self_type" : "type-30387", ++ "referenced_type" : "type-30384", ++ "self_type" : "type-30386", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109598,8 +109640,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-31070", +- "self_type" : "type-31072", ++ "referenced_type" : "type-31069", ++ "self_type" : "type-31071", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109607,8 +109649,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-32194", +- "self_type" : "type-32196", ++ "referenced_type" : "type-32193", ++ "self_type" : "type-32195", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109616,8 +109658,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-3842", +- "self_type" : "type-3844", ++ "referenced_type" : "type-3794", ++ "self_type" : "type-3796", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109634,8 +109676,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-5768", +- "self_type" : "type-5770", ++ "referenced_type" : "type-5720", ++ "self_type" : "type-5722", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109643,8 +109685,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-7075", +- "self_type" : "type-7077", ++ "referenced_type" : "type-7027", ++ "self_type" : "type-7029", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109652,8 +109694,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-7743", +- "self_type" : "type-7745", ++ "referenced_type" : "type-7695", ++ "self_type" : "type-7697", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109661,8 +109703,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-8063", +- "self_type" : "type-8065", ++ "referenced_type" : "type-8015", ++ "self_type" : "type-8017", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109670,8 +109712,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedField *", + "name" : "const google::protobuf::RepeatedField *", +- "referenced_type" : "type-9025", +- "self_type" : "type-9027", ++ "referenced_type" : "type-8977", ++ "self_type" : "type-8979", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109679,8 +109721,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2067", +- "self_type" : "type-2068", ++ "referenced_type" : "type-1999", ++ "self_type" : "type-2000", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -109688,8 +109730,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2089", +- "self_type" : "type-2090", ++ "referenced_type" : "type-2022", ++ "self_type" : "type-2023", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -109697,8 +109739,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2099", +- "self_type" : "type-2100", ++ "referenced_type" : "type-2032", ++ "self_type" : "type-2033", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -109706,8 +109748,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2073", +- "self_type" : "type-2074", ++ "referenced_type" : "type-2005", ++ "self_type" : "type-2006", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -109715,8 +109757,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2418", +- "self_type" : "type-2419", ++ "referenced_type" : "type-2348", ++ "self_type" : "type-2349", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -109724,8 +109766,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2104", +- "self_type" : "type-2106", ++ "referenced_type" : "type-2037", ++ "self_type" : "type-2039", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -109733,8 +109775,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2405", +- "self_type" : "type-2406", ++ "referenced_type" : "type-2335", ++ "self_type" : "type-2336", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -109742,8 +109784,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2083", +- "self_type" : "type-2084", ++ "referenced_type" : "type-2016", ++ "self_type" : "type-2017", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -109751,8 +109793,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2062", +- "self_type" : "type-2063", ++ "referenced_type" : "type-1994", ++ "self_type" : "type-1995", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -109760,8 +109802,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2134", +- "self_type" : "type-2135", ++ "referenced_type" : "type-2065", ++ "self_type" : "type-2066", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -109769,8 +109811,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-4363", +- "self_type" : "type-6748", ++ "referenced_type" : "type-4315", ++ "self_type" : "type-6700", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -109778,8 +109820,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-10163", +- "self_type" : "type-10165", ++ "referenced_type" : "type-10115", ++ "self_type" : "type-10117", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109787,8 +109829,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-10271", +- "self_type" : "type-10273", ++ "referenced_type" : "type-10223", ++ "self_type" : "type-10225", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109796,8 +109838,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-10317", +- "self_type" : "type-10319", ++ "referenced_type" : "type-10269", ++ "self_type" : "type-10271", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109805,8 +109847,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-10674", +- "self_type" : "type-10676", ++ "referenced_type" : "type-10626", ++ "self_type" : "type-10628", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109814,8 +109856,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-10775", +- "self_type" : "type-10777", ++ "referenced_type" : "type-10727", ++ "self_type" : "type-10729", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109823,8 +109865,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-10867", +- "self_type" : "type-10869", ++ "referenced_type" : "type-10819", ++ "self_type" : "type-10821", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109832,8 +109874,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-10978", +- "self_type" : "type-10980", ++ "referenced_type" : "type-10930", ++ "self_type" : "type-10932", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109841,8 +109883,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-11030", +- "self_type" : "type-11032", ++ "referenced_type" : "type-10982", ++ "self_type" : "type-10984", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109850,8 +109892,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-11146", +- "self_type" : "type-11148", ++ "referenced_type" : "type-11098", ++ "self_type" : "type-11100", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109859,8 +109901,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-11330", +- "self_type" : "type-11332", ++ "referenced_type" : "type-11282", ++ "self_type" : "type-11284", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109868,8 +109910,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-11488", +- "self_type" : "type-11490", ++ "referenced_type" : "type-11440", ++ "self_type" : "type-11442", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109877,8 +109919,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-11920", +- "self_type" : "type-11923", ++ "referenced_type" : "type-11872", ++ "self_type" : "type-11875", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109886,8 +109928,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-12093", +- "self_type" : "type-12095", ++ "referenced_type" : "type-12045", ++ "self_type" : "type-12047", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109895,8 +109937,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-12376", +- "self_type" : "type-12378", ++ "referenced_type" : "type-12328", ++ "self_type" : "type-12330", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109904,8 +109946,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-12475", +- "self_type" : "type-12477", ++ "referenced_type" : "type-12427", ++ "self_type" : "type-12429", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109913,8 +109955,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-12615", +- "self_type" : "type-12617", ++ "referenced_type" : "type-12567", ++ "self_type" : "type-12569", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109922,8 +109964,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-12673", +- "self_type" : "type-12675", ++ "referenced_type" : "type-12625", ++ "self_type" : "type-12627", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109931,8 +109973,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-12785", +- "self_type" : "type-12787", ++ "referenced_type" : "type-12737", ++ "self_type" : "type-12739", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109940,8 +109982,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-12853", +- "self_type" : "type-12855", ++ "referenced_type" : "type-12805", ++ "self_type" : "type-12807", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109949,8 +109991,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-12906", +- "self_type" : "type-12908", ++ "referenced_type" : "type-12858", ++ "self_type" : "type-12860", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109958,8 +110000,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-12991", +- "self_type" : "type-12993", ++ "referenced_type" : "type-12943", ++ "self_type" : "type-12945", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109967,8 +110009,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-13059", +- "self_type" : "type-13061", ++ "referenced_type" : "type-13011", ++ "self_type" : "type-13013", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109976,8 +110018,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-13298", +- "self_type" : "type-13300", ++ "referenced_type" : "type-13250", ++ "self_type" : "type-13252", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109985,8 +110027,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-13496", +- "self_type" : "type-13498", ++ "referenced_type" : "type-13448", ++ "self_type" : "type-13450", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -109994,8 +110036,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-13562", +- "self_type" : "type-13564", ++ "referenced_type" : "type-13514", ++ "self_type" : "type-13516", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110003,8 +110045,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-13608", +- "self_type" : "type-13610", ++ "referenced_type" : "type-13560", ++ "self_type" : "type-13562", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110012,8 +110054,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-13965", +- "self_type" : "type-13967", ++ "referenced_type" : "type-13917", ++ "self_type" : "type-13919", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110021,8 +110063,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-14066", +- "self_type" : "type-14068", ++ "referenced_type" : "type-14018", ++ "self_type" : "type-14020", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110030,8 +110072,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-14158", +- "self_type" : "type-14160", ++ "referenced_type" : "type-14110", ++ "self_type" : "type-14112", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110039,8 +110081,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-14269", +- "self_type" : "type-14271", ++ "referenced_type" : "type-14221", ++ "self_type" : "type-14223", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110048,8 +110090,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-14321", +- "self_type" : "type-14323", ++ "referenced_type" : "type-14273", ++ "self_type" : "type-14275", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110057,8 +110099,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-14410", +- "self_type" : "type-14412", ++ "referenced_type" : "type-14362", ++ "self_type" : "type-14364", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110066,8 +110108,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-14581", +- "self_type" : "type-14583", ++ "referenced_type" : "type-14533", ++ "self_type" : "type-14535", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110075,8 +110117,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-14708", +- "self_type" : "type-14710", ++ "referenced_type" : "type-14660", ++ "self_type" : "type-14662", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110084,8 +110126,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-14947", +- "self_type" : "type-14949", ++ "referenced_type" : "type-14899", ++ "self_type" : "type-14901", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110093,8 +110135,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-15152", +- "self_type" : "type-15154", ++ "referenced_type" : "type-15104", ++ "self_type" : "type-15106", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110102,8 +110144,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-15308", +- "self_type" : "type-15310", ++ "referenced_type" : "type-15260", ++ "self_type" : "type-15262", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110111,8 +110153,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-15776", +- "self_type" : "type-15779", ++ "referenced_type" : "type-15728", ++ "self_type" : "type-15731", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110120,8 +110162,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-15949", +- "self_type" : "type-15951", ++ "referenced_type" : "type-15901", ++ "self_type" : "type-15903", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110129,8 +110171,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16231", +- "self_type" : "type-16233", ++ "referenced_type" : "type-16183", ++ "self_type" : "type-16185", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110138,8 +110180,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16332", +- "self_type" : "type-16334", ++ "referenced_type" : "type-16284", ++ "self_type" : "type-16286", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110147,8 +110189,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16472", +- "self_type" : "type-16474", ++ "referenced_type" : "type-16424", ++ "self_type" : "type-16426", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110156,8 +110198,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16529", +- "self_type" : "type-16531", ++ "referenced_type" : "type-16481", ++ "self_type" : "type-16483", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110165,8 +110207,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16641", +- "self_type" : "type-16643", ++ "referenced_type" : "type-16593", ++ "self_type" : "type-16595", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110174,8 +110216,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16709", +- "self_type" : "type-16711", ++ "referenced_type" : "type-16661", ++ "self_type" : "type-16663", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110183,8 +110225,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16762", +- "self_type" : "type-16764", ++ "referenced_type" : "type-16714", ++ "self_type" : "type-16716", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110192,8 +110234,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16847", +- "self_type" : "type-16849", ++ "referenced_type" : "type-16799", ++ "self_type" : "type-16801", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110201,8 +110243,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16915", +- "self_type" : "type-16917", ++ "referenced_type" : "type-16867", ++ "self_type" : "type-16869", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110210,8 +110252,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17154", +- "self_type" : "type-17156", ++ "referenced_type" : "type-17106", ++ "self_type" : "type-17108", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110219,8 +110261,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17352", +- "self_type" : "type-17354", ++ "referenced_type" : "type-17304", ++ "self_type" : "type-17306", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110228,8 +110270,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17426", +- "self_type" : "type-17428", ++ "referenced_type" : "type-17378", ++ "self_type" : "type-17380", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110237,8 +110279,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17472", +- "self_type" : "type-17474", ++ "referenced_type" : "type-17424", ++ "self_type" : "type-17426", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110246,8 +110288,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17829", +- "self_type" : "type-17831", ++ "referenced_type" : "type-17781", ++ "self_type" : "type-17783", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110255,8 +110297,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17930", +- "self_type" : "type-17932", ++ "referenced_type" : "type-17882", ++ "self_type" : "type-17884", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110264,8 +110306,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18022", +- "self_type" : "type-18024", ++ "referenced_type" : "type-17974", ++ "self_type" : "type-17976", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110273,8 +110315,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18133", +- "self_type" : "type-18135", ++ "referenced_type" : "type-18085", ++ "self_type" : "type-18087", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110282,8 +110324,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18185", +- "self_type" : "type-18187", ++ "referenced_type" : "type-18137", ++ "self_type" : "type-18139", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110291,8 +110333,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18274", +- "self_type" : "type-18276", ++ "referenced_type" : "type-18226", ++ "self_type" : "type-18228", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110300,8 +110342,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18445", +- "self_type" : "type-18447", ++ "referenced_type" : "type-18397", ++ "self_type" : "type-18399", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110309,8 +110351,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18572", +- "self_type" : "type-18574", ++ "referenced_type" : "type-18524", ++ "self_type" : "type-18526", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110318,8 +110360,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18804", +- "self_type" : "type-18806", ++ "referenced_type" : "type-18756", ++ "self_type" : "type-18758", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110327,8 +110369,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18936", +- "self_type" : "type-18938", ++ "referenced_type" : "type-18888", ++ "self_type" : "type-18890", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110336,8 +110378,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19084", +- "self_type" : "type-19086", ++ "referenced_type" : "type-19036", ++ "self_type" : "type-19038", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110345,8 +110387,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19324", +- "self_type" : "type-19326", ++ "referenced_type" : "type-19276", ++ "self_type" : "type-19278", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110354,8 +110396,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19468", +- "self_type" : "type-19470", ++ "referenced_type" : "type-19420", ++ "self_type" : "type-19422", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110363,8 +110405,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19672", +- "self_type" : "type-19674", ++ "referenced_type" : "type-19624", ++ "self_type" : "type-19626", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110372,8 +110414,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19841", +- "self_type" : "type-19843", ++ "referenced_type" : "type-19793", ++ "self_type" : "type-19795", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110381,8 +110423,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19997", +- "self_type" : "type-19999", ++ "referenced_type" : "type-19949", ++ "self_type" : "type-19951", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110390,8 +110432,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20310", +- "self_type" : "type-20313", ++ "referenced_type" : "type-20262", ++ "self_type" : "type-20265", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110399,8 +110441,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20483", +- "self_type" : "type-20485", ++ "referenced_type" : "type-20435", ++ "self_type" : "type-20437", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110408,8 +110450,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20762", +- "self_type" : "type-20764", ++ "referenced_type" : "type-20714", ++ "self_type" : "type-20716", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110417,8 +110459,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20863", +- "self_type" : "type-20865", ++ "referenced_type" : "type-20815", ++ "self_type" : "type-20817", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110426,8 +110468,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21003", +- "self_type" : "type-21005", ++ "referenced_type" : "type-20955", ++ "self_type" : "type-20957", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110435,8 +110477,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21061", +- "self_type" : "type-21063", ++ "referenced_type" : "type-21013", ++ "self_type" : "type-21015", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110444,8 +110486,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21173", +- "self_type" : "type-21175", ++ "referenced_type" : "type-2109", ++ "self_type" : "type-2112", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110453,8 +110495,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21241", +- "self_type" : "type-21243", ++ "referenced_type" : "type-21125", ++ "self_type" : "type-21127", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110462,8 +110504,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21294", +- "self_type" : "type-21296", ++ "referenced_type" : "type-21193", ++ "self_type" : "type-21195", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110471,8 +110513,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21379", +- "self_type" : "type-21381", ++ "referenced_type" : "type-21246", ++ "self_type" : "type-21248", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110480,8 +110522,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21447", +- "self_type" : "type-21449", ++ "referenced_type" : "type-21331", ++ "self_type" : "type-21333", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110489,8 +110531,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21686", +- "self_type" : "type-21688", ++ "referenced_type" : "type-21399", ++ "self_type" : "type-21401", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110498,8 +110540,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2179", +- "self_type" : "type-2181", ++ "referenced_type" : "type-21638", ++ "self_type" : "type-21640", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110507,8 +110549,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21884", +- "self_type" : "type-21886", ++ "referenced_type" : "type-21836", ++ "self_type" : "type-21838", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110516,8 +110558,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21955", +- "self_type" : "type-21957", ++ "referenced_type" : "type-21957", ++ "self_type" : "type-21959", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110525,8 +110567,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-22001", +- "self_type" : "type-22003", ++ "referenced_type" : "type-21999", ++ "self_type" : "type-22001", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110534,8 +110576,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-22358", +- "self_type" : "type-22360", ++ "referenced_type" : "type-22325", ++ "self_type" : "type-22327", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110543,8 +110585,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-22459", +- "self_type" : "type-22461", ++ "referenced_type" : "type-22402", ++ "self_type" : "type-22404", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110552,8 +110594,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-22551", +- "self_type" : "type-22553", ++ "referenced_type" : "type-22470", ++ "self_type" : "type-22472", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110561,8 +110603,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-22662", +- "self_type" : "type-22664", ++ "referenced_type" : "type-22574", ++ "self_type" : "type-22576", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110570,8 +110612,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-22714", +- "self_type" : "type-22716", ++ "referenced_type" : "type-22639", ++ "self_type" : "type-22641", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110579,8 +110621,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-22803", +- "self_type" : "type-22805", ++ "referenced_type" : "type-22749", ++ "self_type" : "type-22751", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110588,8 +110630,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-22974", +- "self_type" : "type-22976", ++ "referenced_type" : "type-22941", ++ "self_type" : "type-22943", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110597,8 +110639,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-23101", +- "self_type" : "type-23103", ++ "referenced_type" : "type-23086", ++ "self_type" : "type-23090", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110606,8 +110648,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-23333", +- "self_type" : "type-23335", ++ "referenced_type" : "type-23328", ++ "self_type" : "type-23330", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110615,8 +110657,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-23465", +- "self_type" : "type-23467", ++ "referenced_type" : "type-23442", ++ "self_type" : "type-23444", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110624,8 +110666,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-23613", +- "self_type" : "type-23615", ++ "referenced_type" : "type-23594", ++ "self_type" : "type-23596", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110633,8 +110675,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-23845", +- "self_type" : "type-23847", ++ "referenced_type" : "type-23834", ++ "self_type" : "type-23836", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110642,8 +110684,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-23968", +- "self_type" : "type-23970", ++ "referenced_type" : "type-23972", ++ "self_type" : "type-23974", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110651,8 +110693,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-24142", +- "self_type" : "type-24144", ++ "referenced_type" : "type-2399", ++ "self_type" : "type-2401", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110660,8 +110702,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-24308", +- "self_type" : "type-24310", ++ "referenced_type" : "type-24138", ++ "self_type" : "type-24140", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110669,8 +110711,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-24460", +- "self_type" : "type-24462", ++ "referenced_type" : "type-24309", ++ "self_type" : "type-24311", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110678,8 +110720,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-24614", +- "self_type" : "type-24616", ++ "referenced_type" : "type-24439", ++ "self_type" : "type-24441", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110687,8 +110729,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2469", +- "self_type" : "type-2471", ++ "referenced_type" : "type-24581", ++ "self_type" : "type-24583", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110696,8 +110738,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-24742", +- "self_type" : "type-24744", ++ "referenced_type" : "type-24701", ++ "self_type" : "type-24703", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110705,8 +110747,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-24876", +- "self_type" : "type-24878", ++ "referenced_type" : "type-24839", ++ "self_type" : "type-24841", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110714,8 +110756,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-25162", +- "self_type" : "type-25164", ++ "referenced_type" : "type-25139", ++ "self_type" : "type-25141", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110732,8 +110774,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-25486", +- "self_type" : "type-25489", ++ "referenced_type" : "type-25537", ++ "self_type" : "type-25539", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110741,8 +110783,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-25659", +- "self_type" : "type-25661", ++ "referenced_type" : "type-25710", ++ "self_type" : "type-25712", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110750,8 +110792,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-25941", +- "self_type" : "type-25943", ++ "referenced_type" : "type-25992", ++ "self_type" : "type-25994", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110759,8 +110801,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-26041", +- "self_type" : "type-26043", ++ "referenced_type" : "type-26094", ++ "self_type" : "type-26096", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110768,8 +110810,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-26181", +- "self_type" : "type-26183", ++ "referenced_type" : "type-26225", ++ "self_type" : "type-26227", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110777,8 +110819,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-26239", +- "self_type" : "type-26241", ++ "referenced_type" : "type-26281", ++ "self_type" : "type-26283", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110786,8 +110828,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-26351", +- "self_type" : "type-26353", ++ "referenced_type" : "type-26394", ++ "self_type" : "type-26396", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110795,8 +110837,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-26419", +- "self_type" : "type-26421", ++ "referenced_type" : "type-26461", ++ "self_type" : "type-26463", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110804,8 +110846,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-26472", +- "self_type" : "type-26474", ++ "referenced_type" : "type-26508", ++ "self_type" : "type-26510", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110813,8 +110855,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-26557", +- "self_type" : "type-26559", ++ "referenced_type" : "type-26584", ++ "self_type" : "type-26586", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110822,8 +110864,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-26625", +- "self_type" : "type-26627", ++ "referenced_type" : "type-26647", ++ "self_type" : "type-26649", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110831,8 +110873,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-26864", +- "self_type" : "type-26866", ++ "referenced_type" : "type-26888", ++ "self_type" : "type-26890", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110840,8 +110882,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-27062", +- "self_type" : "type-27064", ++ "referenced_type" : "type-27092", ++ "self_type" : "type-27094", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110849,8 +110891,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-27140", +- "self_type" : "type-27142", ++ "referenced_type" : "type-27139", ++ "self_type" : "type-27141", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110858,8 +110900,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-27186", +- "self_type" : "type-27188", ++ "referenced_type" : "type-27185", ++ "self_type" : "type-27187", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110867,8 +110909,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-27543", +- "self_type" : "type-27545", ++ "referenced_type" : "type-27542", ++ "self_type" : "type-27544", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110876,8 +110918,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-27644", +- "self_type" : "type-27646", ++ "referenced_type" : "type-27643", ++ "self_type" : "type-27645", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110885,8 +110927,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-27736", +- "self_type" : "type-27738", ++ "referenced_type" : "type-27735", ++ "self_type" : "type-27737", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110894,8 +110936,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-27847", +- "self_type" : "type-27849", ++ "referenced_type" : "type-27846", ++ "self_type" : "type-27848", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110903,8 +110945,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-27899", +- "self_type" : "type-27901", ++ "referenced_type" : "type-27898", ++ "self_type" : "type-27900", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110912,8 +110954,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-27988", +- "self_type" : "type-27990", ++ "referenced_type" : "type-27987", ++ "self_type" : "type-27989", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110921,8 +110963,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-28159", +- "self_type" : "type-28161", ++ "referenced_type" : "type-28158", ++ "self_type" : "type-28160", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110930,8 +110972,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-28286", +- "self_type" : "type-28288", ++ "referenced_type" : "type-28285", ++ "self_type" : "type-28287", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110939,8 +110981,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-28518", +- "self_type" : "type-28520", ++ "referenced_type" : "type-28517", ++ "self_type" : "type-28519", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110948,8 +110990,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-28650", +- "self_type" : "type-28652", ++ "referenced_type" : "type-28649", ++ "self_type" : "type-28651", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110957,8 +110999,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-28798", +- "self_type" : "type-28800", ++ "referenced_type" : "type-28797", ++ "self_type" : "type-28799", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110966,8 +111008,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-29030", +- "self_type" : "type-29032", ++ "referenced_type" : "type-29029", ++ "self_type" : "type-29031", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110975,8 +111017,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-29153", +- "self_type" : "type-29155", ++ "referenced_type" : "type-29152", ++ "self_type" : "type-29154", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110984,8 +111026,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-29327", +- "self_type" : "type-29329", ++ "referenced_type" : "type-29326", ++ "self_type" : "type-29328", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -110993,8 +111035,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-29493", +- "self_type" : "type-29495", ++ "referenced_type" : "type-29492", ++ "self_type" : "type-29494", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111002,8 +111044,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-29645", +- "self_type" : "type-29647", ++ "referenced_type" : "type-29644", ++ "self_type" : "type-29646", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111011,8 +111053,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-29799", +- "self_type" : "type-29801", ++ "referenced_type" : "type-29798", ++ "self_type" : "type-29800", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111020,8 +111062,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-29923", +- "self_type" : "type-29925", ++ "referenced_type" : "type-29922", ++ "self_type" : "type-29924", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111029,8 +111071,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-30055", +- "self_type" : "type-30057", ++ "referenced_type" : "type-30054", ++ "self_type" : "type-30056", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111038,8 +111080,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-30307", +- "self_type" : "type-30309", ++ "referenced_type" : "type-30306", ++ "self_type" : "type-30308", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111047,8 +111089,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-30401", +- "self_type" : "type-30403", ++ "referenced_type" : "type-30400", ++ "self_type" : "type-30402", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111056,8 +111098,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-30632", +- "self_type" : "type-30635", ++ "referenced_type" : "type-30631", ++ "self_type" : "type-30634", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111065,8 +111107,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-30805", +- "self_type" : "type-30807", ++ "referenced_type" : "type-30804", ++ "self_type" : "type-30806", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111074,8 +111116,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-31087", +- "self_type" : "type-31089", ++ "referenced_type" : "type-31086", ++ "self_type" : "type-31088", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111083,8 +111125,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-31188", +- "self_type" : "type-31190", ++ "referenced_type" : "type-31187", ++ "self_type" : "type-31189", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111092,8 +111134,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-31328", +- "self_type" : "type-31330", ++ "referenced_type" : "type-31327", ++ "self_type" : "type-31329", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111101,8 +111143,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-31386", +- "self_type" : "type-31388", ++ "referenced_type" : "type-31385", ++ "self_type" : "type-31387", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111110,8 +111152,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-31498", +- "self_type" : "type-31500", ++ "referenced_type" : "type-31497", ++ "self_type" : "type-31499", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111119,8 +111161,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-31566", +- "self_type" : "type-31568", ++ "referenced_type" : "type-31565", ++ "self_type" : "type-31567", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111128,8 +111170,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-31619", +- "self_type" : "type-31621", ++ "referenced_type" : "type-31618", ++ "self_type" : "type-31620", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111137,8 +111179,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-31704", +- "self_type" : "type-31706", ++ "referenced_type" : "type-31703", ++ "self_type" : "type-31705", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111146,8 +111188,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-31772", +- "self_type" : "type-31774", ++ "referenced_type" : "type-31771", ++ "self_type" : "type-31773", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111155,8 +111197,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-32011", +- "self_type" : "type-32013", ++ "referenced_type" : "type-32010", ++ "self_type" : "type-32012", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111164,8 +111206,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-32209", +- "self_type" : "type-32211", ++ "referenced_type" : "type-32208", ++ "self_type" : "type-32210", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111173,8 +111215,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-3337", +- "self_type" : "type-3340", ++ "referenced_type" : "type-3289", ++ "self_type" : "type-3292", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111182,8 +111224,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-3516", +- "self_type" : "type-3518", ++ "referenced_type" : "type-3468", ++ "self_type" : "type-3470", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111191,8 +111233,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-3859", +- "self_type" : "type-3861", ++ "referenced_type" : "type-3811", ++ "self_type" : "type-3813", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111200,8 +111242,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-3978", +- "self_type" : "type-3980", ++ "referenced_type" : "type-3930", ++ "self_type" : "type-3932", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111209,8 +111251,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-4167", +- "self_type" : "type-4169", ++ "referenced_type" : "type-4119", ++ "self_type" : "type-4121", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111218,8 +111260,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-4230", +- "self_type" : "type-4232", ++ "referenced_type" : "type-4182", ++ "self_type" : "type-4184", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111227,8 +111269,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-4371", +- "self_type" : "type-4373", ++ "referenced_type" : "type-4323", ++ "self_type" : "type-4325", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111236,8 +111278,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-4442", +- "self_type" : "type-4444", ++ "referenced_type" : "type-4394", ++ "self_type" : "type-4396", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111245,8 +111287,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-4494", +- "self_type" : "type-4496", ++ "referenced_type" : "type-4446", ++ "self_type" : "type-4448", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111254,8 +111296,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-4687", +- "self_type" : "type-4689", ++ "referenced_type" : "type-4639", ++ "self_type" : "type-4641", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111263,8 +111305,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-5317", +- "self_type" : "type-5320", ++ "referenced_type" : "type-5269", ++ "self_type" : "type-5272", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111272,8 +111314,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-5496", +- "self_type" : "type-5498", ++ "referenced_type" : "type-5448", ++ "self_type" : "type-5450", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111281,8 +111323,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-5785", +- "self_type" : "type-5787", ++ "referenced_type" : "type-5737", ++ "self_type" : "type-5739", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111290,8 +111332,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-5886", +- "self_type" : "type-5888", ++ "referenced_type" : "type-5838", ++ "self_type" : "type-5840", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111299,8 +111341,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-6026", +- "self_type" : "type-6028", ++ "referenced_type" : "type-5978", ++ "self_type" : "type-5980", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111308,8 +111350,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-6084", +- "self_type" : "type-6086", ++ "referenced_type" : "type-6036", ++ "self_type" : "type-6038", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111317,8 +111359,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-6196", +- "self_type" : "type-6198", ++ "referenced_type" : "type-6148", ++ "self_type" : "type-6150", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111326,8 +111368,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-6264", +- "self_type" : "type-6266", ++ "referenced_type" : "type-6216", ++ "self_type" : "type-6218", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111335,8 +111377,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-6317", +- "self_type" : "type-6319", ++ "referenced_type" : "type-6269", ++ "self_type" : "type-6271", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111344,8 +111386,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-6407", +- "self_type" : "type-6409", ++ "referenced_type" : "type-6359", ++ "self_type" : "type-6361", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111353,8 +111395,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-6476", +- "self_type" : "type-6478", ++ "referenced_type" : "type-6428", ++ "self_type" : "type-6430", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111371,8 +111413,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-6849", +- "self_type" : "type-6851", ++ "referenced_type" : "type-6801", ++ "self_type" : "type-6803", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111380,8 +111422,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-7090", +- "self_type" : "type-7092", ++ "referenced_type" : "type-7042", ++ "self_type" : "type-7044", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111389,8 +111431,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-7183", +- "self_type" : "type-7185", ++ "referenced_type" : "type-7135", ++ "self_type" : "type-7137", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111398,8 +111440,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-7270", +- "self_type" : "type-7272", ++ "referenced_type" : "type-7222", ++ "self_type" : "type-7224", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111407,8 +111449,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-7759", +- "self_type" : "type-7761", ++ "referenced_type" : "type-7711", ++ "self_type" : "type-7713", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111416,8 +111458,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-7862", +- "self_type" : "type-7864", ++ "referenced_type" : "type-7814", ++ "self_type" : "type-7816", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111425,8 +111467,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-7969", +- "self_type" : "type-7971", ++ "referenced_type" : "type-7921", ++ "self_type" : "type-7923", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111434,8 +111476,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-8079", +- "self_type" : "type-8081", ++ "referenced_type" : "type-8031", ++ "self_type" : "type-8033", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111443,8 +111485,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-8131", +- "self_type" : "type-8133", ++ "referenced_type" : "type-8083", ++ "self_type" : "type-8085", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111452,8 +111494,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-8591", +- "self_type" : "type-8594", ++ "referenced_type" : "type-8543", ++ "self_type" : "type-8546", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111461,8 +111503,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-8761", +- "self_type" : "type-8763", ++ "referenced_type" : "type-8713", ++ "self_type" : "type-8715", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111470,8 +111512,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-9042", +- "self_type" : "type-9044", ++ "referenced_type" : "type-8994", ++ "self_type" : "type-8996", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111479,8 +111521,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-9143", +- "self_type" : "type-9145", ++ "referenced_type" : "type-9095", ++ "self_type" : "type-9097", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111488,8 +111530,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-9283", +- "self_type" : "type-9285", ++ "referenced_type" : "type-9235", ++ "self_type" : "type-9237", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111497,8 +111539,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-9341", +- "self_type" : "type-9343", ++ "referenced_type" : "type-9293", ++ "self_type" : "type-9295", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111506,8 +111548,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-9453", +- "self_type" : "type-9455", ++ "referenced_type" : "type-9405", ++ "self_type" : "type-9407", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111515,8 +111557,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-9521", +- "self_type" : "type-9523", ++ "referenced_type" : "type-9473", ++ "self_type" : "type-9475", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111524,8 +111566,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-9574", +- "self_type" : "type-9576", ++ "referenced_type" : "type-9526", ++ "self_type" : "type-9528", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111533,8 +111575,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-9659", +- "self_type" : "type-9661", ++ "referenced_type" : "type-9611", ++ "self_type" : "type-9613", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111542,8 +111584,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-9727", +- "self_type" : "type-9729", ++ "referenced_type" : "type-9679", ++ "self_type" : "type-9681", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111551,8 +111593,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-9965", +- "self_type" : "type-9967", ++ "referenced_type" : "type-9917", ++ "self_type" : "type-9919", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -111569,8 +111611,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2424", +- "self_type" : "type-2425", ++ "referenced_type" : "type-2354", ++ "self_type" : "type-2355", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -111578,8 +111620,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2110", +- "self_type" : "type-2111", ++ "referenced_type" : "type-2043", ++ "self_type" : "type-2044", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -111587,8 +111629,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2429", +- "self_type" : "type-2430", ++ "referenced_type" : "type-2359", ++ "self_type" : "type-2360", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -111596,8 +111638,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2094", +- "self_type" : "type-2095", ++ "referenced_type" : "type-2027", ++ "self_type" : "type-2028", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -111605,8 +111647,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2411", +- "self_type" : "type-2414", ++ "referenced_type" : "type-2343", ++ "self_type" : "type-2344", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -111614,8 +111656,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2078", +- "self_type" : "type-2079", ++ "referenced_type" : "type-2011", ++ "self_type" : "type-2012", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -111623,8 +111665,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2126", +- "self_type" : "type-2127", ++ "referenced_type" : "type-2059", ++ "self_type" : "type-2060", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -111632,8 +111674,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2115", +- "self_type" : "type-2116", ++ "referenced_type" : "type-2048", ++ "self_type" : "type-2049", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -111641,8 +111683,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2120", +- "self_type" : "type-2121", ++ "referenced_type" : "type-2053", ++ "self_type" : "type-2054", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -111650,8 +111692,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField *", + "name" : "const google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-7562", +- "self_type" : "type-7564", ++ "referenced_type" : "type-7514", ++ "self_type" : "type-7516", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -111659,8 +111701,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> > *", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> > *", +- "referenced_type" : "type-7576", +- "self_type" : "type-7577", ++ "referenced_type" : "type-7528", ++ "self_type" : "type-7529", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -111677,8 +111719,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceDescriptor *", + "name" : "const google::protobuf::ServiceDescriptor *", +- "referenced_type" : "type-1991", +- "self_type" : "type-1990", ++ "referenced_type" : "type-1917", ++ "self_type" : "type-1916", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111686,8 +111728,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceDescriptorProto *", + "name" : "const google::protobuf::ServiceDescriptorProto *", +- "referenced_type" : "type-1887", +- "self_type" : "type-1888", ++ "referenced_type" : "type-1805", ++ "self_type" : "type-1807", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -111695,8 +111737,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-12142", +- "self_type" : "type-12144", ++ "referenced_type" : "type-12094", ++ "self_type" : "type-12096", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111704,8 +111746,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-13210", +- "self_type" : "type-13212", ++ "referenced_type" : "type-13162", ++ "self_type" : "type-13164", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111713,8 +111755,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-14761", +- "self_type" : "type-14763", ++ "referenced_type" : "type-14713", ++ "self_type" : "type-14715", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111722,8 +111764,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-14852", +- "self_type" : "type-14854", ++ "referenced_type" : "type-14804", ++ "self_type" : "type-14806", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111731,8 +111773,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-15115", +- "self_type" : "type-15117", ++ "referenced_type" : "type-15067", ++ "self_type" : "type-15069", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111740,8 +111782,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-15215", +- "self_type" : "type-15217", ++ "referenced_type" : "type-15167", ++ "self_type" : "type-15169", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111749,8 +111791,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-15997", +- "self_type" : "type-15999", ++ "referenced_type" : "type-15949", ++ "self_type" : "type-15951", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111758,8 +111800,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-17066", +- "self_type" : "type-17068", ++ "referenced_type" : "type-17018", ++ "self_type" : "type-17020", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111767,8 +111809,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-18625", +- "self_type" : "type-18627", ++ "referenced_type" : "type-18577", ++ "self_type" : "type-18579", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111776,8 +111818,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-18709", +- "self_type" : "type-18711", ++ "referenced_type" : "type-18661", ++ "self_type" : "type-18663", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111785,8 +111827,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-18899", +- "self_type" : "type-18901", ++ "referenced_type" : "type-18851", ++ "self_type" : "type-18853", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111794,8 +111836,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-18997", +- "self_type" : "type-18999", ++ "referenced_type" : "type-18949", ++ "self_type" : "type-18951", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111803,8 +111845,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-19240", +- "self_type" : "type-19242", ++ "referenced_type" : "type-1913", ++ "self_type" : "type-1912", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111812,8 +111854,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-19569", +- "self_type" : "type-19571", ++ "referenced_type" : "type-19192", ++ "self_type" : "type-19194", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111821,8 +111863,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-19740", +- "self_type" : "type-19742", ++ "referenced_type" : "type-19521", ++ "self_type" : "type-19523", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111830,8 +111872,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-1987", +- "self_type" : "type-1986", ++ "referenced_type" : "type-19692", ++ "self_type" : "type-19694", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111839,8 +111881,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-19907", +- "self_type" : "type-19909", ++ "referenced_type" : "type-19859", ++ "self_type" : "type-19861", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111848,8 +111890,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-20529", +- "self_type" : "type-20531", ++ "referenced_type" : "type-20481", ++ "self_type" : "type-20483", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111857,8 +111899,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-21598", +- "self_type" : "type-21600", ++ "referenced_type" : "type-21550", ++ "self_type" : "type-21552", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111866,8 +111908,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-23154", +- "self_type" : "type-23156", ++ "referenced_type" : "type-23139", ++ "self_type" : "type-23141", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111875,8 +111917,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-23238", +- "self_type" : "type-23240", ++ "referenced_type" : "type-23227", ++ "self_type" : "type-23230", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111884,8 +111926,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-23428", +- "self_type" : "type-23430", ++ "referenced_type" : "type-23411", ++ "self_type" : "type-23413", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111893,8 +111935,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-23526", +- "self_type" : "type-23528", ++ "referenced_type" : "type-23504", ++ "self_type" : "type-23506", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111902,8 +111944,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-23761", +- "self_type" : "type-23763", ++ "referenced_type" : "type-23748", ++ "self_type" : "type-23750", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111911,8 +111953,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-24039", +- "self_type" : "type-24041", ++ "referenced_type" : "type-24038", ++ "self_type" : "type-24040", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111920,8 +111962,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-24207", +- "self_type" : "type-24209", ++ "referenced_type" : "type-24212", ++ "self_type" : "type-24214", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111929,8 +111971,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-24372", +- "self_type" : "type-24374", ++ "referenced_type" : "type-24353", ++ "self_type" : "type-24355", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111938,8 +111980,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-24512", +- "self_type" : "type-24516", ++ "referenced_type" : "type-24490", ++ "self_type" : "type-24494", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111947,8 +111989,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-24795", +- "self_type" : "type-24797", ++ "referenced_type" : "type-2463", ++ "self_type" : "type-2465", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111956,8 +111998,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-24951", +- "self_type" : "type-24953", ++ "referenced_type" : "type-24753", ++ "self_type" : "type-24755", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111965,8 +112007,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-25080", +- "self_type" : "type-25082", ++ "referenced_type" : "type-24919", ++ "self_type" : "type-24921", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111974,8 +112016,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-2533", +- "self_type" : "type-2535", ++ "referenced_type" : "type-25051", ++ "self_type" : "type-25053", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111983,8 +112025,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-25708", +- "self_type" : "type-25710", ++ "referenced_type" : "type-25759", ++ "self_type" : "type-25761", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -111992,8 +112034,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-26776", +- "self_type" : "type-26778", ++ "referenced_type" : "type-26798", ++ "self_type" : "type-26800", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112001,8 +112043,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-28339", +- "self_type" : "type-28341", ++ "referenced_type" : "type-28338", ++ "self_type" : "type-28340", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112010,8 +112052,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-28423", +- "self_type" : "type-28425", ++ "referenced_type" : "type-28422", ++ "self_type" : "type-28424", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112019,8 +112061,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-28613", +- "self_type" : "type-28615", ++ "referenced_type" : "type-28612", ++ "self_type" : "type-28614", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112028,8 +112070,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-28711", +- "self_type" : "type-28713", ++ "referenced_type" : "type-28710", ++ "self_type" : "type-28712", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112037,8 +112079,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-28946", +- "self_type" : "type-28948", ++ "referenced_type" : "type-28945", ++ "self_type" : "type-28947", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112046,8 +112088,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-29224", +- "self_type" : "type-29226", ++ "referenced_type" : "type-29223", ++ "self_type" : "type-29225", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112055,8 +112097,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-29392", +- "self_type" : "type-29394", ++ "referenced_type" : "type-29391", ++ "self_type" : "type-29393", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112064,8 +112106,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-29557", +- "self_type" : "type-29559", ++ "referenced_type" : "type-29556", ++ "self_type" : "type-29558", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112073,8 +112115,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-29697", +- "self_type" : "type-29701", ++ "referenced_type" : "type-29696", ++ "self_type" : "type-29700", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112082,8 +112124,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-29974", +- "self_type" : "type-29976", ++ "referenced_type" : "type-29973", ++ "self_type" : "type-29975", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112091,8 +112133,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-30107", +- "self_type" : "type-30109", ++ "referenced_type" : "type-30106", ++ "self_type" : "type-30108", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112100,8 +112142,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-30225", +- "self_type" : "type-30227", ++ "referenced_type" : "type-30224", ++ "self_type" : "type-30226", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112109,8 +112151,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-30854", +- "self_type" : "type-30856", ++ "referenced_type" : "type-30853", ++ "self_type" : "type-30855", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112118,8 +112160,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-31923", +- "self_type" : "type-31925", ++ "referenced_type" : "type-31922", ++ "self_type" : "type-31924", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112127,8 +112169,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-3571", +- "self_type" : "type-3573", ++ "referenced_type" : "type-3523", ++ "self_type" : "type-3525", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112136,8 +112178,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-5549", +- "self_type" : "type-5551", ++ "referenced_type" : "type-5501", ++ "self_type" : "type-5503", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112145,8 +112187,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-6722", +- "self_type" : "type-6724", ++ "referenced_type" : "type-6674", ++ "self_type" : "type-6676", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112154,8 +112196,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-8808", +- "self_type" : "type-8810", ++ "referenced_type" : "type-8760", ++ "self_type" : "type-8762", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112163,8 +112205,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::ServiceOptions *", + "name" : "const google::protobuf::ServiceOptions *", +- "referenced_type" : "type-9878", +- "self_type" : "type-9880", ++ "referenced_type" : "type-9830", ++ "self_type" : "type-9832", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112172,8 +112214,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-12156", +- "self_type" : "type-12158", ++ "referenced_type" : "type-12108", ++ "self_type" : "type-12110", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112181,8 +112223,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-13225", +- "self_type" : "type-13227", ++ "referenced_type" : "type-13177", ++ "self_type" : "type-13179", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112190,8 +112232,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-14776", +- "self_type" : "type-14778", ++ "referenced_type" : "type-14728", ++ "self_type" : "type-14730", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112199,8 +112241,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-14868", +- "self_type" : "type-14870", ++ "referenced_type" : "type-14820", ++ "self_type" : "type-14822", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112208,8 +112250,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-15132", +- "self_type" : "type-15134", ++ "referenced_type" : "type-15084", ++ "self_type" : "type-15086", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112217,8 +112259,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-15238", +- "self_type" : "type-15240", ++ "referenced_type" : "type-15190", ++ "self_type" : "type-15192", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112226,8 +112268,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-16011", +- "self_type" : "type-16013", ++ "referenced_type" : "type-15963", ++ "self_type" : "type-15965", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112235,8 +112277,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-17081", +- "self_type" : "type-17083", ++ "referenced_type" : "type-17033", ++ "self_type" : "type-17035", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112244,8 +112286,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-18640", +- "self_type" : "type-18642", ++ "referenced_type" : "type-18592", ++ "self_type" : "type-18594", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112253,8 +112295,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-18725", +- "self_type" : "type-18727", ++ "referenced_type" : "type-18677", ++ "self_type" : "type-18679", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112262,8 +112304,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-18916", +- "self_type" : "type-18918", ++ "referenced_type" : "type-18868", ++ "self_type" : "type-18870", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112271,8 +112313,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-19014", +- "self_type" : "type-19016", ++ "referenced_type" : "type-18966", ++ "self_type" : "type-18968", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112280,8 +112322,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-19255", +- "self_type" : "type-19257", ++ "referenced_type" : "type-19207", ++ "self_type" : "type-19209", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112289,8 +112331,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-19585", +- "self_type" : "type-19587", ++ "referenced_type" : "type-1942", ++ "self_type" : "type-1941", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112298,8 +112340,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-19755", +- "self_type" : "type-19757", ++ "referenced_type" : "type-19537", ++ "self_type" : "type-19539", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112307,8 +112349,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-19925", +- "self_type" : "type-19927", ++ "referenced_type" : "type-19707", ++ "self_type" : "type-19709", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112316,8 +112358,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-2016", +- "self_type" : "type-2015", ++ "referenced_type" : "type-19877", ++ "self_type" : "type-19879", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112325,8 +112367,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-20543", +- "self_type" : "type-20545", ++ "referenced_type" : "type-20495", ++ "self_type" : "type-20497", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112334,8 +112376,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-21613", +- "self_type" : "type-21615", ++ "referenced_type" : "type-21565", ++ "self_type" : "type-21567", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112343,8 +112385,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-23169", +- "self_type" : "type-23171", ++ "referenced_type" : "type-23153", ++ "self_type" : "type-23155", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112352,8 +112394,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-23254", +- "self_type" : "type-23256", ++ "referenced_type" : "type-23244", ++ "self_type" : "type-23246", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112361,8 +112403,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-23445", +- "self_type" : "type-23447", ++ "referenced_type" : "type-23425", ++ "self_type" : "type-23427", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112370,8 +112412,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-23543", +- "self_type" : "type-23545", ++ "referenced_type" : "type-23521", ++ "self_type" : "type-23523", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112379,8 +112421,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-23776", +- "self_type" : "type-23778", ++ "referenced_type" : "type-23762", ++ "self_type" : "type-23764", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112388,8 +112430,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-24055", +- "self_type" : "type-24057", ++ "referenced_type" : "type-24052", ++ "self_type" : "type-24054", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112397,8 +112439,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-24222", +- "self_type" : "type-24224", ++ "referenced_type" : "type-24226", ++ "self_type" : "type-24228", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112406,8 +112448,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-24388", +- "self_type" : "type-24390", ++ "referenced_type" : "type-24369", ++ "self_type" : "type-24371", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112415,8 +112457,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-24529", +- "self_type" : "type-24531", ++ "referenced_type" : "type-24506", ++ "self_type" : "type-24508", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112424,8 +112466,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-24810", +- "self_type" : "type-24812", ++ "referenced_type" : "type-2477", ++ "self_type" : "type-2479", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112433,8 +112475,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-24965", +- "self_type" : "type-24967", ++ "referenced_type" : "type-24770", ++ "self_type" : "type-24772", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112442,8 +112484,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-25096", +- "self_type" : "type-25098", ++ "referenced_type" : "type-24933", ++ "self_type" : "type-24935", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112451,8 +112493,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-2547", +- "self_type" : "type-2549", ++ "referenced_type" : "type-25068", ++ "self_type" : "type-25070", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112460,8 +112502,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-25722", +- "self_type" : "type-25724", ++ "referenced_type" : "type-25773", ++ "self_type" : "type-25775", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112469,8 +112511,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-26791", +- "self_type" : "type-26793", ++ "referenced_type" : "type-26813", ++ "self_type" : "type-26815", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112478,8 +112520,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-28354", +- "self_type" : "type-28356", ++ "referenced_type" : "type-28353", ++ "self_type" : "type-28355", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112487,8 +112529,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-28439", +- "self_type" : "type-28441", ++ "referenced_type" : "type-28438", ++ "self_type" : "type-28440", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112496,8 +112538,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-28630", +- "self_type" : "type-28632", ++ "referenced_type" : "type-28629", ++ "self_type" : "type-28631", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112505,8 +112547,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-28728", +- "self_type" : "type-28730", ++ "referenced_type" : "type-28727", ++ "self_type" : "type-28729", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112514,8 +112556,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-28961", +- "self_type" : "type-28963", ++ "referenced_type" : "type-28960", ++ "self_type" : "type-28962", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112523,8 +112565,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-29240", +- "self_type" : "type-29242", ++ "referenced_type" : "type-29239", ++ "self_type" : "type-29241", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112532,8 +112574,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-29407", +- "self_type" : "type-29409", ++ "referenced_type" : "type-29406", ++ "self_type" : "type-29408", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112541,8 +112583,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-29573", +- "self_type" : "type-29575", ++ "referenced_type" : "type-29572", ++ "self_type" : "type-29574", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112550,8 +112592,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-29714", +- "self_type" : "type-29716", ++ "referenced_type" : "type-29713", ++ "self_type" : "type-29715", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112559,8 +112601,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-29989", +- "self_type" : "type-29991", ++ "referenced_type" : "type-29988", ++ "self_type" : "type-29990", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112568,8 +112610,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-30121", +- "self_type" : "type-30123", ++ "referenced_type" : "type-30120", ++ "self_type" : "type-30122", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112577,8 +112619,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-30241", +- "self_type" : "type-30243", ++ "referenced_type" : "type-30240", ++ "self_type" : "type-30242", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112586,8 +112628,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-30868", +- "self_type" : "type-30870", ++ "referenced_type" : "type-30867", ++ "self_type" : "type-30869", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112595,8 +112637,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-31938", +- "self_type" : "type-31940", ++ "referenced_type" : "type-31937", ++ "self_type" : "type-31939", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112604,8 +112646,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-3585", +- "self_type" : "type-3587", ++ "referenced_type" : "type-3537", ++ "self_type" : "type-3539", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112613,8 +112655,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-5563", +- "self_type" : "type-5565", ++ "referenced_type" : "type-5515", ++ "self_type" : "type-5517", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112622,8 +112664,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-6738", +- "self_type" : "type-6740", ++ "referenced_type" : "type-6690", ++ "self_type" : "type-6692", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112631,8 +112673,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-8822", +- "self_type" : "type-8824", ++ "referenced_type" : "type-8774", ++ "self_type" : "type-8776", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112640,8 +112682,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *", + "name" : "const google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-9893", +- "self_type" : "type-9895", ++ "referenced_type" : "type-9845", ++ "self_type" : "type-9847", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -112649,8 +112691,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceCodeInfo_Location *", + "name" : "const google::protobuf::SourceCodeInfo_Location *", +- "referenced_type" : "type-1923", +- "self_type" : "type-1924", ++ "referenced_type" : "type-1844", ++ "self_type" : "type-1845", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -112658,8 +112700,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::SourceContext *", + "name" : "const google::protobuf::SourceContext *", +- "referenced_type" : "type-2474", +- "self_type" : "type-2476", ++ "referenced_type" : "type-2404", ++ "self_type" : "type-2406", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/source_context.pb.h" + }, +@@ -112676,8 +112718,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::StringValue *", + "name" : "const google::protobuf::StringValue *", +- "referenced_type" : "type-11127", +- "self_type" : "type-11126", ++ "referenced_type" : "type-11079", ++ "self_type" : "type-11078", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -112685,8 +112727,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Struct *", + "name" : "const google::protobuf::Struct *", +- "referenced_type" : "type-7281", +- "self_type" : "type-7591", ++ "referenced_type" : "type-7233", ++ "self_type" : "type-7543", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -112694,8 +112736,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::TextFormat::FieldValuePrinter *", + "name" : "const google::protobuf::TextFormat::FieldValuePrinter *", +- "referenced_type" : "type-3725", +- "self_type" : "type-3724", ++ "referenced_type" : "type-3677", ++ "self_type" : "type-3676", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -112703,8 +112745,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::TextFormat::ParseInfoTree *", + "name" : "const google::protobuf::TextFormat::ParseInfoTree *", +- "referenced_type" : "type-7689", +- "self_type" : "type-7690", ++ "referenced_type" : "type-7641", ++ "self_type" : "type-7642", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, +@@ -112712,8 +112754,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::TextFormat::Printer *", + "name" : "const google::protobuf::TextFormat::Printer *", +- "referenced_type" : "type-7684", +- "self_type" : "type-7685", ++ "referenced_type" : "type-7636", ++ "self_type" : "type-7637", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, +@@ -112721,8 +112763,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Timestamp *", + "name" : "const google::protobuf::Timestamp *", +- "referenced_type" : "type-7847", +- "self_type" : "type-7846", ++ "referenced_type" : "type-7799", ++ "self_type" : "type-7798", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -112730,8 +112772,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Type *", + "name" : "const google::protobuf::Type *", +- "referenced_type" : "type-2490", +- "self_type" : "type-2492", ++ "referenced_type" : "type-2420", ++ "self_type" : "type-2422", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, +@@ -112739,8 +112781,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::UInt32Value *", + "name" : "const google::protobuf::UInt32Value *", +- "referenced_type" : "type-11118", +- "self_type" : "type-11117", ++ "referenced_type" : "type-11070", ++ "self_type" : "type-11069", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -112748,8 +112790,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::UInt64Value *", + "name" : "const google::protobuf::UInt64Value *", +- "referenced_type" : "type-11110", +- "self_type" : "type-11109", ++ "referenced_type" : "type-11062", ++ "self_type" : "type-11061", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -112757,8 +112799,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::UninterpretedOption *", + "name" : "const google::protobuf::UninterpretedOption *", +- "referenced_type" : "type-1915", +- "self_type" : "type-1916", ++ "referenced_type" : "type-1835", ++ "self_type" : "type-1836", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -112766,8 +112808,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::UninterpretedOption_NamePart *", + "name" : "const google::protobuf::UninterpretedOption_NamePart *", +- "referenced_type" : "type-1919", +- "self_type" : "type-1920", ++ "referenced_type" : "type-1840", ++ "self_type" : "type-1841", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -112775,8 +112817,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::UnknownField *", + "name" : "const google::protobuf::UnknownField *", +- "referenced_type" : "type-1940", +- "self_type" : "type-1947", ++ "referenced_type" : "type-1865", ++ "self_type" : "type-1871", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -112784,8 +112826,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::UnknownFieldSet *", + "name" : "const google::protobuf::UnknownFieldSet *", +- "referenced_type" : "type-1937", +- "self_type" : "type-1938", ++ "referenced_type" : "type-1862", ++ "self_type" : "type-1863", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -112793,8 +112835,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::Value *", + "name" : "const google::protobuf::Value *", +- "referenced_type" : "type-7290", +- "self_type" : "type-7394", ++ "referenced_type" : "type-7242", ++ "self_type" : "type-7346", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -112802,8 +112844,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::compiler::Importer *", + "name" : "const google::protobuf::compiler::Importer *", +- "referenced_type" : "type-11367", +- "self_type" : "type-11368", ++ "referenced_type" : "type-11319", ++ "self_type" : "type-11320", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/importer.h" + }, +@@ -112811,8 +112853,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::compiler::Parser *", + "name" : "const google::protobuf::compiler::Parser *", +- "referenced_type" : "type-11355", +- "self_type" : "type-11356", ++ "referenced_type" : "type-11307", ++ "self_type" : "type-11308", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/parser.h" + }, +@@ -112820,8 +112862,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::compiler::Parser::LocationRecorder *", + "name" : "const google::protobuf::compiler::Parser::LocationRecorder *", +- "referenced_type" : "type-11493", +- "self_type" : "type-11494", ++ "referenced_type" : "type-11445", ++ "self_type" : "type-11446", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/parser.h" + }, +@@ -112829,8 +112871,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::compiler::SourceLocationTable *", + "name" : "const google::protobuf::compiler::SourceLocationTable *", +- "referenced_type" : "type-11503", +- "self_type" : "type-11504", ++ "referenced_type" : "type-11455", ++ "self_type" : "type-11456", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/parser.h" + }, +@@ -112847,8 +112889,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::hash *", + "name" : "const google::protobuf::hash *", +- "referenced_type" : "type-3692", +- "self_type" : "type-3693", ++ "referenced_type" : "type-3644", ++ "self_type" : "type-3645", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -112856,8 +112898,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::hash *", + "name" : "const google::protobuf::hash *", +- "referenced_type" : "type-4260", +- "self_type" : "type-4261", ++ "referenced_type" : "type-4212", ++ "self_type" : "type-4213", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -112874,8 +112916,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::hash *", + "name" : "const google::protobuf::hash *", +- "referenced_type" : "type-19711", +- "self_type" : "type-19712", ++ "referenced_type" : "type-19663", ++ "self_type" : "type-19664", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -112901,8 +112943,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::AnyMetadata *", + "name" : "const google::protobuf::internal::AnyMetadata *", +- "referenced_type" : "type-2579", +- "self_type" : "type-2580", ++ "referenced_type" : "type-2511", ++ "self_type" : "type-2512", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/any.h" + }, +@@ -112919,8 +112961,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::DynamicMapField *", + "name" : "const google::protobuf::internal::DynamicMapField *", +- "referenced_type" : "type-6790", +- "self_type" : "type-6791", ++ "referenced_type" : "type-6742", ++ "self_type" : "type-6743", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, +@@ -112946,8 +112988,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::GeneratedMessageReflection *", + "name" : "const google::protobuf::internal::GeneratedMessageReflection *", +- "referenced_type" : "type-4300", +- "self_type" : "type-4299", ++ "referenced_type" : "type-4252", ++ "self_type" : "type-4251", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -112955,8 +112997,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::InternalMetadataWithArena *", + "name" : "const google::protobuf::internal::InternalMetadataWithArena *", +- "referenced_type" : "type-1950", +- "self_type" : "type-1951", ++ "referenced_type" : "type-1874", ++ "self_type" : "type-1875", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/metadata.h" + }, +@@ -112964,8 +113006,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", + "name" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", +- "referenced_type" : "type-15159", +- "self_type" : "type-15161", ++ "referenced_type" : "type-15111", ++ "self_type" : "type-15113", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, +@@ -112973,8 +113015,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", + "name" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", +- "referenced_type" : "type-18943", +- "self_type" : "type-18945", ++ "referenced_type" : "type-18895", ++ "self_type" : "type-18897", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, +@@ -112982,8 +113024,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", + "name" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", +- "referenced_type" : "type-23472", +- "self_type" : "type-23474", ++ "referenced_type" : "type-23449", ++ "self_type" : "type-23451", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, +@@ -112991,8 +113033,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", + "name" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", +- "referenced_type" : "type-28657", +- "self_type" : "type-28659", ++ "referenced_type" : "type-28656", ++ "self_type" : "type-28658", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, +@@ -113000,8 +113042,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", + "name" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", +- "referenced_type" : "type-7221", +- "self_type" : "type-7220", ++ "referenced_type" : "type-7173", ++ "self_type" : "type-7172", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -113009,8 +113051,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::MapEntryBase *", + "name" : "const google::protobuf::internal::MapEntryBase *", +- "referenced_type" : "type-4263", +- "self_type" : "type-4264", ++ "referenced_type" : "type-4215", ++ "self_type" : "type-4216", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map_entry.h" + }, +@@ -113018,8 +113060,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::MapEntryLite, Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0>::MapEntryWrapper, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", + "name" : "const google::protobuf::internal::MapEntryLite, Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0>::MapEntryWrapper, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", +- "referenced_type" : "type-7327", +- "self_type" : "type-7331", ++ "referenced_type" : "type-7279", ++ "self_type" : "type-7283", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map_entry_lite.h" + }, +@@ -113027,8 +113069,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::MapEntryLite, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", + "name" : "const google::protobuf::internal::MapEntryLite, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", +- "referenced_type" : "type-7279", +- "self_type" : "type-7583", ++ "referenced_type" : "type-7231", ++ "self_type" : "type-7535", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -113036,8 +113078,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::MapField, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", + "name" : "const google::protobuf::internal::MapField, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", +- "referenced_type" : "type-7369", +- "self_type" : "type-7595", ++ "referenced_type" : "type-7321", ++ "self_type" : "type-7547", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -113045,8 +113087,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::MapFieldAccessor *", + "name" : "const google::protobuf::internal::MapFieldAccessor *", +- "referenced_type" : "type-7009", +- "self_type" : "type-7010", ++ "referenced_type" : "type-6961", ++ "self_type" : "type-6962", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -113054,8 +113096,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::MapFieldBase *", + "name" : "const google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-4268", +- "self_type" : "type-4274", ++ "referenced_type" : "type-4220", ++ "self_type" : "type-4226", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, +@@ -113063,8 +113105,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::MapFieldLite, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", + "name" : "const google::protobuf::internal::MapFieldLite, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", +- "referenced_type" : "type-7197", +- "self_type" : "type-7593", ++ "referenced_type" : "type-7149", ++ "self_type" : "type-7545", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -113072,8 +113114,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::RandomAccessRepeatedFieldAccessor *", + "name" : "const google::protobuf::internal::RandomAccessRepeatedFieldAccessor *", +- "referenced_type" : "type-6979", +- "self_type" : "type-6980", ++ "referenced_type" : "type-6931", ++ "self_type" : "type-6932", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -113081,8 +113123,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldAccessor *", + "name" : "const google::protobuf::internal::RepeatedFieldAccessor *", +- "referenced_type" : "type-6947", +- "self_type" : "type-6946", ++ "referenced_type" : "type-6899", ++ "self_type" : "type-6898", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -113090,8 +113132,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldPrimitiveAccessor *", + "name" : "const google::protobuf::internal::RepeatedFieldPrimitiveAccessor *", +- "referenced_type" : "type-6833", +- "self_type" : "type-6834", ++ "referenced_type" : "type-6785", ++ "self_type" : "type-6786", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -113099,8 +113141,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldPrimitiveAccessor *", + "name" : "const google::protobuf::internal::RepeatedFieldPrimitiveAccessor *", +- "referenced_type" : "type-6828", +- "self_type" : "type-6829", ++ "referenced_type" : "type-6780", ++ "self_type" : "type-6781", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -113108,8 +113150,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldPrimitiveAccessor *", + "name" : "const google::protobuf::internal::RepeatedFieldPrimitiveAccessor *", +- "referenced_type" : "type-6823", +- "self_type" : "type-6824", ++ "referenced_type" : "type-6775", ++ "self_type" : "type-6776", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -113117,8 +113159,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldPrimitiveAccessor *", + "name" : "const google::protobuf::internal::RepeatedFieldPrimitiveAccessor *", +- "referenced_type" : "type-6798", +- "self_type" : "type-6803", ++ "referenced_type" : "type-6750", ++ "self_type" : "type-6755", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -113126,8 +113168,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldPrimitiveAccessor *", + "name" : "const google::protobuf::internal::RepeatedFieldPrimitiveAccessor *", +- "referenced_type" : "type-6812", +- "self_type" : "type-6813", ++ "referenced_type" : "type-6764", ++ "self_type" : "type-6765", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -113135,8 +113177,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldPrimitiveAccessor *", + "name" : "const google::protobuf::internal::RepeatedFieldPrimitiveAccessor *", +- "referenced_type" : "type-6807", +- "self_type" : "type-6808", ++ "referenced_type" : "type-6759", ++ "self_type" : "type-6760", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -113144,8 +113186,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldPrimitiveAccessor *", + "name" : "const google::protobuf::internal::RepeatedFieldPrimitiveAccessor *", +- "referenced_type" : "type-6818", +- "self_type" : "type-6819", ++ "referenced_type" : "type-6770", ++ "self_type" : "type-6771", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -113153,8 +113195,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldWrapper *", + "name" : "const google::protobuf::internal::RepeatedFieldWrapper *", +- "referenced_type" : "type-7000", +- "self_type" : "type-7001", ++ "referenced_type" : "type-6952", ++ "self_type" : "type-6953", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -113162,8 +113204,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldWrapper *", + "name" : "const google::protobuf::internal::RepeatedFieldWrapper *", +- "referenced_type" : "type-6997", +- "self_type" : "type-6998", ++ "referenced_type" : "type-6949", ++ "self_type" : "type-6950", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -113171,8 +113213,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldWrapper *", + "name" : "const google::protobuf::internal::RepeatedFieldWrapper *", +- "referenced_type" : "type-6994", +- "self_type" : "type-6995", ++ "referenced_type" : "type-6946", ++ "self_type" : "type-6947", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -113180,8 +113222,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldWrapper *", + "name" : "const google::protobuf::internal::RepeatedFieldWrapper *", +- "referenced_type" : "type-6982", +- "self_type" : "type-6983", ++ "referenced_type" : "type-6934", ++ "self_type" : "type-6935", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -113189,8 +113231,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldWrapper *", + "name" : "const google::protobuf::internal::RepeatedFieldWrapper *", +- "referenced_type" : "type-6988", +- "self_type" : "type-6989", ++ "referenced_type" : "type-6940", ++ "self_type" : "type-6941", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -113198,8 +113240,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldWrapper *", + "name" : "const google::protobuf::internal::RepeatedFieldWrapper *", +- "referenced_type" : "type-6985", +- "self_type" : "type-6986", ++ "referenced_type" : "type-6937", ++ "self_type" : "type-6938", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -113207,8 +113249,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldWrapper *", + "name" : "const google::protobuf::internal::RepeatedFieldWrapper *", +- "referenced_type" : "type-6991", +- "self_type" : "type-6992", ++ "referenced_type" : "type-6943", ++ "self_type" : "type-6944", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -113225,8 +113267,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::RepeatedPtrFieldMessageAccessor *", + "name" : "const google::protobuf::internal::RepeatedPtrFieldMessageAccessor *", +- "referenced_type" : "type-6845", +- "self_type" : "type-6846", ++ "referenced_type" : "type-6797", ++ "self_type" : "type-6798", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -113234,8 +113276,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::RepeatedPtrFieldStringAccessor *", + "name" : "const google::protobuf::internal::RepeatedPtrFieldStringAccessor *", +- "referenced_type" : "type-6840", +- "self_type" : "type-6841", ++ "referenced_type" : "type-6792", ++ "self_type" : "type-6793", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -113243,8 +113285,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::RepeatedPtrFieldWrapper *", + "name" : "const google::protobuf::internal::RepeatedPtrFieldWrapper *", +- "referenced_type" : "type-7006", +- "self_type" : "type-7007", ++ "referenced_type" : "type-6958", ++ "self_type" : "type-6959", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -113252,8 +113294,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::RepeatedPtrFieldWrapper, std::allocator > > *", + "name" : "const google::protobuf::internal::RepeatedPtrFieldWrapper, std::allocator > > *", +- "referenced_type" : "type-7003", +- "self_type" : "type-7004", ++ "referenced_type" : "type-6955", ++ "self_type" : "type-6956", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -113261,8 +113303,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::RepeatedPtrIterator, std::allocator > > *", + "name" : "const google::protobuf::internal::RepeatedPtrIterator, std::allocator > > *", +- "referenced_type" : "type-3813", +- "self_type" : "type-3814", ++ "referenced_type" : "type-3765", ++ "self_type" : "type-3766", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -113270,8 +113312,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::RepeatedPtrIterator *", + "name" : "const google::protobuf::internal::RepeatedPtrIterator *", +- "referenced_type" : "type-6756", +- "self_type" : "type-6757", ++ "referenced_type" : "type-6708", ++ "self_type" : "type-6709", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -113279,8 +113321,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::RepeatedPtrIterator, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> > *", + "name" : "const google::protobuf::internal::RepeatedPtrIterator, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> > *", +- "referenced_type" : "type-7255", +- "self_type" : "type-7256", ++ "referenced_type" : "type-7207", ++ "self_type" : "type-7208", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -113288,8 +113330,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::RepeatedPtrOverPtrsIterator *", + "name" : "const google::protobuf::internal::RepeatedPtrOverPtrsIterator *", +- "referenced_type" : "type-7695", +- "self_type" : "type-7696", ++ "referenced_type" : "type-7647", ++ "self_type" : "type-7648", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -113306,8 +113348,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::TypeDefinedMapFieldBase *", + "name" : "const google::protobuf::internal::TypeDefinedMapFieldBase *", +- "referenced_type" : "type-6775", +- "self_type" : "type-6776", ++ "referenced_type" : "type-6727", ++ "self_type" : "type-6728", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, +@@ -113315,8 +113357,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::TypeDefinedMapFieldBase, std::allocator >, google::protobuf::Value> *", + "name" : "const google::protobuf::internal::TypeDefinedMapFieldBase, std::allocator >, google::protobuf::Value> *", +- "referenced_type" : "type-7311", +- "self_type" : "type-7312", ++ "referenced_type" : "type-7263", ++ "self_type" : "type-7264", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, +@@ -113333,8 +113375,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_array *", + "name" : "const google::protobuf::internal::scoped_array *", +- "referenced_type" : "type-4340", +- "self_type" : "type-4341", ++ "referenced_type" : "type-4292", ++ "self_type" : "type-4293", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113342,8 +113384,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_array *", + "name" : "const google::protobuf::internal::scoped_array *", +- "referenced_type" : "type-1664", +- "self_type" : "type-1665", ++ "referenced_type" : "type-1577", ++ "self_type" : "type-1578", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113351,8 +113393,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-7638", +- "self_type" : "type-7639", ++ "referenced_type" : "type-7590", ++ "self_type" : "type-7591", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113360,8 +113402,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-4331", +- "self_type" : "type-4332", ++ "referenced_type" : "type-4283", ++ "self_type" : "type-4284", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113369,8 +113411,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-3691", +- "self_type" : "type-3696", ++ "referenced_type" : "type-3643", ++ "self_type" : "type-3648", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113378,8 +113420,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-4296", +- "self_type" : "type-4297", ++ "referenced_type" : "type-4248", ++ "self_type" : "type-4249", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113387,8 +113429,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-25024", +- "self_type" : "type-25026", ++ "referenced_type" : "type-24993", ++ "self_type" : "type-24995", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113396,8 +113438,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19932", +- "self_type" : "type-19940", ++ "referenced_type" : "type-19884", ++ "self_type" : "type-19892", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113405,8 +113447,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-3770", +- "self_type" : "type-3773", ++ "referenced_type" : "type-3722", ++ "self_type" : "type-3725", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113414,8 +113456,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr > *", + "name" : "const google::protobuf::internal::scoped_ptr > *", +- "referenced_type" : "type-19686", +- "self_type" : "type-19691", ++ "referenced_type" : "type-19638", ++ "self_type" : "type-19643", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113423,8 +113465,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr, std::allocator >, std::allocator, std::allocator > > > &, const google::protobuf::Field *> > *", + "name" : "const google::protobuf::internal::scoped_ptr, std::allocator >, std::allocator, std::allocator > > > &, const google::protobuf::Field *> > *", +- "referenced_type" : "type-15218", +- "self_type" : "type-15223", ++ "referenced_type" : "type-15170", ++ "self_type" : "type-15175", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113432,8 +113474,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr > *", + "name" : "const google::protobuf::internal::scoped_ptr > *", +- "referenced_type" : "type-25044", +- "self_type" : "type-25045", ++ "referenced_type" : "type-25014", ++ "self_type" : "type-25015", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113442,7 +113484,7 @@ + "linker_set_key" : "const google::protobuf::internal::scoped_ptr, std::allocator > *> > *", + "name" : "const google::protobuf::internal::scoped_ptr, std::allocator > *> > *", + "referenced_type" : "type-771", +- "self_type" : "type-1662", ++ "self_type" : "type-1574", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113450,8 +113492,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19910", +- "self_type" : "type-19916", ++ "referenced_type" : "type-19862", ++ "self_type" : "type-19868", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113459,8 +113501,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-3748", +- "self_type" : "type-3755", ++ "referenced_type" : "type-3700", ++ "self_type" : "type-3707", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113468,8 +113510,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> > *", + "name" : "const google::protobuf::internal::scoped_ptr, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> > *", +- "referenced_type" : "type-7379", +- "self_type" : "type-7382", ++ "referenced_type" : "type-7331", ++ "self_type" : "type-7334", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113477,8 +113519,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19597", +- "self_type" : "type-19601", ++ "referenced_type" : "type-19549", ++ "self_type" : "type-19553", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113486,8 +113528,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-11255", +- "self_type" : "type-11256", ++ "referenced_type" : "type-11207", ++ "self_type" : "type-11208", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113495,8 +113537,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-24653", +- "self_type" : "type-24654", ++ "referenced_type" : "type-24616", ++ "self_type" : "type-24617", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113504,8 +113546,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-15245", +- "self_type" : "type-15253", ++ "referenced_type" : "type-15197", ++ "self_type" : "type-15205", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113513,8 +113555,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19220", +- "self_type" : "type-19225", ++ "referenced_type" : "type-19172", ++ "self_type" : "type-19177", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113522,8 +113564,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19608", +- "self_type" : "type-19619", ++ "referenced_type" : "type-19560", ++ "self_type" : "type-19571", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113531,8 +113573,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19676", +- "self_type" : "type-19677", ++ "referenced_type" : "type-19628", ++ "self_type" : "type-19629", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113540,8 +113582,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19679", +- "self_type" : "type-19680", ++ "referenced_type" : "type-19631", ++ "self_type" : "type-19632", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113549,8 +113591,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19634", +- "self_type" : "type-19641", ++ "referenced_type" : "type-19586", ++ "self_type" : "type-19593", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113558,8 +113600,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19592", +- "self_type" : "type-19593", ++ "referenced_type" : "type-19544", ++ "self_type" : "type-19545", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113567,8 +113609,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19207", +- "self_type" : "type-19208", ++ "referenced_type" : "type-19159", ++ "self_type" : "type-19160", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113576,8 +113618,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr *", + "name" : "const google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-24635", +- "self_type" : "type-24645", ++ "referenced_type" : "type-24602", ++ "self_type" : "type-24611", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -113585,8 +113627,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::io::ArrayInputStream *", + "name" : "const google::protobuf::io::ArrayInputStream *", +- "referenced_type" : "type-1640", +- "self_type" : "type-1641", ++ "referenced_type" : "type-1553", ++ "self_type" : "type-1554", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h" + }, +@@ -113594,8 +113636,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::io::ArrayOutputStream *", + "name" : "const google::protobuf::io::ArrayOutputStream *", +- "referenced_type" : "type-1643", +- "self_type" : "type-1644", ++ "referenced_type" : "type-1557", ++ "self_type" : "type-1558", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h" + }, +@@ -113621,8 +113663,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::io::ConcatenatingInputStream *", + "name" : "const google::protobuf::io::ConcatenatingInputStream *", +- "referenced_type" : "type-1619", +- "self_type" : "type-1620", ++ "referenced_type" : "type-1535", ++ "self_type" : "type-1538", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -113630,8 +113672,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::io::CopyingInputStreamAdaptor *", + "name" : "const google::protobuf::io::CopyingInputStreamAdaptor *", +- "referenced_type" : "type-1651", +- "self_type" : "type-1652", ++ "referenced_type" : "type-1565", ++ "self_type" : "type-1566", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h" + }, +@@ -113639,8 +113681,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::io::CopyingOutputStreamAdaptor *", + "name" : "const google::protobuf::io::CopyingOutputStreamAdaptor *", +- "referenced_type" : "type-1654", +- "self_type" : "type-1655", ++ "referenced_type" : "type-1567", ++ "self_type" : "type-1568", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h" + }, +@@ -113648,8 +113690,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::io::FileInputStream *", + "name" : "const google::protobuf::io::FileInputStream *", +- "referenced_type" : "type-1588", +- "self_type" : "type-1589", ++ "referenced_type" : "type-1506", ++ "self_type" : "type-1507", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -113657,8 +113699,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::io::FileOutputStream *", + "name" : "const google::protobuf::io::FileOutputStream *", +- "referenced_type" : "type-1594", +- "self_type" : "type-1595", ++ "referenced_type" : "type-1512", ++ "self_type" : "type-1513", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -113666,8 +113708,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::io::GzipInputStream *", + "name" : "const google::protobuf::io::GzipInputStream *", +- "referenced_type" : "type-11184", +- "self_type" : "type-11185", ++ "referenced_type" : "type-11136", ++ "self_type" : "type-11137", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/gzip_stream.h" + }, +@@ -113675,8 +113717,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::io::GzipOutputStream *", + "name" : "const google::protobuf::io::GzipOutputStream *", +- "referenced_type" : "type-11194", +- "self_type" : "type-11195", ++ "referenced_type" : "type-11146", ++ "self_type" : "type-11147", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/gzip_stream.h" + }, +@@ -113684,8 +113726,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::io::IstreamInputStream *", + "name" : "const google::protobuf::io::IstreamInputStream *", +- "referenced_type" : "type-1603", +- "self_type" : "type-1604", ++ "referenced_type" : "type-1520", ++ "self_type" : "type-1521", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -113693,8 +113735,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::io::LazyStringOutputStream *", + "name" : "const google::protobuf::io::LazyStringOutputStream *", +- "referenced_type" : "type-1649", +- "self_type" : "type-1650", ++ "referenced_type" : "type-1563", ++ "self_type" : "type-1564", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h" + }, +@@ -113702,8 +113744,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::io::LimitingInputStream *", + "name" : "const google::protobuf::io::LimitingInputStream *", +- "referenced_type" : "type-1623", +- "self_type" : "type-1626", ++ "referenced_type" : "type-1541", ++ "self_type" : "type-1542", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -113711,8 +113753,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::io::OstreamOutputStream *", + "name" : "const google::protobuf::io::OstreamOutputStream *", +- "referenced_type" : "type-1611", +- "self_type" : "type-1612", ++ "referenced_type" : "type-1528", ++ "self_type" : "type-1529", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -113720,8 +113762,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::io::Printer *", + "name" : "const google::protobuf::io::Printer *", +- "referenced_type" : "type-11212", +- "self_type" : "type-11215", ++ "referenced_type" : "type-11164", ++ "self_type" : "type-11167", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -113729,8 +113771,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::io::StringOutputStream *", + "name" : "const google::protobuf::io::StringOutputStream *", +- "referenced_type" : "type-1646", +- "self_type" : "type-1647", ++ "referenced_type" : "type-1560", ++ "self_type" : "type-1561", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h" + }, +@@ -113801,8 +113843,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::strings::internal::SubstituteArg *", + "name" : "const google::protobuf::strings::internal::SubstituteArg *", +- "referenced_type" : "type-3634", +- "self_type" : "type-3635", ++ "referenced_type" : "type-3586", ++ "self_type" : "type-3587", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/substitute.h" + }, +@@ -113810,8 +113852,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::DefaultFieldComparator *", + "name" : "const google::protobuf::util::DefaultFieldComparator *", +- "referenced_type" : "type-14825", +- "self_type" : "type-14826", ++ "referenced_type" : "type-14777", ++ "self_type" : "type-14778", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/field_comparator.h" + }, +@@ -113819,8 +113861,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::FieldContext *", + "name" : "const google::protobuf::util::FieldContext *", +- "referenced_type" : "type-14822", +- "self_type" : "type-14824", ++ "referenced_type" : "type-14774", ++ "self_type" : "type-14776", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/field_comparator.h" + }, +@@ -113828,8 +113870,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::FieldContext *", + "name" : "const google::protobuf::util::FieldContext *", +- "referenced_type" : "type-18679", +- "self_type" : "type-18681", ++ "referenced_type" : "type-18631", ++ "self_type" : "type-18633", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/field_comparator.h" + }, +@@ -113837,8 +113879,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::FieldContext *", + "name" : "const google::protobuf::util::FieldContext *", +- "referenced_type" : "type-23208", +- "self_type" : "type-23210", ++ "referenced_type" : "type-23196", ++ "self_type" : "type-23198", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/field_comparator.h" + }, +@@ -113846,8 +113888,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::FieldContext *", + "name" : "const google::protobuf::util::FieldContext *", +- "referenced_type" : "type-25017", +- "self_type" : "type-25019", ++ "referenced_type" : "type-24986", ++ "self_type" : "type-24988", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h" + }, +@@ -113855,8 +113897,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::FieldContext *", + "name" : "const google::protobuf::util::FieldContext *", +- "referenced_type" : "type-28393", +- "self_type" : "type-28395", ++ "referenced_type" : "type-28392", ++ "self_type" : "type-28394", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/field_comparator.h" + }, +@@ -113864,8 +113906,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::FieldMaskUtil::MergeOptions *", + "name" : "const google::protobuf::util::FieldMaskUtil::MergeOptions *", +- "referenced_type" : "type-14951", +- "self_type" : "type-14955", ++ "referenced_type" : "type-14903", ++ "self_type" : "type-14907", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/field_mask_util.h" + }, +@@ -113873,8 +113915,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::MessageDifferencer::MapKeyComparator *", + "name" : "const google::protobuf::util::MessageDifferencer::MapKeyComparator *", +- "referenced_type" : "type-24899", +- "self_type" : "type-24898", ++ "referenced_type" : "type-24866", ++ "self_type" : "type-24865", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -113891,8 +113933,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::StatusOr *", + "name" : "const google::protobuf::util::StatusOr *", +- "referenced_type" : "type-15338", +- "self_type" : "type-15339", ++ "referenced_type" : "type-15290", ++ "self_type" : "type-15291", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -113900,8 +113942,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::StatusOr *", + "name" : "const google::protobuf::util::StatusOr *", +- "referenced_type" : "type-20006", +- "self_type" : "type-20008", ++ "referenced_type" : "type-19958", ++ "self_type" : "type-19960", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -113909,8 +113951,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::StatusOr *", + "name" : "const google::protobuf::util::StatusOr *", +- "referenced_type" : "type-15326", +- "self_type" : "type-15327", ++ "referenced_type" : "type-15278", ++ "self_type" : "type-15279", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -113918,8 +113960,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::StatusOr *", + "name" : "const google::protobuf::util::StatusOr *", +- "referenced_type" : "type-15334", +- "self_type" : "type-15335", ++ "referenced_type" : "type-15286", ++ "self_type" : "type-15287", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -113927,8 +113969,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::StatusOr *", + "name" : "const google::protobuf::util::StatusOr *", +- "referenced_type" : "type-15336", +- "self_type" : "type-15337", ++ "referenced_type" : "type-15288", ++ "self_type" : "type-15289", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -113936,8 +113978,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::StatusOr *", + "name" : "const google::protobuf::util::StatusOr *", +- "referenced_type" : "type-15015", +- "self_type" : "type-15016", ++ "referenced_type" : "type-14967", ++ "self_type" : "type-14968", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -113945,8 +113987,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::StatusOr *", + "name" : "const google::protobuf::util::StatusOr *", +- "referenced_type" : "type-15330", +- "self_type" : "type-15331", ++ "referenced_type" : "type-15282", ++ "self_type" : "type-15283", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -113954,8 +113996,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::StatusOr, std::allocator > > *", + "name" : "const google::protobuf::util::StatusOr, std::allocator > > *", +- "referenced_type" : "type-15340", +- "self_type" : "type-15341", ++ "referenced_type" : "type-15292", ++ "self_type" : "type-15293", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -113963,8 +114005,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::StatusOr *", + "name" : "const google::protobuf::util::StatusOr *", +- "referenced_type" : "type-15328", +- "self_type" : "type-15329", ++ "referenced_type" : "type-15280", ++ "self_type" : "type-15281", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -113972,8 +114014,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::StatusOr *", + "name" : "const google::protobuf::util::StatusOr *", +- "referenced_type" : "type-15332", +- "self_type" : "type-15333", ++ "referenced_type" : "type-15284", ++ "self_type" : "type-15285", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -113981,8 +114023,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::converter::DataPiece *", + "name" : "const google::protobuf::util::converter::DataPiece *", +- "referenced_type" : "type-15048", +- "self_type" : "type-15051", ++ "referenced_type" : "type-15000", ++ "self_type" : "type-15003", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, +@@ -113990,8 +114032,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::converter::DefaultValueObjectWriter::Node *", + "name" : "const google::protobuf::util::converter::DefaultValueObjectWriter::Node *", +- "referenced_type" : "type-15355", +- "self_type" : "type-15356", ++ "referenced_type" : "type-15307", ++ "self_type" : "type-15308", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h" + }, +@@ -113999,8 +114041,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::converter::ObjectLocationTracker *", + "name" : "const google::protobuf::util::converter::ObjectLocationTracker *", +- "referenced_type" : "type-19696", +- "self_type" : "type-19697", ++ "referenced_type" : "type-19648", ++ "self_type" : "type-19649", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/object_location_tracker.h" + }, +@@ -114008,8 +114050,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::converter::ObjectSource *", + "name" : "const google::protobuf::util::converter::ObjectSource *", +- "referenced_type" : "type-19476", +- "self_type" : "type-19477", ++ "referenced_type" : "type-19428", ++ "self_type" : "type-19429", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/object_source.h" + }, +@@ -114017,8 +114059,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::converter::ObjectWriter *", + "name" : "const google::protobuf::util::converter::ObjectWriter *", +- "referenced_type" : "type-15346", +- "self_type" : "type-15347", ++ "referenced_type" : "type-15298", ++ "self_type" : "type-15299", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/object_writer.h" + }, +@@ -114026,8 +114068,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::converter::ProtoStreamObjectSource *", + "name" : "const google::protobuf::util::converter::ProtoStreamObjectSource *", +- "referenced_type" : "type-19371", +- "self_type" : "type-19370", ++ "referenced_type" : "type-19323", ++ "self_type" : "type-19322", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -114035,8 +114077,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::converter::ProtoStreamObjectWriter::Item *", + "name" : "const google::protobuf::util::converter::ProtoStreamObjectWriter::Item *", +- "referenced_type" : "type-19689", +- "self_type" : "type-19690", ++ "referenced_type" : "type-19641", ++ "self_type" : "type-19642", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, +@@ -114044,8 +114086,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::converter::ProtoWriter::ProtoElement *", + "name" : "const google::protobuf::util::converter::ProtoWriter::ProtoElement *", +- "referenced_type" : "type-19683", +- "self_type" : "type-19684", ++ "referenced_type" : "type-19635", ++ "self_type" : "type-19636", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, +@@ -114053,8 +114095,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::converter::StructuredObjectWriter::BaseElement *", + "name" : "const google::protobuf::util::converter::StructuredObjectWriter::BaseElement *", +- "referenced_type" : "type-19193", +- "self_type" : "type-19194", ++ "referenced_type" : "type-19145", ++ "self_type" : "type-19146", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/structured_objectwriter.h" + }, +@@ -114062,8 +114104,8 @@ + "alignment" : 4, + "linker_set_key" : "const google::protobuf::util::converter::TypeInfo *", + "name" : "const google::protobuf::util::converter::TypeInfo *", +- "referenced_type" : "type-15350", +- "self_type" : "type-15349", ++ "referenced_type" : "type-15302", ++ "self_type" : "type-15301", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h" + }, +@@ -114089,8 +114131,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node *", + "name" : "const std::__tree_node *", +- "referenced_type" : "type-13132", +- "self_type" : "type-13134", ++ "referenced_type" : "type-13084", ++ "self_type" : "type-13086", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114098,8 +114140,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node *", + "name" : "const std::__tree_node *", +- "referenced_type" : "type-16988", +- "self_type" : "type-16990", ++ "referenced_type" : "type-16940", ++ "self_type" : "type-16942", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114107,8 +114149,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node *", + "name" : "const std::__tree_node *", +- "referenced_type" : "type-21520", +- "self_type" : "type-21522", ++ "referenced_type" : "type-21472", ++ "self_type" : "type-21474", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114116,8 +114158,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node *", + "name" : "const std::__tree_node *", +- "referenced_type" : "type-26698", +- "self_type" : "type-26700", ++ "referenced_type" : "type-26719", ++ "self_type" : "type-26722", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114125,8 +114167,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node *", + "name" : "const std::__tree_node *", +- "referenced_type" : "type-31845", +- "self_type" : "type-31847", ++ "referenced_type" : "type-31844", ++ "self_type" : "type-31846", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114134,8 +114176,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node *", + "name" : "const std::__tree_node *", +- "referenced_type" : "type-6623", +- "self_type" : "type-6625", ++ "referenced_type" : "type-6575", ++ "self_type" : "type-6577", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114143,8 +114185,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node *", + "name" : "const std::__tree_node *", +- "referenced_type" : "type-9800", +- "self_type" : "type-9802", ++ "referenced_type" : "type-9752", ++ "self_type" : "type-9754", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114152,8 +114194,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node *>, void *> *", + "name" : "const std::__tree_node *>, void *> *", +- "referenced_type" : "type-13122", +- "self_type" : "type-13124", ++ "referenced_type" : "type-13074", ++ "self_type" : "type-13076", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114161,8 +114203,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node *>, void *> *", + "name" : "const std::__tree_node *>, void *> *", +- "referenced_type" : "type-16978", +- "self_type" : "type-16980", ++ "referenced_type" : "type-16930", ++ "self_type" : "type-16932", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114170,8 +114212,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node *>, void *> *", + "name" : "const std::__tree_node *>, void *> *", +- "referenced_type" : "type-21510", +- "self_type" : "type-21512", ++ "referenced_type" : "type-21462", ++ "self_type" : "type-21464", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114179,8 +114221,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node *>, void *> *", + "name" : "const std::__tree_node *>, void *> *", +- "referenced_type" : "type-26688", +- "self_type" : "type-26690", ++ "referenced_type" : "type-26711", ++ "self_type" : "type-26713", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114188,8 +114230,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node *>, void *> *", + "name" : "const std::__tree_node *>, void *> *", +- "referenced_type" : "type-31835", +- "self_type" : "type-31837", ++ "referenced_type" : "type-31834", ++ "self_type" : "type-31836", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114197,8 +114239,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node *>, void *> *", + "name" : "const std::__tree_node *>, void *> *", +- "referenced_type" : "type-6607", +- "self_type" : "type-6609", ++ "referenced_type" : "type-6559", ++ "self_type" : "type-6561", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114206,8 +114248,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node *>, void *> *", + "name" : "const std::__tree_node *>, void *> *", +- "referenced_type" : "type-9790", +- "self_type" : "type-9792", ++ "referenced_type" : "type-9742", ++ "self_type" : "type-9744", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114215,8 +114257,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", + "name" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", +- "referenced_type" : "type-10407", +- "self_type" : "type-10409", ++ "referenced_type" : "type-10359", ++ "self_type" : "type-10361", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114224,8 +114266,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", + "name" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", +- "referenced_type" : "type-13698", +- "self_type" : "type-13700", ++ "referenced_type" : "type-13650", ++ "self_type" : "type-13652", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114233,8 +114275,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", + "name" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", +- "referenced_type" : "type-17562", +- "self_type" : "type-17564", ++ "referenced_type" : "type-17514", ++ "self_type" : "type-17516", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114242,8 +114284,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", + "name" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", +- "referenced_type" : "type-22091", +- "self_type" : "type-22093", ++ "referenced_type" : "type-22090", ++ "self_type" : "type-22092", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114251,8 +114293,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", + "name" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", +- "referenced_type" : "type-27276", +- "self_type" : "type-27278", ++ "referenced_type" : "type-27275", ++ "self_type" : "type-27277", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114260,8 +114302,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", + "name" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", +- "referenced_type" : "type-7449", +- "self_type" : "type-7451", ++ "referenced_type" : "type-7401", ++ "self_type" : "type-7403", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114269,8 +114311,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node, std::allocator > *, void *> *", + "name" : "const std::__tree_node, std::allocator > *, void *> *", +- "referenced_type" : "type-10415", +- "self_type" : "type-10417", ++ "referenced_type" : "type-10367", ++ "self_type" : "type-10369", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114278,8 +114320,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node, std::allocator > *, void *> *", + "name" : "const std::__tree_node, std::allocator > *, void *> *", +- "referenced_type" : "type-13706", +- "self_type" : "type-13708", ++ "referenced_type" : "type-13658", ++ "self_type" : "type-13660", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114287,8 +114329,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node, std::allocator > *, void *> *", + "name" : "const std::__tree_node, std::allocator > *, void *> *", +- "referenced_type" : "type-17570", +- "self_type" : "type-17572", ++ "referenced_type" : "type-17522", ++ "self_type" : "type-17524", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114296,8 +114338,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node, std::allocator > *, void *> *", + "name" : "const std::__tree_node, std::allocator > *, void *> *", +- "referenced_type" : "type-22099", +- "self_type" : "type-22101", ++ "referenced_type" : "type-22098", ++ "self_type" : "type-22100", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114305,8 +114347,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node, std::allocator > *, void *> *", + "name" : "const std::__tree_node, std::allocator > *, void *> *", +- "referenced_type" : "type-27284", +- "self_type" : "type-27286", ++ "referenced_type" : "type-27283", ++ "self_type" : "type-27285", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114314,8 +114356,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::__tree_node, std::allocator > *, void *> *", + "name" : "const std::__tree_node, std::allocator > *, void *> *", +- "referenced_type" : "type-7464", +- "self_type" : "type-7466", ++ "referenced_type" : "type-7416", ++ "self_type" : "type-7418", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114323,8 +114365,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-10089", +- "self_type" : "type-10097", ++ "referenced_type" : "type-10041", ++ "self_type" : "type-10049", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114332,8 +114374,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-10184", +- "self_type" : "type-10192", ++ "referenced_type" : "type-10136", ++ "self_type" : "type-10144", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114341,8 +114383,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-10278", +- "self_type" : "type-10550", ++ "referenced_type" : "type-10230", ++ "self_type" : "type-10502", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114350,8 +114392,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-10291", +- "self_type" : "type-10436", ++ "referenced_type" : "type-10243", ++ "self_type" : "type-10388", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114368,8 +114410,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-10547", +- "self_type" : "type-10551", ++ "referenced_type" : "type-10499", ++ "self_type" : "type-10503", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114377,8 +114419,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-10715", +- "self_type" : "type-10725", ++ "referenced_type" : "type-10667", ++ "self_type" : "type-10677", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114386,8 +114428,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-10803", +- "self_type" : "type-10815", ++ "referenced_type" : "type-10755", ++ "self_type" : "type-10767", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114395,8 +114437,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-10879", +- "self_type" : "type-10906", ++ "referenced_type" : "type-10831", ++ "self_type" : "type-10858", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114404,8 +114446,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-10988", +- "self_type" : "type-10996", ++ "referenced_type" : "type-10940", ++ "self_type" : "type-10948", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114413,8 +114455,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-11043", +- "self_type" : "type-11069", ++ "referenced_type" : "type-10995", ++ "self_type" : "type-11021", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114422,8 +114464,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-11081", +- "self_type" : "type-11119", ++ "referenced_type" : "type-11033", ++ "self_type" : "type-11071", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114431,8 +114473,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-11243", +- "self_type" : "type-11246", ++ "referenced_type" : "type-11195", ++ "self_type" : "type-11198", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114440,8 +114482,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-11251", +- "self_type" : "type-11250", ++ "referenced_type" : "type-11203", ++ "self_type" : "type-11202", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114449,8 +114491,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-11392", +- "self_type" : "type-11411", ++ "referenced_type" : "type-11344", ++ "self_type" : "type-11363", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114458,8 +114500,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-11523", +- "self_type" : "type-11522", ++ "referenced_type" : "type-11475", ++ "self_type" : "type-11474", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114467,8 +114509,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-11542", +- "self_type" : "type-11554", ++ "referenced_type" : "type-11494", ++ "self_type" : "type-11506", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114476,8 +114518,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-11702", +- "self_type" : "type-11756", ++ "referenced_type" : "type-11654", ++ "self_type" : "type-11708", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114485,8 +114527,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-12010", +- "self_type" : "type-12029", ++ "referenced_type" : "type-11962", ++ "self_type" : "type-11981", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114494,17 +114536,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-12125", +- "self_type" : "type-12124", ++ "referenced_type" : "type-1204", ++ "self_type" : "type-1253", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-12232", +- "self_type" : "type-12268", ++ "referenced_type" : "type-12077", ++ "self_type" : "type-12076", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114512,17 +114554,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-1235", +- "self_type" : "type-1234", ++ "referenced_type" : "type-12184", ++ "self_type" : "type-12220", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-12423", +- "self_type" : "type-12426", ++ "referenced_type" : "type-12375", ++ "self_type" : "type-12378", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114530,8 +114572,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-12520", +- "self_type" : "type-12531", ++ "referenced_type" : "type-12472", ++ "self_type" : "type-12483", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114539,8 +114581,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-12627", +- "self_type" : "type-12633", ++ "referenced_type" : "type-12579", ++ "self_type" : "type-12585", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114548,8 +114590,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-12726", +- "self_type" : "type-12762", ++ "referenced_type" : "type-12678", ++ "self_type" : "type-12714", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114557,8 +114599,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-12806", +- "self_type" : "type-12814", ++ "referenced_type" : "type-12758", ++ "self_type" : "type-12766", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114566,8 +114608,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-12871", +- "self_type" : "type-12876", ++ "referenced_type" : "type-12823", ++ "self_type" : "type-12828", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114575,17 +114617,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-1289", +- "self_type" : "type-1337", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "const std::basic_string, std::allocator > *", +- "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-12937", +- "self_type" : "type-12949", ++ "referenced_type" : "type-12889", ++ "self_type" : "type-12901", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114593,8 +114626,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-13017", +- "self_type" : "type-13020", ++ "referenced_type" : "type-12969", ++ "self_type" : "type-12972", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -114602,8 +114635,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-13040", +- "self_type" : "type-13039", ++ "referenced_type" : "type-12992", ++ "self_type" : "type-12991", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114611,8 +114644,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-13088", +- "self_type" : "type-13191", ++ "referenced_type" : "type-13040", ++ "self_type" : "type-13143", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114620,8 +114653,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-13312", +- "self_type" : "type-13352", ++ "referenced_type" : "type-13264", ++ "self_type" : "type-13304", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114629,8 +114662,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-13422", +- "self_type" : "type-13430", ++ "referenced_type" : "type-13374", ++ "self_type" : "type-13382", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114638,8 +114671,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-13517", +- "self_type" : "type-13525", ++ "referenced_type" : "type-13469", ++ "self_type" : "type-13477", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114647,8 +114680,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-13569", +- "self_type" : "type-13841", ++ "referenced_type" : "type-13521", ++ "self_type" : "type-13793", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114656,8 +114689,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-13582", +- "self_type" : "type-13727", ++ "referenced_type" : "type-13534", ++ "self_type" : "type-13679", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -114665,26 +114698,26 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-13838", +- "self_type" : "type-13842", ++ "referenced_type" : "type-1376", ++ "self_type" : "type-1379", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-14006", +- "self_type" : "type-14016", ++ "referenced_type" : "type-13790", ++ "self_type" : "type-13794", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-14094", +- "self_type" : "type-14106", ++ "referenced_type" : "type-1390", ++ "self_type" : "type-1389", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114692,8 +114725,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-14170", +- "self_type" : "type-14197", ++ "referenced_type" : "type-13958", ++ "self_type" : "type-13968", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114701,8 +114734,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-14279", +- "self_type" : "type-14287", ++ "referenced_type" : "type-14046", ++ "self_type" : "type-14058", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114710,8 +114743,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-14334", +- "self_type" : "type-14351", ++ "referenced_type" : "type-14122", ++ "self_type" : "type-14149", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114719,8 +114752,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-14363", +- "self_type" : "type-14389", ++ "referenced_type" : "type-14231", ++ "self_type" : "type-14239", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114728,17 +114761,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-14495", +- "self_type" : "type-14498", ++ "referenced_type" : "type-1426", ++ "self_type" : "type-1425", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-14502", +- "self_type" : "type-14501", ++ "referenced_type" : "type-14286", ++ "self_type" : "type-14303", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114746,8 +114779,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-1457", +- "self_type" : "type-1461", ++ "referenced_type" : "type-14315", ++ "self_type" : "type-14341", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114755,8 +114788,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-14616", +- "self_type" : "type-14630", ++ "referenced_type" : "type-14447", ++ "self_type" : "type-14450", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114764,17 +114797,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-14742", +- "self_type" : "type-14741", ++ "referenced_type" : "type-1445", ++ "self_type" : "type-1457", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-1475", +- "self_type" : "type-1474", ++ "referenced_type" : "type-14454", ++ "self_type" : "type-14453", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114782,17 +114815,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-14783", +- "self_type" : "type-14782", ++ "referenced_type" : "type-14568", ++ "self_type" : "type-14582", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-14830", +- "self_type" : "type-14832", ++ "referenced_type" : "type-14694", ++ "self_type" : "type-14693", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114800,35 +114833,35 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-15003", +- "self_type" : "type-15090", ++ "referenced_type" : "type-14735", ++ "self_type" : "type-14734", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/map.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-15075", +- "self_type" : "type-15177", ++ "referenced_type" : "type-14782", ++ "self_type" : "type-14784", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-1510", +- "self_type" : "type-1509", ++ "referenced_type" : "type-14955", ++ "self_type" : "type-15042", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-15181", +- "self_type" : "type-15187", ++ "referenced_type" : "type-15027", ++ "self_type" : "type-15129", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114836,8 +114869,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-1526", +- "self_type" : "type-1537", ++ "referenced_type" : "type-15133", ++ "self_type" : "type-15139", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114845,8 +114878,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-15558", +- "self_type" : "type-15613", ++ "referenced_type" : "type-15510", ++ "self_type" : "type-15565", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114854,8 +114887,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-15866", +- "self_type" : "type-15885", ++ "referenced_type" : "type-15818", ++ "self_type" : "type-15837", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114863,8 +114896,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-15980", +- "self_type" : "type-15979", ++ "referenced_type" : "type-15932", ++ "self_type" : "type-15931", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114872,8 +114905,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16087", +- "self_type" : "type-16123", ++ "referenced_type" : "type-16039", ++ "self_type" : "type-16075", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114881,8 +114914,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16280", +- "self_type" : "type-16283", ++ "referenced_type" : "type-16232", ++ "self_type" : "type-16235", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114890,8 +114923,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16377", +- "self_type" : "type-16388", ++ "referenced_type" : "type-16329", ++ "self_type" : "type-16340", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114899,8 +114932,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16484", +- "self_type" : "type-16490", ++ "referenced_type" : "type-16436", ++ "self_type" : "type-16442", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114908,8 +114941,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16582", +- "self_type" : "type-16618", ++ "referenced_type" : "type-16534", ++ "self_type" : "type-16570", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114917,8 +114950,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16662", +- "self_type" : "type-16670", ++ "referenced_type" : "type-16614", ++ "self_type" : "type-16622", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114926,8 +114959,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16727", +- "self_type" : "type-16732", ++ "referenced_type" : "type-16679", ++ "self_type" : "type-16684", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114935,8 +114968,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16793", +- "self_type" : "type-16805", ++ "referenced_type" : "type-16745", ++ "self_type" : "type-16757", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114944,8 +114977,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16873", +- "self_type" : "type-16876", ++ "referenced_type" : "type-16825", ++ "self_type" : "type-16828", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -114953,8 +114986,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16896", +- "self_type" : "type-16895", ++ "referenced_type" : "type-16848", ++ "self_type" : "type-16847", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114962,8 +114995,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-16944", +- "self_type" : "type-17047", ++ "referenced_type" : "type-16896", ++ "self_type" : "type-16999", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114971,8 +115004,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-17168", +- "self_type" : "type-17208", ++ "referenced_type" : "type-17120", ++ "self_type" : "type-17160", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114980,8 +115013,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-17278", +- "self_type" : "type-17286", ++ "referenced_type" : "type-17230", ++ "self_type" : "type-17238", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -114989,8 +115022,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-17373", +- "self_type" : "type-17381", ++ "referenced_type" : "type-17325", ++ "self_type" : "type-17333", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -114998,8 +115031,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-17433", +- "self_type" : "type-17705", ++ "referenced_type" : "type-17385", ++ "self_type" : "type-17657", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115007,8 +115040,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-17446", +- "self_type" : "type-17591", ++ "referenced_type" : "type-17398", ++ "self_type" : "type-17543", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -115016,8 +115049,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-17702", +- "self_type" : "type-17706", ++ "referenced_type" : "type-17654", ++ "self_type" : "type-17658", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115025,8 +115058,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-17870", +- "self_type" : "type-17880", ++ "referenced_type" : "type-17822", ++ "self_type" : "type-17832", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115034,8 +115067,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-17958", +- "self_type" : "type-17970", ++ "referenced_type" : "type-1785", ++ "self_type" : "type-1857", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115043,8 +115076,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18034", +- "self_type" : "type-18061", ++ "referenced_type" : "type-17910", ++ "self_type" : "type-17922", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115052,8 +115085,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18143", +- "self_type" : "type-18151", ++ "referenced_type" : "type-17986", ++ "self_type" : "type-18013", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115061,8 +115094,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18198", +- "self_type" : "type-18215", ++ "referenced_type" : "type-18095", ++ "self_type" : "type-18103", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115070,8 +115103,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18227", +- "self_type" : "type-18253", ++ "referenced_type" : "type-18150", ++ "self_type" : "type-18167", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115079,35 +115112,35 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18359", +- "self_type" : "type-18362", ++ "referenced_type" : "type-18179", ++ "self_type" : "type-18205", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18366", +- "self_type" : "type-18365", ++ "referenced_type" : "type-18311", ++ "self_type" : "type-18314", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18480", +- "self_type" : "type-18494", ++ "referenced_type" : "type-18318", ++ "self_type" : "type-18317", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18606", +- "self_type" : "type-18605", ++ "referenced_type" : "type-18432", ++ "self_type" : "type-18446", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115115,17 +115148,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18647", +- "self_type" : "type-18646", ++ "referenced_type" : "type-18558", ++ "self_type" : "type-18557", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-1868", +- "self_type" : "type-1934", ++ "referenced_type" : "type-18599", ++ "self_type" : "type-18598", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115133,8 +115166,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18687", +- "self_type" : "type-18689", ++ "referenced_type" : "type-18639", ++ "self_type" : "type-18641", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115142,8 +115175,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18822", +- "self_type" : "type-18874", ++ "referenced_type" : "type-18774", ++ "self_type" : "type-18826", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -115151,8 +115184,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18859", +- "self_type" : "type-18961", ++ "referenced_type" : "type-18811", ++ "self_type" : "type-18913", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115160,8 +115193,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-18965", +- "self_type" : "type-18971", ++ "referenced_type" : "type-18917", ++ "self_type" : "type-18923", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115169,8 +115202,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-19177", +- "self_type" : "type-19209", ++ "referenced_type" : "type-19129", ++ "self_type" : "type-19161", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115178,8 +115211,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-19386", +- "self_type" : "type-19402", ++ "referenced_type" : "type-19338", ++ "self_type" : "type-19354", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115187,8 +115220,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-19522", +- "self_type" : "type-19551", ++ "referenced_type" : "type-19474", ++ "self_type" : "type-19503", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115196,8 +115229,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-19708", +- "self_type" : "type-19718", ++ "referenced_type" : "type-19660", ++ "self_type" : "type-19670", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115205,8 +115238,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-19868", +- "self_type" : "type-19877", ++ "referenced_type" : "type-19820", ++ "self_type" : "type-19829", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115214,8 +115247,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-20091", +- "self_type" : "type-20146", ++ "referenced_type" : "type-20043", ++ "self_type" : "type-20098", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115223,8 +115256,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-20400", +- "self_type" : "type-20419", ++ "referenced_type" : "type-20352", ++ "self_type" : "type-20371", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115232,8 +115265,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-20512", +- "self_type" : "type-20511", ++ "referenced_type" : "type-20464", ++ "self_type" : "type-20463", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115241,8 +115274,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-20619", +- "self_type" : "type-20654", ++ "referenced_type" : "type-20571", ++ "self_type" : "type-20606", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115250,8 +115283,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-20811", +- "self_type" : "type-20814", ++ "referenced_type" : "type-20763", ++ "self_type" : "type-20766", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115259,8 +115292,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-20908", +- "self_type" : "type-20919", ++ "referenced_type" : "type-20860", ++ "self_type" : "type-20871", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115268,8 +115301,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21015", +- "self_type" : "type-21021", ++ "referenced_type" : "type-20967", ++ "self_type" : "type-20973", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115277,8 +115310,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21114", +- "self_type" : "type-21150", ++ "referenced_type" : "type-21066", ++ "self_type" : "type-21102", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115286,8 +115319,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21194", +- "self_type" : "type-21202", ++ "referenced_type" : "type-21146", ++ "self_type" : "type-21154", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115295,8 +115328,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21259", +- "self_type" : "type-21264", ++ "referenced_type" : "type-21211", ++ "self_type" : "type-21216", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115304,8 +115337,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21325", +- "self_type" : "type-21337", ++ "referenced_type" : "type-21277", ++ "self_type" : "type-21289", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115313,8 +115346,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21405", +- "self_type" : "type-21408", ++ "referenced_type" : "type-21357", ++ "self_type" : "type-21360", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -115322,8 +115355,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21428", +- "self_type" : "type-21427", ++ "referenced_type" : "type-21380", ++ "self_type" : "type-21379", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115331,8 +115364,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21476", +- "self_type" : "type-21579", ++ "referenced_type" : "type-21428", ++ "self_type" : "type-21531", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115340,8 +115373,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21700", +- "self_type" : "type-21740", ++ "referenced_type" : "type-21652", ++ "self_type" : "type-21692", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115349,8 +115382,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21810", +- "self_type" : "type-21818", ++ "referenced_type" : "type-21762", ++ "self_type" : "type-21770", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115358,8 +115391,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21905", +- "self_type" : "type-21913", ++ "referenced_type" : "type-21857", ++ "self_type" : "type-21865", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115367,8 +115400,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21962", +- "self_type" : "type-22234", ++ "referenced_type" : "type-21901", ++ "self_type" : "type-21913", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115376,8 +115409,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-21975", +- "self_type" : "type-22120", ++ "referenced_type" : "type-21970", ++ "self_type" : "type-22121", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -115385,8 +115418,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-22231", +- "self_type" : "type-22235", ++ "referenced_type" : "type-22038", ++ "self_type" : "type-22037", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "const std::basic_string, std::allocator > *", ++ "name" : "const std::basic_string, std::allocator > *", ++ "referenced_type" : "type-22216", ++ "self_type" : "type-22220", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115394,8 +115436,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-22399", +- "self_type" : "type-22409", ++ "referenced_type" : "type-22358", ++ "self_type" : "type-22367", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115403,8 +115445,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-22487", +- "self_type" : "type-22499", ++ "referenced_type" : "type-22417", ++ "self_type" : "type-22424", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115412,8 +115454,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-22563", +- "self_type" : "type-22590", ++ "referenced_type" : "type-22484", ++ "self_type" : "type-22501", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115421,8 +115463,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-22672", +- "self_type" : "type-22680", ++ "referenced_type" : "type-22510", ++ "self_type" : "type-22697", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115430,8 +115472,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-22727", +- "self_type" : "type-22744", ++ "referenced_type" : "type-22585", ++ "self_type" : "type-22600", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115439,8 +115481,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-22756", +- "self_type" : "type-22782", ++ "referenced_type" : "type-22656", ++ "self_type" : "type-22678", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115448,8 +115490,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-22888", +- "self_type" : "type-22891", ++ "referenced_type" : "type-22849", ++ "self_type" : "type-22853", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115457,8 +115499,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-22895", +- "self_type" : "type-22894", ++ "referenced_type" : "type-2287", ++ "self_type" : "type-2321", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115466,8 +115508,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-23009", +- "self_type" : "type-23023", ++ "referenced_type" : "type-22982", ++ "self_type" : "type-22995", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115475,8 +115517,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-23135", +- "self_type" : "type-23134", ++ "referenced_type" : "type-23120", ++ "self_type" : "type-23119", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115484,35 +115526,35 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-23176", +- "self_type" : "type-23175", ++ "referenced_type" : "type-23204", ++ "self_type" : "type-23206", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-23216", +- "self_type" : "type-23218", ++ "referenced_type" : "type-23341", ++ "self_type" : "type-23386", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-23351", +- "self_type" : "type-23403", ++ "referenced_type" : "type-23470", ++ "self_type" : "type-23478", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/map.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-23388", +- "self_type" : "type-23490", ++ "referenced_type" : "type-23527", ++ "self_type" : "type-23597", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115520,8 +115562,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-23494", +- "self_type" : "type-23500", ++ "referenced_type" : "type-23694", ++ "self_type" : "type-23720", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115529,8 +115571,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-2359", +- "self_type" : "type-2393", ++ "referenced_type" : "type-23706", ++ "self_type" : "type-23705", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115538,8 +115580,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-23706", +- "self_type" : "type-23730", ++ "referenced_type" : "type-23888", ++ "self_type" : "type-23905", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115547,8 +115589,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-23886", +- "self_type" : "type-23902", ++ "referenced_type" : "type-23985", ++ "self_type" : "type-23984", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115556,8 +115598,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-23997", +- "self_type" : "type-24021", ++ "referenced_type" : "type-23998", ++ "self_type" : "type-24018", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115565,8 +115607,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-24175", +- "self_type" : "type-24185", ++ "referenced_type" : "type-24177", ++ "self_type" : "type-24190", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115574,8 +115616,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-24335", +- "self_type" : "type-24344", ++ "referenced_type" : "type-24183", ++ "self_type" : "type-24314", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115583,44 +115625,44 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-24488", +- "self_type" : "type-24491", ++ "referenced_type" : "type-24323", ++ "self_type" : "type-24329", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-24666", +- "self_type" : "type-24675", ++ "referenced_type" : "type-2446", ++ "self_type" : "type-2445", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-24754", +- "self_type" : "type-24772", ++ "referenced_type" : "type-24465", ++ "self_type" : "type-24470", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-24929", +- "self_type" : "type-24933", ++ "referenced_type" : "type-24629", ++ "self_type" : "type-24638", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-25056", +- "self_type" : "type-25055", ++ "referenced_type" : "type-24710", ++ "self_type" : "type-24730", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115628,8 +115670,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-2516", +- "self_type" : "type-2515", ++ "referenced_type" : "type-24898", ++ "self_type" : "type-24901", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115637,8 +115679,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-25181", +- "self_type" : "type-25189", ++ "referenced_type" : "type-25027", ++ "self_type" : "type-25026", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115646,8 +115688,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-25269", +- "self_type" : "type-25324", ++ "referenced_type" : "type-25164", ++ "self_type" : "type-25178", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115655,8 +115697,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-25576", +- "self_type" : "type-25595", ++ "referenced_type" : "type-25333", ++ "self_type" : "type-25382", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115664,17 +115706,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-25691", +- "self_type" : "type-25690", ++ "referenced_type" : "type-25629", ++ "self_type" : "type-25648", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-25798", +- "self_type" : "type-25833", ++ "referenced_type" : "type-25742", ++ "self_type" : "type-25741", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115682,8 +115724,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-25989", +- "self_type" : "type-25992", ++ "referenced_type" : "type-25847", ++ "self_type" : "type-25884", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115691,17 +115733,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-26086", +- "self_type" : "type-26097", ++ "referenced_type" : "type-26042", ++ "self_type" : "type-26045", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-26193", +- "self_type" : "type-26199", ++ "referenced_type" : "type-26138", ++ "self_type" : "type-26144", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115709,17 +115751,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-26292", +- "self_type" : "type-26328", ++ "referenced_type" : "type-26237", ++ "self_type" : "type-26243", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-26372", +- "self_type" : "type-26380", ++ "referenced_type" : "type-2625", ++ "self_type" : "type-2624", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115727,8 +115769,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-26437", +- "self_type" : "type-26442", ++ "referenced_type" : "type-26336", ++ "self_type" : "type-26370", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115736,8 +115778,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-26503", +- "self_type" : "type-26515", ++ "referenced_type" : "type-26414", ++ "self_type" : "type-26422", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115745,17 +115787,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-26583", +- "self_type" : "type-26586", ++ "referenced_type" : "type-26480", ++ "self_type" : "type-26485", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-26606", +- "self_type" : "type-26605", ++ "referenced_type" : "type-26536", ++ "self_type" : "type-26546", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115763,26 +115805,26 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-26654", +- "self_type" : "type-26757", ++ "referenced_type" : "type-26611", ++ "self_type" : "type-26614", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-26878", +- "self_type" : "type-26918", ++ "referenced_type" : "type-2666", ++ "self_type" : "type-2715", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-26988", +- "self_type" : "type-26996", ++ "referenced_type" : "type-26675", ++ "self_type" : "type-26780", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115790,26 +115832,26 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-27083", +- "self_type" : "type-27091", ++ "referenced_type" : "type-26898", ++ "self_type" : "type-26938", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-2714", +- "self_type" : "type-2763", ++ "referenced_type" : "type-27013", ++ "self_type" : "type-27022", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-27147", +- "self_type" : "type-27419", ++ "referenced_type" : "type-27146", ++ "self_type" : "type-27418", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115817,8 +115859,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-27160", +- "self_type" : "type-27305", ++ "referenced_type" : "type-27159", ++ "self_type" : "type-27304", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -115826,8 +115868,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-27416", +- "self_type" : "type-27420", ++ "referenced_type" : "type-27415", ++ "self_type" : "type-27419", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115835,8 +115877,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-27584", +- "self_type" : "type-27594", ++ "referenced_type" : "type-27583", ++ "self_type" : "type-27593", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115844,8 +115886,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-27672", +- "self_type" : "type-27684", ++ "referenced_type" : "type-27671", ++ "self_type" : "type-27683", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115853,8 +115895,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-27748", +- "self_type" : "type-27775", ++ "referenced_type" : "type-27747", ++ "self_type" : "type-27774", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115862,8 +115904,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-27857", +- "self_type" : "type-27865", ++ "referenced_type" : "type-27856", ++ "self_type" : "type-27864", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115871,8 +115913,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-27912", +- "self_type" : "type-27929", ++ "referenced_type" : "type-27911", ++ "self_type" : "type-27928", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115880,8 +115922,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-27941", +- "self_type" : "type-27967", ++ "referenced_type" : "type-27940", ++ "self_type" : "type-27966", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115889,8 +115931,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-28073", +- "self_type" : "type-28076", ++ "referenced_type" : "type-28072", ++ "self_type" : "type-28075", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115898,8 +115940,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-28080", +- "self_type" : "type-28079", ++ "referenced_type" : "type-28079", ++ "self_type" : "type-28078", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115907,8 +115949,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-28194", +- "self_type" : "type-28208", ++ "referenced_type" : "type-28193", ++ "self_type" : "type-28207", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115916,8 +115958,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-28320", +- "self_type" : "type-28319", ++ "referenced_type" : "type-28319", ++ "self_type" : "type-28318", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -115925,8 +115967,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-28361", +- "self_type" : "type-28360", ++ "referenced_type" : "type-28360", ++ "self_type" : "type-28359", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115934,26 +115976,26 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-28401", +- "self_type" : "type-28403", ++ "referenced_type" : "type-2838", ++ "self_type" : "type-2841", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-28536", +- "self_type" : "type-28588", ++ "referenced_type" : "type-28400", ++ "self_type" : "type-28402", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/map.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-28573", +- "self_type" : "type-28675", ++ "referenced_type" : "type-2852", ++ "self_type" : "type-2851", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115961,17 +116003,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-28679", +- "self_type" : "type-28685", ++ "referenced_type" : "type-28535", ++ "self_type" : "type-28587", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-2886", +- "self_type" : "type-2889", ++ "referenced_type" : "type-28572", ++ "self_type" : "type-28674", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115979,8 +116021,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-28891", +- "self_type" : "type-28915", ++ "referenced_type" : "type-28678", ++ "self_type" : "type-28684", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115988,8 +116030,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-2900", +- "self_type" : "type-2899", ++ "referenced_type" : "type-2888", ++ "self_type" : "type-2887", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -115997,8 +116039,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-29071", +- "self_type" : "type-29087", ++ "referenced_type" : "type-28890", ++ "self_type" : "type-28914", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116006,17 +116048,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-29182", +- "self_type" : "type-29206", ++ "referenced_type" : "type-2907", ++ "self_type" : "type-2919", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-2936", +- "self_type" : "type-2935", ++ "referenced_type" : "type-29070", ++ "self_type" : "type-29086", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116024,8 +116066,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-29360", +- "self_type" : "type-29370", ++ "referenced_type" : "type-29181", ++ "self_type" : "type-29205", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116033,17 +116075,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-29520", +- "self_type" : "type-29529", ++ "referenced_type" : "type-29359", ++ "self_type" : "type-29369", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-2955", +- "self_type" : "type-2967", ++ "referenced_type" : "type-29519", ++ "self_type" : "type-29528", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116051,8 +116093,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-29673", +- "self_type" : "type-29676", ++ "referenced_type" : "type-29672", ++ "self_type" : "type-29675", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116060,8 +116102,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-29847", +- "self_type" : "type-29856", ++ "referenced_type" : "type-29846", ++ "self_type" : "type-29855", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116069,8 +116111,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-29935", +- "self_type" : "type-29951", ++ "referenced_type" : "type-29934", ++ "self_type" : "type-29950", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116078,8 +116120,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-30085", +- "self_type" : "type-30089", ++ "referenced_type" : "type-30084", ++ "self_type" : "type-30088", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116087,8 +116129,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-30201", +- "self_type" : "type-30200", ++ "referenced_type" : "type-30200", ++ "self_type" : "type-30199", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116096,8 +116138,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-30325", +- "self_type" : "type-30333", ++ "referenced_type" : "type-30324", ++ "self_type" : "type-30332", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116105,8 +116147,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-30413", +- "self_type" : "type-30468", ++ "referenced_type" : "type-30412", ++ "self_type" : "type-30467", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116114,8 +116156,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-30722", +- "self_type" : "type-30741", ++ "referenced_type" : "type-3068", ++ "self_type" : "type-3124", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116123,17 +116165,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-30837", +- "self_type" : "type-30836", ++ "referenced_type" : "type-30721", ++ "self_type" : "type-30740", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-30944", +- "self_type" : "type-30979", ++ "referenced_type" : "type-30836", ++ "self_type" : "type-30835", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116141,8 +116183,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-31136", +- "self_type" : "type-31139", ++ "referenced_type" : "type-30943", ++ "self_type" : "type-30978", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116150,17 +116192,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-3116", +- "self_type" : "type-3172", ++ "referenced_type" : "type-31135", ++ "self_type" : "type-31138", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-31233", +- "self_type" : "type-31244", ++ "referenced_type" : "type-31232", ++ "self_type" : "type-31243", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116168,8 +116210,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-31340", +- "self_type" : "type-31346", ++ "referenced_type" : "type-31339", ++ "self_type" : "type-31345", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116177,8 +116219,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-31439", +- "self_type" : "type-31475", ++ "referenced_type" : "type-31438", ++ "self_type" : "type-31474", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116186,8 +116228,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-31519", +- "self_type" : "type-31527", ++ "referenced_type" : "type-31518", ++ "self_type" : "type-31526", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116195,8 +116237,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-31584", +- "self_type" : "type-31589", ++ "referenced_type" : "type-31583", ++ "self_type" : "type-31588", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116204,8 +116246,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-31650", +- "self_type" : "type-31662", ++ "referenced_type" : "type-31649", ++ "self_type" : "type-31661", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116213,8 +116255,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-31730", +- "self_type" : "type-31733", ++ "referenced_type" : "type-31729", ++ "self_type" : "type-31732", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -116222,8 +116264,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-31753", +- "self_type" : "type-31752", ++ "referenced_type" : "type-31752", ++ "self_type" : "type-31751", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116231,8 +116273,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-31801", +- "self_type" : "type-31904", ++ "referenced_type" : "type-31800", ++ "self_type" : "type-31903", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116240,8 +116282,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-32025", +- "self_type" : "type-32065", ++ "referenced_type" : "type-32024", ++ "self_type" : "type-32064", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116249,8 +116291,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-32135", +- "self_type" : "type-32143", ++ "referenced_type" : "type-32134", ++ "self_type" : "type-32142", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116258,8 +116300,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-32230", +- "self_type" : "type-32238", ++ "referenced_type" : "type-32229", ++ "self_type" : "type-32237", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116267,8 +116309,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-3427", +- "self_type" : "type-3452", ++ "referenced_type" : "type-3379", ++ "self_type" : "type-3404", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116276,8 +116318,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-3554", +- "self_type" : "type-3553", ++ "referenced_type" : "type-3506", ++ "self_type" : "type-3505", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116285,8 +116327,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-3673", +- "self_type" : "type-3727", ++ "referenced_type" : "type-3625", ++ "self_type" : "type-3679", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116294,8 +116336,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-3926", +- "self_type" : "type-3929", ++ "referenced_type" : "type-3878", ++ "self_type" : "type-3881", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116303,8 +116345,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-4072", +- "self_type" : "type-4083", ++ "referenced_type" : "type-4024", ++ "self_type" : "type-4035", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116312,8 +116354,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-4182", +- "self_type" : "type-4188", ++ "referenced_type" : "type-4134", ++ "self_type" : "type-4140", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116321,8 +116363,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-4301", +- "self_type" : "type-4347", ++ "referenced_type" : "type-4253", ++ "self_type" : "type-4299", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116339,8 +116381,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-4392", +- "self_type" : "type-4401", ++ "referenced_type" : "type-4344", ++ "self_type" : "type-4353", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116348,8 +116390,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-4460", +- "self_type" : "type-4465", ++ "referenced_type" : "type-4412", ++ "self_type" : "type-4417", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116357,8 +116399,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-4540", +- "self_type" : "type-4539", ++ "referenced_type" : "type-4492", ++ "self_type" : "type-4491", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116366,8 +116408,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-4694", +- "self_type" : "type-4743", ++ "referenced_type" : "type-4646", ++ "self_type" : "type-4695", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116375,8 +116417,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-4866", +- "self_type" : "type-4869", ++ "referenced_type" : "type-4818", ++ "self_type" : "type-4821", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116384,8 +116426,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-4880", +- "self_type" : "type-4879", ++ "referenced_type" : "type-4832", ++ "self_type" : "type-4831", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116393,8 +116435,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-4916", +- "self_type" : "type-4915", ++ "referenced_type" : "type-4868", ++ "self_type" : "type-4867", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116402,8 +116444,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-4935", +- "self_type" : "type-4947", ++ "referenced_type" : "type-4887", ++ "self_type" : "type-4899", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116411,8 +116453,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-5096", +- "self_type" : "type-5152", ++ "referenced_type" : "type-5048", ++ "self_type" : "type-5104", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116420,8 +116462,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-5407", +- "self_type" : "type-5432", ++ "referenced_type" : "type-5359", ++ "self_type" : "type-5384", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116429,8 +116471,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-5532", +- "self_type" : "type-5531", ++ "referenced_type" : "type-5484", ++ "self_type" : "type-5483", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116438,8 +116480,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-5640", +- "self_type" : "type-5677", ++ "referenced_type" : "type-5592", ++ "self_type" : "type-5629", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116447,8 +116489,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-5834", +- "self_type" : "type-5837", ++ "referenced_type" : "type-5786", ++ "self_type" : "type-5789", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116456,8 +116498,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-5931", +- "self_type" : "type-5942", ++ "referenced_type" : "type-5883", ++ "self_type" : "type-5894", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116465,8 +116507,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-6038", +- "self_type" : "type-6044", ++ "referenced_type" : "type-5990", ++ "self_type" : "type-5996", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116474,8 +116516,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-6137", +- "self_type" : "type-6173", ++ "referenced_type" : "type-6089", ++ "self_type" : "type-6125", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116483,8 +116525,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-6217", +- "self_type" : "type-6225", ++ "referenced_type" : "type-6169", ++ "self_type" : "type-6177", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116492,8 +116534,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-6282", +- "self_type" : "type-6287", ++ "referenced_type" : "type-6234", ++ "self_type" : "type-6239", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116501,8 +116543,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-6351", +- "self_type" : "type-6363", ++ "referenced_type" : "type-6303", ++ "self_type" : "type-6315", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116510,8 +116552,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-6433", +- "self_type" : "type-6436", ++ "referenced_type" : "type-6385", ++ "self_type" : "type-6388", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -116519,8 +116561,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-6456", +- "self_type" : "type-6455", ++ "referenced_type" : "type-6408", ++ "self_type" : "type-6407", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116528,8 +116570,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-6551", +- "self_type" : "type-6703", ++ "referenced_type" : "type-6503", ++ "self_type" : "type-6655", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116537,8 +116579,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-6870", +- "self_type" : "type-6931", ++ "referenced_type" : "type-6822", ++ "self_type" : "type-6883", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116546,8 +116588,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-7016", +- "self_type" : "type-7024", ++ "referenced_type" : "type-6968", ++ "self_type" : "type-6976", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116555,8 +116597,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-7117", +- "self_type" : "type-7125", ++ "referenced_type" : "type-7069", ++ "self_type" : "type-7077", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116564,8 +116606,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-7190", +- "self_type" : "type-7632", ++ "referenced_type" : "type-7142", ++ "self_type" : "type-7584", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116573,8 +116615,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-7213", +- "self_type" : "type-7492", ++ "referenced_type" : "type-7165", ++ "self_type" : "type-7444", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -116600,8 +116642,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-7629", +- "self_type" : "type-7633", ++ "referenced_type" : "type-7581", ++ "self_type" : "type-7585", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116609,8 +116651,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-7801", +- "self_type" : "type-7812", ++ "referenced_type" : "type-7753", ++ "self_type" : "type-7764", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116618,8 +116660,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-7905", +- "self_type" : "type-7917", ++ "referenced_type" : "type-7857", ++ "self_type" : "type-7869", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116627,8 +116669,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-7981", +- "self_type" : "type-8007", ++ "referenced_type" : "type-7933", ++ "self_type" : "type-7959", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116645,8 +116687,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-8089", +- "self_type" : "type-8097", ++ "referenced_type" : "type-8041", ++ "self_type" : "type-8049", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116654,8 +116696,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-8142", +- "self_type" : "type-8145", ++ "referenced_type" : "type-8094", ++ "self_type" : "type-8097", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116663,8 +116705,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-8156", +- "self_type" : "type-8155", ++ "referenced_type" : "type-8108", ++ "self_type" : "type-8107", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116672,8 +116714,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-819", +- "self_type" : "type-831", ++ "referenced_type" : "type-8144", ++ "self_type" : "type-8143", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116681,8 +116723,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-8192", +- "self_type" : "type-8191", ++ "referenced_type" : "type-8163", ++ "self_type" : "type-8175", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116690,8 +116732,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-8211", +- "self_type" : "type-8223", ++ "referenced_type" : "type-819", ++ "self_type" : "type-831", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116699,8 +116741,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-8371", +- "self_type" : "type-8427", ++ "referenced_type" : "type-8323", ++ "self_type" : "type-8379", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116708,8 +116750,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-8681", +- "self_type" : "type-8697", ++ "referenced_type" : "type-8633", ++ "self_type" : "type-8649", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116717,8 +116759,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-8791", +- "self_type" : "type-8790", ++ "referenced_type" : "type-8743", ++ "self_type" : "type-8742", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116726,8 +116768,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-8898", +- "self_type" : "type-8934", ++ "referenced_type" : "type-8850", ++ "self_type" : "type-8886", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116735,8 +116777,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-9091", +- "self_type" : "type-9094", ++ "referenced_type" : "type-9043", ++ "self_type" : "type-9046", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116744,8 +116786,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-9188", +- "self_type" : "type-9199", ++ "referenced_type" : "type-9140", ++ "self_type" : "type-9151", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116753,8 +116795,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-9295", +- "self_type" : "type-9301", ++ "referenced_type" : "type-9247", ++ "self_type" : "type-9253", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116762,8 +116804,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-9394", +- "self_type" : "type-9430", ++ "referenced_type" : "type-9346", ++ "self_type" : "type-9382", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116771,8 +116813,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-9474", +- "self_type" : "type-9482", ++ "referenced_type" : "type-9426", ++ "self_type" : "type-9434", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116780,8 +116822,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-9539", +- "self_type" : "type-9544", ++ "referenced_type" : "type-9491", ++ "self_type" : "type-9496", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116789,8 +116831,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-9605", +- "self_type" : "type-9617", ++ "referenced_type" : "type-9557", ++ "self_type" : "type-9569", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116798,8 +116840,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-9685", +- "self_type" : "type-9688", ++ "referenced_type" : "type-9637", ++ "self_type" : "type-9640", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -116807,8 +116849,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-9708", +- "self_type" : "type-9707", ++ "referenced_type" : "type-9660", ++ "self_type" : "type-9659", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_util.h" + }, +@@ -116816,8 +116858,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-9756", +- "self_type" : "type-9859", ++ "referenced_type" : "type-9708", ++ "self_type" : "type-9811", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116825,8 +116867,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > *", + "name" : "const std::basic_string, std::allocator > *", +- "referenced_type" : "type-9979", +- "self_type" : "type-10019", ++ "referenced_type" : "type-9931", ++ "self_type" : "type-9971", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116834,8 +116876,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-10019", +- "self_type" : "type-10020", ++ "referenced_type" : "type-10049", ++ "self_type" : "type-10050", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116843,8 +116885,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-10097", +- "self_type" : "type-10098", ++ "referenced_type" : "type-10144", ++ "self_type" : "type-10148", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116852,8 +116894,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-10192", +- "self_type" : "type-10196", ++ "referenced_type" : "type-10388", ++ "self_type" : "type-10433", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116861,8 +116903,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-10436", +- "self_type" : "type-10481", ++ "referenced_type" : "type-10503", ++ "self_type" : "type-10506", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116870,8 +116912,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-10551", +- "self_type" : "type-10554", ++ "referenced_type" : "type-10677", ++ "self_type" : "type-10683", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116879,8 +116921,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-10725", +- "self_type" : "type-10731", ++ "referenced_type" : "type-10767", ++ "self_type" : "type-10773", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116888,8 +116930,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-10815", +- "self_type" : "type-10821", ++ "referenced_type" : "type-10858", ++ "self_type" : "type-10863", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116897,8 +116939,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-10906", +- "self_type" : "type-10911", ++ "referenced_type" : "type-10948", ++ "self_type" : "type-10953", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116906,8 +116948,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-10996", +- "self_type" : "type-11001", ++ "referenced_type" : "type-11021", ++ "self_type" : "type-11027", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116915,8 +116957,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-11069", +- "self_type" : "type-11075", ++ "referenced_type" : "type-11198", ++ "self_type" : "type-11205", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116924,8 +116966,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-11246", +- "self_type" : "type-11253", ++ "referenced_type" : "type-11363", ++ "self_type" : "type-11366", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116933,8 +116975,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-11411", +- "self_type" : "type-11414", ++ "referenced_type" : "type-11708", ++ "self_type" : "type-11760", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116942,8 +116984,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-11756", +- "self_type" : "type-11808", ++ "referenced_type" : "type-11981", ++ "self_type" : "type-11985", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116951,8 +116993,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-12029", +- "self_type" : "type-12033", ++ "referenced_type" : "type-12076", ++ "self_type" : "type-12075", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116960,8 +117002,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-12124", +- "self_type" : "type-12123", ++ "referenced_type" : "type-12220", ++ "self_type" : "type-12221", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116969,8 +117011,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-12268", +- "self_type" : "type-12269", ++ "referenced_type" : "type-12378", ++ "self_type" : "type-12379", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116978,8 +117020,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-12426", +- "self_type" : "type-12427", ++ "referenced_type" : "type-12483", ++ "self_type" : "type-12490", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116987,8 +117029,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-12531", +- "self_type" : "type-12538", ++ "referenced_type" : "type-12585", ++ "self_type" : "type-12591", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -116996,8 +117038,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-12633", +- "self_type" : "type-12639", ++ "referenced_type" : "type-12714", ++ "self_type" : "type-12715", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117005,8 +117047,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-12762", +- "self_type" : "type-12763", ++ "referenced_type" : "type-12766", ++ "self_type" : "type-12770", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117014,8 +117056,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-12814", +- "self_type" : "type-12818", ++ "referenced_type" : "type-12828", ++ "self_type" : "type-12832", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117023,8 +117065,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-12876", +- "self_type" : "type-12880", ++ "referenced_type" : "type-12901", ++ "self_type" : "type-12906", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117032,8 +117074,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-12949", +- "self_type" : "type-12954", ++ "referenced_type" : "type-12972", ++ "self_type" : "type-12985", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117041,8 +117083,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-13020", +- "self_type" : "type-13033", ++ "referenced_type" : "type-13143", ++ "self_type" : "type-13148", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117050,8 +117092,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-13191", +- "self_type" : "type-13196", ++ "referenced_type" : "type-13304", ++ "self_type" : "type-13305", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117059,8 +117101,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-13352", +- "self_type" : "type-13353", ++ "referenced_type" : "type-13382", ++ "self_type" : "type-13383", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117068,8 +117110,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-13430", +- "self_type" : "type-13431", ++ "referenced_type" : "type-13477", ++ "self_type" : "type-13481", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117077,8 +117119,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-13525", +- "self_type" : "type-13529", ++ "referenced_type" : "type-13679", ++ "self_type" : "type-13724", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117086,8 +117128,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-13727", +- "self_type" : "type-13772", ++ "referenced_type" : "type-13794", ++ "self_type" : "type-13797", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117095,8 +117137,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-13842", +- "self_type" : "type-13845", ++ "referenced_type" : "type-13968", ++ "self_type" : "type-13974", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117104,8 +117146,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-14016", +- "self_type" : "type-14022", ++ "referenced_type" : "type-14058", ++ "self_type" : "type-14064", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117113,8 +117155,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-14106", +- "self_type" : "type-14112", ++ "referenced_type" : "type-14149", ++ "self_type" : "type-14154", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117122,8 +117164,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-14197", +- "self_type" : "type-14202", ++ "referenced_type" : "type-14239", ++ "self_type" : "type-14244", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117131,8 +117173,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-14287", +- "self_type" : "type-14292", ++ "referenced_type" : "type-14303", ++ "self_type" : "type-14309", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117140,8 +117182,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-14351", +- "self_type" : "type-14357", ++ "referenced_type" : "type-14450", ++ "self_type" : "type-14456", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117149,8 +117191,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-14498", +- "self_type" : "type-14504", ++ "referenced_type" : "type-14582", ++ "self_type" : "type-14585", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117158,8 +117200,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-14630", +- "self_type" : "type-14633", ++ "referenced_type" : "type-14693", ++ "self_type" : "type-14699", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117167,8 +117209,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-14741", +- "self_type" : "type-14747", ++ "referenced_type" : "type-14784", ++ "self_type" : "type-14790", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117176,8 +117218,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-14832", +- "self_type" : "type-14838", ++ "referenced_type" : "type-15042", ++ "self_type" : "type-15053", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117185,8 +117227,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-15090", +- "self_type" : "type-15101", ++ "referenced_type" : "type-15139", ++ "self_type" : "type-15148", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117194,8 +117236,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-15187", +- "self_type" : "type-15196", ++ "referenced_type" : "type-15565", ++ "self_type" : "type-15617", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117203,8 +117245,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-15613", +- "self_type" : "type-15665", ++ "referenced_type" : "type-15837", ++ "self_type" : "type-15841", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117212,8 +117254,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-15885", +- "self_type" : "type-15889", ++ "referenced_type" : "type-15931", ++ "self_type" : "type-15930", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117221,8 +117263,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-15979", +- "self_type" : "type-15978", ++ "referenced_type" : "type-16075", ++ "self_type" : "type-16076", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117230,8 +117272,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-16123", +- "self_type" : "type-16124", ++ "referenced_type" : "type-16235", ++ "self_type" : "type-16236", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117239,8 +117281,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-16283", +- "self_type" : "type-16284", ++ "referenced_type" : "type-16340", ++ "self_type" : "type-16347", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117248,8 +117290,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-16388", +- "self_type" : "type-16395", ++ "referenced_type" : "type-16442", ++ "self_type" : "type-16448", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117257,8 +117299,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-16490", +- "self_type" : "type-16496", ++ "referenced_type" : "type-16570", ++ "self_type" : "type-16571", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117266,8 +117308,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-16618", +- "self_type" : "type-16619", ++ "referenced_type" : "type-16622", ++ "self_type" : "type-16626", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117275,8 +117317,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-16670", +- "self_type" : "type-16674", ++ "referenced_type" : "type-16684", ++ "self_type" : "type-16688", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117284,8 +117326,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-16732", +- "self_type" : "type-16736", ++ "referenced_type" : "type-16757", ++ "self_type" : "type-16762", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117293,8 +117335,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-16805", +- "self_type" : "type-16810", ++ "referenced_type" : "type-16828", ++ "self_type" : "type-16841", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117302,8 +117344,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-16876", +- "self_type" : "type-16889", ++ "referenced_type" : "type-16999", ++ "self_type" : "type-17004", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117311,8 +117353,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-17047", +- "self_type" : "type-17052", ++ "referenced_type" : "type-17160", ++ "self_type" : "type-17161", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117320,8 +117362,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-17208", +- "self_type" : "type-17209", ++ "referenced_type" : "type-17238", ++ "self_type" : "type-17239", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117329,8 +117371,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-17286", +- "self_type" : "type-17287", ++ "referenced_type" : "type-17333", ++ "self_type" : "type-17337", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117338,8 +117380,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-17381", +- "self_type" : "type-17385", ++ "referenced_type" : "type-17543", ++ "self_type" : "type-17588", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117347,8 +117389,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-17591", +- "self_type" : "type-17636", ++ "referenced_type" : "type-17658", ++ "self_type" : "type-17661", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117356,8 +117398,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-17706", +- "self_type" : "type-17709", ++ "referenced_type" : "type-17832", ++ "self_type" : "type-17838", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117365,8 +117407,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-17880", +- "self_type" : "type-17886", ++ "referenced_type" : "type-17922", ++ "self_type" : "type-17928", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117374,8 +117416,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-17970", +- "self_type" : "type-17976", ++ "referenced_type" : "type-18013", ++ "self_type" : "type-18018", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117383,8 +117425,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-18061", +- "self_type" : "type-18066", ++ "referenced_type" : "type-18103", ++ "self_type" : "type-18108", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117392,8 +117434,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-18151", +- "self_type" : "type-18156", ++ "referenced_type" : "type-18167", ++ "self_type" : "type-18173", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117401,8 +117443,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-18215", +- "self_type" : "type-18221", ++ "referenced_type" : "type-18314", ++ "self_type" : "type-18320", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117410,8 +117452,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-18362", +- "self_type" : "type-18368", ++ "referenced_type" : "type-18446", ++ "self_type" : "type-18449", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117419,8 +117461,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-18494", +- "self_type" : "type-18497", ++ "referenced_type" : "type-18557", ++ "self_type" : "type-18563", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117428,8 +117470,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-18605", +- "self_type" : "type-18611", ++ "referenced_type" : "type-1857", ++ "self_type" : "type-1950", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117437,8 +117479,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-18689", +- "self_type" : "type-18695", ++ "referenced_type" : "type-18641", ++ "self_type" : "type-18647", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117446,8 +117488,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-18874", +- "self_type" : "type-18885", ++ "referenced_type" : "type-18826", ++ "self_type" : "type-18837", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117455,8 +117497,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-18971", +- "self_type" : "type-18980", ++ "referenced_type" : "type-18923", ++ "self_type" : "type-18932", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117464,8 +117506,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-19209", +- "self_type" : "type-19221", ++ "referenced_type" : "type-19161", ++ "self_type" : "type-19173", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117473,8 +117515,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-1934", +- "self_type" : "type-2024", ++ "referenced_type" : "type-19354", ++ "self_type" : "type-19358", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117482,8 +117524,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-19402", +- "self_type" : "type-19406", ++ "referenced_type" : "type-19503", ++ "self_type" : "type-19507", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117491,8 +117533,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-19551", +- "self_type" : "type-19555", ++ "referenced_type" : "type-19670", ++ "self_type" : "type-19676", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117500,8 +117542,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-19718", +- "self_type" : "type-19724", ++ "referenced_type" : "type-19829", ++ "self_type" : "type-19840", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117509,8 +117551,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-19877", +- "self_type" : "type-19888", ++ "referenced_type" : "type-20098", ++ "self_type" : "type-20150", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117518,8 +117560,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-20146", +- "self_type" : "type-20198", ++ "referenced_type" : "type-20371", ++ "self_type" : "type-20375", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117527,8 +117569,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-20419", +- "self_type" : "type-20423", ++ "referenced_type" : "type-20463", ++ "self_type" : "type-20462", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117536,8 +117578,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-20511", +- "self_type" : "type-20510", ++ "referenced_type" : "type-20606", ++ "self_type" : "type-20607", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117545,8 +117587,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-20654", +- "self_type" : "type-20655", ++ "referenced_type" : "type-20766", ++ "self_type" : "type-20767", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117554,8 +117596,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-20814", +- "self_type" : "type-20815", ++ "referenced_type" : "type-20871", ++ "self_type" : "type-20878", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117563,8 +117605,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-20919", +- "self_type" : "type-20926", ++ "referenced_type" : "type-20973", ++ "self_type" : "type-20979", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117572,8 +117614,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-21021", +- "self_type" : "type-21027", ++ "referenced_type" : "type-21102", ++ "self_type" : "type-21103", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117581,8 +117623,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-21150", +- "self_type" : "type-21151", ++ "referenced_type" : "type-21154", ++ "self_type" : "type-21158", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117590,8 +117632,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-21202", +- "self_type" : "type-21206", ++ "referenced_type" : "type-21216", ++ "self_type" : "type-21220", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117599,8 +117641,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-21264", +- "self_type" : "type-21268", ++ "referenced_type" : "type-21289", ++ "self_type" : "type-21294", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117608,8 +117650,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-21337", +- "self_type" : "type-21342", ++ "referenced_type" : "type-21360", ++ "self_type" : "type-21373", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117617,8 +117659,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-21408", +- "self_type" : "type-21421", ++ "referenced_type" : "type-21531", ++ "self_type" : "type-21536", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117626,8 +117668,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-21579", +- "self_type" : "type-21584", ++ "referenced_type" : "type-21692", ++ "self_type" : "type-21693", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117635,8 +117677,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-21740", +- "self_type" : "type-21741", ++ "referenced_type" : "type-21770", ++ "self_type" : "type-21771", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117644,8 +117686,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-21818", +- "self_type" : "type-21819", ++ "referenced_type" : "type-21865", ++ "self_type" : "type-21869", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117654,7 +117696,7 @@ + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", + "referenced_type" : "type-21913", +- "self_type" : "type-21917", ++ "self_type" : "type-21918", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117662,8 +117704,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-22120", +- "self_type" : "type-22165", ++ "referenced_type" : "type-22121", ++ "self_type" : "type-22164", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117671,8 +117713,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-22235", +- "self_type" : "type-22238", ++ "referenced_type" : "type-22220", ++ "self_type" : "type-22222", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117680,8 +117722,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-22409", +- "self_type" : "type-22415", ++ "referenced_type" : "type-22367", ++ "self_type" : "type-22372", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117689,8 +117731,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-22499", +- "self_type" : "type-22505", ++ "referenced_type" : "type-22424", ++ "self_type" : "type-22428", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117698,8 +117740,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-22590", +- "self_type" : "type-22595", ++ "referenced_type" : "type-22501", ++ "self_type" : "type-22504", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117707,8 +117749,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-22680", +- "self_type" : "type-22685", ++ "referenced_type" : "type-22600", ++ "self_type" : "type-22607", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117716,8 +117758,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-22744", +- "self_type" : "type-22750", ++ "referenced_type" : "type-22678", ++ "self_type" : "type-22685", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117725,8 +117767,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-22891", +- "self_type" : "type-22897", ++ "referenced_type" : "type-22853", ++ "self_type" : "type-22857", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117734,8 +117776,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-23023", +- "self_type" : "type-23026", ++ "referenced_type" : "type-22995", ++ "self_type" : "type-22997", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117743,8 +117785,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-23134", +- "self_type" : "type-23140", ++ "referenced_type" : "type-23119", ++ "self_type" : "type-23125", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117752,8 +117794,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-23218", +- "self_type" : "type-23224", ++ "referenced_type" : "type-23206", ++ "self_type" : "type-23211", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117761,8 +117803,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-23403", +- "self_type" : "type-23414", ++ "referenced_type" : "type-2321", ++ "self_type" : "type-2326", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117770,8 +117812,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-23500", +- "self_type" : "type-23509", ++ "referenced_type" : "type-23386", ++ "self_type" : "type-23397", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117779,8 +117821,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-23730", +- "self_type" : "type-23742", ++ "referenced_type" : "type-23478", ++ "self_type" : "type-23487", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117788,8 +117830,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-23902", +- "self_type" : "type-23906", ++ "referenced_type" : "type-23720", ++ "self_type" : "type-23729", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117797,8 +117839,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-2393", +- "self_type" : "type-2398", ++ "referenced_type" : "type-23905", ++ "self_type" : "type-23910", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117806,8 +117848,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-24021", +- "self_type" : "type-24025", ++ "referenced_type" : "type-24018", ++ "self_type" : "type-24022", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117815,8 +117857,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-24185", +- "self_type" : "type-24191", ++ "referenced_type" : "type-24190", ++ "self_type" : "type-24196", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117824,8 +117866,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-24344", +- "self_type" : "type-24355", ++ "referenced_type" : "type-24329", ++ "self_type" : "type-24338", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117833,8 +117875,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-24491", +- "self_type" : "type-24495", ++ "referenced_type" : "type-2445", ++ "self_type" : "type-2444", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117842,8 +117884,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-24675", +- "self_type" : "type-24681", ++ "referenced_type" : "type-24470", ++ "self_type" : "type-24474", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117851,8 +117893,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-24772", +- "self_type" : "type-24781", ++ "referenced_type" : "type-24638", ++ "self_type" : "type-24642", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117860,8 +117902,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-24933", +- "self_type" : "type-24937", ++ "referenced_type" : "type-24730", ++ "self_type" : "type-24737", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117869,8 +117911,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-25055", +- "self_type" : "type-25066", ++ "referenced_type" : "type-24901", ++ "self_type" : "type-24905", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117878,8 +117920,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-2515", +- "self_type" : "type-2514", ++ "referenced_type" : "type-25026", ++ "self_type" : "type-25037", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117887,8 +117929,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-25189", +- "self_type" : "type-25194", ++ "referenced_type" : "type-25178", ++ "self_type" : "type-25185", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117896,8 +117938,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-25324", +- "self_type" : "type-25374", ++ "referenced_type" : "type-25382", ++ "self_type" : "type-25427", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117905,8 +117947,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-25595", +- "self_type" : "type-25599", ++ "referenced_type" : "type-25648", ++ "self_type" : "type-25652", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117914,8 +117956,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-25690", +- "self_type" : "type-25689", ++ "referenced_type" : "type-25741", ++ "self_type" : "type-25740", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117923,8 +117965,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-25833", +- "self_type" : "type-25834", ++ "referenced_type" : "type-25884", ++ "self_type" : "type-25885", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117932,8 +117974,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-25992", +- "self_type" : "type-25993", ++ "referenced_type" : "type-26045", ++ "self_type" : "type-26046", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117941,8 +117983,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-26097", +- "self_type" : "type-26104", ++ "referenced_type" : "type-26144", ++ "self_type" : "type-26148", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117950,8 +117992,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-26199", +- "self_type" : "type-26205", ++ "referenced_type" : "type-26243", ++ "self_type" : "type-26247", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117959,8 +118001,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-26328", +- "self_type" : "type-26329", ++ "referenced_type" : "type-26370", ++ "self_type" : "type-26371", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117968,8 +118010,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-26380", +- "self_type" : "type-26384", ++ "referenced_type" : "type-26422", ++ "self_type" : "type-26426", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117977,8 +118019,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-26442", +- "self_type" : "type-26446", ++ "referenced_type" : "type-26485", ++ "self_type" : "type-26487", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117986,8 +118028,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-26515", +- "self_type" : "type-26520", ++ "referenced_type" : "type-26546", ++ "self_type" : "type-26550", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -117995,8 +118037,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-26586", +- "self_type" : "type-26599", ++ "referenced_type" : "type-26614", ++ "self_type" : "type-26627", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118004,8 +118046,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-26757", +- "self_type" : "type-26762", ++ "referenced_type" : "type-26780", ++ "self_type" : "type-26784", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118013,8 +118055,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-26918", +- "self_type" : "type-26919", ++ "referenced_type" : "type-26938", ++ "self_type" : "type-26939", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118022,8 +118064,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-26996", +- "self_type" : "type-26997", ++ "referenced_type" : "type-27022", ++ "self_type" : "type-27025", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118031,8 +118073,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-27091", +- "self_type" : "type-27095", ++ "referenced_type" : "type-27304", ++ "self_type" : "type-27349", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118040,8 +118082,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-27305", +- "self_type" : "type-27350", ++ "referenced_type" : "type-27419", ++ "self_type" : "type-27422", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118049,8 +118091,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-27420", +- "self_type" : "type-27423", ++ "referenced_type" : "type-27593", ++ "self_type" : "type-27599", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118058,8 +118100,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-27594", +- "self_type" : "type-27600", ++ "referenced_type" : "type-27683", ++ "self_type" : "type-27689", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118067,8 +118109,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-27684", +- "self_type" : "type-27690", ++ "referenced_type" : "type-27774", ++ "self_type" : "type-27779", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118076,8 +118118,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-27775", +- "self_type" : "type-27780", ++ "referenced_type" : "type-27864", ++ "self_type" : "type-27869", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118085,8 +118127,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-27865", +- "self_type" : "type-27870", ++ "referenced_type" : "type-27928", ++ "self_type" : "type-27934", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118094,8 +118136,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-27929", +- "self_type" : "type-27935", ++ "referenced_type" : "type-28075", ++ "self_type" : "type-28081", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118103,8 +118145,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-28076", +- "self_type" : "type-28082", ++ "referenced_type" : "type-28207", ++ "self_type" : "type-28210", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118112,8 +118154,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-28208", +- "self_type" : "type-28211", ++ "referenced_type" : "type-28318", ++ "self_type" : "type-28324", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118121,8 +118163,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-28319", +- "self_type" : "type-28325", ++ "referenced_type" : "type-28402", ++ "self_type" : "type-28408", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118130,8 +118172,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-28403", +- "self_type" : "type-28409", ++ "referenced_type" : "type-28587", ++ "self_type" : "type-28598", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118139,8 +118181,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-28588", +- "self_type" : "type-28599", ++ "referenced_type" : "type-28684", ++ "self_type" : "type-28693", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118148,8 +118190,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-28685", +- "self_type" : "type-28694", ++ "referenced_type" : "type-28914", ++ "self_type" : "type-28926", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118157,8 +118199,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-28915", +- "self_type" : "type-28927", ++ "referenced_type" : "type-29086", ++ "self_type" : "type-29090", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118166,8 +118208,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-29087", +- "self_type" : "type-29091", ++ "referenced_type" : "type-29205", ++ "self_type" : "type-29209", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118175,8 +118217,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-29206", +- "self_type" : "type-29210", ++ "referenced_type" : "type-29369", ++ "self_type" : "type-29375", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118184,8 +118226,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-29370", +- "self_type" : "type-29376", ++ "referenced_type" : "type-29528", ++ "self_type" : "type-29539", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118193,8 +118235,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-29529", +- "self_type" : "type-29540", ++ "referenced_type" : "type-29675", ++ "self_type" : "type-29679", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118202,8 +118244,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-29676", +- "self_type" : "type-29680", ++ "referenced_type" : "type-29855", ++ "self_type" : "type-29861", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118211,8 +118253,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-29856", +- "self_type" : "type-29862", ++ "referenced_type" : "type-29950", ++ "self_type" : "type-29959", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118220,8 +118262,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-29951", +- "self_type" : "type-29960", ++ "referenced_type" : "type-30088", ++ "self_type" : "type-30092", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118229,8 +118271,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-30089", +- "self_type" : "type-30093", ++ "referenced_type" : "type-30199", ++ "self_type" : "type-30210", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118238,8 +118280,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-30200", +- "self_type" : "type-30211", ++ "referenced_type" : "type-30332", ++ "self_type" : "type-30337", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118247,8 +118289,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-30333", +- "self_type" : "type-30338", ++ "referenced_type" : "type-30467", ++ "self_type" : "type-30519", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118256,8 +118298,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-30468", +- "self_type" : "type-30520", ++ "referenced_type" : "type-30740", ++ "self_type" : "type-30744", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118265,8 +118307,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-30741", +- "self_type" : "type-30745", ++ "referenced_type" : "type-30835", ++ "self_type" : "type-30834", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118274,8 +118316,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-30836", +- "self_type" : "type-30835", ++ "referenced_type" : "type-30978", ++ "self_type" : "type-30979", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118283,8 +118325,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-30979", +- "self_type" : "type-30980", ++ "referenced_type" : "type-31138", ++ "self_type" : "type-31139", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118292,8 +118334,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-31139", +- "self_type" : "type-31140", ++ "referenced_type" : "type-3124", ++ "self_type" : "type-3176", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118301,8 +118343,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-31244", +- "self_type" : "type-31251", ++ "referenced_type" : "type-31243", ++ "self_type" : "type-31250", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118310,8 +118352,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-31346", +- "self_type" : "type-31352", ++ "referenced_type" : "type-31345", ++ "self_type" : "type-31351", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118319,8 +118361,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-31475", +- "self_type" : "type-31476", ++ "referenced_type" : "type-31474", ++ "self_type" : "type-31475", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118328,8 +118370,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-31527", +- "self_type" : "type-31531", ++ "referenced_type" : "type-31526", ++ "self_type" : "type-31530", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118337,8 +118379,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-31589", +- "self_type" : "type-31593", ++ "referenced_type" : "type-31588", ++ "self_type" : "type-31592", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118346,8 +118388,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-31662", +- "self_type" : "type-31667", ++ "referenced_type" : "type-31661", ++ "self_type" : "type-31666", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118355,8 +118397,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-3172", +- "self_type" : "type-3224", ++ "referenced_type" : "type-31732", ++ "self_type" : "type-31745", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118364,8 +118406,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-31733", +- "self_type" : "type-31746", ++ "referenced_type" : "type-31903", ++ "self_type" : "type-31908", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118373,8 +118415,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-31904", +- "self_type" : "type-31909", ++ "referenced_type" : "type-32064", ++ "self_type" : "type-32065", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118382,8 +118424,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-32065", +- "self_type" : "type-32066", ++ "referenced_type" : "type-32142", ++ "self_type" : "type-32143", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118391,8 +118433,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-32143", +- "self_type" : "type-32144", ++ "referenced_type" : "type-32237", ++ "self_type" : "type-32241", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118400,8 +118442,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-32238", +- "self_type" : "type-32242", ++ "referenced_type" : "type-3404", ++ "self_type" : "type-3408", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118409,8 +118451,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-3452", +- "self_type" : "type-3456", ++ "referenced_type" : "type-3505", ++ "self_type" : "type-3504", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118418,8 +118460,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-3553", +- "self_type" : "type-3552", ++ "referenced_type" : "type-3679", ++ "self_type" : "type-3680", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118427,8 +118469,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-3727", +- "self_type" : "type-3728", ++ "referenced_type" : "type-3881", ++ "self_type" : "type-3882", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118436,8 +118478,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-3929", +- "self_type" : "type-3930", ++ "referenced_type" : "type-4035", ++ "self_type" : "type-4042", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118445,8 +118487,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-4083", +- "self_type" : "type-4090", ++ "referenced_type" : "type-4140", ++ "self_type" : "type-4146", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118454,8 +118496,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-4188", +- "self_type" : "type-4194", ++ "referenced_type" : "type-4299", ++ "self_type" : "type-4300", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118463,8 +118505,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-4347", +- "self_type" : "type-4348", ++ "referenced_type" : "type-4353", ++ "self_type" : "type-4357", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118472,8 +118514,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-4401", +- "self_type" : "type-4405", ++ "referenced_type" : "type-4417", ++ "self_type" : "type-4420", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118481,8 +118523,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-4465", +- "self_type" : "type-4468", ++ "referenced_type" : "type-5104", ++ "self_type" : "type-5156", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118490,8 +118532,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-5152", +- "self_type" : "type-5204", ++ "referenced_type" : "type-5384", ++ "self_type" : "type-5388", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118499,8 +118541,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-5432", +- "self_type" : "type-5436", ++ "referenced_type" : "type-5483", ++ "self_type" : "type-5482", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118508,8 +118550,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-5531", +- "self_type" : "type-5530", ++ "referenced_type" : "type-5629", ++ "self_type" : "type-5630", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118517,8 +118559,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-5677", +- "self_type" : "type-5678", ++ "referenced_type" : "type-5789", ++ "self_type" : "type-5790", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118526,8 +118568,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-5837", +- "self_type" : "type-5838", ++ "referenced_type" : "type-5894", ++ "self_type" : "type-5901", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118535,8 +118577,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-5942", +- "self_type" : "type-5949", ++ "referenced_type" : "type-5996", ++ "self_type" : "type-6002", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118544,8 +118586,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-6044", +- "self_type" : "type-6050", ++ "referenced_type" : "type-6125", ++ "self_type" : "type-6126", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118553,8 +118595,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-6173", +- "self_type" : "type-6174", ++ "referenced_type" : "type-6177", ++ "self_type" : "type-6181", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118562,8 +118604,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-6225", +- "self_type" : "type-6229", ++ "referenced_type" : "type-6239", ++ "self_type" : "type-6243", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118571,8 +118613,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-6287", +- "self_type" : "type-6291", ++ "referenced_type" : "type-6315", ++ "self_type" : "type-6320", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118580,8 +118622,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-6363", +- "self_type" : "type-6368", ++ "referenced_type" : "type-6388", ++ "self_type" : "type-6401", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118589,8 +118631,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-6436", +- "self_type" : "type-6449", ++ "referenced_type" : "type-6655", ++ "self_type" : "type-6660", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118598,8 +118640,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-6703", +- "self_type" : "type-6708", ++ "referenced_type" : "type-6883", ++ "self_type" : "type-6884", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118607,8 +118649,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-6931", +- "self_type" : "type-6932", ++ "referenced_type" : "type-6976", ++ "self_type" : "type-6977", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118616,8 +118658,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-7024", +- "self_type" : "type-7025", ++ "referenced_type" : "type-7077", ++ "self_type" : "type-7081", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118625,8 +118667,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-7125", +- "self_type" : "type-7129", ++ "referenced_type" : "type-7444", ++ "self_type" : "type-7503", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118634,8 +118676,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-7492", +- "self_type" : "type-7551", ++ "referenced_type" : "type-7585", ++ "self_type" : "type-7588", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118643,8 +118685,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-7633", +- "self_type" : "type-7636", ++ "referenced_type" : "type-7764", ++ "self_type" : "type-7770", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118652,8 +118694,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-7812", +- "self_type" : "type-7818", ++ "referenced_type" : "type-7869", ++ "self_type" : "type-7875", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118661,8 +118703,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-7917", +- "self_type" : "type-7923", ++ "referenced_type" : "type-7959", ++ "self_type" : "type-7964", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118670,8 +118712,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-8007", +- "self_type" : "type-8012", ++ "referenced_type" : "type-8049", ++ "self_type" : "type-8054", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118679,8 +118721,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-8097", +- "self_type" : "type-8102", ++ "referenced_type" : "type-8379", ++ "self_type" : "type-8431", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118688,8 +118730,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-8427", +- "self_type" : "type-8479", ++ "referenced_type" : "type-8649", ++ "self_type" : "type-8653", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118697,8 +118739,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-8697", +- "self_type" : "type-8701", ++ "referenced_type" : "type-8742", ++ "self_type" : "type-8741", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118706,8 +118748,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-8790", +- "self_type" : "type-8789", ++ "referenced_type" : "type-8886", ++ "self_type" : "type-8887", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118715,8 +118757,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-8934", +- "self_type" : "type-8935", ++ "referenced_type" : "type-9046", ++ "self_type" : "type-9047", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118724,8 +118766,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-9094", +- "self_type" : "type-9095", ++ "referenced_type" : "type-9151", ++ "self_type" : "type-9158", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118733,8 +118775,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-9199", +- "self_type" : "type-9206", ++ "referenced_type" : "type-9253", ++ "self_type" : "type-9259", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118742,8 +118784,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-9301", +- "self_type" : "type-9307", ++ "referenced_type" : "type-9382", ++ "self_type" : "type-9383", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118751,8 +118793,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-9430", +- "self_type" : "type-9431", ++ "referenced_type" : "type-9434", ++ "self_type" : "type-9438", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118760,8 +118802,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-9482", +- "self_type" : "type-9486", ++ "referenced_type" : "type-9496", ++ "self_type" : "type-9500", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118769,8 +118811,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-9544", +- "self_type" : "type-9548", ++ "referenced_type" : "type-9569", ++ "self_type" : "type-9574", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118778,8 +118820,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-9617", +- "self_type" : "type-9622", ++ "referenced_type" : "type-9640", ++ "self_type" : "type-9653", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118787,8 +118829,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-9688", +- "self_type" : "type-9701", ++ "referenced_type" : "type-9811", ++ "self_type" : "type-9816", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118796,8 +118838,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::basic_string, std::allocator > **", + "name" : "const std::basic_string, std::allocator > **", +- "referenced_type" : "type-9859", +- "self_type" : "type-9864", ++ "referenced_type" : "type-9971", ++ "self_type" : "type-9972", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -118805,8 +118847,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair *", + "name" : "const std::pair *", +- "referenced_type" : "type-11513", +- "self_type" : "type-11512", ++ "referenced_type" : "type-11465", ++ "self_type" : "type-11464", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -118814,8 +118856,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair *", + "name" : "const std::pair *", +- "referenced_type" : "type-14733", +- "self_type" : "type-14732", ++ "referenced_type" : "type-14685", ++ "self_type" : "type-14684", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -118823,8 +118865,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair *", + "name" : "const std::pair *", +- "referenced_type" : "type-18597", +- "self_type" : "type-18596", ++ "referenced_type" : "type-18549", ++ "self_type" : "type-18548", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -118832,8 +118874,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair *", + "name" : "const std::pair *", +- "referenced_type" : "type-23126", +- "self_type" : "type-23125", ++ "referenced_type" : "type-23111", ++ "self_type" : "type-23110", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -118841,8 +118883,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::pair *", + "name" : "const std::pair *", +- "referenced_type" : "type-28311", +- "self_type" : "type-28310", ++ "referenced_type" : "type-28310", ++ "self_type" : "type-28309", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -118850,8 +118892,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", +- "referenced_type" : "type-13143", +- "self_type" : "type-13145", ++ "referenced_type" : "type-13095", ++ "self_type" : "type-13097", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -118859,8 +118901,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", +- "referenced_type" : "type-16999", +- "self_type" : "type-17001", ++ "referenced_type" : "type-16951", ++ "self_type" : "type-16953", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -118868,8 +118910,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", +- "referenced_type" : "type-21531", +- "self_type" : "type-21533", ++ "referenced_type" : "type-21483", ++ "self_type" : "type-21485", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -118877,8 +118919,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", +- "referenced_type" : "type-26709", +- "self_type" : "type-26711", ++ "referenced_type" : "type-26730", ++ "self_type" : "type-26732", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -118886,8 +118928,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", +- "referenced_type" : "type-31856", +- "self_type" : "type-31858", ++ "referenced_type" : "type-31855", ++ "self_type" : "type-31857", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -118895,8 +118937,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", +- "referenced_type" : "type-6640", +- "self_type" : "type-6642", ++ "referenced_type" : "type-6592", ++ "self_type" : "type-6594", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -118904,8 +118946,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", +- "referenced_type" : "type-9811", +- "self_type" : "type-9813", ++ "referenced_type" : "type-9763", ++ "self_type" : "type-9765", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -118913,8 +118955,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", + "name" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", +- "referenced_type" : "type-10421", +- "self_type" : "type-10423", ++ "referenced_type" : "type-10373", ++ "self_type" : "type-10375", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -118922,8 +118964,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", + "name" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", +- "referenced_type" : "type-13712", +- "self_type" : "type-13714", ++ "referenced_type" : "type-13664", ++ "self_type" : "type-13666", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -118931,8 +118973,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", + "name" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", +- "referenced_type" : "type-17576", +- "self_type" : "type-17578", ++ "referenced_type" : "type-17528", ++ "self_type" : "type-17530", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -118940,8 +118982,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", + "name" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", +- "referenced_type" : "type-22105", +- "self_type" : "type-22107", ++ "referenced_type" : "type-22104", ++ "self_type" : "type-22106", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -118949,8 +118991,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", + "name" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", +- "referenced_type" : "type-27290", +- "self_type" : "type-27292", ++ "referenced_type" : "type-27289", ++ "self_type" : "type-27291", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -118958,8 +119000,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", + "name" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", +- "referenced_type" : "type-7474", +- "self_type" : "type-7476", ++ "referenced_type" : "type-7426", ++ "self_type" : "type-7428", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -118967,8 +119009,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-10012", +- "self_type" : "type-10014", ++ "referenced_type" : "type-10046", ++ "self_type" : "type-10048", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -118976,8 +119018,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-10094", +- "self_type" : "type-10096", ++ "referenced_type" : "type-10139", ++ "self_type" : "type-10141", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -118985,8 +119027,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-10187", +- "self_type" : "type-10189", ++ "referenced_type" : "type-1019", ++ "self_type" : "type-1018", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -118994,8 +119036,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-1019", +- "self_type" : "type-1018", ++ "referenced_type" : "type-10330", ++ "self_type" : "type-10332", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119003,8 +119045,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-10378", +- "self_type" : "type-10380", ++ "referenced_type" : "type-10435", ++ "self_type" : "type-10442", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119012,8 +119054,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-10483", +- "self_type" : "type-10490", ++ "referenced_type" : "type-10530", ++ "self_type" : "type-10532", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119021,8 +119063,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-10578", +- "self_type" : "type-10580", ++ "referenced_type" : "type-1058", ++ "self_type" : "type-1060", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119030,8 +119072,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-1058", +- "self_type" : "type-1060", ++ "referenced_type" : "type-10672", ++ "self_type" : "type-10675", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119039,8 +119081,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-10720", +- "self_type" : "type-10723", ++ "referenced_type" : "type-10762", ++ "self_type" : "type-10764", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119048,8 +119090,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-10810", +- "self_type" : "type-10812", ++ "referenced_type" : "type-10852", ++ "self_type" : "type-10854", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119057,8 +119099,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-10900", +- "self_type" : "type-10902", ++ "referenced_type" : "type-10945", ++ "self_type" : "type-10947", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119066,8 +119108,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-10993", +- "self_type" : "type-10995", ++ "referenced_type" : "type-11009", ++ "self_type" : "type-11011", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119075,8 +119117,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-11057", +- "self_type" : "type-11059", ++ "referenced_type" : "type-11165", ++ "self_type" : "type-11175", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119084,8 +119126,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-11213", +- "self_type" : "type-11223", ++ "referenced_type" : "type-11218", ++ "self_type" : "type-11220", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119093,8 +119135,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-11266", +- "self_type" : "type-11268", ++ "referenced_type" : "type-11376", ++ "self_type" : "type-11378", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119102,8 +119144,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-11424", +- "self_type" : "type-11426", ++ "referenced_type" : "type-11453", ++ "self_type" : "type-11460", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119111,8 +119153,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-11501", +- "self_type" : "type-11508", ++ "referenced_type" : "type-11502", ++ "self_type" : "type-11504", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119120,8 +119162,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-11550", +- "self_type" : "type-11552", ++ "referenced_type" : "type-11530", ++ "self_type" : "type-11532", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119129,8 +119171,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-11578", +- "self_type" : "type-11580", ++ "referenced_type" : "type-11703", ++ "self_type" : "type-11705", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119138,8 +119180,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-11751", +- "self_type" : "type-11753", ++ "referenced_type" : "type-11978", ++ "self_type" : "type-11980", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119147,8 +119189,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-12026", +- "self_type" : "type-12028", ++ "referenced_type" : "type-12116", ++ "self_type" : "type-12118", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119156,8 +119198,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-1214", +- "self_type" : "type-1213", ++ "referenced_type" : "type-12248", ++ "self_type" : "type-12250", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119165,8 +119207,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-12164", +- "self_type" : "type-12166", ++ "referenced_type" : "type-1234", ++ "self_type" : "type-1236", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119174,8 +119216,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-12296", +- "self_type" : "type-12298", ++ "referenced_type" : "type-12396", ++ "self_type" : "type-12398", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119183,8 +119225,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-12444", +- "self_type" : "type-12446", ++ "referenced_type" : "type-12480", ++ "self_type" : "type-12482", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119192,8 +119234,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-12528", +- "self_type" : "type-12530", ++ "referenced_type" : "type-12582", ++ "self_type" : "type-12584", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119201,8 +119243,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-1253", +- "self_type" : "type-1255", ++ "referenced_type" : "type-12709", ++ "self_type" : "type-12711", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119210,8 +119252,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-12630", +- "self_type" : "type-12632", ++ "referenced_type" : "type-12761", ++ "self_type" : "type-12763", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119219,8 +119261,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-12757", +- "self_type" : "type-12759", ++ "referenced_type" : "type-12844", ++ "self_type" : "type-12846", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119228,8 +119270,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-12809", +- "self_type" : "type-12811", ++ "referenced_type" : "type-12893", ++ "self_type" : "type-12892", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119237,8 +119279,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-12892", +- "self_type" : "type-12894", ++ "referenced_type" : "type-12897", ++ "self_type" : "type-12899", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119246,8 +119288,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-12941", +- "self_type" : "type-12940", ++ "referenced_type" : "type-12975", ++ "self_type" : "type-12977", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119255,8 +119297,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-12945", +- "self_type" : "type-12947", ++ "referenced_type" : "type-13043", ++ "self_type" : "type-13045", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119264,8 +119306,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-13023", +- "self_type" : "type-13025", ++ "referenced_type" : "type-13080", ++ "self_type" : "type-13094", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119273,8 +119315,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-13091", +- "self_type" : "type-13093", ++ "referenced_type" : "type-13297", ++ "self_type" : "type-13299", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119282,8 +119324,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-13128", +- "self_type" : "type-13142", ++ "referenced_type" : "type-13379", ++ "self_type" : "type-13381", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119291,8 +119333,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-1321", +- "self_type" : "type-1323", ++ "referenced_type" : "type-13472", ++ "self_type" : "type-13474", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119300,8 +119342,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-13345", +- "self_type" : "type-13347", ++ "referenced_type" : "type-13621", ++ "self_type" : "type-13623", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119309,8 +119351,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-13427", +- "self_type" : "type-13429", ++ "referenced_type" : "type-13726", ++ "self_type" : "type-13733", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119318,8 +119360,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-13520", +- "self_type" : "type-13522", ++ "referenced_type" : "type-13821", ++ "self_type" : "type-13823", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119327,8 +119369,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-13669", +- "self_type" : "type-13671", ++ "referenced_type" : "type-1386", ++ "self_type" : "type-1388", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119336,8 +119378,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-13774", +- "self_type" : "type-13781", ++ "referenced_type" : "type-13963", ++ "self_type" : "type-13966", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119345,8 +119387,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-13869", +- "self_type" : "type-13871", ++ "referenced_type" : "type-14053", ++ "self_type" : "type-14055", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119354,8 +119396,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-14011", +- "self_type" : "type-14014", ++ "referenced_type" : "type-14143", ++ "self_type" : "type-14145", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119363,8 +119405,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-14101", +- "self_type" : "type-14103", ++ "referenced_type" : "type-1420", ++ "self_type" : "type-1423", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119372,8 +119414,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-14191", +- "self_type" : "type-14193", ++ "referenced_type" : "type-14236", ++ "self_type" : "type-14238", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119381,8 +119423,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-14284", +- "self_type" : "type-14286", ++ "referenced_type" : "type-14291", ++ "self_type" : "type-14293", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119390,8 +119432,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-14339", +- "self_type" : "type-14341", ++ "referenced_type" : "type-14417", ++ "self_type" : "type-14427", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119399,8 +119441,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-14465", +- "self_type" : "type-14475", ++ "referenced_type" : "type-14469", ++ "self_type" : "type-14471", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119408,8 +119450,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-14517", +- "self_type" : "type-14519", ++ "referenced_type" : "type-1453", ++ "self_type" : "type-1455", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119417,8 +119459,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-14643", +- "self_type" : "type-14645", ++ "referenced_type" : "type-14595", ++ "self_type" : "type-14597", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119426,8 +119468,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-1470", +- "self_type" : "type-1472", ++ "referenced_type" : "type-14673", ++ "self_type" : "type-14680", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119435,8 +119477,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-14721", +- "self_type" : "type-14728", ++ "referenced_type" : "type-14737", ++ "self_type" : "type-14739", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119444,8 +119486,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-14785", +- "self_type" : "type-14787", ++ "referenced_type" : "type-1481", ++ "self_type" : "type-1483", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119453,8 +119495,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-14874", +- "self_type" : "type-14876", ++ "referenced_type" : "type-14826", ++ "self_type" : "type-14828", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119462,8 +119504,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-1506", +- "self_type" : "type-1508", ++ "referenced_type" : "type-15024", ++ "self_type" : "type-15026", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119471,8 +119513,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-15072", +- "self_type" : "type-15074", ++ "referenced_type" : "type-15093", ++ "self_type" : "type-15103", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119480,8 +119522,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-15141", +- "self_type" : "type-15151", ++ "referenced_type" : "type-15136", ++ "self_type" : "type-15138", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119489,8 +119531,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-15184", +- "self_type" : "type-15186", ++ "referenced_type" : "type-15389", ++ "self_type" : "type-15391", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119498,8 +119540,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-1534", +- "self_type" : "type-1536", ++ "referenced_type" : "type-15560", ++ "self_type" : "type-15562", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119507,8 +119549,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-15437", +- "self_type" : "type-15439", ++ "referenced_type" : "type-15834", ++ "self_type" : "type-15836", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119516,8 +119558,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-1558", +- "self_type" : "type-1560", ++ "referenced_type" : "type-15971", ++ "self_type" : "type-15973", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119525,8 +119567,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-15608", +- "self_type" : "type-15610", ++ "referenced_type" : "type-16103", ++ "self_type" : "type-16105", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119534,8 +119576,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-15882", +- "self_type" : "type-15884", ++ "referenced_type" : "type-16253", ++ "self_type" : "type-16255", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119543,8 +119585,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16019", +- "self_type" : "type-16021", ++ "referenced_type" : "type-16337", ++ "self_type" : "type-16339", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119552,8 +119594,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16151", +- "self_type" : "type-16153", ++ "referenced_type" : "type-16439", ++ "self_type" : "type-16441", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119561,8 +119603,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16301", +- "self_type" : "type-16303", ++ "referenced_type" : "type-16565", ++ "self_type" : "type-16567", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119570,8 +119612,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16385", +- "self_type" : "type-16387", ++ "referenced_type" : "type-16617", ++ "self_type" : "type-16619", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119579,8 +119621,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16487", +- "self_type" : "type-16489", ++ "referenced_type" : "type-16700", ++ "self_type" : "type-16702", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119588,8 +119630,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16613", +- "self_type" : "type-16615", ++ "referenced_type" : "type-16749", ++ "self_type" : "type-16748", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119597,8 +119639,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16665", +- "self_type" : "type-16667", ++ "referenced_type" : "type-16753", ++ "self_type" : "type-16755", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119606,8 +119648,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16748", +- "self_type" : "type-16750", ++ "referenced_type" : "type-16831", ++ "self_type" : "type-16833", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119615,8 +119657,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16797", +- "self_type" : "type-16796", ++ "referenced_type" : "type-16899", ++ "self_type" : "type-16901", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119624,8 +119666,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16801", +- "self_type" : "type-16803", ++ "referenced_type" : "type-16936", ++ "self_type" : "type-16950", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119633,8 +119675,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16879", +- "self_type" : "type-16881", ++ "referenced_type" : "type-17153", ++ "self_type" : "type-17155", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119642,8 +119684,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16947", +- "self_type" : "type-16949", ++ "referenced_type" : "type-17235", ++ "self_type" : "type-17237", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119651,8 +119693,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-16984", +- "self_type" : "type-16998", ++ "referenced_type" : "type-17328", ++ "self_type" : "type-17330", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119660,8 +119702,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-17201", +- "self_type" : "type-17203", ++ "referenced_type" : "type-17485", ++ "self_type" : "type-17487", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119669,8 +119711,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-17283", +- "self_type" : "type-17285", ++ "referenced_type" : "type-17590", ++ "self_type" : "type-17597", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119678,8 +119720,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-17376", +- "self_type" : "type-17378", ++ "referenced_type" : "type-17685", ++ "self_type" : "type-17687", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119687,8 +119729,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-17533", +- "self_type" : "type-17535", ++ "referenced_type" : "type-17827", ++ "self_type" : "type-17830", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119696,8 +119738,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-17638", +- "self_type" : "type-17645", ++ "referenced_type" : "type-17917", ++ "self_type" : "type-17919", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119705,8 +119747,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-17733", +- "self_type" : "type-17735", ++ "referenced_type" : "type-18007", ++ "self_type" : "type-18009", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119714,8 +119756,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-17875", +- "self_type" : "type-17878", ++ "referenced_type" : "type-18100", ++ "self_type" : "type-18102", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119723,8 +119765,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-17965", +- "self_type" : "type-17967", ++ "referenced_type" : "type-18155", ++ "self_type" : "type-18157", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119732,8 +119774,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18055", +- "self_type" : "type-18057", ++ "referenced_type" : "type-18281", ++ "self_type" : "type-18291", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119741,8 +119783,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18148", +- "self_type" : "type-18150", ++ "referenced_type" : "type-18333", ++ "self_type" : "type-18335", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119750,8 +119792,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18203", +- "self_type" : "type-18205", ++ "referenced_type" : "type-18459", ++ "self_type" : "type-18461", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119759,8 +119801,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18329", +- "self_type" : "type-18339", ++ "referenced_type" : "type-1851", ++ "self_type" : "type-1854", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119768,8 +119810,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18381", +- "self_type" : "type-18383", ++ "referenced_type" : "type-18537", ++ "self_type" : "type-18544", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119777,8 +119819,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18507", +- "self_type" : "type-18509", ++ "referenced_type" : "type-18601", ++ "self_type" : "type-18603", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119786,8 +119828,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18585", +- "self_type" : "type-18592", ++ "referenced_type" : "type-18683", ++ "self_type" : "type-18685", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119795,8 +119837,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18649", +- "self_type" : "type-18651", ++ "referenced_type" : "type-18808", ++ "self_type" : "type-18810", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119804,8 +119846,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18731", +- "self_type" : "type-18733", ++ "referenced_type" : "type-18877", ++ "self_type" : "type-18887", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119813,8 +119855,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18856", +- "self_type" : "type-18858", ++ "referenced_type" : "type-18920", ++ "self_type" : "type-18922", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119822,8 +119864,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18925", +- "self_type" : "type-18935", ++ "referenced_type" : "type-19155", ++ "self_type" : "type-19157", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119831,8 +119873,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-18968", +- "self_type" : "type-18970", ++ "referenced_type" : "type-19351", ++ "self_type" : "type-19353", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119840,8 +119882,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-19203", +- "self_type" : "type-19205", ++ "referenced_type" : "type-19365", ++ "self_type" : "type-19367", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119849,8 +119891,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-1929", +- "self_type" : "type-1932", ++ "referenced_type" : "type-19546", ++ "self_type" : "type-19548", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119858,8 +119900,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-19399", +- "self_type" : "type-19401", ++ "referenced_type" : "type-19716", ++ "self_type" : "type-19718", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119867,8 +119909,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-19413", +- "self_type" : "type-19415", ++ "referenced_type" : "type-19825", ++ "self_type" : "type-19828", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119876,8 +119918,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-19594", +- "self_type" : "type-19596", ++ "referenced_type" : "type-20093", ++ "self_type" : "type-20095", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119885,8 +119927,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-19764", +- "self_type" : "type-19766", ++ "referenced_type" : "type-20368", ++ "self_type" : "type-20370", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119894,8 +119936,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-19873", +- "self_type" : "type-19876", ++ "referenced_type" : "type-20503", ++ "self_type" : "type-20505", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119903,8 +119945,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-20141", +- "self_type" : "type-20143", ++ "referenced_type" : "type-20634", ++ "self_type" : "type-20636", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119912,8 +119954,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-20416", +- "self_type" : "type-20418", ++ "referenced_type" : "type-20784", ++ "self_type" : "type-20786", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119921,8 +119963,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-20551", +- "self_type" : "type-20553", ++ "referenced_type" : "type-20868", ++ "self_type" : "type-20870", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119930,8 +119972,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-20682", +- "self_type" : "type-20684", ++ "referenced_type" : "type-20970", ++ "self_type" : "type-20972", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119939,8 +119981,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-20832", +- "self_type" : "type-20834", ++ "referenced_type" : "type-21097", ++ "self_type" : "type-21099", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119948,8 +119990,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-20916", +- "self_type" : "type-20918", ++ "referenced_type" : "type-21149", ++ "self_type" : "type-21151", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119957,8 +119999,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21018", +- "self_type" : "type-21020", ++ "referenced_type" : "type-21232", ++ "self_type" : "type-21234", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119966,8 +120008,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21145", +- "self_type" : "type-21147", ++ "referenced_type" : "type-21281", ++ "self_type" : "type-21280", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119975,8 +120017,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21197", +- "self_type" : "type-21199", ++ "referenced_type" : "type-21285", ++ "self_type" : "type-21287", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119984,8 +120026,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21280", +- "self_type" : "type-21282", ++ "referenced_type" : "type-21363", ++ "self_type" : "type-21365", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -119993,8 +120035,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21329", +- "self_type" : "type-21328", ++ "referenced_type" : "type-21431", ++ "self_type" : "type-21433", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120002,8 +120044,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21333", +- "self_type" : "type-21335", ++ "referenced_type" : "type-21468", ++ "self_type" : "type-21482", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120011,8 +120053,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21411", +- "self_type" : "type-21413", ++ "referenced_type" : "type-21685", ++ "self_type" : "type-21687", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120020,8 +120062,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21479", +- "self_type" : "type-21481", ++ "referenced_type" : "type-21767", ++ "self_type" : "type-21769", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120029,8 +120071,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21516", +- "self_type" : "type-21530", ++ "referenced_type" : "type-21860", ++ "self_type" : "type-21862", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120038,8 +120080,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21733", +- "self_type" : "type-21735", ++ "referenced_type" : "type-21907", ++ "self_type" : "type-21909", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120047,8 +120089,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21815", +- "self_type" : "type-21817", ++ "referenced_type" : "type-21911", ++ "self_type" : "type-21910", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120056,8 +120098,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-21908", +- "self_type" : "type-21910", ++ "referenced_type" : "type-22058", ++ "self_type" : "type-22060", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120065,8 +120107,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-22062", +- "self_type" : "type-22064", ++ "referenced_type" : "type-22175", ++ "self_type" : "type-22180", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120074,8 +120116,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-22167", +- "self_type" : "type-22174", ++ "referenced_type" : "type-22236", ++ "self_type" : "type-22238", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120083,8 +120125,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-22262", +- "self_type" : "type-22264", ++ "referenced_type" : "type-22363", ++ "self_type" : "type-22365", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120092,8 +120134,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-22404", +- "self_type" : "type-22407", ++ "referenced_type" : "type-22420", ++ "self_type" : "type-22423", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120101,8 +120143,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-22494", +- "self_type" : "type-22496", ++ "referenced_type" : "type-22498", ++ "self_type" : "type-22500", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120110,8 +120152,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-22584", +- "self_type" : "type-22586", ++ "referenced_type" : "type-22595", ++ "self_type" : "type-22597", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120119,8 +120161,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-22677", +- "self_type" : "type-22679", ++ "referenced_type" : "type-22659", ++ "self_type" : "type-22661", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120128,8 +120170,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-22732", +- "self_type" : "type-22734", ++ "referenced_type" : "type-22664", ++ "self_type" : "type-22666", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120137,8 +120179,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-22858", +- "self_type" : "type-22868", ++ "referenced_type" : "type-22874", ++ "self_type" : "type-22877", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120146,8 +120188,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-22910", +- "self_type" : "type-22912", ++ "referenced_type" : "type-23014", ++ "self_type" : "type-23016", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120155,8 +120197,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-23036", +- "self_type" : "type-23038", ++ "referenced_type" : "type-23161", ++ "self_type" : "type-23163", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120164,8 +120206,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-23114", +- "self_type" : "type-23121", ++ "referenced_type" : "type-2317", ++ "self_type" : "type-2319", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120173,8 +120215,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-23178", +- "self_type" : "type-23180", ++ "referenced_type" : "type-23251", ++ "self_type" : "type-23253", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120182,8 +120224,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-23260", +- "self_type" : "type-23262", ++ "referenced_type" : "type-23371", ++ "self_type" : "type-23373", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120191,8 +120233,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-23385", +- "self_type" : "type-23387", ++ "referenced_type" : "type-23473", ++ "self_type" : "type-23475", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120200,8 +120242,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-23454", +- "self_type" : "type-23464", ++ "referenced_type" : "type-23680", ++ "self_type" : "type-23685", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120209,8 +120251,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-23497", +- "self_type" : "type-23499", ++ "referenced_type" : "type-23714", ++ "self_type" : "type-23716", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120218,8 +120260,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-23724", +- "self_type" : "type-23726", ++ "referenced_type" : "type-23902", ++ "self_type" : "type-23904", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120227,8 +120269,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-2388", +- "self_type" : "type-2390", ++ "referenced_type" : "type-23931", ++ "self_type" : "type-23950", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120236,8 +120278,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-23899", +- "self_type" : "type-23901", ++ "referenced_type" : "type-24061", ++ "self_type" : "type-24063", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120245,8 +120287,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-23913", +- "self_type" : "type-23915", ++ "referenced_type" : "type-24235", ++ "self_type" : "type-24237", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120254,8 +120296,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-24064", +- "self_type" : "type-24066", ++ "referenced_type" : "type-24278", ++ "self_type" : "type-24296", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120263,8 +120305,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-24231", +- "self_type" : "type-24233", ++ "referenced_type" : "type-24326", ++ "self_type" : "type-24328", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120272,8 +120314,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-24340", +- "self_type" : "type-24343", ++ "referenced_type" : "type-24515", ++ "self_type" : "type-24517", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120281,8 +120323,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-24540", +- "self_type" : "type-24542", ++ "referenced_type" : "type-24635", ++ "self_type" : "type-24637", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120290,8 +120332,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-24671", +- "self_type" : "type-24673", ++ "referenced_type" : "type-24713", ++ "self_type" : "type-24717", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120299,8 +120341,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-24769", +- "self_type" : "type-24771", ++ "referenced_type" : "type-24726", ++ "self_type" : "type-24729", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120308,8 +120350,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-24973", +- "self_type" : "type-24975", ++ "referenced_type" : "type-2485", ++ "self_type" : "type-2487", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120317,8 +120359,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-25052", +- "self_type" : "type-25054", ++ "referenced_type" : "type-24941", ++ "self_type" : "type-24943", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120326,8 +120368,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-25184", +- "self_type" : "type-25186", ++ "referenced_type" : "type-25023", ++ "self_type" : "type-25025", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120335,8 +120377,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-25319", +- "self_type" : "type-25321", ++ "referenced_type" : "type-25174", ++ "self_type" : "type-25176", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120344,8 +120386,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-2553", +- "self_type" : "type-2555", ++ "referenced_type" : "type-25378", ++ "self_type" : "type-25380", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120353,8 +120395,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-25592", +- "self_type" : "type-25594", ++ "referenced_type" : "type-25644", ++ "self_type" : "type-25646", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120362,8 +120404,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-25730", +- "self_type" : "type-25732", ++ "referenced_type" : "type-25779", ++ "self_type" : "type-25781", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120371,8 +120413,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-25861", +- "self_type" : "type-25863", ++ "referenced_type" : "type-25912", ++ "self_type" : "type-25914", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120380,8 +120422,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-26010", +- "self_type" : "type-26012", ++ "referenced_type" : "type-2604", ++ "self_type" : "type-2603", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120389,8 +120431,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-26094", +- "self_type" : "type-26096", ++ "referenced_type" : "type-26063", ++ "self_type" : "type-26065", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120398,8 +120440,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-26196", +- "self_type" : "type-26198", ++ "referenced_type" : "type-26141", ++ "self_type" : "type-26143", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120407,8 +120449,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-26323", +- "self_type" : "type-26325", ++ "referenced_type" : "type-26240", ++ "self_type" : "type-26242", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120416,8 +120458,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-26375", +- "self_type" : "type-26377", ++ "referenced_type" : "type-26363", ++ "self_type" : "type-26365", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120425,8 +120467,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-26458", +- "self_type" : "type-26460", ++ "referenced_type" : "type-2639", ++ "self_type" : "type-2641", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120434,8 +120476,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-26507", +- "self_type" : "type-26506", ++ "referenced_type" : "type-26417", ++ "self_type" : "type-26419", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120443,8 +120485,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-26511", +- "self_type" : "type-26513", ++ "referenced_type" : "type-26496", ++ "self_type" : "type-26498", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120452,8 +120494,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-26589", +- "self_type" : "type-26591", ++ "referenced_type" : "type-26541", ++ "self_type" : "type-26543", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120461,8 +120503,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-26657", +- "self_type" : "type-26659", ++ "referenced_type" : "type-26617", ++ "self_type" : "type-26619", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120470,8 +120512,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-26694", +- "self_type" : "type-26708", ++ "referenced_type" : "type-26678", ++ "self_type" : "type-26680", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120479,8 +120521,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-26911", +- "self_type" : "type-26913", ++ "referenced_type" : "type-26931", ++ "self_type" : "type-26933", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120488,8 +120530,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-26993", +- "self_type" : "type-26995", ++ "referenced_type" : "type-2696", ++ "self_type" : "type-2698", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120497,8 +120539,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-27086", +- "self_type" : "type-27088", ++ "referenced_type" : "type-27019", ++ "self_type" : "type-27021", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120506,8 +120548,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-27247", +- "self_type" : "type-27249", ++ "referenced_type" : "type-27246", ++ "self_type" : "type-27248", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120515,8 +120557,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-27352", +- "self_type" : "type-27359", ++ "referenced_type" : "type-27351", ++ "self_type" : "type-27358", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120524,8 +120566,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-2744", +- "self_type" : "type-2746", ++ "referenced_type" : "type-27446", ++ "self_type" : "type-27448", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120533,8 +120575,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-27447", +- "self_type" : "type-27449", ++ "referenced_type" : "type-27588", ++ "self_type" : "type-27591", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120542,8 +120584,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-27589", +- "self_type" : "type-27592", ++ "referenced_type" : "type-27678", ++ "self_type" : "type-27680", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120551,8 +120593,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-27679", +- "self_type" : "type-27681", ++ "referenced_type" : "type-27768", ++ "self_type" : "type-27770", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120560,8 +120602,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-27769", +- "self_type" : "type-27771", ++ "referenced_type" : "type-27861", ++ "self_type" : "type-27863", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120569,8 +120611,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-27862", +- "self_type" : "type-27864", ++ "referenced_type" : "type-27916", ++ "self_type" : "type-27918", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120578,8 +120620,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-27917", +- "self_type" : "type-27919", ++ "referenced_type" : "type-28042", ++ "self_type" : "type-28052", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120587,8 +120629,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-28043", +- "self_type" : "type-28053", ++ "referenced_type" : "type-28094", ++ "self_type" : "type-28096", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120596,8 +120638,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-28095", +- "self_type" : "type-28097", ++ "referenced_type" : "type-28220", ++ "self_type" : "type-28222", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120605,8 +120647,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-28221", +- "self_type" : "type-28223", ++ "referenced_type" : "type-28298", ++ "self_type" : "type-28305", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120614,8 +120656,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-28299", +- "self_type" : "type-28306", ++ "referenced_type" : "type-28362", ++ "self_type" : "type-28364", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120623,8 +120665,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-28363", +- "self_type" : "type-28365", ++ "referenced_type" : "type-28444", ++ "self_type" : "type-28446", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120632,8 +120674,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-28445", +- "self_type" : "type-28447", ++ "referenced_type" : "type-2848", ++ "self_type" : "type-2850", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120641,8 +120683,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-28570", +- "self_type" : "type-28572", ++ "referenced_type" : "type-28569", ++ "self_type" : "type-28571", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120650,8 +120692,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-28639", +- "self_type" : "type-28649", ++ "referenced_type" : "type-28638", ++ "self_type" : "type-28648", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120659,8 +120701,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-28682", +- "self_type" : "type-28684", ++ "referenced_type" : "type-28681", ++ "self_type" : "type-28683", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120668,8 +120710,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-28909", +- "self_type" : "type-28911", ++ "referenced_type" : "type-2882", ++ "self_type" : "type-2885", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120677,8 +120719,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-2896", +- "self_type" : "type-2898", ++ "referenced_type" : "type-28908", ++ "self_type" : "type-28910", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120686,8 +120728,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-29084", +- "self_type" : "type-29086", ++ "referenced_type" : "type-29083", ++ "self_type" : "type-29085", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120695,8 +120737,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-29098", +- "self_type" : "type-29100", ++ "referenced_type" : "type-29097", ++ "self_type" : "type-29099", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120704,8 +120746,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-29249", +- "self_type" : "type-29251", ++ "referenced_type" : "type-2915", ++ "self_type" : "type-2917", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120713,8 +120755,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-2930", +- "self_type" : "type-2933", ++ "referenced_type" : "type-29248", ++ "self_type" : "type-29250", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120722,8 +120764,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-29416", +- "self_type" : "type-29418", ++ "referenced_type" : "type-29415", ++ "self_type" : "type-29417", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120731,8 +120773,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-295", +- "self_type" : "type-294", ++ "referenced_type" : "type-2943", ++ "self_type" : "type-2945", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120740,8 +120782,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-29525", +- "self_type" : "type-29528", ++ "referenced_type" : "type-295", ++ "self_type" : "type-294", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120749,8 +120791,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-2963", +- "self_type" : "type-2965", ++ "referenced_type" : "type-29524", ++ "self_type" : "type-29527", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120758,8 +120800,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-29725", +- "self_type" : "type-29727", ++ "referenced_type" : "type-29724", ++ "self_type" : "type-29726", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120767,8 +120809,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-29852", +- "self_type" : "type-29854", ++ "referenced_type" : "type-29851", ++ "self_type" : "type-29853", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120776,8 +120818,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-2991", +- "self_type" : "type-2993", ++ "referenced_type" : "type-29947", ++ "self_type" : "type-29949", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120785,8 +120827,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-29948", +- "self_type" : "type-29950", ++ "referenced_type" : "type-30128", ++ "self_type" : "type-30130", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120794,8 +120836,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-30129", +- "self_type" : "type-30131", ++ "referenced_type" : "type-30196", ++ "self_type" : "type-30198", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120803,8 +120845,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-30197", +- "self_type" : "type-30199", ++ "referenced_type" : "type-30327", ++ "self_type" : "type-30329", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120812,8 +120854,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-30328", +- "self_type" : "type-30330", ++ "referenced_type" : "type-30462", ++ "self_type" : "type-30464", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120821,8 +120863,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-30463", +- "self_type" : "type-30465", ++ "referenced_type" : "type-30737", ++ "self_type" : "type-30739", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120830,8 +120872,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-30738", +- "self_type" : "type-30740", ++ "referenced_type" : "type-30875", ++ "self_type" : "type-30877", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120839,8 +120881,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-30876", +- "self_type" : "type-30878", ++ "referenced_type" : "type-31006", ++ "self_type" : "type-31008", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120848,8 +120890,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-31007", +- "self_type" : "type-31009", ++ "referenced_type" : "type-31156", ++ "self_type" : "type-31158", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120857,8 +120899,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-31157", +- "self_type" : "type-31159", ++ "referenced_type" : "type-3119", ++ "self_type" : "type-3121", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120866,8 +120908,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-31241", +- "self_type" : "type-31243", ++ "referenced_type" : "type-31240", ++ "self_type" : "type-31242", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120875,8 +120917,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-31343", +- "self_type" : "type-31345", ++ "referenced_type" : "type-31342", ++ "self_type" : "type-31344", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120884,8 +120926,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-31470", +- "self_type" : "type-31472", ++ "referenced_type" : "type-31469", ++ "self_type" : "type-31471", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120893,8 +120935,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-31522", +- "self_type" : "type-31524", ++ "referenced_type" : "type-31521", ++ "self_type" : "type-31523", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120902,8 +120944,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-31605", +- "self_type" : "type-31607", ++ "referenced_type" : "type-31604", ++ "self_type" : "type-31606", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120911,8 +120953,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-31654", +- "self_type" : "type-31653", ++ "referenced_type" : "type-31653", ++ "self_type" : "type-31652", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120920,8 +120962,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-31658", +- "self_type" : "type-31660", ++ "referenced_type" : "type-31657", ++ "self_type" : "type-31659", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120929,8 +120971,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-3167", +- "self_type" : "type-3169", ++ "referenced_type" : "type-31735", ++ "self_type" : "type-31737", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120938,8 +120980,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-31736", +- "self_type" : "type-31738", ++ "referenced_type" : "type-31803", ++ "self_type" : "type-31805", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120947,8 +120989,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-31804", +- "self_type" : "type-31806", ++ "referenced_type" : "type-31840", ++ "self_type" : "type-31854", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120956,8 +120998,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-31841", +- "self_type" : "type-31855", ++ "referenced_type" : "type-32057", ++ "self_type" : "type-32059", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120965,8 +121007,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-32058", +- "self_type" : "type-32060", ++ "referenced_type" : "type-32139", ++ "self_type" : "type-32141", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120974,8 +121016,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-32140", +- "self_type" : "type-32142", ++ "referenced_type" : "type-32232", ++ "self_type" : "type-32234", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120983,8 +121025,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-32233", +- "self_type" : "type-32235", ++ "referenced_type" : "type-3401", ++ "self_type" : "type-3403", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -120992,8 +121034,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-3449", +- "self_type" : "type-3451", ++ "referenced_type" : "type-3545", ++ "self_type" : "type-3547", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121001,8 +121043,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-3593", +- "self_type" : "type-3595", ++ "referenced_type" : "type-3726", ++ "self_type" : "type-3728", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121010,8 +121052,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-3774", +- "self_type" : "type-3776", ++ "referenced_type" : "type-3899", ++ "self_type" : "type-3901", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121019,8 +121061,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-3947", +- "self_type" : "type-3949", ++ "referenced_type" : "type-4032", ++ "self_type" : "type-4034", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121028,8 +121070,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-4080", +- "self_type" : "type-4082", ++ "referenced_type" : "type-4137", ++ "self_type" : "type-4139", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121037,8 +121079,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-4185", +- "self_type" : "type-4187", ++ "referenced_type" : "type-4294", ++ "self_type" : "type-4296", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121046,8 +121088,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-4342", +- "self_type" : "type-4344", ++ "referenced_type" : "type-4348", ++ "self_type" : "type-4350", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121055,8 +121097,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-4396", +- "self_type" : "type-4398", ++ "referenced_type" : "type-4432", ++ "self_type" : "type-4434", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121064,8 +121106,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-4480", +- "self_type" : "type-4482", ++ "referenced_type" : "type-4471", ++ "self_type" : "type-4470", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121073,8 +121115,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-4519", +- "self_type" : "type-4518", ++ "referenced_type" : "type-4507", ++ "self_type" : "type-4509", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121082,8 +121124,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-4555", +- "self_type" : "type-4557", ++ "referenced_type" : "type-4676", ++ "self_type" : "type-4678", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121091,8 +121133,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-4724", +- "self_type" : "type-4726", ++ "referenced_type" : "type-4828", ++ "self_type" : "type-4830", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121109,8 +121151,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-4876", +- "self_type" : "type-4878", ++ "referenced_type" : "type-4862", ++ "self_type" : "type-4865", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121118,8 +121160,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-4910", +- "self_type" : "type-4913", ++ "referenced_type" : "type-4895", ++ "self_type" : "type-4897", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121127,17 +121169,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-4943", +- "self_type" : "type-4945", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/arena.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "const std::type_info *", +- "name" : "const std::type_info *", +- "referenced_type" : "type-4971", +- "self_type" : "type-4973", ++ "referenced_type" : "type-4923", ++ "self_type" : "type-4925", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121145,8 +121178,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-5147", +- "self_type" : "type-5149", ++ "referenced_type" : "type-5099", ++ "self_type" : "type-5101", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121154,8 +121187,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-5429", +- "self_type" : "type-5431", ++ "referenced_type" : "type-5381", ++ "self_type" : "type-5383", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121163,8 +121196,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-5571", +- "self_type" : "type-5573", ++ "referenced_type" : "type-5523", ++ "self_type" : "type-5525", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121172,8 +121205,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-5705", +- "self_type" : "type-5707", ++ "referenced_type" : "type-5657", ++ "self_type" : "type-5659", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121181,8 +121214,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-5855", +- "self_type" : "type-5857", ++ "referenced_type" : "type-5807", ++ "self_type" : "type-5809", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121190,8 +121223,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-5939", +- "self_type" : "type-5941", ++ "referenced_type" : "type-5891", ++ "self_type" : "type-5893", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121199,8 +121232,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-6041", +- "self_type" : "type-6043", ++ "referenced_type" : "type-5993", ++ "self_type" : "type-5995", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121208,8 +121241,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-6168", +- "self_type" : "type-6170", ++ "referenced_type" : "type-6120", ++ "self_type" : "type-6122", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121217,8 +121250,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-6220", +- "self_type" : "type-6222", ++ "referenced_type" : "type-6172", ++ "self_type" : "type-6174", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121226,8 +121259,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-6303", +- "self_type" : "type-6305", ++ "referenced_type" : "type-6255", ++ "self_type" : "type-6257", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121235,8 +121268,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-6355", +- "self_type" : "type-6354", ++ "referenced_type" : "type-6307", ++ "self_type" : "type-6306", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121244,8 +121277,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-6359", +- "self_type" : "type-6361", ++ "referenced_type" : "type-6311", ++ "self_type" : "type-6313", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121253,8 +121286,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-6439", +- "self_type" : "type-6441", ++ "referenced_type" : "type-6391", ++ "self_type" : "type-6393", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121262,8 +121295,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-6555", +- "self_type" : "type-6557", ++ "referenced_type" : "type-6507", ++ "self_type" : "type-6509", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121271,8 +121304,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-6619", +- "self_type" : "type-6639", ++ "referenced_type" : "type-6571", ++ "self_type" : "type-6591", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121280,8 +121313,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-6922", +- "self_type" : "type-6924", ++ "referenced_type" : "type-6874", ++ "self_type" : "type-6876", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121289,8 +121322,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-7021", +- "self_type" : "type-7023", ++ "referenced_type" : "type-6973", ++ "self_type" : "type-6975", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121298,8 +121331,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-7120", +- "self_type" : "type-7122", ++ "referenced_type" : "type-7072", ++ "self_type" : "type-7074", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121307,8 +121340,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-7397", +- "self_type" : "type-7399", ++ "referenced_type" : "type-7349", ++ "self_type" : "type-7351", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121325,8 +121358,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-7553", +- "self_type" : "type-7560", ++ "referenced_type" : "type-7505", ++ "self_type" : "type-7512", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121334,8 +121367,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-7660", +- "self_type" : "type-7662", ++ "referenced_type" : "type-7612", ++ "self_type" : "type-7614", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121343,8 +121376,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-7807", +- "self_type" : "type-7810", ++ "referenced_type" : "type-7759", ++ "self_type" : "type-7762", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121352,8 +121385,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-7912", +- "self_type" : "type-7914", ++ "referenced_type" : "type-7864", ++ "self_type" : "type-7866", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121370,8 +121403,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-8001", +- "self_type" : "type-8003", ++ "referenced_type" : "type-7953", ++ "self_type" : "type-7955", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121379,8 +121412,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-8094", +- "self_type" : "type-8096", ++ "referenced_type" : "type-8046", ++ "self_type" : "type-8048", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121388,8 +121421,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-8152", +- "self_type" : "type-8154", ++ "referenced_type" : "type-8104", ++ "self_type" : "type-8106", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121397,8 +121430,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-8186", +- "self_type" : "type-8189", ++ "referenced_type" : "type-8138", ++ "self_type" : "type-8141", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121406,8 +121439,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-8219", +- "self_type" : "type-8221", ++ "referenced_type" : "type-8171", ++ "self_type" : "type-8173", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121415,8 +121448,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-8247", +- "self_type" : "type-8249", ++ "referenced_type" : "type-8199", ++ "self_type" : "type-8201", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121433,8 +121466,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-8422", +- "self_type" : "type-8424", ++ "referenced_type" : "type-8374", ++ "self_type" : "type-8376", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121451,8 +121484,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-8694", +- "self_type" : "type-8696", ++ "referenced_type" : "type-8646", ++ "self_type" : "type-8648", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121460,8 +121493,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-8830", +- "self_type" : "type-8832", ++ "referenced_type" : "type-8782", ++ "self_type" : "type-8784", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121469,8 +121502,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-8962", +- "self_type" : "type-8964", ++ "referenced_type" : "type-8914", ++ "self_type" : "type-8916", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121478,8 +121511,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-9112", +- "self_type" : "type-9114", ++ "referenced_type" : "type-9064", ++ "self_type" : "type-9066", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121487,8 +121520,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-9196", +- "self_type" : "type-9198", ++ "referenced_type" : "type-9148", ++ "self_type" : "type-9150", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121496,8 +121529,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-9298", +- "self_type" : "type-9300", ++ "referenced_type" : "type-9250", ++ "self_type" : "type-9252", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121505,8 +121538,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-9425", +- "self_type" : "type-9427", ++ "referenced_type" : "type-9377", ++ "self_type" : "type-9379", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121514,8 +121547,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-9477", +- "self_type" : "type-9479", ++ "referenced_type" : "type-9429", ++ "self_type" : "type-9431", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121523,8 +121556,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-9560", +- "self_type" : "type-9562", ++ "referenced_type" : "type-9512", ++ "self_type" : "type-9514", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121532,8 +121565,17 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-9609", +- "self_type" : "type-9608", ++ "referenced_type" : "type-9561", ++ "self_type" : "type-9560", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/arena.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "const std::type_info *", ++ "name" : "const std::type_info *", ++ "referenced_type" : "type-9565", ++ "self_type" : "type-9567", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121541,8 +121583,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-9613", +- "self_type" : "type-9615", ++ "referenced_type" : "type-9643", ++ "self_type" : "type-9645", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121550,8 +121592,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-9691", +- "self_type" : "type-9693", ++ "referenced_type" : "type-9711", ++ "self_type" : "type-9713", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121559,8 +121601,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-9759", +- "self_type" : "type-9761", ++ "referenced_type" : "type-9748", ++ "self_type" : "type-9762", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121568,8 +121610,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::type_info *", + "name" : "const std::type_info *", +- "referenced_type" : "type-9796", +- "self_type" : "type-9810", ++ "referenced_type" : "type-9964", ++ "self_type" : "type-9966", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121577,8 +121619,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *", + "name" : "const std::vector > *", +- "referenced_type" : "type-10701", +- "self_type" : "type-10700", ++ "referenced_type" : "type-10653", ++ "self_type" : "type-10652", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -121586,8 +121628,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *", + "name" : "const std::vector > *", +- "referenced_type" : "type-13992", +- "self_type" : "type-13991", ++ "referenced_type" : "type-13944", ++ "self_type" : "type-13943", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -121595,8 +121637,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *", + "name" : "const std::vector > *", +- "referenced_type" : "type-17856", +- "self_type" : "type-17855", ++ "referenced_type" : "type-17808", ++ "self_type" : "type-17807", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -121604,8 +121646,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *", + "name" : "const std::vector > *", +- "referenced_type" : "type-22385", +- "self_type" : "type-22384", ++ "referenced_type" : "type-22347", ++ "self_type" : "type-22346", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -121613,8 +121655,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *", + "name" : "const std::vector > *", +- "referenced_type" : "type-27570", +- "self_type" : "type-27569", ++ "referenced_type" : "type-27569", ++ "self_type" : "type-27568", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -121622,8 +121664,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *", + "name" : "const std::vector > *", +- "referenced_type" : "type-7787", +- "self_type" : "type-7786", ++ "referenced_type" : "type-7739", ++ "self_type" : "type-7738", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -121631,8 +121673,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *", + "name" : "const std::vector > *", +- "referenced_type" : "type-10695", +- "self_type" : "type-10694", ++ "referenced_type" : "type-10647", ++ "self_type" : "type-10646", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -121640,8 +121682,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *", + "name" : "const std::vector > *", +- "referenced_type" : "type-13986", +- "self_type" : "type-13985", ++ "referenced_type" : "type-13938", ++ "self_type" : "type-13937", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -121649,8 +121691,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *", + "name" : "const std::vector > *", +- "referenced_type" : "type-17850", +- "self_type" : "type-17849", ++ "referenced_type" : "type-17802", ++ "self_type" : "type-17801", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -121658,8 +121700,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *", + "name" : "const std::vector > *", +- "referenced_type" : "type-22379", +- "self_type" : "type-22378", ++ "referenced_type" : "type-22341", ++ "self_type" : "type-22340", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -121667,8 +121709,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *", + "name" : "const std::vector > *", +- "referenced_type" : "type-27564", +- "self_type" : "type-27563", ++ "referenced_type" : "type-27563", ++ "self_type" : "type-27562", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -121676,8 +121718,8 @@ + "alignment" : 4, + "linker_set_key" : "const std::vector > *", + "name" : "const std::vector > *", +- "referenced_type" : "type-7781", +- "self_type" : "type-7780", ++ "referenced_type" : "type-7733", ++ "self_type" : "type-7732", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -121757,8 +121799,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Any *", + "name" : "google::protobuf::Any *", +- "referenced_type" : "type-1846", +- "self_type" : "type-1845", ++ "referenced_type" : "type-1759", ++ "self_type" : "type-1758", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -121766,8 +121808,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Api *", + "name" : "google::protobuf::Api *", +- "referenced_type" : "type-2342", +- "self_type" : "type-2341", ++ "referenced_type" : "type-2269", ++ "self_type" : "type-2268", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -121820,8 +121862,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::BoolValue *", + "name" : "google::protobuf::BoolValue *", +- "referenced_type" : "type-11054", +- "self_type" : "type-11066", ++ "referenced_type" : "type-11006", ++ "self_type" : "type-11018", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121829,8 +121871,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::BytesValue *", + "name" : "google::protobuf::BytesValue *", +- "referenced_type" : "type-11056", +- "self_type" : "type-11068", ++ "referenced_type" : "type-11008", ++ "self_type" : "type-11020", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -121847,8 +121889,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DebugStringOptions *", + "name" : "google::protobuf::DebugStringOptions *", +- "referenced_type" : "type-1956", +- "self_type" : "type-1957", ++ "referenced_type" : "type-1881", ++ "self_type" : "type-1882", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -121856,8 +121898,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Descriptor *", + "name" : "google::protobuf::Descriptor *", +- "referenced_type" : "type-1958", +- "self_type" : "type-1971", ++ "referenced_type" : "type-1883", ++ "self_type" : "type-1897", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -121865,8 +121907,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Descriptor::ExtensionRange *", + "name" : "google::protobuf::Descriptor::ExtensionRange *", +- "referenced_type" : "type-2021", +- "self_type" : "type-2020", ++ "referenced_type" : "type-1947", ++ "self_type" : "type-1946", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -121874,8 +121916,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Descriptor::ReservedRange *", + "name" : "google::protobuf::Descriptor::ReservedRange *", +- "referenced_type" : "type-2023", +- "self_type" : "type-2022", ++ "referenced_type" : "type-1949", ++ "self_type" : "type-1948", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -121883,8 +121925,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-10027", +- "self_type" : "type-10026", ++ "referenced_type" : "type-10057", ++ "self_type" : "type-10056", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -121892,8 +121934,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-10105", +- "self_type" : "type-10104", ++ "referenced_type" : "type-10198", ++ "self_type" : "type-10197", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -121901,8 +121943,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-10246", +- "self_type" : "type-10245", ++ "referenced_type" : "type-10441", ++ "self_type" : "type-10440", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -121910,8 +121952,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-10489", +- "self_type" : "type-10488", ++ "referenced_type" : "type-10522", ++ "self_type" : "type-10521", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -121919,8 +121961,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-10570", +- "self_type" : "type-10569", ++ "referenced_type" : "type-10688", ++ "self_type" : "type-10687", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -121928,8 +121970,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-10736", +- "self_type" : "type-10735", ++ "referenced_type" : "type-10780", ++ "self_type" : "type-10779", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -121937,8 +121979,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-10828", +- "self_type" : "type-10827", ++ "referenced_type" : "type-10871", ++ "self_type" : "type-10870", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -121946,8 +121988,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-10919", +- "self_type" : "type-10918", ++ "referenced_type" : "type-10958", ++ "self_type" : "type-10957", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -121955,8 +121997,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-11006", +- "self_type" : "type-11005", ++ "referenced_type" : "type-11032", ++ "self_type" : "type-11031", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -121964,8 +122006,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-11080", +- "self_type" : "type-11079", ++ "referenced_type" : "type-11375", ++ "self_type" : "type-11374", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -121973,8 +122015,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-11423", +- "self_type" : "type-11422", ++ "referenced_type" : "type-11727", ++ "self_type" : "type-11726", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -121982,8 +122024,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-11775", +- "self_type" : "type-11774", ++ "referenced_type" : "type-11992", ++ "self_type" : "type-11991", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -121991,8 +122033,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-12040", +- "self_type" : "type-12039", ++ "referenced_type" : "type-12113", ++ "self_type" : "type-12112", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122000,8 +122042,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-12161", +- "self_type" : "type-12160", ++ "referenced_type" : "type-12495", ++ "self_type" : "type-12494", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122009,8 +122051,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-12543", +- "self_type" : "type-12542", ++ "referenced_type" : "type-12598", ++ "self_type" : "type-12597", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122018,8 +122060,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-12646", +- "self_type" : "type-12645", ++ "referenced_type" : "type-12721", ++ "self_type" : "type-12720", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122027,8 +122069,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-12769", +- "self_type" : "type-12768", ++ "referenced_type" : "type-12775", ++ "self_type" : "type-12774", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122036,8 +122078,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-12823", +- "self_type" : "type-12822", ++ "referenced_type" : "type-12841", ++ "self_type" : "type-12840", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122045,8 +122087,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-12889", +- "self_type" : "type-12888", ++ "referenced_type" : "type-12915", ++ "self_type" : "type-12914", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122054,8 +122096,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-12963", +- "self_type" : "type-12962", ++ "referenced_type" : "type-12990", ++ "self_type" : "type-12989", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122063,8 +122105,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-13038", +- "self_type" : "type-13037", ++ "referenced_type" : "type-13182", ++ "self_type" : "type-13181", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122072,8 +122114,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-13230", +- "self_type" : "type-13229", ++ "referenced_type" : "type-13312", ++ "self_type" : "type-13311", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122081,8 +122123,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-13360", +- "self_type" : "type-13359", ++ "referenced_type" : "type-13390", ++ "self_type" : "type-13389", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122090,8 +122132,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-13438", +- "self_type" : "type-13437", ++ "referenced_type" : "type-13489", ++ "self_type" : "type-13488", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122099,8 +122141,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-13537", +- "self_type" : "type-13536", ++ "referenced_type" : "type-13732", ++ "self_type" : "type-13731", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122108,8 +122150,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-13780", +- "self_type" : "type-13779", ++ "referenced_type" : "type-13813", ++ "self_type" : "type-13812", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122117,8 +122159,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-13861", +- "self_type" : "type-13860", ++ "referenced_type" : "type-13979", ++ "self_type" : "type-13978", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122126,8 +122168,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-14027", +- "self_type" : "type-14026", ++ "referenced_type" : "type-14071", ++ "self_type" : "type-14070", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122135,8 +122177,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-14119", +- "self_type" : "type-14118", ++ "referenced_type" : "type-14162", ++ "self_type" : "type-14161", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122144,8 +122186,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-14210", +- "self_type" : "type-14209", ++ "referenced_type" : "type-14249", ++ "self_type" : "type-14248", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122153,8 +122195,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-14297", +- "self_type" : "type-14296", ++ "referenced_type" : "type-14314", ++ "self_type" : "type-14313", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122162,8 +122204,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-14362", +- "self_type" : "type-14361", ++ "referenced_type" : "type-14594", ++ "self_type" : "type-14593", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122171,8 +122213,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-14642", +- "self_type" : "type-14641", ++ "referenced_type" : "type-14733", ++ "self_type" : "type-14732", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122180,8 +122222,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-14781", +- "self_type" : "type-14780", ++ "referenced_type" : "type-14825", ++ "self_type" : "type-14824", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122189,8 +122231,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-14873", +- "self_type" : "type-14872", ++ "referenced_type" : "type-15089", ++ "self_type" : "type-15088", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122198,8 +122240,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-15137", +- "self_type" : "type-15136", ++ "referenced_type" : "type-15195", ++ "self_type" : "type-15194", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122207,8 +122249,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-15243", +- "self_type" : "type-15242", ++ "referenced_type" : "type-15584", ++ "self_type" : "type-15583", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122216,8 +122258,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-15632", +- "self_type" : "type-15631", ++ "referenced_type" : "type-15848", ++ "self_type" : "type-15847", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122225,8 +122267,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-15896", +- "self_type" : "type-15895", ++ "referenced_type" : "type-15968", ++ "self_type" : "type-15967", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122234,8 +122276,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-16016", +- "self_type" : "type-16015", ++ "referenced_type" : "type-16352", ++ "self_type" : "type-16351", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122243,8 +122285,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-16400", +- "self_type" : "type-16399", ++ "referenced_type" : "type-16454", ++ "self_type" : "type-16453", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122252,8 +122294,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-16502", +- "self_type" : "type-16501", ++ "referenced_type" : "type-16577", ++ "self_type" : "type-16576", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122261,8 +122303,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-16625", +- "self_type" : "type-16624", ++ "referenced_type" : "type-16631", ++ "self_type" : "type-16630", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122270,8 +122312,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-16679", +- "self_type" : "type-16678", ++ "referenced_type" : "type-16697", ++ "self_type" : "type-16696", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122279,8 +122321,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-16745", +- "self_type" : "type-16744", ++ "referenced_type" : "type-16771", ++ "self_type" : "type-16770", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122288,8 +122330,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-16819", +- "self_type" : "type-16818", ++ "referenced_type" : "type-16846", ++ "self_type" : "type-16845", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122297,8 +122339,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-16894", +- "self_type" : "type-16893", ++ "referenced_type" : "type-17038", ++ "self_type" : "type-17037", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122306,8 +122348,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-17086", +- "self_type" : "type-17085", ++ "referenced_type" : "type-17168", ++ "self_type" : "type-17167", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122315,8 +122357,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-17216", +- "self_type" : "type-17215", ++ "referenced_type" : "type-17246", ++ "self_type" : "type-17245", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122324,8 +122366,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-17294", +- "self_type" : "type-17293", ++ "referenced_type" : "type-17353", ++ "self_type" : "type-17352", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122333,8 +122375,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-17401", +- "self_type" : "type-17400", ++ "referenced_type" : "type-17596", ++ "self_type" : "type-17595", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122342,8 +122384,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-17644", +- "self_type" : "type-17643", ++ "referenced_type" : "type-17677", ++ "self_type" : "type-17676", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122351,8 +122393,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-17725", +- "self_type" : "type-17724", ++ "referenced_type" : "type-17843", ++ "self_type" : "type-17842", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122360,8 +122402,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-17891", +- "self_type" : "type-17890", ++ "referenced_type" : "type-17935", ++ "self_type" : "type-17934", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122369,8 +122411,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-17983", +- "self_type" : "type-17982", ++ "referenced_type" : "type-18026", ++ "self_type" : "type-18025", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122378,8 +122420,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-18074", +- "self_type" : "type-18073", ++ "referenced_type" : "type-18113", ++ "self_type" : "type-18112", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122387,8 +122429,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-18161", +- "self_type" : "type-18160", ++ "referenced_type" : "type-18178", ++ "self_type" : "type-18177", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122396,8 +122438,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-18226", +- "self_type" : "type-18225", ++ "referenced_type" : "type-18458", ++ "self_type" : "type-18457", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122405,8 +122447,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-18506", +- "self_type" : "type-18505", ++ "referenced_type" : "type-18597", ++ "self_type" : "type-18596", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122414,8 +122456,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-18645", +- "self_type" : "type-18644", ++ "referenced_type" : "type-18682", ++ "self_type" : "type-18681", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122423,8 +122465,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-18730", +- "self_type" : "type-18729", ++ "referenced_type" : "type-18873", ++ "self_type" : "type-18872", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122432,8 +122474,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-18921", +- "self_type" : "type-18920", ++ "referenced_type" : "type-1891", ++ "self_type" : "type-1890", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122441,8 +122483,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-19019", +- "self_type" : "type-19018", ++ "referenced_type" : "type-18971", ++ "self_type" : "type-18970", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122450,8 +122492,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-19262", +- "self_type" : "type-19261", ++ "referenced_type" : "type-19214", ++ "self_type" : "type-19213", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122459,8 +122501,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-19412", +- "self_type" : "type-19411", ++ "referenced_type" : "type-19364", ++ "self_type" : "type-19363", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122468,8 +122510,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-19590", +- "self_type" : "type-19589", ++ "referenced_type" : "type-19542", ++ "self_type" : "type-19541", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122477,8 +122519,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-1966", +- "self_type" : "type-1965", ++ "referenced_type" : "type-19712", ++ "self_type" : "type-19711", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122486,8 +122528,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-19760", +- "self_type" : "type-19759", ++ "referenced_type" : "type-19882", ++ "self_type" : "type-19881", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122495,8 +122537,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-19930", +- "self_type" : "type-19929", ++ "referenced_type" : "type-20117", ++ "self_type" : "type-20116", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122504,8 +122546,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-20165", +- "self_type" : "type-20164", ++ "referenced_type" : "type-20382", ++ "self_type" : "type-20381", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122513,8 +122555,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-20430", +- "self_type" : "type-20429", ++ "referenced_type" : "type-20500", ++ "self_type" : "type-20499", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122522,8 +122564,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-20548", +- "self_type" : "type-20547", ++ "referenced_type" : "type-20883", ++ "self_type" : "type-20882", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122531,8 +122573,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-20931", +- "self_type" : "type-20930", ++ "referenced_type" : "type-20986", ++ "self_type" : "type-20985", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122540,8 +122582,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-21034", +- "self_type" : "type-21033", ++ "referenced_type" : "type-21109", ++ "self_type" : "type-21108", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122549,8 +122591,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-21157", +- "self_type" : "type-21156", ++ "referenced_type" : "type-21163", ++ "self_type" : "type-21162", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122558,8 +122600,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-21211", +- "self_type" : "type-21210", ++ "referenced_type" : "type-21229", ++ "self_type" : "type-21228", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122567,8 +122609,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-21277", +- "self_type" : "type-21276", ++ "referenced_type" : "type-21303", ++ "self_type" : "type-21302", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122576,8 +122618,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-21351", +- "self_type" : "type-21350", ++ "referenced_type" : "type-21378", ++ "self_type" : "type-21377", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122585,8 +122627,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-21426", +- "self_type" : "type-21425", ++ "referenced_type" : "type-21570", ++ "self_type" : "type-21569", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122594,8 +122636,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-21618", +- "self_type" : "type-21617", ++ "referenced_type" : "type-21700", ++ "self_type" : "type-21699", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122603,8 +122645,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-21748", +- "self_type" : "type-21747", ++ "referenced_type" : "type-21778", ++ "self_type" : "type-21777", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122612,8 +122654,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-21826", +- "self_type" : "type-21825", ++ "referenced_type" : "type-21925", ++ "self_type" : "type-21924", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122621,8 +122663,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-21930", +- "self_type" : "type-21929", ++ "referenced_type" : "type-22169", ++ "self_type" : "type-22168", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122630,8 +122672,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-22173", +- "self_type" : "type-22172", ++ "referenced_type" : "type-22233", ++ "self_type" : "type-22232", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122639,8 +122681,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-22254", +- "self_type" : "type-22253", ++ "referenced_type" : "type-22377", ++ "self_type" : "type-22376", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122648,8 +122690,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-22420", +- "self_type" : "type-22419", ++ "referenced_type" : "type-22433", ++ "self_type" : "type-22432", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122657,8 +122699,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-22512", +- "self_type" : "type-22511", ++ "referenced_type" : "type-22509", ++ "self_type" : "type-22508", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122666,8 +122708,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-22603", +- "self_type" : "type-22602", ++ "referenced_type" : "type-22613", ++ "self_type" : "type-22612", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122675,8 +122717,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-22690", +- "self_type" : "type-22689", ++ "referenced_type" : "type-22694", ++ "self_type" : "type-22693", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122684,8 +122726,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-22755", +- "self_type" : "type-22754", ++ "referenced_type" : "type-23007", ++ "self_type" : "type-23006", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122693,8 +122735,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-23035", +- "self_type" : "type-23034", ++ "referenced_type" : "type-23159", ++ "self_type" : "type-23158", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122702,8 +122744,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-23174", +- "self_type" : "type-23173", ++ "referenced_type" : "type-23249", ++ "self_type" : "type-23248", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122711,8 +122753,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-23259", +- "self_type" : "type-23258", ++ "referenced_type" : "type-2333", ++ "self_type" : "type-2332", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122720,8 +122762,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-23450", +- "self_type" : "type-23449", ++ "referenced_type" : "type-23430", ++ "self_type" : "type-23429", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122729,8 +122771,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-23548", +- "self_type" : "type-23547", ++ "referenced_type" : "type-23526", ++ "self_type" : "type-23525", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122738,8 +122780,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-23783", +- "self_type" : "type-23782", ++ "referenced_type" : "type-23771", ++ "self_type" : "type-23770", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122747,8 +122789,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-23912", +- "self_type" : "type-23911", ++ "referenced_type" : "type-23916", ++ "self_type" : "type-23915", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122756,8 +122798,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-2403", +- "self_type" : "type-2402", ++ "referenced_type" : "type-24057", ++ "self_type" : "type-24056", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122765,8 +122807,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-24060", +- "self_type" : "type-24059", ++ "referenced_type" : "type-24231", ++ "self_type" : "type-24230", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122774,8 +122816,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-24227", +- "self_type" : "type-24226", ++ "referenced_type" : "type-24374", ++ "self_type" : "type-24373", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122783,8 +122825,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-24393", +- "self_type" : "type-24392", ++ "referenced_type" : "type-24511", ++ "self_type" : "type-24510", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122792,8 +122834,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-24535", +- "self_type" : "type-24534", ++ "referenced_type" : "type-24647", ++ "self_type" : "type-24646", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122801,8 +122843,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-24686", +- "self_type" : "type-24685", ++ "referenced_type" : "type-24775", ++ "self_type" : "type-24774", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122810,8 +122852,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-24815", +- "self_type" : "type-24814", ++ "referenced_type" : "type-2482", ++ "self_type" : "type-2481", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122819,8 +122861,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-24970", +- "self_type" : "type-24969", ++ "referenced_type" : "type-24938", ++ "self_type" : "type-24937", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122828,8 +122870,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-25101", +- "self_type" : "type-25100", ++ "referenced_type" : "type-25073", ++ "self_type" : "type-25072", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122837,8 +122879,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-25199", +- "self_type" : "type-25198", ++ "referenced_type" : "type-25194", ++ "self_type" : "type-25193", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122846,8 +122888,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-25341", +- "self_type" : "type-25340", ++ "referenced_type" : "type-25398", ++ "self_type" : "type-25397", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122855,8 +122897,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-2552", +- "self_type" : "type-2551", ++ "referenced_type" : "type-25657", ++ "self_type" : "type-25656", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122864,8 +122906,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-25606", +- "self_type" : "type-25605", ++ "referenced_type" : "type-25778", ++ "self_type" : "type-25777", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122873,8 +122915,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-25727", +- "self_type" : "type-25726", ++ "referenced_type" : "type-26153", ++ "self_type" : "type-26152", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122882,8 +122924,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-26109", +- "self_type" : "type-26108", ++ "referenced_type" : "type-26252", ++ "self_type" : "type-26251", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122891,8 +122933,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-26212", +- "self_type" : "type-26211", ++ "referenced_type" : "type-26377", ++ "self_type" : "type-26376", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122900,8 +122942,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-26335", +- "self_type" : "type-26334", ++ "referenced_type" : "type-26431", ++ "self_type" : "type-26430", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122909,8 +122951,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-26389", +- "self_type" : "type-26388", ++ "referenced_type" : "type-26492", ++ "self_type" : "type-26491", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122918,8 +122960,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-26455", +- "self_type" : "type-26454", ++ "referenced_type" : "type-26555", ++ "self_type" : "type-26554", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122927,8 +122969,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-26529", +- "self_type" : "type-26528", ++ "referenced_type" : "type-26632", ++ "self_type" : "type-26631", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122936,8 +122978,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-26604", +- "self_type" : "type-26603", ++ "referenced_type" : "type-26818", ++ "self_type" : "type-26817", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122945,8 +122987,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-26796", +- "self_type" : "type-26795", ++ "referenced_type" : "type-26944", ++ "self_type" : "type-26943", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122954,8 +122996,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-26926", +- "self_type" : "type-26925", ++ "referenced_type" : "type-27033", ++ "self_type" : "type-27032", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122963,8 +123005,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-27004", +- "self_type" : "type-27003", ++ "referenced_type" : "type-27114", ++ "self_type" : "type-27113", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122972,8 +123014,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-27115", +- "self_type" : "type-27114", ++ "referenced_type" : "type-27357", ++ "self_type" : "type-27356", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122981,8 +123023,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-27358", +- "self_type" : "type-27357", ++ "referenced_type" : "type-27438", ++ "self_type" : "type-27437", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122990,8 +123032,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-27439", +- "self_type" : "type-27438", ++ "referenced_type" : "type-27604", ++ "self_type" : "type-27603", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -122999,8 +123041,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-27605", +- "self_type" : "type-27604", ++ "referenced_type" : "type-27696", ++ "self_type" : "type-27695", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123008,8 +123050,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-27697", +- "self_type" : "type-27696", ++ "referenced_type" : "type-27787", ++ "self_type" : "type-27786", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123017,8 +123059,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-27788", +- "self_type" : "type-27787", ++ "referenced_type" : "type-27874", ++ "self_type" : "type-27873", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123026,8 +123068,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-27875", +- "self_type" : "type-27874", ++ "referenced_type" : "type-27939", ++ "self_type" : "type-27938", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123035,8 +123077,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-27940", +- "self_type" : "type-27939", ++ "referenced_type" : "type-28219", ++ "self_type" : "type-28218", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123044,8 +123086,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-28220", +- "self_type" : "type-28219", ++ "referenced_type" : "type-28358", ++ "self_type" : "type-28357", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123053,8 +123095,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-28359", +- "self_type" : "type-28358", ++ "referenced_type" : "type-28443", ++ "self_type" : "type-28442", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123062,8 +123104,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-28444", +- "self_type" : "type-28443", ++ "referenced_type" : "type-28634", ++ "self_type" : "type-28633", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123071,8 +123113,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-28635", +- "self_type" : "type-28634", ++ "referenced_type" : "type-28732", ++ "self_type" : "type-28731", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123080,8 +123122,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-28733", +- "self_type" : "type-28732", ++ "referenced_type" : "type-28967", ++ "self_type" : "type-28966", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123089,8 +123131,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-28968", +- "self_type" : "type-28967", ++ "referenced_type" : "type-29096", ++ "self_type" : "type-29095", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123098,8 +123140,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-29097", +- "self_type" : "type-29096", ++ "referenced_type" : "type-29244", ++ "self_type" : "type-29243", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123107,8 +123149,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-29245", +- "self_type" : "type-29244", ++ "referenced_type" : "type-29411", ++ "self_type" : "type-29410", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123116,8 +123158,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-29412", +- "self_type" : "type-29411", ++ "referenced_type" : "type-29577", ++ "self_type" : "type-29576", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123125,8 +123167,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-29578", +- "self_type" : "type-29577", ++ "referenced_type" : "type-29719", ++ "self_type" : "type-29718", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123134,8 +123176,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-29720", +- "self_type" : "type-29719", ++ "referenced_type" : "type-29866", ++ "self_type" : "type-29865", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123143,8 +123185,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-29867", +- "self_type" : "type-29866", ++ "referenced_type" : "type-29993", ++ "self_type" : "type-29992", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123152,8 +123194,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-29994", +- "self_type" : "type-29993", ++ "referenced_type" : "type-30125", ++ "self_type" : "type-30124", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123161,8 +123203,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-30126", +- "self_type" : "type-30125", ++ "referenced_type" : "type-30245", ++ "self_type" : "type-30244", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123170,8 +123212,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-30246", +- "self_type" : "type-30245", ++ "referenced_type" : "type-30342", ++ "self_type" : "type-30341", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123179,8 +123221,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-30343", +- "self_type" : "type-30342", ++ "referenced_type" : "type-30486", ++ "self_type" : "type-30485", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123188,8 +123230,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-30487", +- "self_type" : "type-30486", ++ "referenced_type" : "type-30751", ++ "self_type" : "type-30750", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123197,8 +123239,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-30752", +- "self_type" : "type-30751", ++ "referenced_type" : "type-30872", ++ "self_type" : "type-30871", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123206,8 +123248,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-30873", +- "self_type" : "type-30872", ++ "referenced_type" : "type-31255", ++ "self_type" : "type-31254", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123215,8 +123257,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-31256", +- "self_type" : "type-31255", ++ "referenced_type" : "type-31358", ++ "self_type" : "type-31357", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123224,8 +123266,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-31359", +- "self_type" : "type-31358", ++ "referenced_type" : "type-3143", ++ "self_type" : "type-3142", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123233,8 +123275,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-31482", +- "self_type" : "type-31481", ++ "referenced_type" : "type-31481", ++ "self_type" : "type-31480", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123242,8 +123284,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-31536", +- "self_type" : "type-31535", ++ "referenced_type" : "type-31535", ++ "self_type" : "type-31534", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123251,8 +123293,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-31602", +- "self_type" : "type-31601", ++ "referenced_type" : "type-31601", ++ "self_type" : "type-31600", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123260,8 +123302,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-31676", +- "self_type" : "type-31675", ++ "referenced_type" : "type-31675", ++ "self_type" : "type-31674", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123269,8 +123311,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-31751", +- "self_type" : "type-31750", ++ "referenced_type" : "type-31750", ++ "self_type" : "type-31749", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123278,8 +123320,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-3191", +- "self_type" : "type-3190", ++ "referenced_type" : "type-31942", ++ "self_type" : "type-31941", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123287,8 +123329,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-31943", +- "self_type" : "type-31942", ++ "referenced_type" : "type-32072", ++ "self_type" : "type-32071", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123296,8 +123338,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-32073", +- "self_type" : "type-32072", ++ "referenced_type" : "type-32150", ++ "self_type" : "type-32149", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123305,8 +123347,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-32151", +- "self_type" : "type-32150", ++ "referenced_type" : "type-3415", ++ "self_type" : "type-3414", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123314,8 +123356,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-3463", +- "self_type" : "type-3462", ++ "referenced_type" : "type-3542", ++ "self_type" : "type-3541", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123323,8 +123365,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-3590", +- "self_type" : "type-3589", ++ "referenced_type" : "type-3696", ++ "self_type" : "type-3697", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123332,8 +123374,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-3744", +- "self_type" : "type-3745", ++ "referenced_type" : "type-4047", ++ "self_type" : "type-4046", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123341,8 +123383,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-4095", +- "self_type" : "type-4094", ++ "referenced_type" : "type-4153", ++ "self_type" : "type-4152", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123350,8 +123392,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-4201", +- "self_type" : "type-4200", ++ "referenced_type" : "type-4306", ++ "self_type" : "type-4305", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123359,8 +123401,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-4354", +- "self_type" : "type-4353", ++ "referenced_type" : "type-4362", ++ "self_type" : "type-4361", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123368,8 +123410,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-4410", +- "self_type" : "type-4409", ++ "referenced_type" : "type-4429", ++ "self_type" : "type-4428", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123377,8 +123419,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-4477", +- "self_type" : "type-4476", ++ "referenced_type" : "type-4614", ++ "self_type" : "type-4613", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123386,8 +123428,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-4662", +- "self_type" : "type-4661", ++ "referenced_type" : "type-5123", ++ "self_type" : "type-5122", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123395,8 +123437,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-5171", +- "self_type" : "type-5170", ++ "referenced_type" : "type-5395", ++ "self_type" : "type-5394", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123404,8 +123446,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-5443", +- "self_type" : "type-5442", ++ "referenced_type" : "type-5520", ++ "self_type" : "type-5519", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123413,8 +123455,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-5568", +- "self_type" : "type-5567", ++ "referenced_type" : "type-5906", ++ "self_type" : "type-5905", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123422,8 +123464,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-5954", +- "self_type" : "type-5953", ++ "referenced_type" : "type-6009", ++ "self_type" : "type-6008", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123431,8 +123473,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-6057", +- "self_type" : "type-6056", ++ "referenced_type" : "type-6132", ++ "self_type" : "type-6131", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123440,8 +123482,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-6180", +- "self_type" : "type-6179", ++ "referenced_type" : "type-6186", ++ "self_type" : "type-6185", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123449,8 +123491,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-6234", +- "self_type" : "type-6233", ++ "referenced_type" : "type-6252", ++ "self_type" : "type-6251", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123458,8 +123500,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-6300", +- "self_type" : "type-6299", ++ "referenced_type" : "type-6329", ++ "self_type" : "type-6328", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123467,8 +123509,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-6377", +- "self_type" : "type-6376", ++ "referenced_type" : "type-6406", ++ "self_type" : "type-6405", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123476,8 +123518,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-6454", +- "self_type" : "type-6453", ++ "referenced_type" : "type-6696", ++ "self_type" : "type-6695", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123485,8 +123527,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-6744", +- "self_type" : "type-6743", ++ "referenced_type" : "type-6891", ++ "self_type" : "type-6890", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123494,8 +123536,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-6939", +- "self_type" : "type-6938", ++ "referenced_type" : "type-6984", ++ "self_type" : "type-6983", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123503,8 +123545,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-7032", +- "self_type" : "type-7031", ++ "referenced_type" : "type-7110", ++ "self_type" : "type-7109", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123512,8 +123554,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-7158", +- "self_type" : "type-7157", ++ "referenced_type" : "type-7511", ++ "self_type" : "type-7510", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123521,8 +123563,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-7559", +- "self_type" : "type-7558", ++ "referenced_type" : "type-7604", ++ "self_type" : "type-7603", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123530,8 +123572,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-7652", +- "self_type" : "type-7651", ++ "referenced_type" : "type-7775", ++ "self_type" : "type-7774", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123539,8 +123581,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-7823", +- "self_type" : "type-7822", ++ "referenced_type" : "type-7882", ++ "self_type" : "type-7881", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123548,8 +123590,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-7930", +- "self_type" : "type-7929", ++ "referenced_type" : "type-7972", ++ "self_type" : "type-7971", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123557,8 +123599,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-8020", +- "self_type" : "type-8019", ++ "referenced_type" : "type-8059", ++ "self_type" : "type-8058", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123566,8 +123608,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-8107", +- "self_type" : "type-8106", ++ "referenced_type" : "type-8398", ++ "self_type" : "type-8397", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123575,8 +123617,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-8446", +- "self_type" : "type-8445", ++ "referenced_type" : "type-8660", ++ "self_type" : "type-8659", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123584,8 +123626,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-8708", +- "self_type" : "type-8707", ++ "referenced_type" : "type-8779", ++ "self_type" : "type-8778", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123593,8 +123635,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-8827", +- "self_type" : "type-8826", ++ "referenced_type" : "type-9163", ++ "self_type" : "type-9162", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123602,8 +123644,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-9211", +- "self_type" : "type-9210", ++ "referenced_type" : "type-9266", ++ "self_type" : "type-9265", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123611,8 +123653,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-9314", +- "self_type" : "type-9313", ++ "referenced_type" : "type-9389", ++ "self_type" : "type-9388", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123620,8 +123662,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-9437", +- "self_type" : "type-9436", ++ "referenced_type" : "type-9443", ++ "self_type" : "type-9442", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123629,8 +123671,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-9491", +- "self_type" : "type-9490", ++ "referenced_type" : "type-9509", ++ "self_type" : "type-9508", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123638,8 +123680,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-9557", +- "self_type" : "type-9556", ++ "referenced_type" : "type-9583", ++ "self_type" : "type-9582", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123647,8 +123689,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-9631", +- "self_type" : "type-9630", ++ "referenced_type" : "type-9658", ++ "self_type" : "type-9657", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123656,8 +123698,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-9706", +- "self_type" : "type-9705", ++ "referenced_type" : "type-9850", ++ "self_type" : "type-9849", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123665,8 +123707,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorDatabase *", + "name" : "google::protobuf::DescriptorDatabase *", +- "referenced_type" : "type-9898", +- "self_type" : "type-9897", ++ "referenced_type" : "type-9979", ++ "self_type" : "type-9978", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123674,8 +123716,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool *", + "name" : "google::protobuf::DescriptorPool *", +- "referenced_type" : "type-1964", +- "self_type" : "type-2057", ++ "referenced_type" : "type-1889", ++ "self_type" : "type-1987", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123683,8 +123725,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::ErrorCollector *", + "name" : "google::protobuf::DescriptorPool::ErrorCollector *", +- "referenced_type" : "type-1968", +- "self_type" : "type-1967", ++ "referenced_type" : "type-1893", ++ "self_type" : "type-1892", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -123692,8 +123734,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-10088", +- "self_type" : "type-10087", ++ "referenced_type" : "type-10040", ++ "self_type" : "type-10039", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123701,8 +123743,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-10181", +- "self_type" : "type-10180", ++ "referenced_type" : "type-10133", ++ "self_type" : "type-10132", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123710,8 +123752,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-10366", +- "self_type" : "type-10365", ++ "referenced_type" : "type-10318", ++ "self_type" : "type-10317", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123719,8 +123761,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-10546", +- "self_type" : "type-10545", ++ "referenced_type" : "type-10498", ++ "self_type" : "type-10497", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123728,8 +123770,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-10711", +- "self_type" : "type-10710", ++ "referenced_type" : "type-10663", ++ "self_type" : "type-10662", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123737,8 +123779,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-10793", +- "self_type" : "type-10792", ++ "referenced_type" : "type-10745", ++ "self_type" : "type-10744", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123746,8 +123788,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-10887", +- "self_type" : "type-10886", ++ "referenced_type" : "type-10839", ++ "self_type" : "type-10838", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123755,8 +123797,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-10982", +- "self_type" : "type-10981", ++ "referenced_type" : "type-10934", ++ "self_type" : "type-10933", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123764,8 +123806,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-11040", +- "self_type" : "type-11039", ++ "referenced_type" : "type-10992", ++ "self_type" : "type-10991", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123773,8 +123815,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-11242", +- "self_type" : "type-11241", ++ "referenced_type" : "type-11194", ++ "self_type" : "type-11193", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123782,8 +123824,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-11391", +- "self_type" : "type-11390", ++ "referenced_type" : "type-11343", ++ "self_type" : "type-11342", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123791,8 +123833,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-11689", +- "self_type" : "type-11688", ++ "referenced_type" : "type-11641", ++ "self_type" : "type-11640", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123800,8 +123842,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-12000", +- "self_type" : "type-11999", ++ "referenced_type" : "type-11952", ++ "self_type" : "type-11951", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123809,8 +123851,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-12185", +- "self_type" : "type-12184", ++ "referenced_type" : "type-12137", ++ "self_type" : "type-12136", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123818,8 +123860,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-12238", +- "self_type" : "type-12237", ++ "referenced_type" : "type-12190", ++ "self_type" : "type-12189", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123827,8 +123869,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-12420", +- "self_type" : "type-12419", ++ "referenced_type" : "type-12372", ++ "self_type" : "type-12371", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123836,8 +123878,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-12517", +- "self_type" : "type-12516", ++ "referenced_type" : "type-12469", ++ "self_type" : "type-12468", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123845,8 +123887,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-12623", +- "self_type" : "type-12622", ++ "referenced_type" : "type-12575", ++ "self_type" : "type-12574", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123854,8 +123896,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-12718", +- "self_type" : "type-12717", ++ "referenced_type" : "type-12670", ++ "self_type" : "type-12669", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123863,8 +123905,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-12803", +- "self_type" : "type-12802", ++ "referenced_type" : "type-12755", ++ "self_type" : "type-12754", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123872,8 +123914,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-12870", +- "self_type" : "type-12869", ++ "referenced_type" : "type-12822", ++ "self_type" : "type-12821", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123881,8 +123923,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-12932", +- "self_type" : "type-12931", ++ "referenced_type" : "type-12884", ++ "self_type" : "type-12883", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123890,8 +123932,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-13012", +- "self_type" : "type-13011", ++ "referenced_type" : "type-12964", ++ "self_type" : "type-12963", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123899,8 +123941,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-13095", +- "self_type" : "type-13094", ++ "referenced_type" : "type-13047", ++ "self_type" : "type-13046", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123908,8 +123950,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-13326", +- "self_type" : "type-13325", ++ "referenced_type" : "type-13278", ++ "self_type" : "type-13277", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123917,8 +123959,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-13421", +- "self_type" : "type-13420", ++ "referenced_type" : "type-13373", ++ "self_type" : "type-13372", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123926,8 +123968,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-13514", +- "self_type" : "type-13513", ++ "referenced_type" : "type-13466", ++ "self_type" : "type-13465", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123935,8 +123977,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-13657", +- "self_type" : "type-13656", ++ "referenced_type" : "type-13609", ++ "self_type" : "type-13608", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123944,8 +123986,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-13837", +- "self_type" : "type-13836", ++ "referenced_type" : "type-13789", ++ "self_type" : "type-13788", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123953,8 +123995,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-14002", +- "self_type" : "type-14001", ++ "referenced_type" : "type-13954", ++ "self_type" : "type-13953", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123962,8 +124004,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-14084", +- "self_type" : "type-14083", ++ "referenced_type" : "type-14036", ++ "self_type" : "type-14035", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123971,8 +124013,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-14178", +- "self_type" : "type-14177", ++ "referenced_type" : "type-14130", ++ "self_type" : "type-14129", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123980,8 +124022,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-14273", +- "self_type" : "type-14272", ++ "referenced_type" : "type-14225", ++ "self_type" : "type-14224", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123989,8 +124031,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-14331", +- "self_type" : "type-14330", ++ "referenced_type" : "type-14283", ++ "self_type" : "type-14282", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -123998,8 +124040,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-14494", +- "self_type" : "type-14493", ++ "referenced_type" : "type-14446", ++ "self_type" : "type-14445", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124007,8 +124049,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-14615", +- "self_type" : "type-14614", ++ "referenced_type" : "type-14567", ++ "self_type" : "type-14566", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124016,8 +124058,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-14796", +- "self_type" : "type-14795", ++ "referenced_type" : "type-14748", ++ "self_type" : "type-14747", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124025,8 +124067,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-14878", +- "self_type" : "type-14877", ++ "referenced_type" : "type-14830", ++ "self_type" : "type-14829", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124034,8 +124076,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-15007", +- "self_type" : "type-15006", ++ "referenced_type" : "type-14959", ++ "self_type" : "type-14958", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124043,8 +124085,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-15195", +- "self_type" : "type-15194", ++ "referenced_type" : "type-15147", ++ "self_type" : "type-15146", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124052,8 +124094,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-15545", +- "self_type" : "type-15544", ++ "referenced_type" : "type-15497", ++ "self_type" : "type-15496", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124061,8 +124103,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-15856", +- "self_type" : "type-15855", ++ "referenced_type" : "type-15808", ++ "self_type" : "type-15807", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124070,8 +124112,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16040", +- "self_type" : "type-16039", ++ "referenced_type" : "type-15992", ++ "self_type" : "type-15991", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124079,8 +124121,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16093", +- "self_type" : "type-16092", ++ "referenced_type" : "type-16045", ++ "self_type" : "type-16044", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124088,8 +124130,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16277", +- "self_type" : "type-16276", ++ "referenced_type" : "type-16229", ++ "self_type" : "type-16228", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124097,8 +124139,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16374", +- "self_type" : "type-16373", ++ "referenced_type" : "type-16326", ++ "self_type" : "type-16325", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124106,8 +124148,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16480", +- "self_type" : "type-16479", ++ "referenced_type" : "type-16432", ++ "self_type" : "type-16431", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124115,8 +124157,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16574", +- "self_type" : "type-16573", ++ "referenced_type" : "type-16526", ++ "self_type" : "type-16525", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124124,8 +124166,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16659", +- "self_type" : "type-16658", ++ "referenced_type" : "type-16611", ++ "self_type" : "type-16610", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124133,8 +124175,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16726", +- "self_type" : "type-16725", ++ "referenced_type" : "type-16678", ++ "self_type" : "type-16677", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124142,8 +124184,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16788", +- "self_type" : "type-16787", ++ "referenced_type" : "type-16740", ++ "self_type" : "type-16739", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124151,8 +124193,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16868", +- "self_type" : "type-16867", ++ "referenced_type" : "type-16820", ++ "self_type" : "type-16819", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124160,8 +124202,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-16951", +- "self_type" : "type-16950", ++ "referenced_type" : "type-16903", ++ "self_type" : "type-16902", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124169,8 +124211,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-17182", +- "self_type" : "type-17181", ++ "referenced_type" : "type-17134", ++ "self_type" : "type-17133", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124178,8 +124220,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-17277", +- "self_type" : "type-17276", ++ "referenced_type" : "type-17229", ++ "self_type" : "type-17228", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124187,8 +124229,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-17370", +- "self_type" : "type-17369", ++ "referenced_type" : "type-17322", ++ "self_type" : "type-17321", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124196,8 +124238,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-17521", +- "self_type" : "type-17520", ++ "referenced_type" : "type-1735", ++ "self_type" : "type-1734", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124205,8 +124247,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-17701", +- "self_type" : "type-17700", ++ "referenced_type" : "type-17473", ++ "self_type" : "type-17472", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124214,8 +124256,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-17866", +- "self_type" : "type-17865", ++ "referenced_type" : "type-17653", ++ "self_type" : "type-17652", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124223,8 +124265,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-17948", +- "self_type" : "type-17947", ++ "referenced_type" : "type-17818", ++ "self_type" : "type-17817", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124232,8 +124274,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-18042", +- "self_type" : "type-18041", ++ "referenced_type" : "type-17900", ++ "self_type" : "type-17899", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124241,8 +124283,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-18137", +- "self_type" : "type-18136", ++ "referenced_type" : "type-17994", ++ "self_type" : "type-17993", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124250,8 +124292,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-18195", +- "self_type" : "type-18194", ++ "referenced_type" : "type-18089", ++ "self_type" : "type-18088", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124259,8 +124301,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-1824", +- "self_type" : "type-1823", ++ "referenced_type" : "type-18147", ++ "self_type" : "type-18146", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124268,8 +124310,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-18358", +- "self_type" : "type-18357", ++ "referenced_type" : "type-18310", ++ "self_type" : "type-18309", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124277,8 +124319,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-18479", +- "self_type" : "type-18478", ++ "referenced_type" : "type-18431", ++ "self_type" : "type-18430", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124286,8 +124328,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-18660", +- "self_type" : "type-18659", ++ "referenced_type" : "type-18612", ++ "self_type" : "type-18611", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124295,8 +124337,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-18735", +- "self_type" : "type-18734", ++ "referenced_type" : "type-18687", ++ "self_type" : "type-18686", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124304,8 +124346,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-18826", +- "self_type" : "type-18825", ++ "referenced_type" : "type-18778", ++ "self_type" : "type-18777", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124313,8 +124355,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-18979", +- "self_type" : "type-18978", ++ "referenced_type" : "type-18931", ++ "self_type" : "type-18930", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124322,8 +124364,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-19237", +- "self_type" : "type-19236", ++ "referenced_type" : "type-19189", ++ "self_type" : "type-19188", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124331,8 +124373,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-19383", +- "self_type" : "type-19382", ++ "referenced_type" : "type-19335", ++ "self_type" : "type-19334", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124340,8 +124382,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-19550", +- "self_type" : "type-19549", ++ "referenced_type" : "type-19502", ++ "self_type" : "type-19501", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124349,8 +124391,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-19727", +- "self_type" : "type-19726", ++ "referenced_type" : "type-19679", ++ "self_type" : "type-19678", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124358,8 +124400,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-19887", +- "self_type" : "type-19886", ++ "referenced_type" : "type-19839", ++ "self_type" : "type-19838", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124367,8 +124409,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-20078", +- "self_type" : "type-20077", ++ "referenced_type" : "type-20030", ++ "self_type" : "type-20029", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124376,8 +124418,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-20390", +- "self_type" : "type-20389", ++ "referenced_type" : "type-20342", ++ "self_type" : "type-20341", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124385,8 +124427,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-20572", +- "self_type" : "type-20571", ++ "referenced_type" : "type-20524", ++ "self_type" : "type-20523", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124394,8 +124436,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-20625", +- "self_type" : "type-20624", ++ "referenced_type" : "type-20577", ++ "self_type" : "type-20576", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124403,8 +124445,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-20808", +- "self_type" : "type-20807", ++ "referenced_type" : "type-20760", ++ "self_type" : "type-20759", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124412,8 +124454,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-20905", +- "self_type" : "type-20904", ++ "referenced_type" : "type-20857", ++ "self_type" : "type-20856", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124421,8 +124463,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-21011", +- "self_type" : "type-21010", ++ "referenced_type" : "type-20963", ++ "self_type" : "type-20962", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124430,8 +124472,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-21106", +- "self_type" : "type-21105", ++ "referenced_type" : "type-21058", ++ "self_type" : "type-21057", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124439,8 +124481,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-21191", +- "self_type" : "type-21190", ++ "referenced_type" : "type-21143", ++ "self_type" : "type-21142", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124448,8 +124490,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-21258", +- "self_type" : "type-21257", ++ "referenced_type" : "type-21210", ++ "self_type" : "type-21209", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124457,8 +124499,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-21320", +- "self_type" : "type-21319", ++ "referenced_type" : "type-21272", ++ "self_type" : "type-21271", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124466,8 +124508,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-21400", +- "self_type" : "type-21399", ++ "referenced_type" : "type-21352", ++ "self_type" : "type-21351", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124475,8 +124517,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-21483", +- "self_type" : "type-21482", ++ "referenced_type" : "type-21435", ++ "self_type" : "type-21434", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124484,8 +124526,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-21714", +- "self_type" : "type-21713", ++ "referenced_type" : "type-21666", ++ "self_type" : "type-21665", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124493,8 +124535,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-21809", +- "self_type" : "type-21808", ++ "referenced_type" : "type-21761", ++ "self_type" : "type-21760", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124502,8 +124544,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-21902", +- "self_type" : "type-21901", ++ "referenced_type" : "type-21854", ++ "self_type" : "type-21853", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124511,8 +124553,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-22050", +- "self_type" : "type-22049", ++ "referenced_type" : "type-21897", ++ "self_type" : "type-21896", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124520,8 +124562,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-22230", +- "self_type" : "type-22229", ++ "referenced_type" : "type-22041", ++ "self_type" : "type-22040", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124529,8 +124571,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-22395", +- "self_type" : "type-22394", ++ "referenced_type" : "type-22215", ++ "self_type" : "type-22214", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124538,8 +124580,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-22477", +- "self_type" : "type-22476", ++ "referenced_type" : "type-22355", ++ "self_type" : "type-22354", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124547,8 +124589,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-22571", +- "self_type" : "type-22570", ++ "referenced_type" : "type-22412", ++ "self_type" : "type-22411", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124556,8 +124598,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-22666", +- "self_type" : "type-22665", ++ "referenced_type" : "type-22490", ++ "self_type" : "type-22489", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124565,8 +124607,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-22724", +- "self_type" : "type-22723", ++ "referenced_type" : "type-2256", ++ "self_type" : "type-2255", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124574,8 +124616,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-22887", +- "self_type" : "type-22886", ++ "referenced_type" : "type-22579", ++ "self_type" : "type-22578", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124583,8 +124625,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-23008", +- "self_type" : "type-23007", ++ "referenced_type" : "type-22653", ++ "self_type" : "type-22652", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124592,8 +124634,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-23189", +- "self_type" : "type-23188", ++ "referenced_type" : "type-22848", ++ "self_type" : "type-22847", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124601,8 +124643,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-23264", +- "self_type" : "type-23263", ++ "referenced_type" : "type-22981", ++ "self_type" : "type-22980", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124610,8 +124652,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-2329", +- "self_type" : "type-2328", ++ "referenced_type" : "type-23174", ++ "self_type" : "type-23173", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124619,8 +124661,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-23355", +- "self_type" : "type-23354", ++ "referenced_type" : "type-23255", ++ "self_type" : "type-23254", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124628,8 +124670,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-23508", +- "self_type" : "type-23507", ++ "referenced_type" : "type-23345", ++ "self_type" : "type-23344", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124637,8 +124679,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-23758", +- "self_type" : "type-23757", ++ "referenced_type" : "type-23486", ++ "self_type" : "type-23485", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124646,8 +124688,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-23883", +- "self_type" : "type-23882", ++ "referenced_type" : "type-23745", ++ "self_type" : "type-23744", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124655,8 +124697,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-24020", +- "self_type" : "type-24019", ++ "referenced_type" : "type-23885", ++ "self_type" : "type-23884", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124664,8 +124706,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-24194", +- "self_type" : "type-24193", ++ "referenced_type" : "type-24017", ++ "self_type" : "type-24016", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124673,8 +124715,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-24354", +- "self_type" : "type-24353", ++ "referenced_type" : "type-24199", ++ "self_type" : "type-24198", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124682,8 +124724,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-24498", +- "self_type" : "type-24497", ++ "referenced_type" : "type-24337", ++ "self_type" : "type-24336", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124691,8 +124733,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-24663", +- "self_type" : "type-24662", ++ "referenced_type" : "type-24477", ++ "self_type" : "type-24476", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124700,8 +124742,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-24764", +- "self_type" : "type-24763", ++ "referenced_type" : "type-24626", ++ "self_type" : "type-24625", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124709,8 +124751,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-24972", +- "self_type" : "type-24971", ++ "referenced_type" : "type-24723", ++ "self_type" : "type-24722", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124718,8 +124760,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-25088", +- "self_type" : "type-25087", ++ "referenced_type" : "type-24940", ++ "self_type" : "type-24939", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124727,8 +124769,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-25178", +- "self_type" : "type-25177", ++ "referenced_type" : "type-25059", ++ "self_type" : "type-25058", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124736,8 +124778,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-25188", +- "self_type" : "type-25187", ++ "referenced_type" : "type-2506", ++ "self_type" : "type-2505", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124745,8 +124787,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-25566", +- "self_type" : "type-25565", ++ "referenced_type" : "type-25160", ++ "self_type" : "type-25159", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124754,8 +124796,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-2574", +- "self_type" : "type-2573", ++ "referenced_type" : "type-25325", ++ "self_type" : "type-25324", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124763,8 +124805,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-25751", +- "self_type" : "type-25750", ++ "referenced_type" : "type-25620", ++ "self_type" : "type-25619", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124772,8 +124814,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-25804", +- "self_type" : "type-25803", ++ "referenced_type" : "type-25800", ++ "self_type" : "type-25799", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124781,8 +124823,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-25986", +- "self_type" : "type-25985", ++ "referenced_type" : "type-25855", ++ "self_type" : "type-25854", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124790,8 +124832,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-26083", +- "self_type" : "type-26082", ++ "referenced_type" : "type-26039", ++ "self_type" : "type-26038", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124799,8 +124841,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-26189", +- "self_type" : "type-26188", ++ "referenced_type" : "type-26130", ++ "self_type" : "type-26129", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124808,8 +124850,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-26284", +- "self_type" : "type-26283", ++ "referenced_type" : "type-26233", ++ "self_type" : "type-26232", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124817,8 +124859,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-26369", +- "self_type" : "type-26368", ++ "referenced_type" : "type-26327", ++ "self_type" : "type-26326", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124826,8 +124868,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-26436", +- "self_type" : "type-26435", ++ "referenced_type" : "type-26411", ++ "self_type" : "type-26410", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124835,8 +124877,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-26498", +- "self_type" : "type-26497", ++ "referenced_type" : "type-26479", ++ "self_type" : "type-26478", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124844,8 +124886,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-26578", +- "self_type" : "type-26577", ++ "referenced_type" : "type-26532", ++ "self_type" : "type-26531", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124853,8 +124895,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-26661", +- "self_type" : "type-26660", ++ "referenced_type" : "type-26606", ++ "self_type" : "type-26605", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124862,8 +124904,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-26892", +- "self_type" : "type-26891", ++ "referenced_type" : "type-26682", ++ "self_type" : "type-26681", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124871,8 +124913,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-26987", +- "self_type" : "type-26986", ++ "referenced_type" : "type-26913", ++ "self_type" : "type-26912", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124880,8 +124922,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-27080", +- "self_type" : "type-27079", ++ "referenced_type" : "type-27012", ++ "self_type" : "type-27011", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124889,8 +124931,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-27235", +- "self_type" : "type-27234", ++ "referenced_type" : "type-27234", ++ "self_type" : "type-27233", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124898,8 +124940,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-27415", +- "self_type" : "type-27414", ++ "referenced_type" : "type-27414", ++ "self_type" : "type-27413", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124907,8 +124949,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-27580", +- "self_type" : "type-27579", ++ "referenced_type" : "type-27579", ++ "self_type" : "type-27578", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124916,8 +124958,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-27662", +- "self_type" : "type-27661", ++ "referenced_type" : "type-27661", ++ "self_type" : "type-27660", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124925,8 +124967,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-27756", +- "self_type" : "type-27755", ++ "referenced_type" : "type-27755", ++ "self_type" : "type-27754", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124934,8 +124976,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-27851", +- "self_type" : "type-27850", ++ "referenced_type" : "type-27850", ++ "self_type" : "type-27849", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124943,8 +124985,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-27909", +- "self_type" : "type-27908", ++ "referenced_type" : "type-27908", ++ "self_type" : "type-27907", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124952,8 +124994,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-28072", +- "self_type" : "type-28071", ++ "referenced_type" : "type-28071", ++ "self_type" : "type-28070", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124961,8 +125003,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-28193", +- "self_type" : "type-28192", ++ "referenced_type" : "type-28192", ++ "self_type" : "type-28191", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124970,8 +125012,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-28374", +- "self_type" : "type-28373", ++ "referenced_type" : "type-28373", ++ "self_type" : "type-28372", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124979,8 +125021,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-28449", +- "self_type" : "type-28448", ++ "referenced_type" : "type-28448", ++ "self_type" : "type-28447", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124988,8 +125030,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-28540", +- "self_type" : "type-28539", ++ "referenced_type" : "type-28539", ++ "self_type" : "type-28538", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -124997,8 +125039,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-28693", +- "self_type" : "type-28692", ++ "referenced_type" : "type-28692", ++ "self_type" : "type-28691", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125006,8 +125048,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-28943", +- "self_type" : "type-28942", ++ "referenced_type" : "type-28942", ++ "self_type" : "type-28941", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125015,8 +125057,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-29068", +- "self_type" : "type-29067", ++ "referenced_type" : "type-29067", ++ "self_type" : "type-29066", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125024,8 +125066,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-29205", +- "self_type" : "type-29204", ++ "referenced_type" : "type-29204", ++ "self_type" : "type-29203", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125033,8 +125075,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-29379", +- "self_type" : "type-29378", ++ "referenced_type" : "type-29378", ++ "self_type" : "type-29377", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125042,8 +125084,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-29539", +- "self_type" : "type-29538", ++ "referenced_type" : "type-29538", ++ "self_type" : "type-29537", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125051,8 +125093,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-29683", +- "self_type" : "type-29682", ++ "referenced_type" : "type-29682", ++ "self_type" : "type-29681", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125060,8 +125102,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-29844", +- "self_type" : "type-29843", ++ "referenced_type" : "type-29843", ++ "self_type" : "type-29842", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125069,8 +125111,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-29943", +- "self_type" : "type-29942", ++ "referenced_type" : "type-29942", ++ "self_type" : "type-29941", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125078,8 +125120,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-30128", +- "self_type" : "type-30127", ++ "referenced_type" : "type-30127", ++ "self_type" : "type-30126", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125087,8 +125129,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-30233", +- "self_type" : "type-30232", ++ "referenced_type" : "type-30232", ++ "self_type" : "type-30231", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125096,8 +125138,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-30322", +- "self_type" : "type-30321", ++ "referenced_type" : "type-30321", ++ "self_type" : "type-30320", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125105,8 +125147,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-30332", +- "self_type" : "type-30331", ++ "referenced_type" : "type-30331", ++ "self_type" : "type-30330", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125114,8 +125156,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-30712", +- "self_type" : "type-30711", ++ "referenced_type" : "type-3055", ++ "self_type" : "type-3054", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125123,8 +125165,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-30897", +- "self_type" : "type-30896", ++ "referenced_type" : "type-30711", ++ "self_type" : "type-30710", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125132,8 +125174,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-30950", +- "self_type" : "type-30949", ++ "referenced_type" : "type-30896", ++ "self_type" : "type-30895", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125141,8 +125183,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-3103", +- "self_type" : "type-3102", ++ "referenced_type" : "type-30949", ++ "self_type" : "type-30948", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125150,8 +125192,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-31133", +- "self_type" : "type-31132", ++ "referenced_type" : "type-31132", ++ "self_type" : "type-31131", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125159,8 +125201,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-31230", +- "self_type" : "type-31229", ++ "referenced_type" : "type-31229", ++ "self_type" : "type-31228", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125168,8 +125210,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-31336", +- "self_type" : "type-31335", ++ "referenced_type" : "type-31335", ++ "self_type" : "type-31334", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125177,8 +125219,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-31431", +- "self_type" : "type-31430", ++ "referenced_type" : "type-31430", ++ "self_type" : "type-31429", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125186,8 +125228,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-31516", +- "self_type" : "type-31515", ++ "referenced_type" : "type-31515", ++ "self_type" : "type-31514", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125195,8 +125237,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-31583", +- "self_type" : "type-31582", ++ "referenced_type" : "type-31582", ++ "self_type" : "type-31581", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125204,8 +125246,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-31645", +- "self_type" : "type-31644", ++ "referenced_type" : "type-31644", ++ "self_type" : "type-31643", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125213,8 +125255,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-31725", +- "self_type" : "type-31724", ++ "referenced_type" : "type-31724", ++ "self_type" : "type-31723", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125222,8 +125264,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-31808", +- "self_type" : "type-31807", ++ "referenced_type" : "type-31807", ++ "self_type" : "type-31806", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125231,8 +125273,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-32039", +- "self_type" : "type-32038", ++ "referenced_type" : "type-32038", ++ "self_type" : "type-32037", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125240,8 +125282,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-32134", +- "self_type" : "type-32133", ++ "referenced_type" : "type-32133", ++ "self_type" : "type-32132", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125249,8 +125291,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-32227", +- "self_type" : "type-32226", ++ "referenced_type" : "type-32226", ++ "self_type" : "type-32225", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125258,8 +125300,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-3417", +- "self_type" : "type-3416", ++ "referenced_type" : "type-3369", ++ "self_type" : "type-3368", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125267,8 +125309,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-3614", +- "self_type" : "type-3613", ++ "referenced_type" : "type-3566", ++ "self_type" : "type-3565", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125276,8 +125318,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-3681", +- "self_type" : "type-3680", ++ "referenced_type" : "type-3633", ++ "self_type" : "type-3632", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125285,8 +125327,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-3923", +- "self_type" : "type-3922", ++ "referenced_type" : "type-3875", ++ "self_type" : "type-3874", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125294,8 +125336,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-4021", +- "self_type" : "type-4020", ++ "referenced_type" : "type-3973", ++ "self_type" : "type-3972", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125303,8 +125345,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-4175", +- "self_type" : "type-4174", ++ "referenced_type" : "type-4127", ++ "self_type" : "type-4126", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125312,8 +125354,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-4291", +- "self_type" : "type-4290", ++ "referenced_type" : "type-4243", ++ "self_type" : "type-4242", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125321,8 +125363,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-4389", +- "self_type" : "type-4388", ++ "referenced_type" : "type-4341", ++ "self_type" : "type-4340", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125330,8 +125372,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-4459", +- "self_type" : "type-4458", ++ "referenced_type" : "type-4411", ++ "self_type" : "type-4410", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125339,8 +125381,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-5083", +- "self_type" : "type-5082", ++ "referenced_type" : "type-5035", ++ "self_type" : "type-5034", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125348,8 +125390,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-5397", +- "self_type" : "type-5396", ++ "referenced_type" : "type-5349", ++ "self_type" : "type-5348", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125357,8 +125399,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-5592", +- "self_type" : "type-5591", ++ "referenced_type" : "type-5544", ++ "self_type" : "type-5543", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125366,8 +125408,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-5646", +- "self_type" : "type-5645", ++ "referenced_type" : "type-5598", ++ "self_type" : "type-5597", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125375,8 +125417,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-5831", +- "self_type" : "type-5830", ++ "referenced_type" : "type-5783", ++ "self_type" : "type-5782", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125384,8 +125426,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-5928", +- "self_type" : "type-5927", ++ "referenced_type" : "type-5880", ++ "self_type" : "type-5879", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125393,8 +125435,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-6034", +- "self_type" : "type-6033", ++ "referenced_type" : "type-5986", ++ "self_type" : "type-5985", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125402,8 +125444,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-6129", +- "self_type" : "type-6128", ++ "referenced_type" : "type-6081", ++ "self_type" : "type-6080", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125411,8 +125453,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-6214", +- "self_type" : "type-6213", ++ "referenced_type" : "type-6166", ++ "self_type" : "type-6165", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125420,8 +125462,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-6281", +- "self_type" : "type-6280", ++ "referenced_type" : "type-6233", ++ "self_type" : "type-6232", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125429,8 +125471,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-6343", +- "self_type" : "type-6342", ++ "referenced_type" : "type-6295", ++ "self_type" : "type-6294", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125438,8 +125480,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-6428", +- "self_type" : "type-6427", ++ "referenced_type" : "type-6380", ++ "self_type" : "type-6379", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125447,8 +125489,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-6559", +- "self_type" : "type-6558", ++ "referenced_type" : "type-6511", ++ "self_type" : "type-6510", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125456,8 +125498,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-6901", +- "self_type" : "type-6900", ++ "referenced_type" : "type-6853", ++ "self_type" : "type-6852", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125465,8 +125507,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-7015", +- "self_type" : "type-7014", ++ "referenced_type" : "type-6967", ++ "self_type" : "type-6966", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125474,8 +125516,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-7112", +- "self_type" : "type-7111", ++ "referenced_type" : "type-7064", ++ "self_type" : "type-7063", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125483,8 +125525,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-7362", +- "self_type" : "type-7361", ++ "referenced_type" : "type-7314", ++ "self_type" : "type-7313", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125492,8 +125534,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-7628", +- "self_type" : "type-7627", ++ "referenced_type" : "type-7580", ++ "self_type" : "type-7579", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125501,8 +125543,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-7797", +- "self_type" : "type-7796", ++ "referenced_type" : "type-7749", ++ "self_type" : "type-7748", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125510,8 +125552,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-7880", +- "self_type" : "type-7879", ++ "referenced_type" : "type-7832", ++ "self_type" : "type-7831", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125519,8 +125561,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-7989", +- "self_type" : "type-7988", ++ "referenced_type" : "type-7941", ++ "self_type" : "type-7940", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125528,8 +125570,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-8083", +- "self_type" : "type-8082", ++ "referenced_type" : "type-8035", ++ "self_type" : "type-8034", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125537,8 +125579,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-8359", +- "self_type" : "type-8358", ++ "referenced_type" : "type-8311", ++ "self_type" : "type-8310", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125546,8 +125588,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-8671", +- "self_type" : "type-8670", ++ "referenced_type" : "type-8623", ++ "self_type" : "type-8622", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125555,8 +125597,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-8851", +- "self_type" : "type-8850", ++ "referenced_type" : "type-8803", ++ "self_type" : "type-8802", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125564,8 +125606,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-8904", +- "self_type" : "type-8903", ++ "referenced_type" : "type-8856", ++ "self_type" : "type-8855", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125573,8 +125615,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-9088", +- "self_type" : "type-9087", ++ "referenced_type" : "type-9040", ++ "self_type" : "type-9039", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125582,8 +125624,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-9185", +- "self_type" : "type-9184", ++ "referenced_type" : "type-9137", ++ "self_type" : "type-9136", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125591,8 +125633,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-9291", +- "self_type" : "type-9290", ++ "referenced_type" : "type-9243", ++ "self_type" : "type-9242", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125600,8 +125642,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-9386", +- "self_type" : "type-9385", ++ "referenced_type" : "type-9338", ++ "self_type" : "type-9337", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125609,8 +125651,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-9471", +- "self_type" : "type-9470", ++ "referenced_type" : "type-9423", ++ "self_type" : "type-9422", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125618,8 +125660,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-9538", +- "self_type" : "type-9537", ++ "referenced_type" : "type-9490", ++ "self_type" : "type-9489", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125627,8 +125669,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-9600", +- "self_type" : "type-9599", ++ "referenced_type" : "type-9552", ++ "self_type" : "type-9551", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125636,8 +125678,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-9680", +- "self_type" : "type-9679", ++ "referenced_type" : "type-9632", ++ "self_type" : "type-9631", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125645,8 +125687,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-9763", +- "self_type" : "type-9762", ++ "referenced_type" : "type-9715", ++ "self_type" : "type-9714", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125654,8 +125696,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPool::Tables *", + "name" : "google::protobuf::DescriptorPool::Tables *", +- "referenced_type" : "type-9993", +- "self_type" : "type-9992", ++ "referenced_type" : "type-9945", ++ "self_type" : "type-9944", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125663,8 +125705,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorPoolDatabase *", + "name" : "google::protobuf::DescriptorPoolDatabase *", +- "referenced_type" : "type-3763", +- "self_type" : "type-3942", ++ "referenced_type" : "type-3715", ++ "self_type" : "type-3894", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -125672,8 +125714,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorProto *", + "name" : "google::protobuf::DescriptorProto *", +- "referenced_type" : "type-1677", +- "self_type" : "type-1878", ++ "referenced_type" : "type-1591", ++ "self_type" : "type-1796", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -125681,8 +125723,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorProto_ExtensionRange *", + "name" : "google::protobuf::DescriptorProto_ExtensionRange *", +- "referenced_type" : "type-1696", +- "self_type" : "type-1894", ++ "referenced_type" : "type-1610", ++ "self_type" : "type-1813", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -125690,8 +125732,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DescriptorProto_ReservedRange *", + "name" : "google::protobuf::DescriptorProto_ReservedRange *", +- "referenced_type" : "type-1702", +- "self_type" : "type-1902", ++ "referenced_type" : "type-1616", ++ "self_type" : "type-1821", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -125699,8 +125741,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DoubleValue *", + "name" : "google::protobuf::DoubleValue *", +- "referenced_type" : "type-11048", +- "self_type" : "type-11060", ++ "referenced_type" : "type-11000", ++ "self_type" : "type-11012", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -125708,8 +125750,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Duration *", + "name" : "google::protobuf::Duration *", +- "referenced_type" : "type-4178", +- "self_type" : "type-4177", ++ "referenced_type" : "type-4130", ++ "self_type" : "type-4129", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -125717,8 +125759,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory *", + "name" : "google::protobuf::DynamicMessageFactory *", +- "referenced_type" : "type-3863", +- "self_type" : "type-3864", ++ "referenced_type" : "type-3815", ++ "self_type" : "type-3816", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/dynamic_message.h" + }, +@@ -125726,8 +125768,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-10561", +- "self_type" : "type-10560", ++ "referenced_type" : "type-10513", ++ "self_type" : "type-10512", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125735,8 +125777,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-12253", +- "self_type" : "type-12252", ++ "referenced_type" : "type-12205", ++ "self_type" : "type-12204", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125744,8 +125786,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-12720", +- "self_type" : "type-12719", ++ "referenced_type" : "type-12672", ++ "self_type" : "type-12671", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125753,8 +125795,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-13852", +- "self_type" : "type-13851", ++ "referenced_type" : "type-13804", ++ "self_type" : "type-13803", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125762,8 +125804,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-16108", +- "self_type" : "type-16107", ++ "referenced_type" : "type-16060", ++ "self_type" : "type-16059", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125771,8 +125813,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-16576", +- "self_type" : "type-16575", ++ "referenced_type" : "type-16528", ++ "self_type" : "type-16527", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125780,8 +125822,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-17716", +- "self_type" : "type-17715", ++ "referenced_type" : "type-17668", ++ "self_type" : "type-17667", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125789,8 +125831,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-20640", +- "self_type" : "type-20639", ++ "referenced_type" : "type-20592", ++ "self_type" : "type-20591", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125798,8 +125840,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-21108", +- "self_type" : "type-21107", ++ "referenced_type" : "type-21060", ++ "self_type" : "type-21059", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125807,8 +125849,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-22245", +- "self_type" : "type-22244", ++ "referenced_type" : "type-22226", ++ "self_type" : "type-22225", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125816,8 +125858,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-25037", +- "self_type" : "type-25036", ++ "referenced_type" : "type-25005", ++ "self_type" : "type-25004", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125825,8 +125867,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-25819", +- "self_type" : "type-25818", ++ "referenced_type" : "type-25870", ++ "self_type" : "type-25869", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125834,8 +125876,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-26286", +- "self_type" : "type-26285", ++ "referenced_type" : "type-26329", ++ "self_type" : "type-26328", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125843,8 +125885,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-27430", +- "self_type" : "type-27429", ++ "referenced_type" : "type-27429", ++ "self_type" : "type-27428", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125852,8 +125894,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-30187", +- "self_type" : "type-30186", ++ "referenced_type" : "type-30186", ++ "self_type" : "type-30185", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125861,8 +125903,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-30965", +- "self_type" : "type-30964", ++ "referenced_type" : "type-30964", ++ "self_type" : "type-30963", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125870,8 +125912,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-31433", +- "self_type" : "type-31432", ++ "referenced_type" : "type-31432", ++ "self_type" : "type-31431", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125879,8 +125921,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-3700", +- "self_type" : "type-3699", ++ "referenced_type" : "type-3652", ++ "self_type" : "type-3651", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125888,8 +125930,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-4293", +- "self_type" : "type-4292", ++ "referenced_type" : "type-4245", ++ "self_type" : "type-4244", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125897,8 +125939,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-5661", +- "self_type" : "type-5660", ++ "referenced_type" : "type-5613", ++ "self_type" : "type-5612", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125906,8 +125948,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-6131", +- "self_type" : "type-6130", ++ "referenced_type" : "type-6083", ++ "self_type" : "type-6082", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125915,8 +125957,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-7643", +- "self_type" : "type-7642", ++ "referenced_type" : "type-7595", ++ "self_type" : "type-7594", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125924,8 +125966,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-8919", +- "self_type" : "type-8918", ++ "referenced_type" : "type-8871", ++ "self_type" : "type-8870", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125933,8 +125975,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", + "name" : "google::protobuf::DynamicMessageFactory::PrototypeMap *", +- "referenced_type" : "type-9388", +- "self_type" : "type-9387", ++ "referenced_type" : "type-9340", ++ "self_type" : "type-9339", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -125942,8 +125984,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Empty *", + "name" : "google::protobuf::Empty *", +- "referenced_type" : "type-4395", +- "self_type" : "type-4399", ++ "referenced_type" : "type-4347", ++ "self_type" : "type-4351", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -125951,8 +125993,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::EncodedDescriptorDatabase *", + "name" : "google::protobuf::EncodedDescriptorDatabase *", +- "referenced_type" : "type-3761", +- "self_type" : "type-3941", ++ "referenced_type" : "type-3713", ++ "self_type" : "type-3893", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -125960,8 +126002,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Enum *", + "name" : "google::protobuf::Enum *", +- "referenced_type" : "type-2495", +- "self_type" : "type-2497", ++ "referenced_type" : "type-2425", ++ "self_type" : "type-2427", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, +@@ -125969,8 +126011,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::EnumDescriptor *", + "name" : "google::protobuf::EnumDescriptor *", +- "referenced_type" : "type-1973", +- "self_type" : "type-1972", ++ "referenced_type" : "type-1899", ++ "self_type" : "type-1898", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -125978,8 +126020,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::EnumDescriptorProto *", + "name" : "google::protobuf::EnumDescriptorProto *", +- "referenced_type" : "type-1688", +- "self_type" : "type-1882", ++ "referenced_type" : "type-1602", ++ "self_type" : "type-1800", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -125987,8 +126029,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::EnumOptions *", + "name" : "google::protobuf::EnumOptions *", +- "referenced_type" : "type-1694", +- "self_type" : "type-1693", ++ "referenced_type" : "type-1608", ++ "self_type" : "type-1607", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -125996,8 +126038,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::EnumValue *", + "name" : "google::protobuf::EnumValue *", +- "referenced_type" : "type-2299", +- "self_type" : "type-2372", ++ "referenced_type" : "type-2226", ++ "self_type" : "type-2300", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -126005,8 +126047,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::EnumValueDescriptor *", + "name" : "google::protobuf::EnumValueDescriptor *", +- "referenced_type" : "type-1979", +- "self_type" : "type-1978", ++ "referenced_type" : "type-1905", ++ "self_type" : "type-1904", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -126014,8 +126056,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::EnumValueDescriptorProto *", + "name" : "google::protobuf::EnumValueDescriptorProto *", +- "referenced_type" : "type-1690", +- "self_type" : "type-1906", ++ "referenced_type" : "type-1604", ++ "self_type" : "type-1825", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -126023,8 +126065,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::EnumValueOptions *", + "name" : "google::protobuf::EnumValueOptions *", +- "referenced_type" : "type-1692", +- "self_type" : "type-1691", ++ "referenced_type" : "type-1606", ++ "self_type" : "type-1605", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -126032,8 +126074,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Field *", + "name" : "google::protobuf::Field *", +- "referenced_type" : "type-2296", +- "self_type" : "type-2363", ++ "referenced_type" : "type-2223", ++ "self_type" : "type-2291", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -126041,8 +126083,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::FieldDescriptor *", + "name" : "google::protobuf::FieldDescriptor *", +- "referenced_type" : "type-1996", +- "self_type" : "type-1995", ++ "referenced_type" : "type-1922", ++ "self_type" : "type-1921", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -126050,8 +126092,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::FieldDescriptorProto *", + "name" : "google::protobuf::FieldDescriptorProto *", +- "referenced_type" : "type-1679", +- "self_type" : "type-1890", ++ "referenced_type" : "type-1593", ++ "self_type" : "type-1809", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -126059,8 +126101,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::FieldDescriptorProto_Label *", + "name" : "google::protobuf::FieldDescriptorProto_Label *", +- "referenced_type" : "type-2195", +- "self_type" : "type-2196", ++ "referenced_type" : "type-2126", ++ "self_type" : "type-2127", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_enum_reflection.h" + }, +@@ -126068,8 +126110,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::FieldDescriptorProto_Type *", + "name" : "google::protobuf::FieldDescriptorProto_Type *", +- "referenced_type" : "type-2193", +- "self_type" : "type-2194", ++ "referenced_type" : "type-2124", ++ "self_type" : "type-2125", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_enum_reflection.h" + }, +@@ -126077,8 +126119,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::FieldMask *", + "name" : "google::protobuf::FieldMask *", +- "referenced_type" : "type-6346", +- "self_type" : "type-6345", ++ "referenced_type" : "type-6298", ++ "self_type" : "type-6297", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -126086,8 +126128,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::FieldOptions *", + "name" : "google::protobuf::FieldOptions *", +- "referenced_type" : "type-1681", +- "self_type" : "type-1680", ++ "referenced_type" : "type-1595", ++ "self_type" : "type-1594", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -126095,8 +126137,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::FieldOptions_CType *", + "name" : "google::protobuf::FieldOptions_CType *", +- "referenced_type" : "type-2199", +- "self_type" : "type-2200", ++ "referenced_type" : "type-2130", ++ "self_type" : "type-2131", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_enum_reflection.h" + }, +@@ -126104,8 +126146,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::FieldOptions_JSType *", + "name" : "google::protobuf::FieldOptions_JSType *", +- "referenced_type" : "type-2201", +- "self_type" : "type-2202", ++ "referenced_type" : "type-2132", ++ "self_type" : "type-2133", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_enum_reflection.h" + }, +@@ -126113,8 +126155,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Field_Cardinality *", + "name" : "google::protobuf::Field_Cardinality *", +- "referenced_type" : "type-2479", +- "self_type" : "type-2480", ++ "referenced_type" : "type-2409", ++ "self_type" : "type-2410", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_enum_reflection.h" + }, +@@ -126122,8 +126164,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Field_Kind *", + "name" : "google::protobuf::Field_Kind *", +- "referenced_type" : "type-2477", +- "self_type" : "type-2478", ++ "referenced_type" : "type-2407", ++ "self_type" : "type-2408", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_enum_reflection.h" + }, +@@ -126131,8 +126173,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::FileDescriptor *", + "name" : "google::protobuf::FileDescriptor *", +- "referenced_type" : "type-1961", +- "self_type" : "type-2053", ++ "referenced_type" : "type-1886", ++ "self_type" : "type-1983", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -126140,8 +126182,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::FileDescriptorProto *", + "name" : "google::protobuf::FileDescriptorProto *", +- "referenced_type" : "type-1674", +- "self_type" : "type-1874", ++ "referenced_type" : "type-1587", ++ "self_type" : "type-1792", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -126149,8 +126191,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::FileDescriptorSet *", + "name" : "google::protobuf::FileDescriptorSet *", +- "referenced_type" : "type-2211", +- "self_type" : "type-2213", ++ "referenced_type" : "type-2142", ++ "self_type" : "type-2144", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -126158,8 +126200,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::FileOptions *", + "name" : "google::protobuf::FileOptions *", +- "referenced_type" : "type-1712", +- "self_type" : "type-1711", ++ "referenced_type" : "type-1626", ++ "self_type" : "type-1625", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -126167,8 +126209,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::FileOptions_OptimizeMode *", + "name" : "google::protobuf::FileOptions_OptimizeMode *", +- "referenced_type" : "type-2197", +- "self_type" : "type-2198", ++ "referenced_type" : "type-2128", ++ "self_type" : "type-2129", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_enum_reflection.h" + }, +@@ -126176,8 +126218,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::FloatValue *", + "name" : "google::protobuf::FloatValue *", +- "referenced_type" : "type-11049", +- "self_type" : "type-11061", ++ "referenced_type" : "type-11001", ++ "self_type" : "type-11013", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -126185,8 +126227,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::GeneratedCodeInfo *", + "name" : "google::protobuf::GeneratedCodeInfo *", +- "referenced_type" : "type-2261", +- "self_type" : "type-2263", ++ "referenced_type" : "type-2190", ++ "self_type" : "type-2192", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -126194,8 +126236,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::GeneratedCodeInfo_Annotation *", + "name" : "google::protobuf::GeneratedCodeInfo_Annotation *", +- "referenced_type" : "type-1735", +- "self_type" : "type-1926", ++ "referenced_type" : "type-1648", ++ "self_type" : "type-1847", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -126212,8 +126254,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Int32Value *", + "name" : "google::protobuf::Int32Value *", +- "referenced_type" : "type-11052", +- "self_type" : "type-11064", ++ "referenced_type" : "type-11004", ++ "self_type" : "type-11016", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -126221,8 +126263,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Int64Value *", + "name" : "google::protobuf::Int64Value *", +- "referenced_type" : "type-11050", +- "self_type" : "type-11062", ++ "referenced_type" : "type-11002", ++ "self_type" : "type-11014", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -126230,8 +126272,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ListValue *", + "name" : "google::protobuf::ListValue *", +- "referenced_type" : "type-7234", +- "self_type" : "type-7233", ++ "referenced_type" : "type-7186", ++ "self_type" : "type-7185", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -126248,8 +126290,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-10016", +- "self_type" : "type-10015", ++ "referenced_type" : "type-10342", ++ "self_type" : "type-10341", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126257,8 +126299,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-10390", +- "self_type" : "type-10389", ++ "referenced_type" : "type-12661", ++ "self_type" : "type-12660", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126266,8 +126308,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-12709", +- "self_type" : "type-12708", ++ "referenced_type" : "type-12979", ++ "self_type" : "type-12978", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126275,8 +126317,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-13027", +- "self_type" : "type-13026", ++ "referenced_type" : "type-13301", ++ "self_type" : "type-13300", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126284,8 +126326,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-13349", +- "self_type" : "type-13348", ++ "referenced_type" : "type-13633", ++ "self_type" : "type-13632", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126293,8 +126335,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-13681", +- "self_type" : "type-13680", ++ "referenced_type" : "type-15030", ++ "self_type" : "type-15029", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126302,8 +126344,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-15078", +- "self_type" : "type-15077", ++ "referenced_type" : "type-16517", ++ "self_type" : "type-16516", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126311,8 +126353,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-16565", +- "self_type" : "type-16564", ++ "referenced_type" : "type-16835", ++ "self_type" : "type-16834", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126320,8 +126362,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-16883", +- "self_type" : "type-16882", ++ "referenced_type" : "type-17157", ++ "self_type" : "type-17156", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126329,8 +126371,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-17205", +- "self_type" : "type-17204", ++ "referenced_type" : "type-17497", ++ "self_type" : "type-17496", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126338,8 +126380,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-17545", +- "self_type" : "type-17544", ++ "referenced_type" : "type-18814", ++ "self_type" : "type-18813", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126347,8 +126389,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-18862", +- "self_type" : "type-18861", ++ "referenced_type" : "type-21049", ++ "self_type" : "type-21048", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126356,8 +126398,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-21097", +- "self_type" : "type-21096", ++ "referenced_type" : "type-21367", ++ "self_type" : "type-21366", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126365,8 +126407,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-21415", +- "self_type" : "type-21414", ++ "referenced_type" : "type-21689", ++ "self_type" : "type-21688", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126374,8 +126416,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-21737", +- "self_type" : "type-21736", ++ "referenced_type" : "type-22074", ++ "self_type" : "type-22073", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126383,8 +126425,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-22074", +- "self_type" : "type-22073", ++ "referenced_type" : "type-23375", ++ "self_type" : "type-23374", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126392,8 +126434,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-23391", +- "self_type" : "type-23390", ++ "referenced_type" : "type-26318", ++ "self_type" : "type-26317", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126401,8 +126443,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-26275", +- "self_type" : "type-26274", ++ "referenced_type" : "type-26621", ++ "self_type" : "type-26620", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126410,8 +126452,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-26593", +- "self_type" : "type-26592", ++ "referenced_type" : "type-26935", ++ "self_type" : "type-26934", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126419,8 +126461,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-26915", +- "self_type" : "type-26914", ++ "referenced_type" : "type-27258", ++ "self_type" : "type-27257", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126428,8 +126470,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-27259", +- "self_type" : "type-27258", ++ "referenced_type" : "type-28575", ++ "self_type" : "type-28574", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126437,8 +126479,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-28576", +- "self_type" : "type-28575", ++ "referenced_type" : "type-31421", ++ "self_type" : "type-31420", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126446,8 +126488,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-31422", +- "self_type" : "type-31421", ++ "referenced_type" : "type-31739", ++ "self_type" : "type-31738", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126455,8 +126497,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-31740", +- "self_type" : "type-31739", ++ "referenced_type" : "type-32061", ++ "self_type" : "type-32060", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126464,8 +126506,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-32062", +- "self_type" : "type-32061", ++ "referenced_type" : "type-4232", ++ "self_type" : "type-4231", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126473,8 +126515,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-4280", +- "self_type" : "type-4279", ++ "referenced_type" : "type-6072", ++ "self_type" : "type-6071", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126482,8 +126524,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-6120", +- "self_type" : "type-6119", ++ "referenced_type" : "type-6395", ++ "self_type" : "type-6394", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126491,26 +126533,26 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-6443", +- "self_type" : "type-6442", ++ "referenced_type" : "type-6465", ++ "self_type" : "type-6512", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/map.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, + { + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-6513", +- "self_type" : "type-6560", ++ "referenced_type" : "type-6879", ++ "self_type" : "type-6878", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/arena.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-6927", +- "self_type" : "type-6926", ++ "referenced_type" : "type-7367", ++ "self_type" : "type-7366", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126518,8 +126560,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-7415", +- "self_type" : "type-7414", ++ "referenced_type" : "type-9329", ++ "self_type" : "type-9328", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126527,8 +126569,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-9377", +- "self_type" : "type-9376", ++ "referenced_type" : "type-9647", ++ "self_type" : "type-9646", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126536,8 +126578,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap *", + "name" : "google::protobuf::Map::InnerMap *", +- "referenced_type" : "type-9695", +- "self_type" : "type-9694", ++ "referenced_type" : "type-9968", ++ "self_type" : "type-9967", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126545,8 +126587,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap::Node *", + "name" : "google::protobuf::Map::InnerMap::Node *", +- "referenced_type" : "type-6584", +- "self_type" : "type-6585", ++ "referenced_type" : "type-6536", ++ "self_type" : "type-6537", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126554,8 +126596,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap::iterator_base::KeyValuePair> *", + "name" : "google::protobuf::Map::InnerMap::iterator_base::KeyValuePair> *", +- "referenced_type" : "type-6657", +- "self_type" : "type-6665", ++ "referenced_type" : "type-6609", ++ "self_type" : "type-6617", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126563,8 +126605,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::InnerMap::iterator_base::KeyValuePair> *", + "name" : "google::protobuf::Map::InnerMap::iterator_base::KeyValuePair> *", +- "referenced_type" : "type-6651", +- "self_type" : "type-6655", ++ "referenced_type" : "type-6603", ++ "self_type" : "type-6607", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126572,8 +126614,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::KeyValuePair *", + "name" : "google::protobuf::Map::KeyValuePair *", +- "referenced_type" : "type-6515", +- "self_type" : "type-6578", ++ "referenced_type" : "type-6467", ++ "self_type" : "type-6530", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126581,8 +126623,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::MapAllocator::InnerMap::Node> *", + "name" : "google::protobuf::Map::MapAllocator::InnerMap::Node> *", +- "referenced_type" : "type-6630", +- "self_type" : "type-6631", ++ "referenced_type" : "type-6582", ++ "self_type" : "type-6583", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126590,8 +126632,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::MapAllocator::KeyValuePair> *", + "name" : "google::protobuf::Map::MapAllocator::KeyValuePair> *", +- "referenced_type" : "type-6514", +- "self_type" : "type-6577", ++ "referenced_type" : "type-6466", ++ "self_type" : "type-6529", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126599,8 +126641,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::MapAllocator *", + "name" : "google::protobuf::Map::MapAllocator *", +- "referenced_type" : "type-6591", +- "self_type" : "type-6592", ++ "referenced_type" : "type-6543", ++ "self_type" : "type-6544", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126608,8 +126650,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::MapAllocator > *", + "name" : "google::protobuf::Map::MapAllocator > *", +- "referenced_type" : "type-6614", +- "self_type" : "type-6616", ++ "referenced_type" : "type-6566", ++ "self_type" : "type-6568", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126617,8 +126659,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::MapAllocator *>, void *> > *", + "name" : "google::protobuf::Map::MapAllocator *>, void *> > *", +- "referenced_type" : "type-6600", +- "self_type" : "type-6602", ++ "referenced_type" : "type-6552", ++ "self_type" : "type-6554", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126626,8 +126668,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::MapAllocator *> > *", + "name" : "google::protobuf::Map::MapAllocator *> > *", +- "referenced_type" : "type-6595", +- "self_type" : "type-6597", ++ "referenced_type" : "type-6547", ++ "self_type" : "type-6549", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126635,8 +126677,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::MapAllocator *> > *", + "name" : "google::protobuf::Map::MapAllocator *> > *", +- "referenced_type" : "type-6509", +- "self_type" : "type-6588", ++ "referenced_type" : "type-6461", ++ "self_type" : "type-6540", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126644,8 +126686,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::MapAllocator::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > > *", + "name" : "google::protobuf::Map::MapAllocator::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > > *", +- "referenced_type" : "type-6634", +- "self_type" : "type-6636", ++ "referenced_type" : "type-6586", ++ "self_type" : "type-6588", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126653,8 +126695,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::MapAllocator *", + "name" : "google::protobuf::Map::MapAllocator *", +- "referenced_type" : "type-6628", +- "self_type" : "type-6629", ++ "referenced_type" : "type-6580", ++ "self_type" : "type-6581", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126662,8 +126704,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::const_iterator *", + "name" : "google::protobuf::Map::const_iterator *", +- "referenced_type" : "type-6674", +- "self_type" : "type-6677", ++ "referenced_type" : "type-6626", ++ "self_type" : "type-6629", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126671,8 +126713,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::iterator *", + "name" : "google::protobuf::Map::iterator *", +- "referenced_type" : "type-6688", +- "self_type" : "type-6691", ++ "referenced_type" : "type-6640", ++ "self_type" : "type-6643", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126680,8 +126722,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map::iterator_base *", + "name" : "google::protobuf::Map::iterator_base *", +- "referenced_type" : "type-6668", +- "self_type" : "type-6670", ++ "referenced_type" : "type-6620", ++ "self_type" : "type-6622", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126689,8 +126731,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map, Value>::InnerMap *", + "name" : "google::protobuf::Map, Value>::InnerMap *", +- "referenced_type" : "type-7205", +- "self_type" : "type-7204", ++ "referenced_type" : "type-7157", ++ "self_type" : "type-7156", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -126698,8 +126740,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map, Value>::InnerMap::Node *", + "name" : "google::protobuf::Map, Value>::InnerMap::Node *", +- "referenced_type" : "type-7426", +- "self_type" : "type-7427", ++ "referenced_type" : "type-7378", ++ "self_type" : "type-7379", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126707,8 +126749,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map, Value>::InnerMap::iterator_base, Value>::KeyValuePair> *", + "name" : "google::protobuf::Map, Value>::InnerMap::iterator_base, Value>::KeyValuePair> *", +- "referenced_type" : "type-7502", +- "self_type" : "type-7510", ++ "referenced_type" : "type-7454", ++ "self_type" : "type-7462", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126716,8 +126758,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map, Value>::InnerMap::iterator_base, Value>::KeyValuePair> *", + "name" : "google::protobuf::Map, Value>::InnerMap::iterator_base, Value>::KeyValuePair> *", +- "referenced_type" : "type-7493", +- "self_type" : "type-7497", ++ "referenced_type" : "type-7445", ++ "self_type" : "type-7449", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126725,8 +126767,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map, Value>::KeyValuePair *", + "name" : "google::protobuf::Map, Value>::KeyValuePair *", +- "referenced_type" : "type-7209", +- "self_type" : "type-7419", ++ "referenced_type" : "type-7161", ++ "self_type" : "type-7371", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126734,8 +126776,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map, Value>::MapAllocator, Value>::InnerMap::Node> *", + "name" : "google::protobuf::Map, Value>::MapAllocator, Value>::InnerMap::Node> *", +- "referenced_type" : "type-7478", +- "self_type" : "type-7479", ++ "referenced_type" : "type-7430", ++ "self_type" : "type-7431", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126743,8 +126785,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map, Value>::MapAllocator, Value>::KeyValuePair> *", + "name" : "google::protobuf::Map, Value>::MapAllocator, Value>::KeyValuePair> *", +- "referenced_type" : "type-7207", +- "self_type" : "type-7418", ++ "referenced_type" : "type-7159", ++ "self_type" : "type-7370", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126752,8 +126794,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map, Value>::MapAllocator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> > *", + "name" : "google::protobuf::Map, Value>::MapAllocator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> > *", +- "referenced_type" : "type-7441", +- "self_type" : "type-7443", ++ "referenced_type" : "type-7393", ++ "self_type" : "type-7395", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126761,8 +126803,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map, Value>::MapAllocator, std::allocator > *, void *> > *", + "name" : "google::protobuf::Map, Value>::MapAllocator, std::allocator > *, void *> > *", +- "referenced_type" : "type-7457", +- "self_type" : "type-7459", ++ "referenced_type" : "type-7409", ++ "self_type" : "type-7411", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126770,8 +126812,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map, Value>::MapAllocator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *> > *", + "name" : "google::protobuf::Map, Value>::MapAllocator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *> > *", +- "referenced_type" : "type-7436", +- "self_type" : "type-7438", ++ "referenced_type" : "type-7388", ++ "self_type" : "type-7390", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126779,8 +126821,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map, Value>::MapAllocator, std::allocator > *> *", + "name" : "google::protobuf::Map, Value>::MapAllocator, std::allocator > *> *", +- "referenced_type" : "type-7432", +- "self_type" : "type-7433", ++ "referenced_type" : "type-7384", ++ "self_type" : "type-7385", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126788,8 +126830,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map, Value>::MapAllocator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *> > *", + "name" : "google::protobuf::Map, Value>::MapAllocator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *> > *", +- "referenced_type" : "type-7242", +- "self_type" : "type-7429", ++ "referenced_type" : "type-7194", ++ "self_type" : "type-7381", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126797,8 +126839,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map, Value>::MapAllocator, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > > *", + "name" : "google::protobuf::Map, Value>::MapAllocator, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > > *", +- "referenced_type" : "type-7469", +- "self_type" : "type-7471", ++ "referenced_type" : "type-7421", ++ "self_type" : "type-7423", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126806,8 +126848,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map, Value>::MapAllocator *", + "name" : "google::protobuf::Map, Value>::MapAllocator *", +- "referenced_type" : "type-7482", +- "self_type" : "type-7483", ++ "referenced_type" : "type-7434", ++ "self_type" : "type-7435", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126815,8 +126857,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map, Value>::const_iterator *", + "name" : "google::protobuf::Map, Value>::const_iterator *", +- "referenced_type" : "type-7519", +- "self_type" : "type-7522", ++ "referenced_type" : "type-7471", ++ "self_type" : "type-7474", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126824,8 +126866,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map, Value>::iterator *", + "name" : "google::protobuf::Map, Value>::iterator *", +- "referenced_type" : "type-7533", +- "self_type" : "type-7536", ++ "referenced_type" : "type-7485", ++ "self_type" : "type-7488", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126833,8 +126875,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map, Value>::iterator_base *", + "name" : "google::protobuf::Map, Value>::iterator_base *", +- "referenced_type" : "type-7513", +- "self_type" : "type-7515", ++ "referenced_type" : "type-7465", ++ "self_type" : "type-7467", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126842,8 +126884,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map *", + "name" : "google::protobuf::Map *", +- "referenced_type" : "type-4277", +- "self_type" : "type-6576", ++ "referenced_type" : "type-4229", ++ "self_type" : "type-6528", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126851,8 +126893,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Map, std::allocator >, google::protobuf::Value> *", + "name" : "google::protobuf::Map, std::allocator >, google::protobuf::Value> *", +- "referenced_type" : "type-7201", +- "self_type" : "type-7200", ++ "referenced_type" : "type-7153", ++ "self_type" : "type-7152", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126860,8 +126902,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapIterator *", + "name" : "google::protobuf::MapIterator *", +- "referenced_type" : "type-4284", +- "self_type" : "type-4286", ++ "referenced_type" : "type-4236", ++ "self_type" : "type-4238", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, +@@ -126869,8 +126911,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapKey *", + "name" : "google::protobuf::MapKey *", +- "referenced_type" : "type-4256", +- "self_type" : "type-4383", ++ "referenced_type" : "type-4208", ++ "self_type" : "type-4335", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126878,8 +126920,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapKey::KeyValue *", + "name" : "google::protobuf::MapKey::KeyValue *", +- "referenced_type" : "type-4257", +- "self_type" : "type-4385", ++ "referenced_type" : "type-4209", ++ "self_type" : "type-4337", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126887,8 +126929,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapPair *", + "name" : "google::protobuf::MapPair *", +- "referenced_type" : "type-6507", +- "self_type" : "type-6506", ++ "referenced_type" : "type-6459", ++ "self_type" : "type-6458", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126896,8 +126938,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *", + "name" : "google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *", +- "referenced_type" : "type-7212", +- "self_type" : "type-7211", ++ "referenced_type" : "type-7164", ++ "self_type" : "type-7163", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -126905,8 +126947,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-10110", +- "self_type" : "type-10109", ++ "referenced_type" : "type-10062", ++ "self_type" : "type-10061", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -126914,8 +126956,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-10251", +- "self_type" : "type-10250", ++ "referenced_type" : "type-10203", ++ "self_type" : "type-10202", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -126923,8 +126965,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-10593", +- "self_type" : "type-10592", ++ "referenced_type" : "type-10545", ++ "self_type" : "type-10544", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -126932,8 +126974,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-10751", +- "self_type" : "type-10750", ++ "referenced_type" : "type-10703", ++ "self_type" : "type-10702", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -126941,8 +126983,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-10839", +- "self_type" : "type-10838", ++ "referenced_type" : "type-10791", ++ "self_type" : "type-10790", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -126950,8 +126992,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-10929", +- "self_type" : "type-10928", ++ "referenced_type" : "type-10881", ++ "self_type" : "type-10880", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -126959,8 +127001,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-11012", +- "self_type" : "type-11011", ++ "referenced_type" : "type-10964", ++ "self_type" : "type-10963", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -126968,8 +127010,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-11088", +- "self_type" : "type-11087", ++ "referenced_type" : "type-11040", ++ "self_type" : "type-11039", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -126977,8 +127019,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-11281", +- "self_type" : "type-11280", ++ "referenced_type" : "type-11233", ++ "self_type" : "type-11232", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -126986,8 +127028,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-11438", +- "self_type" : "type-11437", ++ "referenced_type" : "type-11390", ++ "self_type" : "type-11389", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -126995,8 +127037,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-11896", +- "self_type" : "type-11895", ++ "referenced_type" : "type-11848", ++ "self_type" : "type-11847", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127004,8 +127046,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-12067", +- "self_type" : "type-12066", ++ "referenced_type" : "type-12019", ++ "self_type" : "type-12018", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127013,8 +127055,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-12171", +- "self_type" : "type-12170", ++ "referenced_type" : "type-12123", ++ "self_type" : "type-12122", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127022,8 +127064,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-12310", +- "self_type" : "type-12309", ++ "referenced_type" : "type-12262", ++ "self_type" : "type-12261", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127031,8 +127073,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-12457", +- "self_type" : "type-12456", ++ "referenced_type" : "type-12409", ++ "self_type" : "type-12408", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127040,8 +127082,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-12550", +- "self_type" : "type-12549", ++ "referenced_type" : "type-12502", ++ "self_type" : "type-12501", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127049,8 +127091,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-12651", +- "self_type" : "type-12650", ++ "referenced_type" : "type-12603", ++ "self_type" : "type-12602", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127058,8 +127100,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-12833", +- "self_type" : "type-12832", ++ "referenced_type" : "type-12785", ++ "self_type" : "type-12784", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127067,8 +127109,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-12913", +- "self_type" : "type-12912", ++ "referenced_type" : "type-12865", ++ "self_type" : "type-12864", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127076,8 +127118,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-12971", +- "self_type" : "type-12970", ++ "referenced_type" : "type-12923", ++ "self_type" : "type-12922", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127085,8 +127127,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-13443", +- "self_type" : "type-13442", ++ "referenced_type" : "type-13395", ++ "self_type" : "type-13394", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127094,8 +127136,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-13542", +- "self_type" : "type-13541", ++ "referenced_type" : "type-13494", ++ "self_type" : "type-13493", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127103,8 +127145,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-13884", +- "self_type" : "type-13883", ++ "referenced_type" : "type-13836", ++ "self_type" : "type-13835", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127112,8 +127154,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-14042", +- "self_type" : "type-14041", ++ "referenced_type" : "type-13994", ++ "self_type" : "type-13993", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127121,8 +127163,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-14130", +- "self_type" : "type-14129", ++ "referenced_type" : "type-14082", ++ "self_type" : "type-14081", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127130,8 +127172,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-14220", +- "self_type" : "type-14219", ++ "referenced_type" : "type-14172", ++ "self_type" : "type-14171", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127139,8 +127181,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-14303", +- "self_type" : "type-14302", ++ "referenced_type" : "type-14255", ++ "self_type" : "type-14254", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127148,8 +127190,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-14370", +- "self_type" : "type-14369", ++ "referenced_type" : "type-14322", ++ "self_type" : "type-14321", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127157,8 +127199,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-14532", +- "self_type" : "type-14531", ++ "referenced_type" : "type-14484", ++ "self_type" : "type-14483", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127166,8 +127208,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-14657", +- "self_type" : "type-14656", ++ "referenced_type" : "type-14609", ++ "self_type" : "type-14608", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127175,8 +127217,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-14792", +- "self_type" : "type-14791", ++ "referenced_type" : "type-14744", ++ "self_type" : "type-14743", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127184,8 +127226,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-14890", +- "self_type" : "type-14889", ++ "referenced_type" : "type-14842", ++ "self_type" : "type-14841", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127193,8 +127235,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-15250", +- "self_type" : "type-15249", ++ "referenced_type" : "type-15202", ++ "self_type" : "type-15201", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127202,8 +127244,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-15753", +- "self_type" : "type-15752", ++ "referenced_type" : "type-15705", ++ "self_type" : "type-15704", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127211,8 +127253,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-15923", +- "self_type" : "type-15922", ++ "referenced_type" : "type-15875", ++ "self_type" : "type-15874", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127220,8 +127262,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-16026", +- "self_type" : "type-16025", ++ "referenced_type" : "type-15978", ++ "self_type" : "type-15977", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127229,8 +127271,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-16165", +- "self_type" : "type-16164", ++ "referenced_type" : "type-16117", ++ "self_type" : "type-16116", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127238,8 +127280,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-16314", +- "self_type" : "type-16313", ++ "referenced_type" : "type-16266", ++ "self_type" : "type-16265", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127247,8 +127289,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-16407", +- "self_type" : "type-16406", ++ "referenced_type" : "type-16359", ++ "self_type" : "type-16358", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127256,8 +127298,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-16507", +- "self_type" : "type-16506", ++ "referenced_type" : "type-16459", ++ "self_type" : "type-16458", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127265,8 +127307,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-16689", +- "self_type" : "type-16688", ++ "referenced_type" : "type-16641", ++ "self_type" : "type-16640", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127274,8 +127316,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-16769", +- "self_type" : "type-16768", ++ "referenced_type" : "type-16721", ++ "self_type" : "type-16720", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127283,8 +127325,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-16827", +- "self_type" : "type-16826", ++ "referenced_type" : "type-16779", ++ "self_type" : "type-16778", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127292,8 +127334,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-17299", +- "self_type" : "type-17298", ++ "referenced_type" : "type-17251", ++ "self_type" : "type-17250", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127301,8 +127343,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-17406", +- "self_type" : "type-17405", ++ "referenced_type" : "type-17358", ++ "self_type" : "type-17357", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127310,8 +127352,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-17748", +- "self_type" : "type-17747", ++ "referenced_type" : "type-17700", ++ "self_type" : "type-17699", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127319,8 +127361,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-17906", +- "self_type" : "type-17905", ++ "referenced_type" : "type-17858", ++ "self_type" : "type-17857", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127328,8 +127370,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-17994", +- "self_type" : "type-17993", ++ "referenced_type" : "type-17946", ++ "self_type" : "type-17945", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127337,8 +127379,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-18084", +- "self_type" : "type-18083", ++ "referenced_type" : "type-18036", ++ "self_type" : "type-18035", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127346,8 +127388,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-18167", +- "self_type" : "type-18166", ++ "referenced_type" : "type-18119", ++ "self_type" : "type-18118", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127355,8 +127397,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-18234", +- "self_type" : "type-18233", ++ "referenced_type" : "type-18186", ++ "self_type" : "type-18185", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127364,8 +127406,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-18396", +- "self_type" : "type-18395", ++ "referenced_type" : "type-18348", ++ "self_type" : "type-18347", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127373,8 +127415,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-18521", +- "self_type" : "type-18520", ++ "referenced_type" : "type-18473", ++ "self_type" : "type-18472", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127382,8 +127424,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-18656", +- "self_type" : "type-18655", ++ "referenced_type" : "type-18608", ++ "self_type" : "type-18607", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127391,8 +127433,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-18747", +- "self_type" : "type-18746", ++ "referenced_type" : "type-18699", ++ "self_type" : "type-18698", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127400,8 +127442,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-19026", +- "self_type" : "type-19025", ++ "referenced_type" : "type-18978", ++ "self_type" : "type-18977", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127409,8 +127451,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-19269", +- "self_type" : "type-19268", ++ "referenced_type" : "type-19221", ++ "self_type" : "type-19220", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127418,8 +127460,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-19420", +- "self_type" : "type-19419", ++ "referenced_type" : "type-19372", ++ "self_type" : "type-19371", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127427,8 +127469,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-19607", +- "self_type" : "type-19606", ++ "referenced_type" : "type-19559", ++ "self_type" : "type-19558", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127436,8 +127478,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-19778", +- "self_type" : "type-19777", ++ "referenced_type" : "type-19730", ++ "self_type" : "type-19729", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127445,8 +127487,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-19937", +- "self_type" : "type-19936", ++ "referenced_type" : "type-19889", ++ "self_type" : "type-19888", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127454,8 +127496,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-20286", +- "self_type" : "type-20285", ++ "referenced_type" : "type-20238", ++ "self_type" : "type-20237", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127463,8 +127505,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-20457", +- "self_type" : "type-20456", ++ "referenced_type" : "type-20409", ++ "self_type" : "type-20408", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127472,8 +127514,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-20558", +- "self_type" : "type-20557", ++ "referenced_type" : "type-20510", ++ "self_type" : "type-20509", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127481,8 +127523,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-20696", +- "self_type" : "type-20695", ++ "referenced_type" : "type-20648", ++ "self_type" : "type-20647", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127490,8 +127532,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-20845", +- "self_type" : "type-20844", ++ "referenced_type" : "type-20797", ++ "self_type" : "type-20796", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127499,8 +127541,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-20938", +- "self_type" : "type-20937", ++ "referenced_type" : "type-2080", ++ "self_type" : "type-2079", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127508,8 +127550,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-21039", +- "self_type" : "type-21038", ++ "referenced_type" : "type-20890", ++ "self_type" : "type-20889", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127517,8 +127559,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-21221", +- "self_type" : "type-21220", ++ "referenced_type" : "type-20991", ++ "self_type" : "type-20990", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127526,8 +127568,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-21301", +- "self_type" : "type-21300", ++ "referenced_type" : "type-21173", ++ "self_type" : "type-21172", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127535,8 +127577,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-21359", +- "self_type" : "type-21358", ++ "referenced_type" : "type-21253", ++ "self_type" : "type-21252", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127544,8 +127586,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-2149", +- "self_type" : "type-2148", ++ "referenced_type" : "type-21311", ++ "self_type" : "type-21310", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127553,8 +127595,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-21831", +- "self_type" : "type-21830", ++ "referenced_type" : "type-21783", ++ "self_type" : "type-21782", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127571,8 +127613,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-22277", +- "self_type" : "type-22276", ++ "referenced_type" : "type-22250", ++ "self_type" : "type-22249", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127580,8 +127622,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-22435", +- "self_type" : "type-22434", ++ "referenced_type" : "type-22382", ++ "self_type" : "type-22381", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127589,8 +127631,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-22523", +- "self_type" : "type-22522", ++ "referenced_type" : "type-22440", ++ "self_type" : "type-22439", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127598,8 +127640,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-22613", +- "self_type" : "type-22612", ++ "referenced_type" : "type-22521", ++ "self_type" : "type-22520", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127607,8 +127649,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-22696", +- "self_type" : "type-22695", ++ "referenced_type" : "type-22620", ++ "self_type" : "type-22619", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127616,8 +127658,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-22763", +- "self_type" : "type-22762", ++ "referenced_type" : "type-22706", ++ "self_type" : "type-22705", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127625,8 +127667,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-22925", +- "self_type" : "type-22924", ++ "referenced_type" : "type-22889", ++ "self_type" : "type-22888", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127634,8 +127676,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-23050", +- "self_type" : "type-23049", ++ "referenced_type" : "type-23032", ++ "self_type" : "type-23031", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127643,8 +127685,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-23185", +- "self_type" : "type-23184", ++ "referenced_type" : "type-23170", ++ "self_type" : "type-23169", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127652,8 +127694,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-23276", +- "self_type" : "type-23275", ++ "referenced_type" : "type-23269", ++ "self_type" : "type-23268", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127661,8 +127703,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-23555", +- "self_type" : "type-23554", ++ "referenced_type" : "type-23535", ++ "self_type" : "type-23534", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127670,8 +127712,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-23790", +- "self_type" : "type-23789", ++ "referenced_type" : "type-2367", ++ "self_type" : "type-2366", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127679,8 +127721,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-23920", +- "self_type" : "type-23919", ++ "referenced_type" : "type-23779", ++ "self_type" : "type-23778", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127688,8 +127730,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-24077", +- "self_type" : "type-24076", ++ "referenced_type" : "type-23921", ++ "self_type" : "type-23920", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127697,8 +127739,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-24245", +- "self_type" : "type-24244", ++ "referenced_type" : "type-24075", ++ "self_type" : "type-24074", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127706,8 +127748,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-2437", +- "self_type" : "type-2436", ++ "referenced_type" : "type-24249", ++ "self_type" : "type-24248", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127715,8 +127757,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-24400", +- "self_type" : "type-24399", ++ "referenced_type" : "type-24381", ++ "self_type" : "type-24380", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127724,8 +127766,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-24555", +- "self_type" : "type-24554", ++ "referenced_type" : "type-24525", ++ "self_type" : "type-24524", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127733,8 +127775,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-24691", +- "self_type" : "type-24690", ++ "referenced_type" : "type-24653", ++ "self_type" : "type-24652", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127742,8 +127784,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-24822", +- "self_type" : "type-24821", ++ "referenced_type" : "type-24782", ++ "self_type" : "type-24781", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127751,8 +127793,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-24981", +- "self_type" : "type-24980", ++ "referenced_type" : "type-2492", ++ "self_type" : "type-2491", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127760,8 +127802,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-25108", +- "self_type" : "type-25107", ++ "referenced_type" : "type-24948", ++ "self_type" : "type-24947", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127769,8 +127811,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-25206", +- "self_type" : "type-25205", ++ "referenced_type" : "type-25081", ++ "self_type" : "type-25080", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127778,8 +127820,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-25462", +- "self_type" : "type-25461", ++ "referenced_type" : "type-25206", ++ "self_type" : "type-25205", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127787,8 +127829,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-2560", +- "self_type" : "type-2559", ++ "referenced_type" : "type-25513", ++ "self_type" : "type-25512", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127796,8 +127838,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-25633", +- "self_type" : "type-25632", ++ "referenced_type" : "type-25684", ++ "self_type" : "type-25683", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127805,8 +127847,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-25737", +- "self_type" : "type-25736", ++ "referenced_type" : "type-25786", ++ "self_type" : "type-25785", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127814,8 +127856,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-25875", +- "self_type" : "type-25874", ++ "referenced_type" : "type-25926", ++ "self_type" : "type-25925", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127823,8 +127865,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-26023", +- "self_type" : "type-26022", ++ "referenced_type" : "type-26076", ++ "self_type" : "type-26075", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127832,8 +127874,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-26116", +- "self_type" : "type-26115", ++ "referenced_type" : "type-26161", ++ "self_type" : "type-26160", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127841,8 +127883,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-26217", +- "self_type" : "type-26216", ++ "referenced_type" : "type-26259", ++ "self_type" : "type-26258", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127850,8 +127892,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-26399", +- "self_type" : "type-26398", ++ "referenced_type" : "type-26441", ++ "self_type" : "type-26440", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127859,8 +127901,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-26479", +- "self_type" : "type-26478", ++ "referenced_type" : "type-26515", ++ "self_type" : "type-26514", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127868,8 +127910,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-26537", +- "self_type" : "type-26536", ++ "referenced_type" : "type-26562", ++ "self_type" : "type-26561", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127877,8 +127919,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-27009", +- "self_type" : "type-27008", ++ "referenced_type" : "type-27039", ++ "self_type" : "type-27038", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127886,8 +127928,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-27120", +- "self_type" : "type-27119", ++ "referenced_type" : "type-27119", ++ "self_type" : "type-27118", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127895,8 +127937,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-27462", +- "self_type" : "type-27461", ++ "referenced_type" : "type-27461", ++ "self_type" : "type-27460", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127904,8 +127946,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-27620", +- "self_type" : "type-27619", ++ "referenced_type" : "type-27619", ++ "self_type" : "type-27618", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127913,8 +127955,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-27708", +- "self_type" : "type-27707", ++ "referenced_type" : "type-27707", ++ "self_type" : "type-27706", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127922,8 +127964,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-27798", +- "self_type" : "type-27797", ++ "referenced_type" : "type-27797", ++ "self_type" : "type-27796", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127931,8 +127973,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-27881", +- "self_type" : "type-27880", ++ "referenced_type" : "type-27880", ++ "self_type" : "type-27879", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127940,8 +127982,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-27948", +- "self_type" : "type-27947", ++ "referenced_type" : "type-27947", ++ "self_type" : "type-27946", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127949,8 +127991,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-28110", +- "self_type" : "type-28109", ++ "referenced_type" : "type-28109", ++ "self_type" : "type-28108", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127958,8 +128000,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-28235", +- "self_type" : "type-28234", ++ "referenced_type" : "type-28234", ++ "self_type" : "type-28233", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127967,8 +128009,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-28370", +- "self_type" : "type-28369", ++ "referenced_type" : "type-28369", ++ "self_type" : "type-28368", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127976,8 +128018,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-28461", +- "self_type" : "type-28460", ++ "referenced_type" : "type-28460", ++ "self_type" : "type-28459", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127985,8 +128027,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-28740", +- "self_type" : "type-28739", ++ "referenced_type" : "type-28739", ++ "self_type" : "type-28738", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -127994,8 +128036,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-28975", +- "self_type" : "type-28974", ++ "referenced_type" : "type-28974", ++ "self_type" : "type-28973", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128003,8 +128045,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-29105", +- "self_type" : "type-29104", ++ "referenced_type" : "type-29104", ++ "self_type" : "type-29103", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128012,8 +128054,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-29262", +- "self_type" : "type-29261", ++ "referenced_type" : "type-29261", ++ "self_type" : "type-29260", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128021,8 +128063,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-29430", +- "self_type" : "type-29429", ++ "referenced_type" : "type-29429", ++ "self_type" : "type-29428", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128030,8 +128072,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-29585", +- "self_type" : "type-29584", ++ "referenced_type" : "type-29584", ++ "self_type" : "type-29583", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128039,8 +128081,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-29740", +- "self_type" : "type-29739", ++ "referenced_type" : "type-29739", ++ "self_type" : "type-29738", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128048,8 +128090,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-29872", +- "self_type" : "type-29871", ++ "referenced_type" : "type-29871", ++ "self_type" : "type-29870", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128057,8 +128099,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-30001", +- "self_type" : "type-30000", ++ "referenced_type" : "type-30000", ++ "self_type" : "type-29999", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128066,8 +128108,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-30137", +- "self_type" : "type-30136", ++ "referenced_type" : "type-30136", ++ "self_type" : "type-30135", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128075,8 +128117,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-30253", +- "self_type" : "type-30252", ++ "referenced_type" : "type-30252", ++ "self_type" : "type-30251", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128084,8 +128126,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-30350", +- "self_type" : "type-30349", ++ "referenced_type" : "type-30349", ++ "self_type" : "type-30348", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128093,8 +128135,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-30608", +- "self_type" : "type-30607", ++ "referenced_type" : "type-30607", ++ "self_type" : "type-30606", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128102,8 +128144,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-30779", +- "self_type" : "type-30778", ++ "referenced_type" : "type-30778", ++ "self_type" : "type-30777", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128111,8 +128153,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-30883", +- "self_type" : "type-30882", ++ "referenced_type" : "type-30882", ++ "self_type" : "type-30881", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128120,8 +128162,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-31021", +- "self_type" : "type-31020", ++ "referenced_type" : "type-31020", ++ "self_type" : "type-31019", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128129,8 +128171,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-31170", +- "self_type" : "type-31169", ++ "referenced_type" : "type-31169", ++ "self_type" : "type-31168", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128138,8 +128180,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-31263", +- "self_type" : "type-31262", ++ "referenced_type" : "type-31262", ++ "self_type" : "type-31261", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128147,8 +128189,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-31364", +- "self_type" : "type-31363", ++ "referenced_type" : "type-31363", ++ "self_type" : "type-31362", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128156,8 +128198,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-31546", +- "self_type" : "type-31545", ++ "referenced_type" : "type-31545", ++ "self_type" : "type-31544", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128165,8 +128207,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-31626", +- "self_type" : "type-31625", ++ "referenced_type" : "type-31625", ++ "self_type" : "type-31624", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128174,8 +128216,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-31684", +- "self_type" : "type-31683", ++ "referenced_type" : "type-31683", ++ "self_type" : "type-31682", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128183,8 +128225,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-32156", +- "self_type" : "type-32155", ++ "referenced_type" : "type-32155", ++ "self_type" : "type-32154", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128192,8 +128234,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-3313", +- "self_type" : "type-3312", ++ "referenced_type" : "type-3265", ++ "self_type" : "type-3264", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128201,8 +128243,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-3490", +- "self_type" : "type-3489", ++ "referenced_type" : "type-3442", ++ "self_type" : "type-3441", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128210,8 +128252,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-3600", +- "self_type" : "type-3599", ++ "referenced_type" : "type-3552", ++ "self_type" : "type-3551", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128219,8 +128261,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-3790", +- "self_type" : "type-3789", ++ "referenced_type" : "type-3742", ++ "self_type" : "type-3741", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128228,8 +128270,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-3960", +- "self_type" : "type-3959", ++ "referenced_type" : "type-3912", ++ "self_type" : "type-3911", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128237,8 +128279,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-4102", +- "self_type" : "type-4101", ++ "referenced_type" : "type-4054", ++ "self_type" : "type-4053", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128246,8 +128288,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-4206", +- "self_type" : "type-4205", ++ "referenced_type" : "type-4158", ++ "self_type" : "type-4157", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128255,8 +128297,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-4244", +- "self_type" : "type-4361", ++ "referenced_type" : "type-4196", ++ "self_type" : "type-4313", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128264,8 +128306,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-4420", +- "self_type" : "type-4419", ++ "referenced_type" : "type-4372", ++ "self_type" : "type-4371", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128273,8 +128315,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-4501", +- "self_type" : "type-4500", ++ "referenced_type" : "type-4453", ++ "self_type" : "type-4452", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128282,8 +128324,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-4667", +- "self_type" : "type-4666", ++ "referenced_type" : "type-4619", ++ "self_type" : "type-4618", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128291,8 +128333,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-5293", +- "self_type" : "type-5292", ++ "referenced_type" : "type-5245", ++ "self_type" : "type-5244", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128300,8 +128342,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-5470", +- "self_type" : "type-5469", ++ "referenced_type" : "type-5422", ++ "self_type" : "type-5421", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128309,8 +128351,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-5578", +- "self_type" : "type-5577", ++ "referenced_type" : "type-5530", ++ "self_type" : "type-5529", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128318,8 +128360,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-5719", +- "self_type" : "type-5718", ++ "referenced_type" : "type-5671", ++ "self_type" : "type-5670", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128327,8 +128369,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-5868", +- "self_type" : "type-5867", ++ "referenced_type" : "type-5820", ++ "self_type" : "type-5819", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128336,8 +128378,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-5961", +- "self_type" : "type-5960", ++ "referenced_type" : "type-5913", ++ "self_type" : "type-5912", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128345,8 +128387,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-6062", +- "self_type" : "type-6061", ++ "referenced_type" : "type-6014", ++ "self_type" : "type-6013", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128354,8 +128396,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-6244", +- "self_type" : "type-6243", ++ "referenced_type" : "type-6196", ++ "self_type" : "type-6195", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128363,8 +128405,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-6324", +- "self_type" : "type-6323", ++ "referenced_type" : "type-6276", ++ "self_type" : "type-6275", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128372,8 +128414,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-6385", +- "self_type" : "type-6384", ++ "referenced_type" : "type-6337", ++ "self_type" : "type-6336", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128381,8 +128423,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-7037", +- "self_type" : "type-7036", ++ "referenced_type" : "type-6989", ++ "self_type" : "type-6988", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128390,8 +128432,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-7163", +- "self_type" : "type-7162", ++ "referenced_type" : "type-7115", ++ "self_type" : "type-7114", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128399,8 +128441,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-7678", +- "self_type" : "type-7677", ++ "referenced_type" : "type-7630", ++ "self_type" : "type-7629", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128408,8 +128450,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-7836", +- "self_type" : "type-7835", ++ "referenced_type" : "type-7788", ++ "self_type" : "type-7787", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128417,8 +128459,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-7941", +- "self_type" : "type-7940", ++ "referenced_type" : "type-7893", ++ "self_type" : "type-7892", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128426,8 +128468,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-8030", +- "self_type" : "type-8029", ++ "referenced_type" : "type-7982", ++ "self_type" : "type-7981", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128435,8 +128477,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-8113", +- "self_type" : "type-8112", ++ "referenced_type" : "type-8065", ++ "self_type" : "type-8064", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128444,8 +128486,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-8567", +- "self_type" : "type-8566", ++ "referenced_type" : "type-8519", ++ "self_type" : "type-8518", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128453,8 +128495,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-8735", +- "self_type" : "type-8734", ++ "referenced_type" : "type-8687", ++ "self_type" : "type-8686", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128462,8 +128504,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-8837", +- "self_type" : "type-8836", ++ "referenced_type" : "type-8789", ++ "self_type" : "type-8788", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128471,8 +128513,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-8976", +- "self_type" : "type-8975", ++ "referenced_type" : "type-8928", ++ "self_type" : "type-8927", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128480,8 +128522,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-9125", +- "self_type" : "type-9124", ++ "referenced_type" : "type-9077", ++ "self_type" : "type-9076", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128489,8 +128531,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-9218", +- "self_type" : "type-9217", ++ "referenced_type" : "type-9170", ++ "self_type" : "type-9169", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128498,8 +128540,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-9319", +- "self_type" : "type-9318", ++ "referenced_type" : "type-9271", ++ "self_type" : "type-9270", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128507,8 +128549,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-9501", +- "self_type" : "type-9500", ++ "referenced_type" : "type-9453", ++ "self_type" : "type-9452", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128516,8 +128558,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-9581", +- "self_type" : "type-9580", ++ "referenced_type" : "type-9533", ++ "self_type" : "type-9532", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128525,8 +128567,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MapValueRef *", + "name" : "google::protobuf::MapValueRef *", +- "referenced_type" : "type-9639", +- "self_type" : "type-9638", ++ "referenced_type" : "type-9591", ++ "self_type" : "type-9590", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -128534,8 +128576,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MergedDescriptorDatabase *", + "name" : "google::protobuf::MergedDescriptorDatabase *", +- "referenced_type" : "type-3765", +- "self_type" : "type-3943", ++ "referenced_type" : "type-3717", ++ "self_type" : "type-3895", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -128543,8 +128585,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-10191", +- "self_type" : "type-10190", ++ "referenced_type" : "type-10143", ++ "self_type" : "type-10142", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128561,8 +128603,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-11428", +- "self_type" : "type-11427", ++ "referenced_type" : "type-11380", ++ "self_type" : "type-11379", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128570,8 +128612,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-11541", +- "self_type" : "type-11540", ++ "referenced_type" : "type-11493", ++ "self_type" : "type-11492", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128579,8 +128621,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-1249", +- "self_type" : "type-1248", ++ "referenced_type" : "type-13016", ++ "self_type" : "type-13015", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128588,8 +128630,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-1285", +- "self_type" : "type-1284", ++ "referenced_type" : "type-13476", ++ "self_type" : "type-13475", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128597,8 +128639,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-13064", +- "self_type" : "type-13063", ++ "referenced_type" : "type-1416", ++ "self_type" : "type-1415", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128606,8 +128648,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-13524", +- "self_type" : "type-13523", ++ "referenced_type" : "type-1444", ++ "self_type" : "type-1443", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128615,8 +128657,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-14647", +- "self_type" : "type-14646", ++ "referenced_type" : "type-14599", ++ "self_type" : "type-14598", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128624,8 +128666,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-15027", +- "self_type" : "type-15026", ++ "referenced_type" : "type-14979", ++ "self_type" : "type-14978", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128633,8 +128675,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-1503", +- "self_type" : "type-1502", ++ "referenced_type" : "type-1600", ++ "self_type" : "type-1754", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128642,8 +128684,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-1525", +- "self_type" : "type-1524", ++ "referenced_type" : "type-16872", ++ "self_type" : "type-16871", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128651,8 +128693,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-1686", +- "self_type" : "type-1842", ++ "referenced_type" : "type-17332", ++ "self_type" : "type-17331", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128660,8 +128702,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-16920", +- "self_type" : "type-16919", ++ "referenced_type" : "type-18463", ++ "self_type" : "type-18462", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128669,8 +128711,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-17380", +- "self_type" : "type-17379", ++ "referenced_type" : "type-18792", ++ "self_type" : "type-18791", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128678,8 +128720,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-18511", +- "self_type" : "type-18510", ++ "referenced_type" : "type-21404", ++ "self_type" : "type-21403", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128687,8 +128729,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-18840", +- "self_type" : "type-18839", ++ "referenced_type" : "type-21864", ++ "self_type" : "type-21863", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128696,8 +128738,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-21452", +- "self_type" : "type-21451", ++ "referenced_type" : "type-22112", ++ "self_type" : "type-22111", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128705,8 +128747,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-21912", +- "self_type" : "type-21911", ++ "referenced_type" : "type-22474", ++ "self_type" : "type-22473", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128714,8 +128756,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-23040", +- "self_type" : "type-23039", ++ "referenced_type" : "type-23901", ++ "self_type" : "type-23900", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128723,8 +128765,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-23369", +- "self_type" : "type-23368", ++ "referenced_type" : "type-24164", ++ "self_type" : "type-24163", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128732,8 +128774,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-26630", +- "self_type" : "type-26629", ++ "referenced_type" : "type-2635", ++ "self_type" : "type-2634", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128741,8 +128783,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-27090", +- "self_type" : "type-27089", ++ "referenced_type" : "type-2663", ++ "self_type" : "type-2662", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128750,8 +128792,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-28225", +- "self_type" : "type-28224", ++ "referenced_type" : "type-28224", ++ "self_type" : "type-28223", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128759,8 +128801,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-28554", +- "self_type" : "type-28553", ++ "referenced_type" : "type-28553", ++ "self_type" : "type-28552", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128768,8 +128810,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-2926", +- "self_type" : "type-2925", ++ "referenced_type" : "type-2878", ++ "self_type" : "type-2877", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128777,8 +128819,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-2954", +- "self_type" : "type-2953", ++ "referenced_type" : "type-2906", ++ "self_type" : "type-2905", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128786,8 +128828,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-31777", +- "self_type" : "type-31776", ++ "referenced_type" : "type-31776", ++ "self_type" : "type-31775", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128795,8 +128837,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-32237", +- "self_type" : "type-32236", ++ "referenced_type" : "type-32236", ++ "self_type" : "type-32235", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128813,8 +128855,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-4551", +- "self_type" : "type-4550", ++ "referenced_type" : "type-4503", ++ "self_type" : "type-4502", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128822,8 +128864,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-4580", +- "self_type" : "type-4579", ++ "referenced_type" : "type-4532", ++ "self_type" : "type-4531", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128831,8 +128873,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-4906", +- "self_type" : "type-4905", ++ "referenced_type" : "type-4858", ++ "self_type" : "type-4857", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128840,8 +128882,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-4934", +- "self_type" : "type-4933", ++ "referenced_type" : "type-4886", ++ "self_type" : "type-4885", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128849,8 +128891,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-6481", +- "self_type" : "type-6480", ++ "referenced_type" : "type-6433", ++ "self_type" : "type-6432", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128858,8 +128900,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-7124", +- "self_type" : "type-7123", ++ "referenced_type" : "type-7076", ++ "self_type" : "type-7075", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128876,8 +128918,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-818", +- "self_type" : "type-817", ++ "referenced_type" : "type-8134", ++ "self_type" : "type-8133", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128885,8 +128927,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-8182", +- "self_type" : "type-8181", ++ "referenced_type" : "type-8162", ++ "self_type" : "type-8161", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128894,8 +128936,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-8210", +- "self_type" : "type-8209", ++ "referenced_type" : "type-818", ++ "self_type" : "type-817", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128903,8 +128945,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message *", + "name" : "google::protobuf::Message *", +- "referenced_type" : "type-9732", +- "self_type" : "type-9731", ++ "referenced_type" : "type-9684", ++ "self_type" : "type-9683", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -128912,8 +128954,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Message **", + "name" : "google::protobuf::Message **", +- "referenced_type" : "type-1842", +- "self_type" : "type-6490", ++ "referenced_type" : "type-1754", ++ "self_type" : "type-6442", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -128921,8 +128963,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-10807", +- "self_type" : "type-10806", ++ "referenced_type" : "type-10759", ++ "self_type" : "type-10758", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -128930,8 +128972,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-11276", +- "self_type" : "type-11275", ++ "referenced_type" : "type-11228", ++ "self_type" : "type-11227", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -128939,8 +128981,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-11568", +- "self_type" : "type-11567", ++ "referenced_type" : "type-11520", ++ "self_type" : "type-11519", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -128948,8 +128990,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-11592", +- "self_type" : "type-11591", ++ "referenced_type" : "type-11544", ++ "self_type" : "type-11543", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -128957,8 +128999,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-14098", +- "self_type" : "type-14097", ++ "referenced_type" : "type-1330", ++ "self_type" : "type-1329", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -128966,8 +129008,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-1412", +- "self_type" : "type-1411", ++ "referenced_type" : "type-1398", ++ "self_type" : "type-1397", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -128975,8 +129017,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-14527", +- "self_type" : "type-14526", ++ "referenced_type" : "type-14050", ++ "self_type" : "type-14049", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -128984,8 +129026,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-1484", +- "self_type" : "type-1483", ++ "referenced_type" : "type-14479", ++ "self_type" : "type-14478", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -128993,8 +129035,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-15427", +- "self_type" : "type-15426", ++ "referenced_type" : "type-1471", ++ "self_type" : "type-1470", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129002,8 +129044,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-15451", +- "self_type" : "type-15450", ++ "referenced_type" : "type-1495", ++ "self_type" : "type-1494", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129011,8 +129053,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-1550", +- "self_type" : "type-1549", ++ "referenced_type" : "type-15379", ++ "self_type" : "type-15378", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129020,8 +129062,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-1576", +- "self_type" : "type-1575", ++ "referenced_type" : "type-15403", ++ "self_type" : "type-15402", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129029,8 +129071,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-17962", +- "self_type" : "type-17961", ++ "referenced_type" : "type-17914", ++ "self_type" : "type-17913", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129038,8 +129080,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-18391", +- "self_type" : "type-18390", ++ "referenced_type" : "type-18343", ++ "self_type" : "type-18342", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129047,8 +129089,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-19224", +- "self_type" : "type-19223", ++ "referenced_type" : "type-19176", ++ "self_type" : "type-19175", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129056,8 +129098,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-19548", +- "self_type" : "type-19547", ++ "referenced_type" : "type-19500", ++ "self_type" : "type-19499", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129065,8 +129107,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-2152", +- "self_type" : "type-2153", ++ "referenced_type" : "type-2083", ++ "self_type" : "type-2084", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -129074,8 +129116,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-22491", +- "self_type" : "type-22490", ++ "referenced_type" : "type-23013", ++ "self_type" : "type-23012", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129083,8 +129125,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-22920", +- "self_type" : "type-22919", ++ "referenced_type" : "type-23776", ++ "self_type" : "type-23775", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129092,8 +129134,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-23745", +- "self_type" : "type-23744", ++ "referenced_type" : "type-24590", ++ "self_type" : "type-24589", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129101,8 +129143,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-24018", +- "self_type" : "type-24017", ++ "referenced_type" : "type-24851", ++ "self_type" : "type-24850", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129110,8 +129152,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-27676", +- "self_type" : "type-27675", ++ "referenced_type" : "type-27675", ++ "self_type" : "type-27674", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129119,8 +129161,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-28105", +- "self_type" : "type-28104", ++ "referenced_type" : "type-2792", ++ "self_type" : "type-2791", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129128,8 +129170,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-2840", +- "self_type" : "type-2839", ++ "referenced_type" : "type-28104", ++ "self_type" : "type-28103", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129137,8 +129179,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-28930", +- "self_type" : "type-28929", ++ "referenced_type" : "type-2860", ++ "self_type" : "type-2859", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129146,8 +129188,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-2908", +- "self_type" : "type-2907", ++ "referenced_type" : "type-28929", ++ "self_type" : "type-28928", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129155,8 +129197,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-29203", +- "self_type" : "type-29202", ++ "referenced_type" : "type-29202", ++ "self_type" : "type-29201", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129164,8 +129206,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-2981", +- "self_type" : "type-2980", ++ "referenced_type" : "type-2933", ++ "self_type" : "type-2932", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129173,8 +129215,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-3005", +- "self_type" : "type-3004", ++ "referenced_type" : "type-2957", ++ "self_type" : "type-2956", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129182,8 +129224,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-4820", +- "self_type" : "type-4819", ++ "referenced_type" : "type-4772", ++ "self_type" : "type-4771", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129191,8 +129233,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-4888", +- "self_type" : "type-4887", ++ "referenced_type" : "type-4840", ++ "self_type" : "type-4839", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129200,8 +129242,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-4961", +- "self_type" : "type-4960", ++ "referenced_type" : "type-4913", ++ "self_type" : "type-4912", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129209,8 +129251,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-4985", +- "self_type" : "type-4984", ++ "referenced_type" : "type-4937", ++ "self_type" : "type-4936", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129236,8 +129278,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-7909", +- "self_type" : "type-7908", ++ "referenced_type" : "type-7861", ++ "self_type" : "type-7860", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129245,8 +129287,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-8164", +- "self_type" : "type-8163", ++ "referenced_type" : "type-8116", ++ "self_type" : "type-8115", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129254,8 +129296,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-8237", +- "self_type" : "type-8236", ++ "referenced_type" : "type-8189", ++ "self_type" : "type-8188", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129263,8 +129305,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageFactory *", + "name" : "google::protobuf::MessageFactory *", +- "referenced_type" : "type-8261", +- "self_type" : "type-8260", ++ "referenced_type" : "type-8213", ++ "self_type" : "type-8212", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -129308,8 +129350,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MessageOptions *", + "name" : "google::protobuf::MessageOptions *", +- "referenced_type" : "type-1700", +- "self_type" : "type-1699", ++ "referenced_type" : "type-1614", ++ "self_type" : "type-1613", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -129317,8 +129359,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Method *", + "name" : "google::protobuf::Method *", +- "referenced_type" : "type-2284", +- "self_type" : "type-2348", ++ "referenced_type" : "type-2213", ++ "self_type" : "type-2275", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -129326,8 +129368,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MethodDescriptor *", + "name" : "google::protobuf::MethodDescriptor *", +- "referenced_type" : "type-1989", +- "self_type" : "type-1988", ++ "referenced_type" : "type-1915", ++ "self_type" : "type-1914", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -129335,8 +129377,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MethodDescriptorProto *", + "name" : "google::protobuf::MethodDescriptorProto *", +- "referenced_type" : "type-1706", +- "self_type" : "type-1910", ++ "referenced_type" : "type-1620", ++ "self_type" : "type-1830", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -129344,8 +129386,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::MethodOptions *", + "name" : "google::protobuf::MethodOptions *", +- "referenced_type" : "type-1708", +- "self_type" : "type-1707", ++ "referenced_type" : "type-1622", ++ "self_type" : "type-1621", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -129353,8 +129395,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Mixin *", + "name" : "google::protobuf::Mixin *", +- "referenced_type" : "type-2288", +- "self_type" : "type-2350", ++ "referenced_type" : "type-2217", ++ "self_type" : "type-2277", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -129362,8 +129404,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::NullValue *", + "name" : "google::protobuf::NullValue *", +- "referenced_type" : "type-7325", +- "self_type" : "type-7326", ++ "referenced_type" : "type-7277", ++ "self_type" : "type-7278", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_enum_reflection.h" + }, +@@ -129371,8 +129413,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::OneofDescriptor *", + "name" : "google::protobuf::OneofDescriptor *", +- "referenced_type" : "type-2001", +- "self_type" : "type-2019", ++ "referenced_type" : "type-1927", ++ "self_type" : "type-1945", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -129380,8 +129422,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::OneofDescriptorProto *", + "name" : "google::protobuf::OneofDescriptorProto *", +- "referenced_type" : "type-1698", +- "self_type" : "type-1898", ++ "referenced_type" : "type-1612", ++ "self_type" : "type-1817", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -129389,8 +129431,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Option *", + "name" : "google::protobuf::Option *", +- "referenced_type" : "type-2286", +- "self_type" : "type-2367", ++ "referenced_type" : "type-2215", ++ "self_type" : "type-2295", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -129398,8 +129440,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Reflection *", + "name" : "google::protobuf::Reflection *", +- "referenced_type" : "type-2142", +- "self_type" : "type-2143", ++ "referenced_type" : "type-2073", ++ "self_type" : "type-2074", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -129407,8 +129449,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-10136", +- "self_type" : "type-10135", ++ "referenced_type" : "type-10088", ++ "self_type" : "type-10087", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129416,8 +129458,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-10264", +- "self_type" : "type-10263", ++ "referenced_type" : "type-10216", ++ "self_type" : "type-10215", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129425,8 +129467,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-10310", +- "self_type" : "type-10309", ++ "referenced_type" : "type-10262", ++ "self_type" : "type-10261", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129434,8 +129476,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-10644", +- "self_type" : "type-10643", ++ "referenced_type" : "type-10596", ++ "self_type" : "type-10595", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129443,8 +129485,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-10767", +- "self_type" : "type-10766", ++ "referenced_type" : "type-10719", ++ "self_type" : "type-10718", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129452,8 +129494,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-10860", +- "self_type" : "type-10859", ++ "referenced_type" : "type-10812", ++ "self_type" : "type-10811", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129461,8 +129503,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-10950", +- "self_type" : "type-10949", ++ "referenced_type" : "type-10902", ++ "self_type" : "type-10901", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129470,8 +129512,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-11023", +- "self_type" : "type-11022", ++ "referenced_type" : "type-10975", ++ "self_type" : "type-10974", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129479,8 +129521,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-11136", +- "self_type" : "type-11135", ++ "referenced_type" : "type-11088", ++ "self_type" : "type-11087", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129488,8 +129530,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-11302", +- "self_type" : "type-11301", ++ "referenced_type" : "type-11254", ++ "self_type" : "type-11253", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129497,8 +129539,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-11461", +- "self_type" : "type-11460", ++ "referenced_type" : "type-11413", ++ "self_type" : "type-11412", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129506,8 +129548,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-11913", +- "self_type" : "type-11912", ++ "referenced_type" : "type-11865", ++ "self_type" : "type-11864", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129515,8 +129557,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-12084", +- "self_type" : "type-12083", ++ "referenced_type" : "type-12036", ++ "self_type" : "type-12035", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129524,8 +129566,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-12347", +- "self_type" : "type-12346", ++ "referenced_type" : "type-12299", ++ "self_type" : "type-12298", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129533,8 +129575,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-12468", +- "self_type" : "type-12467", ++ "referenced_type" : "type-12420", ++ "self_type" : "type-12419", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129542,8 +129584,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-12608", +- "self_type" : "type-12607", ++ "referenced_type" : "type-12560", ++ "self_type" : "type-12559", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129551,8 +129593,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-12666", +- "self_type" : "type-12665", ++ "referenced_type" : "type-12618", ++ "self_type" : "type-12617", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129560,8 +129602,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-12846", +- "self_type" : "type-12845", ++ "referenced_type" : "type-12798", ++ "self_type" : "type-12797", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129569,8 +129611,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-12984", +- "self_type" : "type-12983", ++ "referenced_type" : "type-12936", ++ "self_type" : "type-12935", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129578,8 +129620,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-13469", +- "self_type" : "type-13468", ++ "referenced_type" : "type-13421", ++ "self_type" : "type-13420", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129587,8 +129629,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-13555", +- "self_type" : "type-13554", ++ "referenced_type" : "type-13507", ++ "self_type" : "type-13506", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129596,8 +129638,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-13601", +- "self_type" : "type-13600", ++ "referenced_type" : "type-13553", ++ "self_type" : "type-13552", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129605,8 +129647,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-13935", +- "self_type" : "type-13934", ++ "referenced_type" : "type-13887", ++ "self_type" : "type-13886", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129614,8 +129656,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-14058", +- "self_type" : "type-14057", ++ "referenced_type" : "type-14010", ++ "self_type" : "type-14009", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129623,8 +129665,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-14151", +- "self_type" : "type-14150", ++ "referenced_type" : "type-14103", ++ "self_type" : "type-14102", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129632,8 +129674,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-14241", +- "self_type" : "type-14240", ++ "referenced_type" : "type-14193", ++ "self_type" : "type-14192", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129641,8 +129683,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-14314", +- "self_type" : "type-14313", ++ "referenced_type" : "type-14266", ++ "self_type" : "type-14265", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129650,8 +129692,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-14400", +- "self_type" : "type-14399", ++ "referenced_type" : "type-14352", ++ "self_type" : "type-14351", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129659,8 +129701,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-14553", +- "self_type" : "type-14552", ++ "referenced_type" : "type-14505", ++ "self_type" : "type-14504", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129668,8 +129710,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-14681", +- "self_type" : "type-14680", ++ "referenced_type" : "type-14633", ++ "self_type" : "type-14632", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129677,8 +129719,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-14916", +- "self_type" : "type-14915", ++ "referenced_type" : "type-14868", ++ "self_type" : "type-14867", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129686,8 +129728,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-15144", +- "self_type" : "type-15143", ++ "referenced_type" : "type-15096", ++ "self_type" : "type-15095", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129695,8 +129737,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-15277", +- "self_type" : "type-15276", ++ "referenced_type" : "type-15229", ++ "self_type" : "type-15228", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129704,8 +129746,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-15769", +- "self_type" : "type-15768", ++ "referenced_type" : "type-15721", ++ "self_type" : "type-15720", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129713,8 +129755,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-15940", +- "self_type" : "type-15939", ++ "referenced_type" : "type-15892", ++ "self_type" : "type-15891", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129722,8 +129764,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16202", +- "self_type" : "type-16201", ++ "referenced_type" : "type-16154", ++ "self_type" : "type-16153", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129731,8 +129773,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16325", +- "self_type" : "type-16324", ++ "referenced_type" : "type-16277", ++ "self_type" : "type-16276", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129740,8 +129782,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16465", +- "self_type" : "type-16464", ++ "referenced_type" : "type-16417", ++ "self_type" : "type-16416", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129749,8 +129791,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16522", +- "self_type" : "type-16521", ++ "referenced_type" : "type-16474", ++ "self_type" : "type-16473", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129758,8 +129800,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16702", +- "self_type" : "type-16701", ++ "referenced_type" : "type-16654", ++ "self_type" : "type-16653", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129767,8 +129809,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16840", +- "self_type" : "type-16839", ++ "referenced_type" : "type-16792", ++ "self_type" : "type-16791", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129776,8 +129818,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17325", +- "self_type" : "type-17324", ++ "referenced_type" : "type-17277", ++ "self_type" : "type-17276", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129785,8 +129827,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17419", +- "self_type" : "type-17418", ++ "referenced_type" : "type-17371", ++ "self_type" : "type-17370", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129794,8 +129836,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17465", +- "self_type" : "type-17464", ++ "referenced_type" : "type-17417", ++ "self_type" : "type-17416", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129803,8 +129845,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17799", +- "self_type" : "type-17798", ++ "referenced_type" : "type-17751", ++ "self_type" : "type-17750", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129812,8 +129854,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17922", +- "self_type" : "type-17921", ++ "referenced_type" : "type-17874", ++ "self_type" : "type-17873", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129821,8 +129863,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18015", +- "self_type" : "type-18014", ++ "referenced_type" : "type-17967", ++ "self_type" : "type-17966", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129830,8 +129872,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18105", +- "self_type" : "type-18104", ++ "referenced_type" : "type-18057", ++ "self_type" : "type-18056", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129839,8 +129881,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18178", +- "self_type" : "type-18177", ++ "referenced_type" : "type-18130", ++ "self_type" : "type-18129", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129848,8 +129890,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18264", +- "self_type" : "type-18263", ++ "referenced_type" : "type-18216", ++ "self_type" : "type-18215", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129857,8 +129899,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18417", +- "self_type" : "type-18416", ++ "referenced_type" : "type-18369", ++ "self_type" : "type-18368", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129866,8 +129908,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18545", +- "self_type" : "type-18544", ++ "referenced_type" : "type-18497", ++ "self_type" : "type-18496", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129875,8 +129917,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18773", +- "self_type" : "type-18772", ++ "referenced_type" : "type-18725", ++ "self_type" : "type-18724", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129884,8 +129926,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18928", +- "self_type" : "type-18927", ++ "referenced_type" : "type-18880", ++ "self_type" : "type-18879", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129893,8 +129935,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19053", +- "self_type" : "type-19052", ++ "referenced_type" : "type-19005", ++ "self_type" : "type-19004", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129902,8 +129944,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19292", +- "self_type" : "type-19291", ++ "referenced_type" : "type-19244", ++ "self_type" : "type-19243", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129911,8 +129953,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19441", +- "self_type" : "type-19440", ++ "referenced_type" : "type-19393", ++ "self_type" : "type-19392", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129920,8 +129962,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19638", +- "self_type" : "type-19637", ++ "referenced_type" : "type-19590", ++ "self_type" : "type-19589", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129929,8 +129971,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19808", +- "self_type" : "type-19807", ++ "referenced_type" : "type-19760", ++ "self_type" : "type-19759", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129938,8 +129980,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19963", +- "self_type" : "type-19962", ++ "referenced_type" : "type-19915", ++ "self_type" : "type-19914", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129947,8 +129989,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20303", +- "self_type" : "type-20302", ++ "referenced_type" : "type-20255", ++ "self_type" : "type-20254", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129956,8 +129998,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20474", +- "self_type" : "type-20473", ++ "referenced_type" : "type-20426", ++ "self_type" : "type-20425", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129965,8 +130007,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20733", +- "self_type" : "type-20732", ++ "referenced_type" : "type-20685", ++ "self_type" : "type-20684", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129974,8 +130016,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20856", +- "self_type" : "type-20855", ++ "referenced_type" : "type-20808", ++ "self_type" : "type-20807", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129983,8 +130025,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20996", +- "self_type" : "type-20995", ++ "referenced_type" : "type-20948", ++ "self_type" : "type-20947", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -129992,8 +130034,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-21054", +- "self_type" : "type-21053", ++ "referenced_type" : "type-21006", ++ "self_type" : "type-21005", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130001,8 +130043,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-21234", +- "self_type" : "type-21233", ++ "referenced_type" : "type-2102", ++ "self_type" : "type-2101", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130010,8 +130052,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-21372", +- "self_type" : "type-21371", ++ "referenced_type" : "type-21186", ++ "self_type" : "type-21185", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130019,8 +130061,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-2172", +- "self_type" : "type-2171", ++ "referenced_type" : "type-21324", ++ "self_type" : "type-21323", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130028,8 +130070,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-21857", +- "self_type" : "type-21856", ++ "referenced_type" : "type-21809", ++ "self_type" : "type-21808", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130046,8 +130088,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-21994", +- "self_type" : "type-21993", ++ "referenced_type" : "type-21992", ++ "self_type" : "type-21991", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130055,8 +130097,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-22328", +- "self_type" : "type-22327", ++ "referenced_type" : "type-22297", ++ "self_type" : "type-22296", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130064,8 +130106,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-22451", +- "self_type" : "type-22450", ++ "referenced_type" : "type-22395", ++ "self_type" : "type-22394", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130073,8 +130115,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-22544", +- "self_type" : "type-22543", ++ "referenced_type" : "type-22463", ++ "self_type" : "type-22462", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130082,8 +130124,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-22634", +- "self_type" : "type-22633", ++ "referenced_type" : "type-22546", ++ "self_type" : "type-22545", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130091,8 +130133,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-22707", +- "self_type" : "type-22706", ++ "referenced_type" : "type-22632", ++ "self_type" : "type-22631", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130100,8 +130142,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-22793", +- "self_type" : "type-22792", ++ "referenced_type" : "type-22741", ++ "self_type" : "type-22740", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130109,8 +130151,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-22946", +- "self_type" : "type-22945", ++ "referenced_type" : "type-22912", ++ "self_type" : "type-22911", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130118,8 +130160,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23074", +- "self_type" : "type-23073", ++ "referenced_type" : "type-23056", ++ "self_type" : "type-23055", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130127,8 +130169,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23302", +- "self_type" : "type-23301", ++ "referenced_type" : "type-23297", ++ "self_type" : "type-23296", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130136,8 +130178,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23457", +- "self_type" : "type-23456", ++ "referenced_type" : "type-23435", ++ "self_type" : "type-23434", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130145,8 +130187,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23582", +- "self_type" : "type-23581", ++ "referenced_type" : "type-23563", ++ "self_type" : "type-23562", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130154,8 +130196,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23813", +- "self_type" : "type-23812", ++ "referenced_type" : "type-23802", ++ "self_type" : "type-23801", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130163,8 +130205,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23941", +- "self_type" : "type-23940", ++ "referenced_type" : "type-2387", ++ "self_type" : "type-2386", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130172,8 +130214,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24108", +- "self_type" : "type-24107", ++ "referenced_type" : "type-23944", ++ "self_type" : "type-23943", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130181,8 +130223,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24275", +- "self_type" : "type-24274", ++ "referenced_type" : "type-24106", ++ "self_type" : "type-24105", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130190,8 +130232,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24426", +- "self_type" : "type-24425", ++ "referenced_type" : "type-24275", ++ "self_type" : "type-24274", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130199,8 +130241,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-2457", +- "self_type" : "type-2456", ++ "referenced_type" : "type-24408", ++ "self_type" : "type-24407", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130208,8 +130250,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24581", +- "self_type" : "type-24580", ++ "referenced_type" : "type-24548", ++ "self_type" : "type-24547", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130217,8 +130259,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24712", +- "self_type" : "type-24711", ++ "referenced_type" : "type-24674", ++ "self_type" : "type-24673", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130226,8 +130268,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24845", +- "self_type" : "type-24844", ++ "referenced_type" : "type-24805", ++ "self_type" : "type-24804", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130235,8 +130277,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-25131", +- "self_type" : "type-25130", ++ "referenced_type" : "type-25106", ++ "self_type" : "type-25105", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130244,8 +130286,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-25228", +- "self_type" : "type-25227", ++ "referenced_type" : "type-25229", ++ "self_type" : "type-25228", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130253,8 +130295,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-25479", +- "self_type" : "type-25478", ++ "referenced_type" : "type-25530", ++ "self_type" : "type-25529", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130262,8 +130304,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-25650", +- "self_type" : "type-25649", ++ "referenced_type" : "type-25701", ++ "self_type" : "type-25700", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130271,8 +130313,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-25912", +- "self_type" : "type-25911", ++ "referenced_type" : "type-25963", ++ "self_type" : "type-25962", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130280,8 +130322,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-26034", +- "self_type" : "type-26033", ++ "referenced_type" : "type-26087", ++ "self_type" : "type-26086", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130289,8 +130331,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-26174", +- "self_type" : "type-26173", ++ "referenced_type" : "type-26218", ++ "self_type" : "type-26217", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130298,8 +130340,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-26232", +- "self_type" : "type-26231", ++ "referenced_type" : "type-26274", ++ "self_type" : "type-26273", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130307,8 +130349,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-26412", +- "self_type" : "type-26411", ++ "referenced_type" : "type-26454", ++ "self_type" : "type-26453", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130316,8 +130358,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-26550", +- "self_type" : "type-26549", ++ "referenced_type" : "type-26575", ++ "self_type" : "type-26574", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130325,8 +130367,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-27035", +- "self_type" : "type-27034", ++ "referenced_type" : "type-27065", ++ "self_type" : "type-27064", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130334,8 +130376,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-27133", +- "self_type" : "type-27132", ++ "referenced_type" : "type-27132", ++ "self_type" : "type-27131", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130343,8 +130385,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-27179", +- "self_type" : "type-27178", ++ "referenced_type" : "type-27178", ++ "self_type" : "type-27177", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130352,8 +130394,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-27513", +- "self_type" : "type-27512", ++ "referenced_type" : "type-27512", ++ "self_type" : "type-27511", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130361,8 +130403,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-27636", +- "self_type" : "type-27635", ++ "referenced_type" : "type-27635", ++ "self_type" : "type-27634", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130370,8 +130412,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-27729", +- "self_type" : "type-27728", ++ "referenced_type" : "type-27728", ++ "self_type" : "type-27727", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130379,8 +130421,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-27819", +- "self_type" : "type-27818", ++ "referenced_type" : "type-27818", ++ "self_type" : "type-27817", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130388,8 +130430,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-27892", +- "self_type" : "type-27891", ++ "referenced_type" : "type-27891", ++ "self_type" : "type-27890", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130397,8 +130439,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-27978", +- "self_type" : "type-27977", ++ "referenced_type" : "type-27977", ++ "self_type" : "type-27976", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130406,8 +130448,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28131", +- "self_type" : "type-28130", ++ "referenced_type" : "type-28130", ++ "self_type" : "type-28129", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130415,8 +130457,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28259", +- "self_type" : "type-28258", ++ "referenced_type" : "type-28258", ++ "self_type" : "type-28257", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130424,8 +130466,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28487", +- "self_type" : "type-28486", ++ "referenced_type" : "type-28486", ++ "self_type" : "type-28485", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130433,8 +130475,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28642", +- "self_type" : "type-28641", ++ "referenced_type" : "type-28641", ++ "self_type" : "type-28640", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130442,8 +130484,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28767", +- "self_type" : "type-28766", ++ "referenced_type" : "type-28766", ++ "self_type" : "type-28765", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130451,8 +130493,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28998", +- "self_type" : "type-28997", ++ "referenced_type" : "type-28997", ++ "self_type" : "type-28996", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130460,8 +130502,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29126", +- "self_type" : "type-29125", ++ "referenced_type" : "type-29125", ++ "self_type" : "type-29124", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130469,8 +130511,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29293", +- "self_type" : "type-29292", ++ "referenced_type" : "type-29292", ++ "self_type" : "type-29291", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130478,8 +130520,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29460", +- "self_type" : "type-29459", ++ "referenced_type" : "type-29459", ++ "self_type" : "type-29458", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130487,8 +130529,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29611", +- "self_type" : "type-29610", ++ "referenced_type" : "type-29610", ++ "self_type" : "type-29609", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130496,8 +130538,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29766", +- "self_type" : "type-29765", ++ "referenced_type" : "type-29765", ++ "self_type" : "type-29764", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130505,8 +130547,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29893", +- "self_type" : "type-29892", ++ "referenced_type" : "type-29892", ++ "self_type" : "type-29891", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130514,8 +130556,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-30024", +- "self_type" : "type-30023", ++ "referenced_type" : "type-30023", ++ "self_type" : "type-30022", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130523,8 +130565,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-30276", +- "self_type" : "type-30275", ++ "referenced_type" : "type-30275", ++ "self_type" : "type-30274", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130532,8 +130574,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-30372", +- "self_type" : "type-30371", ++ "referenced_type" : "type-30371", ++ "self_type" : "type-30370", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130541,8 +130583,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-30625", +- "self_type" : "type-30624", ++ "referenced_type" : "type-30624", ++ "self_type" : "type-30623", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130550,8 +130592,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-30796", +- "self_type" : "type-30795", ++ "referenced_type" : "type-30795", ++ "self_type" : "type-30794", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130559,8 +130601,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-31058", +- "self_type" : "type-31057", ++ "referenced_type" : "type-31057", ++ "self_type" : "type-31056", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130568,8 +130610,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-31181", +- "self_type" : "type-31180", ++ "referenced_type" : "type-31180", ++ "self_type" : "type-31179", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130577,8 +130619,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-31321", +- "self_type" : "type-31320", ++ "referenced_type" : "type-31320", ++ "self_type" : "type-31319", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130586,8 +130628,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-31379", +- "self_type" : "type-31378", ++ "referenced_type" : "type-31378", ++ "self_type" : "type-31377", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130595,8 +130637,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-31559", +- "self_type" : "type-31558", ++ "referenced_type" : "type-31558", ++ "self_type" : "type-31557", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130604,8 +130646,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-31697", +- "self_type" : "type-31696", ++ "referenced_type" : "type-31696", ++ "self_type" : "type-31695", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130613,8 +130655,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-32182", +- "self_type" : "type-32181", ++ "referenced_type" : "type-32181", ++ "self_type" : "type-32180", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130622,8 +130664,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-3330", +- "self_type" : "type-3329", ++ "referenced_type" : "type-3282", ++ "self_type" : "type-3281", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130631,8 +130673,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-3507", +- "self_type" : "type-3506", ++ "referenced_type" : "type-3459", ++ "self_type" : "type-3458", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130640,8 +130682,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-3830", +- "self_type" : "type-3829", ++ "referenced_type" : "type-3782", ++ "self_type" : "type-3781", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130649,8 +130691,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-3971", +- "self_type" : "type-3970", ++ "referenced_type" : "type-3923", ++ "self_type" : "type-3922", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130667,8 +130709,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-4160", +- "self_type" : "type-4159", ++ "referenced_type" : "type-4112", ++ "self_type" : "type-4111", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130676,8 +130718,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-4223", +- "self_type" : "type-4222", ++ "referenced_type" : "type-4175", ++ "self_type" : "type-4174", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130685,8 +130727,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-4435", +- "self_type" : "type-4434", ++ "referenced_type" : "type-4387", ++ "self_type" : "type-4386", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130694,8 +130736,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-4680", +- "self_type" : "type-4679", ++ "referenced_type" : "type-4632", ++ "self_type" : "type-4631", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130703,8 +130745,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-5310", +- "self_type" : "type-5309", ++ "referenced_type" : "type-5262", ++ "self_type" : "type-5261", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130712,8 +130754,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-5487", +- "self_type" : "type-5486", ++ "referenced_type" : "type-5439", ++ "self_type" : "type-5438", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130721,8 +130763,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-5756", +- "self_type" : "type-5755", ++ "referenced_type" : "type-5708", ++ "self_type" : "type-5707", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130730,8 +130772,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-5879", +- "self_type" : "type-5878", ++ "referenced_type" : "type-5831", ++ "self_type" : "type-5830", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130739,8 +130781,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-6019", +- "self_type" : "type-6018", ++ "referenced_type" : "type-5971", ++ "self_type" : "type-5970", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130748,8 +130790,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-6077", +- "self_type" : "type-6076", ++ "referenced_type" : "type-6029", ++ "self_type" : "type-6028", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130757,8 +130799,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-6257", +- "self_type" : "type-6256", ++ "referenced_type" : "type-6209", ++ "self_type" : "type-6208", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130766,8 +130808,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-6400", +- "self_type" : "type-6399", ++ "referenced_type" : "type-6352", ++ "self_type" : "type-6351", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130775,8 +130817,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-7063", +- "self_type" : "type-7062", ++ "referenced_type" : "type-7015", ++ "self_type" : "type-7014", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130784,8 +130826,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-7176", +- "self_type" : "type-7175", ++ "referenced_type" : "type-7128", ++ "self_type" : "type-7127", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130793,8 +130835,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-7263", +- "self_type" : "type-7262", ++ "referenced_type" : "type-7215", ++ "self_type" : "type-7214", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130802,8 +130844,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-7729", +- "self_type" : "type-7728", ++ "referenced_type" : "type-7681", ++ "self_type" : "type-7680", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130811,8 +130853,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-7854", +- "self_type" : "type-7853", ++ "referenced_type" : "type-7806", ++ "self_type" : "type-7805", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130820,8 +130862,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-7962", +- "self_type" : "type-7961", ++ "referenced_type" : "type-7914", ++ "self_type" : "type-7913", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130829,8 +130871,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-8051", +- "self_type" : "type-8050", ++ "referenced_type" : "type-8003", ++ "self_type" : "type-8002", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130838,8 +130880,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-8124", +- "self_type" : "type-8123", ++ "referenced_type" : "type-8076", ++ "self_type" : "type-8075", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130847,8 +130889,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-8584", +- "self_type" : "type-8583", ++ "referenced_type" : "type-8536", ++ "self_type" : "type-8535", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130856,8 +130898,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-8752", +- "self_type" : "type-8751", ++ "referenced_type" : "type-8704", ++ "self_type" : "type-8703", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130865,8 +130907,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-9013", +- "self_type" : "type-9012", ++ "referenced_type" : "type-8965", ++ "self_type" : "type-8964", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130874,8 +130916,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-9136", +- "self_type" : "type-9135", ++ "referenced_type" : "type-9088", ++ "self_type" : "type-9087", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130883,8 +130925,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-9276", +- "self_type" : "type-9275", ++ "referenced_type" : "type-9228", ++ "self_type" : "type-9227", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130892,8 +130934,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-9334", +- "self_type" : "type-9333", ++ "referenced_type" : "type-9286", ++ "self_type" : "type-9285", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130901,8 +130943,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-9514", +- "self_type" : "type-9513", ++ "referenced_type" : "type-9466", ++ "self_type" : "type-9465", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130910,8 +130952,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-9652", +- "self_type" : "type-9651", ++ "referenced_type" : "type-9604", ++ "self_type" : "type-9603", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130928,8 +130970,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-10134", +- "self_type" : "type-10133", ++ "referenced_type" : "type-10086", ++ "self_type" : "type-10085", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130937,8 +130979,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-10642", +- "self_type" : "type-10641", ++ "referenced_type" : "type-10594", ++ "self_type" : "type-10593", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130946,8 +130988,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-10948", +- "self_type" : "type-10947", ++ "referenced_type" : "type-10900", ++ "self_type" : "type-10899", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130955,8 +130997,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-11300", +- "self_type" : "type-11299", ++ "referenced_type" : "type-11252", ++ "self_type" : "type-11251", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130964,8 +131006,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-11459", +- "self_type" : "type-11458", ++ "referenced_type" : "type-11411", ++ "self_type" : "type-11410", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130973,8 +131015,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-12345", +- "self_type" : "type-12344", ++ "referenced_type" : "type-12297", ++ "self_type" : "type-12296", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130982,8 +131024,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-13467", +- "self_type" : "type-13466", ++ "referenced_type" : "type-13419", ++ "self_type" : "type-13418", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -130991,8 +131033,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-13933", +- "self_type" : "type-13932", ++ "referenced_type" : "type-13885", ++ "self_type" : "type-13884", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131000,8 +131042,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-14239", +- "self_type" : "type-14238", ++ "referenced_type" : "type-14191", ++ "self_type" : "type-14190", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131009,8 +131051,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-14551", +- "self_type" : "type-14550", ++ "referenced_type" : "type-14503", ++ "self_type" : "type-14502", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131018,8 +131060,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-14679", +- "self_type" : "type-14678", ++ "referenced_type" : "type-14631", ++ "self_type" : "type-14630", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131027,8 +131069,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-14913", +- "self_type" : "type-14912", ++ "referenced_type" : "type-14865", ++ "self_type" : "type-14864", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131036,8 +131078,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-15275", +- "self_type" : "type-15274", ++ "referenced_type" : "type-15227", ++ "self_type" : "type-15226", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131045,8 +131087,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16200", +- "self_type" : "type-16199", ++ "referenced_type" : "type-16152", ++ "self_type" : "type-16151", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131054,8 +131096,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17323", +- "self_type" : "type-17322", ++ "referenced_type" : "type-17275", ++ "self_type" : "type-17274", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131063,8 +131105,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17797", +- "self_type" : "type-17796", ++ "referenced_type" : "type-17749", ++ "self_type" : "type-17748", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131072,8 +131114,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18103", +- "self_type" : "type-18102", ++ "referenced_type" : "type-18055", ++ "self_type" : "type-18054", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131081,8 +131123,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18415", +- "self_type" : "type-18414", ++ "referenced_type" : "type-18367", ++ "self_type" : "type-18366", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131090,8 +131132,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18543", +- "self_type" : "type-18542", ++ "referenced_type" : "type-18495", ++ "self_type" : "type-18494", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131099,8 +131141,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18770", +- "self_type" : "type-18769", ++ "referenced_type" : "type-18722", ++ "self_type" : "type-18721", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131108,8 +131150,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19051", +- "self_type" : "type-19050", ++ "referenced_type" : "type-19003", ++ "self_type" : "type-19002", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131117,8 +131159,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19290", +- "self_type" : "type-19289", ++ "referenced_type" : "type-19242", ++ "self_type" : "type-19241", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131126,8 +131168,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19439", +- "self_type" : "type-19438", ++ "referenced_type" : "type-19391", ++ "self_type" : "type-19390", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131135,8 +131177,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19636", +- "self_type" : "type-19635", ++ "referenced_type" : "type-19588", ++ "self_type" : "type-19587", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131144,8 +131186,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19804", +- "self_type" : "type-19803", ++ "referenced_type" : "type-19756", ++ "self_type" : "type-19755", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131153,8 +131195,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19961", +- "self_type" : "type-19960", ++ "referenced_type" : "type-19913", ++ "self_type" : "type-19912", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131162,8 +131204,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20731", +- "self_type" : "type-20730", ++ "referenced_type" : "type-20683", ++ "self_type" : "type-20682", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131171,8 +131213,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-21855", +- "self_type" : "type-21854", ++ "referenced_type" : "type-21807", ++ "self_type" : "type-21806", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131180,8 +131222,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-22326", +- "self_type" : "type-22325", ++ "referenced_type" : "type-22295", ++ "self_type" : "type-22294", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131189,8 +131231,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-22632", +- "self_type" : "type-22631", ++ "referenced_type" : "type-22544", ++ "self_type" : "type-22543", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131198,8 +131240,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-22944", +- "self_type" : "type-22943", ++ "referenced_type" : "type-22910", ++ "self_type" : "type-22909", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131207,8 +131249,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23072", +- "self_type" : "type-23071", ++ "referenced_type" : "type-23054", ++ "self_type" : "type-23053", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131216,8 +131258,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23299", +- "self_type" : "type-23298", ++ "referenced_type" : "type-23295", ++ "self_type" : "type-23294", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131225,8 +131267,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23580", +- "self_type" : "type-23579", ++ "referenced_type" : "type-23561", ++ "self_type" : "type-23560", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131234,8 +131276,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23811", +- "self_type" : "type-23810", ++ "referenced_type" : "type-23800", ++ "self_type" : "type-23799", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131243,8 +131285,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23939", +- "self_type" : "type-23938", ++ "referenced_type" : "type-23942", ++ "self_type" : "type-23941", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131252,8 +131294,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24106", +- "self_type" : "type-24105", ++ "referenced_type" : "type-24104", ++ "self_type" : "type-24103", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131261,8 +131303,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24271", +- "self_type" : "type-24270", ++ "referenced_type" : "type-24273", ++ "self_type" : "type-24272", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131270,8 +131312,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24424", +- "self_type" : "type-24423", ++ "referenced_type" : "type-24406", ++ "self_type" : "type-24405", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131279,8 +131321,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24579", +- "self_type" : "type-24578", ++ "referenced_type" : "type-24546", ++ "self_type" : "type-24545", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131288,8 +131330,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24710", +- "self_type" : "type-24709", ++ "referenced_type" : "type-24672", ++ "self_type" : "type-24671", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131297,8 +131339,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24843", +- "self_type" : "type-24842", ++ "referenced_type" : "type-24803", ++ "self_type" : "type-24802", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131306,8 +131348,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-25129", +- "self_type" : "type-25128", ++ "referenced_type" : "type-25104", ++ "self_type" : "type-25103", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131315,8 +131357,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-25226", +- "self_type" : "type-25225", ++ "referenced_type" : "type-25227", ++ "self_type" : "type-25226", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131324,8 +131366,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-25910", +- "self_type" : "type-25909", ++ "referenced_type" : "type-25961", ++ "self_type" : "type-25960", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131333,8 +131375,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-27033", +- "self_type" : "type-27032", ++ "referenced_type" : "type-27063", ++ "self_type" : "type-27062", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131342,8 +131384,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-27511", +- "self_type" : "type-27510", ++ "referenced_type" : "type-27510", ++ "self_type" : "type-27509", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131351,8 +131393,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-27817", +- "self_type" : "type-27816", ++ "referenced_type" : "type-27816", ++ "self_type" : "type-27815", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131360,8 +131402,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28129", +- "self_type" : "type-28128", ++ "referenced_type" : "type-28128", ++ "self_type" : "type-28127", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131369,8 +131411,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28257", +- "self_type" : "type-28256", ++ "referenced_type" : "type-28256", ++ "self_type" : "type-28255", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131378,8 +131420,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28484", +- "self_type" : "type-28483", ++ "referenced_type" : "type-28483", ++ "self_type" : "type-28482", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131387,8 +131429,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28765", +- "self_type" : "type-28764", ++ "referenced_type" : "type-28764", ++ "self_type" : "type-28763", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131396,8 +131438,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28996", +- "self_type" : "type-28995", ++ "referenced_type" : "type-28995", ++ "self_type" : "type-28994", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131405,8 +131447,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29124", +- "self_type" : "type-29123", ++ "referenced_type" : "type-29123", ++ "self_type" : "type-29122", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131414,8 +131456,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29291", +- "self_type" : "type-29290", ++ "referenced_type" : "type-29290", ++ "self_type" : "type-29289", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131423,8 +131465,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29456", +- "self_type" : "type-29455", ++ "referenced_type" : "type-29455", ++ "self_type" : "type-29454", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131432,8 +131474,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29609", +- "self_type" : "type-29608", ++ "referenced_type" : "type-29608", ++ "self_type" : "type-29607", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131441,8 +131483,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29764", +- "self_type" : "type-29763", ++ "referenced_type" : "type-29763", ++ "self_type" : "type-29762", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131450,8 +131492,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29891", +- "self_type" : "type-29890", ++ "referenced_type" : "type-29890", ++ "self_type" : "type-29889", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131459,8 +131501,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-30022", +- "self_type" : "type-30021", ++ "referenced_type" : "type-30021", ++ "self_type" : "type-30020", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131468,8 +131510,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-30274", +- "self_type" : "type-30273", ++ "referenced_type" : "type-30273", ++ "self_type" : "type-30272", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131477,8 +131519,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-30370", +- "self_type" : "type-30369", ++ "referenced_type" : "type-30369", ++ "self_type" : "type-30368", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131486,8 +131528,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-31056", +- "self_type" : "type-31055", ++ "referenced_type" : "type-31055", ++ "self_type" : "type-31054", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131495,8 +131537,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-32180", +- "self_type" : "type-32179", ++ "referenced_type" : "type-32179", ++ "self_type" : "type-32178", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131504,8 +131546,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-3828", +- "self_type" : "type-3827", ++ "referenced_type" : "type-3780", ++ "self_type" : "type-3779", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131522,8 +131564,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-5754", +- "self_type" : "type-5753", ++ "referenced_type" : "type-5706", ++ "self_type" : "type-5705", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131531,8 +131573,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-7061", +- "self_type" : "type-7060", ++ "referenced_type" : "type-7013", ++ "self_type" : "type-7012", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131540,8 +131582,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-7727", +- "self_type" : "type-7726", ++ "referenced_type" : "type-7679", ++ "self_type" : "type-7678", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131549,8 +131591,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-8049", +- "self_type" : "type-8048", ++ "referenced_type" : "type-8001", ++ "self_type" : "type-8000", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131558,8 +131600,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-9011", +- "self_type" : "type-9010", ++ "referenced_type" : "type-8963", ++ "self_type" : "type-8962", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131576,8 +131618,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-10132", +- "self_type" : "type-10131", ++ "referenced_type" : "type-10084", ++ "self_type" : "type-10083", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131585,8 +131627,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-10640", +- "self_type" : "type-10639", ++ "referenced_type" : "type-10592", ++ "self_type" : "type-10591", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131594,8 +131636,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-10946", +- "self_type" : "type-10945", ++ "referenced_type" : "type-10898", ++ "self_type" : "type-10897", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131603,8 +131645,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-11298", +- "self_type" : "type-11297", ++ "referenced_type" : "type-11250", ++ "self_type" : "type-11249", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131612,8 +131654,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-11457", +- "self_type" : "type-11456", ++ "referenced_type" : "type-11409", ++ "self_type" : "type-11408", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131621,8 +131663,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-12343", +- "self_type" : "type-12342", ++ "referenced_type" : "type-12295", ++ "self_type" : "type-12294", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131630,8 +131672,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-13465", +- "self_type" : "type-13464", ++ "referenced_type" : "type-13417", ++ "self_type" : "type-13416", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131639,8 +131681,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-13931", +- "self_type" : "type-13930", ++ "referenced_type" : "type-13883", ++ "self_type" : "type-13882", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131648,8 +131690,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-14237", +- "self_type" : "type-14236", ++ "referenced_type" : "type-14189", ++ "self_type" : "type-14188", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131657,8 +131699,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-14549", +- "self_type" : "type-14548", ++ "referenced_type" : "type-14501", ++ "self_type" : "type-14500", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131666,8 +131708,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-14677", +- "self_type" : "type-14676", ++ "referenced_type" : "type-14629", ++ "self_type" : "type-14628", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131675,8 +131717,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-14911", +- "self_type" : "type-14910", ++ "referenced_type" : "type-14863", ++ "self_type" : "type-14862", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131684,8 +131726,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-15273", +- "self_type" : "type-15272", ++ "referenced_type" : "type-15225", ++ "self_type" : "type-15224", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131693,8 +131735,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16198", +- "self_type" : "type-16197", ++ "referenced_type" : "type-16150", ++ "self_type" : "type-16149", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131702,8 +131744,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17321", +- "self_type" : "type-17320", ++ "referenced_type" : "type-17273", ++ "self_type" : "type-17272", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131711,8 +131753,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17795", +- "self_type" : "type-17794", ++ "referenced_type" : "type-17747", ++ "self_type" : "type-17746", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131720,8 +131762,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18101", +- "self_type" : "type-18100", ++ "referenced_type" : "type-18053", ++ "self_type" : "type-18052", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131729,8 +131771,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18413", +- "self_type" : "type-18412", ++ "referenced_type" : "type-18365", ++ "self_type" : "type-18364", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131738,8 +131780,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18541", +- "self_type" : "type-18540", ++ "referenced_type" : "type-18493", ++ "self_type" : "type-18492", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131747,8 +131789,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18768", +- "self_type" : "type-18767", ++ "referenced_type" : "type-18720", ++ "self_type" : "type-18719", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131756,8 +131798,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19049", +- "self_type" : "type-19048", ++ "referenced_type" : "type-19001", ++ "self_type" : "type-19000", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131765,8 +131807,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19288", +- "self_type" : "type-19287", ++ "referenced_type" : "type-19240", ++ "self_type" : "type-19239", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131774,8 +131816,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19437", +- "self_type" : "type-19436", ++ "referenced_type" : "type-19389", ++ "self_type" : "type-19388", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131783,8 +131825,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19633", +- "self_type" : "type-19632", ++ "referenced_type" : "type-19585", ++ "self_type" : "type-19584", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131792,8 +131834,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19802", +- "self_type" : "type-19801", ++ "referenced_type" : "type-19754", ++ "self_type" : "type-19753", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131801,8 +131843,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19959", +- "self_type" : "type-19958", ++ "referenced_type" : "type-19911", ++ "self_type" : "type-19910", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131810,8 +131852,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20729", +- "self_type" : "type-20728", ++ "referenced_type" : "type-20681", ++ "self_type" : "type-20680", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131819,8 +131861,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-21853", +- "self_type" : "type-21852", ++ "referenced_type" : "type-21805", ++ "self_type" : "type-21804", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131828,8 +131870,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-22324", +- "self_type" : "type-22323", ++ "referenced_type" : "type-22293", ++ "self_type" : "type-22292", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131837,8 +131879,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-22630", +- "self_type" : "type-22629", ++ "referenced_type" : "type-22542", ++ "self_type" : "type-22541", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131846,8 +131888,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-22942", +- "self_type" : "type-22941", ++ "referenced_type" : "type-22907", ++ "self_type" : "type-22906", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131855,8 +131897,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23070", +- "self_type" : "type-23069", ++ "referenced_type" : "type-23052", ++ "self_type" : "type-23051", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131864,8 +131906,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23297", +- "self_type" : "type-23296", ++ "referenced_type" : "type-23293", ++ "self_type" : "type-23292", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131873,8 +131915,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23578", +- "self_type" : "type-23577", ++ "referenced_type" : "type-23559", ++ "self_type" : "type-23558", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131882,8 +131924,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23809", +- "self_type" : "type-23808", ++ "referenced_type" : "type-23798", ++ "self_type" : "type-23797", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131891,8 +131933,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23937", +- "self_type" : "type-23936", ++ "referenced_type" : "type-23940", ++ "self_type" : "type-23939", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131900,8 +131942,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24103", +- "self_type" : "type-24102", ++ "referenced_type" : "type-24101", ++ "self_type" : "type-24100", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131909,8 +131951,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24269", +- "self_type" : "type-24268", ++ "referenced_type" : "type-24271", ++ "self_type" : "type-24270", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131918,8 +131960,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24422", +- "self_type" : "type-24421", ++ "referenced_type" : "type-24404", ++ "self_type" : "type-24403", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131927,8 +131969,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24577", +- "self_type" : "type-24576", ++ "referenced_type" : "type-24544", ++ "self_type" : "type-24543", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131936,8 +131978,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24708", +- "self_type" : "type-24707", ++ "referenced_type" : "type-24670", ++ "self_type" : "type-24669", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131945,8 +131987,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24841", +- "self_type" : "type-24840", ++ "referenced_type" : "type-24801", ++ "self_type" : "type-24800", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131954,8 +131996,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-25127", +- "self_type" : "type-25126", ++ "referenced_type" : "type-25102", ++ "self_type" : "type-25101", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131963,8 +132005,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-25224", +- "self_type" : "type-25223", ++ "referenced_type" : "type-25225", ++ "self_type" : "type-25224", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131972,8 +132014,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-25908", +- "self_type" : "type-25907", ++ "referenced_type" : "type-25959", ++ "self_type" : "type-25958", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131981,8 +132023,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-27031", +- "self_type" : "type-27030", ++ "referenced_type" : "type-27061", ++ "self_type" : "type-27060", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131990,8 +132032,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-27509", +- "self_type" : "type-27508", ++ "referenced_type" : "type-27508", ++ "self_type" : "type-27507", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -131999,8 +132041,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-27815", +- "self_type" : "type-27814", ++ "referenced_type" : "type-27814", ++ "self_type" : "type-27813", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132008,8 +132050,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28127", +- "self_type" : "type-28126", ++ "referenced_type" : "type-28126", ++ "self_type" : "type-28125", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132017,8 +132059,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28255", +- "self_type" : "type-28254", ++ "referenced_type" : "type-28254", ++ "self_type" : "type-28253", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132026,8 +132068,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28482", +- "self_type" : "type-28481", ++ "referenced_type" : "type-28481", ++ "self_type" : "type-28480", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132035,8 +132077,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28763", +- "self_type" : "type-28762", ++ "referenced_type" : "type-28762", ++ "self_type" : "type-28761", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132044,8 +132086,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28994", +- "self_type" : "type-28993", ++ "referenced_type" : "type-28993", ++ "self_type" : "type-28992", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132053,8 +132095,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29122", +- "self_type" : "type-29121", ++ "referenced_type" : "type-29121", ++ "self_type" : "type-29120", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132062,8 +132104,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29288", +- "self_type" : "type-29287", ++ "referenced_type" : "type-29287", ++ "self_type" : "type-29286", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132071,8 +132113,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29454", +- "self_type" : "type-29453", ++ "referenced_type" : "type-29453", ++ "self_type" : "type-29452", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132080,8 +132122,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29607", +- "self_type" : "type-29606", ++ "referenced_type" : "type-29606", ++ "self_type" : "type-29605", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132089,8 +132131,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29762", +- "self_type" : "type-29761", ++ "referenced_type" : "type-29761", ++ "self_type" : "type-29760", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132098,8 +132140,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29889", +- "self_type" : "type-29888", ++ "referenced_type" : "type-29888", ++ "self_type" : "type-29887", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132107,8 +132149,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-30020", +- "self_type" : "type-30019", ++ "referenced_type" : "type-30019", ++ "self_type" : "type-30018", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132116,8 +132158,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-30272", +- "self_type" : "type-30271", ++ "referenced_type" : "type-30271", ++ "self_type" : "type-30270", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132125,8 +132167,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-30368", +- "self_type" : "type-30367", ++ "referenced_type" : "type-30367", ++ "self_type" : "type-30366", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132134,8 +132176,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-31054", +- "self_type" : "type-31053", ++ "referenced_type" : "type-31053", ++ "self_type" : "type-31052", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132143,8 +132185,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-32178", +- "self_type" : "type-32177", ++ "referenced_type" : "type-32177", ++ "self_type" : "type-32176", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132152,8 +132194,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-3826", +- "self_type" : "type-3825", ++ "referenced_type" : "type-3778", ++ "self_type" : "type-3777", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132170,8 +132212,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-5752", +- "self_type" : "type-5751", ++ "referenced_type" : "type-5704", ++ "self_type" : "type-5703", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132179,8 +132221,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-7059", +- "self_type" : "type-7058", ++ "referenced_type" : "type-7011", ++ "self_type" : "type-7010", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132188,8 +132230,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-7725", +- "self_type" : "type-7724", ++ "referenced_type" : "type-7677", ++ "self_type" : "type-7676", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132197,8 +132239,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-8047", +- "self_type" : "type-8046", ++ "referenced_type" : "type-7999", ++ "self_type" : "type-7998", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132206,8 +132248,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-9009", +- "self_type" : "type-9008", ++ "referenced_type" : "type-8961", ++ "self_type" : "type-8960", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132224,8 +132266,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-14903", +- "self_type" : "type-14902", ++ "referenced_type" : "type-14855", ++ "self_type" : "type-14854", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132233,8 +132275,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-15265", +- "self_type" : "type-15264", ++ "referenced_type" : "type-15217", ++ "self_type" : "type-15216", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132242,8 +132284,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18760", +- "self_type" : "type-18759", ++ "referenced_type" : "type-18712", ++ "self_type" : "type-18711", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132251,8 +132293,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19041", +- "self_type" : "type-19040", ++ "referenced_type" : "type-18993", ++ "self_type" : "type-18992", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132260,8 +132302,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19280", +- "self_type" : "type-19279", ++ "referenced_type" : "type-19232", ++ "self_type" : "type-19231", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132269,8 +132311,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19625", +- "self_type" : "type-19624", ++ "referenced_type" : "type-19577", ++ "self_type" : "type-19576", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132278,8 +132320,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19793", +- "self_type" : "type-19792", ++ "referenced_type" : "type-19745", ++ "self_type" : "type-19744", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132287,8 +132329,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19951", +- "self_type" : "type-19950", ++ "referenced_type" : "type-19903", ++ "self_type" : "type-19902", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132296,8 +132338,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23289", +- "self_type" : "type-23288", ++ "referenced_type" : "type-23285", ++ "self_type" : "type-23284", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132305,8 +132347,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23570", +- "self_type" : "type-23569", ++ "referenced_type" : "type-23551", ++ "self_type" : "type-23550", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132314,8 +132356,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23801", +- "self_type" : "type-23800", ++ "referenced_type" : "type-23790", ++ "self_type" : "type-23789", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132323,8 +132365,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24095", +- "self_type" : "type-24094", ++ "referenced_type" : "type-24093", ++ "self_type" : "type-24092", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132332,8 +132374,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24260", +- "self_type" : "type-24259", ++ "referenced_type" : "type-24262", ++ "self_type" : "type-24261", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132341,8 +132383,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24414", +- "self_type" : "type-24413", ++ "referenced_type" : "type-24396", ++ "self_type" : "type-24395", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132350,8 +132392,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24569", +- "self_type" : "type-24568", ++ "referenced_type" : "type-24536", ++ "self_type" : "type-24535", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132359,8 +132401,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24833", +- "self_type" : "type-24832", ++ "referenced_type" : "type-24793", ++ "self_type" : "type-24792", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132368,8 +132410,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-25119", +- "self_type" : "type-25118", ++ "referenced_type" : "type-25093", ++ "self_type" : "type-25092", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132377,8 +132419,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28474", +- "self_type" : "type-28473", ++ "referenced_type" : "type-28473", ++ "self_type" : "type-28472", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132386,8 +132428,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28755", +- "self_type" : "type-28754", ++ "referenced_type" : "type-28754", ++ "self_type" : "type-28753", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132395,8 +132437,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28986", +- "self_type" : "type-28985", ++ "referenced_type" : "type-28985", ++ "self_type" : "type-28984", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132404,8 +132446,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29280", +- "self_type" : "type-29279", ++ "referenced_type" : "type-29279", ++ "self_type" : "type-29278", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132413,8 +132455,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29445", +- "self_type" : "type-29444", ++ "referenced_type" : "type-29444", ++ "self_type" : "type-29443", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132422,8 +132464,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29599", +- "self_type" : "type-29598", ++ "referenced_type" : "type-29598", ++ "self_type" : "type-29597", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132431,8 +132473,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29754", +- "self_type" : "type-29753", ++ "referenced_type" : "type-29753", ++ "self_type" : "type-29752", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132440,8 +132482,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-30012", +- "self_type" : "type-30011", ++ "referenced_type" : "type-30011", ++ "self_type" : "type-30010", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132449,8 +132491,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-30264", +- "self_type" : "type-30263", ++ "referenced_type" : "type-30263", ++ "self_type" : "type-30262", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132476,8 +132518,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-10126", +- "self_type" : "type-10125", ++ "referenced_type" : "type-10078", ++ "self_type" : "type-10077", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132485,8 +132527,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-10633", +- "self_type" : "type-10632", ++ "referenced_type" : "type-10585", ++ "self_type" : "type-10584", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132494,8 +132536,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-10940", +- "self_type" : "type-10939", ++ "referenced_type" : "type-10892", ++ "self_type" : "type-10891", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132503,8 +132545,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-11292", +- "self_type" : "type-11291", ++ "referenced_type" : "type-11244", ++ "self_type" : "type-11243", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132512,8 +132554,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-11451", +- "self_type" : "type-11450", ++ "referenced_type" : "type-11403", ++ "self_type" : "type-11402", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132521,8 +132563,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-12337", +- "self_type" : "type-12336", ++ "referenced_type" : "type-12289", ++ "self_type" : "type-12288", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132530,8 +132572,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-13459", +- "self_type" : "type-13458", ++ "referenced_type" : "type-13411", ++ "self_type" : "type-13410", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132539,8 +132581,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-13924", +- "self_type" : "type-13923", ++ "referenced_type" : "type-13876", ++ "self_type" : "type-13875", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132548,8 +132590,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-14231", +- "self_type" : "type-14230", ++ "referenced_type" : "type-14183", ++ "self_type" : "type-14182", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132557,8 +132599,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-14543", +- "self_type" : "type-14542", ++ "referenced_type" : "type-14495", ++ "self_type" : "type-14494", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132566,8 +132608,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-14671", +- "self_type" : "type-14670", ++ "referenced_type" : "type-14623", ++ "self_type" : "type-14622", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132575,8 +132617,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-14905", +- "self_type" : "type-14904", ++ "referenced_type" : "type-14857", ++ "self_type" : "type-14856", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132584,8 +132626,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-15267", +- "self_type" : "type-15266", ++ "referenced_type" : "type-15219", ++ "self_type" : "type-15218", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132593,8 +132635,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16192", +- "self_type" : "type-16191", ++ "referenced_type" : "type-16144", ++ "self_type" : "type-16143", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132602,8 +132644,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17315", +- "self_type" : "type-17314", ++ "referenced_type" : "type-17267", ++ "self_type" : "type-17266", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132611,8 +132653,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17788", +- "self_type" : "type-17787", ++ "referenced_type" : "type-17740", ++ "self_type" : "type-17739", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132620,8 +132662,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18095", +- "self_type" : "type-18094", ++ "referenced_type" : "type-18047", ++ "self_type" : "type-18046", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132629,8 +132671,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18407", +- "self_type" : "type-18406", ++ "referenced_type" : "type-18359", ++ "self_type" : "type-18358", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132638,8 +132680,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18535", +- "self_type" : "type-18534", ++ "referenced_type" : "type-18487", ++ "self_type" : "type-18486", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132647,8 +132689,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18762", +- "self_type" : "type-18761", ++ "referenced_type" : "type-18714", ++ "self_type" : "type-18713", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132656,8 +132698,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19043", +- "self_type" : "type-19042", ++ "referenced_type" : "type-18995", ++ "self_type" : "type-18994", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132665,8 +132707,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19282", +- "self_type" : "type-19281", ++ "referenced_type" : "type-19234", ++ "self_type" : "type-19233", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132674,8 +132716,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19431", +- "self_type" : "type-19430", ++ "referenced_type" : "type-19383", ++ "self_type" : "type-19382", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132683,8 +132725,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19627", +- "self_type" : "type-19626", ++ "referenced_type" : "type-19579", ++ "self_type" : "type-19578", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132692,8 +132734,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19796", +- "self_type" : "type-19795", ++ "referenced_type" : "type-19748", ++ "self_type" : "type-19747", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132701,8 +132743,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19953", +- "self_type" : "type-19952", ++ "referenced_type" : "type-19905", ++ "self_type" : "type-19904", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132710,8 +132752,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20723", +- "self_type" : "type-20722", ++ "referenced_type" : "type-20675", ++ "self_type" : "type-20674", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132719,8 +132761,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-21847", +- "self_type" : "type-21846", ++ "referenced_type" : "type-21799", ++ "self_type" : "type-21798", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132728,8 +132770,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-22317", +- "self_type" : "type-22316", ++ "referenced_type" : "type-22287", ++ "self_type" : "type-22286", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132737,8 +132779,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-22624", +- "self_type" : "type-22623", ++ "referenced_type" : "type-22535", ++ "self_type" : "type-22534", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132746,8 +132788,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-22936", +- "self_type" : "type-22935", ++ "referenced_type" : "type-22901", ++ "self_type" : "type-22900", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132755,8 +132797,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23064", +- "self_type" : "type-23063", ++ "referenced_type" : "type-23045", ++ "self_type" : "type-23044", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132764,8 +132806,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23291", +- "self_type" : "type-23290", ++ "referenced_type" : "type-23287", ++ "self_type" : "type-23286", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132773,8 +132815,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23572", +- "self_type" : "type-23571", ++ "referenced_type" : "type-23553", ++ "self_type" : "type-23552", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132782,8 +132824,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23803", +- "self_type" : "type-23802", ++ "referenced_type" : "type-23792", ++ "self_type" : "type-23791", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132791,8 +132833,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23931", +- "self_type" : "type-23930", ++ "referenced_type" : "type-23934", ++ "self_type" : "type-23933", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132800,8 +132842,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24097", +- "self_type" : "type-24096", ++ "referenced_type" : "type-24095", ++ "self_type" : "type-24094", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132809,8 +132851,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24263", +- "self_type" : "type-24262", ++ "referenced_type" : "type-24265", ++ "self_type" : "type-24264", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132818,8 +132860,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24416", +- "self_type" : "type-24415", ++ "referenced_type" : "type-24398", ++ "self_type" : "type-24397", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132827,8 +132869,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24571", +- "self_type" : "type-24570", ++ "referenced_type" : "type-24538", ++ "self_type" : "type-24537", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132836,8 +132878,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24702", +- "self_type" : "type-24701", ++ "referenced_type" : "type-24664", ++ "self_type" : "type-24663", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132845,8 +132887,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24835", +- "self_type" : "type-24834", ++ "referenced_type" : "type-24795", ++ "self_type" : "type-24794", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132854,8 +132896,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-25121", +- "self_type" : "type-25120", ++ "referenced_type" : "type-25095", ++ "self_type" : "type-25094", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132863,8 +132905,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-25218", +- "self_type" : "type-25217", ++ "referenced_type" : "type-25219", ++ "self_type" : "type-25218", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132872,8 +132914,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-25902", +- "self_type" : "type-25901", ++ "referenced_type" : "type-25953", ++ "self_type" : "type-25952", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132881,8 +132923,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-27025", +- "self_type" : "type-27024", ++ "referenced_type" : "type-27055", ++ "self_type" : "type-27054", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132890,8 +132932,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-27502", +- "self_type" : "type-27501", ++ "referenced_type" : "type-27501", ++ "self_type" : "type-27500", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132899,8 +132941,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-27809", +- "self_type" : "type-27808", ++ "referenced_type" : "type-27808", ++ "self_type" : "type-27807", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132908,8 +132950,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28121", +- "self_type" : "type-28120", ++ "referenced_type" : "type-28120", ++ "self_type" : "type-28119", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132917,8 +132959,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28249", +- "self_type" : "type-28248", ++ "referenced_type" : "type-28248", ++ "self_type" : "type-28247", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132926,8 +132968,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28476", +- "self_type" : "type-28475", ++ "referenced_type" : "type-28475", ++ "self_type" : "type-28474", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132935,8 +132977,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28757", +- "self_type" : "type-28756", ++ "referenced_type" : "type-28756", ++ "self_type" : "type-28755", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132944,8 +132986,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28988", +- "self_type" : "type-28987", ++ "referenced_type" : "type-28987", ++ "self_type" : "type-28986", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132953,8 +132995,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29116", +- "self_type" : "type-29115", ++ "referenced_type" : "type-29115", ++ "self_type" : "type-29114", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132962,8 +133004,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29282", +- "self_type" : "type-29281", ++ "referenced_type" : "type-29281", ++ "self_type" : "type-29280", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132971,8 +133013,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29448", +- "self_type" : "type-29447", ++ "referenced_type" : "type-29447", ++ "self_type" : "type-29446", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132980,8 +133022,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29601", +- "self_type" : "type-29600", ++ "referenced_type" : "type-29600", ++ "self_type" : "type-29599", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132989,8 +133031,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29756", +- "self_type" : "type-29755", ++ "referenced_type" : "type-29755", ++ "self_type" : "type-29754", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -132998,8 +133040,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29883", +- "self_type" : "type-29882", ++ "referenced_type" : "type-29882", ++ "self_type" : "type-29881", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133007,8 +133049,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-30014", +- "self_type" : "type-30013", ++ "referenced_type" : "type-30013", ++ "self_type" : "type-30012", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133016,8 +133058,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-30266", +- "self_type" : "type-30265", ++ "referenced_type" : "type-30265", ++ "self_type" : "type-30264", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133025,8 +133067,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-30362", +- "self_type" : "type-30361", ++ "referenced_type" : "type-30361", ++ "self_type" : "type-30360", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133034,8 +133076,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-31048", +- "self_type" : "type-31047", ++ "referenced_type" : "type-31047", ++ "self_type" : "type-31046", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133043,8 +133085,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-32172", +- "self_type" : "type-32171", ++ "referenced_type" : "type-32171", ++ "self_type" : "type-32170", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133052,8 +133094,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-3820", +- "self_type" : "type-3819", ++ "referenced_type" : "type-3772", ++ "self_type" : "type-3771", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133070,8 +133112,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-5746", +- "self_type" : "type-5745", ++ "referenced_type" : "type-5698", ++ "self_type" : "type-5697", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133079,8 +133121,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-7053", +- "self_type" : "type-7052", ++ "referenced_type" : "type-7005", ++ "self_type" : "type-7004", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133088,8 +133130,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-7718", +- "self_type" : "type-7717", ++ "referenced_type" : "type-7670", ++ "self_type" : "type-7669", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133097,8 +133139,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-8041", +- "self_type" : "type-8040", ++ "referenced_type" : "type-7993", ++ "self_type" : "type-7992", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133106,8 +133148,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-9003", +- "self_type" : "type-9002", ++ "referenced_type" : "type-8955", ++ "self_type" : "type-8954", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133124,8 +133166,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-10128", +- "self_type" : "type-10127", ++ "referenced_type" : "type-10080", ++ "self_type" : "type-10079", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133133,8 +133175,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-10635", +- "self_type" : "type-10634", ++ "referenced_type" : "type-10587", ++ "self_type" : "type-10586", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133142,8 +133184,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-10942", +- "self_type" : "type-10941", ++ "referenced_type" : "type-10894", ++ "self_type" : "type-10893", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133151,8 +133193,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-11294", +- "self_type" : "type-11293", ++ "referenced_type" : "type-11246", ++ "self_type" : "type-11245", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133160,8 +133202,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-11453", +- "self_type" : "type-11452", ++ "referenced_type" : "type-11405", ++ "self_type" : "type-11404", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133169,8 +133211,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-12339", +- "self_type" : "type-12338", ++ "referenced_type" : "type-12291", ++ "self_type" : "type-12290", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133178,8 +133220,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-13461", +- "self_type" : "type-13460", ++ "referenced_type" : "type-13413", ++ "self_type" : "type-13412", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133187,8 +133229,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-13926", +- "self_type" : "type-13925", ++ "referenced_type" : "type-13878", ++ "self_type" : "type-13877", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133196,8 +133238,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-14233", +- "self_type" : "type-14232", ++ "referenced_type" : "type-14185", ++ "self_type" : "type-14184", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133205,8 +133247,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-14545", +- "self_type" : "type-14544", ++ "referenced_type" : "type-14497", ++ "self_type" : "type-14496", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133214,8 +133256,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-14673", +- "self_type" : "type-14672", ++ "referenced_type" : "type-14625", ++ "self_type" : "type-14624", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133223,8 +133265,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-14907", +- "self_type" : "type-14906", ++ "referenced_type" : "type-14859", ++ "self_type" : "type-14858", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133232,8 +133274,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-15269", +- "self_type" : "type-15268", ++ "referenced_type" : "type-15221", ++ "self_type" : "type-15220", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133241,8 +133283,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16194", +- "self_type" : "type-16193", ++ "referenced_type" : "type-16146", ++ "self_type" : "type-16145", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133250,8 +133292,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17317", +- "self_type" : "type-17316", ++ "referenced_type" : "type-17269", ++ "self_type" : "type-17268", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133259,8 +133301,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17790", +- "self_type" : "type-17789", ++ "referenced_type" : "type-17742", ++ "self_type" : "type-17741", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133268,8 +133310,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18097", +- "self_type" : "type-18096", ++ "referenced_type" : "type-18049", ++ "self_type" : "type-18048", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133277,8 +133319,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18409", +- "self_type" : "type-18408", ++ "referenced_type" : "type-18361", ++ "self_type" : "type-18360", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133286,8 +133328,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18537", +- "self_type" : "type-18536", ++ "referenced_type" : "type-18489", ++ "self_type" : "type-18488", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133295,8 +133337,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18764", +- "self_type" : "type-18763", ++ "referenced_type" : "type-18716", ++ "self_type" : "type-18715", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133304,8 +133346,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19045", +- "self_type" : "type-19044", ++ "referenced_type" : "type-18997", ++ "self_type" : "type-18996", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133313,8 +133355,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19284", +- "self_type" : "type-19283", ++ "referenced_type" : "type-19236", ++ "self_type" : "type-19235", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133322,8 +133364,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19433", +- "self_type" : "type-19432", ++ "referenced_type" : "type-19385", ++ "self_type" : "type-19384", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133331,8 +133373,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19629", +- "self_type" : "type-19628", ++ "referenced_type" : "type-19581", ++ "self_type" : "type-19580", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133340,8 +133382,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19798", +- "self_type" : "type-19797", ++ "referenced_type" : "type-19750", ++ "self_type" : "type-19749", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133349,8 +133391,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19955", +- "self_type" : "type-19954", ++ "referenced_type" : "type-19907", ++ "self_type" : "type-19906", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133358,8 +133400,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20725", +- "self_type" : "type-20724", ++ "referenced_type" : "type-20677", ++ "self_type" : "type-20676", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133367,8 +133409,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-21849", +- "self_type" : "type-21848", ++ "referenced_type" : "type-21801", ++ "self_type" : "type-21800", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133376,8 +133418,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-22319", +- "self_type" : "type-22318", ++ "referenced_type" : "type-22289", ++ "self_type" : "type-22288", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133385,8 +133427,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-22626", +- "self_type" : "type-22625", ++ "referenced_type" : "type-22537", ++ "self_type" : "type-22536", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133394,8 +133436,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-22938", +- "self_type" : "type-22937", ++ "referenced_type" : "type-22903", ++ "self_type" : "type-22902", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133403,8 +133445,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23066", +- "self_type" : "type-23065", ++ "referenced_type" : "type-23048", ++ "self_type" : "type-23047", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133412,8 +133454,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23293", +- "self_type" : "type-23292", ++ "referenced_type" : "type-23289", ++ "self_type" : "type-23288", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133421,8 +133463,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23574", +- "self_type" : "type-23573", ++ "referenced_type" : "type-23555", ++ "self_type" : "type-23554", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133430,8 +133472,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23805", +- "self_type" : "type-23804", ++ "referenced_type" : "type-23794", ++ "self_type" : "type-23793", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133439,8 +133481,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23933", +- "self_type" : "type-23932", ++ "referenced_type" : "type-23936", ++ "self_type" : "type-23935", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133448,8 +133490,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24099", +- "self_type" : "type-24098", ++ "referenced_type" : "type-24097", ++ "self_type" : "type-24096", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133457,8 +133499,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24265", +- "self_type" : "type-24264", ++ "referenced_type" : "type-24267", ++ "self_type" : "type-24266", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133466,8 +133508,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24418", +- "self_type" : "type-24417", ++ "referenced_type" : "type-24400", ++ "self_type" : "type-24399", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133475,8 +133517,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24573", +- "self_type" : "type-24572", ++ "referenced_type" : "type-24540", ++ "self_type" : "type-24539", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133484,8 +133526,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24704", +- "self_type" : "type-24703", ++ "referenced_type" : "type-24666", ++ "self_type" : "type-24665", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133493,8 +133535,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24837", +- "self_type" : "type-24836", ++ "referenced_type" : "type-24797", ++ "self_type" : "type-24796", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133502,8 +133544,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-25123", +- "self_type" : "type-25122", ++ "referenced_type" : "type-25098", ++ "self_type" : "type-25097", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133511,8 +133553,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-25220", +- "self_type" : "type-25219", ++ "referenced_type" : "type-25221", ++ "self_type" : "type-25220", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133520,8 +133562,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-25904", +- "self_type" : "type-25903", ++ "referenced_type" : "type-25955", ++ "self_type" : "type-25954", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133529,8 +133571,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-27027", +- "self_type" : "type-27026", ++ "referenced_type" : "type-27057", ++ "self_type" : "type-27056", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133538,8 +133580,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-27504", +- "self_type" : "type-27503", ++ "referenced_type" : "type-27503", ++ "self_type" : "type-27502", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133547,8 +133589,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-27811", +- "self_type" : "type-27810", ++ "referenced_type" : "type-27810", ++ "self_type" : "type-27809", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133556,8 +133598,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28123", +- "self_type" : "type-28122", ++ "referenced_type" : "type-28122", ++ "self_type" : "type-28121", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133565,8 +133607,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28251", +- "self_type" : "type-28250", ++ "referenced_type" : "type-28250", ++ "self_type" : "type-28249", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133574,8 +133616,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28478", +- "self_type" : "type-28477", ++ "referenced_type" : "type-28477", ++ "self_type" : "type-28476", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133583,8 +133625,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28759", +- "self_type" : "type-28758", ++ "referenced_type" : "type-28758", ++ "self_type" : "type-28757", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133592,8 +133634,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28990", +- "self_type" : "type-28989", ++ "referenced_type" : "type-28989", ++ "self_type" : "type-28988", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133601,8 +133643,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29118", +- "self_type" : "type-29117", ++ "referenced_type" : "type-29117", ++ "self_type" : "type-29116", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133610,8 +133652,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29284", +- "self_type" : "type-29283", ++ "referenced_type" : "type-29283", ++ "self_type" : "type-29282", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133619,8 +133661,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29450", +- "self_type" : "type-29449", ++ "referenced_type" : "type-29449", ++ "self_type" : "type-29448", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133628,8 +133670,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29603", +- "self_type" : "type-29602", ++ "referenced_type" : "type-29602", ++ "self_type" : "type-29601", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133637,8 +133679,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29758", +- "self_type" : "type-29757", ++ "referenced_type" : "type-29757", ++ "self_type" : "type-29756", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133646,8 +133688,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29885", +- "self_type" : "type-29884", ++ "referenced_type" : "type-29884", ++ "self_type" : "type-29883", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133655,8 +133697,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-30016", +- "self_type" : "type-30015", ++ "referenced_type" : "type-30015", ++ "self_type" : "type-30014", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133664,8 +133706,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-30268", +- "self_type" : "type-30267", ++ "referenced_type" : "type-30267", ++ "self_type" : "type-30266", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133673,8 +133715,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-30364", +- "self_type" : "type-30363", ++ "referenced_type" : "type-30363", ++ "self_type" : "type-30362", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133682,8 +133724,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-31050", +- "self_type" : "type-31049", ++ "referenced_type" : "type-31049", ++ "self_type" : "type-31048", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133691,8 +133733,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-32174", +- "self_type" : "type-32173", ++ "referenced_type" : "type-32173", ++ "self_type" : "type-32172", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133700,8 +133742,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-3822", +- "self_type" : "type-3821", ++ "referenced_type" : "type-3774", ++ "self_type" : "type-3773", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133718,8 +133760,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-5748", +- "self_type" : "type-5747", ++ "referenced_type" : "type-5700", ++ "self_type" : "type-5699", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133727,8 +133769,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-7055", +- "self_type" : "type-7054", ++ "referenced_type" : "type-7007", ++ "self_type" : "type-7006", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133736,8 +133778,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-7720", +- "self_type" : "type-7719", ++ "referenced_type" : "type-7672", ++ "self_type" : "type-7671", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133745,8 +133787,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-8043", +- "self_type" : "type-8042", ++ "referenced_type" : "type-7995", ++ "self_type" : "type-7994", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133754,8 +133796,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-9005", +- "self_type" : "type-9004", ++ "referenced_type" : "type-8957", ++ "self_type" : "type-8956", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133772,8 +133814,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-10130", +- "self_type" : "type-10129", ++ "referenced_type" : "type-10082", ++ "self_type" : "type-10081", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133781,8 +133823,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-10638", +- "self_type" : "type-10637", ++ "referenced_type" : "type-10590", ++ "self_type" : "type-10589", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133790,8 +133832,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-10944", +- "self_type" : "type-10943", ++ "referenced_type" : "type-10896", ++ "self_type" : "type-10895", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133799,8 +133841,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-11296", +- "self_type" : "type-11295", ++ "referenced_type" : "type-11248", ++ "self_type" : "type-11247", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133808,8 +133850,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-11455", +- "self_type" : "type-11454", ++ "referenced_type" : "type-11407", ++ "self_type" : "type-11406", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133817,8 +133859,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-12341", +- "self_type" : "type-12340", ++ "referenced_type" : "type-12293", ++ "self_type" : "type-12292", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133826,8 +133868,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-13463", +- "self_type" : "type-13462", ++ "referenced_type" : "type-13415", ++ "self_type" : "type-13414", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133835,8 +133877,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-13929", +- "self_type" : "type-13928", ++ "referenced_type" : "type-13881", ++ "self_type" : "type-13880", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133844,8 +133886,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-14235", +- "self_type" : "type-14234", ++ "referenced_type" : "type-14187", ++ "self_type" : "type-14186", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133853,8 +133895,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-14547", +- "self_type" : "type-14546", ++ "referenced_type" : "type-14499", ++ "self_type" : "type-14498", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133862,8 +133904,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-14675", +- "self_type" : "type-14674", ++ "referenced_type" : "type-14627", ++ "self_type" : "type-14626", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133871,8 +133913,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-14909", +- "self_type" : "type-14908", ++ "referenced_type" : "type-14861", ++ "self_type" : "type-14860", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133880,8 +133922,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-15271", +- "self_type" : "type-15270", ++ "referenced_type" : "type-15223", ++ "self_type" : "type-15222", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133889,8 +133931,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-16196", +- "self_type" : "type-16195", ++ "referenced_type" : "type-16148", ++ "self_type" : "type-16147", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133898,8 +133940,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17319", +- "self_type" : "type-17318", ++ "referenced_type" : "type-17271", ++ "self_type" : "type-17270", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133907,8 +133949,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-17793", +- "self_type" : "type-17792", ++ "referenced_type" : "type-17745", ++ "self_type" : "type-17744", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133916,8 +133958,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18099", +- "self_type" : "type-18098", ++ "referenced_type" : "type-18051", ++ "self_type" : "type-18050", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133925,8 +133967,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18411", +- "self_type" : "type-18410", ++ "referenced_type" : "type-18363", ++ "self_type" : "type-18362", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133934,8 +133976,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18539", +- "self_type" : "type-18538", ++ "referenced_type" : "type-18491", ++ "self_type" : "type-18490", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133943,8 +133985,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-18766", +- "self_type" : "type-18765", ++ "referenced_type" : "type-18718", ++ "self_type" : "type-18717", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133952,8 +133994,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19047", +- "self_type" : "type-19046", ++ "referenced_type" : "type-18999", ++ "self_type" : "type-18998", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133961,8 +134003,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19286", +- "self_type" : "type-19285", ++ "referenced_type" : "type-19238", ++ "self_type" : "type-19237", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133970,8 +134012,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19435", +- "self_type" : "type-19434", ++ "referenced_type" : "type-19387", ++ "self_type" : "type-19386", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133979,8 +134021,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19631", +- "self_type" : "type-19630", ++ "referenced_type" : "type-19583", ++ "self_type" : "type-19582", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133988,8 +134030,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19800", +- "self_type" : "type-19799", ++ "referenced_type" : "type-19752", ++ "self_type" : "type-19751", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -133997,8 +134039,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-19957", +- "self_type" : "type-19956", ++ "referenced_type" : "type-19909", ++ "self_type" : "type-19908", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134006,8 +134048,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-20727", +- "self_type" : "type-20726", ++ "referenced_type" : "type-20679", ++ "self_type" : "type-20678", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134015,8 +134057,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-21851", +- "self_type" : "type-21850", ++ "referenced_type" : "type-21803", ++ "self_type" : "type-21802", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134024,8 +134066,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-22322", +- "self_type" : "type-22321", ++ "referenced_type" : "type-22291", ++ "self_type" : "type-22290", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134033,8 +134075,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-22628", +- "self_type" : "type-22627", ++ "referenced_type" : "type-22540", ++ "self_type" : "type-22539", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134042,8 +134084,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-22940", +- "self_type" : "type-22939", ++ "referenced_type" : "type-22905", ++ "self_type" : "type-22904", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134051,8 +134093,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23068", +- "self_type" : "type-23067", ++ "referenced_type" : "type-23050", ++ "self_type" : "type-23049", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134060,8 +134102,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23295", +- "self_type" : "type-23294", ++ "referenced_type" : "type-23291", ++ "self_type" : "type-23290", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134069,8 +134111,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23576", +- "self_type" : "type-23575", ++ "referenced_type" : "type-23557", ++ "self_type" : "type-23556", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134078,8 +134120,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23807", +- "self_type" : "type-23806", ++ "referenced_type" : "type-23796", ++ "self_type" : "type-23795", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134087,8 +134129,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-23935", +- "self_type" : "type-23934", ++ "referenced_type" : "type-23938", ++ "self_type" : "type-23937", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134096,8 +134138,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24101", +- "self_type" : "type-24100", ++ "referenced_type" : "type-24099", ++ "self_type" : "type-24098", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134105,8 +134147,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24267", +- "self_type" : "type-24266", ++ "referenced_type" : "type-24269", ++ "self_type" : "type-24268", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134114,8 +134156,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24420", +- "self_type" : "type-24419", ++ "referenced_type" : "type-24402", ++ "self_type" : "type-24401", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134123,8 +134165,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24575", +- "self_type" : "type-24574", ++ "referenced_type" : "type-24542", ++ "self_type" : "type-24541", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134132,8 +134174,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24706", +- "self_type" : "type-24705", ++ "referenced_type" : "type-24668", ++ "self_type" : "type-24667", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134141,8 +134183,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-24839", +- "self_type" : "type-24838", ++ "referenced_type" : "type-24799", ++ "self_type" : "type-24798", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134150,8 +134192,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-25125", +- "self_type" : "type-25124", ++ "referenced_type" : "type-25100", ++ "self_type" : "type-25099", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134159,8 +134201,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-25222", +- "self_type" : "type-25221", ++ "referenced_type" : "type-25223", ++ "self_type" : "type-25222", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134168,8 +134210,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-25906", +- "self_type" : "type-25905", ++ "referenced_type" : "type-25957", ++ "self_type" : "type-25956", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134177,8 +134219,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-27029", +- "self_type" : "type-27028", ++ "referenced_type" : "type-27059", ++ "self_type" : "type-27058", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134186,8 +134228,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-27507", +- "self_type" : "type-27506", ++ "referenced_type" : "type-27506", ++ "self_type" : "type-27505", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134195,8 +134237,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-27813", +- "self_type" : "type-27812", ++ "referenced_type" : "type-27812", ++ "self_type" : "type-27811", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134204,8 +134246,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28125", +- "self_type" : "type-28124", ++ "referenced_type" : "type-28124", ++ "self_type" : "type-28123", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134213,8 +134255,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28253", +- "self_type" : "type-28252", ++ "referenced_type" : "type-28252", ++ "self_type" : "type-28251", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134222,8 +134264,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28480", +- "self_type" : "type-28479", ++ "referenced_type" : "type-28479", ++ "self_type" : "type-28478", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134231,8 +134273,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28761", +- "self_type" : "type-28760", ++ "referenced_type" : "type-28760", ++ "self_type" : "type-28759", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134240,8 +134282,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-28992", +- "self_type" : "type-28991", ++ "referenced_type" : "type-28991", ++ "self_type" : "type-28990", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134249,8 +134291,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29120", +- "self_type" : "type-29119", ++ "referenced_type" : "type-29119", ++ "self_type" : "type-29118", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134258,8 +134300,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29286", +- "self_type" : "type-29285", ++ "referenced_type" : "type-29285", ++ "self_type" : "type-29284", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134267,8 +134309,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29452", +- "self_type" : "type-29451", ++ "referenced_type" : "type-29451", ++ "self_type" : "type-29450", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134276,8 +134318,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29605", +- "self_type" : "type-29604", ++ "referenced_type" : "type-29604", ++ "self_type" : "type-29603", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134285,8 +134327,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29760", +- "self_type" : "type-29759", ++ "referenced_type" : "type-29759", ++ "self_type" : "type-29758", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134294,8 +134336,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-29887", +- "self_type" : "type-29886", ++ "referenced_type" : "type-29886", ++ "self_type" : "type-29885", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134303,8 +134345,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-30018", +- "self_type" : "type-30017", ++ "referenced_type" : "type-30017", ++ "self_type" : "type-30016", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134312,8 +134354,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-30270", +- "self_type" : "type-30269", ++ "referenced_type" : "type-30269", ++ "self_type" : "type-30268", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134321,8 +134363,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-30366", +- "self_type" : "type-30365", ++ "referenced_type" : "type-30365", ++ "self_type" : "type-30364", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134330,8 +134372,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-31052", +- "self_type" : "type-31051", ++ "referenced_type" : "type-31051", ++ "self_type" : "type-31050", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134339,8 +134381,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-32176", +- "self_type" : "type-32175", ++ "referenced_type" : "type-32175", ++ "self_type" : "type-32174", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134348,8 +134390,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-3824", +- "self_type" : "type-3823", ++ "referenced_type" : "type-3776", ++ "self_type" : "type-3775", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134366,8 +134408,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-5750", +- "self_type" : "type-5749", ++ "referenced_type" : "type-5702", ++ "self_type" : "type-5701", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134375,8 +134417,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-7057", +- "self_type" : "type-7056", ++ "referenced_type" : "type-7009", ++ "self_type" : "type-7008", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134384,8 +134426,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-7723", +- "self_type" : "type-7722", ++ "referenced_type" : "type-7675", ++ "self_type" : "type-7674", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134393,8 +134435,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-8045", +- "self_type" : "type-8044", ++ "referenced_type" : "type-7997", ++ "self_type" : "type-7996", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134402,8 +134444,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedField *", + "name" : "google::protobuf::RepeatedField *", +- "referenced_type" : "type-9007", +- "self_type" : "type-9006", ++ "referenced_type" : "type-8959", ++ "self_type" : "type-8958", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -134420,8 +134462,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-1676", +- "self_type" : "type-2071", ++ "referenced_type" : "type-1590", ++ "self_type" : "type-2003", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -134429,8 +134471,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-1695", +- "self_type" : "type-2092", ++ "referenced_type" : "type-1609", ++ "self_type" : "type-2025", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -134438,8 +134480,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-1701", +- "self_type" : "type-2102", ++ "referenced_type" : "type-1615", ++ "self_type" : "type-2035", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -134447,8 +134489,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-1687", +- "self_type" : "type-2076", ++ "referenced_type" : "type-1601", ++ "self_type" : "type-2008", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -134456,8 +134498,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2417", +- "self_type" : "type-2421", ++ "referenced_type" : "type-2347", ++ "self_type" : "type-2351", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -134465,8 +134507,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-1689", +- "self_type" : "type-2108", ++ "referenced_type" : "type-1603", ++ "self_type" : "type-2041", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -134474,8 +134516,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2404", +- "self_type" : "type-2408", ++ "referenced_type" : "type-2334", ++ "self_type" : "type-2340", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -134483,8 +134525,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-1678", +- "self_type" : "type-2086", ++ "referenced_type" : "type-1592", ++ "self_type" : "type-2019", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -134492,8 +134534,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2061", +- "self_type" : "type-2065", ++ "referenced_type" : "type-1993", ++ "self_type" : "type-1997", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -134501,8 +134543,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2133", +- "self_type" : "type-2137", ++ "referenced_type" : "type-2064", ++ "self_type" : "type-2068", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -134510,8 +134552,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-10117", +- "self_type" : "type-10116", ++ "referenced_type" : "type-10069", ++ "self_type" : "type-10068", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134519,8 +134561,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-10258", +- "self_type" : "type-10257", ++ "referenced_type" : "type-10210", ++ "self_type" : "type-10209", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134528,8 +134570,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-10758", +- "self_type" : "type-10757", ++ "referenced_type" : "type-10710", ++ "self_type" : "type-10709", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134537,8 +134579,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-10846", +- "self_type" : "type-10845", ++ "referenced_type" : "type-10798", ++ "self_type" : "type-10797", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134546,8 +134588,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-10936", +- "self_type" : "type-10935", ++ "referenced_type" : "type-10888", ++ "self_type" : "type-10887", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134555,8 +134597,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-11019", +- "self_type" : "type-11018", ++ "referenced_type" : "type-10971", ++ "self_type" : "type-10970", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134564,8 +134606,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-11095", +- "self_type" : "type-11094", ++ "referenced_type" : "type-11047", ++ "self_type" : "type-11046", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134573,8 +134615,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-11288", +- "self_type" : "type-11287", ++ "referenced_type" : "type-11240", ++ "self_type" : "type-11239", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134582,8 +134624,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-11445", +- "self_type" : "type-11444", ++ "referenced_type" : "type-11397", ++ "self_type" : "type-11396", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134591,8 +134633,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-11904", +- "self_type" : "type-11903", ++ "referenced_type" : "type-11856", ++ "self_type" : "type-11855", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134600,8 +134642,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-12074", +- "self_type" : "type-12073", ++ "referenced_type" : "type-12026", ++ "self_type" : "type-12025", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134609,8 +134651,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-12183", +- "self_type" : "type-12182", ++ "referenced_type" : "type-12135", ++ "self_type" : "type-12134", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134618,8 +134660,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-12317", +- "self_type" : "type-12316", ++ "referenced_type" : "type-12269", ++ "self_type" : "type-12268", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134627,8 +134669,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-12464", +- "self_type" : "type-12463", ++ "referenced_type" : "type-12416", ++ "self_type" : "type-12415", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134636,8 +134678,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-12557", +- "self_type" : "type-12556", ++ "referenced_type" : "type-12509", ++ "self_type" : "type-12508", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134645,8 +134687,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-12658", +- "self_type" : "type-12657", ++ "referenced_type" : "type-12610", ++ "self_type" : "type-12609", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134654,8 +134696,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-12840", +- "self_type" : "type-12839", ++ "referenced_type" : "type-12792", ++ "self_type" : "type-12791", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134663,8 +134705,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-12920", +- "self_type" : "type-12919", ++ "referenced_type" : "type-12872", ++ "self_type" : "type-12871", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134672,8 +134714,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-12978", +- "self_type" : "type-12977", ++ "referenced_type" : "type-12930", ++ "self_type" : "type-12929", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134681,8 +134723,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-13052", +- "self_type" : "type-13051", ++ "referenced_type" : "type-13004", ++ "self_type" : "type-13003", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134690,8 +134732,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-13450", +- "self_type" : "type-13449", ++ "referenced_type" : "type-13402", ++ "self_type" : "type-13401", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134699,8 +134741,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-13549", +- "self_type" : "type-13548", ++ "referenced_type" : "type-13501", ++ "self_type" : "type-13500", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134708,8 +134750,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-14049", +- "self_type" : "type-14048", ++ "referenced_type" : "type-14001", ++ "self_type" : "type-14000", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134717,8 +134759,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-14137", +- "self_type" : "type-14136", ++ "referenced_type" : "type-14089", ++ "self_type" : "type-14088", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134726,8 +134768,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-14227", +- "self_type" : "type-14226", ++ "referenced_type" : "type-14179", ++ "self_type" : "type-14178", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134735,8 +134777,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-14310", +- "self_type" : "type-14309", ++ "referenced_type" : "type-14262", ++ "self_type" : "type-14261", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134744,8 +134786,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-14377", +- "self_type" : "type-14376", ++ "referenced_type" : "type-14329", ++ "self_type" : "type-14328", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134753,8 +134795,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-14539", +- "self_type" : "type-14538", ++ "referenced_type" : "type-14491", ++ "self_type" : "type-14490", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134762,8 +134804,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-14664", +- "self_type" : "type-14663", ++ "referenced_type" : "type-14616", ++ "self_type" : "type-14615", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134771,8 +134813,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-14806", +- "self_type" : "type-14805", ++ "referenced_type" : "type-14758", ++ "self_type" : "type-14757", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134780,8 +134822,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-14897", +- "self_type" : "type-14896", ++ "referenced_type" : "type-14849", ++ "self_type" : "type-14848", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134789,8 +134831,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-15258", +- "self_type" : "type-15257", ++ "referenced_type" : "type-15210", ++ "self_type" : "type-15209", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134798,8 +134840,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-15761", +- "self_type" : "type-15760", ++ "referenced_type" : "type-15713", ++ "self_type" : "type-15712", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134807,8 +134849,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-15930", +- "self_type" : "type-15929", ++ "referenced_type" : "type-15882", ++ "self_type" : "type-15881", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134816,8 +134858,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16038", +- "self_type" : "type-16037", ++ "referenced_type" : "type-15990", ++ "self_type" : "type-15989", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134825,8 +134867,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16172", +- "self_type" : "type-16171", ++ "referenced_type" : "type-16124", ++ "self_type" : "type-16123", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134834,8 +134876,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16321", +- "self_type" : "type-16320", ++ "referenced_type" : "type-16273", ++ "self_type" : "type-16272", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134843,8 +134885,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16414", +- "self_type" : "type-16413", ++ "referenced_type" : "type-16366", ++ "self_type" : "type-16365", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134852,8 +134894,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16514", +- "self_type" : "type-16513", ++ "referenced_type" : "type-16466", ++ "self_type" : "type-16465", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134861,8 +134903,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16696", +- "self_type" : "type-16695", ++ "referenced_type" : "type-16648", ++ "self_type" : "type-16647", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134870,8 +134912,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16776", +- "self_type" : "type-16775", ++ "referenced_type" : "type-16728", ++ "self_type" : "type-16727", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134879,8 +134921,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16834", +- "self_type" : "type-16833", ++ "referenced_type" : "type-16786", ++ "self_type" : "type-16785", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134888,8 +134930,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16908", +- "self_type" : "type-16907", ++ "referenced_type" : "type-16860", ++ "self_type" : "type-16859", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134897,8 +134939,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17306", +- "self_type" : "type-17305", ++ "referenced_type" : "type-17258", ++ "self_type" : "type-17257", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134906,8 +134948,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17413", +- "self_type" : "type-17412", ++ "referenced_type" : "type-17365", ++ "self_type" : "type-17364", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134915,8 +134957,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17913", +- "self_type" : "type-17912", ++ "referenced_type" : "type-17865", ++ "self_type" : "type-17864", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134924,8 +134966,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18001", +- "self_type" : "type-18000", ++ "referenced_type" : "type-17953", ++ "self_type" : "type-17952", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134933,8 +134975,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18091", +- "self_type" : "type-18090", ++ "referenced_type" : "type-18043", ++ "self_type" : "type-18042", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134942,8 +134984,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18174", +- "self_type" : "type-18173", ++ "referenced_type" : "type-18126", ++ "self_type" : "type-18125", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134951,8 +134993,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18241", +- "self_type" : "type-18240", ++ "referenced_type" : "type-18193", ++ "self_type" : "type-18192", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134960,8 +135002,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18403", +- "self_type" : "type-18402", ++ "referenced_type" : "type-18355", ++ "self_type" : "type-18354", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134969,8 +135011,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18528", +- "self_type" : "type-18527", ++ "referenced_type" : "type-18480", ++ "self_type" : "type-18479", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134978,8 +135020,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18670", +- "self_type" : "type-18669", ++ "referenced_type" : "type-18622", ++ "self_type" : "type-18621", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134987,8 +135029,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18754", +- "self_type" : "type-18753", ++ "referenced_type" : "type-18706", ++ "self_type" : "type-18705", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -134996,8 +135038,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19034", +- "self_type" : "type-19033", ++ "referenced_type" : "type-18986", ++ "self_type" : "type-18985", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135005,8 +135047,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19276", +- "self_type" : "type-19275", ++ "referenced_type" : "type-19228", ++ "self_type" : "type-19227", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135014,8 +135056,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19427", +- "self_type" : "type-19426", ++ "referenced_type" : "type-19379", ++ "self_type" : "type-19378", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135023,8 +135065,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19615", +- "self_type" : "type-19614", ++ "referenced_type" : "type-19567", ++ "self_type" : "type-19566", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135032,8 +135074,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19786", +- "self_type" : "type-19785", ++ "referenced_type" : "type-19738", ++ "self_type" : "type-19737", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135041,8 +135083,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19945", +- "self_type" : "type-19944", ++ "referenced_type" : "type-19897", ++ "self_type" : "type-19896", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135050,8 +135092,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20294", +- "self_type" : "type-20293", ++ "referenced_type" : "type-20246", ++ "self_type" : "type-20245", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135059,8 +135101,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20464", +- "self_type" : "type-20463", ++ "referenced_type" : "type-20416", ++ "self_type" : "type-20415", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135068,8 +135110,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20570", +- "self_type" : "type-20569", ++ "referenced_type" : "type-20522", ++ "self_type" : "type-20521", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135077,8 +135119,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20703", +- "self_type" : "type-20702", ++ "referenced_type" : "type-20655", ++ "self_type" : "type-20654", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135086,8 +135128,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20852", +- "self_type" : "type-20851", ++ "referenced_type" : "type-20804", ++ "self_type" : "type-20803", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135095,8 +135137,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20945", +- "self_type" : "type-20944", ++ "referenced_type" : "type-2089", ++ "self_type" : "type-2088", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135104,8 +135146,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21046", +- "self_type" : "type-21045", ++ "referenced_type" : "type-20897", ++ "self_type" : "type-20896", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135113,8 +135155,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21228", +- "self_type" : "type-21227", ++ "referenced_type" : "type-20998", ++ "self_type" : "type-20997", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135122,8 +135164,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21308", +- "self_type" : "type-21307", ++ "referenced_type" : "type-21180", ++ "self_type" : "type-21179", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135131,8 +135173,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21366", +- "self_type" : "type-21365", ++ "referenced_type" : "type-21260", ++ "self_type" : "type-21259", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135140,8 +135182,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21440", +- "self_type" : "type-21439", ++ "referenced_type" : "type-21318", ++ "self_type" : "type-21317", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135149,8 +135191,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2158", +- "self_type" : "type-2157", ++ "referenced_type" : "type-21392", ++ "self_type" : "type-21391", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135158,8 +135200,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21838", +- "self_type" : "type-21837", ++ "referenced_type" : "type-21790", ++ "self_type" : "type-21789", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135176,8 +135218,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-22442", +- "self_type" : "type-22441", ++ "referenced_type" : "type-22389", ++ "self_type" : "type-22388", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135185,8 +135227,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-22530", +- "self_type" : "type-22529", ++ "referenced_type" : "type-22447", ++ "self_type" : "type-22446", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135194,8 +135236,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-22620", +- "self_type" : "type-22619", ++ "referenced_type" : "type-22529", ++ "self_type" : "type-22528", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135203,8 +135245,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-22703", +- "self_type" : "type-22702", ++ "referenced_type" : "type-22627", ++ "self_type" : "type-22626", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135212,8 +135254,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-22770", +- "self_type" : "type-22769", ++ "referenced_type" : "type-22713", ++ "self_type" : "type-22712", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135221,8 +135263,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-22932", +- "self_type" : "type-22931", ++ "referenced_type" : "type-22896", ++ "self_type" : "type-22895", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135230,8 +135272,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-23057", +- "self_type" : "type-23056", ++ "referenced_type" : "type-23039", ++ "self_type" : "type-23038", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135239,8 +135281,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-23199", +- "self_type" : "type-23198", ++ "referenced_type" : "type-23185", ++ "self_type" : "type-23184", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135248,8 +135290,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-23283", +- "self_type" : "type-23282", ++ "referenced_type" : "type-23278", ++ "self_type" : "type-23277", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135257,8 +135299,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-23563", +- "self_type" : "type-23562", ++ "referenced_type" : "type-23544", ++ "self_type" : "type-23543", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135266,8 +135308,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-23797", +- "self_type" : "type-23796", ++ "referenced_type" : "type-2374", ++ "self_type" : "type-2373", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135275,8 +135317,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-23927", +- "self_type" : "type-23926", ++ "referenced_type" : "type-23786", ++ "self_type" : "type-23785", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135284,8 +135326,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-24085", +- "self_type" : "type-24084", ++ "referenced_type" : "type-23928", ++ "self_type" : "type-23927", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135293,8 +135335,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-24253", +- "self_type" : "type-24252", ++ "referenced_type" : "type-24083", ++ "self_type" : "type-24082", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135302,8 +135344,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-24408", +- "self_type" : "type-24407", ++ "referenced_type" : "type-24256", ++ "self_type" : "type-24255", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135311,8 +135353,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2444", +- "self_type" : "type-2443", ++ "referenced_type" : "type-24389", ++ "self_type" : "type-24388", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135320,8 +135362,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-24563", +- "self_type" : "type-24562", ++ "referenced_type" : "type-24532", ++ "self_type" : "type-24531", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135329,8 +135371,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-24698", +- "self_type" : "type-24697", ++ "referenced_type" : "type-24660", ++ "self_type" : "type-24659", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135338,8 +135380,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-24829", +- "self_type" : "type-24828", ++ "referenced_type" : "type-24789", ++ "self_type" : "type-24788", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135347,8 +135389,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-24993", +- "self_type" : "type-24992", ++ "referenced_type" : "type-24962", ++ "self_type" : "type-24961", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135356,8 +135398,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-25115", +- "self_type" : "type-25114", ++ "referenced_type" : "type-2504", ++ "self_type" : "type-2503", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135365,8 +135407,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-25213", +- "self_type" : "type-25212", ++ "referenced_type" : "type-25088", ++ "self_type" : "type-25087", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135374,8 +135416,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-25470", +- "self_type" : "type-25469", ++ "referenced_type" : "type-25215", ++ "self_type" : "type-25214", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135383,8 +135425,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-25640", +- "self_type" : "type-25639", ++ "referenced_type" : "type-25521", ++ "self_type" : "type-25520", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135392,8 +135434,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2572", +- "self_type" : "type-2571", ++ "referenced_type" : "type-25691", ++ "self_type" : "type-25690", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135401,8 +135443,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-25749", +- "self_type" : "type-25748", ++ "referenced_type" : "type-25798", ++ "self_type" : "type-25797", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135410,8 +135452,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-25882", +- "self_type" : "type-25881", ++ "referenced_type" : "type-25933", ++ "self_type" : "type-25932", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135419,8 +135461,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-26030", +- "self_type" : "type-26029", ++ "referenced_type" : "type-26083", ++ "self_type" : "type-26082", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135428,8 +135470,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-26123", +- "self_type" : "type-26122", ++ "referenced_type" : "type-26168", ++ "self_type" : "type-26167", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135437,8 +135479,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-26224", +- "self_type" : "type-26223", ++ "referenced_type" : "type-26266", ++ "self_type" : "type-26265", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135446,8 +135488,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-26406", +- "self_type" : "type-26405", ++ "referenced_type" : "type-26448", ++ "self_type" : "type-26447", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135455,8 +135497,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-26486", +- "self_type" : "type-26485", ++ "referenced_type" : "type-26522", ++ "self_type" : "type-26521", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135464,8 +135506,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-26544", +- "self_type" : "type-26543", ++ "referenced_type" : "type-26569", ++ "self_type" : "type-26568", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135473,8 +135515,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-26618", +- "self_type" : "type-26617", ++ "referenced_type" : "type-26642", ++ "self_type" : "type-26641", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135482,8 +135524,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-27016", +- "self_type" : "type-27015", ++ "referenced_type" : "type-27046", ++ "self_type" : "type-27045", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135491,8 +135533,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-27127", +- "self_type" : "type-27126", ++ "referenced_type" : "type-27126", ++ "self_type" : "type-27125", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135500,8 +135542,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-27627", +- "self_type" : "type-27626", ++ "referenced_type" : "type-27626", ++ "self_type" : "type-27625", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135509,8 +135551,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-27715", +- "self_type" : "type-27714", ++ "referenced_type" : "type-27714", ++ "self_type" : "type-27713", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135518,8 +135560,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-27805", +- "self_type" : "type-27804", ++ "referenced_type" : "type-27804", ++ "self_type" : "type-27803", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135527,8 +135569,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-27888", +- "self_type" : "type-27887", ++ "referenced_type" : "type-27887", ++ "self_type" : "type-27886", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135536,8 +135578,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-27955", +- "self_type" : "type-27954", ++ "referenced_type" : "type-27954", ++ "self_type" : "type-27953", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135545,8 +135587,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-28117", +- "self_type" : "type-28116", ++ "referenced_type" : "type-28116", ++ "self_type" : "type-28115", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135554,8 +135596,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-28242", +- "self_type" : "type-28241", ++ "referenced_type" : "type-28241", ++ "self_type" : "type-28240", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135563,8 +135605,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-28384", +- "self_type" : "type-28383", ++ "referenced_type" : "type-28383", ++ "self_type" : "type-28382", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135572,8 +135614,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-28468", +- "self_type" : "type-28467", ++ "referenced_type" : "type-28467", ++ "self_type" : "type-28466", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135581,8 +135623,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-28748", +- "self_type" : "type-28747", ++ "referenced_type" : "type-28747", ++ "self_type" : "type-28746", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135590,8 +135632,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-28982", +- "self_type" : "type-28981", ++ "referenced_type" : "type-28981", ++ "self_type" : "type-28980", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135599,8 +135641,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-29112", +- "self_type" : "type-29111", ++ "referenced_type" : "type-29111", ++ "self_type" : "type-29110", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135608,8 +135650,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-29270", +- "self_type" : "type-29269", ++ "referenced_type" : "type-29269", ++ "self_type" : "type-29268", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135617,8 +135659,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-29438", +- "self_type" : "type-29437", ++ "referenced_type" : "type-29437", ++ "self_type" : "type-29436", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135626,8 +135668,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-29593", +- "self_type" : "type-29592", ++ "referenced_type" : "type-29592", ++ "self_type" : "type-29591", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135635,8 +135677,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-29748", +- "self_type" : "type-29747", ++ "referenced_type" : "type-29747", ++ "self_type" : "type-29746", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135644,8 +135686,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-29879", +- "self_type" : "type-29878", ++ "referenced_type" : "type-29878", ++ "self_type" : "type-29877", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135653,8 +135695,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-30008", +- "self_type" : "type-30007", ++ "referenced_type" : "type-30007", ++ "self_type" : "type-30006", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135662,8 +135704,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-30149", +- "self_type" : "type-30148", ++ "referenced_type" : "type-30148", ++ "self_type" : "type-30147", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135671,8 +135713,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-30260", +- "self_type" : "type-30259", ++ "referenced_type" : "type-30259", ++ "self_type" : "type-30258", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135680,8 +135722,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-30357", +- "self_type" : "type-30356", ++ "referenced_type" : "type-30356", ++ "self_type" : "type-30355", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135689,8 +135731,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-30616", +- "self_type" : "type-30615", ++ "referenced_type" : "type-30615", ++ "self_type" : "type-30614", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135698,8 +135740,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-30786", +- "self_type" : "type-30785", ++ "referenced_type" : "type-30785", ++ "self_type" : "type-30784", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135707,8 +135749,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-30895", +- "self_type" : "type-30894", ++ "referenced_type" : "type-30894", ++ "self_type" : "type-30893", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135716,8 +135758,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-31028", +- "self_type" : "type-31027", ++ "referenced_type" : "type-31027", ++ "self_type" : "type-31026", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135725,8 +135767,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-31177", +- "self_type" : "type-31176", ++ "referenced_type" : "type-31176", ++ "self_type" : "type-31175", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135734,8 +135776,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-31270", +- "self_type" : "type-31269", ++ "referenced_type" : "type-31269", ++ "self_type" : "type-31268", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135743,8 +135785,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-31371", +- "self_type" : "type-31370", ++ "referenced_type" : "type-31370", ++ "self_type" : "type-31369", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135752,8 +135794,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-31553", +- "self_type" : "type-31552", ++ "referenced_type" : "type-31552", ++ "self_type" : "type-31551", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135761,8 +135803,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-31633", +- "self_type" : "type-31632", ++ "referenced_type" : "type-31632", ++ "self_type" : "type-31631", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135770,8 +135812,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-31691", +- "self_type" : "type-31690", ++ "referenced_type" : "type-31690", ++ "self_type" : "type-31689", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135779,8 +135821,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-31765", +- "self_type" : "type-31764", ++ "referenced_type" : "type-31764", ++ "self_type" : "type-31763", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135788,8 +135830,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-32163", +- "self_type" : "type-32162", ++ "referenced_type" : "type-32162", ++ "self_type" : "type-32161", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135797,8 +135839,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-3321", +- "self_type" : "type-3320", ++ "referenced_type" : "type-3273", ++ "self_type" : "type-3272", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135806,8 +135848,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-3497", +- "self_type" : "type-3496", ++ "referenced_type" : "type-3449", ++ "self_type" : "type-3448", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135815,8 +135857,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-3612", +- "self_type" : "type-3611", ++ "referenced_type" : "type-3564", ++ "self_type" : "type-3563", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135824,8 +135866,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-3797", +- "self_type" : "type-3796", ++ "referenced_type" : "type-3749", ++ "self_type" : "type-3748", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135833,8 +135875,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-3967", +- "self_type" : "type-3966", ++ "referenced_type" : "type-3919", ++ "self_type" : "type-3918", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135842,8 +135884,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-4109", +- "self_type" : "type-4108", ++ "referenced_type" : "type-4061", ++ "self_type" : "type-4060", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135851,8 +135893,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-4213", +- "self_type" : "type-4212", ++ "referenced_type" : "type-4165", ++ "self_type" : "type-4164", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135860,8 +135902,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-4271", +- "self_type" : "type-4270", ++ "referenced_type" : "type-4223", ++ "self_type" : "type-4222", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -135869,8 +135911,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-4427", +- "self_type" : "type-4426", ++ "referenced_type" : "type-4379", ++ "self_type" : "type-4378", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135878,8 +135920,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-4508", +- "self_type" : "type-4507", ++ "referenced_type" : "type-4460", ++ "self_type" : "type-4459", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135887,8 +135929,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-4674", +- "self_type" : "type-4673", ++ "referenced_type" : "type-4626", ++ "self_type" : "type-4625", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135896,8 +135938,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-5301", +- "self_type" : "type-5300", ++ "referenced_type" : "type-5253", ++ "self_type" : "type-5252", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135905,8 +135947,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-5477", +- "self_type" : "type-5476", ++ "referenced_type" : "type-5429", ++ "self_type" : "type-5428", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135914,8 +135956,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-5590", +- "self_type" : "type-5589", ++ "referenced_type" : "type-5542", ++ "self_type" : "type-5541", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135923,8 +135965,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-5726", +- "self_type" : "type-5725", ++ "referenced_type" : "type-5678", ++ "self_type" : "type-5677", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135932,8 +135974,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-5875", +- "self_type" : "type-5874", ++ "referenced_type" : "type-5827", ++ "self_type" : "type-5826", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135941,8 +135983,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-5968", +- "self_type" : "type-5967", ++ "referenced_type" : "type-5920", ++ "self_type" : "type-5919", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135950,8 +135992,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-6069", +- "self_type" : "type-6068", ++ "referenced_type" : "type-6021", ++ "self_type" : "type-6020", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135959,8 +136001,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-6251", +- "self_type" : "type-6250", ++ "referenced_type" : "type-6203", ++ "self_type" : "type-6202", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135968,8 +136010,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-6331", +- "self_type" : "type-6330", ++ "referenced_type" : "type-6283", ++ "self_type" : "type-6282", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135977,8 +136019,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-6392", +- "self_type" : "type-6391", ++ "referenced_type" : "type-6344", ++ "self_type" : "type-6343", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135986,8 +136028,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-6468", +- "self_type" : "type-6467", ++ "referenced_type" : "type-6420", ++ "self_type" : "type-6419", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -135995,8 +136037,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-7044", +- "self_type" : "type-7043", ++ "referenced_type" : "type-6996", ++ "self_type" : "type-6995", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -136004,8 +136046,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-7170", +- "self_type" : "type-7169", ++ "referenced_type" : "type-7122", ++ "self_type" : "type-7121", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -136013,8 +136055,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-7843", +- "self_type" : "type-7842", ++ "referenced_type" : "type-7795", ++ "self_type" : "type-7794", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -136022,8 +136064,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-7948", +- "self_type" : "type-7947", ++ "referenced_type" : "type-7900", ++ "self_type" : "type-7899", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -136031,8 +136073,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-8037", +- "self_type" : "type-8036", ++ "referenced_type" : "type-7989", ++ "self_type" : "type-7988", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -136040,8 +136082,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-8120", +- "self_type" : "type-8119", ++ "referenced_type" : "type-8072", ++ "self_type" : "type-8071", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -136049,8 +136091,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-8575", +- "self_type" : "type-8574", ++ "referenced_type" : "type-8527", ++ "self_type" : "type-8526", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -136058,8 +136100,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-8742", +- "self_type" : "type-8741", ++ "referenced_type" : "type-8694", ++ "self_type" : "type-8693", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -136067,8 +136109,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-8849", +- "self_type" : "type-8848", ++ "referenced_type" : "type-8801", ++ "self_type" : "type-8800", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -136076,8 +136118,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-8983", +- "self_type" : "type-8982", ++ "referenced_type" : "type-8935", ++ "self_type" : "type-8934", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -136085,8 +136127,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-9132", +- "self_type" : "type-9131", ++ "referenced_type" : "type-9084", ++ "self_type" : "type-9083", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -136094,8 +136136,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-9225", +- "self_type" : "type-9224", ++ "referenced_type" : "type-9177", ++ "self_type" : "type-9176", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -136103,8 +136145,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-9326", +- "self_type" : "type-9325", ++ "referenced_type" : "type-9278", ++ "self_type" : "type-9277", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -136112,8 +136154,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-9508", +- "self_type" : "type-9507", ++ "referenced_type" : "type-9460", ++ "self_type" : "type-9459", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -136121,8 +136163,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-9588", +- "self_type" : "type-9587", ++ "referenced_type" : "type-9540", ++ "self_type" : "type-9539", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -136130,8 +136172,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-9646", +- "self_type" : "type-9645", ++ "referenced_type" : "type-9598", ++ "self_type" : "type-9597", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -136139,8 +136181,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-9720", +- "self_type" : "type-9719", ++ "referenced_type" : "type-9672", ++ "self_type" : "type-9671", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -136157,8 +136199,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-10138", +- "self_type" : "type-10137", ++ "referenced_type" : "type-10090", ++ "self_type" : "type-10089", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136166,8 +136208,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-10266", +- "self_type" : "type-10265", ++ "referenced_type" : "type-10218", ++ "self_type" : "type-10217", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136175,8 +136217,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-10312", +- "self_type" : "type-10311", ++ "referenced_type" : "type-10264", ++ "self_type" : "type-10263", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136184,8 +136226,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-10646", +- "self_type" : "type-10645", ++ "referenced_type" : "type-10598", ++ "self_type" : "type-10597", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136193,8 +136235,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-10769", +- "self_type" : "type-10768", ++ "referenced_type" : "type-10721", ++ "self_type" : "type-10720", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136202,8 +136244,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-10862", +- "self_type" : "type-10861", ++ "referenced_type" : "type-10814", ++ "self_type" : "type-10813", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136211,8 +136253,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-10952", +- "self_type" : "type-10951", ++ "referenced_type" : "type-10904", ++ "self_type" : "type-10903", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136220,8 +136262,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-11025", +- "self_type" : "type-11024", ++ "referenced_type" : "type-10977", ++ "self_type" : "type-10976", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136229,8 +136271,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-11138", +- "self_type" : "type-11137", ++ "referenced_type" : "type-11090", ++ "self_type" : "type-11089", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136238,8 +136280,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-11304", +- "self_type" : "type-11303", ++ "referenced_type" : "type-11256", ++ "self_type" : "type-11255", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136247,8 +136289,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-11463", +- "self_type" : "type-11462", ++ "referenced_type" : "type-11415", ++ "self_type" : "type-11414", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136256,8 +136298,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-11915", +- "self_type" : "type-11914", ++ "referenced_type" : "type-11867", ++ "self_type" : "type-11866", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136265,8 +136307,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-12086", +- "self_type" : "type-12085", ++ "referenced_type" : "type-12038", ++ "self_type" : "type-12037", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136274,8 +136316,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-12349", +- "self_type" : "type-12348", ++ "referenced_type" : "type-12301", ++ "self_type" : "type-12300", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136283,8 +136325,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-12470", +- "self_type" : "type-12469", ++ "referenced_type" : "type-12422", ++ "self_type" : "type-12421", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136292,8 +136334,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-12610", +- "self_type" : "type-12609", ++ "referenced_type" : "type-12562", ++ "self_type" : "type-12561", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136301,8 +136343,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-12668", +- "self_type" : "type-12667", ++ "referenced_type" : "type-12620", ++ "self_type" : "type-12619", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136310,8 +136352,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-12783", +- "self_type" : "type-12782", ++ "referenced_type" : "type-12735", ++ "self_type" : "type-12734", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136319,8 +136361,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-12848", +- "self_type" : "type-12847", ++ "referenced_type" : "type-12800", ++ "self_type" : "type-12799", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136328,8 +136370,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-12986", +- "self_type" : "type-12985", ++ "referenced_type" : "type-12938", ++ "self_type" : "type-12937", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136337,8 +136379,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-13058", +- "self_type" : "type-13057", ++ "referenced_type" : "type-13010", ++ "self_type" : "type-13009", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136346,8 +136388,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-13297", +- "self_type" : "type-13296", ++ "referenced_type" : "type-13249", ++ "self_type" : "type-13248", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136355,8 +136397,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-13471", +- "self_type" : "type-13470", ++ "referenced_type" : "type-13423", ++ "self_type" : "type-13422", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136364,8 +136406,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-13557", +- "self_type" : "type-13556", ++ "referenced_type" : "type-13509", ++ "self_type" : "type-13508", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136373,8 +136415,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-13603", +- "self_type" : "type-13602", ++ "referenced_type" : "type-13555", ++ "self_type" : "type-13554", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136382,8 +136424,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-13937", +- "self_type" : "type-13936", ++ "referenced_type" : "type-13889", ++ "self_type" : "type-13888", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136391,8 +136433,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-14060", +- "self_type" : "type-14059", ++ "referenced_type" : "type-14012", ++ "self_type" : "type-14011", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136400,8 +136442,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-14153", +- "self_type" : "type-14152", ++ "referenced_type" : "type-14105", ++ "self_type" : "type-14104", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136409,8 +136451,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-14243", +- "self_type" : "type-14242", ++ "referenced_type" : "type-14195", ++ "self_type" : "type-14194", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136418,8 +136460,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-14316", +- "self_type" : "type-14315", ++ "referenced_type" : "type-14268", ++ "self_type" : "type-14267", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136427,8 +136469,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-14402", +- "self_type" : "type-14401", ++ "referenced_type" : "type-14354", ++ "self_type" : "type-14353", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136436,8 +136478,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-14555", +- "self_type" : "type-14554", ++ "referenced_type" : "type-14507", ++ "self_type" : "type-14506", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136445,8 +136487,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-14683", +- "self_type" : "type-14682", ++ "referenced_type" : "type-14635", ++ "self_type" : "type-14634", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136454,8 +136496,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-14918", +- "self_type" : "type-14917", ++ "referenced_type" : "type-14870", ++ "self_type" : "type-14869", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136463,8 +136505,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-15146", +- "self_type" : "type-15145", ++ "referenced_type" : "type-15098", ++ "self_type" : "type-15097", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136472,8 +136514,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-15279", +- "self_type" : "type-15278", ++ "referenced_type" : "type-15231", ++ "self_type" : "type-15230", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136481,8 +136523,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-15771", +- "self_type" : "type-15770", ++ "referenced_type" : "type-15723", ++ "self_type" : "type-15722", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136490,8 +136532,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-15942", +- "self_type" : "type-15941", ++ "referenced_type" : "type-15894", ++ "self_type" : "type-15893", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136499,8 +136541,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16204", +- "self_type" : "type-16203", ++ "referenced_type" : "type-16156", ++ "self_type" : "type-16155", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136508,8 +136550,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16327", +- "self_type" : "type-16326", ++ "referenced_type" : "type-16279", ++ "self_type" : "type-16278", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136517,8 +136559,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16467", +- "self_type" : "type-16466", ++ "referenced_type" : "type-16419", ++ "self_type" : "type-16418", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136526,8 +136568,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16524", +- "self_type" : "type-16523", ++ "referenced_type" : "type-16476", ++ "self_type" : "type-16475", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136535,8 +136577,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16639", +- "self_type" : "type-16638", ++ "referenced_type" : "type-16591", ++ "self_type" : "type-16590", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136544,8 +136586,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16704", +- "self_type" : "type-16703", ++ "referenced_type" : "type-16656", ++ "self_type" : "type-16655", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136553,8 +136595,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16842", +- "self_type" : "type-16841", ++ "referenced_type" : "type-16794", ++ "self_type" : "type-16793", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136562,8 +136604,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-16914", +- "self_type" : "type-16913", ++ "referenced_type" : "type-16866", ++ "self_type" : "type-16865", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136571,8 +136613,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17153", +- "self_type" : "type-17152", ++ "referenced_type" : "type-17105", ++ "self_type" : "type-17104", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136580,8 +136622,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17327", +- "self_type" : "type-17326", ++ "referenced_type" : "type-17279", ++ "self_type" : "type-17278", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136589,8 +136631,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17421", +- "self_type" : "type-17420", ++ "referenced_type" : "type-17373", ++ "self_type" : "type-17372", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136598,8 +136640,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17467", +- "self_type" : "type-17466", ++ "referenced_type" : "type-17419", ++ "self_type" : "type-17418", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136607,8 +136649,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17801", +- "self_type" : "type-17800", ++ "referenced_type" : "type-17753", ++ "self_type" : "type-17752", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136616,8 +136658,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-17924", +- "self_type" : "type-17923", ++ "referenced_type" : "type-17876", ++ "self_type" : "type-17875", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136625,8 +136667,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18017", +- "self_type" : "type-18016", ++ "referenced_type" : "type-17969", ++ "self_type" : "type-17968", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136634,8 +136676,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18107", +- "self_type" : "type-18106", ++ "referenced_type" : "type-18059", ++ "self_type" : "type-18058", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136643,8 +136685,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18180", +- "self_type" : "type-18179", ++ "referenced_type" : "type-18132", ++ "self_type" : "type-18131", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136652,8 +136694,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18266", +- "self_type" : "type-18265", ++ "referenced_type" : "type-18218", ++ "self_type" : "type-18217", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136661,8 +136703,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18419", +- "self_type" : "type-18418", ++ "referenced_type" : "type-18371", ++ "self_type" : "type-18370", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136670,8 +136712,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18547", +- "self_type" : "type-18546", ++ "referenced_type" : "type-18499", ++ "self_type" : "type-18498", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136679,8 +136721,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18775", +- "self_type" : "type-18774", ++ "referenced_type" : "type-18727", ++ "self_type" : "type-18726", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136688,8 +136730,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-18930", +- "self_type" : "type-18929", ++ "referenced_type" : "type-18882", ++ "self_type" : "type-18881", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136697,8 +136739,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19055", +- "self_type" : "type-19054", ++ "referenced_type" : "type-19007", ++ "self_type" : "type-19006", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136706,8 +136748,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19294", +- "self_type" : "type-19293", ++ "referenced_type" : "type-19246", ++ "self_type" : "type-19245", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136715,8 +136757,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19443", +- "self_type" : "type-19442", ++ "referenced_type" : "type-19395", ++ "self_type" : "type-19394", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136724,8 +136766,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19640", +- "self_type" : "type-19639", ++ "referenced_type" : "type-19592", ++ "self_type" : "type-19591", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136733,8 +136775,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19810", +- "self_type" : "type-19809", ++ "referenced_type" : "type-19762", ++ "self_type" : "type-19761", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136742,8 +136784,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-19967", +- "self_type" : "type-19966", ++ "referenced_type" : "type-19919", ++ "self_type" : "type-19918", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136751,8 +136793,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20305", +- "self_type" : "type-20304", ++ "referenced_type" : "type-20257", ++ "self_type" : "type-20256", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136760,8 +136802,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20476", +- "self_type" : "type-20475", ++ "referenced_type" : "type-20428", ++ "self_type" : "type-20427", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136769,8 +136811,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20735", +- "self_type" : "type-20734", ++ "referenced_type" : "type-20687", ++ "self_type" : "type-20686", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136778,8 +136820,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20858", +- "self_type" : "type-20857", ++ "referenced_type" : "type-20810", ++ "self_type" : "type-20809", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136787,8 +136829,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-20998", +- "self_type" : "type-20997", ++ "referenced_type" : "type-20950", ++ "self_type" : "type-20949", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136796,8 +136838,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21056", +- "self_type" : "type-21055", ++ "referenced_type" : "type-21008", ++ "self_type" : "type-21007", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136805,8 +136847,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21171", +- "self_type" : "type-21170", ++ "referenced_type" : "type-2104", ++ "self_type" : "type-2103", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136814,8 +136856,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21236", +- "self_type" : "type-21235", ++ "referenced_type" : "type-21123", ++ "self_type" : "type-21122", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136823,8 +136865,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21374", +- "self_type" : "type-21373", ++ "referenced_type" : "type-21188", ++ "self_type" : "type-21187", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136832,8 +136874,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21446", +- "self_type" : "type-21445", ++ "referenced_type" : "type-21326", ++ "self_type" : "type-21325", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136841,8 +136883,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21685", +- "self_type" : "type-21684", ++ "referenced_type" : "type-21398", ++ "self_type" : "type-21397", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136850,8 +136892,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2174", +- "self_type" : "type-2173", ++ "referenced_type" : "type-21637", ++ "self_type" : "type-21636", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136859,8 +136901,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21859", +- "self_type" : "type-21858", ++ "referenced_type" : "type-21811", ++ "self_type" : "type-21810", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136877,8 +136919,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-21996", +- "self_type" : "type-21995", ++ "referenced_type" : "type-21994", ++ "self_type" : "type-21993", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136886,8 +136928,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-22330", +- "self_type" : "type-22329", ++ "referenced_type" : "type-22299", ++ "self_type" : "type-22298", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136895,8 +136937,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-22453", +- "self_type" : "type-22452", ++ "referenced_type" : "type-22397", ++ "self_type" : "type-22396", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136904,8 +136946,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-22546", +- "self_type" : "type-22545", ++ "referenced_type" : "type-22465", ++ "self_type" : "type-22464", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136913,8 +136955,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-22636", +- "self_type" : "type-22635", ++ "referenced_type" : "type-22548", ++ "self_type" : "type-22547", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136922,8 +136964,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-22709", +- "self_type" : "type-22708", ++ "referenced_type" : "type-22634", ++ "self_type" : "type-22633", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136931,8 +136973,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-22795", +- "self_type" : "type-22794", ++ "referenced_type" : "type-22743", ++ "self_type" : "type-22742", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136940,8 +136982,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-22948", +- "self_type" : "type-22947", ++ "referenced_type" : "type-22914", ++ "self_type" : "type-22913", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136949,8 +136991,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-23076", +- "self_type" : "type-23075", ++ "referenced_type" : "type-23059", ++ "self_type" : "type-23058", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136958,8 +137000,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-23304", +- "self_type" : "type-23303", ++ "referenced_type" : "type-23299", ++ "self_type" : "type-23298", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136967,8 +137009,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-23459", +- "self_type" : "type-23458", ++ "referenced_type" : "type-23437", ++ "self_type" : "type-23436", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136976,8 +137018,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-23584", +- "self_type" : "type-23583", ++ "referenced_type" : "type-23565", ++ "self_type" : "type-23564", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136985,8 +137027,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-23815", +- "self_type" : "type-23814", ++ "referenced_type" : "type-23804", ++ "self_type" : "type-23803", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -136994,8 +137036,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-23943", +- "self_type" : "type-23942", ++ "referenced_type" : "type-2389", ++ "self_type" : "type-2388", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137003,8 +137045,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-24110", +- "self_type" : "type-24109", ++ "referenced_type" : "type-23946", ++ "self_type" : "type-23945", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137012,8 +137054,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-24277", +- "self_type" : "type-24276", ++ "referenced_type" : "type-24108", ++ "self_type" : "type-24107", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137021,8 +137063,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-24430", +- "self_type" : "type-24429", ++ "referenced_type" : "type-24277", ++ "self_type" : "type-24276", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137030,8 +137072,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-24583", +- "self_type" : "type-24582", ++ "referenced_type" : "type-24410", ++ "self_type" : "type-24409", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137039,8 +137081,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2459", +- "self_type" : "type-2458", ++ "referenced_type" : "type-24550", ++ "self_type" : "type-24549", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137048,8 +137090,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-24714", +- "self_type" : "type-24713", ++ "referenced_type" : "type-24676", ++ "self_type" : "type-24675", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137057,8 +137099,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-24847", +- "self_type" : "type-24846", ++ "referenced_type" : "type-24807", ++ "self_type" : "type-24806", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137066,8 +137108,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-25133", +- "self_type" : "type-25132", ++ "referenced_type" : "type-25109", ++ "self_type" : "type-25108", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137084,8 +137126,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-25481", +- "self_type" : "type-25480", ++ "referenced_type" : "type-25532", ++ "self_type" : "type-25531", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137093,8 +137135,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-25652", +- "self_type" : "type-25651", ++ "referenced_type" : "type-25703", ++ "self_type" : "type-25702", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137102,8 +137144,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-25914", +- "self_type" : "type-25913", ++ "referenced_type" : "type-25965", ++ "self_type" : "type-25964", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137111,8 +137153,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-26036", +- "self_type" : "type-26035", ++ "referenced_type" : "type-26089", ++ "self_type" : "type-26088", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137120,8 +137162,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-26176", +- "self_type" : "type-26175", ++ "referenced_type" : "type-26220", ++ "self_type" : "type-26219", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137129,8 +137171,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-26234", +- "self_type" : "type-26233", ++ "referenced_type" : "type-26276", ++ "self_type" : "type-26275", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137138,8 +137180,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-26349", +- "self_type" : "type-26348", ++ "referenced_type" : "type-26391", ++ "self_type" : "type-26390", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137147,8 +137189,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-26414", +- "self_type" : "type-26413", ++ "referenced_type" : "type-26456", ++ "self_type" : "type-26455", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137156,8 +137198,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-26552", +- "self_type" : "type-26551", ++ "referenced_type" : "type-26577", ++ "self_type" : "type-26576", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137165,8 +137207,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-26624", +- "self_type" : "type-26623", ++ "referenced_type" : "type-26646", ++ "self_type" : "type-26645", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137174,8 +137216,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-26863", +- "self_type" : "type-26862", ++ "referenced_type" : "type-26887", ++ "self_type" : "type-26886", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137183,8 +137225,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-27037", +- "self_type" : "type-27036", ++ "referenced_type" : "type-27067", ++ "self_type" : "type-27066", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137192,8 +137234,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-27135", +- "self_type" : "type-27134", ++ "referenced_type" : "type-27134", ++ "self_type" : "type-27133", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137201,8 +137243,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-27181", +- "self_type" : "type-27180", ++ "referenced_type" : "type-27180", ++ "self_type" : "type-27179", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137210,8 +137252,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-27515", +- "self_type" : "type-27514", ++ "referenced_type" : "type-27514", ++ "self_type" : "type-27513", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137219,8 +137261,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-27638", +- "self_type" : "type-27637", ++ "referenced_type" : "type-27637", ++ "self_type" : "type-27636", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137228,8 +137270,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-27731", +- "self_type" : "type-27730", ++ "referenced_type" : "type-27730", ++ "self_type" : "type-27729", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137237,8 +137279,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-27821", +- "self_type" : "type-27820", ++ "referenced_type" : "type-27820", ++ "self_type" : "type-27819", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137246,8 +137288,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-27894", +- "self_type" : "type-27893", ++ "referenced_type" : "type-27893", ++ "self_type" : "type-27892", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137255,8 +137297,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-27980", +- "self_type" : "type-27979", ++ "referenced_type" : "type-27979", ++ "self_type" : "type-27978", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137264,8 +137306,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-28133", +- "self_type" : "type-28132", ++ "referenced_type" : "type-28132", ++ "self_type" : "type-28131", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137273,8 +137315,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-28261", +- "self_type" : "type-28260", ++ "referenced_type" : "type-28260", ++ "self_type" : "type-28259", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137282,8 +137324,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-28489", +- "self_type" : "type-28488", ++ "referenced_type" : "type-28488", ++ "self_type" : "type-28487", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137291,8 +137333,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-28644", +- "self_type" : "type-28643", ++ "referenced_type" : "type-28643", ++ "self_type" : "type-28642", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137300,8 +137342,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-28769", +- "self_type" : "type-28768", ++ "referenced_type" : "type-28768", ++ "self_type" : "type-28767", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137309,8 +137351,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-29000", +- "self_type" : "type-28999", ++ "referenced_type" : "type-28999", ++ "self_type" : "type-28998", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137318,8 +137360,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-29128", +- "self_type" : "type-29127", ++ "referenced_type" : "type-29127", ++ "self_type" : "type-29126", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137327,8 +137369,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-29295", +- "self_type" : "type-29294", ++ "referenced_type" : "type-29294", ++ "self_type" : "type-29293", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137336,8 +137378,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-29462", +- "self_type" : "type-29461", ++ "referenced_type" : "type-29461", ++ "self_type" : "type-29460", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137345,8 +137387,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-29615", +- "self_type" : "type-29614", ++ "referenced_type" : "type-29614", ++ "self_type" : "type-29613", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137354,8 +137396,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-29768", +- "self_type" : "type-29767", ++ "referenced_type" : "type-29767", ++ "self_type" : "type-29766", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137363,8 +137405,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-29895", +- "self_type" : "type-29894", ++ "referenced_type" : "type-29894", ++ "self_type" : "type-29893", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137372,8 +137414,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-30026", +- "self_type" : "type-30025", ++ "referenced_type" : "type-30025", ++ "self_type" : "type-30024", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137381,8 +137423,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-30278", +- "self_type" : "type-30277", ++ "referenced_type" : "type-30277", ++ "self_type" : "type-30276", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137390,8 +137432,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-30375", +- "self_type" : "type-30374", ++ "referenced_type" : "type-30374", ++ "self_type" : "type-30373", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137399,8 +137441,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-30627", +- "self_type" : "type-30626", ++ "referenced_type" : "type-30626", ++ "self_type" : "type-30625", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137408,8 +137450,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-30798", +- "self_type" : "type-30797", ++ "referenced_type" : "type-30797", ++ "self_type" : "type-30796", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137417,8 +137459,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-31060", +- "self_type" : "type-31059", ++ "referenced_type" : "type-31059", ++ "self_type" : "type-31058", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137426,8 +137468,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-31183", +- "self_type" : "type-31182", ++ "referenced_type" : "type-31182", ++ "self_type" : "type-31181", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137435,8 +137477,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-31323", +- "self_type" : "type-31322", ++ "referenced_type" : "type-31322", ++ "self_type" : "type-31321", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137444,8 +137486,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-31381", +- "self_type" : "type-31380", ++ "referenced_type" : "type-31380", ++ "self_type" : "type-31379", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137453,8 +137495,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-31496", +- "self_type" : "type-31495", ++ "referenced_type" : "type-31495", ++ "self_type" : "type-31494", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137462,8 +137504,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-31561", +- "self_type" : "type-31560", ++ "referenced_type" : "type-31560", ++ "self_type" : "type-31559", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137471,8 +137513,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-31699", +- "self_type" : "type-31698", ++ "referenced_type" : "type-31698", ++ "self_type" : "type-31697", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137480,8 +137522,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-31771", +- "self_type" : "type-31770", ++ "referenced_type" : "type-31770", ++ "self_type" : "type-31769", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137489,8 +137531,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-32010", +- "self_type" : "type-32009", ++ "referenced_type" : "type-32009", ++ "self_type" : "type-32008", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137498,8 +137540,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-32184", +- "self_type" : "type-32183", ++ "referenced_type" : "type-32183", ++ "self_type" : "type-32182", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137507,8 +137549,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-3332", +- "self_type" : "type-3331", ++ "referenced_type" : "type-3284", ++ "self_type" : "type-3283", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137516,8 +137558,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-3509", +- "self_type" : "type-3508", ++ "referenced_type" : "type-3461", ++ "self_type" : "type-3460", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137525,8 +137567,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-3832", +- "self_type" : "type-3831", ++ "referenced_type" : "type-3784", ++ "self_type" : "type-3783", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137534,8 +137576,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-3973", +- "self_type" : "type-3972", ++ "referenced_type" : "type-3925", ++ "self_type" : "type-3924", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137543,8 +137585,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-4162", +- "self_type" : "type-4161", ++ "referenced_type" : "type-4114", ++ "self_type" : "type-4113", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137552,8 +137594,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-4225", +- "self_type" : "type-4224", ++ "referenced_type" : "type-4177", ++ "self_type" : "type-4176", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137570,8 +137612,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-4370", +- "self_type" : "type-4369", ++ "referenced_type" : "type-4322", ++ "self_type" : "type-4321", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137579,8 +137621,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-4437", +- "self_type" : "type-4436", ++ "referenced_type" : "type-4389", ++ "self_type" : "type-4388", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137588,8 +137630,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-4682", +- "self_type" : "type-4681", ++ "referenced_type" : "type-4634", ++ "self_type" : "type-4633", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137597,8 +137639,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-5312", +- "self_type" : "type-5311", ++ "referenced_type" : "type-5264", ++ "self_type" : "type-5263", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137606,8 +137648,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-5489", +- "self_type" : "type-5488", ++ "referenced_type" : "type-5441", ++ "self_type" : "type-5440", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137615,8 +137657,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-5758", +- "self_type" : "type-5757", ++ "referenced_type" : "type-5710", ++ "self_type" : "type-5709", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137624,8 +137666,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-5881", +- "self_type" : "type-5880", ++ "referenced_type" : "type-5833", ++ "self_type" : "type-5832", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137633,8 +137675,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-6021", +- "self_type" : "type-6020", ++ "referenced_type" : "type-5973", ++ "self_type" : "type-5972", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137642,8 +137684,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-6079", +- "self_type" : "type-6078", ++ "referenced_type" : "type-6031", ++ "self_type" : "type-6030", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137651,8 +137693,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-6194", +- "self_type" : "type-6193", ++ "referenced_type" : "type-6146", ++ "self_type" : "type-6145", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137660,8 +137702,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-6259", +- "self_type" : "type-6258", ++ "referenced_type" : "type-6211", ++ "self_type" : "type-6210", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137669,8 +137711,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-6402", +- "self_type" : "type-6401", ++ "referenced_type" : "type-6354", ++ "self_type" : "type-6353", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137678,8 +137720,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-6475", +- "self_type" : "type-6474", ++ "referenced_type" : "type-6427", ++ "self_type" : "type-6426", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137687,8 +137729,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-6848", +- "self_type" : "type-6847", ++ "referenced_type" : "type-6800", ++ "self_type" : "type-6799", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137696,8 +137738,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-7065", +- "self_type" : "type-7064", ++ "referenced_type" : "type-7017", ++ "self_type" : "type-7016", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137705,8 +137747,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-7178", +- "self_type" : "type-7177", ++ "referenced_type" : "type-7130", ++ "self_type" : "type-7129", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137714,8 +137756,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-7265", +- "self_type" : "type-7264", ++ "referenced_type" : "type-7217", ++ "self_type" : "type-7216", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137723,8 +137765,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-7731", +- "self_type" : "type-7730", ++ "referenced_type" : "type-7683", ++ "self_type" : "type-7682", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137732,8 +137774,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-7856", +- "self_type" : "type-7855", ++ "referenced_type" : "type-7808", ++ "self_type" : "type-7807", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137741,8 +137783,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-7964", +- "self_type" : "type-7963", ++ "referenced_type" : "type-7916", ++ "self_type" : "type-7915", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137750,8 +137792,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-8053", +- "self_type" : "type-8052", ++ "referenced_type" : "type-8005", ++ "self_type" : "type-8004", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137759,8 +137801,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-8126", +- "self_type" : "type-8125", ++ "referenced_type" : "type-8078", ++ "self_type" : "type-8077", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137768,8 +137810,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-8586", +- "self_type" : "type-8585", ++ "referenced_type" : "type-8538", ++ "self_type" : "type-8537", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137777,8 +137819,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-8754", +- "self_type" : "type-8753", ++ "referenced_type" : "type-8706", ++ "self_type" : "type-8705", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137786,8 +137828,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-9015", +- "self_type" : "type-9014", ++ "referenced_type" : "type-8967", ++ "self_type" : "type-8966", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137795,8 +137837,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-9138", +- "self_type" : "type-9137", ++ "referenced_type" : "type-9090", ++ "self_type" : "type-9089", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137804,8 +137846,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-9278", +- "self_type" : "type-9277", ++ "referenced_type" : "type-9230", ++ "self_type" : "type-9229", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137813,8 +137855,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-9336", +- "self_type" : "type-9335", ++ "referenced_type" : "type-9288", ++ "self_type" : "type-9287", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137822,8 +137864,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-9451", +- "self_type" : "type-9450", ++ "referenced_type" : "type-9403", ++ "self_type" : "type-9402", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137831,8 +137873,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-9516", +- "self_type" : "type-9515", ++ "referenced_type" : "type-9468", ++ "self_type" : "type-9467", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137840,8 +137882,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-9654", +- "self_type" : "type-9653", ++ "referenced_type" : "type-9606", ++ "self_type" : "type-9605", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137849,8 +137891,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-9726", +- "self_type" : "type-9725", ++ "referenced_type" : "type-9678", ++ "self_type" : "type-9677", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137858,8 +137900,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-9964", +- "self_type" : "type-9963", ++ "referenced_type" : "type-9916", ++ "self_type" : "type-9915", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -137867,8 +137909,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2343", +- "self_type" : "type-2423", ++ "referenced_type" : "type-2270", ++ "self_type" : "type-2353", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -137876,8 +137918,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-1705", +- "self_type" : "type-2113", ++ "referenced_type" : "type-1619", ++ "self_type" : "type-2046", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -137885,8 +137927,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2346", +- "self_type" : "type-2428", ++ "referenced_type" : "type-2273", ++ "self_type" : "type-2358", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -137894,8 +137936,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-1697", +- "self_type" : "type-2097", ++ "referenced_type" : "type-1611", ++ "self_type" : "type-2030", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -137903,8 +137945,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-2285", +- "self_type" : "type-2410", ++ "referenced_type" : "type-2214", ++ "self_type" : "type-2342", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -137912,8 +137954,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-1703", +- "self_type" : "type-2081", ++ "referenced_type" : "type-1617", ++ "self_type" : "type-2014", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -137921,8 +137963,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-1715", +- "self_type" : "type-2129", ++ "referenced_type" : "type-1629", ++ "self_type" : "type-2062", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -137930,8 +137972,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-1682", +- "self_type" : "type-2118", ++ "referenced_type" : "type-1596", ++ "self_type" : "type-2051", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -137939,8 +137981,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-1684", +- "self_type" : "type-2124", ++ "referenced_type" : "type-1598", ++ "self_type" : "type-2057", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -137948,8 +137990,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField *", + "name" : "google::protobuf::RepeatedPtrField *", +- "referenced_type" : "type-7235", +- "self_type" : "type-7561", ++ "referenced_type" : "type-7187", ++ "self_type" : "type-7513", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -137957,8 +137999,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> > *", + "name" : "google::protobuf::RepeatedPtrField, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> > *", +- "referenced_type" : "type-7575", +- "self_type" : "type-7579", ++ "referenced_type" : "type-7527", ++ "self_type" : "type-7531", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -137966,8 +138008,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField, std::allocator > > *", + "name" : "google::protobuf::RepeatedPtrField, std::allocator > > *", +- "referenced_type" : "type-12178", +- "self_type" : "type-12177", ++ "referenced_type" : "type-12130", ++ "self_type" : "type-12129", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -137975,8 +138017,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField, std::allocator > > *", + "name" : "google::protobuf::RepeatedPtrField, std::allocator > > *", +- "referenced_type" : "type-14801", +- "self_type" : "type-14800", ++ "referenced_type" : "type-14753", ++ "self_type" : "type-14752", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -137984,8 +138026,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField, std::allocator > > *", + "name" : "google::protobuf::RepeatedPtrField, std::allocator > > *", +- "referenced_type" : "type-16033", +- "self_type" : "type-16032", ++ "referenced_type" : "type-15985", ++ "self_type" : "type-15984", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -137993,8 +138035,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField, std::allocator > > *", + "name" : "google::protobuf::RepeatedPtrField, std::allocator > > *", +- "referenced_type" : "type-18665", +- "self_type" : "type-18664", ++ "referenced_type" : "type-18617", ++ "self_type" : "type-18616", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -138002,8 +138044,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField, std::allocator > > *", + "name" : "google::protobuf::RepeatedPtrField, std::allocator > > *", +- "referenced_type" : "type-20565", +- "self_type" : "type-20564", ++ "referenced_type" : "type-20517", ++ "self_type" : "type-20516", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -138011,8 +138053,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField, std::allocator > > *", + "name" : "google::protobuf::RepeatedPtrField, std::allocator > > *", +- "referenced_type" : "type-23194", +- "self_type" : "type-23193", ++ "referenced_type" : "type-23180", ++ "self_type" : "type-23179", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -138020,8 +138062,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField, std::allocator > > *", + "name" : "google::protobuf::RepeatedPtrField, std::allocator > > *", +- "referenced_type" : "type-24988", +- "self_type" : "type-24987", ++ "referenced_type" : "type-24957", ++ "self_type" : "type-24956", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -138029,8 +138071,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField, std::allocator > > *", + "name" : "google::protobuf::RepeatedPtrField, std::allocator > > *", +- "referenced_type" : "type-2567", +- "self_type" : "type-2566", ++ "referenced_type" : "type-2499", ++ "self_type" : "type-2498", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -138038,8 +138080,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField, std::allocator > > *", + "name" : "google::protobuf::RepeatedPtrField, std::allocator > > *", +- "referenced_type" : "type-25744", +- "self_type" : "type-25743", ++ "referenced_type" : "type-25793", ++ "self_type" : "type-25792", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -138047,8 +138089,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField, std::allocator > > *", + "name" : "google::protobuf::RepeatedPtrField, std::allocator > > *", +- "referenced_type" : "type-28379", +- "self_type" : "type-28378", ++ "referenced_type" : "type-28378", ++ "self_type" : "type-28377", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -138056,8 +138098,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField, std::allocator > > *", + "name" : "google::protobuf::RepeatedPtrField, std::allocator > > *", +- "referenced_type" : "type-30144", +- "self_type" : "type-30143", ++ "referenced_type" : "type-30143", ++ "self_type" : "type-30142", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -138065,8 +138107,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField, std::allocator > > *", + "name" : "google::protobuf::RepeatedPtrField, std::allocator > > *", +- "referenced_type" : "type-30890", +- "self_type" : "type-30889", ++ "referenced_type" : "type-30889", ++ "self_type" : "type-30888", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -138074,8 +138116,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField, std::allocator > > *", + "name" : "google::protobuf::RepeatedPtrField, std::allocator > > *", +- "referenced_type" : "type-3607", +- "self_type" : "type-3606", ++ "referenced_type" : "type-3559", ++ "self_type" : "type-3558", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -138092,8 +138134,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField, std::allocator > > *", + "name" : "google::protobuf::RepeatedPtrField, std::allocator > > *", +- "referenced_type" : "type-5585", +- "self_type" : "type-5584", ++ "referenced_type" : "type-5537", ++ "self_type" : "type-5536", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -138101,8 +138143,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RepeatedPtrField, std::allocator > > *", + "name" : "google::protobuf::RepeatedPtrField, std::allocator > > *", +- "referenced_type" : "type-8844", +- "self_type" : "type-8843", ++ "referenced_type" : "type-8796", ++ "self_type" : "type-8795", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -138110,8 +138152,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback1 *", + "name" : "google::protobuf::ResultCallback1 *", +- "referenced_type" : "type-15399", +- "self_type" : "type-15398", ++ "referenced_type" : "type-15351", ++ "self_type" : "type-15350", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/field_mask_utility.h" + }, +@@ -138119,8 +138161,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback2, std::allocator >, std::allocator, std::allocator > > > &, const google::protobuf::Field *> *", + "name" : "google::protobuf::ResultCallback2, std::allocator >, std::allocator, std::allocator > > > &, const google::protobuf::Field *> *", +- "referenced_type" : "type-15200", +- "self_type" : "type-15199", ++ "referenced_type" : "type-15152", ++ "self_type" : "type-15151", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138128,8 +138170,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback2, std::allocator >, std::allocator, std::allocator > > > &, const google::protobuf::Field *> *", + "name" : "google::protobuf::ResultCallback2, std::allocator >, std::allocator, std::allocator > > > &, const google::protobuf::Field *> *", +- "referenced_type" : "type-24515", +- "self_type" : "type-24514", ++ "referenced_type" : "type-24493", ++ "self_type" : "type-24492", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138137,8 +138179,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback2, std::allocator >, std::allocator, std::allocator > > > &, const google::protobuf::Field *> *", + "name" : "google::protobuf::ResultCallback2, std::allocator >, std::allocator, std::allocator > > > &, const google::protobuf::Field *> *", +- "referenced_type" : "type-24767", +- "self_type" : "type-24766", ++ "referenced_type" : "type-24725", ++ "self_type" : "type-24724", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138146,8 +138188,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback2, std::allocator >, std::allocator, std::allocator > > > &, const google::protobuf::Field *> *", + "name" : "google::protobuf::ResultCallback2, std::allocator >, std::allocator, std::allocator > > > &, const google::protobuf::Field *> *", +- "referenced_type" : "type-29700", +- "self_type" : "type-29699", ++ "referenced_type" : "type-29699", ++ "self_type" : "type-29698", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138155,8 +138197,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback2, std::allocator >, std::allocator, std::allocator > > > &, const google::protobuf::Field *> *", + "name" : "google::protobuf::ResultCallback2, std::allocator >, std::allocator, std::allocator > > > &, const google::protobuf::Field *> *", +- "referenced_type" : "type-29946", +- "self_type" : "type-29945", ++ "referenced_type" : "type-29945", ++ "self_type" : "type-29944", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138164,8 +138206,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback2 *", + "name" : "google::protobuf::ResultCallback2 *", +- "referenced_type" : "type-24925", +- "self_type" : "type-25042", ++ "referenced_type" : "type-24892", ++ "self_type" : "type-25012", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138173,8 +138215,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-10568", +- "self_type" : "type-10567", ++ "referenced_type" : "type-10520", ++ "self_type" : "type-10519", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138182,8 +138224,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-10878", +- "self_type" : "type-10877", ++ "referenced_type" : "type-10830", ++ "self_type" : "type-10829", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138191,8 +138233,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-10987", +- "self_type" : "type-10986", ++ "referenced_type" : "type-10939", ++ "self_type" : "type-10938", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138200,8 +138242,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-11248", +- "self_type" : "type-11247", ++ "referenced_type" : "type-11200", ++ "self_type" : "type-11199", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138209,8 +138251,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-11384", +- "self_type" : "type-11383", ++ "referenced_type" : "type-11336", ++ "self_type" : "type-11335", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138218,8 +138260,17 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-11559", +- "self_type" : "type-11558", ++ "referenced_type" : "type-11511", ++ "self_type" : "type-11510", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", ++ "name" : "google::protobuf::ResultCallback, std::allocator > *> *", ++ "referenced_type" : "type-11534", ++ "self_type" : "type-11533", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138236,8 +138287,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-11630", +- "self_type" : "type-11629", ++ "referenced_type" : "type-12227", ++ "self_type" : "type-12226", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138245,8 +138296,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-12275", +- "self_type" : "type-12274", ++ "referenced_type" : "type-12818", ++ "self_type" : "type-12817", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138254,8 +138305,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-12866", +- "self_type" : "type-12865", ++ "referenced_type" : "type-13282", ++ "self_type" : "type-13281", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138263,8 +138314,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-13330", +- "self_type" : "type-13329", ++ "referenced_type" : "type-13811", ++ "self_type" : "type-13810", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138272,8 +138323,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-13859", +- "self_type" : "type-13858", ++ "referenced_type" : "type-1406", ++ "self_type" : "type-1405", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138281,8 +138332,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-14169", +- "self_type" : "type-14168", ++ "referenced_type" : "type-14121", ++ "self_type" : "type-14120", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138290,8 +138341,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-14278", +- "self_type" : "type-14277", ++ "referenced_type" : "type-14230", ++ "self_type" : "type-14229", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138299,8 +138350,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-14500", +- "self_type" : "type-14499", ++ "referenced_type" : "type-14452", ++ "self_type" : "type-14451", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138308,8 +138359,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-14608", +- "self_type" : "type-14607", ++ "referenced_type" : "type-14560", ++ "self_type" : "type-14559", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138317,8 +138368,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-1494", +- "self_type" : "type-1493", ++ "referenced_type" : "type-1462", ++ "self_type" : "type-1461", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138326,8 +138377,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-15388", +- "self_type" : "type-15387", ++ "referenced_type" : "type-1485", ++ "self_type" : "type-1484", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138335,8 +138386,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-1540", +- "self_type" : "type-1539", ++ "referenced_type" : "type-15340", ++ "self_type" : "type-15339", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138344,8 +138395,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-15441", +- "self_type" : "type-15440", ++ "referenced_type" : "type-15393", ++ "self_type" : "type-15392", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138353,8 +138404,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-15489", +- "self_type" : "type-15488", ++ "referenced_type" : "type-1544", ++ "self_type" : "type-1543", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138362,8 +138413,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-1563", +- "self_type" : "type-1562", ++ "referenced_type" : "type-15441", ++ "self_type" : "type-15440", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138371,8 +138422,17 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-16130", +- "self_type" : "type-16129", ++ "referenced_type" : "type-1570", ++ "self_type" : "type-1569", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", ++ "name" : "google::protobuf::ResultCallback, std::allocator > *> *", ++ "referenced_type" : "type-16082", ++ "self_type" : "type-16081", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138380,8 +138440,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-1628", +- "self_type" : "type-1627", ++ "referenced_type" : "type-16674", ++ "self_type" : "type-16673", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138389,17 +138449,17 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-1657", +- "self_type" : "type-1656", ++ "referenced_type" : "type-17138", ++ "self_type" : "type-17137", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, + { + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-16722", +- "self_type" : "type-16721", ++ "referenced_type" : "type-17675", ++ "self_type" : "type-17674", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138407,8 +138467,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-17186", +- "self_type" : "type-17185", ++ "referenced_type" : "type-17985", ++ "self_type" : "type-17984", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138416,8 +138476,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-17723", +- "self_type" : "type-17722", ++ "referenced_type" : "type-18094", ++ "self_type" : "type-18093", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138425,8 +138485,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-18033", +- "self_type" : "type-18032", ++ "referenced_type" : "type-18316", ++ "self_type" : "type-18315", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138434,8 +138494,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-18142", +- "self_type" : "type-18141", ++ "referenced_type" : "type-18424", ++ "self_type" : "type-18423", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138443,8 +138503,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-18364", +- "self_type" : "type-18363", ++ "referenced_type" : "type-19099", ++ "self_type" : "type-19098", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138452,8 +138512,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-18472", +- "self_type" : "type-18471", ++ "referenced_type" : "type-19337", ++ "self_type" : "type-19336", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138461,8 +138521,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-19147", +- "self_type" : "type-19146", ++ "referenced_type" : "type-19424", ++ "self_type" : "type-19423", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138470,8 +138530,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-19385", +- "self_type" : "type-19384", ++ "referenced_type" : "type-19493", ++ "self_type" : "type-19492", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138479,8 +138539,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-19472", +- "self_type" : "type-19471", ++ "referenced_type" : "type-19672", ++ "self_type" : "type-19671", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138488,8 +138548,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-19541", +- "self_type" : "type-19540", ++ "referenced_type" : "type-19834", ++ "self_type" : "type-19833", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138497,8 +138557,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-19720", +- "self_type" : "type-19719", ++ "referenced_type" : "type-20613", ++ "self_type" : "type-20612", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138506,8 +138566,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-19882", +- "self_type" : "type-19881", ++ "referenced_type" : "type-21206", ++ "self_type" : "type-21205", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138515,8 +138575,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-20661", +- "self_type" : "type-20660", ++ "referenced_type" : "type-21670", ++ "self_type" : "type-21669", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138524,8 +138584,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-21254", +- "self_type" : "type-21253", ++ "referenced_type" : "type-22231", ++ "self_type" : "type-22230", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138533,8 +138593,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-21718", +- "self_type" : "type-21717", ++ "referenced_type" : "type-22483", ++ "self_type" : "type-22482", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138542,8 +138602,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-22252", +- "self_type" : "type-22251", ++ "referenced_type" : "type-22584", ++ "self_type" : "type-22583", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138551,8 +138611,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-22562", +- "self_type" : "type-22561", ++ "referenced_type" : "type-22856", ++ "self_type" : "type-22855", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138560,8 +138620,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-22671", +- "self_type" : "type-22670", ++ "referenced_type" : "type-23860", ++ "self_type" : "type-23859", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138569,8 +138629,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-22893", +- "self_type" : "type-22892", ++ "referenced_type" : "type-23887", ++ "self_type" : "type-23886", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138578,8 +138638,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-23001", +- "self_type" : "type-23000", ++ "referenced_type" : "type-24011", ++ "self_type" : "type-24010", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138587,8 +138647,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-23676", +- "self_type" : "type-23675", ++ "referenced_type" : "type-24192", ++ "self_type" : "type-24191", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138596,8 +138656,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-23885", +- "self_type" : "type-23884", ++ "referenced_type" : "type-24469", ++ "self_type" : "type-24468", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138605,8 +138665,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-23972", +- "self_type" : "type-23971", ++ "referenced_type" : "type-24513", ++ "self_type" : "type-24512", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138614,8 +138674,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-24011", +- "self_type" : "type-24010", ++ "referenced_type" : "type-24744", ++ "self_type" : "type-24743", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138623,8 +138683,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-24187", +- "self_type" : "type-24186", ++ "referenced_type" : "type-24777", ++ "self_type" : "type-24776", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138632,8 +138692,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-24349", +- "self_type" : "type-24348", ++ "referenced_type" : "type-24997", ++ "self_type" : "type-24996", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138641,8 +138701,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-24539", +- "self_type" : "type-24538", ++ "referenced_type" : "type-25201", ++ "self_type" : "type-25200", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138650,8 +138710,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-24817", +- "self_type" : "type-24816", ++ "referenced_type" : "type-25891", ++ "self_type" : "type-25890", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138659,8 +138719,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-25029", +- "self_type" : "type-25028", ++ "referenced_type" : "type-26475", ++ "self_type" : "type-26474", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138668,8 +138728,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-25840", +- "self_type" : "type-25839", ++ "referenced_type" : "type-26917", ++ "self_type" : "type-26916", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138677,8 +138737,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-26432", +- "self_type" : "type-26431", ++ "referenced_type" : "type-27436", ++ "self_type" : "type-27435", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138686,8 +138746,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-26896", +- "self_type" : "type-26895", ++ "referenced_type" : "type-27746", ++ "self_type" : "type-27745", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138695,8 +138755,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-27437", +- "self_type" : "type-27436", ++ "referenced_type" : "type-27855", ++ "self_type" : "type-27854", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138704,17 +138764,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-27747", +- "self_type" : "type-27746", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-27856", +- "self_type" : "type-27855", ++ "referenced_type" : "type-28077", ++ "self_type" : "type-28076", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138722,8 +138773,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-28078", +- "self_type" : "type-28077", ++ "referenced_type" : "type-28185", ++ "self_type" : "type-28184", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138731,8 +138782,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-28186", +- "self_type" : "type-28185", ++ "referenced_type" : "type-2868", ++ "self_type" : "type-2867", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138740,8 +138791,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-28861", +- "self_type" : "type-28860", ++ "referenced_type" : "type-28860", ++ "self_type" : "type-28859", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138749,8 +138800,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-29070", +- "self_type" : "type-29069", ++ "referenced_type" : "type-29069", ++ "self_type" : "type-29068", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138758,8 +138809,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-29157", +- "self_type" : "type-29156", ++ "referenced_type" : "type-29156", ++ "self_type" : "type-29155", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138767,8 +138818,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-2916", +- "self_type" : "type-2915", ++ "referenced_type" : "type-29195", ++ "self_type" : "type-29194", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138776,8 +138827,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-29196", +- "self_type" : "type-29195", ++ "referenced_type" : "type-2924", ++ "self_type" : "type-2923", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138785,8 +138836,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-29372", +- "self_type" : "type-29371", ++ "referenced_type" : "type-29371", ++ "self_type" : "type-29370", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138794,8 +138845,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-29534", +- "self_type" : "type-29533", ++ "referenced_type" : "type-2947", ++ "self_type" : "type-2946", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138803,8 +138854,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-2972", +- "self_type" : "type-2971", ++ "referenced_type" : "type-29533", ++ "self_type" : "type-29532", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138812,8 +138863,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-29724", +- "self_type" : "type-29723", ++ "referenced_type" : "type-29723", ++ "self_type" : "type-29722", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138830,8 +138881,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-29996", +- "self_type" : "type-29995", ++ "referenced_type" : "type-29995", ++ "self_type" : "type-29994", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138839,8 +138890,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-30179", +- "self_type" : "type-30178", ++ "referenced_type" : "type-30178", ++ "self_type" : "type-30177", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138848,8 +138899,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-3043", +- "self_type" : "type-3042", ++ "referenced_type" : "type-30985", ++ "self_type" : "type-30984", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138857,8 +138908,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-30986", +- "self_type" : "type-30985", ++ "referenced_type" : "type-31578", ++ "self_type" : "type-31577", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138866,8 +138917,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-31579", +- "self_type" : "type-31578", ++ "referenced_type" : "type-32042", ++ "self_type" : "type-32041", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138875,8 +138926,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-32043", +- "self_type" : "type-32042", ++ "referenced_type" : "type-3686", ++ "self_type" : "type-3685", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138884,8 +138935,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-3734", +- "self_type" : "type-3733", ++ "referenced_type" : "type-4407", ++ "self_type" : "type-4406", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138893,8 +138944,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-4455", +- "self_type" : "type-4454", ++ "referenced_type" : "type-4848", ++ "self_type" : "type-4847", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138902,8 +138953,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-4896", +- "self_type" : "type-4895", ++ "referenced_type" : "type-4904", ++ "self_type" : "type-4903", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138911,8 +138962,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-4952", +- "self_type" : "type-4951", ++ "referenced_type" : "type-4927", ++ "self_type" : "type-4926", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138929,8 +138980,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-5023", +- "self_type" : "type-5022", ++ "referenced_type" : "type-5636", ++ "self_type" : "type-5635", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138938,8 +138989,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-5684", +- "self_type" : "type-5683", ++ "referenced_type" : "type-6229", ++ "self_type" : "type-6228", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138947,8 +138998,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-6277", +- "self_type" : "type-6276", ++ "referenced_type" : "type-6857", ++ "self_type" : "type-6856", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138956,17 +139007,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-6905", +- "self_type" : "type-6904", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-7650", +- "self_type" : "type-7649", ++ "referenced_type" : "type-7602", ++ "self_type" : "type-7601", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138983,8 +139025,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-7980", +- "self_type" : "type-7979", ++ "referenced_type" : "type-7932", ++ "self_type" : "type-7931", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -138992,8 +139034,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-8088", +- "self_type" : "type-8087", ++ "referenced_type" : "type-8040", ++ "self_type" : "type-8039", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -139001,8 +139043,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-8172", +- "self_type" : "type-8171", ++ "referenced_type" : "type-8124", ++ "self_type" : "type-8123", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -139010,8 +139052,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-8228", +- "self_type" : "type-8227", ++ "referenced_type" : "type-8180", ++ "self_type" : "type-8179", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -139019,8 +139061,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-8251", +- "self_type" : "type-8250", ++ "referenced_type" : "type-8203", ++ "self_type" : "type-8202", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -139028,8 +139070,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-8299", +- "self_type" : "type-8298", ++ "referenced_type" : "type-8251", ++ "self_type" : "type-8250", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -139055,8 +139097,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-8941", +- "self_type" : "type-8940", ++ "referenced_type" : "type-8893", ++ "self_type" : "type-8892", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -139064,8 +139106,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-9534", +- "self_type" : "type-9533", ++ "referenced_type" : "type-9486", ++ "self_type" : "type-9485", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -139073,8 +139115,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ResultCallback, std::allocator > *> *", + "name" : "google::protobuf::ResultCallback, std::allocator > *> *", +- "referenced_type" : "type-9997", +- "self_type" : "type-9996", ++ "referenced_type" : "type-9949", ++ "self_type" : "type-9948", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -139082,8 +139124,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RpcChannel *", + "name" : "google::protobuf::RpcChannel *", +- "referenced_type" : "type-7107", +- "self_type" : "type-7108", ++ "referenced_type" : "type-7059", ++ "self_type" : "type-7060", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/service.h" + }, +@@ -139091,8 +139133,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::RpcController *", + "name" : "google::protobuf::RpcController *", +- "referenced_type" : "type-7105", +- "self_type" : "type-7106", ++ "referenced_type" : "type-7057", ++ "self_type" : "type-7058", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/service.h" + }, +@@ -139100,8 +139142,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Service *", + "name" : "google::protobuf::Service *", +- "referenced_type" : "type-7102", +- "self_type" : "type-7103", ++ "referenced_type" : "type-7054", ++ "self_type" : "type-7055", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/service.h" + }, +@@ -139109,8 +139151,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ServiceDescriptor *", + "name" : "google::protobuf::ServiceDescriptor *", +- "referenced_type" : "type-1985", +- "self_type" : "type-1984", ++ "referenced_type" : "type-1911", ++ "self_type" : "type-1910", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -139118,8 +139160,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ServiceDescriptorProto *", + "name" : "google::protobuf::ServiceDescriptorProto *", +- "referenced_type" : "type-1704", +- "self_type" : "type-1886", ++ "referenced_type" : "type-1618", ++ "self_type" : "type-1804", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -139127,8 +139169,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::ServiceOptions *", + "name" : "google::protobuf::ServiceOptions *", +- "referenced_type" : "type-1710", +- "self_type" : "type-1709", ++ "referenced_type" : "type-1624", ++ "self_type" : "type-1623", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -139136,8 +139178,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::SimpleDescriptorDatabase *", + "name" : "google::protobuf::SimpleDescriptorDatabase *", +- "referenced_type" : "type-3749", +- "self_type" : "type-3938", ++ "referenced_type" : "type-3701", ++ "self_type" : "type-3890", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -139145,8 +139187,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::SimpleDescriptorDatabase::DescriptorIndex *", + "name" : "google::protobuf::SimpleDescriptorDatabase::DescriptorIndex *", +- "referenced_type" : "type-3750", +- "self_type" : "type-3939", ++ "referenced_type" : "type-3702", ++ "self_type" : "type-3891", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -139154,8 +139196,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::SimpleDescriptorDatabase::DescriptorIndex > *", + "name" : "google::protobuf::SimpleDescriptorDatabase::DescriptorIndex > *", +- "referenced_type" : "type-3756", +- "self_type" : "type-3940", ++ "referenced_type" : "type-3708", ++ "self_type" : "type-3892", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -139163,8 +139205,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::SourceCodeInfo *", + "name" : "google::protobuf::SourceCodeInfo *", +- "referenced_type" : "type-1714", +- "self_type" : "type-1713", ++ "referenced_type" : "type-1628", ++ "self_type" : "type-1627", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -139172,8 +139214,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::SourceCodeInfo_Location *", + "name" : "google::protobuf::SourceCodeInfo_Location *", +- "referenced_type" : "type-1716", +- "self_type" : "type-1922", ++ "referenced_type" : "type-1630", ++ "self_type" : "type-1843", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -139181,8 +139223,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::SourceContext *", + "name" : "google::protobuf::SourceContext *", +- "referenced_type" : "type-2345", +- "self_type" : "type-2344", ++ "referenced_type" : "type-2272", ++ "self_type" : "type-2271", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/source_context.pb.h" + }, +@@ -139190,8 +139232,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::SourceLocation *", + "name" : "google::protobuf::SourceLocation *", +- "referenced_type" : "type-1952", +- "self_type" : "type-3677", ++ "referenced_type" : "type-1876", ++ "self_type" : "type-3629", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, +@@ -139208,8 +139250,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::StringValue *", + "name" : "google::protobuf::StringValue *", +- "referenced_type" : "type-11055", +- "self_type" : "type-11067", ++ "referenced_type" : "type-11007", ++ "self_type" : "type-11019", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -139217,8 +139259,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Struct *", + "name" : "google::protobuf::Struct *", +- "referenced_type" : "type-7218", +- "self_type" : "type-7217", ++ "referenced_type" : "type-7170", ++ "self_type" : "type-7169", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -139226,8 +139268,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Syntax *", + "name" : "google::protobuf::Syntax *", +- "referenced_type" : "type-2481", +- "self_type" : "type-2482", ++ "referenced_type" : "type-2411", ++ "self_type" : "type-2412", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_enum_reflection.h" + }, +@@ -139235,8 +139277,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::TextFormat::FieldValuePrinter *", + "name" : "google::protobuf::TextFormat::FieldValuePrinter *", +- "referenced_type" : "type-3726", +- "self_type" : "type-7683", ++ "referenced_type" : "type-3678", ++ "self_type" : "type-7635", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, +@@ -139244,8 +139286,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::TextFormat::Finder *", + "name" : "google::protobuf::TextFormat::Finder *", +- "referenced_type" : "type-3869", +- "self_type" : "type-3878", ++ "referenced_type" : "type-3821", ++ "self_type" : "type-3830", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, +@@ -139253,8 +139295,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::TextFormat::ParseInfoTree *", + "name" : "google::protobuf::TextFormat::ParseInfoTree *", +- "referenced_type" : "type-3872", +- "self_type" : "type-3879", ++ "referenced_type" : "type-3824", ++ "self_type" : "type-3831", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, +@@ -139262,8 +139304,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::TextFormat::ParseLocation *", + "name" : "google::protobuf::TextFormat::ParseLocation *", +- "referenced_type" : "type-3870", +- "self_type" : "type-3871", ++ "referenced_type" : "type-3822", ++ "self_type" : "type-3823", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, +@@ -139271,8 +139313,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::TextFormat::Parser *", + "name" : "google::protobuf::TextFormat::Parser *", +- "referenced_type" : "type-3875", +- "self_type" : "type-3880", ++ "referenced_type" : "type-3827", ++ "self_type" : "type-3832", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, +@@ -139280,8 +139322,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::TextFormat::Parser::ParserImpl *", + "name" : "google::protobuf::TextFormat::Parser::ParserImpl *", +- "referenced_type" : "type-10607", +- "self_type" : "type-10606", ++ "referenced_type" : "type-10559", ++ "self_type" : "type-10558", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, +@@ -139289,8 +139331,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::TextFormat::Parser::ParserImpl *", + "name" : "google::protobuf::TextFormat::Parser::ParserImpl *", +- "referenced_type" : "type-13898", +- "self_type" : "type-13897", ++ "referenced_type" : "type-13850", ++ "self_type" : "type-13849", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, +@@ -139298,8 +139340,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::TextFormat::Parser::ParserImpl *", + "name" : "google::protobuf::TextFormat::Parser::ParserImpl *", +- "referenced_type" : "type-17762", +- "self_type" : "type-17761", ++ "referenced_type" : "type-17714", ++ "self_type" : "type-17713", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, +@@ -139307,8 +139349,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::TextFormat::Parser::ParserImpl *", + "name" : "google::protobuf::TextFormat::Parser::ParserImpl *", +- "referenced_type" : "type-22291", +- "self_type" : "type-22290", ++ "referenced_type" : "type-22262", ++ "self_type" : "type-22261", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, +@@ -139316,8 +139358,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::TextFormat::Parser::ParserImpl *", + "name" : "google::protobuf::TextFormat::Parser::ParserImpl *", +- "referenced_type" : "type-27476", +- "self_type" : "type-27475", ++ "referenced_type" : "type-27475", ++ "self_type" : "type-27474", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, +@@ -139325,8 +139367,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::TextFormat::Parser::ParserImpl *", + "name" : "google::protobuf::TextFormat::Parser::ParserImpl *", +- "referenced_type" : "type-7692", +- "self_type" : "type-7691", ++ "referenced_type" : "type-7644", ++ "self_type" : "type-7643", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, +@@ -139334,8 +139376,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::TextFormat::Printer *", + "name" : "google::protobuf::TextFormat::Printer *", +- "referenced_type" : "type-3866", +- "self_type" : "type-3868", ++ "referenced_type" : "type-3818", ++ "self_type" : "type-3820", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, +@@ -139343,8 +139385,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Timestamp *", + "name" : "google::protobuf::Timestamp *", +- "referenced_type" : "type-7806", +- "self_type" : "type-7811", ++ "referenced_type" : "type-7758", ++ "self_type" : "type-7763", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -139352,8 +139394,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Type *", + "name" : "google::protobuf::Type *", +- "referenced_type" : "type-2487", +- "self_type" : "type-2489", ++ "referenced_type" : "type-2417", ++ "self_type" : "type-2419", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, +@@ -139361,8 +139403,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::UInt32Value *", + "name" : "google::protobuf::UInt32Value *", +- "referenced_type" : "type-11053", +- "self_type" : "type-11065", ++ "referenced_type" : "type-11005", ++ "self_type" : "type-11017", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -139370,8 +139412,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::UInt64Value *", + "name" : "google::protobuf::UInt64Value *", +- "referenced_type" : "type-11051", +- "self_type" : "type-11063", ++ "referenced_type" : "type-11003", ++ "self_type" : "type-11015", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -139379,8 +139421,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::UninterpretedOption *", + "name" : "google::protobuf::UninterpretedOption *", +- "referenced_type" : "type-1683", +- "self_type" : "type-1914", ++ "referenced_type" : "type-1597", ++ "self_type" : "type-1834", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -139388,8 +139430,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::UninterpretedOption_NamePart *", + "name" : "google::protobuf::UninterpretedOption_NamePart *", +- "referenced_type" : "type-1685", +- "self_type" : "type-1918", ++ "referenced_type" : "type-1599", ++ "self_type" : "type-1839", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -139397,8 +139439,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::UnknownField *", + "name" : "google::protobuf::UnknownField *", +- "referenced_type" : "type-1941", +- "self_type" : "type-1945", ++ "referenced_type" : "type-1866", ++ "self_type" : "type-1869", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -139406,8 +139448,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::UnknownFieldSet *", + "name" : "google::protobuf::UnknownFieldSet *", +- "referenced_type" : "type-1739", +- "self_type" : "type-1936", ++ "referenced_type" : "type-1652", ++ "self_type" : "type-1859", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -139415,8 +139457,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Value *", + "name" : "google::protobuf::Value *", +- "referenced_type" : "type-7215", +- "self_type" : "type-7226", ++ "referenced_type" : "type-7167", ++ "self_type" : "type-7178", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -139424,8 +139466,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Value **", + "name" : "google::protobuf::Value **", +- "referenced_type" : "type-7226", +- "self_type" : "type-7307", ++ "referenced_type" : "type-7178", ++ "self_type" : "type-7259", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map_type_handler.h" + }, +@@ -139433,8 +139475,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::Value::KindUnion *", + "name" : "google::protobuf::Value::KindUnion *", +- "referenced_type" : "type-7216", +- "self_type" : "type-7335", ++ "referenced_type" : "type-7168", ++ "self_type" : "type-7287", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/struct.pb.h" + }, +@@ -139442,8 +139484,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::compiler::DiskSourceTree *", + "name" : "google::protobuf::compiler::DiskSourceTree *", +- "referenced_type" : "type-11369", +- "self_type" : "type-11372", ++ "referenced_type" : "type-11321", ++ "self_type" : "type-11324", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/importer.h" + }, +@@ -139451,8 +139493,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::compiler::DiskSourceTree::Mapping *", + "name" : "google::protobuf::compiler::DiskSourceTree::Mapping *", +- "referenced_type" : "type-11374", +- "self_type" : "type-11377", ++ "referenced_type" : "type-11326", ++ "self_type" : "type-11329", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/importer.h" + }, +@@ -139460,8 +139502,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::compiler::Importer *", + "name" : "google::protobuf::compiler::Importer *", +- "referenced_type" : "type-11365", +- "self_type" : "type-11366", ++ "referenced_type" : "type-11317", ++ "self_type" : "type-11318", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/importer.h" + }, +@@ -139469,8 +139511,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::compiler::MultiFileErrorCollector *", + "name" : "google::protobuf::compiler::MultiFileErrorCollector *", +- "referenced_type" : "type-11361", +- "self_type" : "type-11360", ++ "referenced_type" : "type-11313", ++ "self_type" : "type-11312", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/importer.h" + }, +@@ -139478,8 +139520,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::compiler::Parser *", + "name" : "google::protobuf::compiler::Parser *", +- "referenced_type" : "type-11336", +- "self_type" : "type-11346", ++ "referenced_type" : "type-11288", ++ "self_type" : "type-11298", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/parser.h" + }, +@@ -139487,8 +139529,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::compiler::Parser::LocationRecorder *", + "name" : "google::protobuf::compiler::Parser::LocationRecorder *", +- "referenced_type" : "type-11347", +- "self_type" : "type-11495", ++ "referenced_type" : "type-11299", ++ "self_type" : "type-11447", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/parser.h" + }, +@@ -139496,8 +139538,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::compiler::Parser::MapField *", + "name" : "google::protobuf::compiler::Parser::MapField *", +- "referenced_type" : "type-11351", +- "self_type" : "type-11354", ++ "referenced_type" : "type-11303", ++ "self_type" : "type-11306", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/parser.h" + }, +@@ -139505,8 +139547,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::compiler::SourceLocationTable *", + "name" : "google::protobuf::compiler::SourceLocationTable *", +- "referenced_type" : "type-11341", +- "self_type" : "type-11340", ++ "referenced_type" : "type-11293", ++ "self_type" : "type-11292", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/parser.h" + }, +@@ -139514,8 +139556,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::compiler::SourceTree *", + "name" : "google::protobuf::compiler::SourceTree *", +- "referenced_type" : "type-11359", +- "self_type" : "type-11358", ++ "referenced_type" : "type-11311", ++ "self_type" : "type-11310", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/importer.h" + }, +@@ -139523,8 +139565,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::compiler::SourceTreeDescriptorDatabase *", + "name" : "google::protobuf::compiler::SourceTreeDescriptorDatabase *", +- "referenced_type" : "type-11357", +- "self_type" : "type-11363", ++ "referenced_type" : "type-11309", ++ "self_type" : "type-11315", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/importer.h" + }, +@@ -139532,8 +139574,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::compiler::SourceTreeDescriptorDatabase::ValidationErrorCollector *", + "name" : "google::protobuf::compiler::SourceTreeDescriptorDatabase::ValidationErrorCollector *", +- "referenced_type" : "type-11362", +- "self_type" : "type-11364", ++ "referenced_type" : "type-11314", ++ "self_type" : "type-11316", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/importer.h" + }, +@@ -139541,8 +139583,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash *", + "name" : "google::protobuf::hash *", +- "referenced_type" : "type-4312", +- "self_type" : "type-4313", ++ "referenced_type" : "type-4264", ++ "self_type" : "type-4265", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -139559,8 +139601,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash *", + "name" : "google::protobuf::hash *", +- "referenced_type" : "type-4306", +- "self_type" : "type-4307", ++ "referenced_type" : "type-4258", ++ "self_type" : "type-4259", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -139568,8 +139610,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash *", + "name" : "google::protobuf::hash *", +- "referenced_type" : "type-4304", +- "self_type" : "type-4305", ++ "referenced_type" : "type-4256", ++ "self_type" : "type-4257", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -139577,8 +139619,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash *", + "name" : "google::protobuf::hash *", +- "referenced_type" : "type-4310", +- "self_type" : "type-4311", ++ "referenced_type" : "type-4262", ++ "self_type" : "type-4263", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -139586,8 +139628,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash *", + "name" : "google::protobuf::hash *", +- "referenced_type" : "type-4308", +- "self_type" : "type-4309", ++ "referenced_type" : "type-4260", ++ "self_type" : "type-4261", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -139595,8 +139637,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map, google::protobuf::streq, std::allocator > > *", + "name" : "google::protobuf::hash_map, google::protobuf::streq, std::allocator > > *", +- "referenced_type" : "type-3637", +- "self_type" : "type-3657", ++ "referenced_type" : "type-3589", ++ "self_type" : "type-3609", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -139604,8 +139646,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map &), google::protobuf::hash, google::protobuf::streq, std::allocator &)> > > *", + "name" : "google::protobuf::hash_map &), google::protobuf::hash, google::protobuf::streq, std::allocator &)> > > *", +- "referenced_type" : "type-6865", +- "self_type" : "type-6874", ++ "referenced_type" : "type-6817", ++ "self_type" : "type-6826", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -139613,8 +139655,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map, std::equal_to, std::allocator > > *", + "name" : "google::protobuf::hash_map, std::equal_to, std::allocator > > *", +- "referenced_type" : "type-4314", +- "self_type" : "type-4322", ++ "referenced_type" : "type-4266", ++ "self_type" : "type-4274", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -139622,8 +139664,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map, std::equal_to, std::allocator > > *", + "name" : "google::protobuf::hash_map, std::equal_to, std::allocator > > *", +- "referenced_type" : "type-6859", +- "self_type" : "type-6879", ++ "referenced_type" : "type-6811", ++ "self_type" : "type-6831", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -139631,8 +139673,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-10018", +- "self_type" : "type-10017", ++ "referenced_type" : "type-10344", ++ "self_type" : "type-10343", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139640,8 +139682,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-10392", +- "self_type" : "type-10391", ++ "referenced_type" : "type-12663", ++ "self_type" : "type-12662", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139649,8 +139691,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-12711", +- "self_type" : "type-12710", ++ "referenced_type" : "type-12981", ++ "self_type" : "type-12980", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139658,8 +139700,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-13029", +- "self_type" : "type-13028", ++ "referenced_type" : "type-13303", ++ "self_type" : "type-13302", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139667,8 +139709,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-13351", +- "self_type" : "type-13350", ++ "referenced_type" : "type-13635", ++ "self_type" : "type-13634", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139676,8 +139718,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-13683", +- "self_type" : "type-13682", ++ "referenced_type" : "type-15032", ++ "self_type" : "type-15031", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139685,8 +139727,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-15080", +- "self_type" : "type-15079", ++ "referenced_type" : "type-16519", ++ "self_type" : "type-16518", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139694,8 +139736,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-16567", +- "self_type" : "type-16566", ++ "referenced_type" : "type-16837", ++ "self_type" : "type-16836", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139703,8 +139745,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-16885", +- "self_type" : "type-16884", ++ "referenced_type" : "type-17159", ++ "self_type" : "type-17158", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139712,8 +139754,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-17207", +- "self_type" : "type-17206", ++ "referenced_type" : "type-17499", ++ "self_type" : "type-17498", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139721,8 +139763,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-17547", +- "self_type" : "type-17546", ++ "referenced_type" : "type-18816", ++ "self_type" : "type-18815", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139730,8 +139772,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-18864", +- "self_type" : "type-18863", ++ "referenced_type" : "type-21051", ++ "self_type" : "type-21050", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139739,8 +139781,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-21099", +- "self_type" : "type-21098", ++ "referenced_type" : "type-21369", ++ "self_type" : "type-21368", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139748,8 +139790,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-21417", +- "self_type" : "type-21416", ++ "referenced_type" : "type-21691", ++ "self_type" : "type-21690", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139757,8 +139799,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-21739", +- "self_type" : "type-21738", ++ "referenced_type" : "type-22076", ++ "self_type" : "type-22075", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139766,8 +139808,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-22076", +- "self_type" : "type-22075", ++ "referenced_type" : "type-23377", ++ "self_type" : "type-23376", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139775,8 +139817,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-23393", +- "self_type" : "type-23392", ++ "referenced_type" : "type-26320", ++ "self_type" : "type-26319", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139784,8 +139826,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-26277", +- "self_type" : "type-26276", ++ "referenced_type" : "type-26623", ++ "self_type" : "type-26622", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139793,8 +139835,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-26595", +- "self_type" : "type-26594", ++ "referenced_type" : "type-26937", ++ "self_type" : "type-26936", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139802,8 +139844,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-26917", +- "self_type" : "type-26916", ++ "referenced_type" : "type-27260", ++ "self_type" : "type-27259", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139811,8 +139853,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-27261", +- "self_type" : "type-27260", ++ "referenced_type" : "type-28577", ++ "self_type" : "type-28576", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139820,8 +139862,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-28578", +- "self_type" : "type-28577", ++ "referenced_type" : "type-31423", ++ "self_type" : "type-31422", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139829,8 +139871,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-31424", +- "self_type" : "type-31423", ++ "referenced_type" : "type-31741", ++ "self_type" : "type-31740", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139838,8 +139880,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-31742", +- "self_type" : "type-31741", ++ "referenced_type" : "type-32063", ++ "self_type" : "type-32062", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139847,8 +139889,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-32064", +- "self_type" : "type-32063", ++ "referenced_type" : "type-4234", ++ "self_type" : "type-4233", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139856,8 +139898,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-4282", +- "self_type" : "type-4281", ++ "referenced_type" : "type-6074", ++ "self_type" : "type-6073", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139865,8 +139907,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-6122", +- "self_type" : "type-6121", ++ "referenced_type" : "type-6397", ++ "self_type" : "type-6396", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139874,26 +139916,26 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-6445", +- "self_type" : "type-6444", ++ "referenced_type" : "type-6456", ++ "self_type" : "type-6516", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/map.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, + { + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-6504", +- "self_type" : "type-6564", ++ "referenced_type" : "type-6882", ++ "self_type" : "type-6881", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/arena.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-6930", +- "self_type" : "type-6929", ++ "referenced_type" : "type-7369", ++ "self_type" : "type-7368", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139901,8 +139943,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-7417", +- "self_type" : "type-7416", ++ "referenced_type" : "type-9331", ++ "self_type" : "type-9330", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139910,8 +139952,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-9379", +- "self_type" : "type-9378", ++ "referenced_type" : "type-9649", ++ "self_type" : "type-9648", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139919,8 +139961,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", + "name" : "google::protobuf::hash_map *, google::protobuf::hash, std::equal_to, google::protobuf::Map::MapAllocator *> > > *", +- "referenced_type" : "type-9697", +- "self_type" : "type-9696", ++ "referenced_type" : "type-9970", ++ "self_type" : "type-9969", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -139928,8 +139970,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > > *", + "name" : "google::protobuf::hash_map, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > > *", +- "referenced_type" : "type-19525", +- "self_type" : "type-19531", ++ "referenced_type" : "type-19477", ++ "self_type" : "type-19483", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -139937,8 +139979,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > > *", + "name" : "google::protobuf::hash_map, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > > *", +- "referenced_type" : "type-24638", +- "self_type" : "type-24637", ++ "referenced_type" : "type-24604", ++ "self_type" : "type-24603", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, +@@ -139946,8 +139988,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > > *", + "name" : "google::protobuf::hash_map, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > > *", +- "referenced_type" : "type-24892", +- "self_type" : "type-24891", ++ "referenced_type" : "type-24859", ++ "self_type" : "type-24858", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, +@@ -139955,8 +139997,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > > *", + "name" : "google::protobuf::hash_map, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > > *", +- "referenced_type" : "type-29822", +- "self_type" : "type-29821", ++ "referenced_type" : "type-29821", ++ "self_type" : "type-29820", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, +@@ -139964,8 +140006,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > > *", + "name" : "google::protobuf::hash_map, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> > > *", +- "referenced_type" : "type-30071", +- "self_type" : "type-30070", ++ "referenced_type" : "type-30070", ++ "self_type" : "type-30069", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, +@@ -139973,8 +140015,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > > *", + "name" : "google::protobuf::hash_map, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > > *", +- "referenced_type" : "type-19365", +- "self_type" : "type-19389", ++ "referenced_type" : "type-19317", ++ "self_type" : "type-19341", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -139982,8 +140024,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > > *", + "name" : "google::protobuf::hash_map, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > > *", +- "referenced_type" : "type-24626", +- "self_type" : "type-24625", ++ "referenced_type" : "type-24595", ++ "self_type" : "type-24594", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h" + }, +@@ -139991,8 +140033,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > > *", + "name" : "google::protobuf::hash_map, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > > *", +- "referenced_type" : "type-24886", +- "self_type" : "type-24885", ++ "referenced_type" : "type-24853", ++ "self_type" : "type-24852", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h" + }, +@@ -140000,8 +140042,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > > *", + "name" : "google::protobuf::hash_map, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > > *", +- "referenced_type" : "type-29811", +- "self_type" : "type-29810", ++ "referenced_type" : "type-29810", ++ "self_type" : "type-29809", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h" + }, +@@ -140009,8 +140051,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > > *", + "name" : "google::protobuf::hash_map, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *), google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> > > *", +- "referenced_type" : "type-30065", +- "self_type" : "type-30064", ++ "referenced_type" : "type-30064", ++ "self_type" : "type-30063", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h" + }, +@@ -140018,8 +140060,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, const google::protobuf::SourceCodeInfo_Location *, google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> > > *", + "name" : "google::protobuf::hash_map, std::allocator >, const google::protobuf::SourceCodeInfo_Location *, google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> > > *", +- "referenced_type" : "type-3651", +- "self_type" : "type-3706", ++ "referenced_type" : "type-3603", ++ "self_type" : "type-3658", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -140027,8 +140069,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, google::protobuf::FieldDescriptorProto_Type, google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> > > *", + "name" : "google::protobuf::hash_map, std::allocator >, google::protobuf::FieldDescriptorProto_Type, google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> > > *", +- "referenced_type" : "type-11395", +- "self_type" : "type-11401", ++ "referenced_type" : "type-11347", ++ "self_type" : "type-11353", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -140036,8 +140078,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *, google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, google::protobuf::Map, Value>::MapAllocator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *> > > *", + "name" : "google::protobuf::hash_map, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *, google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, google::protobuf::Map, Value>::MapAllocator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *> > > *", +- "referenced_type" : "type-7238", +- "self_type" : "type-7237", ++ "referenced_type" : "type-7190", ++ "self_type" : "type-7189", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -140045,8 +140087,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, int, google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, int> > > *", + "name" : "google::protobuf::hash_map, std::allocator >, int, google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, int> > > *", +- "referenced_type" : "type-15311", +- "self_type" : "type-15316", ++ "referenced_type" : "type-15263", ++ "self_type" : "type-15268", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -140063,8 +140105,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_set, std::equal_to > *", + "name" : "google::protobuf::hash_set, std::equal_to > *", +- "referenced_type" : "type-3719", +- "self_type" : "type-3722", ++ "referenced_type" : "type-3671", ++ "self_type" : "type-3674", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -140072,8 +140114,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_set, std::equal_to > *", + "name" : "google::protobuf::hash_set, std::equal_to > *", +- "referenced_type" : "type-19512", +- "self_type" : "type-19713", ++ "referenced_type" : "type-19464", ++ "self_type" : "type-19665", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -140081,8 +140123,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::hash_set, std::allocator >, google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > > > *", + "name" : "google::protobuf::hash_set, std::allocator >, google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > > > *", +- "referenced_type" : "type-3714", +- "self_type" : "type-3718", ++ "referenced_type" : "type-3666", ++ "self_type" : "type-3670", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -140090,8 +140132,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::AnyMetadata *", + "name" : "google::protobuf::internal::AnyMetadata *", +- "referenced_type" : "type-1847", +- "self_type" : "type-2578", ++ "referenced_type" : "type-1760", ++ "self_type" : "type-2510", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/any.h" + }, +@@ -140126,8 +140168,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::DynamicMapField *", + "name" : "google::protobuf::internal::DynamicMapField *", +- "referenced_type" : "type-4276", +- "self_type" : "type-6789", ++ "referenced_type" : "type-4228", ++ "self_type" : "type-6741", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, +@@ -140270,8 +140312,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::FunctionClosure1 *> *", + "name" : "google::protobuf::internal::FunctionClosure1 *> *", +- "referenced_type" : "type-3683", +- "self_type" : "type-3688", ++ "referenced_type" : "type-3635", ++ "self_type" : "type-3640", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -140279,8 +140321,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::FunctionResultCallback_1_1 *", + "name" : "google::protobuf::internal::FunctionResultCallback_1_1 *", +- "referenced_type" : "type-19486", +- "self_type" : "type-19521", ++ "referenced_type" : "type-19438", ++ "self_type" : "type-19473", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -140297,8 +140339,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::GeneratedMessageReflection *", + "name" : "google::protobuf::internal::GeneratedMessageReflection *", +- "referenced_type" : "type-2204", +- "self_type" : "type-6479", ++ "referenced_type" : "type-2135", ++ "self_type" : "type-6431", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -140306,8 +140348,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::InternalMetadataWithArena *", + "name" : "google::protobuf::internal::InternalMetadataWithArena *", +- "referenced_type" : "type-1675", +- "self_type" : "type-1949", ++ "referenced_type" : "type-1588", ++ "self_type" : "type-1873", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/metadata.h" + }, +@@ -140315,8 +140357,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::InternalMetadataWithArena::Container *", + "name" : "google::protobuf::internal::InternalMetadataWithArena::Container *", +- "referenced_type" : "type-1738", +- "self_type" : "type-1933", ++ "referenced_type" : "type-1651", ++ "self_type" : "type-1855", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -140342,8 +140384,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", + "name" : "google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", +- "referenced_type" : "type-7222", +- "self_type" : "type-7223", ++ "referenced_type" : "type-7174", ++ "self_type" : "type-7175", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -140351,8 +140393,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapEntryBase *", + "name" : "google::protobuf::internal::MapEntryBase *", +- "referenced_type" : "type-4262", +- "self_type" : "type-4265", ++ "referenced_type" : "type-4214", ++ "self_type" : "type-4217", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map_entry.h" + }, +@@ -140360,8 +140402,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapEntryLite, Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0>::MapEntryWrapper, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", + "name" : "google::protobuf::internal::MapEntryLite, Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0>::MapEntryWrapper, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", +- "referenced_type" : "type-7328", +- "self_type" : "type-7400", ++ "referenced_type" : "type-7280", ++ "self_type" : "type-7352", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -140369,8 +140411,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapEntryLite, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", + "name" : "google::protobuf::internal::MapEntryLite, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", +- "referenced_type" : "type-7224", +- "self_type" : "type-7225", ++ "referenced_type" : "type-7176", ++ "self_type" : "type-7177", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -140378,8 +140420,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapField, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", + "name" : "google::protobuf::internal::MapField, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", +- "referenced_type" : "type-7219", +- "self_type" : "type-7600", ++ "referenced_type" : "type-7171", ++ "self_type" : "type-7552", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -140387,8 +140429,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldAccessor *", + "name" : "google::protobuf::internal::MapFieldAccessor *", +- "referenced_type" : "type-6894", +- "self_type" : "type-7008", ++ "referenced_type" : "type-6846", ++ "self_type" : "type-6960", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -140396,8 +140438,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-10112", +- "self_type" : "type-10111", ++ "referenced_type" : "type-10064", ++ "self_type" : "type-10063", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140405,8 +140447,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-10253", +- "self_type" : "type-10252", ++ "referenced_type" : "type-10205", ++ "self_type" : "type-10204", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140414,8 +140456,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-10597", +- "self_type" : "type-10596", ++ "referenced_type" : "type-10549", ++ "self_type" : "type-10548", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140423,8 +140465,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-10753", +- "self_type" : "type-10752", ++ "referenced_type" : "type-10705", ++ "self_type" : "type-10704", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140432,8 +140474,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-10841", +- "self_type" : "type-10840", ++ "referenced_type" : "type-10793", ++ "self_type" : "type-10792", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140441,8 +140483,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-10931", +- "self_type" : "type-10930", ++ "referenced_type" : "type-10883", ++ "self_type" : "type-10882", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140450,8 +140492,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-11014", +- "self_type" : "type-11013", ++ "referenced_type" : "type-10966", ++ "self_type" : "type-10965", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140459,8 +140501,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-11090", +- "self_type" : "type-11089", ++ "referenced_type" : "type-11042", ++ "self_type" : "type-11041", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140468,8 +140510,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-11283", +- "self_type" : "type-11282", ++ "referenced_type" : "type-11235", ++ "self_type" : "type-11234", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140477,8 +140519,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-11440", +- "self_type" : "type-11439", ++ "referenced_type" : "type-11392", ++ "self_type" : "type-11391", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140486,8 +140528,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-11898", +- "self_type" : "type-11897", ++ "referenced_type" : "type-11850", ++ "self_type" : "type-11849", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140495,8 +140537,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-12069", +- "self_type" : "type-12068", ++ "referenced_type" : "type-12021", ++ "self_type" : "type-12020", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140504,8 +140546,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-12173", +- "self_type" : "type-12172", ++ "referenced_type" : "type-12125", ++ "self_type" : "type-12124", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140513,8 +140555,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-12312", +- "self_type" : "type-12311", ++ "referenced_type" : "type-12264", ++ "self_type" : "type-12263", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140522,8 +140564,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-12459", +- "self_type" : "type-12458", ++ "referenced_type" : "type-12411", ++ "self_type" : "type-12410", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140531,8 +140573,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-12552", +- "self_type" : "type-12551", ++ "referenced_type" : "type-12504", ++ "self_type" : "type-12503", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140540,8 +140582,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-12653", +- "self_type" : "type-12652", ++ "referenced_type" : "type-12605", ++ "self_type" : "type-12604", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140549,8 +140591,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-12835", +- "self_type" : "type-12834", ++ "referenced_type" : "type-12787", ++ "self_type" : "type-12786", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140558,8 +140600,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-12915", +- "self_type" : "type-12914", ++ "referenced_type" : "type-12867", ++ "self_type" : "type-12866", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140567,8 +140609,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-12973", +- "self_type" : "type-12972", ++ "referenced_type" : "type-12925", ++ "self_type" : "type-12924", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140576,8 +140618,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-13445", +- "self_type" : "type-13444", ++ "referenced_type" : "type-13397", ++ "self_type" : "type-13396", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140585,8 +140627,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-13544", +- "self_type" : "type-13543", ++ "referenced_type" : "type-13496", ++ "self_type" : "type-13495", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140594,8 +140636,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-13888", +- "self_type" : "type-13887", ++ "referenced_type" : "type-13840", ++ "self_type" : "type-13839", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140603,8 +140645,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-14044", +- "self_type" : "type-14043", ++ "referenced_type" : "type-13996", ++ "self_type" : "type-13995", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140612,8 +140654,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-14132", +- "self_type" : "type-14131", ++ "referenced_type" : "type-14084", ++ "self_type" : "type-14083", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140621,8 +140663,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-14222", +- "self_type" : "type-14221", ++ "referenced_type" : "type-14174", ++ "self_type" : "type-14173", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140630,8 +140672,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-14305", +- "self_type" : "type-14304", ++ "referenced_type" : "type-14257", ++ "self_type" : "type-14256", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140639,8 +140681,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-14372", +- "self_type" : "type-14371", ++ "referenced_type" : "type-14324", ++ "self_type" : "type-14323", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140648,8 +140690,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-14534", +- "self_type" : "type-14533", ++ "referenced_type" : "type-14486", ++ "self_type" : "type-14485", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140657,8 +140699,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-14659", +- "self_type" : "type-14658", ++ "referenced_type" : "type-14611", ++ "self_type" : "type-14610", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140666,8 +140708,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-14794", +- "self_type" : "type-14793", ++ "referenced_type" : "type-14746", ++ "self_type" : "type-14745", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140675,8 +140717,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-14892", +- "self_type" : "type-14891", ++ "referenced_type" : "type-14844", ++ "self_type" : "type-14843", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140684,8 +140726,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-15252", +- "self_type" : "type-15251", ++ "referenced_type" : "type-15204", ++ "self_type" : "type-15203", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140693,8 +140735,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-15755", +- "self_type" : "type-15754", ++ "referenced_type" : "type-15707", ++ "self_type" : "type-15706", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140702,8 +140744,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-15925", +- "self_type" : "type-15924", ++ "referenced_type" : "type-15877", ++ "self_type" : "type-15876", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140711,8 +140753,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-16028", +- "self_type" : "type-16027", ++ "referenced_type" : "type-15980", ++ "self_type" : "type-15979", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140720,8 +140762,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-16167", +- "self_type" : "type-16166", ++ "referenced_type" : "type-16119", ++ "self_type" : "type-16118", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140729,8 +140771,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-16316", +- "self_type" : "type-16315", ++ "referenced_type" : "type-16268", ++ "self_type" : "type-16267", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140738,8 +140780,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-16409", +- "self_type" : "type-16408", ++ "referenced_type" : "type-16361", ++ "self_type" : "type-16360", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140747,8 +140789,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-16509", +- "self_type" : "type-16508", ++ "referenced_type" : "type-16461", ++ "self_type" : "type-16460", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140756,8 +140798,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-16691", +- "self_type" : "type-16690", ++ "referenced_type" : "type-16643", ++ "self_type" : "type-16642", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140765,8 +140807,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-16771", +- "self_type" : "type-16770", ++ "referenced_type" : "type-16723", ++ "self_type" : "type-16722", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140774,8 +140816,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-16829", +- "self_type" : "type-16828", ++ "referenced_type" : "type-16781", ++ "self_type" : "type-16780", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140783,8 +140825,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-17301", +- "self_type" : "type-17300", ++ "referenced_type" : "type-17253", ++ "self_type" : "type-17252", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140792,8 +140834,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-17408", +- "self_type" : "type-17407", ++ "referenced_type" : "type-17360", ++ "self_type" : "type-17359", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140801,8 +140843,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-17752", +- "self_type" : "type-17751", ++ "referenced_type" : "type-17704", ++ "self_type" : "type-17703", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140810,8 +140852,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-17908", +- "self_type" : "type-17907", ++ "referenced_type" : "type-17860", ++ "self_type" : "type-17859", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140819,8 +140861,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-17996", +- "self_type" : "type-17995", ++ "referenced_type" : "type-17948", ++ "self_type" : "type-17947", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140828,8 +140870,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-18086", +- "self_type" : "type-18085", ++ "referenced_type" : "type-18038", ++ "self_type" : "type-18037", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140837,8 +140879,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-18169", +- "self_type" : "type-18168", ++ "referenced_type" : "type-18121", ++ "self_type" : "type-18120", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140846,8 +140888,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-18236", +- "self_type" : "type-18235", ++ "referenced_type" : "type-18188", ++ "self_type" : "type-18187", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140855,8 +140897,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-18398", +- "self_type" : "type-18397", ++ "referenced_type" : "type-18350", ++ "self_type" : "type-18349", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140864,8 +140906,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-18523", +- "self_type" : "type-18522", ++ "referenced_type" : "type-18475", ++ "self_type" : "type-18474", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140873,8 +140915,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-18658", +- "self_type" : "type-18657", ++ "referenced_type" : "type-18610", ++ "self_type" : "type-18609", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140882,8 +140924,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-18749", +- "self_type" : "type-18748", ++ "referenced_type" : "type-18701", ++ "self_type" : "type-18700", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140891,8 +140933,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-19028", +- "self_type" : "type-19027", ++ "referenced_type" : "type-18980", ++ "self_type" : "type-18979", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140900,8 +140942,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-19271", +- "self_type" : "type-19270", ++ "referenced_type" : "type-19223", ++ "self_type" : "type-19222", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140909,8 +140951,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-19422", +- "self_type" : "type-19421", ++ "referenced_type" : "type-19374", ++ "self_type" : "type-19373", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140918,8 +140960,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-19610", +- "self_type" : "type-19609", ++ "referenced_type" : "type-19562", ++ "self_type" : "type-19561", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140927,8 +140969,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-19780", +- "self_type" : "type-19779", ++ "referenced_type" : "type-19732", ++ "self_type" : "type-19731", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140936,8 +140978,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-19939", +- "self_type" : "type-19938", ++ "referenced_type" : "type-19891", ++ "self_type" : "type-19890", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140945,8 +140987,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-20288", +- "self_type" : "type-20287", ++ "referenced_type" : "type-20240", ++ "self_type" : "type-20239", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140954,8 +140996,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-20459", +- "self_type" : "type-20458", ++ "referenced_type" : "type-20411", ++ "self_type" : "type-20410", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140963,8 +141005,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-20560", +- "self_type" : "type-20559", ++ "referenced_type" : "type-20512", ++ "self_type" : "type-20511", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140972,8 +141014,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-20698", +- "self_type" : "type-20697", ++ "referenced_type" : "type-20650", ++ "self_type" : "type-20649", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140981,8 +141023,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-20847", +- "self_type" : "type-20846", ++ "referenced_type" : "type-20799", ++ "self_type" : "type-20798", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140990,8 +141032,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-20940", +- "self_type" : "type-20939", ++ "referenced_type" : "type-2082", ++ "self_type" : "type-2081", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -140999,8 +141041,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-21041", +- "self_type" : "type-21040", ++ "referenced_type" : "type-20892", ++ "self_type" : "type-20891", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141008,8 +141050,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-21223", +- "self_type" : "type-21222", ++ "referenced_type" : "type-20993", ++ "self_type" : "type-20992", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141017,8 +141059,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-21303", +- "self_type" : "type-21302", ++ "referenced_type" : "type-21175", ++ "self_type" : "type-21174", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141026,8 +141068,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-21361", +- "self_type" : "type-21360", ++ "referenced_type" : "type-21255", ++ "self_type" : "type-21254", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141035,8 +141077,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-2151", +- "self_type" : "type-2150", ++ "referenced_type" : "type-21313", ++ "self_type" : "type-21312", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141044,8 +141086,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-21833", +- "self_type" : "type-21832", ++ "referenced_type" : "type-21785", ++ "self_type" : "type-21784", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141062,8 +141104,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-22281", +- "self_type" : "type-22280", ++ "referenced_type" : "type-22252", ++ "self_type" : "type-22251", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141071,8 +141113,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-22437", +- "self_type" : "type-22436", ++ "referenced_type" : "type-22384", ++ "self_type" : "type-22383", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141080,8 +141122,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-22525", +- "self_type" : "type-22524", ++ "referenced_type" : "type-22442", ++ "self_type" : "type-22441", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141089,8 +141131,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-22615", +- "self_type" : "type-22614", ++ "referenced_type" : "type-22523", ++ "self_type" : "type-22522", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141098,8 +141140,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-22698", +- "self_type" : "type-22697", ++ "referenced_type" : "type-22622", ++ "self_type" : "type-22621", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141107,8 +141149,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-22765", +- "self_type" : "type-22764", ++ "referenced_type" : "type-22708", ++ "self_type" : "type-22707", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141116,8 +141158,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-22927", +- "self_type" : "type-22926", ++ "referenced_type" : "type-22891", ++ "self_type" : "type-22890", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141125,8 +141167,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-23052", +- "self_type" : "type-23051", ++ "referenced_type" : "type-23034", ++ "self_type" : "type-23033", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141134,8 +141176,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-23187", +- "self_type" : "type-23186", ++ "referenced_type" : "type-23172", ++ "self_type" : "type-23171", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141143,8 +141185,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-23278", +- "self_type" : "type-23277", ++ "referenced_type" : "type-23271", ++ "self_type" : "type-23270", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141152,8 +141194,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-23557", +- "self_type" : "type-23556", ++ "referenced_type" : "type-23537", ++ "self_type" : "type-23536", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141161,8 +141203,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-23792", +- "self_type" : "type-23791", ++ "referenced_type" : "type-2369", ++ "self_type" : "type-2368", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141170,8 +141212,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-23922", +- "self_type" : "type-23921", ++ "referenced_type" : "type-23781", ++ "self_type" : "type-23780", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141179,8 +141221,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-24080", +- "self_type" : "type-24079", ++ "referenced_type" : "type-23923", ++ "self_type" : "type-23922", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141188,8 +141230,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-24247", +- "self_type" : "type-24246", ++ "referenced_type" : "type-24078", ++ "self_type" : "type-24077", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141197,8 +141239,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-2439", +- "self_type" : "type-2438", ++ "referenced_type" : "type-24251", ++ "self_type" : "type-24250", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141206,8 +141248,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-24402", +- "self_type" : "type-24401", ++ "referenced_type" : "type-24383", ++ "self_type" : "type-24382", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141215,8 +141257,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-24557", +- "self_type" : "type-24556", ++ "referenced_type" : "type-24527", ++ "self_type" : "type-24526", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141224,8 +141266,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-24693", +- "self_type" : "type-24692", ++ "referenced_type" : "type-24655", ++ "self_type" : "type-24654", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141233,8 +141275,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-24824", +- "self_type" : "type-24823", ++ "referenced_type" : "type-24784", ++ "self_type" : "type-24783", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141242,8 +141284,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-24983", +- "self_type" : "type-24982", ++ "referenced_type" : "type-2494", ++ "self_type" : "type-2493", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141251,8 +141293,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-25110", +- "self_type" : "type-25109", ++ "referenced_type" : "type-24950", ++ "self_type" : "type-24949", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141260,8 +141302,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-25208", +- "self_type" : "type-25207", ++ "referenced_type" : "type-25083", ++ "self_type" : "type-25082", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141269,8 +141311,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-25464", +- "self_type" : "type-25463", ++ "referenced_type" : "type-25208", ++ "self_type" : "type-25207", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141278,8 +141320,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-2562", +- "self_type" : "type-2561", ++ "referenced_type" : "type-25515", ++ "self_type" : "type-25514", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141287,8 +141329,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-25635", +- "self_type" : "type-25634", ++ "referenced_type" : "type-25686", ++ "self_type" : "type-25685", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141296,8 +141338,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-25739", +- "self_type" : "type-25738", ++ "referenced_type" : "type-25788", ++ "self_type" : "type-25787", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141305,8 +141347,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-25877", +- "self_type" : "type-25876", ++ "referenced_type" : "type-25928", ++ "self_type" : "type-25927", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141314,8 +141356,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-26025", +- "self_type" : "type-26024", ++ "referenced_type" : "type-26078", ++ "self_type" : "type-26077", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141323,8 +141365,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-26118", +- "self_type" : "type-26117", ++ "referenced_type" : "type-26163", ++ "self_type" : "type-26162", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141332,8 +141374,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-26219", +- "self_type" : "type-26218", ++ "referenced_type" : "type-26261", ++ "self_type" : "type-26260", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141341,8 +141383,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-26401", +- "self_type" : "type-26400", ++ "referenced_type" : "type-26443", ++ "self_type" : "type-26442", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141350,8 +141392,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-26481", +- "self_type" : "type-26480", ++ "referenced_type" : "type-26517", ++ "self_type" : "type-26516", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141359,8 +141401,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-26539", +- "self_type" : "type-26538", ++ "referenced_type" : "type-26564", ++ "self_type" : "type-26563", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141368,8 +141410,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-27011", +- "self_type" : "type-27010", ++ "referenced_type" : "type-27041", ++ "self_type" : "type-27040", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141377,8 +141419,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-27122", +- "self_type" : "type-27121", ++ "referenced_type" : "type-27121", ++ "self_type" : "type-27120", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141386,8 +141428,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-27466", +- "self_type" : "type-27465", ++ "referenced_type" : "type-27465", ++ "self_type" : "type-27464", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141395,8 +141437,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-27622", +- "self_type" : "type-27621", ++ "referenced_type" : "type-27621", ++ "self_type" : "type-27620", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141404,8 +141446,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-27710", +- "self_type" : "type-27709", ++ "referenced_type" : "type-27709", ++ "self_type" : "type-27708", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141413,8 +141455,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-27800", +- "self_type" : "type-27799", ++ "referenced_type" : "type-27799", ++ "self_type" : "type-27798", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141422,8 +141464,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-27883", +- "self_type" : "type-27882", ++ "referenced_type" : "type-27882", ++ "self_type" : "type-27881", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141431,8 +141473,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-27950", +- "self_type" : "type-27949", ++ "referenced_type" : "type-27949", ++ "self_type" : "type-27948", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141440,8 +141482,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-28112", +- "self_type" : "type-28111", ++ "referenced_type" : "type-28111", ++ "self_type" : "type-28110", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141449,8 +141491,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-28237", +- "self_type" : "type-28236", ++ "referenced_type" : "type-28236", ++ "self_type" : "type-28235", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141458,8 +141500,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-28372", +- "self_type" : "type-28371", ++ "referenced_type" : "type-28371", ++ "self_type" : "type-28370", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141467,8 +141509,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-28463", +- "self_type" : "type-28462", ++ "referenced_type" : "type-28462", ++ "self_type" : "type-28461", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141476,8 +141518,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-28742", +- "self_type" : "type-28741", ++ "referenced_type" : "type-28741", ++ "self_type" : "type-28740", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141485,8 +141527,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-28977", +- "self_type" : "type-28976", ++ "referenced_type" : "type-28976", ++ "self_type" : "type-28975", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141494,8 +141536,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-29107", +- "self_type" : "type-29106", ++ "referenced_type" : "type-29106", ++ "self_type" : "type-29105", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141503,8 +141545,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-29265", +- "self_type" : "type-29264", ++ "referenced_type" : "type-29264", ++ "self_type" : "type-29263", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141512,8 +141554,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-29432", +- "self_type" : "type-29431", ++ "referenced_type" : "type-29431", ++ "self_type" : "type-29430", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141521,8 +141563,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-29587", +- "self_type" : "type-29586", ++ "referenced_type" : "type-29586", ++ "self_type" : "type-29585", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141530,8 +141572,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-29742", +- "self_type" : "type-29741", ++ "referenced_type" : "type-29741", ++ "self_type" : "type-29740", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141539,8 +141581,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-29874", +- "self_type" : "type-29873", ++ "referenced_type" : "type-29873", ++ "self_type" : "type-29872", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141548,8 +141590,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-30003", +- "self_type" : "type-30002", ++ "referenced_type" : "type-30002", ++ "self_type" : "type-30001", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141557,8 +141599,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-30139", +- "self_type" : "type-30138", ++ "referenced_type" : "type-30138", ++ "self_type" : "type-30137", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141566,8 +141608,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-30255", +- "self_type" : "type-30254", ++ "referenced_type" : "type-30254", ++ "self_type" : "type-30253", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141575,8 +141617,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-30352", +- "self_type" : "type-30351", ++ "referenced_type" : "type-30351", ++ "self_type" : "type-30350", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141584,8 +141626,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-30610", +- "self_type" : "type-30609", ++ "referenced_type" : "type-30609", ++ "self_type" : "type-30608", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141593,8 +141635,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-30781", +- "self_type" : "type-30780", ++ "referenced_type" : "type-30780", ++ "self_type" : "type-30779", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141602,8 +141644,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-30885", +- "self_type" : "type-30884", ++ "referenced_type" : "type-30884", ++ "self_type" : "type-30883", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141611,8 +141653,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-31023", +- "self_type" : "type-31022", ++ "referenced_type" : "type-31022", ++ "self_type" : "type-31021", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141620,8 +141662,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-31172", +- "self_type" : "type-31171", ++ "referenced_type" : "type-31171", ++ "self_type" : "type-31170", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141629,8 +141671,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-31265", +- "self_type" : "type-31264", ++ "referenced_type" : "type-31264", ++ "self_type" : "type-31263", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141638,8 +141680,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-31366", +- "self_type" : "type-31365", ++ "referenced_type" : "type-31365", ++ "self_type" : "type-31364", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141647,8 +141689,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-31548", +- "self_type" : "type-31547", ++ "referenced_type" : "type-31547", ++ "self_type" : "type-31546", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141656,8 +141698,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-31628", +- "self_type" : "type-31627", ++ "referenced_type" : "type-31627", ++ "self_type" : "type-31626", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141665,8 +141707,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-31686", +- "self_type" : "type-31685", ++ "referenced_type" : "type-31685", ++ "self_type" : "type-31684", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141674,8 +141716,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-32158", +- "self_type" : "type-32157", ++ "referenced_type" : "type-32157", ++ "self_type" : "type-32156", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141683,8 +141725,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-3315", +- "self_type" : "type-3314", ++ "referenced_type" : "type-3267", ++ "self_type" : "type-3266", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141692,8 +141734,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-3492", +- "self_type" : "type-3491", ++ "referenced_type" : "type-3444", ++ "self_type" : "type-3443", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141701,8 +141743,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-3602", +- "self_type" : "type-3601", ++ "referenced_type" : "type-3554", ++ "self_type" : "type-3553", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141710,8 +141752,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-3792", +- "self_type" : "type-3791", ++ "referenced_type" : "type-3744", ++ "self_type" : "type-3743", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141719,8 +141761,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-3962", +- "self_type" : "type-3961", ++ "referenced_type" : "type-3914", ++ "self_type" : "type-3913", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141728,8 +141770,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-4104", +- "self_type" : "type-4103", ++ "referenced_type" : "type-4056", ++ "self_type" : "type-4055", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141737,8 +141779,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-4208", +- "self_type" : "type-4207", ++ "referenced_type" : "type-4160", ++ "self_type" : "type-4159", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141746,8 +141788,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-4269", +- "self_type" : "type-4285", ++ "referenced_type" : "type-4221", ++ "self_type" : "type-4237", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141755,8 +141797,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-4422", +- "self_type" : "type-4421", ++ "referenced_type" : "type-4374", ++ "self_type" : "type-4373", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141764,8 +141806,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-4503", +- "self_type" : "type-4502", ++ "referenced_type" : "type-4455", ++ "self_type" : "type-4454", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141773,8 +141815,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-4669", +- "self_type" : "type-4668", ++ "referenced_type" : "type-4621", ++ "self_type" : "type-4620", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141782,8 +141824,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-5295", +- "self_type" : "type-5294", ++ "referenced_type" : "type-5247", ++ "self_type" : "type-5246", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141791,8 +141833,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-5472", +- "self_type" : "type-5471", ++ "referenced_type" : "type-5424", ++ "self_type" : "type-5423", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141800,8 +141842,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-5580", +- "self_type" : "type-5579", ++ "referenced_type" : "type-5532", ++ "self_type" : "type-5531", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141809,8 +141851,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-5721", +- "self_type" : "type-5720", ++ "referenced_type" : "type-5673", ++ "self_type" : "type-5672", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141818,8 +141860,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-5870", +- "self_type" : "type-5869", ++ "referenced_type" : "type-5822", ++ "self_type" : "type-5821", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141827,8 +141869,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-5963", +- "self_type" : "type-5962", ++ "referenced_type" : "type-5915", ++ "self_type" : "type-5914", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141836,8 +141878,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-6064", +- "self_type" : "type-6063", ++ "referenced_type" : "type-6016", ++ "self_type" : "type-6015", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141845,8 +141887,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-6246", +- "self_type" : "type-6245", ++ "referenced_type" : "type-6198", ++ "self_type" : "type-6197", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141854,8 +141896,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-6326", +- "self_type" : "type-6325", ++ "referenced_type" : "type-6278", ++ "self_type" : "type-6277", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141863,8 +141905,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-6387", +- "self_type" : "type-6386", ++ "referenced_type" : "type-6339", ++ "self_type" : "type-6338", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141872,8 +141914,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-7039", +- "self_type" : "type-7038", ++ "referenced_type" : "type-6991", ++ "self_type" : "type-6990", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141881,8 +141923,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-7165", +- "self_type" : "type-7164", ++ "referenced_type" : "type-7117", ++ "self_type" : "type-7116", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141890,8 +141932,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-7682", +- "self_type" : "type-7681", ++ "referenced_type" : "type-7634", ++ "self_type" : "type-7633", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141899,8 +141941,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-7838", +- "self_type" : "type-7837", ++ "referenced_type" : "type-7790", ++ "self_type" : "type-7789", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141908,8 +141950,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-7943", +- "self_type" : "type-7942", ++ "referenced_type" : "type-7895", ++ "self_type" : "type-7894", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141917,8 +141959,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-8032", +- "self_type" : "type-8031", ++ "referenced_type" : "type-7984", ++ "self_type" : "type-7983", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141926,8 +141968,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-8115", +- "self_type" : "type-8114", ++ "referenced_type" : "type-8067", ++ "self_type" : "type-8066", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141935,8 +141977,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-8569", +- "self_type" : "type-8568", ++ "referenced_type" : "type-8521", ++ "self_type" : "type-8520", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141944,8 +141986,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-8737", +- "self_type" : "type-8736", ++ "referenced_type" : "type-8689", ++ "self_type" : "type-8688", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141953,8 +141995,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-8839", +- "self_type" : "type-8838", ++ "referenced_type" : "type-8791", ++ "self_type" : "type-8790", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141962,8 +142004,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-8978", +- "self_type" : "type-8977", ++ "referenced_type" : "type-8930", ++ "self_type" : "type-8929", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141971,8 +142013,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-9127", +- "self_type" : "type-9126", ++ "referenced_type" : "type-9079", ++ "self_type" : "type-9078", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141980,8 +142022,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-9220", +- "self_type" : "type-9219", ++ "referenced_type" : "type-9172", ++ "self_type" : "type-9171", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141989,8 +142031,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-9321", +- "self_type" : "type-9320", ++ "referenced_type" : "type-9273", ++ "self_type" : "type-9272", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -141998,8 +142040,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-9503", +- "self_type" : "type-9502", ++ "referenced_type" : "type-9455", ++ "self_type" : "type-9454", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -142007,8 +142049,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-9583", +- "self_type" : "type-9582", ++ "referenced_type" : "type-9535", ++ "self_type" : "type-9534", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -142016,8 +142058,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldBase *", + "name" : "google::protobuf::internal::MapFieldBase *", +- "referenced_type" : "type-9641", +- "self_type" : "type-9640", ++ "referenced_type" : "type-9593", ++ "self_type" : "type-9592", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -142025,8 +142067,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MapFieldLite, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", + "name" : "google::protobuf::internal::MapFieldLite, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *", +- "referenced_type" : "type-7198", +- "self_type" : "type-7598", ++ "referenced_type" : "type-7150", ++ "self_type" : "type-7550", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -142034,8 +142076,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MessageSetFieldSkipper *", + "name" : "google::protobuf::internal::MessageSetFieldSkipper *", +- "referenced_type" : "type-12904", +- "self_type" : "type-12903", ++ "referenced_type" : "type-12856", ++ "self_type" : "type-12855", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -142043,8 +142085,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MessageSetFieldSkipper *", + "name" : "google::protobuf::internal::MessageSetFieldSkipper *", +- "referenced_type" : "type-16760", +- "self_type" : "type-16759", ++ "referenced_type" : "type-16712", ++ "self_type" : "type-16711", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -142052,8 +142094,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MessageSetFieldSkipper *", + "name" : "google::protobuf::internal::MessageSetFieldSkipper *", +- "referenced_type" : "type-21292", +- "self_type" : "type-21291", ++ "referenced_type" : "type-21244", ++ "self_type" : "type-21243", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -142061,8 +142103,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MessageSetFieldSkipper *", + "name" : "google::protobuf::internal::MessageSetFieldSkipper *", +- "referenced_type" : "type-26470", +- "self_type" : "type-26469", ++ "referenced_type" : "type-26506", ++ "self_type" : "type-26505", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -142070,8 +142112,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MessageSetFieldSkipper *", + "name" : "google::protobuf::internal::MessageSetFieldSkipper *", +- "referenced_type" : "type-31617", +- "self_type" : "type-31616", ++ "referenced_type" : "type-31616", ++ "self_type" : "type-31615", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -142079,8 +142121,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MessageSetFieldSkipper *", + "name" : "google::protobuf::internal::MessageSetFieldSkipper *", +- "referenced_type" : "type-4492", +- "self_type" : "type-4491", ++ "referenced_type" : "type-4444", ++ "self_type" : "type-4443", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -142088,8 +142130,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MessageSetFieldSkipper *", + "name" : "google::protobuf::internal::MessageSetFieldSkipper *", +- "referenced_type" : "type-6315", +- "self_type" : "type-6314", ++ "referenced_type" : "type-6267", ++ "self_type" : "type-6266", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -142097,8 +142139,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MessageSetFieldSkipper *", + "name" : "google::protobuf::internal::MessageSetFieldSkipper *", +- "referenced_type" : "type-9572", +- "self_type" : "type-9571", ++ "referenced_type" : "type-9524", ++ "self_type" : "type-9523", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -142106,8 +142148,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::MethodResultCallback_5_2 > &, int, int> *", + "name" : "google::protobuf::internal::MethodResultCallback_5_2 > &, int, int> *", +- "referenced_type" : "type-24906", +- "self_type" : "type-24926", ++ "referenced_type" : "type-24873", ++ "self_type" : "type-24895", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -142124,8 +142166,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-10000", +- "self_type" : "type-9999", ++ "referenced_type" : "type-10045", ++ "self_type" : "type-10044", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142133,8 +142175,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-10093", +- "self_type" : "type-10092", ++ "referenced_type" : "type-10123", ++ "self_type" : "type-10122", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142142,8 +142184,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-10171", +- "self_type" : "type-10170", ++ "referenced_type" : "type-10135", ++ "self_type" : "type-10134", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142151,8 +142193,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-10183", +- "self_type" : "type-10182", ++ "referenced_type" : "type-10234", ++ "self_type" : "type-10233", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142160,8 +142202,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-10282", +- "self_type" : "type-10281", ++ "referenced_type" : "type-1031", ++ "self_type" : "type-1030", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142169,8 +142211,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-1031", +- "self_type" : "type-1030", ++ "referenced_type" : "type-10326", ++ "self_type" : "type-10325", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142178,8 +142220,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-10374", +- "self_type" : "type-10373", ++ "referenced_type" : "type-10483", ++ "self_type" : "type-10482", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142196,8 +142238,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-10531", +- "self_type" : "type-10530", ++ "referenced_type" : "type-10536", ++ "self_type" : "type-10535", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142214,8 +142256,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-10584", +- "self_type" : "type-10583", ++ "referenced_type" : "type-10665", ++ "self_type" : "type-10664", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142223,8 +142265,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-10713", +- "self_type" : "type-10712", ++ "referenced_type" : "type-10751", ++ "self_type" : "type-10750", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142232,8 +142274,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-10799", +- "self_type" : "type-10798", ++ "referenced_type" : "type-10849", ++ "self_type" : "type-10848", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142241,8 +142283,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-10897", +- "self_type" : "type-10896", ++ "referenced_type" : "type-10944", ++ "self_type" : "type-10943", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142250,8 +142292,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-10992", +- "self_type" : "type-10991", ++ "referenced_type" : "type-10994", ++ "self_type" : "type-10993", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142259,8 +142301,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-11042", +- "self_type" : "type-11041", ++ "referenced_type" : "type-10999", ++ "self_type" : "type-10998", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142268,8 +142310,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-11047", +- "self_type" : "type-11046", ++ "referenced_type" : "type-11026", ++ "self_type" : "type-11025", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142277,8 +142319,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-11074", +- "self_type" : "type-11073", ++ "referenced_type" : "type-11127", ++ "self_type" : "type-11126", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142286,8 +142328,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-11175", +- "self_type" : "type-11174", ++ "referenced_type" : "type-11149", ++ "self_type" : "type-11148", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142295,8 +142337,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-11197", +- "self_type" : "type-11196", ++ "referenced_type" : "type-11174", ++ "self_type" : "type-11173", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142304,8 +142346,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-11222", +- "self_type" : "type-11221", ++ "referenced_type" : "type-11183", ++ "self_type" : "type-11182", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142313,8 +142355,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-11231", +- "self_type" : "type-11230", ++ "referenced_type" : "type-11215", ++ "self_type" : "type-11214", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142322,8 +142364,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-11263", +- "self_type" : "type-11262", ++ "referenced_type" : "type-11362", ++ "self_type" : "type-11361", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142331,8 +142373,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-11410", +- "self_type" : "type-11409", ++ "referenced_type" : "type-11370", ++ "self_type" : "type-11369", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142340,8 +142382,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-11418", +- "self_type" : "type-11417", ++ "referenced_type" : "type-11481", ++ "self_type" : "type-11480", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142349,8 +142391,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-11529", +- "self_type" : "type-11528", ++ "referenced_type" : "type-11523", ++ "self_type" : "type-11522", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142358,8 +142400,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-11571", +- "self_type" : "type-11570", ++ "referenced_type" : "type-11536", ++ "self_type" : "type-11535", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142367,8 +142409,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-11584", +- "self_type" : "type-11583", ++ "referenced_type" : "type-11548", ++ "self_type" : "type-11547", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142376,8 +142418,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-11596", +- "self_type" : "type-11595", ++ "referenced_type" : "type-11576", ++ "self_type" : "type-11575", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142385,8 +142427,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-11624", +- "self_type" : "type-11623", ++ "referenced_type" : "type-11584", ++ "self_type" : "type-11583", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142394,8 +142436,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-11632", +- "self_type" : "type-11631", ++ "referenced_type" : "type-11617", ++ "self_type" : "type-11616", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142403,8 +142445,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-11665", +- "self_type" : "type-11664", ++ "referenced_type" : "type-11649", ++ "self_type" : "type-11648", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142412,8 +142454,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-11697", +- "self_type" : "type-11696", ++ "referenced_type" : "type-11784", ++ "self_type" : "type-11783", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142421,8 +142463,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-11832", +- "self_type" : "type-11831", ++ "referenced_type" : "type-11950", ++ "self_type" : "type-11949", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142430,8 +142472,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-11998", +- "self_type" : "type-11997", ++ "referenced_type" : "type-11954", ++ "self_type" : "type-11953", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142439,8 +142481,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-12002", +- "self_type" : "type-12001", ++ "referenced_type" : "type-11997", ++ "self_type" : "type-11996", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142448,8 +142490,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-12045", +- "self_type" : "type-12044", ++ "referenced_type" : "type-12071", ++ "self_type" : "type-12070", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142457,8 +142499,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-12119", +- "self_type" : "type-12118", ++ "referenced_type" : "type-1208", ++ "self_type" : "type-1207", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142466,8 +142508,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-12163", +- "self_type" : "type-12162", ++ "referenced_type" : "type-12115", ++ "self_type" : "type-12114", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142475,8 +142517,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-12193", +- "self_type" : "type-12192", ++ "referenced_type" : "type-12145", ++ "self_type" : "type-12144", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142484,8 +142526,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-1225", +- "self_type" : "type-1224", ++ "referenced_type" : "type-12255", ++ "self_type" : "type-12254", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142493,8 +142535,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-12303", +- "self_type" : "type-12302", ++ "referenced_type" : "type-12257", ++ "self_type" : "type-12256", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142502,8 +142544,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-12305", +- "self_type" : "type-12304", ++ "referenced_type" : "type-12374", ++ "self_type" : "type-12373", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142511,8 +142553,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-12422", +- "self_type" : "type-12421", ++ "referenced_type" : "type-12384", ++ "self_type" : "type-12383", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142520,8 +142562,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-12432", +- "self_type" : "type-12431", ++ "referenced_type" : "type-12465", ++ "self_type" : "type-12464", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142529,8 +142571,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-1245", +- "self_type" : "type-1244", ++ "referenced_type" : "type-12471", ++ "self_type" : "type-12470", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142538,8 +142580,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-12513", +- "self_type" : "type-12512", ++ "referenced_type" : "type-12497", ++ "self_type" : "type-12496", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142547,8 +142589,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-12519", +- "self_type" : "type-12518", ++ "referenced_type" : "type-12578", ++ "self_type" : "type-12577", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142556,8 +142598,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-12545", +- "self_type" : "type-12544", ++ "referenced_type" : "type-126", ++ "self_type" : "type-125", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142565,8 +142607,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-126", +- "self_type" : "type-125", ++ "referenced_type" : "type-12705", ++ "self_type" : "type-12704", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142574,8 +142616,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-12626", +- "self_type" : "type-12625", ++ "referenced_type" : "type-12713", ++ "self_type" : "type-12712", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142583,8 +142625,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-12753", +- "self_type" : "type-12752", ++ "referenced_type" : "type-12757", ++ "self_type" : "type-12756", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142592,8 +142634,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-12761", +- "self_type" : "type-12760", ++ "referenced_type" : "type-12815", ++ "self_type" : "type-12814", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142601,8 +142643,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-12805", +- "self_type" : "type-12804", ++ "referenced_type" : "type-12827", ++ "self_type" : "type-12826", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142610,8 +142652,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-12863", +- "self_type" : "type-12862", ++ "referenced_type" : "type-12887", ++ "self_type" : "type-12886", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142619,8 +142661,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-12875", +- "self_type" : "type-12874", ++ "referenced_type" : "type-12918", ++ "self_type" : "type-12917", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142628,8 +142670,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-1293", +- "self_type" : "type-1292", ++ "referenced_type" : "type-12968", ++ "self_type" : "type-12967", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142637,8 +142679,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-12935", +- "self_type" : "type-12934", ++ "referenced_type" : "type-13006", ++ "self_type" : "type-13005", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142646,8 +142688,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-12966", +- "self_type" : "type-12965", ++ "referenced_type" : "type-13037", ++ "self_type" : "type-13036", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142655,8 +142697,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-13016", +- "self_type" : "type-13015", ++ "referenced_type" : "type-13059", ++ "self_type" : "type-13058", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142664,8 +142706,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-13054", +- "self_type" : "type-13053", ++ "referenced_type" : "type-13285", ++ "self_type" : "type-13284", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142673,8 +142715,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-13085", +- "self_type" : "type-13084", ++ "referenced_type" : "type-13378", ++ "self_type" : "type-13377", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142682,8 +142724,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-13107", +- "self_type" : "type-13106", ++ "referenced_type" : "type-13456", ++ "self_type" : "type-13455", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142691,8 +142733,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-1315", +- "self_type" : "type-1314", ++ "referenced_type" : "type-13468", ++ "self_type" : "type-13467", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142700,8 +142742,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-13333", +- "self_type" : "type-13332", ++ "referenced_type" : "type-13525", ++ "self_type" : "type-13524", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142709,8 +142751,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-13426", +- "self_type" : "type-13425", ++ "referenced_type" : "type-136", ++ "self_type" : "type-135", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142718,8 +142760,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-13504", +- "self_type" : "type-13503", ++ "referenced_type" : "type-13617", ++ "self_type" : "type-13616", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142727,8 +142769,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-13516", +- "self_type" : "type-13515", ++ "referenced_type" : "type-1373", ++ "self_type" : "type-1372", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142736,8 +142778,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-13573", +- "self_type" : "type-13572", ++ "referenced_type" : "type-1375", ++ "self_type" : "type-1374", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142745,8 +142787,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-136", +- "self_type" : "type-135", ++ "referenced_type" : "type-13774", ++ "self_type" : "type-13773", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142754,8 +142796,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-13665", +- "self_type" : "type-13664", ++ "referenced_type" : "type-13827", ++ "self_type" : "type-13826", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142763,8 +142805,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-13822", +- "self_type" : "type-13821", ++ "referenced_type" : "type-13956", ++ "self_type" : "type-13955", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142772,8 +142814,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-13875", +- "self_type" : "type-13874", ++ "referenced_type" : "type-14042", ++ "self_type" : "type-14041", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142781,8 +142823,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-14004", +- "self_type" : "type-14003", ++ "referenced_type" : "type-1414", ++ "self_type" : "type-1413", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142790,8 +142832,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-14090", +- "self_type" : "type-14089", ++ "referenced_type" : "type-14140", ++ "self_type" : "type-14139", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142799,8 +142841,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-14188", +- "self_type" : "type-14187", ++ "referenced_type" : "type-14235", ++ "self_type" : "type-14234", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142808,8 +142850,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-14283", +- "self_type" : "type-14282", ++ "referenced_type" : "type-14285", ++ "self_type" : "type-14284", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142817,8 +142859,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-14333", +- "self_type" : "type-14332", ++ "referenced_type" : "type-14290", ++ "self_type" : "type-14289", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142826,8 +142868,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-14338", +- "self_type" : "type-14337", ++ "referenced_type" : "type-14308", ++ "self_type" : "type-14307", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142835,8 +142877,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-14356", +- "self_type" : "type-14355", ++ "referenced_type" : "type-1432", ++ "self_type" : "type-1431", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142844,8 +142886,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-14439", +- "self_type" : "type-14438", ++ "referenced_type" : "type-14391", ++ "self_type" : "type-14390", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142853,8 +142895,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-14453", +- "self_type" : "type-14452", ++ "referenced_type" : "type-14405", ++ "self_type" : "type-14404", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142862,8 +142904,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-14474", +- "self_type" : "type-14473", ++ "referenced_type" : "type-14426", ++ "self_type" : "type-14425", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142871,8 +142913,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-14483", +- "self_type" : "type-14482", ++ "referenced_type" : "type-14435", ++ "self_type" : "type-14434", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142880,8 +142922,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-145", +- "self_type" : "type-144", ++ "referenced_type" : "type-14466", ++ "self_type" : "type-14465", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142889,8 +142931,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-14514", +- "self_type" : "type-14513", ++ "referenced_type" : "type-145", ++ "self_type" : "type-144", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142898,8 +142940,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-1455", +- "self_type" : "type-1454", ++ "referenced_type" : "type-14581", ++ "self_type" : "type-14580", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142907,8 +142949,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-14629", +- "self_type" : "type-14628", ++ "referenced_type" : "type-14589", ++ "self_type" : "type-14588", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142916,8 +142958,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-14637", +- "self_type" : "type-14636", ++ "referenced_type" : "type-1474", ++ "self_type" : "type-1473", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142925,8 +142967,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-14810", +- "self_type" : "type-14809", ++ "referenced_type" : "type-14762", ++ "self_type" : "type-14761", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142934,8 +142976,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-14861", +- "self_type" : "type-14860", ++ "referenced_type" : "type-14813", ++ "self_type" : "type-14812", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142943,8 +142985,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-14885", +- "self_type" : "type-14884", ++ "referenced_type" : "type-14837", ++ "self_type" : "type-14836", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142952,8 +142994,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15009", +- "self_type" : "type-15008", ++ "referenced_type" : "type-1487", ++ "self_type" : "type-1486", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142961,8 +143003,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-1501", +- "self_type" : "type-1500", ++ "referenced_type" : "type-14961", ++ "self_type" : "type-14960", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142970,8 +143012,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-1515", +- "self_type" : "type-1514", ++ "referenced_type" : "type-1499", ++ "self_type" : "type-1498", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142979,8 +143021,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15263", +- "self_type" : "type-15262", ++ "referenced_type" : "type-15215", ++ "self_type" : "type-15214", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -142997,8 +143039,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-1530", +- "self_type" : "type-1529", ++ "referenced_type" : "type-15342", ++ "self_type" : "type-15341", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143006,8 +143048,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15390", +- "self_type" : "type-15389", ++ "referenced_type" : "type-15358", ++ "self_type" : "type-15357", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143015,8 +143057,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15406", +- "self_type" : "type-15405", ++ "referenced_type" : "type-15368", ++ "self_type" : "type-15367", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143024,8 +143066,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15416", +- "self_type" : "type-15415", ++ "referenced_type" : "type-1537", ++ "self_type" : "type-1536", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143033,8 +143075,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15430", +- "self_type" : "type-15429", ++ "referenced_type" : "type-15382", ++ "self_type" : "type-15381", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143042,8 +143084,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15443", +- "self_type" : "type-15442", ++ "referenced_type" : "type-15395", ++ "self_type" : "type-15394", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143051,8 +143093,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15455", +- "self_type" : "type-15454", ++ "referenced_type" : "type-15407", ++ "self_type" : "type-15406", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143060,8 +143102,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15483", +- "self_type" : "type-15482", ++ "referenced_type" : "type-15435", ++ "self_type" : "type-15434", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143069,8 +143111,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15491", +- "self_type" : "type-15490", ++ "referenced_type" : "type-15443", ++ "self_type" : "type-15442", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143078,8 +143120,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-1552", +- "self_type" : "type-1551", ++ "referenced_type" : "type-1546", ++ "self_type" : "type-1545", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143087,8 +143129,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15524", +- "self_type" : "type-15523", ++ "referenced_type" : "type-15476", ++ "self_type" : "type-15475", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143096,8 +143138,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15553", +- "self_type" : "type-15552", ++ "referenced_type" : "type-15505", ++ "self_type" : "type-15504", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143105,8 +143147,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-1565", +- "self_type" : "type-1564", ++ "referenced_type" : "type-15641", ++ "self_type" : "type-15640", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143114,8 +143156,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15689", +- "self_type" : "type-15688", ++ "referenced_type" : "type-1580", ++ "self_type" : "type-1579", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143123,8 +143165,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-1580", +- "self_type" : "type-1579", ++ "referenced_type" : "type-15806", ++ "self_type" : "type-15805", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143132,8 +143174,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15854", +- "self_type" : "type-15853", ++ "referenced_type" : "type-15810", ++ "self_type" : "type-15809", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143141,8 +143183,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15858", +- "self_type" : "type-15857", ++ "referenced_type" : "type-15853", ++ "self_type" : "type-15852", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143150,8 +143192,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15901", +- "self_type" : "type-15900", ++ "referenced_type" : "type-15926", ++ "self_type" : "type-15925", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143159,8 +143201,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-15974", +- "self_type" : "type-15973", ++ "referenced_type" : "type-15970", ++ "self_type" : "type-15969", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143168,8 +143210,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16018", +- "self_type" : "type-16017", ++ "referenced_type" : "type-16000", ++ "self_type" : "type-15999", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143177,8 +143219,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16048", +- "self_type" : "type-16047", ++ "referenced_type" : "type-16110", ++ "self_type" : "type-16109", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143186,8 +143228,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16158", +- "self_type" : "type-16157", ++ "referenced_type" : "type-16112", ++ "self_type" : "type-16111", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143195,8 +143237,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16160", +- "self_type" : "type-16159", ++ "referenced_type" : "type-16231", ++ "self_type" : "type-16230", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143204,8 +143246,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16279", +- "self_type" : "type-16278", ++ "referenced_type" : "type-16241", ++ "self_type" : "type-16240", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143213,8 +143255,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16289", +- "self_type" : "type-16288", ++ "referenced_type" : "type-16322", ++ "self_type" : "type-16321", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143222,8 +143264,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-1630", +- "self_type" : "type-1629", ++ "referenced_type" : "type-16328", ++ "self_type" : "type-16327", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143231,8 +143273,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16370", +- "self_type" : "type-16369", ++ "referenced_type" : "type-16354", ++ "self_type" : "type-16353", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143240,8 +143282,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16376", +- "self_type" : "type-16375", ++ "referenced_type" : "type-16435", ++ "self_type" : "type-16434", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143249,8 +143291,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16402", +- "self_type" : "type-16401", ++ "referenced_type" : "type-16561", ++ "self_type" : "type-16560", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143258,8 +143300,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16483", +- "self_type" : "type-16482", ++ "referenced_type" : "type-16569", ++ "self_type" : "type-16568", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143276,8 +143318,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16609", +- "self_type" : "type-16608", ++ "referenced_type" : "type-16613", ++ "self_type" : "type-16612", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143285,8 +143327,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16617", +- "self_type" : "type-16616", ++ "referenced_type" : "type-16671", ++ "self_type" : "type-16670", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143294,8 +143336,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16661", +- "self_type" : "type-16660", ++ "referenced_type" : "type-16683", ++ "self_type" : "type-16682", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143303,8 +143345,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-1667", +- "self_type" : "type-1666", ++ "referenced_type" : "type-16743", ++ "self_type" : "type-16742", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143312,8 +143354,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16719", +- "self_type" : "type-16718", ++ "referenced_type" : "type-16774", ++ "self_type" : "type-16773", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143321,8 +143363,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16731", +- "self_type" : "type-16730", ++ "referenced_type" : "type-16824", ++ "self_type" : "type-16823", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143330,8 +143372,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16791", +- "self_type" : "type-16790", ++ "referenced_type" : "type-16862", ++ "self_type" : "type-16861", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143339,8 +143381,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16822", +- "self_type" : "type-16821", ++ "referenced_type" : "type-16893", ++ "self_type" : "type-16892", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143348,8 +143390,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16872", +- "self_type" : "type-16871", ++ "referenced_type" : "type-16915", ++ "self_type" : "type-16914", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143357,8 +143399,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16910", +- "self_type" : "type-16909", ++ "referenced_type" : "type-17141", ++ "self_type" : "type-17140", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143366,8 +143408,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16941", +- "self_type" : "type-16940", ++ "referenced_type" : "type-17234", ++ "self_type" : "type-17233", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143375,8 +143417,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-16963", +- "self_type" : "type-16962", ++ "referenced_type" : "type-17312", ++ "self_type" : "type-17311", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143384,8 +143426,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17189", +- "self_type" : "type-17188", ++ "referenced_type" : "type-17324", ++ "self_type" : "type-17323", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143393,8 +143435,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17282", +- "self_type" : "type-17281", ++ "referenced_type" : "type-17389", ++ "self_type" : "type-17388", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143402,8 +143444,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17360", +- "self_type" : "type-17359", ++ "referenced_type" : "type-17481", ++ "self_type" : "type-17480", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143411,8 +143453,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17372", +- "self_type" : "type-17371", ++ "referenced_type" : "type-17638", ++ "self_type" : "type-17637", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143420,8 +143462,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17437", +- "self_type" : "type-17436", ++ "referenced_type" : "type-1764", ++ "self_type" : "type-1763", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143429,8 +143471,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17529", +- "self_type" : "type-17528", ++ "referenced_type" : "type-17691", ++ "self_type" : "type-17690", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143438,8 +143480,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17686", +- "self_type" : "type-17685", ++ "referenced_type" : "type-177", ++ "self_type" : "type-176", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143447,8 +143489,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-177", +- "self_type" : "type-176", ++ "referenced_type" : "type-17820", ++ "self_type" : "type-17819", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143456,8 +143498,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17739", +- "self_type" : "type-17738", ++ "referenced_type" : "type-17906", ++ "self_type" : "type-17905", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143465,8 +143507,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17868", +- "self_type" : "type-17867", ++ "referenced_type" : "type-18004", ++ "self_type" : "type-18003", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143474,8 +143516,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-17954", +- "self_type" : "type-17953", ++ "referenced_type" : "type-18099", ++ "self_type" : "type-18098", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143483,8 +143525,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-1798", +- "self_type" : "type-1797", ++ "referenced_type" : "type-18149", ++ "self_type" : "type-18148", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143492,8 +143534,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18052", +- "self_type" : "type-18051", ++ "referenced_type" : "type-18154", ++ "self_type" : "type-18153", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143501,8 +143543,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18147", +- "self_type" : "type-18146", ++ "referenced_type" : "type-18172", ++ "self_type" : "type-18171", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143510,8 +143552,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18197", +- "self_type" : "type-18196", ++ "referenced_type" : "type-18255", ++ "self_type" : "type-18254", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143519,8 +143561,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18202", +- "self_type" : "type-18201", ++ "referenced_type" : "type-18269", ++ "self_type" : "type-18268", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143528,8 +143570,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18220", +- "self_type" : "type-18219", ++ "referenced_type" : "type-18290", ++ "self_type" : "type-18289", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143537,8 +143579,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18303", +- "self_type" : "type-18302", ++ "referenced_type" : "type-18299", ++ "self_type" : "type-18298", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143546,8 +143588,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18317", +- "self_type" : "type-18316", ++ "referenced_type" : "type-18330", ++ "self_type" : "type-18329", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143555,8 +143597,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18338", +- "self_type" : "type-18337", ++ "referenced_type" : "type-18445", ++ "self_type" : "type-18444", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143564,8 +143606,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18347", +- "self_type" : "type-18346", ++ "referenced_type" : "type-18453", ++ "self_type" : "type-18452", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143573,8 +143615,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18378", +- "self_type" : "type-18377", ++ "referenced_type" : "type-18626", ++ "self_type" : "type-18625", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143582,8 +143624,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18493", +- "self_type" : "type-18492", ++ "referenced_type" : "type-18670", ++ "self_type" : "type-18669", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143591,8 +143633,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-1850", +- "self_type" : "type-1849", ++ "referenced_type" : "type-18694", ++ "self_type" : "type-18693", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143600,8 +143642,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18501", +- "self_type" : "type-18500", ++ "referenced_type" : "type-18780", ++ "self_type" : "type-18779", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143609,8 +143651,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18674", +- "self_type" : "type-18673", ++ "referenced_type" : "type-18991", ++ "self_type" : "type-18990", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143618,8 +143660,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18718", +- "self_type" : "type-18717", ++ "referenced_type" : "type-190", ++ "self_type" : "type-189", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143627,8 +143669,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18742", +- "self_type" : "type-18741", ++ "referenced_type" : "type-19101", ++ "self_type" : "type-19100", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143636,8 +143678,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-18828", +- "self_type" : "type-18827", ++ "referenced_type" : "type-19114", ++ "self_type" : "type-19113", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143645,8 +143687,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-190", +- "self_type" : "type-189", ++ "referenced_type" : "type-19123", ++ "self_type" : "type-19122", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143654,8 +143696,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19039", +- "self_type" : "type-19038", ++ "referenced_type" : "type-19211", ++ "self_type" : "type-19210", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143663,8 +143705,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19149", +- "self_type" : "type-19148", ++ "referenced_type" : "type-19216", ++ "self_type" : "type-19215", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143672,8 +143714,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19162", +- "self_type" : "type-19161", ++ "referenced_type" : "type-19303", ++ "self_type" : "type-19302", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143681,8 +143723,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19171", +- "self_type" : "type-19170", ++ "referenced_type" : "type-19308", ++ "self_type" : "type-19307", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143690,8 +143732,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19259", +- "self_type" : "type-19258", ++ "referenced_type" : "type-19349", ++ "self_type" : "type-19348", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143699,8 +143741,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19264", +- "self_type" : "type-19263", ++ "referenced_type" : "type-19426", ++ "self_type" : "type-19425", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143708,8 +143750,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19351", +- "self_type" : "type-19350", ++ "referenced_type" : "type-19603", ++ "self_type" : "type-19602", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143717,8 +143759,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19356", +- "self_type" : "type-19355", ++ "referenced_type" : "type-19657", ++ "self_type" : "type-19656", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143726,8 +143768,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19397", +- "self_type" : "type-19396", ++ "referenced_type" : "type-19799", ++ "self_type" : "type-19798", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143735,8 +143777,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19474", +- "self_type" : "type-19473", ++ "referenced_type" : "type-19816", ++ "self_type" : "type-19815", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143744,8 +143786,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19651", +- "self_type" : "type-19650", ++ "referenced_type" : "type-19847", ++ "self_type" : "type-19846", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143753,8 +143795,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19705", +- "self_type" : "type-19704", ++ "referenced_type" : "type-1989", ++ "self_type" : "type-1988", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143762,8 +143804,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19847", +- "self_type" : "type-19846", ++ "referenced_type" : "type-19901", ++ "self_type" : "type-19900", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143771,8 +143813,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19864", +- "self_type" : "type-19863", ++ "referenced_type" : "type-20005", ++ "self_type" : "type-20004", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143780,8 +143822,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19895", +- "self_type" : "type-19894", ++ "referenced_type" : "type-20038", ++ "self_type" : "type-20037", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143789,8 +143831,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-19949", +- "self_type" : "type-19948", ++ "referenced_type" : "type-20174", ++ "self_type" : "type-20173", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143798,8 +143840,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20053", +- "self_type" : "type-20052", ++ "referenced_type" : "type-20340", ++ "self_type" : "type-20339", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143807,8 +143849,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20086", +- "self_type" : "type-20085", ++ "referenced_type" : "type-20344", ++ "self_type" : "type-20343", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143816,8 +143858,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20222", +- "self_type" : "type-20221", ++ "referenced_type" : "type-20387", ++ "self_type" : "type-20386", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143825,8 +143867,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20388", +- "self_type" : "type-20387", ++ "referenced_type" : "type-20458", ++ "self_type" : "type-20457", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143834,8 +143876,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20392", +- "self_type" : "type-20391", ++ "referenced_type" : "type-205", ++ "self_type" : "type-204", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143843,8 +143885,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20435", +- "self_type" : "type-20434", ++ "referenced_type" : "type-20502", ++ "self_type" : "type-20501", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143852,8 +143894,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-205", +- "self_type" : "type-204", ++ "referenced_type" : "type-20532", ++ "self_type" : "type-20531", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143861,8 +143903,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20506", +- "self_type" : "type-20505", ++ "referenced_type" : "type-20641", ++ "self_type" : "type-20640", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143870,8 +143912,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20550", +- "self_type" : "type-20549", ++ "referenced_type" : "type-20643", ++ "self_type" : "type-20642", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143879,8 +143921,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20580", +- "self_type" : "type-20579", ++ "referenced_type" : "type-20762", ++ "self_type" : "type-20761", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143888,8 +143930,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20689", +- "self_type" : "type-20688", ++ "referenced_type" : "type-20772", ++ "self_type" : "type-20771", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143897,8 +143939,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20691", +- "self_type" : "type-20690", ++ "referenced_type" : "type-20853", ++ "self_type" : "type-20852", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143906,8 +143948,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20810", +- "self_type" : "type-20809", ++ "referenced_type" : "type-20859", ++ "self_type" : "type-20858", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143915,8 +143957,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20820", +- "self_type" : "type-20819", ++ "referenced_type" : "type-20885", ++ "self_type" : "type-20884", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143924,8 +143966,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20901", +- "self_type" : "type-20900", ++ "referenced_type" : "type-20966", ++ "self_type" : "type-20965", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143933,8 +143975,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20907", +- "self_type" : "type-20906", ++ "referenced_type" : "type-21093", ++ "self_type" : "type-21092", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143942,8 +143984,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-20933", +- "self_type" : "type-20932", ++ "referenced_type" : "type-21101", ++ "self_type" : "type-21100", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143951,8 +143993,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21014", +- "self_type" : "type-21013", ++ "referenced_type" : "type-21145", ++ "self_type" : "type-21144", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143960,8 +144002,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21141", +- "self_type" : "type-21140", ++ "referenced_type" : "type-21203", ++ "self_type" : "type-21202", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143969,8 +144011,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21149", +- "self_type" : "type-21148", ++ "referenced_type" : "type-21215", ++ "self_type" : "type-21214", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143978,8 +144020,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21193", +- "self_type" : "type-21192", ++ "referenced_type" : "type-21275", ++ "self_type" : "type-21274", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143987,8 +144029,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21251", +- "self_type" : "type-21250", ++ "referenced_type" : "type-21306", ++ "self_type" : "type-21305", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -143996,8 +144038,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21263", +- "self_type" : "type-21262", ++ "referenced_type" : "type-21356", ++ "self_type" : "type-21355", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144005,8 +144047,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-2132", +- "self_type" : "type-2131", ++ "referenced_type" : "type-21394", ++ "self_type" : "type-21393", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144014,8 +144056,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21323", +- "self_type" : "type-21322", ++ "referenced_type" : "type-21425", ++ "self_type" : "type-21424", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144023,8 +144065,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21354", +- "self_type" : "type-21353", ++ "referenced_type" : "type-21447", ++ "self_type" : "type-21446", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144032,8 +144074,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21404", +- "self_type" : "type-21403", ++ "referenced_type" : "type-21673", ++ "self_type" : "type-21672", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144041,8 +144083,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21442", +- "self_type" : "type-21441", ++ "referenced_type" : "type-21766", ++ "self_type" : "type-21765", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144050,8 +144092,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21473", +- "self_type" : "type-21472", ++ "referenced_type" : "type-21844", ++ "self_type" : "type-21843", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144059,8 +144101,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21495", +- "self_type" : "type-21494", ++ "referenced_type" : "type-21856", ++ "self_type" : "type-21855", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144068,8 +144110,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21721", +- "self_type" : "type-21720", ++ "referenced_type" : "type-21886", ++ "self_type" : "type-21885", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144077,8 +144119,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21814", +- "self_type" : "type-21813", ++ "referenced_type" : "type-21899", ++ "self_type" : "type-21898", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144086,8 +144128,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21892", +- "self_type" : "type-21891", ++ "referenced_type" : "type-21956", ++ "self_type" : "type-21955", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144095,8 +144137,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21904", +- "self_type" : "type-21903", ++ "referenced_type" : "type-22050", ++ "self_type" : "type-22049", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144104,8 +144146,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-21966", +- "self_type" : "type-21965", ++ "referenced_type" : "type-22063", ++ "self_type" : "type-22062", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144113,8 +144155,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-22058", +- "self_type" : "type-22057", ++ "referenced_type" : "type-22201", ++ "self_type" : "type-22200", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144122,8 +144164,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-22215", +- "self_type" : "type-22214", ++ "referenced_type" : "type-22243", ++ "self_type" : "type-22242", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144131,8 +144173,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-22268", +- "self_type" : "type-22267", ++ "referenced_type" : "type-22357", ++ "self_type" : "type-22356", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144140,8 +144182,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-22397", +- "self_type" : "type-22396", ++ "referenced_type" : "type-2236", ++ "self_type" : "type-2235", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144149,8 +144191,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-22483", +- "self_type" : "type-22482", ++ "referenced_type" : "type-22416", ++ "self_type" : "type-22415", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144158,8 +144200,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-22581", +- "self_type" : "type-22580", ++ "referenced_type" : "type-22497", ++ "self_type" : "type-22496", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144167,8 +144209,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-22676", +- "self_type" : "type-22675", ++ "referenced_type" : "type-22514", ++ "self_type" : "type-22513", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144176,8 +144218,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-22726", +- "self_type" : "type-22725", ++ "referenced_type" : "type-22592", ++ "self_type" : "type-22591", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144185,8 +144227,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-22731", +- "self_type" : "type-22730", ++ "referenced_type" : "type-22615", ++ "self_type" : "type-22614", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144194,8 +144236,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-22749", +- "self_type" : "type-22748", ++ "referenced_type" : "type-2264", ++ "self_type" : "type-2263", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144203,8 +144245,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-22832", +- "self_type" : "type-22831", ++ "referenced_type" : "type-22655", ++ "self_type" : "type-22654", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144212,8 +144254,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-22846", +- "self_type" : "type-22845", ++ "referenced_type" : "type-22783", ++ "self_type" : "type-22782", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144221,8 +144263,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-22867", +- "self_type" : "type-22866", ++ "referenced_type" : "type-22800", ++ "self_type" : "type-22799", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144230,8 +144272,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-22876", +- "self_type" : "type-22875", ++ "referenced_type" : "type-22822", ++ "self_type" : "type-22821", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144239,8 +144281,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-22907", +- "self_type" : "type-22906", ++ "referenced_type" : "type-22834", ++ "self_type" : "type-22833", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144248,8 +144290,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-23022", +- "self_type" : "type-23021", ++ "referenced_type" : "type-22871", ++ "self_type" : "type-22870", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144257,8 +144299,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-23030", +- "self_type" : "type-23029", ++ "referenced_type" : "type-22994", ++ "self_type" : "type-22993", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144266,8 +144308,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-2320", +- "self_type" : "type-2319", ++ "referenced_type" : "type-23190", ++ "self_type" : "type-23189", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144275,8 +144317,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-23203", +- "self_type" : "type-23202", ++ "referenced_type" : "type-23262", ++ "self_type" : "type-23261", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144284,8 +144326,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-23247", +- "self_type" : "type-23246", ++ "referenced_type" : "type-23347", ++ "self_type" : "type-23346", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144293,8 +144335,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-23271", +- "self_type" : "type-23270", ++ "referenced_type" : "type-2339", ++ "self_type" : "type-2338", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144302,8 +144344,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-23357", +- "self_type" : "type-23356", ++ "referenced_type" : "type-23477", ++ "self_type" : "type-23476", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144311,8 +144353,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-2337", +- "self_type" : "type-2336", ++ "referenced_type" : "type-23549", ++ "self_type" : "type-23548", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144320,8 +144362,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-23568", +- "self_type" : "type-23567", ++ "referenced_type" : "type-23663", ++ "self_type" : "type-23662", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144329,8 +144371,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-23678", +- "self_type" : "type-23677", ++ "referenced_type" : "type-23676", ++ "self_type" : "type-23675", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144338,8 +144380,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-23691", +- "self_type" : "type-23690", ++ "referenced_type" : "type-23688", ++ "self_type" : "type-23687", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144347,8 +144389,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-23700", +- "self_type" : "type-23699", ++ "referenced_type" : "type-23766", ++ "self_type" : "type-23765", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144356,8 +144398,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-23780", +- "self_type" : "type-23779", ++ "referenced_type" : "type-23854", ++ "self_type" : "type-23853", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144365,8 +144407,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-23785", +- "self_type" : "type-23784", ++ "referenced_type" : "type-23863", ++ "self_type" : "type-23862", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144374,8 +144416,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-23861", +- "self_type" : "type-23860", ++ "referenced_type" : "type-23872", ++ "self_type" : "type-23871", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144383,8 +144425,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-23866", +- "self_type" : "type-23865", ++ "referenced_type" : "type-23899", ++ "self_type" : "type-23898", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144392,8 +144434,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-23897", +- "self_type" : "type-23896", ++ "referenced_type" : "type-24025", ++ "self_type" : "type-24024", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144401,8 +144443,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-23974", +- "self_type" : "type-23973", ++ "referenced_type" : "type-24174", ++ "self_type" : "type-24173", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144410,8 +144452,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-24121", +- "self_type" : "type-24120", ++ "referenced_type" : "type-24233", ++ "self_type" : "type-24232", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144419,8 +144461,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-2413", +- "self_type" : "type-2412", ++ "referenced_type" : "type-24313", ++ "self_type" : "type-24312", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144428,8 +144470,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-24172", +- "self_type" : "type-24171", ++ "referenced_type" : "type-24394", ++ "self_type" : "type-24393", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144437,8 +144479,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-24314", +- "self_type" : "type-24313", ++ "referenced_type" : "type-2440", ++ "self_type" : "type-2439", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144446,17 +144488,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-24331", +- "self_type" : "type-24330", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", +- "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-24360", +- "self_type" : "type-24359", ++ "referenced_type" : "type-246", ++ "self_type" : "type-245", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144464,8 +144497,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-24412", +- "self_type" : "type-24411", ++ "referenced_type" : "type-24606", ++ "self_type" : "type-24605", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144473,8 +144506,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-246", +- "self_type" : "type-245", ++ "referenced_type" : "type-24619", ++ "self_type" : "type-24618", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144482,8 +144515,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-24651", +- "self_type" : "type-24650", ++ "referenced_type" : "type-24628", ++ "self_type" : "type-24627", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144491,8 +144524,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-24656", +- "self_type" : "type-24655", ++ "referenced_type" : "type-24757", ++ "self_type" : "type-24756", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144500,8 +144533,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-24665", +- "self_type" : "type-24664", ++ "referenced_type" : "type-2484", ++ "self_type" : "type-2483", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144509,8 +144542,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-24894", +- "self_type" : "type-24893", ++ "referenced_type" : "type-24861", ++ "self_type" : "type-24860", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144518,8 +144551,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-25047", +- "self_type" : "type-25046", ++ "referenced_type" : "type-24952", ++ "self_type" : "type-24951", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144527,8 +144560,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-2510", +- "self_type" : "type-2509", ++ "referenced_type" : "type-25017", ++ "self_type" : "type-25016", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144536,8 +144569,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-25103", +- "self_type" : "type-25102", ++ "referenced_type" : "type-25075", ++ "self_type" : "type-25074", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144545,8 +144578,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-25180", +- "self_type" : "type-25179", ++ "referenced_type" : "type-2514", ++ "self_type" : "type-2513", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144554,8 +144587,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-25261", +- "self_type" : "type-25260", ++ "referenced_type" : "type-25162", ++ "self_type" : "type-25161", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144563,8 +144596,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-25398", +- "self_type" : "type-25397", ++ "referenced_type" : "type-25210", ++ "self_type" : "type-25209", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144572,8 +144605,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-25564", +- "self_type" : "type-25563", ++ "referenced_type" : "type-2524", ++ "self_type" : "type-2523", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144581,8 +144614,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-25568", +- "self_type" : "type-25567", ++ "referenced_type" : "type-2529", ++ "self_type" : "type-2528", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144590,8 +144623,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-25611", +- "self_type" : "type-25610", ++ "referenced_type" : "type-25297", ++ "self_type" : "type-25296", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144599,8 +144632,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-25685", +- "self_type" : "type-25684", ++ "referenced_type" : "type-25323", ++ "self_type" : "type-25322", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144608,8 +144641,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-25729", +- "self_type" : "type-25728", ++ "referenced_type" : "type-25331", ++ "self_type" : "type-25330", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144617,8 +144650,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-25759", +- "self_type" : "type-25758", ++ "referenced_type" : "type-2538", ++ "self_type" : "type-2537", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144626,8 +144659,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-2583", +- "self_type" : "type-2582", ++ "referenced_type" : "type-2548", ++ "self_type" : "type-2547", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144635,8 +144668,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-25868", +- "self_type" : "type-25867", ++ "referenced_type" : "type-25502", ++ "self_type" : "type-25501", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144644,8 +144677,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-25870", +- "self_type" : "type-25869", ++ "referenced_type" : "type-25618", ++ "self_type" : "type-25617", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144653,8 +144686,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-2589", +- "self_type" : "type-2588", ++ "referenced_type" : "type-25622", ++ "self_type" : "type-25621", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144662,8 +144695,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-2594", +- "self_type" : "type-2593", ++ "referenced_type" : "type-2566", ++ "self_type" : "type-2565", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144671,8 +144704,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-25988", +- "self_type" : "type-25987", ++ "referenced_type" : "type-25665", ++ "self_type" : "type-25664", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144680,8 +144713,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-25998", +- "self_type" : "type-25997", ++ "referenced_type" : "type-25736", ++ "self_type" : "type-25735", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144689,8 +144722,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-2601", +- "self_type" : "type-2600", ++ "referenced_type" : "type-25809", ++ "self_type" : "type-25808", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144698,8 +144731,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-26079", +- "self_type" : "type-26078", ++ "referenced_type" : "type-2583", ++ "self_type" : "type-2582", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144707,8 +144740,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-26085", +- "self_type" : "type-26084", ++ "referenced_type" : "type-25853", ++ "self_type" : "type-25852", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144716,8 +144749,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-26111", +- "self_type" : "type-26110", ++ "referenced_type" : "type-25919", ++ "self_type" : "type-25918", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144725,8 +144758,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-2614", +- "self_type" : "type-2613", ++ "referenced_type" : "type-25921", ++ "self_type" : "type-25920", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144734,8 +144767,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-2616", +- "self_type" : "type-2615", ++ "referenced_type" : "type-26041", ++ "self_type" : "type-26040", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144743,8 +144776,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-26192", +- "self_type" : "type-26191", ++ "referenced_type" : "type-26048", ++ "self_type" : "type-26047", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144752,8 +144785,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-2624", +- "self_type" : "type-2623", ++ "referenced_type" : "type-26132", ++ "self_type" : "type-26131", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144761,8 +144794,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-2631", +- "self_type" : "type-2630", ++ "referenced_type" : "type-2616", ++ "self_type" : "type-2615", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144770,8 +144803,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-26319", +- "self_type" : "type-26318", ++ "referenced_type" : "type-26206", ++ "self_type" : "type-26205", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144779,8 +144812,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-26327", +- "self_type" : "type-26326", ++ "referenced_type" : "type-26236", ++ "self_type" : "type-26235", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144788,8 +144821,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-26371", +- "self_type" : "type-26370", ++ "referenced_type" : "type-26254", ++ "self_type" : "type-26253", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144797,8 +144830,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-2642", +- "self_type" : "type-2641", ++ "referenced_type" : "type-2633", ++ "self_type" : "type-2632", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144806,8 +144839,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-26429", +- "self_type" : "type-26428", ++ "referenced_type" : "type-26334", ++ "self_type" : "type-26333", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144815,8 +144848,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-26441", +- "self_type" : "type-26440", ++ "referenced_type" : "type-26367", ++ "self_type" : "type-26366", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144824,8 +144857,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-2650", +- "self_type" : "type-2649", ++ "referenced_type" : "type-2638", ++ "self_type" : "type-2637", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144833,8 +144866,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-26501", +- "self_type" : "type-26500", ++ "referenced_type" : "type-26380", ++ "self_type" : "type-26379", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144842,8 +144875,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-26532", +- "self_type" : "type-26531", ++ "referenced_type" : "type-26413", ++ "self_type" : "type-26412", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144851,8 +144884,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-26582", +- "self_type" : "type-26581", ++ "referenced_type" : "type-26436", ++ "self_type" : "type-26435", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144860,8 +144893,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-266", +- "self_type" : "type-265", ++ "referenced_type" : "type-26484", ++ "self_type" : "type-26483", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144869,8 +144902,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-2660", +- "self_type" : "type-2659", ++ "referenced_type" : "type-26500", ++ "self_type" : "type-26499", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144878,8 +144911,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-26620", +- "self_type" : "type-26619", ++ "referenced_type" : "type-26535", ++ "self_type" : "type-26534", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144887,8 +144920,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-26651", +- "self_type" : "type-26650", ++ "referenced_type" : "type-26557", ++ "self_type" : "type-26556", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144896,8 +144929,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-26673", +- "self_type" : "type-26672", ++ "referenced_type" : "type-266", ++ "self_type" : "type-265", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144905,8 +144938,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-2670", +- "self_type" : "type-2669", ++ "referenced_type" : "type-26610", ++ "self_type" : "type-26609", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144914,8 +144947,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-2674", +- "self_type" : "type-2673", ++ "referenced_type" : "type-26616", ++ "self_type" : "type-26615", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144923,8 +144956,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-26899", +- "self_type" : "type-26898", ++ "referenced_type" : "type-26636", ++ "self_type" : "type-26635", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144932,8 +144965,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-2690", +- "self_type" : "type-2689", ++ "referenced_type" : "type-26694", ++ "self_type" : "type-26693", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144941,8 +144974,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-26992", +- "self_type" : "type-26991", ++ "referenced_type" : "type-2670", ++ "self_type" : "type-2669", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144950,8 +144983,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-2704", +- "self_type" : "type-2703", ++ "referenced_type" : "type-26824", ++ "self_type" : "type-26823", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144959,8 +144992,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-27070", +- "self_type" : "type-27069", ++ "referenced_type" : "type-26921", ++ "self_type" : "type-26920", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144968,8 +145001,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-27082", +- "self_type" : "type-27081", ++ "referenced_type" : "type-26991", ++ "self_type" : "type-26990", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144977,8 +145010,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-27151", +- "self_type" : "type-27150", ++ "referenced_type" : "type-27017", ++ "self_type" : "type-27016", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144986,8 +145019,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-2718", +- "self_type" : "type-2717", ++ "referenced_type" : "type-27150", ++ "self_type" : "type-27149", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -144995,8 +145028,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-27243", +- "self_type" : "type-27242", ++ "referenced_type" : "type-27242", ++ "self_type" : "type-27241", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145004,8 +145037,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-27400", +- "self_type" : "type-27399", ++ "referenced_type" : "type-27399", ++ "self_type" : "type-27398", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145013,8 +145046,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-27453", +- "self_type" : "type-27452", ++ "referenced_type" : "type-27452", ++ "self_type" : "type-27451", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145022,8 +145055,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-27582", +- "self_type" : "type-27581", ++ "referenced_type" : "type-27581", ++ "self_type" : "type-27580", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145031,8 +145064,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-27668", +- "self_type" : "type-27667", ++ "referenced_type" : "type-27667", ++ "self_type" : "type-27666", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145040,8 +145073,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-27766", +- "self_type" : "type-27765", ++ "referenced_type" : "type-27765", ++ "self_type" : "type-27764", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145049,8 +145082,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-27861", +- "self_type" : "type-27860", ++ "referenced_type" : "type-27860", ++ "self_type" : "type-27859", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145058,8 +145091,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-27911", +- "self_type" : "type-27910", ++ "referenced_type" : "type-27910", ++ "self_type" : "type-27909", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145067,8 +145100,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-27916", +- "self_type" : "type-27915", ++ "referenced_type" : "type-27915", ++ "self_type" : "type-27914", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145076,8 +145109,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-27934", +- "self_type" : "type-27933", ++ "referenced_type" : "type-27933", ++ "self_type" : "type-27932", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145085,8 +145118,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-28017", +- "self_type" : "type-28016", ++ "referenced_type" : "type-28016", ++ "self_type" : "type-28015", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145094,8 +145127,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-28031", +- "self_type" : "type-28030", ++ "referenced_type" : "type-28030", ++ "self_type" : "type-28029", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145103,8 +145136,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-28052", +- "self_type" : "type-28051", ++ "referenced_type" : "type-28051", ++ "self_type" : "type-28050", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145112,8 +145145,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-28061", +- "self_type" : "type-28060", ++ "referenced_type" : "type-28060", ++ "self_type" : "type-28059", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145121,8 +145154,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-28092", +- "self_type" : "type-28091", ++ "referenced_type" : "type-28091", ++ "self_type" : "type-28090", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145130,8 +145163,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-28207", +- "self_type" : "type-28206", ++ "referenced_type" : "type-28206", ++ "self_type" : "type-28205", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145139,8 +145172,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-28215", +- "self_type" : "type-28214", ++ "referenced_type" : "type-28214", ++ "self_type" : "type-28213", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145148,8 +145181,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-28388", +- "self_type" : "type-28387", ++ "referenced_type" : "type-2835", ++ "self_type" : "type-2834", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145157,8 +145190,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-28432", +- "self_type" : "type-28431", ++ "referenced_type" : "type-2837", ++ "self_type" : "type-2836", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145166,8 +145199,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-28456", +- "self_type" : "type-28455", ++ "referenced_type" : "type-28387", ++ "self_type" : "type-28386", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145175,8 +145208,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-28542", +- "self_type" : "type-28541", ++ "referenced_type" : "type-28431", ++ "self_type" : "type-28430", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145184,8 +145217,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-28753", +- "self_type" : "type-28752", ++ "referenced_type" : "type-28455", ++ "self_type" : "type-28454", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145193,8 +145226,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-2883", +- "self_type" : "type-2882", ++ "referenced_type" : "type-28541", ++ "self_type" : "type-28540", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145202,8 +145235,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-2885", +- "self_type" : "type-2884", ++ "referenced_type" : "type-28752", ++ "self_type" : "type-28751", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145211,8 +145244,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-28863", +- "self_type" : "type-28862", ++ "referenced_type" : "type-2876", ++ "self_type" : "type-2875", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145220,8 +145253,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-28876", +- "self_type" : "type-28875", ++ "referenced_type" : "type-28862", ++ "self_type" : "type-28861", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145229,8 +145262,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-28885", +- "self_type" : "type-28884", ++ "referenced_type" : "type-28875", ++ "self_type" : "type-28874", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145238,8 +145271,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-28965", +- "self_type" : "type-28964", ++ "referenced_type" : "type-28884", ++ "self_type" : "type-28883", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145247,8 +145280,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-28970", +- "self_type" : "type-28969", ++ "referenced_type" : "type-2894", ++ "self_type" : "type-2893", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145256,8 +145289,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-29046", +- "self_type" : "type-29045", ++ "referenced_type" : "type-28964", ++ "self_type" : "type-28963", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145265,8 +145298,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-29051", +- "self_type" : "type-29050", ++ "referenced_type" : "type-28969", ++ "self_type" : "type-28968", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145274,8 +145307,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-29082", +- "self_type" : "type-29081", ++ "referenced_type" : "type-29045", ++ "self_type" : "type-29044", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145283,8 +145316,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-29159", +- "self_type" : "type-29158", ++ "referenced_type" : "type-29050", ++ "self_type" : "type-29049", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145292,8 +145325,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-2924", +- "self_type" : "type-2923", ++ "referenced_type" : "type-29081", ++ "self_type" : "type-29080", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145301,8 +145334,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-29306", +- "self_type" : "type-29305", ++ "referenced_type" : "type-29158", ++ "self_type" : "type-29157", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145310,8 +145343,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-29357", +- "self_type" : "type-29356", ++ "referenced_type" : "type-29305", ++ "self_type" : "type-29304", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145319,8 +145352,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-2942", +- "self_type" : "type-2941", ++ "referenced_type" : "type-29356", ++ "self_type" : "type-29355", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145328,8 +145361,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-29499", +- "self_type" : "type-29498", ++ "referenced_type" : "type-2936", ++ "self_type" : "type-2935", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145337,8 +145370,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-29516", +- "self_type" : "type-29515", ++ "referenced_type" : "type-2949", ++ "self_type" : "type-2948", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145346,8 +145379,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-29545", +- "self_type" : "type-29544", ++ "referenced_type" : "type-29498", ++ "self_type" : "type-29497", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145355,8 +145388,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-29597", +- "self_type" : "type-29596", ++ "referenced_type" : "type-29515", ++ "self_type" : "type-29514", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145364,8 +145397,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-29832", +- "self_type" : "type-29831", ++ "referenced_type" : "type-29544", ++ "self_type" : "type-29543", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145373,8 +145406,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-29837", +- "self_type" : "type-29836", ++ "referenced_type" : "type-29596", ++ "self_type" : "type-29595", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145382,8 +145415,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-2984", +- "self_type" : "type-2983", ++ "referenced_type" : "type-2961", ++ "self_type" : "type-2960", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145391,8 +145424,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-29846", +- "self_type" : "type-29845", ++ "referenced_type" : "type-29831", ++ "self_type" : "type-29830", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145400,8 +145433,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-2997", +- "self_type" : "type-2996", ++ "referenced_type" : "type-29836", ++ "self_type" : "type-29835", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145409,8 +145442,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-30073", +- "self_type" : "type-30072", ++ "referenced_type" : "type-29845", ++ "self_type" : "type-29844", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145418,8 +145451,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-3009", +- "self_type" : "type-3008", ++ "referenced_type" : "type-2989", ++ "self_type" : "type-2988", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145427,8 +145460,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-30196", +- "self_type" : "type-30195", ++ "referenced_type" : "type-2997", ++ "self_type" : "type-2996", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145436,8 +145469,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-30248", +- "self_type" : "type-30247", ++ "referenced_type" : "type-30072", ++ "self_type" : "type-30071", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145445,8 +145478,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-30324", +- "self_type" : "type-30323", ++ "referenced_type" : "type-30195", ++ "self_type" : "type-30194", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145454,8 +145487,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-3037", +- "self_type" : "type-3036", ++ "referenced_type" : "type-30247", ++ "self_type" : "type-30246", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145463,8 +145496,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-30405", +- "self_type" : "type-30404", ++ "referenced_type" : "type-3030", ++ "self_type" : "type-3029", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145472,8 +145505,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-3045", +- "self_type" : "type-3044", ++ "referenced_type" : "type-30323", ++ "self_type" : "type-30322", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145481,8 +145514,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-30544", +- "self_type" : "type-30543", ++ "referenced_type" : "type-30404", ++ "self_type" : "type-30403", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145490,8 +145523,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-30710", +- "self_type" : "type-30709", ++ "referenced_type" : "type-30543", ++ "self_type" : "type-30542", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145499,8 +145532,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-30714", +- "self_type" : "type-30713", ++ "referenced_type" : "type-3063", ++ "self_type" : "type-3062", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145508,8 +145541,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-30757", +- "self_type" : "type-30756", ++ "referenced_type" : "type-30709", ++ "self_type" : "type-30708", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145517,8 +145550,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-3078", +- "self_type" : "type-3077", ++ "referenced_type" : "type-30713", ++ "self_type" : "type-30712", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145526,8 +145559,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-30831", +- "self_type" : "type-30830", ++ "referenced_type" : "type-30756", ++ "self_type" : "type-30755", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145535,8 +145568,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-30875", +- "self_type" : "type-30874", ++ "referenced_type" : "type-30830", ++ "self_type" : "type-30829", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145544,8 +145577,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-30905", +- "self_type" : "type-30904", ++ "referenced_type" : "type-30874", ++ "self_type" : "type-30873", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145553,8 +145586,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-31014", +- "self_type" : "type-31013", ++ "referenced_type" : "type-30904", ++ "self_type" : "type-30903", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145562,8 +145595,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-31016", +- "self_type" : "type-31015", ++ "referenced_type" : "type-31013", ++ "self_type" : "type-31012", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145571,8 +145604,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-3111", +- "self_type" : "type-3110", ++ "referenced_type" : "type-31015", ++ "self_type" : "type-31014", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145580,8 +145613,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-31135", +- "self_type" : "type-31134", ++ "referenced_type" : "type-31134", ++ "self_type" : "type-31133", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145589,8 +145622,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-31145", +- "self_type" : "type-31144", ++ "referenced_type" : "type-31144", ++ "self_type" : "type-31143", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145598,8 +145631,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-31226", +- "self_type" : "type-31225", ++ "referenced_type" : "type-31225", ++ "self_type" : "type-31224", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145607,8 +145640,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-31232", +- "self_type" : "type-31231", ++ "referenced_type" : "type-31231", ++ "self_type" : "type-31230", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145616,8 +145649,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-31258", +- "self_type" : "type-31257", ++ "referenced_type" : "type-31257", ++ "self_type" : "type-31256", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145625,8 +145658,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-31339", +- "self_type" : "type-31338", ++ "referenced_type" : "type-31338", ++ "self_type" : "type-31337", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145634,8 +145667,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-31466", +- "self_type" : "type-31465", ++ "referenced_type" : "type-31465", ++ "self_type" : "type-31464", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145643,8 +145676,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-31474", +- "self_type" : "type-31473", ++ "referenced_type" : "type-31473", ++ "self_type" : "type-31472", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145652,8 +145685,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-31518", +- "self_type" : "type-31517", ++ "referenced_type" : "type-31517", ++ "self_type" : "type-31516", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145661,8 +145694,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-31576", +- "self_type" : "type-31575", ++ "referenced_type" : "type-31575", ++ "self_type" : "type-31574", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145670,8 +145703,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-31588", +- "self_type" : "type-31587", ++ "referenced_type" : "type-31587", ++ "self_type" : "type-31586", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145679,8 +145712,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-31648", +- "self_type" : "type-31647", ++ "referenced_type" : "type-31647", ++ "self_type" : "type-31646", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145688,8 +145721,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-31679", +- "self_type" : "type-31678", ++ "referenced_type" : "type-31678", ++ "self_type" : "type-31677", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145706,8 +145739,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-31729", +- "self_type" : "type-31728", ++ "referenced_type" : "type-31728", ++ "self_type" : "type-31727", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145715,8 +145748,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-31767", +- "self_type" : "type-31766", ++ "referenced_type" : "type-31766", ++ "self_type" : "type-31765", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145724,8 +145757,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-31798", +- "self_type" : "type-31797", ++ "referenced_type" : "type-31797", ++ "self_type" : "type-31796", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145733,8 +145766,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-31820", +- "self_type" : "type-31819", ++ "referenced_type" : "type-31819", ++ "self_type" : "type-31818", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145742,8 +145775,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-32046", +- "self_type" : "type-32045", ++ "referenced_type" : "type-3201", ++ "self_type" : "type-3200", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145751,8 +145784,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-32139", +- "self_type" : "type-32138", ++ "referenced_type" : "type-32045", ++ "self_type" : "type-32044", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145760,8 +145793,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-32217", +- "self_type" : "type-32216", ++ "referenced_type" : "type-32138", ++ "self_type" : "type-32137", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145769,8 +145802,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-32229", +- "self_type" : "type-32228", ++ "referenced_type" : "type-32216", ++ "self_type" : "type-32215", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145778,8 +145811,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-3249", +- "self_type" : "type-3248", ++ "referenced_type" : "type-32228", ++ "self_type" : "type-32227", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145796,8 +145829,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-3415", +- "self_type" : "type-3414", ++ "referenced_type" : "type-3367", ++ "self_type" : "type-3366", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145805,8 +145838,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-3419", +- "self_type" : "type-3418", ++ "referenced_type" : "type-3371", ++ "self_type" : "type-3370", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145814,8 +145847,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-3468", +- "self_type" : "type-3467", ++ "referenced_type" : "type-3420", ++ "self_type" : "type-3419", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145823,8 +145856,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-3548", +- "self_type" : "type-3547", ++ "referenced_type" : "type-3500", ++ "self_type" : "type-3499", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145832,8 +145865,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-3592", +- "self_type" : "type-3591", ++ "referenced_type" : "type-3544", ++ "self_type" : "type-3543", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145841,8 +145874,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-3622", +- "self_type" : "type-3621", ++ "referenced_type" : "type-3574", ++ "self_type" : "type-3573", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145850,8 +145883,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-3781", +- "self_type" : "type-3780", ++ "referenced_type" : "type-3733", ++ "self_type" : "type-3732", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145859,8 +145892,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-3785", +- "self_type" : "type-3784", ++ "referenced_type" : "type-3737", ++ "self_type" : "type-3736", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145877,8 +145910,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-3925", +- "self_type" : "type-3924", ++ "referenced_type" : "type-3877", ++ "self_type" : "type-3876", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145886,8 +145919,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-3935", +- "self_type" : "type-3934", ++ "referenced_type" : "type-3887", ++ "self_type" : "type-3886", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145895,8 +145928,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-4017", +- "self_type" : "type-4016", ++ "referenced_type" : "type-3969", ++ "self_type" : "type-3968", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145904,8 +145937,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-4036", +- "self_type" : "type-4035", ++ "referenced_type" : "type-3988", ++ "self_type" : "type-3987", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145913,8 +145946,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-4097", +- "self_type" : "type-4096", ++ "referenced_type" : "type-4049", ++ "self_type" : "type-4048", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145922,8 +145955,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-4180", +- "self_type" : "type-4179", ++ "referenced_type" : "type-4132", ++ "self_type" : "type-4131", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145931,8 +145964,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-4338", +- "self_type" : "type-4337", ++ "referenced_type" : "type-4290", ++ "self_type" : "type-4289", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145940,8 +145973,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-4346", +- "self_type" : "type-4345", ++ "referenced_type" : "type-4298", ++ "self_type" : "type-4297", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145949,8 +145982,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-438", +- "self_type" : "type-437", ++ "referenced_type" : "type-4343", ++ "self_type" : "type-4342", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145958,8 +145991,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-4391", +- "self_type" : "type-4390", ++ "referenced_type" : "type-438", ++ "self_type" : "type-437", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145967,8 +146000,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-4452", +- "self_type" : "type-4451", ++ "referenced_type" : "type-4404", ++ "self_type" : "type-4403", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145976,8 +146009,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-4464", +- "self_type" : "type-4463", ++ "referenced_type" : "type-4416", ++ "self_type" : "type-4415", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145985,8 +146018,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-4531", +- "self_type" : "type-4530", ++ "referenced_type" : "type-4483", ++ "self_type" : "type-4482", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -145994,8 +146027,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-4549", +- "self_type" : "type-4548", ++ "referenced_type" : "type-4501", ++ "self_type" : "type-4500", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146003,8 +146036,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-4554", +- "self_type" : "type-4553", ++ "referenced_type" : "type-4506", ++ "self_type" : "type-4505", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146012,8 +146045,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-4698", +- "self_type" : "type-4697", ++ "referenced_type" : "type-4650", ++ "self_type" : "type-4649", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146021,8 +146054,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-4863", +- "self_type" : "type-4862", ++ "referenced_type" : "type-4815", ++ "self_type" : "type-4814", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146030,8 +146063,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-4865", +- "self_type" : "type-4864", ++ "referenced_type" : "type-4817", ++ "self_type" : "type-4816", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146039,8 +146072,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-4904", +- "self_type" : "type-4903", ++ "referenced_type" : "type-4856", ++ "self_type" : "type-4855", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146048,8 +146081,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-4922", +- "self_type" : "type-4921", ++ "referenced_type" : "type-4874", ++ "self_type" : "type-4873", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146057,8 +146090,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-4964", +- "self_type" : "type-4963", ++ "referenced_type" : "type-4916", ++ "self_type" : "type-4915", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146066,8 +146099,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-4977", +- "self_type" : "type-4976", ++ "referenced_type" : "type-4929", ++ "self_type" : "type-4928", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146075,8 +146108,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-4989", +- "self_type" : "type-4988", ++ "referenced_type" : "type-4941", ++ "self_type" : "type-4940", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146084,8 +146117,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-5017", +- "self_type" : "type-5016", ++ "referenced_type" : "type-4969", ++ "self_type" : "type-4968", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146093,8 +146126,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-5025", +- "self_type" : "type-5024", ++ "referenced_type" : "type-4977", ++ "self_type" : "type-4976", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146102,8 +146135,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-5058", +- "self_type" : "type-5057", ++ "referenced_type" : "type-5010", ++ "self_type" : "type-5009", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146111,8 +146144,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-5091", +- "self_type" : "type-5090", ++ "referenced_type" : "type-5043", ++ "self_type" : "type-5042", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146120,8 +146153,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-5229", +- "self_type" : "type-5228", ++ "referenced_type" : "type-5181", ++ "self_type" : "type-5180", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146129,8 +146162,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-5395", +- "self_type" : "type-5394", ++ "referenced_type" : "type-5347", ++ "self_type" : "type-5346", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146138,8 +146171,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-5399", +- "self_type" : "type-5398", ++ "referenced_type" : "type-5351", ++ "self_type" : "type-5350", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146147,8 +146180,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-5448", +- "self_type" : "type-5447", ++ "referenced_type" : "type-5400", ++ "self_type" : "type-5399", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146156,8 +146189,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-5526", +- "self_type" : "type-5525", ++ "referenced_type" : "type-5478", ++ "self_type" : "type-5477", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146165,8 +146198,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-5570", +- "self_type" : "type-5569", ++ "referenced_type" : "type-5522", ++ "self_type" : "type-5521", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146174,8 +146207,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-5600", +- "self_type" : "type-5599", ++ "referenced_type" : "type-5552", ++ "self_type" : "type-5551", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146183,8 +146216,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-5712", +- "self_type" : "type-5711", ++ "referenced_type" : "type-5664", ++ "self_type" : "type-5663", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146192,8 +146225,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-5714", +- "self_type" : "type-5713", ++ "referenced_type" : "type-5666", ++ "self_type" : "type-5665", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146201,8 +146234,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-5833", +- "self_type" : "type-5832", ++ "referenced_type" : "type-5785", ++ "self_type" : "type-5784", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146210,8 +146243,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-5843", +- "self_type" : "type-5842", ++ "referenced_type" : "type-5795", ++ "self_type" : "type-5794", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146219,8 +146252,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-5924", +- "self_type" : "type-5923", ++ "referenced_type" : "type-5876", ++ "self_type" : "type-5875", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146228,8 +146261,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-5930", +- "self_type" : "type-5929", ++ "referenced_type" : "type-5882", ++ "self_type" : "type-5881", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146237,8 +146270,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-5956", +- "self_type" : "type-5955", ++ "referenced_type" : "type-5908", ++ "self_type" : "type-5907", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146246,8 +146279,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-6037", +- "self_type" : "type-6036", ++ "referenced_type" : "type-5989", ++ "self_type" : "type-5988", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146255,8 +146288,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-6164", +- "self_type" : "type-6163", ++ "referenced_type" : "type-6116", ++ "self_type" : "type-6115", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146264,8 +146297,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-6172", +- "self_type" : "type-6171", ++ "referenced_type" : "type-6124", ++ "self_type" : "type-6123", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146273,8 +146306,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-6216", +- "self_type" : "type-6215", ++ "referenced_type" : "type-6168", ++ "self_type" : "type-6167", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146282,8 +146315,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-6274", +- "self_type" : "type-6273", ++ "referenced_type" : "type-6226", ++ "self_type" : "type-6225", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146291,8 +146324,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-6286", +- "self_type" : "type-6285", ++ "referenced_type" : "type-6238", ++ "self_type" : "type-6237", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146300,8 +146333,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-6348", +- "self_type" : "type-6347", ++ "referenced_type" : "type-6300", ++ "self_type" : "type-6299", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146309,8 +146342,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-6380", +- "self_type" : "type-6379", ++ "referenced_type" : "type-6332", ++ "self_type" : "type-6331", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146318,8 +146351,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-6432", +- "self_type" : "type-6431", ++ "referenced_type" : "type-6384", ++ "self_type" : "type-6383", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146327,8 +146360,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-6470", +- "self_type" : "type-6469", ++ "referenced_type" : "type-6422", ++ "self_type" : "type-6421", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146336,8 +146369,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-6522", +- "self_type" : "type-6521", ++ "referenced_type" : "type-6474", ++ "self_type" : "type-6473", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146345,8 +146378,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-6574", +- "self_type" : "type-6573", ++ "referenced_type" : "type-6526", ++ "self_type" : "type-6525", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146354,8 +146387,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-6908", +- "self_type" : "type-6907", ++ "referenced_type" : "type-6860", ++ "self_type" : "type-6859", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146363,8 +146396,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-7020", +- "self_type" : "type-7019", ++ "referenced_type" : "type-6972", ++ "self_type" : "type-6971", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146372,8 +146405,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-7098", +- "self_type" : "type-7097", ++ "referenced_type" : "type-7050", ++ "self_type" : "type-7049", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146381,8 +146414,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-7115", +- "self_type" : "type-7114", ++ "referenced_type" : "type-7067", ++ "self_type" : "type-7066", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146390,8 +146423,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-7194", +- "self_type" : "type-7193", ++ "referenced_type" : "type-7146", ++ "self_type" : "type-7145", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146413,6 +146446,15 @@ + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", ++ "name" : "google::protobuf::internal::Mutex::Internal *", ++ "referenced_type" : "type-7337", ++ "self_type" : "type-7336", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" ++ }, + { + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", +@@ -146426,8 +146468,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-7385", +- "self_type" : "type-7384", ++ "referenced_type" : "type-7564", ++ "self_type" : "type-7563", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146435,8 +146477,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-7612", +- "self_type" : "type-7611", ++ "referenced_type" : "type-7621", ++ "self_type" : "type-7620", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146444,8 +146486,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-7669", +- "self_type" : "type-7668", ++ "referenced_type" : "type-7751", ++ "self_type" : "type-7750", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146453,8 +146495,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-7799", +- "self_type" : "type-7798", ++ "referenced_type" : "type-7838", ++ "self_type" : "type-7837", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146471,8 +146513,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-7886", +- "self_type" : "type-7885", ++ "referenced_type" : "type-7950", ++ "self_type" : "type-7949", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146480,8 +146522,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-7998", +- "self_type" : "type-7997", ++ "referenced_type" : "type-8045", ++ "self_type" : "type-8044", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146498,8 +146540,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-8093", +- "self_type" : "type-8092", ++ "referenced_type" : "type-8091", ++ "self_type" : "type-8090", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146507,8 +146549,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-8139", +- "self_type" : "type-8138", ++ "referenced_type" : "type-8093", ++ "self_type" : "type-8092", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146516,8 +146558,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-8141", +- "self_type" : "type-8140", ++ "referenced_type" : "type-8132", ++ "self_type" : "type-8131", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146525,8 +146567,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-8180", +- "self_type" : "type-8179", ++ "referenced_type" : "type-8150", ++ "self_type" : "type-8149", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146534,8 +146576,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-8198", +- "self_type" : "type-8197", ++ "referenced_type" : "type-8192", ++ "self_type" : "type-8191", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146543,8 +146585,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-8240", +- "self_type" : "type-8239", ++ "referenced_type" : "type-8205", ++ "self_type" : "type-8204", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146552,8 +146594,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-8253", +- "self_type" : "type-8252", ++ "referenced_type" : "type-8217", ++ "self_type" : "type-8216", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146561,8 +146603,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-8265", +- "self_type" : "type-8264", ++ "referenced_type" : "type-8245", ++ "self_type" : "type-8244", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146570,8 +146612,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-8293", +- "self_type" : "type-8292", ++ "referenced_type" : "type-8253", ++ "self_type" : "type-8252", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146579,8 +146621,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-8301", +- "self_type" : "type-8300", ++ "referenced_type" : "type-8286", ++ "self_type" : "type-8285", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146588,8 +146630,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-8334", +- "self_type" : "type-8333", ++ "referenced_type" : "type-8318", ++ "self_type" : "type-8317", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146597,8 +146639,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-8366", +- "self_type" : "type-8365", ++ "referenced_type" : "type-8455", ++ "self_type" : "type-8454", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146615,8 +146657,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-8503", +- "self_type" : "type-8502", ++ "referenced_type" : "type-8621", ++ "self_type" : "type-8620", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146624,8 +146666,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-865", +- "self_type" : "type-864", ++ "referenced_type" : "type-8625", ++ "self_type" : "type-8624", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146633,8 +146675,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-8669", +- "self_type" : "type-8668", ++ "referenced_type" : "type-865", ++ "self_type" : "type-864", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146642,8 +146684,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-8673", +- "self_type" : "type-8672", ++ "referenced_type" : "type-8665", ++ "self_type" : "type-8664", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146651,8 +146693,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-8713", +- "self_type" : "type-8712", ++ "referenced_type" : "type-8737", ++ "self_type" : "type-8736", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146669,8 +146711,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-8785", +- "self_type" : "type-8784", ++ "referenced_type" : "type-8781", ++ "self_type" : "type-8780", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146678,8 +146720,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-8829", +- "self_type" : "type-8828", ++ "referenced_type" : "type-8811", ++ "self_type" : "type-8810", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146687,8 +146729,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-8859", +- "self_type" : "type-8858", ++ "referenced_type" : "type-8921", ++ "self_type" : "type-8920", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146696,8 +146738,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-8969", +- "self_type" : "type-8968", ++ "referenced_type" : "type-8923", ++ "self_type" : "type-8922", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146705,8 +146747,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-8971", +- "self_type" : "type-8970", ++ "referenced_type" : "type-9042", ++ "self_type" : "type-9041", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146714,8 +146756,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-9090", +- "self_type" : "type-9089", ++ "referenced_type" : "type-9052", ++ "self_type" : "type-9051", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146723,8 +146765,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-9100", +- "self_type" : "type-9099", ++ "referenced_type" : "type-912", ++ "self_type" : "type-911", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146732,8 +146774,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-912", +- "self_type" : "type-911", ++ "referenced_type" : "type-9133", ++ "self_type" : "type-9132", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146741,8 +146783,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-918", +- "self_type" : "type-917", ++ "referenced_type" : "type-9139", ++ "self_type" : "type-9138", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146750,8 +146792,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-9181", +- "self_type" : "type-9180", ++ "referenced_type" : "type-9165", ++ "self_type" : "type-9164", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146759,8 +146801,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-9187", +- "self_type" : "type-9186", ++ "referenced_type" : "type-918", ++ "self_type" : "type-917", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146768,8 +146810,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-9213", +- "self_type" : "type-9212", ++ "referenced_type" : "type-9246", ++ "self_type" : "type-9245", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146786,8 +146828,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-9294", +- "self_type" : "type-9293", ++ "referenced_type" : "type-931", ++ "self_type" : "type-930", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146795,8 +146837,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-931", +- "self_type" : "type-930", ++ "referenced_type" : "type-9373", ++ "self_type" : "type-9372", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146804,8 +146846,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-939", +- "self_type" : "type-938", ++ "referenced_type" : "type-9381", ++ "self_type" : "type-9380", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146813,8 +146855,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-9421", +- "self_type" : "type-9420", ++ "referenced_type" : "type-939", ++ "self_type" : "type-938", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146822,8 +146864,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-9429", +- "self_type" : "type-9428", ++ "referenced_type" : "type-9425", ++ "self_type" : "type-9424", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146840,8 +146882,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-9473", +- "self_type" : "type-9472", ++ "referenced_type" : "type-9483", ++ "self_type" : "type-9482", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146849,8 +146891,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-953", +- "self_type" : "type-952", ++ "referenced_type" : "type-9495", ++ "self_type" : "type-9494", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146858,8 +146900,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-9531", +- "self_type" : "type-9530", ++ "referenced_type" : "type-953", ++ "self_type" : "type-952", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146867,8 +146909,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-9543", +- "self_type" : "type-9542", ++ "referenced_type" : "type-9555", ++ "self_type" : "type-9554", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146876,8 +146918,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-9603", +- "self_type" : "type-9602", ++ "referenced_type" : "type-9586", ++ "self_type" : "type-9585", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146894,8 +146936,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-9634", +- "self_type" : "type-9633", ++ "referenced_type" : "type-9636", ++ "self_type" : "type-9635", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146903,8 +146945,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-9684", +- "self_type" : "type-9683", ++ "referenced_type" : "type-9674", ++ "self_type" : "type-9673", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146912,8 +146954,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-9722", +- "self_type" : "type-9721", ++ "referenced_type" : "type-9705", ++ "self_type" : "type-9704", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146921,8 +146963,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-9753", +- "self_type" : "type-9752", ++ "referenced_type" : "type-9727", ++ "self_type" : "type-9726", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146930,8 +146972,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-9775", +- "self_type" : "type-9774", ++ "referenced_type" : "type-981", ++ "self_type" : "type-980", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146939,8 +146981,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::Mutex::Internal *", + "name" : "google::protobuf::internal::Mutex::Internal *", +- "referenced_type" : "type-981", +- "self_type" : "type-980", ++ "referenced_type" : "type-9952", ++ "self_type" : "type-9951", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mutex.h" + }, +@@ -146975,8 +147017,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::RandomAccessRepeatedFieldAccessor *", + "name" : "google::protobuf::internal::RandomAccessRepeatedFieldAccessor *", +- "referenced_type" : "type-6801", +- "self_type" : "type-6978", ++ "referenced_type" : "type-6753", ++ "self_type" : "type-6930", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -146984,8 +147026,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::RepeatedFieldAccessor *", + "name" : "google::protobuf::internal::RepeatedFieldAccessor *", +- "referenced_type" : "type-6802", +- "self_type" : "type-6967", ++ "referenced_type" : "type-6754", ++ "self_type" : "type-6919", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection.h" + }, +@@ -146993,8 +147035,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::RepeatedFieldPrimitiveAccessor *", + "name" : "google::protobuf::internal::RepeatedFieldPrimitiveAccessor *", +- "referenced_type" : "type-6830", +- "self_type" : "type-6832", ++ "referenced_type" : "type-6782", ++ "self_type" : "type-6784", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -147002,8 +147044,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::RepeatedFieldPrimitiveAccessor *", + "name" : "google::protobuf::internal::RepeatedFieldPrimitiveAccessor *", +- "referenced_type" : "type-6825", +- "self_type" : "type-6827", ++ "referenced_type" : "type-6777", ++ "self_type" : "type-6779", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -147011,8 +147053,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::RepeatedFieldPrimitiveAccessor *", + "name" : "google::protobuf::internal::RepeatedFieldPrimitiveAccessor *", +- "referenced_type" : "type-6820", +- "self_type" : "type-6822", ++ "referenced_type" : "type-6772", ++ "self_type" : "type-6774", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -147020,8 +147062,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::RepeatedFieldPrimitiveAccessor *", + "name" : "google::protobuf::internal::RepeatedFieldPrimitiveAccessor *", +- "referenced_type" : "type-6799", +- "self_type" : "type-7011", ++ "referenced_type" : "type-6751", ++ "self_type" : "type-6963", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -147029,8 +147071,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::RepeatedFieldPrimitiveAccessor *", + "name" : "google::protobuf::internal::RepeatedFieldPrimitiveAccessor *", +- "referenced_type" : "type-6809", +- "self_type" : "type-6811", ++ "referenced_type" : "type-6761", ++ "self_type" : "type-6763", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -147038,8 +147080,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::RepeatedFieldPrimitiveAccessor *", + "name" : "google::protobuf::internal::RepeatedFieldPrimitiveAccessor *", +- "referenced_type" : "type-6804", +- "self_type" : "type-6806", ++ "referenced_type" : "type-6756", ++ "self_type" : "type-6758", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -147047,8 +147089,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::RepeatedFieldPrimitiveAccessor *", + "name" : "google::protobuf::internal::RepeatedFieldPrimitiveAccessor *", +- "referenced_type" : "type-6814", +- "self_type" : "type-6817", ++ "referenced_type" : "type-6766", ++ "self_type" : "type-6769", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -147056,8 +147098,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::RepeatedFieldWrapper *", + "name" : "google::protobuf::internal::RepeatedFieldWrapper *", +- "referenced_type" : "type-6831", +- "self_type" : "type-6999", ++ "referenced_type" : "type-6783", ++ "self_type" : "type-6951", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -147065,8 +147107,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::RepeatedFieldWrapper *", + "name" : "google::protobuf::internal::RepeatedFieldWrapper *", +- "referenced_type" : "type-6826", +- "self_type" : "type-6996", ++ "referenced_type" : "type-6778", ++ "self_type" : "type-6948", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -147074,8 +147116,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::RepeatedFieldWrapper *", + "name" : "google::protobuf::internal::RepeatedFieldWrapper *", +- "referenced_type" : "type-6821", +- "self_type" : "type-6993", ++ "referenced_type" : "type-6773", ++ "self_type" : "type-6945", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -147083,8 +147125,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::RepeatedFieldWrapper *", + "name" : "google::protobuf::internal::RepeatedFieldWrapper *", +- "referenced_type" : "type-6800", +- "self_type" : "type-6981", ++ "referenced_type" : "type-6752", ++ "self_type" : "type-6933", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -147092,8 +147134,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::RepeatedFieldWrapper *", + "name" : "google::protobuf::internal::RepeatedFieldWrapper *", +- "referenced_type" : "type-6810", +- "self_type" : "type-6987", ++ "referenced_type" : "type-6762", ++ "self_type" : "type-6939", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -147101,8 +147143,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::RepeatedFieldWrapper *", + "name" : "google::protobuf::internal::RepeatedFieldWrapper *", +- "referenced_type" : "type-6805", +- "self_type" : "type-6984", ++ "referenced_type" : "type-6757", ++ "self_type" : "type-6936", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -147110,8 +147152,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::RepeatedFieldWrapper *", + "name" : "google::protobuf::internal::RepeatedFieldWrapper *", +- "referenced_type" : "type-6815", +- "self_type" : "type-6990", ++ "referenced_type" : "type-6767", ++ "self_type" : "type-6942", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -147137,8 +147179,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::RepeatedPtrFieldMessageAccessor *", + "name" : "google::protobuf::internal::RepeatedPtrFieldMessageAccessor *", +- "referenced_type" : "type-6842", +- "self_type" : "type-6844", ++ "referenced_type" : "type-6794", ++ "self_type" : "type-6796", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -147146,8 +147188,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::RepeatedPtrFieldStringAccessor *", + "name" : "google::protobuf::internal::RepeatedPtrFieldStringAccessor *", +- "referenced_type" : "type-6835", +- "self_type" : "type-6839", ++ "referenced_type" : "type-6787", ++ "self_type" : "type-6791", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -147155,8 +147197,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::RepeatedPtrFieldWrapper *", + "name" : "google::protobuf::internal::RepeatedPtrFieldWrapper *", +- "referenced_type" : "type-6843", +- "self_type" : "type-7005", ++ "referenced_type" : "type-6795", ++ "self_type" : "type-6957", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -147164,8 +147206,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::RepeatedPtrFieldWrapper, std::allocator > > *", + "name" : "google::protobuf::internal::RepeatedPtrFieldWrapper, std::allocator > > *", +- "referenced_type" : "type-6836", +- "self_type" : "type-7002", ++ "referenced_type" : "type-6788", ++ "self_type" : "type-6954", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -147173,8 +147215,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::RepeatedPtrIterator, std::allocator > > *", + "name" : "google::protobuf::internal::RepeatedPtrIterator, std::allocator > > *", +- "referenced_type" : "type-3782", +- "self_type" : "type-3810", ++ "referenced_type" : "type-3734", ++ "self_type" : "type-3762", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -147182,8 +147224,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::RepeatedPtrIterator *", + "name" : "google::protobuf::internal::RepeatedPtrIterator *", +- "referenced_type" : "type-6749", +- "self_type" : "type-6754", ++ "referenced_type" : "type-6701", ++ "self_type" : "type-6706", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -147191,8 +147233,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::RepeatedPtrIterator, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> > *", + "name" : "google::protobuf::internal::RepeatedPtrIterator, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> > *", +- "referenced_type" : "type-7251", +- "self_type" : "type-7250", ++ "referenced_type" : "type-7203", ++ "self_type" : "type-7202", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -147200,8 +147242,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::RepeatedPtrIterator, std::allocator > > *", + "name" : "google::protobuf::internal::RepeatedPtrIterator, std::allocator > > *", +- "referenced_type" : "type-3806", +- "self_type" : "type-3809", ++ "referenced_type" : "type-3758", ++ "self_type" : "type-3761", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -147209,8 +147251,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::RepeatedPtrOverPtrsIterator *", + "name" : "google::protobuf::internal::RepeatedPtrOverPtrsIterator *", +- "referenced_type" : "type-7665", +- "self_type" : "type-7693", ++ "referenced_type" : "type-7617", ++ "self_type" : "type-7645", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -147245,8 +147287,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::TypeDefinedMapFieldBase *", + "name" : "google::protobuf::internal::TypeDefinedMapFieldBase *", +- "referenced_type" : "type-4283", +- "self_type" : "type-6774", ++ "referenced_type" : "type-4235", ++ "self_type" : "type-6726", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, +@@ -147254,8 +147296,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::TypeDefinedMapFieldBase, std::allocator >, google::protobuf::Value> *", + "name" : "google::protobuf::internal::TypeDefinedMapFieldBase, std::allocator >, google::protobuf::Value> *", +- "referenced_type" : "type-7230", +- "self_type" : "type-7310", ++ "referenced_type" : "type-7182", ++ "self_type" : "type-7262", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, +@@ -147263,8 +147305,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::UnknownFieldSetFieldSkipper *", + "name" : "google::protobuf::internal::UnknownFieldSetFieldSkipper *", +- "referenced_type" : "type-2277", +- "self_type" : "type-2278", ++ "referenced_type" : "type-2206", ++ "self_type" : "type-2207", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format.h" + }, +@@ -147281,8 +147323,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_array *", + "name" : "google::protobuf::internal::scoped_array *", +- "referenced_type" : "type-4334", +- "self_type" : "type-4336", ++ "referenced_type" : "type-4286", ++ "self_type" : "type-4288", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147291,7 +147333,7 @@ + "linker_set_key" : "google::protobuf::internal::scoped_array *", + "name" : "google::protobuf::internal::scoped_array *", + "referenced_type" : "type-779", +- "self_type" : "type-1663", ++ "self_type" : "type-1575", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147299,8 +147341,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-3723", +- "self_type" : "type-7635", ++ "referenced_type" : "type-3675", ++ "self_type" : "type-7587", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147308,8 +147350,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-4298", +- "self_type" : "type-4321", ++ "referenced_type" : "type-4250", ++ "self_type" : "type-4273", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147317,8 +147359,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-1822", +- "self_type" : "type-3682", ++ "referenced_type" : "type-1733", ++ "self_type" : "type-3634", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147326,8 +147368,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-3698", +- "self_type" : "type-4295", ++ "referenced_type" : "type-3650", ++ "self_type" : "type-4247", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147335,8 +147377,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-24922", +- "self_type" : "type-25020", ++ "referenced_type" : "type-24889", ++ "self_type" : "type-24989", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147344,8 +147386,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19923", +- "self_type" : "type-19931", ++ "referenced_type" : "type-19875", ++ "self_type" : "type-19883", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147353,8 +147395,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-3767", +- "self_type" : "type-3769", ++ "referenced_type" : "type-3719", ++ "self_type" : "type-3721", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147362,8 +147404,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr > *", + "name" : "google::protobuf::internal::scoped_ptr > *", +- "referenced_type" : "type-19681", +- "self_type" : "type-19682", ++ "referenced_type" : "type-19633", ++ "self_type" : "type-19634", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147371,8 +147413,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr, std::allocator >, std::allocator, std::allocator > > > &, const google::protobuf::Field *> > *", + "name" : "google::protobuf::internal::scoped_ptr, std::allocator >, std::allocator, std::allocator > > > &, const google::protobuf::Field *> > *", +- "referenced_type" : "type-15198", +- "self_type" : "type-15209", ++ "referenced_type" : "type-15150", ++ "self_type" : "type-15161", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147380,8 +147422,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr > *", + "name" : "google::protobuf::internal::scoped_ptr > *", +- "referenced_type" : "type-25041", +- "self_type" : "type-25043", ++ "referenced_type" : "type-25011", ++ "self_type" : "type-25013", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147390,7 +147432,7 @@ + "linker_set_key" : "google::protobuf::internal::scoped_ptr, std::allocator > *> > *", + "name" : "google::protobuf::internal::scoped_ptr, std::allocator > *> > *", + "referenced_type" : "type-772", +- "self_type" : "type-1661", ++ "self_type" : "type-1573", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147398,8 +147440,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19890", +- "self_type" : "type-19904", ++ "referenced_type" : "type-19842", ++ "self_type" : "type-19856", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147407,8 +147449,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-3735", +- "self_type" : "type-3736", ++ "referenced_type" : "type-3687", ++ "self_type" : "type-3688", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147416,8 +147458,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> > *", + "name" : "google::protobuf::internal::scoped_ptr, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> > *", +- "referenced_type" : "type-7363", +- "self_type" : "type-7372", ++ "referenced_type" : "type-7315", ++ "self_type" : "type-7324", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147425,8 +147467,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19517", +- "self_type" : "type-19772", ++ "referenced_type" : "type-19469", ++ "self_type" : "type-19724", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147434,8 +147476,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-11249", +- "self_type" : "type-11254", ++ "referenced_type" : "type-11201", ++ "self_type" : "type-11206", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147443,8 +147485,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-24641", +- "self_type" : "type-24652", ++ "referenced_type" : "type-24609", ++ "self_type" : "type-24615", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147452,8 +147494,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-15230", +- "self_type" : "type-15244", ++ "referenced_type" : "type-15182", ++ "self_type" : "type-15196", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147461,8 +147503,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19198", +- "self_type" : "type-19218", ++ "referenced_type" : "type-19150", ++ "self_type" : "type-19170", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147470,8 +147512,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19518", +- "self_type" : "type-19794", ++ "referenced_type" : "type-19470", ++ "self_type" : "type-19746", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147479,8 +147521,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19494", +- "self_type" : "type-19675", ++ "referenced_type" : "type-19446", ++ "self_type" : "type-19627", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147488,8 +147530,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19491", +- "self_type" : "type-19678", ++ "referenced_type" : "type-19443", ++ "self_type" : "type-19630", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147497,8 +147539,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19497", +- "self_type" : "type-19623", ++ "referenced_type" : "type-19449", ++ "self_type" : "type-19575", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147506,8 +147548,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19507", +- "self_type" : "type-19763", ++ "referenced_type" : "type-19459", ++ "self_type" : "type-19715", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147515,8 +147557,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-19188", +- "self_type" : "type-19202", ++ "referenced_type" : "type-19140", ++ "self_type" : "type-19154", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147524,8 +147566,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::internal::scoped_ptr *", + "name" : "google::protobuf::internal::scoped_ptr *", +- "referenced_type" : "type-24632", +- "self_type" : "type-24634", ++ "referenced_type" : "type-24600", ++ "self_type" : "type-24601", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -147533,8 +147575,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::AnnotationCollector *", + "name" : "google::protobuf::io::AnnotationCollector *", +- "referenced_type" : "type-11201", +- "self_type" : "type-11202", ++ "referenced_type" : "type-11153", ++ "self_type" : "type-11154", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -147543,7 +147585,7 @@ + "linker_set_key" : "google::protobuf::io::ArrayInputStream *", + "name" : "google::protobuf::io::ArrayInputStream *", + "referenced_type" : "type-764", +- "self_type" : "type-1639", ++ "self_type" : "type-1552", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h" + }, +@@ -147552,7 +147594,7 @@ + "linker_set_key" : "google::protobuf::io::ArrayOutputStream *", + "name" : "google::protobuf::io::ArrayOutputStream *", + "referenced_type" : "type-767", +- "self_type" : "type-1642", ++ "self_type" : "type-1556", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h" + }, +@@ -147578,8 +147620,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ConcatenatingInputStream *", + "name" : "google::protobuf::io::ConcatenatingInputStream *", +- "referenced_type" : "type-1615", +- "self_type" : "type-1618", ++ "referenced_type" : "type-1531", ++ "self_type" : "type-1534", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -147623,8 +147665,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ErrorCollector *", + "name" : "google::protobuf::io::ErrorCollector *", +- "referenced_type" : "type-25035", +- "self_type" : "type-25034", ++ "referenced_type" : "type-25003", ++ "self_type" : "type-25002", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, +@@ -147632,8 +147674,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ErrorCollector *", + "name" : "google::protobuf::io::ErrorCollector *", +- "referenced_type" : "type-30185", +- "self_type" : "type-30184", ++ "referenced_type" : "type-30184", ++ "self_type" : "type-30183", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, +@@ -147641,8 +147683,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ErrorCollector *", + "name" : "google::protobuf::io::ErrorCollector *", +- "referenced_type" : "type-3877", +- "self_type" : "type-3876", ++ "referenced_type" : "type-3829", ++ "self_type" : "type-3828", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, +@@ -147650,8 +147692,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::FileInputStream *", + "name" : "google::protobuf::io::FileInputStream *", +- "referenced_type" : "type-1584", +- "self_type" : "type-1587", ++ "referenced_type" : "type-1503", ++ "self_type" : "type-1505", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -147659,8 +147701,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::FileInputStream::CopyingFileInputStream *", + "name" : "google::protobuf::io::FileInputStream::CopyingFileInputStream *", +- "referenced_type" : "type-1585", +- "self_type" : "type-1590", ++ "referenced_type" : "type-1504", ++ "self_type" : "type-1508", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -147668,8 +147710,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::FileOutputStream *", + "name" : "google::protobuf::io::FileOutputStream *", +- "referenced_type" : "type-1591", +- "self_type" : "type-1593", ++ "referenced_type" : "type-1509", ++ "self_type" : "type-1511", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -147677,8 +147719,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::FileOutputStream::CopyingFileOutputStream *", + "name" : "google::protobuf::io::FileOutputStream::CopyingFileOutputStream *", +- "referenced_type" : "type-1592", +- "self_type" : "type-1596", ++ "referenced_type" : "type-1510", ++ "self_type" : "type-1514", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -147686,8 +147728,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::GzipInputStream *", + "name" : "google::protobuf::io::GzipInputStream *", +- "referenced_type" : "type-11179", +- "self_type" : "type-11183", ++ "referenced_type" : "type-11131", ++ "self_type" : "type-11135", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/gzip_stream.h" + }, +@@ -147695,8 +147737,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::GzipOutputStream *", + "name" : "google::protobuf::io::GzipOutputStream *", +- "referenced_type" : "type-11186", +- "self_type" : "type-11191", ++ "referenced_type" : "type-11138", ++ "self_type" : "type-11143", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/gzip_stream.h" + }, +@@ -147704,8 +147746,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::GzipOutputStream::Options *", + "name" : "google::protobuf::io::GzipOutputStream::Options *", +- "referenced_type" : "type-11189", +- "self_type" : "type-11190", ++ "referenced_type" : "type-11141", ++ "self_type" : "type-11142", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/gzip_stream.h" + }, +@@ -147713,8 +147755,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::IstreamInputStream *", + "name" : "google::protobuf::io::IstreamInputStream *", +- "referenced_type" : "type-1597", +- "self_type" : "type-1601", ++ "referenced_type" : "type-1515", ++ "self_type" : "type-1519", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -147722,8 +147764,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::IstreamInputStream::CopyingIstreamInputStream *", + "name" : "google::protobuf::io::IstreamInputStream::CopyingIstreamInputStream *", +- "referenced_type" : "type-1598", +- "self_type" : "type-1605", ++ "referenced_type" : "type-1516", ++ "self_type" : "type-1522", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -147732,7 +147774,7 @@ + "linker_set_key" : "google::protobuf::io::LazyStringOutputStream *", + "name" : "google::protobuf::io::LazyStringOutputStream *", + "referenced_type" : "type-770", +- "self_type" : "type-1648", ++ "self_type" : "type-1562", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h" + }, +@@ -147740,8 +147782,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::LimitingInputStream *", + "name" : "google::protobuf::io::LimitingInputStream *", +- "referenced_type" : "type-1621", +- "self_type" : "type-1622", ++ "referenced_type" : "type-1539", ++ "self_type" : "type-1540", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -147749,8 +147791,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::OstreamOutputStream *", + "name" : "google::protobuf::io::OstreamOutputStream *", +- "referenced_type" : "type-1606", +- "self_type" : "type-1610", ++ "referenced_type" : "type-1523", ++ "self_type" : "type-1527", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -147758,8 +147800,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::OstreamOutputStream::CopyingOstreamOutputStream *", + "name" : "google::protobuf::io::OstreamOutputStream::CopyingOstreamOutputStream *", +- "referenced_type" : "type-1607", +- "self_type" : "type-1614", ++ "referenced_type" : "type-1524", ++ "self_type" : "type-1530", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -147767,8 +147809,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::Printer *", + "name" : "google::protobuf::io::Printer *", +- "referenced_type" : "type-11203", +- "self_type" : "type-11208", ++ "referenced_type" : "type-11155", ++ "self_type" : "type-11160", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -147777,7 +147819,7 @@ + "linker_set_key" : "google::protobuf::io::StringOutputStream *", + "name" : "google::protobuf::io::StringOutputStream *", + "referenced_type" : "type-769", +- "self_type" : "type-1645", ++ "self_type" : "type-1559", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h" + }, +@@ -147785,8 +147827,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::Tokenizer *", + "name" : "google::protobuf::io::Tokenizer *", +- "referenced_type" : "type-3881", +- "self_type" : "type-3888", ++ "referenced_type" : "type-3833", ++ "self_type" : "type-3840", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" + }, +@@ -147794,8 +147836,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-10275", +- "self_type" : "type-10274", ++ "referenced_type" : "type-10227", ++ "self_type" : "type-10226", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -147803,8 +147845,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-10321", +- "self_type" : "type-10320", ++ "referenced_type" : "type-10273", ++ "self_type" : "type-10272", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -147812,8 +147854,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-10781", +- "self_type" : "type-10780", ++ "referenced_type" : "type-10733", ++ "self_type" : "type-10732", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -147821,8 +147863,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-10795", +- "self_type" : "type-10794", ++ "referenced_type" : "type-10747", ++ "self_type" : "type-10746", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -147830,8 +147872,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-10872", +- "self_type" : "type-10871", ++ "referenced_type" : "type-10824", ++ "self_type" : "type-10823", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -147839,8 +147881,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-11168", +- "self_type" : "type-11167", ++ "referenced_type" : "type-11120", ++ "self_type" : "type-11119", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -147848,8 +147890,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-11492", +- "self_type" : "type-11491", ++ "referenced_type" : "type-11444", ++ "self_type" : "type-11443", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" + }, +@@ -147857,8 +147899,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-11929", +- "self_type" : "type-11928", ++ "referenced_type" : "type-11881", ++ "self_type" : "type-11880", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -147866,8 +147908,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-11994", +- "self_type" : "type-11993", ++ "referenced_type" : "type-11946", ++ "self_type" : "type-11945", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -147875,8 +147917,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-12483", +- "self_type" : "type-12482", ++ "referenced_type" : "type-12435", ++ "self_type" : "type-12434", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -147884,8 +147926,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-12619", +- "self_type" : "type-12618", ++ "referenced_type" : "type-12571", ++ "self_type" : "type-12570", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -147893,8 +147935,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-12680", +- "self_type" : "type-12679", ++ "referenced_type" : "type-12632", ++ "self_type" : "type-12631", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -147902,8 +147944,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-12793", +- "self_type" : "type-12792", ++ "referenced_type" : "type-12745", ++ "self_type" : "type-12744", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -147911,8 +147953,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-12859", +- "self_type" : "type-12858", ++ "referenced_type" : "type-12811", ++ "self_type" : "type-12810", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -147920,8 +147962,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-12997", +- "self_type" : "type-12996", ++ "referenced_type" : "type-12949", ++ "self_type" : "type-12948", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -147929,8 +147971,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-13076", +- "self_type" : "type-13075", ++ "referenced_type" : "type-13028", ++ "self_type" : "type-13027", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -147938,8 +147980,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-13245", +- "self_type" : "type-13244", ++ "referenced_type" : "type-13197", ++ "self_type" : "type-13196", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -147947,8 +147989,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-13566", +- "self_type" : "type-13565", ++ "referenced_type" : "type-1325", ++ "self_type" : "type-1324", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -147956,8 +147998,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-13612", +- "self_type" : "type-13611", ++ "referenced_type" : "type-13518", ++ "self_type" : "type-13517", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -147965,8 +148007,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-1406", +- "self_type" : "type-1405", ++ "referenced_type" : "type-13564", ++ "self_type" : "type-13563", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -147974,8 +148016,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-14072", +- "self_type" : "type-14071", ++ "referenced_type" : "type-14024", ++ "self_type" : "type-14023", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -147983,8 +148025,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-14086", +- "self_type" : "type-14085", ++ "referenced_type" : "type-14038", ++ "self_type" : "type-14037", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -147992,8 +148034,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-14163", +- "self_type" : "type-14162", ++ "referenced_type" : "type-14115", ++ "self_type" : "type-14114", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148001,8 +148043,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-14432", +- "self_type" : "type-14431", ++ "referenced_type" : "type-14384", ++ "self_type" : "type-14383", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148010,8 +148052,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-14712", +- "self_type" : "type-14711", ++ "referenced_type" : "type-14664", ++ "self_type" : "type-14663", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" + }, +@@ -148019,8 +148061,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-15156", +- "self_type" : "type-15155", ++ "referenced_type" : "type-15108", ++ "self_type" : "type-15107", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148028,8 +148070,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-15785", +- "self_type" : "type-15784", ++ "referenced_type" : "type-15737", ++ "self_type" : "type-15736", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148037,8 +148079,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-15850", +- "self_type" : "type-15849", ++ "referenced_type" : "type-15802", ++ "self_type" : "type-15801", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148046,8 +148088,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-16340", +- "self_type" : "type-16339", ++ "referenced_type" : "type-16292", ++ "self_type" : "type-16291", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148055,8 +148097,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-16476", +- "self_type" : "type-16475", ++ "referenced_type" : "type-16428", ++ "self_type" : "type-16427", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148064,8 +148106,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-16536", +- "self_type" : "type-16535", ++ "referenced_type" : "type-16488", ++ "self_type" : "type-16487", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148073,8 +148115,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-16649", +- "self_type" : "type-16648", ++ "referenced_type" : "type-16601", ++ "self_type" : "type-16600", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148082,8 +148124,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-16715", +- "self_type" : "type-16714", ++ "referenced_type" : "type-16667", ++ "self_type" : "type-16666", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148091,8 +148133,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-16853", +- "self_type" : "type-16852", ++ "referenced_type" : "type-16805", ++ "self_type" : "type-16804", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148100,8 +148142,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-16932", +- "self_type" : "type-16931", ++ "referenced_type" : "type-16884", ++ "self_type" : "type-16883", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148109,8 +148151,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-17101", +- "self_type" : "type-17100", ++ "referenced_type" : "type-17053", ++ "self_type" : "type-17052", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148118,8 +148160,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-17430", +- "self_type" : "type-17429", ++ "referenced_type" : "type-17382", ++ "self_type" : "type-17381", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148127,8 +148169,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-17476", +- "self_type" : "type-17475", ++ "referenced_type" : "type-17428", ++ "self_type" : "type-17427", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148136,8 +148178,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-17936", +- "self_type" : "type-17935", ++ "referenced_type" : "type-17888", ++ "self_type" : "type-17887", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148145,8 +148187,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-17950", +- "self_type" : "type-17949", ++ "referenced_type" : "type-17902", ++ "self_type" : "type-17901", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148154,8 +148196,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-18027", +- "self_type" : "type-18026", ++ "referenced_type" : "type-17979", ++ "self_type" : "type-17978", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148163,8 +148205,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-18296", +- "self_type" : "type-18295", ++ "referenced_type" : "type-18248", ++ "self_type" : "type-18247", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148172,8 +148214,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-18576", +- "self_type" : "type-18575", ++ "referenced_type" : "type-18528", ++ "self_type" : "type-18527", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" + }, +@@ -148181,8 +148223,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-18940", +- "self_type" : "type-18939", ++ "referenced_type" : "type-18892", ++ "self_type" : "type-18891", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148190,8 +148232,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-19181", +- "self_type" : "type-19180", ++ "referenced_type" : "type-19133", ++ "self_type" : "type-19132", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148199,8 +148241,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-20319", +- "self_type" : "type-20318", ++ "referenced_type" : "type-20271", ++ "self_type" : "type-20270", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148208,8 +148250,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-20384", +- "self_type" : "type-20383", ++ "referenced_type" : "type-20336", ++ "self_type" : "type-20335", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148217,8 +148259,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-20871", +- "self_type" : "type-20870", ++ "referenced_type" : "type-20823", ++ "self_type" : "type-20822", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148226,8 +148268,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-21007", +- "self_type" : "type-21006", ++ "referenced_type" : "type-20959", ++ "self_type" : "type-20958", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148235,8 +148277,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-21068", +- "self_type" : "type-21067", ++ "referenced_type" : "type-21020", ++ "self_type" : "type-21019", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148244,8 +148286,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-21181", +- "self_type" : "type-21180", ++ "referenced_type" : "type-21133", ++ "self_type" : "type-21132", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148253,8 +148295,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-21247", +- "self_type" : "type-21246", ++ "referenced_type" : "type-2118", ++ "self_type" : "type-2117", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148262,8 +148304,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-21385", +- "self_type" : "type-21384", ++ "referenced_type" : "type-21199", ++ "self_type" : "type-21198", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148271,8 +148313,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-21464", +- "self_type" : "type-21463", ++ "referenced_type" : "type-21337", ++ "self_type" : "type-21336", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148280,8 +148322,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-21633", +- "self_type" : "type-21632", ++ "referenced_type" : "type-21416", ++ "self_type" : "type-21415", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148289,8 +148331,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-2187", +- "self_type" : "type-2186", ++ "referenced_type" : "type-21585", ++ "self_type" : "type-21584", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148298,8 +148340,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-21959", +- "self_type" : "type-21958", ++ "referenced_type" : "type-21961", ++ "self_type" : "type-21960", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148307,8 +148349,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-22005", +- "self_type" : "type-22004", ++ "referenced_type" : "type-22003", ++ "self_type" : "type-22002", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148316,8 +148358,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-22465", +- "self_type" : "type-22464", ++ "referenced_type" : "type-2219", ++ "self_type" : "type-2218", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148325,8 +148367,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-22479", +- "self_type" : "type-22478", ++ "referenced_type" : "type-22408", ++ "self_type" : "type-22407", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148334,8 +148376,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-22556", +- "self_type" : "type-22555", ++ "referenced_type" : "type-22477", ++ "self_type" : "type-22476", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148343,8 +148385,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-22825", +- "self_type" : "type-22824", ++ "referenced_type" : "type-22774", ++ "self_type" : "type-22773", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148352,8 +148394,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-2290", +- "self_type" : "type-2289", ++ "referenced_type" : "type-23005", ++ "self_type" : "type-23004", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148361,8 +148403,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-23105", +- "self_type" : "type-23104", ++ "referenced_type" : "type-23094", ++ "self_type" : "type-23093", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" + }, +@@ -148370,8 +148412,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-23469", +- "self_type" : "type-23468", ++ "referenced_type" : "type-23446", ++ "self_type" : "type-23445", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148379,8 +148421,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-23710", +- "self_type" : "type-23709", ++ "referenced_type" : "type-23699", ++ "self_type" : "type-23698", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148388,8 +148430,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-25495", +- "self_type" : "type-25494", ++ "referenced_type" : "type-25545", ++ "self_type" : "type-25544", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148397,8 +148439,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-25560", +- "self_type" : "type-25559", ++ "referenced_type" : "type-25612", ++ "self_type" : "type-25611", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148406,8 +148448,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-26049", +- "self_type" : "type-26048", ++ "referenced_type" : "type-26098", ++ "self_type" : "type-26097", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148415,8 +148457,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-26185", +- "self_type" : "type-26184", ++ "referenced_type" : "type-26229", ++ "self_type" : "type-26228", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148424,8 +148466,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-26246", +- "self_type" : "type-26245", ++ "referenced_type" : "type-26288", ++ "self_type" : "type-26287", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148433,8 +148475,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-26359", +- "self_type" : "type-26358", ++ "referenced_type" : "type-26400", ++ "self_type" : "type-26399", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148442,8 +148484,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-26425", +- "self_type" : "type-26424", ++ "referenced_type" : "type-26467", ++ "self_type" : "type-26466", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148451,8 +148493,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-26563", +- "self_type" : "type-26562", ++ "referenced_type" : "type-26590", ++ "self_type" : "type-26589", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148460,8 +148502,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-26642", +- "self_type" : "type-26641", ++ "referenced_type" : "type-26665", ++ "self_type" : "type-26664", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148469,8 +148511,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-26811", +- "self_type" : "type-26810", ++ "referenced_type" : "type-26836", ++ "self_type" : "type-26835", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148478,8 +148520,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-27144", +- "self_type" : "type-27143", ++ "referenced_type" : "type-27143", ++ "self_type" : "type-27142", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148487,8 +148529,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-27190", +- "self_type" : "type-27189", ++ "referenced_type" : "type-27189", ++ "self_type" : "type-27188", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148496,8 +148538,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-27650", +- "self_type" : "type-27649", ++ "referenced_type" : "type-27649", ++ "self_type" : "type-27648", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148505,8 +148547,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-27664", +- "self_type" : "type-27663", ++ "referenced_type" : "type-27663", ++ "self_type" : "type-27662", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148514,8 +148556,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-27741", +- "self_type" : "type-27740", ++ "referenced_type" : "type-27740", ++ "self_type" : "type-27739", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148523,8 +148565,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-28010", +- "self_type" : "type-28009", ++ "referenced_type" : "type-2787", ++ "self_type" : "type-2786", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148532,26 +148574,26 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-28290", +- "self_type" : "type-28289", ++ "referenced_type" : "type-28009", ++ "self_type" : "type-28008", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-2835", +- "self_type" : "type-2834", ++ "referenced_type" : "type-28289", ++ "self_type" : "type-28288", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" + }, + { + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-28654", +- "self_type" : "type-28653", ++ "referenced_type" : "type-28653", ++ "self_type" : "type-28652", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148559,8 +148601,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-28895", +- "self_type" : "type-28894", ++ "referenced_type" : "type-28894", ++ "self_type" : "type-28893", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148568,8 +148610,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-30641", +- "self_type" : "type-30640", ++ "referenced_type" : "type-30640", ++ "self_type" : "type-30639", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148577,8 +148619,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-30706", +- "self_type" : "type-30705", ++ "referenced_type" : "type-30705", ++ "self_type" : "type-30704", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148586,8 +148628,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-31196", +- "self_type" : "type-31195", ++ "referenced_type" : "type-31195", ++ "self_type" : "type-31194", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148595,8 +148637,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-31332", +- "self_type" : "type-31331", ++ "referenced_type" : "type-31331", ++ "self_type" : "type-31330", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148604,8 +148646,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-31393", +- "self_type" : "type-31392", ++ "referenced_type" : "type-31392", ++ "self_type" : "type-31391", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148613,8 +148655,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-31506", +- "self_type" : "type-31505", ++ "referenced_type" : "type-31505", ++ "self_type" : "type-31504", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148622,8 +148664,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-31572", +- "self_type" : "type-31571", ++ "referenced_type" : "type-31571", ++ "self_type" : "type-31570", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148631,8 +148673,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-31710", +- "self_type" : "type-31709", ++ "referenced_type" : "type-31709", ++ "self_type" : "type-31708", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148640,8 +148682,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-31789", +- "self_type" : "type-31788", ++ "referenced_type" : "type-31788", ++ "self_type" : "type-31787", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148649,8 +148691,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-31958", +- "self_type" : "type-31957", ++ "referenced_type" : "type-31957", ++ "self_type" : "type-31956", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148658,8 +148700,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-3346", +- "self_type" : "type-3345", ++ "referenced_type" : "type-3298", ++ "self_type" : "type-3297", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148667,8 +148709,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-3411", +- "self_type" : "type-3410", ++ "referenced_type" : "type-3363", ++ "self_type" : "type-3362", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148676,8 +148718,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-3986", +- "self_type" : "type-3985", ++ "referenced_type" : "type-3938", ++ "self_type" : "type-3937", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148685,8 +148727,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-4171", +- "self_type" : "type-4170", ++ "referenced_type" : "type-4123", ++ "self_type" : "type-4122", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148694,8 +148736,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-4237", +- "self_type" : "type-4236", ++ "referenced_type" : "type-4189", ++ "self_type" : "type-4188", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148703,8 +148745,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-4379", +- "self_type" : "type-4378", ++ "referenced_type" : "type-4331", ++ "self_type" : "type-4330", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148712,8 +148754,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-4448", +- "self_type" : "type-4447", ++ "referenced_type" : "type-4400", ++ "self_type" : "type-4399", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148721,8 +148763,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-4691", +- "self_type" : "type-4690", ++ "referenced_type" : "type-4643", ++ "self_type" : "type-4642", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148730,8 +148772,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-4815", +- "self_type" : "type-4814", ++ "referenced_type" : "type-4767", ++ "self_type" : "type-4766", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148739,8 +148781,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-5326", +- "self_type" : "type-5325", ++ "referenced_type" : "type-5278", ++ "self_type" : "type-5277", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148748,8 +148790,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-5391", +- "self_type" : "type-5390", ++ "referenced_type" : "type-5343", ++ "self_type" : "type-5342", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148757,8 +148799,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-5894", +- "self_type" : "type-5893", ++ "referenced_type" : "type-5846", ++ "self_type" : "type-5845", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148766,8 +148808,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-6030", +- "self_type" : "type-6029", ++ "referenced_type" : "type-5982", ++ "self_type" : "type-5981", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148775,8 +148817,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-606", +- "self_type" : "type-605", ++ "referenced_type" : "type-6043", ++ "self_type" : "type-6042", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148784,8 +148826,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-6091", +- "self_type" : "type-6090", ++ "referenced_type" : "type-606", ++ "self_type" : "type-605", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148793,8 +148835,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-6204", +- "self_type" : "type-6203", ++ "referenced_type" : "type-6156", ++ "self_type" : "type-6155", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148802,8 +148844,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-6270", +- "self_type" : "type-6269", ++ "referenced_type" : "type-6222", ++ "self_type" : "type-6221", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148811,8 +148853,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-6413", +- "self_type" : "type-6412", ++ "referenced_type" : "type-6365", ++ "self_type" : "type-6364", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148820,8 +148862,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-6494", +- "self_type" : "type-6493", ++ "referenced_type" : "type-6446", ++ "self_type" : "type-6445", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148829,8 +148871,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-6766", +- "self_type" : "type-6765", ++ "referenced_type" : "type-6718", ++ "self_type" : "type-6717", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148838,8 +148880,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-7187", +- "self_type" : "type-7186", ++ "referenced_type" : "type-7139", ++ "self_type" : "type-7138", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148847,8 +148889,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-7275", +- "self_type" : "type-7274", ++ "referenced_type" : "type-7227", ++ "self_type" : "type-7226", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148865,8 +148907,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-7868", +- "self_type" : "type-7867", ++ "referenced_type" : "type-7820", ++ "self_type" : "type-7819", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148874,8 +148916,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-7882", +- "self_type" : "type-7881", ++ "referenced_type" : "type-7834", ++ "self_type" : "type-7833", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148883,8 +148925,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-7974", +- "self_type" : "type-7973", ++ "referenced_type" : "type-7926", ++ "self_type" : "type-7925", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148892,8 +148934,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-8600", +- "self_type" : "type-8599", ++ "referenced_type" : "type-8552", ++ "self_type" : "type-8551", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148901,8 +148943,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-8665", +- "self_type" : "type-8664", ++ "referenced_type" : "type-8617", ++ "self_type" : "type-8616", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148910,8 +148952,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-9151", +- "self_type" : "type-9150", ++ "referenced_type" : "type-9103", ++ "self_type" : "type-9102", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148919,8 +148961,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-9287", +- "self_type" : "type-9286", ++ "referenced_type" : "type-9239", ++ "self_type" : "type-9238", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148928,8 +148970,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-9348", +- "self_type" : "type-9347", ++ "referenced_type" : "type-9300", ++ "self_type" : "type-9299", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148937,8 +148979,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-9461", +- "self_type" : "type-9460", ++ "referenced_type" : "type-9413", ++ "self_type" : "type-9412", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148946,8 +148988,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-9527", +- "self_type" : "type-9526", ++ "referenced_type" : "type-9479", ++ "self_type" : "type-9478", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148955,8 +148997,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-9665", +- "self_type" : "type-9664", ++ "referenced_type" : "type-9617", ++ "self_type" : "type-9616", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148964,8 +149006,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-9744", +- "self_type" : "type-9743", ++ "referenced_type" : "type-9696", ++ "self_type" : "type-9695", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148973,8 +149015,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *", + "name" : "google::protobuf::io::ZeroCopyInputStream *", +- "referenced_type" : "type-9913", +- "self_type" : "type-9912", ++ "referenced_type" : "type-9865", ++ "self_type" : "type-9864", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -148982,8 +149024,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *const *", + "name" : "google::protobuf::io::ZeroCopyInputStream *const *", +- "referenced_type" : "type-1617", +- "self_type" : "type-1616", ++ "referenced_type" : "type-1533", ++ "self_type" : "type-1532", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -148991,8 +149033,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-10277", +- "self_type" : "type-10276", ++ "referenced_type" : "type-10229", ++ "self_type" : "type-10228", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149000,8 +149042,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-10323", +- "self_type" : "type-10322", ++ "referenced_type" : "type-10275", ++ "self_type" : "type-10274", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149009,8 +149051,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-10783", +- "self_type" : "type-10782", ++ "referenced_type" : "type-10735", ++ "self_type" : "type-10734", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149018,8 +149060,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-10814", +- "self_type" : "type-10813", ++ "referenced_type" : "type-10766", ++ "self_type" : "type-10765", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149027,8 +149069,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-10874", +- "self_type" : "type-10873", ++ "referenced_type" : "type-10826", ++ "self_type" : "type-10825", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149036,8 +149078,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-11170", +- "self_type" : "type-11169", ++ "referenced_type" : "type-11122", ++ "self_type" : "type-11121", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149045,8 +149087,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-11507", +- "self_type" : "type-11506", ++ "referenced_type" : "type-11459", ++ "self_type" : "type-11458", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149054,8 +149096,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-11931", +- "self_type" : "type-11930", ++ "referenced_type" : "type-11883", ++ "self_type" : "type-11882", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149063,8 +149105,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-11996", +- "self_type" : "type-11995", ++ "referenced_type" : "type-11948", ++ "self_type" : "type-11947", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149072,8 +149114,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-12485", +- "self_type" : "type-12484", ++ "referenced_type" : "type-12437", ++ "self_type" : "type-12436", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149081,8 +149123,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-12511", +- "self_type" : "type-12510", ++ "referenced_type" : "type-12463", ++ "self_type" : "type-12462", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149090,8 +149132,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-12682", +- "self_type" : "type-12681", ++ "referenced_type" : "type-12634", ++ "self_type" : "type-12633", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149099,8 +149141,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-12795", +- "self_type" : "type-12794", ++ "referenced_type" : "type-12747", ++ "self_type" : "type-12746", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149108,8 +149150,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-12861", +- "self_type" : "type-12860", ++ "referenced_type" : "type-12813", ++ "self_type" : "type-12812", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149117,8 +149159,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-12999", +- "self_type" : "type-12998", ++ "referenced_type" : "type-12951", ++ "self_type" : "type-12950", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149126,8 +149168,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-13078", +- "self_type" : "type-13077", ++ "referenced_type" : "type-13030", ++ "self_type" : "type-13029", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149135,8 +149177,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-13247", +- "self_type" : "type-13246", ++ "referenced_type" : "type-13199", ++ "self_type" : "type-13198", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149144,8 +149186,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-13568", +- "self_type" : "type-13567", ++ "referenced_type" : "type-1334", ++ "self_type" : "type-1333", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149153,8 +149195,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-13614", +- "self_type" : "type-13613", ++ "referenced_type" : "type-13520", ++ "self_type" : "type-13519", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149162,8 +149204,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-14074", +- "self_type" : "type-14073", ++ "referenced_type" : "type-13566", ++ "self_type" : "type-13565", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149171,8 +149213,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-14105", +- "self_type" : "type-14104", ++ "referenced_type" : "type-14026", ++ "self_type" : "type-14025", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149180,8 +149222,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-1416", +- "self_type" : "type-1415", ++ "referenced_type" : "type-14057", ++ "self_type" : "type-14056", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149189,8 +149231,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-14165", +- "self_type" : "type-14164", ++ "referenced_type" : "type-14117", ++ "self_type" : "type-14116", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149198,8 +149240,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-14434", +- "self_type" : "type-14433", ++ "referenced_type" : "type-14386", ++ "self_type" : "type-14385", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149207,8 +149249,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-14727", +- "self_type" : "type-14726", ++ "referenced_type" : "type-14679", ++ "self_type" : "type-14678", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149216,8 +149258,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-15158", +- "self_type" : "type-15157", ++ "referenced_type" : "type-15110", ++ "self_type" : "type-15109", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149225,8 +149267,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-15787", +- "self_type" : "type-15786", ++ "referenced_type" : "type-15739", ++ "self_type" : "type-15738", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149234,8 +149276,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-15852", +- "self_type" : "type-15851", ++ "referenced_type" : "type-15804", ++ "self_type" : "type-15803", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149243,8 +149285,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-16342", +- "self_type" : "type-16341", ++ "referenced_type" : "type-16294", ++ "self_type" : "type-16293", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149252,8 +149294,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-16368", +- "self_type" : "type-16367", ++ "referenced_type" : "type-16320", ++ "self_type" : "type-16319", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149261,8 +149303,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-16538", +- "self_type" : "type-16537", ++ "referenced_type" : "type-16490", ++ "self_type" : "type-16489", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149270,8 +149312,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-16651", +- "self_type" : "type-16650", ++ "referenced_type" : "type-16603", ++ "self_type" : "type-16602", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149279,8 +149321,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-16717", +- "self_type" : "type-16716", ++ "referenced_type" : "type-16669", ++ "self_type" : "type-16668", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149288,8 +149330,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-16855", +- "self_type" : "type-16854", ++ "referenced_type" : "type-16807", ++ "self_type" : "type-16806", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149297,8 +149339,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-16934", +- "self_type" : "type-16933", ++ "referenced_type" : "type-16886", ++ "self_type" : "type-16885", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149306,8 +149348,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-17103", +- "self_type" : "type-17102", ++ "referenced_type" : "type-17055", ++ "self_type" : "type-17054", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149315,8 +149357,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-17432", +- "self_type" : "type-17431", ++ "referenced_type" : "type-17384", ++ "self_type" : "type-17383", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149324,8 +149366,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-17478", +- "self_type" : "type-17477", ++ "referenced_type" : "type-17430", ++ "self_type" : "type-17429", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149333,8 +149375,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-17938", +- "self_type" : "type-17937", ++ "referenced_type" : "type-17890", ++ "self_type" : "type-17889", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149342,8 +149384,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-17969", +- "self_type" : "type-17968", ++ "referenced_type" : "type-17921", ++ "self_type" : "type-17920", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149351,8 +149393,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-18029", +- "self_type" : "type-18028", ++ "referenced_type" : "type-17981", ++ "self_type" : "type-17980", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149360,8 +149402,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-18298", +- "self_type" : "type-18297", ++ "referenced_type" : "type-18250", ++ "self_type" : "type-18249", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149369,8 +149411,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-18591", +- "self_type" : "type-18590", ++ "referenced_type" : "type-18543", ++ "self_type" : "type-18542", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149378,8 +149420,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-18942", +- "self_type" : "type-18941", ++ "referenced_type" : "type-18894", ++ "self_type" : "type-18893", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149387,8 +149429,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-19183", +- "self_type" : "type-19182", ++ "referenced_type" : "type-19135", ++ "self_type" : "type-19134", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149396,8 +149438,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-20321", +- "self_type" : "type-20320", ++ "referenced_type" : "type-20273", ++ "self_type" : "type-20272", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149405,8 +149447,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-20386", +- "self_type" : "type-20385", ++ "referenced_type" : "type-20338", ++ "self_type" : "type-20337", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149414,8 +149456,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-20873", +- "self_type" : "type-20872", ++ "referenced_type" : "type-20825", ++ "self_type" : "type-20824", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149423,8 +149465,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-20899", +- "self_type" : "type-20898", ++ "referenced_type" : "type-20851", ++ "self_type" : "type-20850", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149432,8 +149474,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-21070", +- "self_type" : "type-21069", ++ "referenced_type" : "type-21022", ++ "self_type" : "type-21021", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149441,8 +149483,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-21183", +- "self_type" : "type-21182", ++ "referenced_type" : "type-21135", ++ "self_type" : "type-21134", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149450,8 +149492,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-21249", +- "self_type" : "type-21248", ++ "referenced_type" : "type-21201", ++ "self_type" : "type-21200", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149459,8 +149501,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-21387", +- "self_type" : "type-21386", ++ "referenced_type" : "type-2121", ++ "self_type" : "type-2120", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149468,8 +149510,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-21466", +- "self_type" : "type-21465", ++ "referenced_type" : "type-21339", ++ "self_type" : "type-21338", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149477,8 +149519,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-21635", +- "self_type" : "type-21634", ++ "referenced_type" : "type-21418", ++ "self_type" : "type-21417", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149486,8 +149528,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-2190", +- "self_type" : "type-2189", ++ "referenced_type" : "type-21587", ++ "self_type" : "type-21586", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149495,8 +149537,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-21961", +- "self_type" : "type-21960", ++ "referenced_type" : "type-21963", ++ "self_type" : "type-21962", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149504,8 +149546,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-22007", +- "self_type" : "type-22006", ++ "referenced_type" : "type-22005", ++ "self_type" : "type-22004", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149513,8 +149555,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-22467", +- "self_type" : "type-22466", ++ "referenced_type" : "type-2221", ++ "self_type" : "type-2220", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149522,8 +149564,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-22498", +- "self_type" : "type-22497", ++ "referenced_type" : "type-22410", ++ "self_type" : "type-22409", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149531,8 +149573,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-22558", +- "self_type" : "type-22557", ++ "referenced_type" : "type-22479", ++ "self_type" : "type-22478", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149540,8 +149582,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-22827", +- "self_type" : "type-22826", ++ "referenced_type" : "type-22776", ++ "self_type" : "type-22775", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149549,8 +149591,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-2292", +- "self_type" : "type-2291", ++ "referenced_type" : "type-23023", ++ "self_type" : "type-23022", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149558,8 +149600,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-23120", +- "self_type" : "type-23119", ++ "referenced_type" : "type-23106", ++ "self_type" : "type-23105", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149567,8 +149609,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-23471", +- "self_type" : "type-23470", ++ "referenced_type" : "type-23448", ++ "self_type" : "type-23447", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149576,8 +149618,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-23712", +- "self_type" : "type-23711", ++ "referenced_type" : "type-23701", ++ "self_type" : "type-23700", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149585,8 +149627,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-25497", +- "self_type" : "type-25496", ++ "referenced_type" : "type-25547", ++ "self_type" : "type-25546", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149594,8 +149636,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-25562", +- "self_type" : "type-25561", ++ "referenced_type" : "type-25614", ++ "self_type" : "type-25613", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149603,8 +149645,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-26051", +- "self_type" : "type-26050", ++ "referenced_type" : "type-26100", ++ "self_type" : "type-26099", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149612,8 +149654,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-26077", +- "self_type" : "type-26076", ++ "referenced_type" : "type-26126", ++ "self_type" : "type-26125", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149621,8 +149663,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-26248", +- "self_type" : "type-26247", ++ "referenced_type" : "type-26290", ++ "self_type" : "type-26289", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149630,8 +149672,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-26361", +- "self_type" : "type-26360", ++ "referenced_type" : "type-26402", ++ "self_type" : "type-26401", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149639,8 +149681,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-26427", +- "self_type" : "type-26426", ++ "referenced_type" : "type-26469", ++ "self_type" : "type-26468", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149648,8 +149690,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-26565", +- "self_type" : "type-26564", ++ "referenced_type" : "type-26593", ++ "self_type" : "type-26592", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149657,8 +149699,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-26644", +- "self_type" : "type-26643", ++ "referenced_type" : "type-26667", ++ "self_type" : "type-26666", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149666,8 +149708,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-26813", +- "self_type" : "type-26812", ++ "referenced_type" : "type-26838", ++ "self_type" : "type-26837", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149675,8 +149717,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-27146", +- "self_type" : "type-27145", ++ "referenced_type" : "type-27145", ++ "self_type" : "type-27144", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149684,8 +149726,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-27192", +- "self_type" : "type-27191", ++ "referenced_type" : "type-27191", ++ "self_type" : "type-27190", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149693,8 +149735,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-27652", +- "self_type" : "type-27651", ++ "referenced_type" : "type-27651", ++ "self_type" : "type-27650", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149702,8 +149744,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-27683", +- "self_type" : "type-27682", ++ "referenced_type" : "type-27682", ++ "self_type" : "type-27681", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149711,8 +149753,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-27743", +- "self_type" : "type-27742", ++ "referenced_type" : "type-27742", ++ "self_type" : "type-27741", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149720,8 +149762,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-28012", +- "self_type" : "type-28011", ++ "referenced_type" : "type-2796", ++ "self_type" : "type-2795", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149729,8 +149771,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-28305", +- "self_type" : "type-28304", ++ "referenced_type" : "type-28011", ++ "self_type" : "type-28010", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149738,8 +149780,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-2844", +- "self_type" : "type-2843", ++ "referenced_type" : "type-28304", ++ "self_type" : "type-28303", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149747,8 +149789,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-28656", +- "self_type" : "type-28655", ++ "referenced_type" : "type-28655", ++ "self_type" : "type-28654", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149756,8 +149798,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-28897", +- "self_type" : "type-28896", ++ "referenced_type" : "type-28896", ++ "self_type" : "type-28895", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149765,8 +149807,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-30643", +- "self_type" : "type-30642", ++ "referenced_type" : "type-30642", ++ "self_type" : "type-30641", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149774,8 +149816,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-30708", +- "self_type" : "type-30707", ++ "referenced_type" : "type-30707", ++ "self_type" : "type-30706", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149783,8 +149825,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-31198", +- "self_type" : "type-31197", ++ "referenced_type" : "type-31197", ++ "self_type" : "type-31196", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149792,8 +149834,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-31224", +- "self_type" : "type-31223", ++ "referenced_type" : "type-31223", ++ "self_type" : "type-31222", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149801,8 +149843,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-31395", +- "self_type" : "type-31394", ++ "referenced_type" : "type-31394", ++ "self_type" : "type-31393", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149810,8 +149852,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-31508", +- "self_type" : "type-31507", ++ "referenced_type" : "type-31507", ++ "self_type" : "type-31506", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149819,8 +149861,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-31574", +- "self_type" : "type-31573", ++ "referenced_type" : "type-31573", ++ "self_type" : "type-31572", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149828,8 +149870,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-31712", +- "self_type" : "type-31711", ++ "referenced_type" : "type-31711", ++ "self_type" : "type-31710", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149837,8 +149879,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-31791", +- "self_type" : "type-31790", ++ "referenced_type" : "type-31790", ++ "self_type" : "type-31789", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149846,8 +149888,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-31960", +- "self_type" : "type-31959", ++ "referenced_type" : "type-31959", ++ "self_type" : "type-31958", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149855,8 +149897,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-3348", +- "self_type" : "type-3347", ++ "referenced_type" : "type-3300", ++ "self_type" : "type-3299", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149864,8 +149906,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-3413", +- "self_type" : "type-3412", ++ "referenced_type" : "type-3365", ++ "self_type" : "type-3364", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149873,8 +149915,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-3988", +- "self_type" : "type-3987", ++ "referenced_type" : "type-3940", ++ "self_type" : "type-3939", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149882,8 +149924,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-4015", +- "self_type" : "type-4014", ++ "referenced_type" : "type-3967", ++ "self_type" : "type-3966", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149891,8 +149933,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-4239", +- "self_type" : "type-4238", ++ "referenced_type" : "type-4191", ++ "self_type" : "type-4190", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149900,8 +149942,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-4381", +- "self_type" : "type-4380", ++ "referenced_type" : "type-4333", ++ "self_type" : "type-4332", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149909,8 +149951,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-4450", +- "self_type" : "type-4449", ++ "referenced_type" : "type-4402", ++ "self_type" : "type-4401", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149918,8 +149960,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-4693", +- "self_type" : "type-4692", ++ "referenced_type" : "type-4645", ++ "self_type" : "type-4644", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149927,8 +149969,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-4824", +- "self_type" : "type-4823", ++ "referenced_type" : "type-4776", ++ "self_type" : "type-4775", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149936,8 +149978,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-5328", +- "self_type" : "type-5327", ++ "referenced_type" : "type-5280", ++ "self_type" : "type-5279", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149945,8 +149987,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-5393", +- "self_type" : "type-5392", ++ "referenced_type" : "type-5345", ++ "self_type" : "type-5344", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149954,8 +149996,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-5896", +- "self_type" : "type-5895", ++ "referenced_type" : "type-5848", ++ "self_type" : "type-5847", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149963,8 +150005,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-5922", +- "self_type" : "type-5921", ++ "referenced_type" : "type-5874", ++ "self_type" : "type-5873", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149972,8 +150014,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-6093", +- "self_type" : "type-6092", ++ "referenced_type" : "type-6045", ++ "self_type" : "type-6044", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149981,8 +150023,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-617", +- "self_type" : "type-616", ++ "referenced_type" : "type-6158", ++ "self_type" : "type-6157", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149990,8 +150032,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-6206", +- "self_type" : "type-6205", ++ "referenced_type" : "type-617", ++ "self_type" : "type-616", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -149999,8 +150041,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-6272", +- "self_type" : "type-6271", ++ "referenced_type" : "type-6224", ++ "self_type" : "type-6223", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -150008,8 +150050,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-6415", +- "self_type" : "type-6414", ++ "referenced_type" : "type-6367", ++ "self_type" : "type-6366", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -150017,8 +150059,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-6496", +- "self_type" : "type-6495", ++ "referenced_type" : "type-6448", ++ "self_type" : "type-6447", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -150026,8 +150068,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-6768", +- "self_type" : "type-6767", ++ "referenced_type" : "type-6720", ++ "self_type" : "type-6719", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -150035,8 +150077,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-7189", +- "self_type" : "type-7188", ++ "referenced_type" : "type-7141", ++ "self_type" : "type-7140", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -150044,8 +150086,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-7277", +- "self_type" : "type-7276", ++ "referenced_type" : "type-7229", ++ "self_type" : "type-7228", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -150062,8 +150104,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-7870", +- "self_type" : "type-7869", ++ "referenced_type" : "type-7822", ++ "self_type" : "type-7821", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -150071,8 +150113,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-7916", +- "self_type" : "type-7915", ++ "referenced_type" : "type-7868", ++ "self_type" : "type-7867", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -150080,8 +150122,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-7976", +- "self_type" : "type-7975", ++ "referenced_type" : "type-7928", ++ "self_type" : "type-7927", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -150089,8 +150131,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-8602", +- "self_type" : "type-8601", ++ "referenced_type" : "type-8554", ++ "self_type" : "type-8553", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -150098,8 +150140,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-8667", +- "self_type" : "type-8666", ++ "referenced_type" : "type-8619", ++ "self_type" : "type-8618", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -150107,8 +150149,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-9153", +- "self_type" : "type-9152", ++ "referenced_type" : "type-9105", ++ "self_type" : "type-9104", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -150116,8 +150158,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-9179", +- "self_type" : "type-9178", ++ "referenced_type" : "type-9131", ++ "self_type" : "type-9130", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -150125,8 +150167,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-9350", +- "self_type" : "type-9349", ++ "referenced_type" : "type-9302", ++ "self_type" : "type-9301", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -150134,8 +150176,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-9463", +- "self_type" : "type-9462", ++ "referenced_type" : "type-9415", ++ "self_type" : "type-9414", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -150143,8 +150185,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-9529", +- "self_type" : "type-9528", ++ "referenced_type" : "type-9481", ++ "self_type" : "type-9480", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -150152,8 +150194,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-9667", +- "self_type" : "type-9666", ++ "referenced_type" : "type-9619", ++ "self_type" : "type-9618", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -150161,8 +150203,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-9746", +- "self_type" : "type-9745", ++ "referenced_type" : "type-9698", ++ "self_type" : "type-9697", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -150170,8 +150212,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *", + "name" : "google::protobuf::io::ZeroCopyOutputStream *", +- "referenced_type" : "type-9915", +- "self_type" : "type-9914", ++ "referenced_type" : "type-9867", ++ "self_type" : "type-9866", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -150234,7 +150276,7 @@ + "linker_set_key" : "google::protobuf::strings::Hex *", + "name" : "google::protobuf::strings::Hex *", + "referenced_type" : "type-100", +- "self_type" : "type-7773", ++ "self_type" : "type-7725", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -150278,8 +150320,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::strings::internal::SubstituteArg *", + "name" : "google::protobuf::strings::internal::SubstituteArg *", +- "referenced_type" : "type-3632", +- "self_type" : "type-3633", ++ "referenced_type" : "type-3584", ++ "self_type" : "type-3585", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/substitute.h" + }, +@@ -150296,8 +150338,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::DefaultFieldComparator *", + "name" : "google::protobuf::util::DefaultFieldComparator *", +- "referenced_type" : "type-14817", +- "self_type" : "type-14821", ++ "referenced_type" : "type-14769", ++ "self_type" : "type-14773", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/field_comparator.h" + }, +@@ -150305,8 +150347,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::DefaultFieldComparator::Tolerance *", + "name" : "google::protobuf::util::DefaultFieldComparator::Tolerance *", +- "referenced_type" : "type-14819", +- "self_type" : "type-14827", ++ "referenced_type" : "type-14771", ++ "self_type" : "type-14779", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/field_comparator.h" + }, +@@ -150314,8 +150356,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::FieldComparator *", + "name" : "google::protobuf::util::FieldComparator *", +- "referenced_type" : "type-14814", +- "self_type" : "type-14815", ++ "referenced_type" : "type-14766", ++ "self_type" : "type-14767", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/field_comparator.h" + }, +@@ -150323,8 +150365,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::FieldContext *", + "name" : "google::protobuf::util::FieldContext *", +- "referenced_type" : "type-25018", +- "self_type" : "type-25023", ++ "referenced_type" : "type-24987", ++ "self_type" : "type-24992", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h" + }, +@@ -150332,8 +150374,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::FieldMaskUtil::MergeOptions *", + "name" : "google::protobuf::util::FieldMaskUtil::MergeOptions *", +- "referenced_type" : "type-14952", +- "self_type" : "type-14954", ++ "referenced_type" : "type-14904", ++ "self_type" : "type-14906", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/field_mask_util.h" + }, +@@ -150341,8 +150383,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::JsonOptions *", + "name" : "google::protobuf::util::JsonOptions *", +- "referenced_type" : "type-24757", +- "self_type" : "type-24758", ++ "referenced_type" : "type-24715", ++ "self_type" : "type-24716", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/json_util.h" + }, +@@ -150350,8 +150392,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::MessageDifferencer *", + "name" : "google::protobuf::util::MessageDifferencer *", +- "referenced_type" : "type-24908", +- "self_type" : "type-24907", ++ "referenced_type" : "type-24875", ++ "self_type" : "type-24874", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -150359,8 +150401,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::MessageDifferencer::IgnoreCriteria *", + "name" : "google::protobuf::util::MessageDifferencer::IgnoreCriteria *", +- "referenced_type" : "type-25000", +- "self_type" : "type-25001", ++ "referenced_type" : "type-24969", ++ "self_type" : "type-24970", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h" + }, +@@ -150368,8 +150410,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::MessageDifferencer::MapKeyComparator *", + "name" : "google::protobuf::util::MessageDifferencer::MapKeyComparator *", +- "referenced_type" : "type-24900", +- "self_type" : "type-24999", ++ "referenced_type" : "type-24867", ++ "self_type" : "type-24968", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h" + }, +@@ -150377,8 +150419,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::MessageDifferencer::Reporter *", + "name" : "google::protobuf::util::MessageDifferencer::Reporter *", +- "referenced_type" : "type-24910", +- "self_type" : "type-24909", ++ "referenced_type" : "type-24877", ++ "self_type" : "type-24876", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h" + }, +@@ -150386,8 +150428,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::MessageDifferencer::SpecificField *", + "name" : "google::protobuf::util::MessageDifferencer::SpecificField *", +- "referenced_type" : "type-24996", +- "self_type" : "type-24998", ++ "referenced_type" : "type-24965", ++ "self_type" : "type-24967", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h" + }, +@@ -150395,8 +150437,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::MessageDifferencer::StreamReporter *", + "name" : "google::protobuf::util::MessageDifferencer::StreamReporter *", +- "referenced_type" : "type-25011", +- "self_type" : "type-25012", ++ "referenced_type" : "type-24980", ++ "self_type" : "type-24981", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h" + }, +@@ -150404,8 +150446,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::Status (*)(const google::protobuf::util::converter::ProtoStreamObjectSource *, const google::protobuf::Type &, google::protobuf::StringPiece, google::protobuf::util::converter::ObjectWriter *)", + "name" : "google::protobuf::util::Status (*)(const google::protobuf::util::converter::ProtoStreamObjectSource *, const google::protobuf::Type &, google::protobuf::StringPiece, google::protobuf::util::converter::ObjectWriter *)", +- "referenced_type" : "type-19369", +- "self_type" : "type-19368", ++ "referenced_type" : "type-19321", ++ "self_type" : "type-19320", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -150413,8 +150455,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::Status (*)(google::protobuf::util::converter::ProtoStreamObjectWriter *, const google::protobuf::util::converter::DataPiece &)", + "name" : "google::protobuf::util::Status (*)(google::protobuf::util::converter::ProtoStreamObjectWriter *, const google::protobuf::util::converter::DataPiece &)", +- "referenced_type" : "type-19502", +- "self_type" : "type-19501", ++ "referenced_type" : "type-19454", ++ "self_type" : "type-19453", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -150422,8 +150464,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::Status (*)(google::protobuf::util::converter::ProtoStreamObjectWriter *, google::protobuf::StringPiece)", + "name" : "google::protobuf::util::Status (*)(google::protobuf::util::converter::ProtoStreamObjectWriter *, google::protobuf::StringPiece)", +- "referenced_type" : "type-19488", +- "self_type" : "type-19487", ++ "referenced_type" : "type-19440", ++ "self_type" : "type-19439", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -150431,8 +150473,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::Status (**)(const google::protobuf::util::converter::ProtoStreamObjectSource *, const google::protobuf::Type &, google::protobuf::StringPiece, google::protobuf::util::converter::ObjectWriter *)", + "name" : "google::protobuf::util::Status (**)(const google::protobuf::util::converter::ProtoStreamObjectSource *, const google::protobuf::Type &, google::protobuf::StringPiece, google::protobuf::util::converter::ObjectWriter *)", +- "referenced_type" : "type-19368", +- "self_type" : "type-19479", ++ "referenced_type" : "type-19320", ++ "self_type" : "type-19431", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h" + }, +@@ -150440,8 +150482,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::Status (**)(google::protobuf::util::converter::ProtoStreamObjectWriter *, const google::protobuf::util::converter::DataPiece &)", + "name" : "google::protobuf::util::Status (**)(google::protobuf::util::converter::ProtoStreamObjectWriter *, const google::protobuf::util::converter::DataPiece &)", +- "referenced_type" : "type-19501", +- "self_type" : "type-19500", ++ "referenced_type" : "type-19453", ++ "self_type" : "type-19452", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, +@@ -150458,8 +150500,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::StatusOr *", + "name" : "google::protobuf::util::StatusOr *", +- "referenced_type" : "type-15029", +- "self_type" : "type-15030", ++ "referenced_type" : "type-14981", ++ "self_type" : "type-14982", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -150467,8 +150509,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::StatusOr *", + "name" : "google::protobuf::util::StatusOr *", +- "referenced_type" : "type-20003", +- "self_type" : "type-20004", ++ "referenced_type" : "type-19955", ++ "self_type" : "type-19956", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -150476,8 +150518,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::StatusOr *", + "name" : "google::protobuf::util::StatusOr *", +- "referenced_type" : "type-15325", +- "self_type" : "type-20000", ++ "referenced_type" : "type-15277", ++ "self_type" : "type-19952", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -150485,8 +150527,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::StatusOr *", + "name" : "google::protobuf::util::StatusOr *", +- "referenced_type" : "type-15023", +- "self_type" : "type-15024", ++ "referenced_type" : "type-14975", ++ "self_type" : "type-14976", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -150494,8 +150536,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::StatusOr *", + "name" : "google::protobuf::util::StatusOr *", +- "referenced_type" : "type-15025", +- "self_type" : "type-15028", ++ "referenced_type" : "type-14977", ++ "self_type" : "type-14980", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -150503,8 +150545,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::StatusOr *", + "name" : "google::protobuf::util::StatusOr *", +- "referenced_type" : "type-15013", +- "self_type" : "type-15014", ++ "referenced_type" : "type-14965", ++ "self_type" : "type-14966", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -150512,8 +150554,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::StatusOr *", + "name" : "google::protobuf::util::StatusOr *", +- "referenced_type" : "type-15019", +- "self_type" : "type-15020", ++ "referenced_type" : "type-14971", ++ "self_type" : "type-14972", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -150521,8 +150563,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::StatusOr, std::allocator > > *", + "name" : "google::protobuf::util::StatusOr, std::allocator > > *", +- "referenced_type" : "type-15031", +- "self_type" : "type-15034", ++ "referenced_type" : "type-14983", ++ "self_type" : "type-14986", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -150530,8 +150572,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::StatusOr *", + "name" : "google::protobuf::util::StatusOr *", +- "referenced_type" : "type-15017", +- "self_type" : "type-15018", ++ "referenced_type" : "type-14969", ++ "self_type" : "type-14970", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -150539,8 +150581,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::StatusOr *", + "name" : "google::protobuf::util::StatusOr *", +- "referenced_type" : "type-15021", +- "self_type" : "type-15022", ++ "referenced_type" : "type-14973", ++ "self_type" : "type-14974", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -150548,8 +150590,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::TypeResolver *", + "name" : "google::protobuf::util::TypeResolver *", +- "referenced_type" : "type-15323", +- "self_type" : "type-15324", ++ "referenced_type" : "type-15275", ++ "self_type" : "type-15276", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/type_resolver.h" + }, +@@ -150557,8 +150599,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::DataPiece *", + "name" : "google::protobuf::util::converter::DataPiece *", +- "referenced_type" : "type-15044", +- "self_type" : "type-15047", ++ "referenced_type" : "type-14996", ++ "self_type" : "type-14999", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, +@@ -150566,8 +150608,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::DefaultValueObjectWriter *", + "name" : "google::protobuf::util::converter::DefaultValueObjectWriter *", +- "referenced_type" : "type-15348", +- "self_type" : "type-15354", ++ "referenced_type" : "type-15300", ++ "self_type" : "type-15306", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h" + }, +@@ -150575,8 +150617,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::DefaultValueObjectWriter::Node *", + "name" : "google::protobuf::util::converter::DefaultValueObjectWriter::Node *", +- "referenced_type" : "type-15232", +- "self_type" : "type-15231", ++ "referenced_type" : "type-15184", ++ "self_type" : "type-15183", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -150584,8 +150626,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ErrorListener *", + "name" : "google::protobuf::util::converter::ErrorListener *", +- "referenced_type" : "type-15380", +- "self_type" : "type-15381", ++ "referenced_type" : "type-15332", ++ "self_type" : "type-15333", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/error_listener.h" + }, +@@ -150593,8 +150635,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::JsonEscaping *", + "name" : "google::protobuf::util::converter::JsonEscaping *", +- "referenced_type" : "type-15413", +- "self_type" : "type-15414", ++ "referenced_type" : "type-15365", ++ "self_type" : "type-15366", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_escaping.h" + }, +@@ -150602,8 +150644,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::JsonObjectWriter *", + "name" : "google::protobuf::util::converter::JsonObjectWriter *", +- "referenced_type" : "type-19197", +- "self_type" : "type-19200", ++ "referenced_type" : "type-19149", ++ "self_type" : "type-19152", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, +@@ -150611,8 +150653,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::JsonObjectWriter::ByteSinkWrapper *", + "name" : "google::protobuf::util::converter::JsonObjectWriter::ByteSinkWrapper *", +- "referenced_type" : "type-19199", +- "self_type" : "type-19201", ++ "referenced_type" : "type-19151", ++ "self_type" : "type-19153", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_objectwriter.h" + }, +@@ -150620,8 +150662,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::JsonObjectWriter::Element *", + "name" : "google::protobuf::util::converter::JsonObjectWriter::Element *", +- "referenced_type" : "type-19186", +- "self_type" : "type-19185", ++ "referenced_type" : "type-19138", ++ "self_type" : "type-19137", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -150629,8 +150671,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::JsonStreamParser *", + "name" : "google::protobuf::util::converter::JsonStreamParser *", +- "referenced_type" : "type-19331", +- "self_type" : "type-19337", ++ "referenced_type" : "type-19283", ++ "self_type" : "type-19289", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h" + }, +@@ -150638,8 +150680,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::JsonStreamParser::NumberResult *", + "name" : "google::protobuf::util::converter::JsonStreamParser::NumberResult *", +- "referenced_type" : "type-19340", +- "self_type" : "type-19343", ++ "referenced_type" : "type-19292", ++ "self_type" : "type-19295", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/json_stream_parser.h" + }, +@@ -150647,8 +150689,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::LocationTrackerInterface *", + "name" : "google::protobuf::util::converter::LocationTrackerInterface *", +- "referenced_type" : "type-15385", +- "self_type" : "type-15394", ++ "referenced_type" : "type-15337", ++ "self_type" : "type-15346", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/location_tracker.h" + }, +@@ -150656,8 +150698,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::NoopErrorListener *", + "name" : "google::protobuf::util::converter::NoopErrorListener *", +- "referenced_type" : "type-15382", +- "self_type" : "type-15383", ++ "referenced_type" : "type-15334", ++ "self_type" : "type-15335", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/error_listener.h" + }, +@@ -150665,8 +150707,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ObjectLocationTracker *", + "name" : "google::protobuf::util::converter::ObjectLocationTracker *", +- "referenced_type" : "type-19692", +- "self_type" : "type-19693", ++ "referenced_type" : "type-19644", ++ "self_type" : "type-19645", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/object_location_tracker.h" + }, +@@ -150674,8 +150716,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ObjectSource *", + "name" : "google::protobuf::util::converter::ObjectSource *", +- "referenced_type" : "type-19374", +- "self_type" : "type-19475", ++ "referenced_type" : "type-19326", ++ "self_type" : "type-19427", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/object_source.h" + }, +@@ -150683,8 +150725,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ObjectWriter *", + "name" : "google::protobuf::util::converter::ObjectWriter *", +- "referenced_type" : "type-15344", +- "self_type" : "type-15345", ++ "referenced_type" : "type-15296", ++ "self_type" : "type-15297", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/object_writer.h" + }, +@@ -150692,8 +150734,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectSource *", + "name" : "google::protobuf::util::converter::ProtoStreamObjectSource *", +- "referenced_type" : "type-19372", +- "self_type" : "type-19478", ++ "referenced_type" : "type-19324", ++ "self_type" : "type-19430", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h" + }, +@@ -150701,8 +150743,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectWriter *", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter *", +- "referenced_type" : "type-19490", +- "self_type" : "type-19489", ++ "referenced_type" : "type-19442", ++ "self_type" : "type-19441", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -150710,8 +150752,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectWriter::AnyWriter *", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter::AnyWriter *", +- "referenced_type" : "type-19496", +- "self_type" : "type-19495", ++ "referenced_type" : "type-19448", ++ "self_type" : "type-19447", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -150719,8 +150761,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Item *", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Item *", +- "referenced_type" : "type-19493", +- "self_type" : "type-19492", ++ "referenced_type" : "type-19445", ++ "self_type" : "type-19444", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -150728,8 +150770,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Options *", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Options *", +- "referenced_type" : "type-19505", +- "self_type" : "type-19687", ++ "referenced_type" : "type-19457", ++ "self_type" : "type-19639", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, +@@ -150737,8 +150779,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoWriter *", + "name" : "google::protobuf::util::converter::ProtoWriter *", +- "referenced_type" : "type-19506", +- "self_type" : "type-19510", ++ "referenced_type" : "type-19458", ++ "self_type" : "type-19462", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, +@@ -150746,8 +150788,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::ProtoWriter::ProtoElement *", + "name" : "google::protobuf::util::converter::ProtoWriter::ProtoElement *", +- "referenced_type" : "type-19509", +- "self_type" : "type-19508", ++ "referenced_type" : "type-19461", ++ "self_type" : "type-19460", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -150755,8 +150797,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::StructuredObjectWriter *", + "name" : "google::protobuf::util::converter::StructuredObjectWriter *", +- "referenced_type" : "type-19191", +- "self_type" : "type-19192", ++ "referenced_type" : "type-19143", ++ "self_type" : "type-19144", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/structured_objectwriter.h" + }, +@@ -150764,8 +150806,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::StructuredObjectWriter::BaseElement *", + "name" : "google::protobuf::util::converter::StructuredObjectWriter::BaseElement *", +- "referenced_type" : "type-19187", +- "self_type" : "type-19189", ++ "referenced_type" : "type-19139", ++ "self_type" : "type-19141", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -150773,8 +150815,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::TypeInfo *", + "name" : "google::protobuf::util::converter::TypeInfo *", +- "referenced_type" : "type-15342", +- "self_type" : "type-15343", ++ "referenced_type" : "type-15294", ++ "self_type" : "type-15295", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/type_info.h" + }, +@@ -150782,8 +150824,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::converter::testing::TypeInfoTestHelper *", + "name" : "google::protobuf::util::converter::testing::TypeInfoTestHelper *", +- "referenced_type" : "type-24640", +- "self_type" : "type-24642", ++ "referenced_type" : "type-24608", ++ "self_type" : "type-24610", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/type_info_test_helper.h" + }, +@@ -150791,8 +150833,8 @@ + "alignment" : 4, + "linker_set_key" : "google::protobuf::util::internal::ZeroCopyStreamByteSink *", + "name" : "google::protobuf::util::internal::ZeroCopyStreamByteSink *", +- "referenced_type" : "type-24761", +- "self_type" : "type-24762", ++ "referenced_type" : "type-24720", ++ "self_type" : "type-24721", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/json_util.h" + }, +@@ -150827,8 +150869,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__1::basic_string (*)(google::protobuf::StringPiece)", + "name" : "std::__1::basic_string (*)(google::protobuf::StringPiece)", +- "referenced_type" : "type-15396", +- "self_type" : "type-15395", ++ "referenced_type" : "type-15348", ++ "self_type" : "type-15347", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/field_mask_utility.h" + }, +@@ -150836,8 +150878,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node *", + "name" : "std::__tree_node *", +- "referenced_type" : "type-13131", +- "self_type" : "type-13130", ++ "referenced_type" : "type-13083", ++ "self_type" : "type-13082", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -150845,8 +150887,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node *", + "name" : "std::__tree_node *", +- "referenced_type" : "type-16987", +- "self_type" : "type-16986", ++ "referenced_type" : "type-16939", ++ "self_type" : "type-16938", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -150854,8 +150896,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node *", + "name" : "std::__tree_node *", +- "referenced_type" : "type-21519", +- "self_type" : "type-21518", ++ "referenced_type" : "type-21471", ++ "self_type" : "type-21470", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -150863,8 +150905,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node *", + "name" : "std::__tree_node *", +- "referenced_type" : "type-26697", +- "self_type" : "type-26696", ++ "referenced_type" : "type-26718", ++ "self_type" : "type-26717", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -150872,8 +150914,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node *", + "name" : "std::__tree_node *", +- "referenced_type" : "type-31844", +- "self_type" : "type-31843", ++ "referenced_type" : "type-31843", ++ "self_type" : "type-31842", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -150881,8 +150923,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node *", + "name" : "std::__tree_node *", +- "referenced_type" : "type-6622", +- "self_type" : "type-6621", ++ "referenced_type" : "type-6574", ++ "self_type" : "type-6573", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -150890,8 +150932,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node *", + "name" : "std::__tree_node *", +- "referenced_type" : "type-9799", +- "self_type" : "type-9798", ++ "referenced_type" : "type-9751", ++ "self_type" : "type-9750", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -150899,8 +150941,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node *>, void *> *", + "name" : "std::__tree_node *>, void *> *", +- "referenced_type" : "type-13121", +- "self_type" : "type-13120", ++ "referenced_type" : "type-13073", ++ "self_type" : "type-13072", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -150908,8 +150950,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node *>, void *> *", + "name" : "std::__tree_node *>, void *> *", +- "referenced_type" : "type-16977", +- "self_type" : "type-16976", ++ "referenced_type" : "type-16929", ++ "self_type" : "type-16928", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -150917,8 +150959,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node *>, void *> *", + "name" : "std::__tree_node *>, void *> *", +- "referenced_type" : "type-21509", +- "self_type" : "type-21508", ++ "referenced_type" : "type-21461", ++ "self_type" : "type-21460", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -150926,8 +150968,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node *>, void *> *", + "name" : "std::__tree_node *>, void *> *", +- "referenced_type" : "type-26687", +- "self_type" : "type-26686", ++ "referenced_type" : "type-26710", ++ "self_type" : "type-26709", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -150935,8 +150977,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node *>, void *> *", + "name" : "std::__tree_node *>, void *> *", +- "referenced_type" : "type-31834", +- "self_type" : "type-31833", ++ "referenced_type" : "type-31833", ++ "self_type" : "type-31832", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -150944,8 +150986,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node *>, void *> *", + "name" : "std::__tree_node *>, void *> *", +- "referenced_type" : "type-6606", +- "self_type" : "type-6605", ++ "referenced_type" : "type-6558", ++ "self_type" : "type-6557", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -150953,8 +150995,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node *>, void *> *", + "name" : "std::__tree_node *>, void *> *", +- "referenced_type" : "type-9789", +- "self_type" : "type-9788", ++ "referenced_type" : "type-9741", ++ "self_type" : "type-9740", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -150962,8 +151004,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", + "name" : "std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", +- "referenced_type" : "type-10405", +- "self_type" : "type-10404", ++ "referenced_type" : "type-10357", ++ "self_type" : "type-10356", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -150971,8 +151013,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", + "name" : "std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", +- "referenced_type" : "type-13696", +- "self_type" : "type-13695", ++ "referenced_type" : "type-13648", ++ "self_type" : "type-13647", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -150980,8 +151022,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", + "name" : "std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", +- "referenced_type" : "type-15082", +- "self_type" : "type-15081", ++ "referenced_type" : "type-15034", ++ "self_type" : "type-15033", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -150989,8 +151031,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", + "name" : "std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", +- "referenced_type" : "type-17560", +- "self_type" : "type-17559", ++ "referenced_type" : "type-17512", ++ "self_type" : "type-17511", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -150998,8 +151040,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", + "name" : "std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", +- "referenced_type" : "type-18866", +- "self_type" : "type-18865", ++ "referenced_type" : "type-18818", ++ "self_type" : "type-18817", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -151016,8 +151058,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", + "name" : "std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", +- "referenced_type" : "type-23395", +- "self_type" : "type-23394", ++ "referenced_type" : "type-23379", ++ "self_type" : "type-23378", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -151025,8 +151067,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", + "name" : "std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", +- "referenced_type" : "type-27274", +- "self_type" : "type-27273", ++ "referenced_type" : "type-27273", ++ "self_type" : "type-27272", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -151034,8 +151076,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", + "name" : "std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", +- "referenced_type" : "type-28580", +- "self_type" : "type-28579", ++ "referenced_type" : "type-28579", ++ "self_type" : "type-28578", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -151043,8 +151085,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", + "name" : "std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *", +- "referenced_type" : "type-7447", +- "self_type" : "type-7446", ++ "referenced_type" : "type-7399", ++ "self_type" : "type-7398", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -151052,8 +151094,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node, std::allocator > *, void *> *", + "name" : "std::__tree_node, std::allocator > *, void *> *", +- "referenced_type" : "type-10414", +- "self_type" : "type-10413", ++ "referenced_type" : "type-10366", ++ "self_type" : "type-10365", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -151061,8 +151103,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node, std::allocator > *, void *> *", + "name" : "std::__tree_node, std::allocator > *, void *> *", +- "referenced_type" : "type-13705", +- "self_type" : "type-13704", ++ "referenced_type" : "type-13657", ++ "self_type" : "type-13656", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -151070,8 +151112,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node, std::allocator > *, void *> *", + "name" : "std::__tree_node, std::allocator > *, void *> *", +- "referenced_type" : "type-15084", +- "self_type" : "type-15083", ++ "referenced_type" : "type-15036", ++ "self_type" : "type-15035", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -151079,8 +151121,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node, std::allocator > *, void *> *", + "name" : "std::__tree_node, std::allocator > *, void *> *", +- "referenced_type" : "type-17569", +- "self_type" : "type-17568", ++ "referenced_type" : "type-17521", ++ "self_type" : "type-17520", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -151088,8 +151130,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node, std::allocator > *, void *> *", + "name" : "std::__tree_node, std::allocator > *, void *> *", +- "referenced_type" : "type-18868", +- "self_type" : "type-18867", ++ "referenced_type" : "type-18820", ++ "self_type" : "type-18819", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -151097,8 +151139,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node, std::allocator > *, void *> *", + "name" : "std::__tree_node, std::allocator > *, void *> *", +- "referenced_type" : "type-22098", +- "self_type" : "type-22097", ++ "referenced_type" : "type-22097", ++ "self_type" : "type-22096", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -151106,8 +151148,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node, std::allocator > *, void *> *", + "name" : "std::__tree_node, std::allocator > *, void *> *", +- "referenced_type" : "type-23397", +- "self_type" : "type-23396", ++ "referenced_type" : "type-23381", ++ "self_type" : "type-23380", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -151115,8 +151157,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node, std::allocator > *, void *> *", + "name" : "std::__tree_node, std::allocator > *, void *> *", +- "referenced_type" : "type-27283", +- "self_type" : "type-27282", ++ "referenced_type" : "type-27282", ++ "self_type" : "type-27281", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -151124,8 +151166,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node, std::allocator > *, void *> *", + "name" : "std::__tree_node, std::allocator > *, void *> *", +- "referenced_type" : "type-28582", +- "self_type" : "type-28581", ++ "referenced_type" : "type-28581", ++ "self_type" : "type-28580", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -151133,8 +151175,8 @@ + "alignment" : 4, + "linker_set_key" : "std::__tree_node, std::allocator > *, void *> *", + "name" : "std::__tree_node, std::allocator > *, void *> *", +- "referenced_type" : "type-7463", +- "self_type" : "type-7462", ++ "referenced_type" : "type-7415", ++ "self_type" : "type-7414", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -151142,17 +151184,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-10031", +- "self_type" : "type-10030", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_istream > *", +- "name" : "std::basic_istream > *", +- "referenced_type" : "type-10626", +- "self_type" : "type-10625", ++ "referenced_type" : "type-10578", ++ "self_type" : "type-10577", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151160,8 +151193,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-10893", +- "self_type" : "type-10892", ++ "referenced_type" : "type-10845", ++ "self_type" : "type-10844", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151169,8 +151202,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-11034", +- "self_type" : "type-11033", ++ "referenced_type" : "type-10986", ++ "self_type" : "type-10985", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151178,8 +151211,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-11380", +- "self_type" : "type-11379", ++ "referenced_type" : "type-11332", ++ "self_type" : "type-11331", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151187,8 +151220,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-11609", +- "self_type" : "type-11608", ++ "referenced_type" : "type-11561", ++ "self_type" : "type-11560", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151196,8 +151229,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-12197", +- "self_type" : "type-12196", ++ "referenced_type" : "type-12149", ++ "self_type" : "type-12148", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151205,8 +151238,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-13364", +- "self_type" : "type-13363", ++ "referenced_type" : "type-13316", ++ "self_type" : "type-13315", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -151214,8 +151247,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-13917", +- "self_type" : "type-13916", ++ "referenced_type" : "type-13869", ++ "self_type" : "type-13868", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151223,8 +151256,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-14184", +- "self_type" : "type-14183", ++ "referenced_type" : "type-14136", ++ "self_type" : "type-14135", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151232,8 +151265,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-14325", +- "self_type" : "type-14324", ++ "referenced_type" : "type-14277", ++ "self_type" : "type-14276", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151241,8 +151274,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-14604", +- "self_type" : "type-14603", ++ "referenced_type" : "type-14556", ++ "self_type" : "type-14555", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151250,8 +151283,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-15468", +- "self_type" : "type-15467", ++ "referenced_type" : "type-1518", ++ "self_type" : "type-1517", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151259,8 +151292,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-1600", +- "self_type" : "type-1599", ++ "referenced_type" : "type-15420", ++ "self_type" : "type-15419", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151268,8 +151301,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-16052", +- "self_type" : "type-16051", ++ "referenced_type" : "type-16004", ++ "self_type" : "type-16003", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151277,8 +151310,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-17220", +- "self_type" : "type-17219", ++ "referenced_type" : "type-17172", ++ "self_type" : "type-17171", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -151286,8 +151319,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-17781", +- "self_type" : "type-17780", ++ "referenced_type" : "type-17733", ++ "self_type" : "type-17732", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151295,8 +151328,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-18048", +- "self_type" : "type-18047", ++ "referenced_type" : "type-18000", ++ "self_type" : "type-17999", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151304,8 +151337,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-18189", +- "self_type" : "type-18188", ++ "referenced_type" : "type-18141", ++ "self_type" : "type-18140", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151313,8 +151346,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-18468", +- "self_type" : "type-18467", ++ "referenced_type" : "type-18420", ++ "self_type" : "type-18419", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151322,8 +151355,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-19481", +- "self_type" : "type-19480", ++ "referenced_type" : "type-19433", ++ "self_type" : "type-19432", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151331,8 +151364,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-19544", +- "self_type" : "type-19543", ++ "referenced_type" : "type-19496", ++ "self_type" : "type-19495", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151340,8 +151373,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-19715", +- "self_type" : "type-19714", ++ "referenced_type" : "type-19667", ++ "self_type" : "type-19666", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151349,8 +151382,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-19806", +- "self_type" : "type-19805", ++ "referenced_type" : "type-19758", ++ "self_type" : "type-19757", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151358,8 +151391,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-20584", +- "self_type" : "type-20583", ++ "referenced_type" : "type-20536", ++ "self_type" : "type-20535", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151367,8 +151400,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-21752", +- "self_type" : "type-21751", ++ "referenced_type" : "type-21704", ++ "self_type" : "type-21703", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -151376,8 +151409,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-22310", +- "self_type" : "type-22309", ++ "referenced_type" : "type-22279", ++ "self_type" : "type-22278", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151385,8 +151418,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-22577", +- "self_type" : "type-22576", ++ "referenced_type" : "type-22493", ++ "self_type" : "type-22492", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151394,8 +151427,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-22718", +- "self_type" : "type-22717", ++ "referenced_type" : "type-22647", ++ "self_type" : "type-22646", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151403,8 +151436,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-22997", +- "self_type" : "type-22996", ++ "referenced_type" : "type-22970", ++ "self_type" : "type-22969", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151421,8 +151454,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-24014", +- "self_type" : "type-24013", ++ "referenced_type" : "type-24013", ++ "self_type" : "type-24012", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151430,8 +151463,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-24182", +- "self_type" : "type-24181", ++ "referenced_type" : "type-24187", ++ "self_type" : "type-24186", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151439,8 +151472,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-24273", +- "self_type" : "type-24272", ++ "referenced_type" : "type-24597", ++ "self_type" : "type-24596", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151448,8 +151481,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-24628", +- "self_type" : "type-24627", ++ "referenced_type" : "type-24855", ++ "self_type" : "type-24854", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151457,8 +151490,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-24888", +- "self_type" : "type-24887", ++ "referenced_type" : "type-24999", ++ "self_type" : "type-24998", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151466,8 +151499,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-25031", +- "self_type" : "type-25030", ++ "referenced_type" : "type-25156", ++ "self_type" : "type-25155", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151475,8 +151508,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-25763", +- "self_type" : "type-25762", ++ "referenced_type" : "type-25815", ++ "self_type" : "type-25814", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151484,8 +151517,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-26930", +- "self_type" : "type-26929", ++ "referenced_type" : "type-26953", ++ "self_type" : "type-26952", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -151493,8 +151526,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-27495", +- "self_type" : "type-27494", ++ "referenced_type" : "type-27494", ++ "self_type" : "type-27493", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151502,8 +151535,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-27762", +- "self_type" : "type-27761", ++ "referenced_type" : "type-27761", ++ "self_type" : "type-27760", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151511,8 +151544,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-27903", +- "self_type" : "type-27902", ++ "referenced_type" : "type-27902", ++ "self_type" : "type-27901", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151520,8 +151553,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-28182", +- "self_type" : "type-28181", ++ "referenced_type" : "type-28181", ++ "self_type" : "type-28180", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151529,8 +151562,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-29166", +- "self_type" : "type-29165", ++ "referenced_type" : "type-29165", ++ "self_type" : "type-29164", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151538,8 +151571,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-29199", +- "self_type" : "type-29198", ++ "referenced_type" : "type-29198", ++ "self_type" : "type-29197", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151547,8 +151580,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-29367", +- "self_type" : "type-29366", ++ "referenced_type" : "type-29366", ++ "self_type" : "type-29365", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151556,8 +151589,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-29458", +- "self_type" : "type-29457", ++ "referenced_type" : "type-29457", ++ "self_type" : "type-29456", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151565,8 +151598,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-29813", +- "self_type" : "type-29812", ++ "referenced_type" : "type-2974", ++ "self_type" : "type-2973", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151574,8 +151607,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-30067", +- "self_type" : "type-30066", ++ "referenced_type" : "type-29812", ++ "self_type" : "type-29811", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151583,8 +151616,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-30181", +- "self_type" : "type-30180", ++ "referenced_type" : "type-30066", ++ "self_type" : "type-30065", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151592,8 +151625,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-3022", +- "self_type" : "type-3021", ++ "referenced_type" : "type-30180", ++ "self_type" : "type-30179", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151601,8 +151634,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-30909", +- "self_type" : "type-30908", ++ "referenced_type" : "type-30908", ++ "self_type" : "type-30907", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151610,8 +151643,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-32077", +- "self_type" : "type-32076", ++ "referenced_type" : "type-32076", ++ "self_type" : "type-32075", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -151619,8 +151652,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-3626", +- "self_type" : "type-3625", ++ "referenced_type" : "type-3578", ++ "self_type" : "type-3577", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151628,8 +151661,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-5002", +- "self_type" : "type-5001", ++ "referenced_type" : "type-4954", ++ "self_type" : "type-4953", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151637,8 +151670,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-5604", +- "self_type" : "type-5603", ++ "referenced_type" : "type-5556", ++ "self_type" : "type-5555", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151646,8 +151679,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-6943", +- "self_type" : "type-6942", ++ "referenced_type" : "type-6895", ++ "self_type" : "type-6894", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -151655,8 +151688,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-7711", +- "self_type" : "type-7710", ++ "referenced_type" : "type-7663", ++ "self_type" : "type-7662", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151664,8 +151697,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-7994", +- "self_type" : "type-7993", ++ "referenced_type" : "type-7946", ++ "self_type" : "type-7945", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151673,8 +151706,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-8135", +- "self_type" : "type-8134", ++ "referenced_type" : "type-8087", ++ "self_type" : "type-8086", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151682,8 +151715,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-8278", +- "self_type" : "type-8277", ++ "referenced_type" : "type-8230", ++ "self_type" : "type-8229", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151691,17 +151724,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_istream > *", + "name" : "std::basic_istream > *", +- "referenced_type" : "type-8863", +- "self_type" : "type-8862", ++ "referenced_type" : "type-8815", ++ "self_type" : "type-8814", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, + { + "alignment" : 4, +- "linker_set_key" : "std::basic_ostream > *", +- "name" : "std::basic_ostream > *", +- "referenced_type" : "type-10033", +- "self_type" : "type-10032", ++ "linker_set_key" : "std::basic_istream > *", ++ "name" : "std::basic_istream > *", ++ "referenced_type" : "type-9983", ++ "self_type" : "type-9982", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -151709,8 +151742,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-10628", +- "self_type" : "type-10627", ++ "referenced_type" : "type-10580", ++ "self_type" : "type-10579", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151718,8 +151751,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-10895", +- "self_type" : "type-10894", ++ "referenced_type" : "type-10847", ++ "self_type" : "type-10846", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151727,8 +151760,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-11036", +- "self_type" : "type-11035", ++ "referenced_type" : "type-10988", ++ "self_type" : "type-10987", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151736,8 +151769,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-11382", +- "self_type" : "type-11381", ++ "referenced_type" : "type-11334", ++ "self_type" : "type-11333", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151745,8 +151778,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-11615", +- "self_type" : "type-11614", ++ "referenced_type" : "type-11567", ++ "self_type" : "type-11566", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151754,8 +151787,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-12199", +- "self_type" : "type-12198", ++ "referenced_type" : "type-12151", ++ "self_type" : "type-12150", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151763,8 +151796,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-13366", +- "self_type" : "type-13365", ++ "referenced_type" : "type-13318", ++ "self_type" : "type-13317", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -151772,8 +151805,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-13919", +- "self_type" : "type-13918", ++ "referenced_type" : "type-13871", ++ "self_type" : "type-13870", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151781,8 +151814,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-14186", +- "self_type" : "type-14185", ++ "referenced_type" : "type-14138", ++ "self_type" : "type-14137", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151790,8 +151823,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-14327", +- "self_type" : "type-14326", ++ "referenced_type" : "type-14279", ++ "self_type" : "type-14278", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151799,8 +151832,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-14606", +- "self_type" : "type-14605", ++ "referenced_type" : "type-14558", ++ "self_type" : "type-14557", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151808,8 +151841,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-15474", +- "self_type" : "type-15473", ++ "referenced_type" : "type-1526", ++ "self_type" : "type-1525", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151817,8 +151850,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-16054", +- "self_type" : "type-16053", ++ "referenced_type" : "type-15426", ++ "self_type" : "type-15425", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151826,8 +151859,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-1609", +- "self_type" : "type-1608", ++ "referenced_type" : "type-16006", ++ "self_type" : "type-16005", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151835,8 +151868,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-17222", +- "self_type" : "type-17221", ++ "referenced_type" : "type-17174", ++ "self_type" : "type-17173", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -151844,8 +151877,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-17783", +- "self_type" : "type-17782", ++ "referenced_type" : "type-17735", ++ "self_type" : "type-17734", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151853,8 +151886,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-18050", +- "self_type" : "type-18049", ++ "referenced_type" : "type-18002", ++ "self_type" : "type-18001", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151862,8 +151895,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-18191", +- "self_type" : "type-18190", ++ "referenced_type" : "type-18143", ++ "self_type" : "type-18142", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151871,8 +151904,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-18470", +- "self_type" : "type-18469", ++ "referenced_type" : "type-18422", ++ "self_type" : "type-18421", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151880,8 +151913,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-19483", +- "self_type" : "type-19482", ++ "referenced_type" : "type-19435", ++ "self_type" : "type-19434", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151889,8 +151922,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-19546", +- "self_type" : "type-19545", ++ "referenced_type" : "type-19498", ++ "self_type" : "type-19497", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151898,8 +151931,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-19717", +- "self_type" : "type-19716", ++ "referenced_type" : "type-19669", ++ "self_type" : "type-19668", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151907,8 +151940,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-19849", +- "self_type" : "type-19848", ++ "referenced_type" : "type-19801", ++ "self_type" : "type-19800", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151916,8 +151949,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-20586", +- "self_type" : "type-20585", ++ "referenced_type" : "type-20538", ++ "self_type" : "type-20537", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151925,8 +151958,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-21754", +- "self_type" : "type-21753", ++ "referenced_type" : "type-21706", ++ "self_type" : "type-21705", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -151934,8 +151967,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-22312", +- "self_type" : "type-22311", ++ "referenced_type" : "type-22281", ++ "self_type" : "type-22280", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151943,8 +151976,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-22579", +- "self_type" : "type-22578", ++ "referenced_type" : "type-22495", ++ "self_type" : "type-22494", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151952,8 +151985,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-22720", +- "self_type" : "type-22719", ++ "referenced_type" : "type-22649", ++ "self_type" : "type-22648", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151961,8 +151994,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-22999", +- "self_type" : "type-22998", ++ "referenced_type" : "type-22972", ++ "self_type" : "type-22971", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151979,8 +152012,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-24016", +- "self_type" : "type-24015", ++ "referenced_type" : "type-24015", ++ "self_type" : "type-24014", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151988,8 +152021,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-24184", +- "self_type" : "type-24183", ++ "referenced_type" : "type-24189", ++ "self_type" : "type-24188", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -151997,8 +152030,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-24316", +- "self_type" : "type-24315", ++ "referenced_type" : "type-24599", ++ "self_type" : "type-24598", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -152006,8 +152039,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-24630", +- "self_type" : "type-24629", ++ "referenced_type" : "type-24857", ++ "self_type" : "type-24856", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -152015,8 +152048,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-24890", +- "self_type" : "type-24889", ++ "referenced_type" : "type-25001", ++ "self_type" : "type-25000", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -152024,8 +152057,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-25033", +- "self_type" : "type-25032", ++ "referenced_type" : "type-25172", ++ "self_type" : "type-25171", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -152033,8 +152066,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-25765", +- "self_type" : "type-25764", ++ "referenced_type" : "type-25817", ++ "self_type" : "type-25816", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -152042,8 +152075,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-26932", +- "self_type" : "type-26931", ++ "referenced_type" : "type-26955", ++ "self_type" : "type-26954", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -152051,8 +152084,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-27497", +- "self_type" : "type-27496", ++ "referenced_type" : "type-27496", ++ "self_type" : "type-27495", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -152060,8 +152093,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-27764", +- "self_type" : "type-27763", ++ "referenced_type" : "type-27763", ++ "self_type" : "type-27762", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -152069,8 +152102,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-27905", +- "self_type" : "type-27904", ++ "referenced_type" : "type-27904", ++ "self_type" : "type-27903", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -152078,8 +152111,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-28184", +- "self_type" : "type-28183", ++ "referenced_type" : "type-28183", ++ "self_type" : "type-28182", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -152087,8 +152120,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-29168", +- "self_type" : "type-29167", ++ "referenced_type" : "type-29167", ++ "self_type" : "type-29166", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -152096,8 +152129,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-29201", +- "self_type" : "type-29200", ++ "referenced_type" : "type-29200", ++ "self_type" : "type-29199", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -152105,8 +152138,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-29369", +- "self_type" : "type-29368", ++ "referenced_type" : "type-29368", ++ "self_type" : "type-29367", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -152114,8 +152147,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-29501", +- "self_type" : "type-29500", ++ "referenced_type" : "type-29500", ++ "self_type" : "type-29499", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -152123,8 +152156,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-29815", +- "self_type" : "type-29814", ++ "referenced_type" : "type-2980", ++ "self_type" : "type-2979", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -152132,8 +152165,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-30069", +- "self_type" : "type-30068", ++ "referenced_type" : "type-29814", ++ "self_type" : "type-29813", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -152141,8 +152174,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-30183", +- "self_type" : "type-30182", ++ "referenced_type" : "type-30068", ++ "self_type" : "type-30067", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -152150,8 +152183,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-3028", +- "self_type" : "type-3027", ++ "referenced_type" : "type-30182", ++ "self_type" : "type-30181", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -152159,8 +152192,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-30911", +- "self_type" : "type-30910", ++ "referenced_type" : "type-30910", ++ "self_type" : "type-30909", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -152168,8 +152201,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-32079", +- "self_type" : "type-32078", ++ "referenced_type" : "type-32078", ++ "self_type" : "type-32077", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -152177,8 +152210,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-3628", +- "self_type" : "type-3627", ++ "referenced_type" : "type-3580", ++ "self_type" : "type-3579", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -152186,8 +152219,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-5008", +- "self_type" : "type-5007", ++ "referenced_type" : "type-4960", ++ "self_type" : "type-4959", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -152195,8 +152228,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-5606", +- "self_type" : "type-5605", ++ "referenced_type" : "type-5558", ++ "self_type" : "type-5557", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -152204,8 +152237,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-6945", +- "self_type" : "type-6944", ++ "referenced_type" : "type-6897", ++ "self_type" : "type-6896", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -152213,8 +152246,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-7713", +- "self_type" : "type-7712", ++ "referenced_type" : "type-7665", ++ "self_type" : "type-7664", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -152222,8 +152255,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-7996", +- "self_type" : "type-7995", ++ "referenced_type" : "type-7948", ++ "self_type" : "type-7947", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -152231,8 +152264,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-8137", +- "self_type" : "type-8136", ++ "referenced_type" : "type-8089", ++ "self_type" : "type-8088", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -152240,8 +152273,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-8284", +- "self_type" : "type-8283", ++ "referenced_type" : "type-8236", ++ "self_type" : "type-8235", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -152249,17 +152282,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_ostream > *", + "name" : "std::basic_ostream > *", +- "referenced_type" : "type-8865", +- "self_type" : "type-8864", ++ "referenced_type" : "type-8817", ++ "self_type" : "type-8816", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_ostream > *", ++ "name" : "std::basic_ostream > *", ++ "referenced_type" : "type-9985", ++ "self_type" : "type-9984", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/message.h" ++ }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-10086", +- "self_type" : "type-10085", ++ "referenced_type" : "type-10038", ++ "self_type" : "type-10037", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152276,8 +152318,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-10179", +- "self_type" : "type-10178", ++ "referenced_type" : "type-10131", ++ "self_type" : "type-10130", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152285,8 +152327,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-10330", +- "self_type" : "type-10329", ++ "referenced_type" : "type-10282", ++ "self_type" : "type-10281", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152303,8 +152345,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-10537", +- "self_type" : "type-10536", ++ "referenced_type" : "type-10489", ++ "self_type" : "type-10488", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -152312,8 +152354,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-10544", +- "self_type" : "type-10543", ++ "referenced_type" : "type-10496", ++ "self_type" : "type-10495", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152321,8 +152363,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-10681", +- "self_type" : "type-10680", ++ "referenced_type" : "type-10633", ++ "self_type" : "type-10632", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" + }, +@@ -152330,8 +152372,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-10709", +- "self_type" : "type-10708", ++ "referenced_type" : "type-10661", ++ "self_type" : "type-10660", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152339,8 +152381,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-10797", +- "self_type" : "type-10796", ++ "referenced_type" : "type-10749", ++ "self_type" : "type-10748", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152348,8 +152390,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-10876", +- "self_type" : "type-10875", ++ "referenced_type" : "type-10828", ++ "self_type" : "type-10827", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152357,8 +152399,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-10905", +- "self_type" : "type-10904", ++ "referenced_type" : "type-10857", ++ "self_type" : "type-10856", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152366,8 +152408,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-10984", +- "self_type" : "type-10983", ++ "referenced_type" : "type-10936", ++ "self_type" : "type-10935", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152375,8 +152417,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-11038", +- "self_type" : "type-11037", ++ "referenced_type" : "type-10990", ++ "self_type" : "type-10989", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152384,8 +152426,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-11144", +- "self_type" : "type-11143", ++ "referenced_type" : "type-11096", ++ "self_type" : "type-11095", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message_lite.h" + }, +@@ -152393,8 +152435,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-11236", +- "self_type" : "type-11235", ++ "referenced_type" : "type-11188", ++ "self_type" : "type-11187", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" + }, +@@ -152402,8 +152444,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-11240", +- "self_type" : "type-11239", ++ "referenced_type" : "type-11192", ++ "self_type" : "type-11191", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152411,8 +152453,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-11389", +- "self_type" : "type-11388", ++ "referenced_type" : "type-11341", ++ "self_type" : "type-11340", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152420,8 +152462,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-11533", +- "self_type" : "type-11532", ++ "referenced_type" : "type-11485", ++ "self_type" : "type-11484", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -152429,8 +152471,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-11539", +- "self_type" : "type-11538", ++ "referenced_type" : "type-11491", ++ "self_type" : "type-11490", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152438,8 +152480,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-11594", +- "self_type" : "type-11593", ++ "referenced_type" : "type-11546", ++ "self_type" : "type-11545", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -152447,8 +152489,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-11637", +- "self_type" : "type-11636", ++ "referenced_type" : "type-11589", ++ "self_type" : "type-11588", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -152456,8 +152498,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-11657", +- "self_type" : "type-11656", ++ "referenced_type" : "type-11609", ++ "self_type" : "type-11608", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -152465,8 +152507,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-11670", +- "self_type" : "type-11669", ++ "referenced_type" : "type-11622", ++ "self_type" : "type-11621", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -152474,8 +152516,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-11692", +- "self_type" : "type-11691", ++ "referenced_type" : "type-11644", ++ "self_type" : "type-11643", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152483,8 +152525,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-12004", +- "self_type" : "type-12003", ++ "referenced_type" : "type-11956", ++ "self_type" : "type-11955", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152492,10 +152534,10 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-1205", +- "self_type" : "type-1204", ++ "referenced_type" : "type-12140", ++ "self_type" : "type-12139", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, +@@ -152510,8 +152552,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-12236", +- "self_type" : "type-12235", ++ "referenced_type" : "type-12370", ++ "self_type" : "type-12369", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152519,17 +152561,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-1238", +- "self_type" : "type-1237", ++ "referenced_type" : "type-12431", ++ "self_type" : "type-12430", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-12418", +- "self_type" : "type-12417", ++ "referenced_type" : "type-12467", ++ "self_type" : "type-12466", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152540,14 +152582,14 @@ + "referenced_type" : "type-12479", + "self_type" : "type-12478", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-12515", +- "self_type" : "type-12514", ++ "referenced_type" : "type-12573", ++ "self_type" : "type-12572", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152555,26 +152597,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-12527", +- "self_type" : "type-12526", ++ "referenced_type" : "type-12649", ++ "self_type" : "type-12648", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-1262", +- "self_type" : "type-1261", ++ "referenced_type" : "type-12741", ++ "self_type" : "type-12740", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-12621", +- "self_type" : "type-12620", ++ "referenced_type" : "type-12753", ++ "self_type" : "type-12752", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152582,8 +152624,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-12697", +- "self_type" : "type-12696", ++ "referenced_type" : "type-12820", ++ "self_type" : "type-12819", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152591,8 +152633,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-12789", +- "self_type" : "type-12788", ++ "referenced_type" : "type-12849", ++ "self_type" : "type-12848", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -152600,26 +152642,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-12801", +- "self_type" : "type-12800", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > *", +- "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-1283", +- "self_type" : "type-1282", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > *", +- "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-12868", +- "self_type" : "type-12867", ++ "referenced_type" : "type-12882", ++ "self_type" : "type-12881", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152627,17 +152651,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-12897", +- "self_type" : "type-12896", ++ "referenced_type" : "type-1289", ++ "self_type" : "type-1288", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-12930", +- "self_type" : "type-12929", ++ "referenced_type" : "type-12966", ++ "self_type" : "type-12965", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152645,8 +152669,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-13014", +- "self_type" : "type-13013", ++ "referenced_type" : "type-12995", ++ "self_type" : "type-12994", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152654,8 +152678,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-13043", +- "self_type" : "type-13042", ++ "referenced_type" : "type-13039", ++ "self_type" : "type-13038", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152663,8 +152687,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-13087", +- "self_type" : "type-13086", ++ "referenced_type" : "type-13280", ++ "self_type" : "type-13279", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152672,8 +152696,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-13328", +- "self_type" : "type-13327", ++ "referenced_type" : "type-13371", ++ "self_type" : "type-13370", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152681,8 +152705,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-13419", +- "self_type" : "type-13418", ++ "referenced_type" : "type-13464", ++ "self_type" : "type-13463", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152690,8 +152714,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-13512", +- "self_type" : "type-13511", ++ "referenced_type" : "type-1356", ++ "self_type" : "type-1355", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152699,8 +152723,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-13621", +- "self_type" : "type-13620", ++ "referenced_type" : "type-13573", ++ "self_type" : "type-13572", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152708,8 +152732,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-13828", +- "self_type" : "type-13827", ++ "referenced_type" : "type-13780", ++ "self_type" : "type-13779", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -152717,8 +152741,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-13835", +- "self_type" : "type-13834", ++ "referenced_type" : "type-13787", ++ "self_type" : "type-13786", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152726,26 +152750,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-13972", +- "self_type" : "type-13971", ++ "referenced_type" : "type-1382", ++ "self_type" : "type-1381", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/message_lite.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-14000", +- "self_type" : "type-13999", ++ "referenced_type" : "type-13924", ++ "self_type" : "type-13923", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-14088", +- "self_type" : "type-14087", ++ "referenced_type" : "type-13952", ++ "self_type" : "type-13951", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152753,8 +152777,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-14167", +- "self_type" : "type-14166", ++ "referenced_type" : "type-14040", ++ "self_type" : "type-14039", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152762,8 +152786,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-14196", +- "self_type" : "type-14195", ++ "referenced_type" : "type-14119", ++ "self_type" : "type-14118", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152771,8 +152795,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-14275", +- "self_type" : "type-14274", ++ "referenced_type" : "type-14148", ++ "self_type" : "type-14147", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152780,8 +152804,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-14329", +- "self_type" : "type-14328", ++ "referenced_type" : "type-14227", ++ "self_type" : "type-14226", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152789,26 +152813,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-14408", +- "self_type" : "type-14407", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message_lite.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > *", +- "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-14488", +- "self_type" : "type-14487", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > *", +- "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-14492", +- "self_type" : "type-14491", ++ "referenced_type" : "type-14281", ++ "self_type" : "type-14280", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152816,17 +152822,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-14613", +- "self_type" : "type-14612", ++ "referenced_type" : "type-1436", ++ "self_type" : "type-1435", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-1464", +- "self_type" : "type-1463", ++ "referenced_type" : "type-14360", ++ "self_type" : "type-14359", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message_lite.h" + }, +@@ -152834,8 +152840,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-14881", +- "self_type" : "type-14880", ++ "referenced_type" : "type-1442", ++ "self_type" : "type-1441", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152843,17 +152849,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-14980", +- "self_type" : "type-14979", ++ "referenced_type" : "type-14440", ++ "self_type" : "type-14439", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-14999", +- "self_type" : "type-14998", ++ "referenced_type" : "type-14444", ++ "self_type" : "type-14443", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152861,8 +152867,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-15012", +- "self_type" : "type-15011", ++ "referenced_type" : "type-14565", ++ "self_type" : "type-14564", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152870,8 +152876,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-15175", +- "self_type" : "type-15174", ++ "referenced_type" : "type-14833", ++ "self_type" : "type-14832", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152879,8 +152885,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-1518", +- "self_type" : "type-1517", ++ "referenced_type" : "type-14932", ++ "self_type" : "type-14931", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -152888,8 +152894,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-1523", +- "self_type" : "type-1522", ++ "referenced_type" : "type-14951", ++ "self_type" : "type-14950", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152897,71 +152903,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-15401", +- "self_type" : "type-15400", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > *", +- "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-15412", +- "self_type" : "type-15411", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > *", +- "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-15453", +- "self_type" : "type-15452", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > *", +- "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-1547", +- "self_type" : "type-1546", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > *", +- "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-15496", +- "self_type" : "type-15495", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > *", +- "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-15516", +- "self_type" : "type-15515", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > *", +- "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-15529", +- "self_type" : "type-15528", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > *", +- "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-15548", +- "self_type" : "type-15547", ++ "referenced_type" : "type-14964", ++ "self_type" : "type-14963", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152969,8 +152912,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-1578", +- "self_type" : "type-1577", ++ "referenced_type" : "type-1497", ++ "self_type" : "type-1496", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -152978,17 +152921,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-15860", +- "self_type" : "type-15859", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > *", +- "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16043", +- "self_type" : "type-16042", ++ "referenced_type" : "type-15127", ++ "self_type" : "type-15126", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -152996,35 +152930,35 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16091", +- "self_type" : "type-16090", ++ "referenced_type" : "type-15353", ++ "self_type" : "type-15352", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16275", +- "self_type" : "type-16274", ++ "referenced_type" : "type-15364", ++ "self_type" : "type-15363", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16336", +- "self_type" : "type-16335", ++ "referenced_type" : "type-15405", ++ "self_type" : "type-15404", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-1637", +- "self_type" : "type-1636", ++ "referenced_type" : "type-15448", ++ "self_type" : "type-15447", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -153032,26 +152966,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16372", +- "self_type" : "type-16371", ++ "referenced_type" : "type-15468", ++ "self_type" : "type-15467", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16384", +- "self_type" : "type-16383", ++ "referenced_type" : "type-15481", ++ "self_type" : "type-15480", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16478", +- "self_type" : "type-16477", ++ "referenced_type" : "type-15500", ++ "self_type" : "type-15499", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153059,17 +152993,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16553", +- "self_type" : "type-16552", ++ "referenced_type" : "type-1551", ++ "self_type" : "type-1550", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-1659", +- "self_type" : "type-1658", ++ "referenced_type" : "type-1572", ++ "self_type" : "type-1571", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -153077,26 +153011,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16645", +- "self_type" : "type-16644", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > *", +- "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16657", +- "self_type" : "type-16656", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > *", +- "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16724", +- "self_type" : "type-16723", ++ "referenced_type" : "type-15812", ++ "self_type" : "type-15811", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153104,8 +153020,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16753", +- "self_type" : "type-16752", ++ "referenced_type" : "type-1585", ++ "self_type" : "type-1584", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -153113,8 +153029,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16786", +- "self_type" : "type-16785", ++ "referenced_type" : "type-15995", ++ "self_type" : "type-15994", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153122,8 +153038,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16870", +- "self_type" : "type-16869", ++ "referenced_type" : "type-16043", ++ "self_type" : "type-16042", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153131,8 +153047,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16899", +- "self_type" : "type-16898", ++ "referenced_type" : "type-16227", ++ "self_type" : "type-16226", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153140,17 +153056,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-16943", +- "self_type" : "type-16942", ++ "referenced_type" : "type-16288", ++ "self_type" : "type-16287", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-17184", +- "self_type" : "type-17183", ++ "referenced_type" : "type-16324", ++ "self_type" : "type-16323", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153158,17 +153074,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-17275", +- "self_type" : "type-17274", ++ "referenced_type" : "type-16336", ++ "self_type" : "type-16335", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-17368", +- "self_type" : "type-17367", ++ "referenced_type" : "type-16430", ++ "self_type" : "type-16429", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153176,8 +153092,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-17485", +- "self_type" : "type-17484", ++ "referenced_type" : "type-16505", ++ "self_type" : "type-16504", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153185,8 +153101,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-17692", +- "self_type" : "type-17691", ++ "referenced_type" : "type-16597", ++ "self_type" : "type-16596", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -153194,8 +153110,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-17699", +- "self_type" : "type-17698", ++ "referenced_type" : "type-16609", ++ "self_type" : "type-16608", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153203,26 +153119,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-17836", +- "self_type" : "type-17835", ++ "referenced_type" : "type-16676", ++ "self_type" : "type-16675", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-17864", +- "self_type" : "type-17863", ++ "referenced_type" : "type-16705", ++ "self_type" : "type-16704", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-17952", +- "self_type" : "type-17951", ++ "referenced_type" : "type-16738", ++ "self_type" : "type-16737", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153230,8 +153146,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18031", +- "self_type" : "type-18030", ++ "referenced_type" : "type-16822", ++ "self_type" : "type-16821", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153239,8 +153155,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18060", +- "self_type" : "type-18059", ++ "referenced_type" : "type-16851", ++ "self_type" : "type-16850", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153248,8 +153164,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18139", +- "self_type" : "type-18138", ++ "referenced_type" : "type-16895", ++ "self_type" : "type-16894", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153257,8 +153173,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18193", +- "self_type" : "type-18192", ++ "referenced_type" : "type-17136", ++ "self_type" : "type-17135", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153266,26 +153182,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18272", +- "self_type" : "type-18271", ++ "referenced_type" : "type-17227", ++ "self_type" : "type-17226", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message_lite.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18352", +- "self_type" : "type-18351", ++ "referenced_type" : "type-17320", ++ "self_type" : "type-17319", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18356", +- "self_type" : "type-18355", ++ "referenced_type" : "type-17437", ++ "self_type" : "type-17436", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153293,8 +153209,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-1841", +- "self_type" : "type-1840", ++ "referenced_type" : "type-1753", ++ "self_type" : "type-1752", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153302,44 +153218,44 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18477", +- "self_type" : "type-18476", ++ "referenced_type" : "type-17644", ++ "self_type" : "type-17643", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-185", +- "self_type" : "type-184", ++ "referenced_type" : "type-17651", ++ "self_type" : "type-17650", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18738", +- "self_type" : "type-18737", ++ "referenced_type" : "type-17788", ++ "self_type" : "type-17787", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18816", +- "self_type" : "type-18815", ++ "referenced_type" : "type-17816", ++ "self_type" : "type-17815", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18818", +- "self_type" : "type-18817", ++ "referenced_type" : "type-17904", ++ "self_type" : "type-17903", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153347,8 +153263,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18831", +- "self_type" : "type-18830", ++ "referenced_type" : "type-17983", ++ "self_type" : "type-17982", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153356,8 +153272,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-18959", +- "self_type" : "type-18958", ++ "referenced_type" : "type-18012", ++ "self_type" : "type-18011", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153365,44 +153281,44 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19157", +- "self_type" : "type-19156", ++ "referenced_type" : "type-18091", ++ "self_type" : "type-18090", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19168", +- "self_type" : "type-19167", ++ "referenced_type" : "type-18145", ++ "self_type" : "type-18144", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19176", +- "self_type" : "type-19175", ++ "referenced_type" : "type-18224", ++ "self_type" : "type-18223", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/message_lite.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19346", +- "self_type" : "type-19345", ++ "referenced_type" : "type-18304", ++ "self_type" : "type-18303", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19381", +- "self_type" : "type-19380", ++ "referenced_type" : "type-18308", ++ "self_type" : "type-18307", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153410,8 +153326,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19485", +- "self_type" : "type-19484", ++ "referenced_type" : "type-18429", ++ "self_type" : "type-18428", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153419,35 +153335,35 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19581", +- "self_type" : "type-19580", ++ "referenced_type" : "type-185", ++ "self_type" : "type-184", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-197", +- "self_type" : "type-196", ++ "referenced_type" : "type-18690", ++ "self_type" : "type-18689", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19707", +- "self_type" : "type-19706", ++ "referenced_type" : "type-18768", ++ "self_type" : "type-18767", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-19867", +- "self_type" : "type-19866", ++ "referenced_type" : "type-18770", ++ "self_type" : "type-18769", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153455,26 +153371,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20022", +- "self_type" : "type-20021", ++ "referenced_type" : "type-18783", ++ "self_type" : "type-18782", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20045", +- "self_type" : "type-20044", ++ "referenced_type" : "type-18911", ++ "self_type" : "type-18910", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20058", +- "self_type" : "type-20057", ++ "referenced_type" : "type-19109", ++ "self_type" : "type-19108", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -153482,17 +153398,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20081", +- "self_type" : "type-20080", ++ "referenced_type" : "type-19120", ++ "self_type" : "type-19119", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20394", +- "self_type" : "type-20393", ++ "referenced_type" : "type-19128", ++ "self_type" : "type-19127", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153500,17 +153416,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20575", +- "self_type" : "type-20574", ++ "referenced_type" : "type-19298", ++ "self_type" : "type-19297", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20623", +- "self_type" : "type-20622", ++ "referenced_type" : "type-19333", ++ "self_type" : "type-19332", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153518,8 +153434,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20806", +- "self_type" : "type-20805", ++ "referenced_type" : "type-19437", ++ "self_type" : "type-19436", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153527,17 +153443,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20867", +- "self_type" : "type-20866", ++ "referenced_type" : "type-19533", ++ "self_type" : "type-19532", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20903", +- "self_type" : "type-20902", ++ "referenced_type" : "type-19659", ++ "self_type" : "type-19658", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153545,8 +153461,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-20915", +- "self_type" : "type-20914", ++ "referenced_type" : "type-197", ++ "self_type" : "type-196", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, +@@ -153554,8 +153470,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21009", +- "self_type" : "type-21008", ++ "referenced_type" : "type-19819", ++ "self_type" : "type-19818", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153563,17 +153479,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21085", +- "self_type" : "type-21084", ++ "referenced_type" : "type-19974", ++ "self_type" : "type-19973", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21177", +- "self_type" : "type-21176", ++ "referenced_type" : "type-19997", ++ "self_type" : "type-19996", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > *", ++ "name" : "std::basic_string, std::allocator > *", ++ "referenced_type" : "type-20010", ++ "self_type" : "type-20009", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -153581,8 +153506,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21189", +- "self_type" : "type-21188", ++ "referenced_type" : "type-20033", ++ "self_type" : "type-20032", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153590,8 +153515,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21256", +- "self_type" : "type-21255", ++ "referenced_type" : "type-20346", ++ "self_type" : "type-20345", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153599,17 +153524,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21285", +- "self_type" : "type-21284", ++ "referenced_type" : "type-20527", ++ "self_type" : "type-20526", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21318", +- "self_type" : "type-21317", ++ "referenced_type" : "type-20575", ++ "self_type" : "type-20574", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153617,8 +153542,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21402", +- "self_type" : "type-21401", ++ "referenced_type" : "type-20758", ++ "self_type" : "type-20757", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153626,17 +153551,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21431", +- "self_type" : "type-21430", ++ "referenced_type" : "type-20819", ++ "self_type" : "type-20818", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21475", +- "self_type" : "type-21474", ++ "referenced_type" : "type-20855", ++ "self_type" : "type-20854", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153644,17 +153569,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21716", +- "self_type" : "type-21715", ++ "referenced_type" : "type-20867", ++ "self_type" : "type-20866", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21807", +- "self_type" : "type-21806", ++ "referenced_type" : "type-20961", ++ "self_type" : "type-20960", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153662,8 +153587,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-21900", +- "self_type" : "type-21899", ++ "referenced_type" : "type-21037", ++ "self_type" : "type-21036", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153671,17 +153596,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-22", +- "self_type" : "type-21", ++ "referenced_type" : "type-21129", ++ "self_type" : "type-21128", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-22014", +- "self_type" : "type-22013", ++ "referenced_type" : "type-21141", ++ "self_type" : "type-21140", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153689,8 +153614,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-22221", +- "self_type" : "type-22220", ++ "referenced_type" : "type-21208", ++ "self_type" : "type-21207", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > *", ++ "name" : "std::basic_string, std::allocator > *", ++ "referenced_type" : "type-21237", ++ "self_type" : "type-21236", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -153698,8 +153632,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-22228", +- "self_type" : "type-22227", ++ "referenced_type" : "type-21270", ++ "self_type" : "type-21269", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153707,17 +153641,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-22365", +- "self_type" : "type-22364", ++ "referenced_type" : "type-21354", ++ "self_type" : "type-21353", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-22393", +- "self_type" : "type-22392", ++ "referenced_type" : "type-21383", ++ "self_type" : "type-21382", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153725,8 +153659,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-22481", +- "self_type" : "type-22480", ++ "referenced_type" : "type-21427", ++ "self_type" : "type-21426", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153734,8 +153668,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-22560", +- "self_type" : "type-22559", ++ "referenced_type" : "type-21668", ++ "self_type" : "type-21667", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153743,8 +153677,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-22589", +- "self_type" : "type-22588", ++ "referenced_type" : "type-21759", ++ "self_type" : "type-21758", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153752,8 +153686,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-22668", +- "self_type" : "type-22667", ++ "referenced_type" : "type-21852", ++ "self_type" : "type-21851", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153761,35 +153695,35 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-22722", +- "self_type" : "type-22721", ++ "referenced_type" : "type-21879", ++ "self_type" : "type-21878", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-22801", +- "self_type" : "type-22800", ++ "referenced_type" : "type-21895", ++ "self_type" : "type-21894", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message_lite.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-22881", +- "self_type" : "type-22880", ++ "referenced_type" : "type-22", ++ "self_type" : "type-21", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-22885", +- "self_type" : "type-22884", ++ "referenced_type" : "type-22013", ++ "self_type" : "type-22012", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153797,8 +153731,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-23006", +- "self_type" : "type-23005", ++ "referenced_type" : "type-22045", ++ "self_type" : "type-22044", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153806,8 +153740,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-23267", +- "self_type" : "type-23266", ++ "referenced_type" : "type-22208", ++ "self_type" : "type-22207", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > *", ++ "name" : "std::basic_string, std::allocator > *", ++ "referenced_type" : "type-22213", ++ "self_type" : "type-22212", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153815,17 +153758,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-23345", +- "self_type" : "type-23344", ++ "referenced_type" : "type-22240", ++ "self_type" : "type-22239", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-23347", +- "self_type" : "type-23346", ++ "referenced_type" : "type-22353", ++ "self_type" : "type-22352", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153833,8 +153776,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-23360", +- "self_type" : "type-23359", ++ "referenced_type" : "type-22414", ++ "self_type" : "type-22413", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153842,8 +153785,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-2339", +- "self_type" : "type-2338", ++ "referenced_type" : "type-22461", ++ "self_type" : "type-22460", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153851,8 +153794,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-23488", +- "self_type" : "type-23487", ++ "referenced_type" : "type-22481", ++ "self_type" : "type-22480", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153860,26 +153803,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-23686", +- "self_type" : "type-23685", ++ "referenced_type" : "type-22582", ++ "self_type" : "type-22581", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-23697", +- "self_type" : "type-23696", ++ "referenced_type" : "type-22651", ++ "self_type" : "type-22650", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-23705", +- "self_type" : "type-23704", ++ "referenced_type" : "type-2266", ++ "self_type" : "type-2265", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153887,17 +153830,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-23856", +- "self_type" : "type-23855", ++ "referenced_type" : "type-22840", ++ "self_type" : "type-22839", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-23881", +- "self_type" : "type-23880", ++ "referenced_type" : "type-22846", ++ "self_type" : "type-22845", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153905,8 +153848,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-23985", +- "self_type" : "type-23984", ++ "referenced_type" : "type-22979", ++ "self_type" : "type-22978", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153914,17 +153857,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-24051", +- "self_type" : "type-24050", ++ "referenced_type" : "type-23258", ++ "self_type" : "type-23257", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-24174", +- "self_type" : "type-24173", ++ "referenced_type" : "type-23340", ++ "self_type" : "type-23339", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153932,8 +153875,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-24334", +- "self_type" : "type-24333", ++ "referenced_type" : "type-23466", ++ "self_type" : "type-23465", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153941,17 +153884,35 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-24482", +- "self_type" : "type-24481", ++ "referenced_type" : "type-23606", ++ "self_type" : "type-23605", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/message_lite.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-24487", +- "self_type" : "type-24486", ++ "referenced_type" : "type-23671", ++ "self_type" : "type-23670", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > *", ++ "name" : "std::basic_string, std::allocator > *", ++ "referenced_type" : "type-23684", ++ "self_type" : "type-23683", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > *", ++ "name" : "std::basic_string, std::allocator > *", ++ "referenced_type" : "type-23693", ++ "self_type" : "type-23692", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153959,17 +153920,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-24624", +- "self_type" : "type-24623", ++ "referenced_type" : "type-23848", ++ "self_type" : "type-23847", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-24661", +- "self_type" : "type-24660", ++ "referenced_type" : "type-23883", ++ "self_type" : "type-23882", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153977,17 +153938,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-24680", +- "self_type" : "type-24679", ++ "referenced_type" : "type-23988", ++ "self_type" : "type-23987", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-24753", +- "self_type" : "type-24752", ++ "referenced_type" : "type-24145", ++ "self_type" : "type-24144", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > *", ++ "name" : "std::basic_string, std::allocator > *", ++ "referenced_type" : "type-24153", ++ "self_type" : "type-24152", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -153995,8 +153965,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-24921", +- "self_type" : "type-24920", ++ "referenced_type" : "type-24176", ++ "self_type" : "type-24175", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154004,8 +153974,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-25060", +- "self_type" : "type-25059", ++ "referenced_type" : "type-24322", ++ "self_type" : "type-24321", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154013,8 +153983,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-25176", +- "self_type" : "type-25175", ++ "referenced_type" : "type-24464", ++ "self_type" : "type-24463", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154022,17 +153992,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-25201", +- "self_type" : "type-25200", ++ "referenced_type" : "type-24587", ++ "self_type" : "type-24586", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-25570", +- "self_type" : "type-25569", ++ "referenced_type" : "type-24624", ++ "self_type" : "type-24623", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154040,17 +154010,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-256", +- "self_type" : "type-255", ++ "referenced_type" : "type-24709", ++ "self_type" : "type-24708", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-25754", +- "self_type" : "type-25753", ++ "referenced_type" : "type-24888", ++ "self_type" : "type-24887", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154058,8 +154028,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-2577", +- "self_type" : "type-2576", ++ "referenced_type" : "type-24894", ++ "self_type" : "type-24893", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > *", ++ "name" : "std::basic_string, std::allocator > *", ++ "referenced_type" : "type-25031", ++ "self_type" : "type-25030", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154067,8 +154046,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-25802", +- "self_type" : "type-25801", ++ "referenced_type" : "type-2509", ++ "self_type" : "type-2508", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154076,8 +154055,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-25984", +- "self_type" : "type-25983", ++ "referenced_type" : "type-25158", ++ "self_type" : "type-25157", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154085,17 +154064,35 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-2599", +- "self_type" : "type-2598", ++ "referenced_type" : "type-25268", ++ "self_type" : "type-25267", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-26045", +- "self_type" : "type-26044", ++ "referenced_type" : "type-25290", ++ "self_type" : "type-25289", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > *", ++ "name" : "std::basic_string, std::allocator > *", ++ "referenced_type" : "type-25327", ++ "self_type" : "type-25326", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > *", ++ "name" : "std::basic_string, std::allocator > *", ++ "referenced_type" : "type-2534", ++ "self_type" : "type-2533", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" + }, +@@ -154103,8 +154100,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-2606", +- "self_type" : "type-2605", ++ "referenced_type" : "type-2543", ++ "self_type" : "type-2542", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > *", ++ "name" : "std::basic_string, std::allocator > *", ++ "referenced_type" : "type-256", ++ "self_type" : "type-255", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -154112,8 +154118,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-26081", +- "self_type" : "type-26080", ++ "referenced_type" : "type-25624", ++ "self_type" : "type-25623", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154121,17 +154127,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-26093", +- "self_type" : "type-26092", ++ "referenced_type" : "type-2573", ++ "self_type" : "type-2572", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-26187", +- "self_type" : "type-26186", ++ "referenced_type" : "type-25803", ++ "self_type" : "type-25802", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154139,8 +154145,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-26263", +- "self_type" : "type-26262", ++ "referenced_type" : "type-25851", ++ "self_type" : "type-25850", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154148,8 +154154,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-26355", +- "self_type" : "type-26354", ++ "referenced_type" : "type-2594", ++ "self_type" : "type-2593", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -154157,8 +154163,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-26367", +- "self_type" : "type-26366", ++ "referenced_type" : "type-26011", ++ "self_type" : "type-26010", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > *", ++ "name" : "std::basic_string, std::allocator > *", ++ "referenced_type" : "type-26037", ++ "self_type" : "type-26036", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154166,8 +154181,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-26434", +- "self_type" : "type-26433", ++ "referenced_type" : "type-26128", ++ "self_type" : "type-26127", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154175,8 +154190,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-26463", +- "self_type" : "type-26462", ++ "referenced_type" : "type-26134", ++ "self_type" : "type-26133", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -154184,8 +154199,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-26496", +- "self_type" : "type-26495", ++ "referenced_type" : "type-26231", ++ "self_type" : "type-26230", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154193,17 +154208,35 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-2656", +- "self_type" : "type-2655", ++ "referenced_type" : "type-2628", ++ "self_type" : "type-2627", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > *", ++ "name" : "std::basic_string, std::allocator > *", ++ "referenced_type" : "type-26306", ++ "self_type" : "type-26305", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > *", ++ "name" : "std::basic_string, std::allocator > *", ++ "referenced_type" : "type-26409", ++ "self_type" : "type-26408", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-26580", +- "self_type" : "type-26579", ++ "referenced_type" : "type-26477", ++ "self_type" : "type-26476", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154211,8 +154244,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-26609", +- "self_type" : "type-26608", ++ "referenced_type" : "type-26530", ++ "self_type" : "type-26529", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154220,8 +154253,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-2665", +- "self_type" : "type-2664", ++ "referenced_type" : "type-26540", ++ "self_type" : "type-26539", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > *", ++ "name" : "std::basic_string, std::allocator > *", ++ "referenced_type" : "type-26595", ++ "self_type" : "type-26594", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, +@@ -154229,8 +154271,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-26653", +- "self_type" : "type-26652", ++ "referenced_type" : "type-26608", ++ "self_type" : "type-26607", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154238,8 +154280,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-26894", +- "self_type" : "type-26893", ++ "referenced_type" : "type-26674", ++ "self_type" : "type-26673", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154247,8 +154289,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-2695", +- "self_type" : "type-2694", ++ "referenced_type" : "type-26911", ++ "self_type" : "type-26910", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -154256,8 +154298,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-26985", +- "self_type" : "type-26984", ++ "referenced_type" : "type-26915", ++ "self_type" : "type-26914", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154265,8 +154307,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-27078", +- "self_type" : "type-27077", ++ "referenced_type" : "type-27010", ++ "self_type" : "type-27009", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154274,8 +154316,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-27199", +- "self_type" : "type-27198", ++ "referenced_type" : "type-27198", ++ "self_type" : "type-27197", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154283,8 +154325,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-27406", +- "self_type" : "type-27405", ++ "referenced_type" : "type-27405", ++ "self_type" : "type-27404", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -154292,8 +154334,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-27413", +- "self_type" : "type-27412", ++ "referenced_type" : "type-27412", ++ "self_type" : "type-27411", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154301,8 +154343,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-27550", +- "self_type" : "type-27549", ++ "referenced_type" : "type-2751", ++ "self_type" : "type-2750", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > *", ++ "name" : "std::basic_string, std::allocator > *", ++ "referenced_type" : "type-27549", ++ "self_type" : "type-27548", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" + }, +@@ -154310,8 +154361,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-27578", +- "self_type" : "type-27577", ++ "referenced_type" : "type-27577", ++ "self_type" : "type-27576", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154319,8 +154370,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-27666", +- "self_type" : "type-27665", ++ "referenced_type" : "type-27665", ++ "self_type" : "type-27664", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154328,8 +154379,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-27745", +- "self_type" : "type-27744", ++ "referenced_type" : "type-27744", ++ "self_type" : "type-27743", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154337,8 +154388,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-27774", +- "self_type" : "type-27773", ++ "referenced_type" : "type-27773", ++ "self_type" : "type-27772", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154355,8 +154406,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-27853", +- "self_type" : "type-27852", ++ "referenced_type" : "type-27852", ++ "self_type" : "type-27851", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154364,8 +154415,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-27907", +- "self_type" : "type-27906", ++ "referenced_type" : "type-27906", ++ "self_type" : "type-27905", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154373,8 +154424,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-27986", +- "self_type" : "type-27985", ++ "referenced_type" : "type-27985", ++ "self_type" : "type-27984", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message_lite.h" + }, +@@ -154382,26 +154433,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-2799", +- "self_type" : "type-2798", ++ "referenced_type" : "type-28065", ++ "self_type" : "type-28064", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-28066", +- "self_type" : "type-28065", ++ "referenced_type" : "type-28069", ++ "self_type" : "type-28068", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-28070", +- "self_type" : "type-28069", ++ "referenced_type" : "type-2818", ++ "self_type" : "type-2817", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154409,8 +154460,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-28191", +- "self_type" : "type-28190", ++ "referenced_type" : "type-28190", ++ "self_type" : "type-28189", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154418,35 +154469,35 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-28452", +- "self_type" : "type-28451", ++ "referenced_type" : "type-2844", ++ "self_type" : "type-2843", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/message_lite.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-28530", +- "self_type" : "type-28529", ++ "referenced_type" : "type-28451", ++ "self_type" : "type-28450", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-28532", +- "self_type" : "type-28531", ++ "referenced_type" : "type-28529", ++ "self_type" : "type-28528", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-28545", +- "self_type" : "type-28544", ++ "referenced_type" : "type-28531", ++ "self_type" : "type-28530", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154454,8 +154505,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-2866", +- "self_type" : "type-2865", ++ "referenced_type" : "type-28544", ++ "self_type" : "type-28543", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154463,8 +154514,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-28673", +- "self_type" : "type-28672", ++ "referenced_type" : "type-28672", ++ "self_type" : "type-28671", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154472,8 +154523,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-28871", +- "self_type" : "type-28870", ++ "referenced_type" : "type-28870", ++ "self_type" : "type-28869", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -154481,8 +154532,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-28882", +- "self_type" : "type-28881", ++ "referenced_type" : "type-28881", ++ "self_type" : "type-28880", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" + }, +@@ -154490,8 +154541,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-28890", +- "self_type" : "type-28889", ++ "referenced_type" : "type-28889", ++ "self_type" : "type-28888", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154499,35 +154550,35 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-2892", +- "self_type" : "type-2891", ++ "referenced_type" : "type-2898", ++ "self_type" : "type-2897", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message_lite.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-29041", +- "self_type" : "type-29040", ++ "referenced_type" : "type-2904", ++ "self_type" : "type-2903", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-29066", +- "self_type" : "type-29065", ++ "referenced_type" : "type-29040", ++ "self_type" : "type-29039", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-29170", +- "self_type" : "type-29169", ++ "referenced_type" : "type-29065", ++ "self_type" : "type-29064", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154535,35 +154586,35 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-29236", +- "self_type" : "type-29235", ++ "referenced_type" : "type-29169", ++ "self_type" : "type-29168", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-29359", +- "self_type" : "type-29358", ++ "referenced_type" : "type-29235", ++ "self_type" : "type-29234", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-2946", +- "self_type" : "type-2945", ++ "referenced_type" : "type-29358", ++ "self_type" : "type-29357", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-29519", +- "self_type" : "type-29518", ++ "referenced_type" : "type-29518", ++ "self_type" : "type-29517", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154571,17 +154622,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-2952", +- "self_type" : "type-2951", ++ "referenced_type" : "type-2959", ++ "self_type" : "type-2958", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-29667", +- "self_type" : "type-29666", ++ "referenced_type" : "type-29666", ++ "self_type" : "type-29665", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -154589,8 +154640,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-29672", +- "self_type" : "type-29671", ++ "referenced_type" : "type-29671", ++ "self_type" : "type-29670", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154598,8 +154649,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-29809", +- "self_type" : "type-29808", ++ "referenced_type" : "type-29808", ++ "self_type" : "type-29807", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -154607,8 +154658,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-29842", +- "self_type" : "type-29841", ++ "referenced_type" : "type-29841", ++ "self_type" : "type-29840", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154616,8 +154667,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-29861", +- "self_type" : "type-29860", ++ "referenced_type" : "type-29860", ++ "self_type" : "type-29859", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -154625,8 +154676,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-29934", +- "self_type" : "type-29933", ++ "referenced_type" : "type-29933", ++ "self_type" : "type-29932", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154634,17 +154685,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-3007", +- "self_type" : "type-3006", ++ "referenced_type" : "type-3002", ++ "self_type" : "type-3001", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-30081", +- "self_type" : "type-30080", ++ "referenced_type" : "type-30080", ++ "self_type" : "type-30079", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154652,8 +154703,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-30205", +- "self_type" : "type-30204", ++ "referenced_type" : "type-30204", ++ "self_type" : "type-30203", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154661,17 +154712,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-30320", +- "self_type" : "type-30319", ++ "referenced_type" : "type-3022", ++ "self_type" : "type-3021", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-30345", +- "self_type" : "type-30344", ++ "referenced_type" : "type-30319", ++ "self_type" : "type-30318", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154679,26 +154730,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-3050", +- "self_type" : "type-3049", ++ "referenced_type" : "type-30344", ++ "self_type" : "type-30343", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-3070", +- "self_type" : "type-3069", ++ "referenced_type" : "type-3035", ++ "self_type" : "type-3034", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-30716", +- "self_type" : "type-30715", ++ "referenced_type" : "type-3058", ++ "self_type" : "type-3057", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154706,17 +154757,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-3083", +- "self_type" : "type-3082", ++ "referenced_type" : "type-30715", ++ "self_type" : "type-30714", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-30900", +- "self_type" : "type-30899", ++ "referenced_type" : "type-30899", ++ "self_type" : "type-30898", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154724,8 +154775,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-30948", +- "self_type" : "type-30947", ++ "referenced_type" : "type-30947", ++ "self_type" : "type-30946", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154733,8 +154784,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-3106", +- "self_type" : "type-3105", ++ "referenced_type" : "type-31130", ++ "self_type" : "type-31129", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154742,8 +154793,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-31131", +- "self_type" : "type-31130", ++ "referenced_type" : "type-31191", ++ "self_type" : "type-31190", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > *", ++ "name" : "std::basic_string, std::allocator > *", ++ "referenced_type" : "type-31227", ++ "self_type" : "type-31226", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154751,17 +154811,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-31192", +- "self_type" : "type-31191", ++ "referenced_type" : "type-31239", ++ "self_type" : "type-31238", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-31228", +- "self_type" : "type-31227", ++ "referenced_type" : "type-31333", ++ "self_type" : "type-31332", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154769,17 +154829,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-31240", +- "self_type" : "type-31239", ++ "referenced_type" : "type-31409", ++ "self_type" : "type-31408", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-31334", +- "self_type" : "type-31333", ++ "referenced_type" : "type-31501", ++ "self_type" : "type-31500", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > *", ++ "name" : "std::basic_string, std::allocator > *", ++ "referenced_type" : "type-31513", ++ "self_type" : "type-31512", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154787,8 +154856,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-31410", +- "self_type" : "type-31409", ++ "referenced_type" : "type-31580", ++ "self_type" : "type-31579", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154796,8 +154865,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-31502", +- "self_type" : "type-31501", ++ "referenced_type" : "type-31609", ++ "self_type" : "type-31608", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -154805,8 +154874,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-31514", +- "self_type" : "type-31513", ++ "referenced_type" : "type-31642", ++ "self_type" : "type-31641", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154814,8 +154883,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-31581", +- "self_type" : "type-31580", ++ "referenced_type" : "type-31726", ++ "self_type" : "type-31725", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154823,17 +154892,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-31610", +- "self_type" : "type-31609", ++ "referenced_type" : "type-31755", ++ "self_type" : "type-31754", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-31643", +- "self_type" : "type-31642", ++ "referenced_type" : "type-31799", ++ "self_type" : "type-31798", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154841,8 +154910,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-31727", +- "self_type" : "type-31726", ++ "referenced_type" : "type-32040", ++ "self_type" : "type-32039", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154850,8 +154919,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-31756", +- "self_type" : "type-31755", ++ "referenced_type" : "type-32131", ++ "self_type" : "type-32130", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154859,8 +154928,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-31800", +- "self_type" : "type-31799", ++ "referenced_type" : "type-32224", ++ "self_type" : "type-32223", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154868,8 +154937,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-32041", +- "self_type" : "type-32040", ++ "referenced_type" : "type-3373", ++ "self_type" : "type-3372", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154877,8 +154946,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-32132", +- "self_type" : "type-32131", ++ "referenced_type" : "type-3569", ++ "self_type" : "type-3568", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154886,8 +154955,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-32225", +- "self_type" : "type-32224", ++ "referenced_type" : "type-3631", ++ "self_type" : "type-3630", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154895,35 +154964,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-3421", +- "self_type" : "type-3420", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > *", +- "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-3617", +- "self_type" : "type-3616", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > *", +- "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-3679", +- "self_type" : "type-3678", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > *", +- "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-3921", +- "self_type" : "type-3920", ++ "referenced_type" : "type-3873", ++ "self_type" : "type-3872", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154931,8 +154973,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-3982", +- "self_type" : "type-3981", ++ "referenced_type" : "type-3934", ++ "self_type" : "type-3933", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" + }, +@@ -154940,8 +154982,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-4019", +- "self_type" : "type-4018", ++ "referenced_type" : "type-3971", ++ "self_type" : "type-3970", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154949,8 +154991,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-4079", +- "self_type" : "type-4078", ++ "referenced_type" : "type-4031", ++ "self_type" : "type-4030", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, +@@ -154958,8 +155000,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-4173", +- "self_type" : "type-4172", ++ "referenced_type" : "type-4125", ++ "self_type" : "type-4124", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154967,8 +155009,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-4259", +- "self_type" : "type-4258", ++ "referenced_type" : "type-4211", ++ "self_type" : "type-4210", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154976,8 +155018,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-4375", +- "self_type" : "type-4374", ++ "referenced_type" : "type-4327", ++ "self_type" : "type-4326", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -154985,8 +155027,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-4387", +- "self_type" : "type-4386", ++ "referenced_type" : "type-4339", ++ "self_type" : "type-4338", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -154994,8 +155036,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-4457", +- "self_type" : "type-4456", ++ "referenced_type" : "type-4409", ++ "self_type" : "type-4408", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155003,8 +155045,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-4485", +- "self_type" : "type-4484", ++ "referenced_type" : "type-4437", ++ "self_type" : "type-4436", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -155012,8 +155054,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-4543", +- "self_type" : "type-4542", ++ "referenced_type" : "type-4495", ++ "self_type" : "type-4494", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155021,8 +155063,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-4779", +- "self_type" : "type-4778", ++ "referenced_type" : "type-4731", ++ "self_type" : "type-4730", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" + }, +@@ -155030,8 +155072,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-4846", +- "self_type" : "type-4845", ++ "referenced_type" : "type-4798", ++ "self_type" : "type-4797", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155039,8 +155081,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-4872", +- "self_type" : "type-4871", ++ "referenced_type" : "type-4824", ++ "self_type" : "type-4823", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message_lite.h" + }, +@@ -155048,8 +155090,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-4926", +- "self_type" : "type-4925", ++ "referenced_type" : "type-4878", ++ "self_type" : "type-4877", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -155057,8 +155099,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-4932", +- "self_type" : "type-4931", ++ "referenced_type" : "type-4884", ++ "self_type" : "type-4883", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155066,8 +155108,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-4987", +- "self_type" : "type-4986", ++ "referenced_type" : "type-4939", ++ "self_type" : "type-4938", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -155075,8 +155117,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-5030", +- "self_type" : "type-5029", ++ "referenced_type" : "type-4982", ++ "self_type" : "type-4981", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -155084,8 +155126,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-5050", +- "self_type" : "type-5049", ++ "referenced_type" : "type-5002", ++ "self_type" : "type-5001", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -155093,8 +155135,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-5063", +- "self_type" : "type-5062", ++ "referenced_type" : "type-5015", ++ "self_type" : "type-5014", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -155102,8 +155144,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-5086", +- "self_type" : "type-5085", ++ "referenced_type" : "type-5038", ++ "self_type" : "type-5037", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155111,8 +155153,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-5401", +- "self_type" : "type-5400", ++ "referenced_type" : "type-5353", ++ "self_type" : "type-5352", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155129,8 +155171,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-5595", +- "self_type" : "type-5594", ++ "referenced_type" : "type-5547", ++ "self_type" : "type-5546", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155138,8 +155180,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-5644", +- "self_type" : "type-5643", ++ "referenced_type" : "type-5596", ++ "self_type" : "type-5595", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155147,8 +155189,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-5829", +- "self_type" : "type-5828", ++ "referenced_type" : "type-5781", ++ "self_type" : "type-5780", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155156,8 +155198,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-5890", +- "self_type" : "type-5889", ++ "referenced_type" : "type-5842", ++ "self_type" : "type-5841", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" + }, +@@ -155165,8 +155207,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-5926", +- "self_type" : "type-5925", ++ "referenced_type" : "type-5878", ++ "self_type" : "type-5877", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155174,8 +155216,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-5938", +- "self_type" : "type-5937", ++ "referenced_type" : "type-5890", ++ "self_type" : "type-5889", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, +@@ -155183,8 +155225,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-6032", +- "self_type" : "type-6031", ++ "referenced_type" : "type-5984", ++ "self_type" : "type-5983", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155192,8 +155234,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-6108", +- "self_type" : "type-6107", ++ "referenced_type" : "type-6060", ++ "self_type" : "type-6059", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155201,8 +155243,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-6200", +- "self_type" : "type-6199", ++ "referenced_type" : "type-6152", ++ "self_type" : "type-6151", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -155210,8 +155252,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-6212", +- "self_type" : "type-6211", ++ "referenced_type" : "type-6164", ++ "self_type" : "type-6163", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155219,8 +155261,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-625", +- "self_type" : "type-624", ++ "referenced_type" : "type-6231", ++ "self_type" : "type-6230", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155228,8 +155270,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-6279", +- "self_type" : "type-6278", ++ "referenced_type" : "type-625", ++ "self_type" : "type-624", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155237,8 +155279,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-6308", +- "self_type" : "type-6307", ++ "referenced_type" : "type-6260", ++ "self_type" : "type-6259", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -155246,8 +155288,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-6341", +- "self_type" : "type-6340", ++ "referenced_type" : "type-6293", ++ "self_type" : "type-6292", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155255,8 +155297,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-6430", +- "self_type" : "type-6429", ++ "referenced_type" : "type-6382", ++ "self_type" : "type-6381", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155264,8 +155306,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-6459", +- "self_type" : "type-6458", ++ "referenced_type" : "type-6411", ++ "self_type" : "type-6410", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155273,8 +155315,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-6545", +- "self_type" : "type-6544", ++ "referenced_type" : "type-6497", ++ "self_type" : "type-6496", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155282,8 +155324,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-6903", +- "self_type" : "type-6902", ++ "referenced_type" : "type-6855", ++ "self_type" : "type-6854", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155291,8 +155333,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-7013", +- "self_type" : "type-7012", ++ "referenced_type" : "type-6965", ++ "self_type" : "type-6964", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155300,8 +155342,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-7110", +- "self_type" : "type-7109", ++ "referenced_type" : "type-7062", ++ "self_type" : "type-7061", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155309,8 +155351,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-7293", +- "self_type" : "type-7292", ++ "referenced_type" : "type-7245", ++ "self_type" : "type-7244", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155327,8 +155369,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-7618", +- "self_type" : "type-7617", ++ "referenced_type" : "type-7570", ++ "self_type" : "type-7569", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -155336,8 +155378,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-7626", +- "self_type" : "type-7625", ++ "referenced_type" : "type-7578", ++ "self_type" : "type-7577", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155345,8 +155387,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-7766", +- "self_type" : "type-7765", ++ "referenced_type" : "type-7718", ++ "self_type" : "type-7717", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/bytestream.h" + }, +@@ -155354,8 +155396,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-7795", +- "self_type" : "type-7794", ++ "referenced_type" : "type-7747", ++ "self_type" : "type-7746", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155363,8 +155405,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-7884", +- "self_type" : "type-7883", ++ "referenced_type" : "type-7836", ++ "self_type" : "type-7835", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155372,8 +155414,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-7978", +- "self_type" : "type-7977", ++ "referenced_type" : "type-7930", ++ "self_type" : "type-7929", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155381,8 +155423,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-8006", +- "self_type" : "type-8005", ++ "referenced_type" : "type-7958", ++ "self_type" : "type-7957", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155390,8 +155432,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-8085", +- "self_type" : "type-8084", ++ "referenced_type" : "type-8037", ++ "self_type" : "type-8036", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155408,8 +155450,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-8148", +- "self_type" : "type-8147", ++ "referenced_type" : "type-8100", ++ "self_type" : "type-8099", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message_lite.h" + }, +@@ -155417,26 +155459,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-816", +- "self_type" : "type-815", ++ "referenced_type" : "type-8154", ++ "self_type" : "type-8153", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-8202", +- "self_type" : "type-8201", ++ "referenced_type" : "type-816", ++ "self_type" : "type-815", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-8208", +- "self_type" : "type-8207", ++ "referenced_type" : "type-8160", ++ "self_type" : "type-8159", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155444,8 +155486,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-8263", +- "self_type" : "type-8262", ++ "referenced_type" : "type-8215", ++ "self_type" : "type-8214", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, +@@ -155453,35 +155495,35 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-83", +- "self_type" : "type-82", ++ "referenced_type" : "type-8258", ++ "self_type" : "type-8257", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-8306", +- "self_type" : "type-8305", ++ "referenced_type" : "type-8278", ++ "self_type" : "type-8277", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-8326", +- "self_type" : "type-8325", ++ "referenced_type" : "type-8291", ++ "self_type" : "type-8290", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-8339", +- "self_type" : "type-8338", ++ "referenced_type" : "type-83", ++ "self_type" : "type-82", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -155489,8 +155531,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-8362", +- "self_type" : "type-8361", ++ "referenced_type" : "type-8314", ++ "self_type" : "type-8313", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155498,8 +155540,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-8675", +- "self_type" : "type-8674", ++ "referenced_type" : "type-8627", ++ "self_type" : "type-8626", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155516,26 +155558,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-881", +- "self_type" : "type-880", ++ "referenced_type" : "type-8806", ++ "self_type" : "type-8805", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-8854", +- "self_type" : "type-8853", ++ "referenced_type" : "type-881", ++ "self_type" : "type-880", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-8902", +- "self_type" : "type-8901", ++ "referenced_type" : "type-8854", ++ "self_type" : "type-8853", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155543,8 +155585,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-9086", +- "self_type" : "type-9085", ++ "referenced_type" : "type-9038", ++ "self_type" : "type-9037", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155552,8 +155594,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-9147", +- "self_type" : "type-9146", ++ "referenced_type" : "type-9099", ++ "self_type" : "type-9098", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" + }, +@@ -155561,8 +155603,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-9183", +- "self_type" : "type-9182", ++ "referenced_type" : "type-9135", ++ "self_type" : "type-9134", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155570,8 +155612,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-9195", +- "self_type" : "type-9194", ++ "referenced_type" : "type-9147", ++ "self_type" : "type-9146", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, +@@ -155579,8 +155621,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-9289", +- "self_type" : "type-9288", ++ "referenced_type" : "type-9241", ++ "self_type" : "type-9240", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155588,8 +155630,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-9365", +- "self_type" : "type-9364", ++ "referenced_type" : "type-9317", ++ "self_type" : "type-9316", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155597,8 +155639,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-9457", +- "self_type" : "type-9456", ++ "referenced_type" : "type-9409", ++ "self_type" : "type-9408", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -155606,8 +155648,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-9469", +- "self_type" : "type-9468", ++ "referenced_type" : "type-9421", ++ "self_type" : "type-9420", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155615,26 +155657,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-949", +- "self_type" : "type-948", ++ "referenced_type" : "type-9488", ++ "self_type" : "type-9487", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-9536", +- "self_type" : "type-9535", ++ "referenced_type" : "type-949", ++ "self_type" : "type-948", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringpiece.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-9565", +- "self_type" : "type-9564", ++ "referenced_type" : "type-9517", ++ "self_type" : "type-9516", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -155642,26 +155684,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-958", +- "self_type" : "type-957", ++ "referenced_type" : "type-9550", ++ "self_type" : "type-9549", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-9598", +- "self_type" : "type-9597", ++ "referenced_type" : "type-958", ++ "self_type" : "type-957", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-9682", +- "self_type" : "type-9681", ++ "referenced_type" : "type-9634", ++ "self_type" : "type-9633", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155669,8 +155711,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-9711", +- "self_type" : "type-9710", ++ "referenced_type" : "type-9663", ++ "self_type" : "type-9662", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155678,8 +155720,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-9755", +- "self_type" : "type-9754", ++ "referenced_type" : "type-9707", ++ "self_type" : "type-9706", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155696,8 +155738,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > *", + "name" : "std::basic_string, std::allocator > *", +- "referenced_type" : "type-9995", +- "self_type" : "type-9994", ++ "referenced_type" : "type-9947", ++ "self_type" : "type-9946", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -155705,8 +155747,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-10085", +- "self_type" : "type-10120", ++ "referenced_type" : "type-10037", ++ "self_type" : "type-10072", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -155714,8 +155756,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-10178", +- "self_type" : "type-10193", ++ "referenced_type" : "type-10130", ++ "self_type" : "type-10145", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -155723,8 +155765,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-10329", +- "self_type" : "type-10478", ++ "referenced_type" : "type-10281", ++ "self_type" : "type-10430", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -155741,8 +155783,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-10543", +- "self_type" : "type-10618", ++ "referenced_type" : "type-10495", ++ "self_type" : "type-10570", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -155750,8 +155792,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-10708", +- "self_type" : "type-10726", ++ "referenced_type" : "type-10660", ++ "self_type" : "type-10678", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -155759,8 +155801,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-10796", +- "self_type" : "type-10816", ++ "referenced_type" : "type-10748", ++ "self_type" : "type-10768", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -155768,8 +155810,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-10875", +- "self_type" : "type-10907", ++ "referenced_type" : "type-10827", ++ "self_type" : "type-10859", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -155777,8 +155819,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-10904", +- "self_type" : "type-10903", ++ "referenced_type" : "type-10856", ++ "self_type" : "type-10855", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -155786,8 +155828,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-10983", +- "self_type" : "type-10997", ++ "referenced_type" : "type-10935", ++ "self_type" : "type-10949", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -155795,8 +155837,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-11037", +- "self_type" : "type-11070", ++ "referenced_type" : "type-10989", ++ "self_type" : "type-11022", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -155804,8 +155846,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-11239", +- "self_type" : "type-11269", ++ "referenced_type" : "type-11191", ++ "self_type" : "type-11221", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -155813,8 +155855,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-11388", +- "self_type" : "type-11429", ++ "referenced_type" : "type-11340", ++ "self_type" : "type-11381", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -155822,8 +155864,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-11538", +- "self_type" : "type-11573", ++ "referenced_type" : "type-11490", ++ "self_type" : "type-11525", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -155831,17 +155873,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-11691", +- "self_type" : "type-11757", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > **", +- "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-12003", +- "self_type" : "type-12030", ++ "referenced_type" : "type-11643", ++ "self_type" : "type-11709", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -155849,8 +155882,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-12187", +- "self_type" : "type-12186", ++ "referenced_type" : "type-11955", ++ "self_type" : "type-11982", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -155858,8 +155891,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-12235", +- "self_type" : "type-12299", ++ "referenced_type" : "type-12139", ++ "self_type" : "type-12138", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -155867,8 +155900,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-1237", +- "self_type" : "type-1243", ++ "referenced_type" : "type-12187", ++ "self_type" : "type-12251", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -155876,8 +155909,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-12417", +- "self_type" : "type-12447", ++ "referenced_type" : "type-12369", ++ "self_type" : "type-12399", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -155885,8 +155918,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-12514", +- "self_type" : "type-12535", ++ "referenced_type" : "type-12466", ++ "self_type" : "type-12487", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -155894,8 +155927,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-12620", +- "self_type" : "type-12634", ++ "referenced_type" : "type-12572", ++ "self_type" : "type-12586", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -155903,8 +155936,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-12696", +- "self_type" : "type-12777", ++ "referenced_type" : "type-12648", ++ "self_type" : "type-12729", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -155912,8 +155945,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-12800", +- "self_type" : "type-12815", ++ "referenced_type" : "type-12752", ++ "self_type" : "type-12767", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -155921,17 +155954,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-1282", +- "self_type" : "type-1437", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > **", +- "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-12867", +- "self_type" : "type-12921", ++ "referenced_type" : "type-12819", ++ "self_type" : "type-12873", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -155939,8 +155963,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-12929", +- "self_type" : "type-12950", ++ "referenced_type" : "type-12881", ++ "self_type" : "type-12902", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -155948,8 +155972,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-13013", +- "self_type" : "type-13030", ++ "referenced_type" : "type-12965", ++ "self_type" : "type-12982", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -155957,8 +155981,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-13042", +- "self_type" : "type-13047", ++ "referenced_type" : "type-12994", ++ "self_type" : "type-12999", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -155966,8 +155990,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-13086", +- "self_type" : "type-13248", ++ "referenced_type" : "type-13038", ++ "self_type" : "type-13200", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -155975,8 +155999,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-13327", +- "self_type" : "type-13372", ++ "referenced_type" : "type-13279", ++ "self_type" : "type-13324", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -155984,17 +156008,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-13418", +- "self_type" : "type-13453", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > **", +- "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-13511", +- "self_type" : "type-13526", ++ "referenced_type" : "type-13370", ++ "self_type" : "type-13405", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156002,8 +156017,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-13620", +- "self_type" : "type-13769", ++ "referenced_type" : "type-13463", ++ "self_type" : "type-13478", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156011,8 +156026,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-13834", +- "self_type" : "type-13909", ++ "referenced_type" : "type-1355", ++ "self_type" : "type-1354", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -156020,26 +156035,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-13999", +- "self_type" : "type-14017", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > **", +- "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-14087", +- "self_type" : "type-14107", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::basic_string, std::allocator > **", +- "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-14166", +- "self_type" : "type-14198", ++ "referenced_type" : "type-13572", ++ "self_type" : "type-13721", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156047,8 +156044,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-14195", +- "self_type" : "type-14194", ++ "referenced_type" : "type-13786", ++ "self_type" : "type-13861", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -156056,8 +156053,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-14274", +- "self_type" : "type-14288", ++ "referenced_type" : "type-13951", ++ "self_type" : "type-13969", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156065,8 +156062,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-14328", +- "self_type" : "type-14352", ++ "referenced_type" : "type-14039", ++ "self_type" : "type-14059", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156074,8 +156071,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-14491", +- "self_type" : "type-14520", ++ "referenced_type" : "type-14118", ++ "self_type" : "type-14150", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156083,17 +156080,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-14612", +- "self_type" : "type-14648", ++ "referenced_type" : "type-14147", ++ "self_type" : "type-14146", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-14880", +- "self_type" : "type-14879", ++ "referenced_type" : "type-14226", ++ "self_type" : "type-14240", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156101,8 +156098,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-14998", +- "self_type" : "type-15094", ++ "referenced_type" : "type-14280", ++ "self_type" : "type-14304", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156110,8 +156107,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-15011", +- "self_type" : "type-15432", ++ "referenced_type" : "type-1441", ++ "self_type" : "type-1476", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -156119,8 +156116,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-15174", +- "self_type" : "type-15188", ++ "referenced_type" : "type-14443", ++ "self_type" : "type-14472", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156128,8 +156125,35 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-1522", +- "self_type" : "type-1553", ++ "referenced_type" : "type-14564", ++ "self_type" : "type-14600", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > **", ++ "name" : "std::basic_string, std::allocator > **", ++ "referenced_type" : "type-14832", ++ "self_type" : "type-14831", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > **", ++ "name" : "std::basic_string, std::allocator > **", ++ "referenced_type" : "type-14950", ++ "self_type" : "type-15046", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > **", ++ "name" : "std::basic_string, std::allocator > **", ++ "referenced_type" : "type-14963", ++ "self_type" : "type-15384", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -156137,8 +156161,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-15547", +- "self_type" : "type-15614", ++ "referenced_type" : "type-15126", ++ "self_type" : "type-15140", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156146,8 +156170,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-15859", +- "self_type" : "type-15886", ++ "referenced_type" : "type-15499", ++ "self_type" : "type-15566", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156155,8 +156179,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16042", +- "self_type" : "type-16041", ++ "referenced_type" : "type-15811", ++ "self_type" : "type-15838", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156164,8 +156188,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16090", +- "self_type" : "type-16154", ++ "referenced_type" : "type-15994", ++ "self_type" : "type-15993", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156173,8 +156197,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16274", +- "self_type" : "type-16304", ++ "referenced_type" : "type-16042", ++ "self_type" : "type-16106", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156182,8 +156206,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16371", +- "self_type" : "type-16392", ++ "referenced_type" : "type-16226", ++ "self_type" : "type-16256", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156191,8 +156215,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16477", +- "self_type" : "type-16491", ++ "referenced_type" : "type-16323", ++ "self_type" : "type-16344", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156200,8 +156224,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16552", +- "self_type" : "type-16633", ++ "referenced_type" : "type-16429", ++ "self_type" : "type-16443", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156209,8 +156233,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16656", +- "self_type" : "type-16671", ++ "referenced_type" : "type-16504", ++ "self_type" : "type-16585", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156218,8 +156242,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16723", +- "self_type" : "type-16777", ++ "referenced_type" : "type-16608", ++ "self_type" : "type-16623", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156227,8 +156251,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16785", +- "self_type" : "type-16806", ++ "referenced_type" : "type-16675", ++ "self_type" : "type-16729", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156236,8 +156260,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16869", +- "self_type" : "type-16886", ++ "referenced_type" : "type-16737", ++ "self_type" : "type-16758", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156245,8 +156269,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16898", +- "self_type" : "type-16903", ++ "referenced_type" : "type-16821", ++ "self_type" : "type-16838", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156254,8 +156278,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-16942", +- "self_type" : "type-17104", ++ "referenced_type" : "type-16850", ++ "self_type" : "type-16855", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > **", ++ "name" : "std::basic_string, std::allocator > **", ++ "referenced_type" : "type-16894", ++ "self_type" : "type-17056", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -156263,8 +156296,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-17183", +- "self_type" : "type-17228", ++ "referenced_type" : "type-17135", ++ "self_type" : "type-17180", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -156272,8 +156305,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-17274", +- "self_type" : "type-17309", ++ "referenced_type" : "type-17226", ++ "self_type" : "type-17261", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156281,8 +156314,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-17367", +- "self_type" : "type-17382", ++ "referenced_type" : "type-17319", ++ "self_type" : "type-17334", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156290,8 +156323,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-17484", +- "self_type" : "type-17633", ++ "referenced_type" : "type-17436", ++ "self_type" : "type-17585", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156299,8 +156332,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-17698", +- "self_type" : "type-17773", ++ "referenced_type" : "type-1752", ++ "self_type" : "type-1858", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" ++ }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::basic_string, std::allocator > **", ++ "name" : "std::basic_string, std::allocator > **", ++ "referenced_type" : "type-17650", ++ "self_type" : "type-17725", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -156308,8 +156350,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-17863", +- "self_type" : "type-17881", ++ "referenced_type" : "type-17815", ++ "self_type" : "type-17833", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156317,8 +156359,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-17951", +- "self_type" : "type-17971", ++ "referenced_type" : "type-17903", ++ "self_type" : "type-17923", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156326,8 +156368,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-18030", +- "self_type" : "type-18062", ++ "referenced_type" : "type-17982", ++ "self_type" : "type-18014", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156335,8 +156377,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-18059", +- "self_type" : "type-18058", ++ "referenced_type" : "type-18011", ++ "self_type" : "type-18010", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -156344,8 +156386,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-18138", +- "self_type" : "type-18152", ++ "referenced_type" : "type-18090", ++ "self_type" : "type-18104", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156353,8 +156395,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-18192", +- "self_type" : "type-18216", ++ "referenced_type" : "type-18144", ++ "self_type" : "type-18168", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156362,8 +156404,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-18355", +- "self_type" : "type-18384", ++ "referenced_type" : "type-18307", ++ "self_type" : "type-18336", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156371,8 +156413,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-1840", +- "self_type" : "type-1935", ++ "referenced_type" : "type-18428", ++ "self_type" : "type-18464", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156380,8 +156422,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-18476", +- "self_type" : "type-18512", ++ "referenced_type" : "type-18689", ++ "self_type" : "type-18688", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156389,8 +156431,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-18737", +- "self_type" : "type-18736", ++ "referenced_type" : "type-18769", ++ "self_type" : "type-18830", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156398,26 +156440,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-18817", +- "self_type" : "type-18878", ++ "referenced_type" : "type-18782", ++ "self_type" : "type-19279", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-18830", +- "self_type" : "type-19327", ++ "referenced_type" : "type-18910", ++ "self_type" : "type-18924", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-18958", +- "self_type" : "type-18972", ++ "referenced_type" : "type-19127", ++ "self_type" : "type-19162", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156425,8 +156467,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-19175", +- "self_type" : "type-19210", ++ "referenced_type" : "type-19332", ++ "self_type" : "type-19355", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156434,8 +156476,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-19380", +- "self_type" : "type-19403", ++ "referenced_type" : "type-19436", ++ "self_type" : "type-19550", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156443,8 +156485,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-19484", +- "self_type" : "type-19598", ++ "referenced_type" : "type-19658", ++ "self_type" : "type-19720", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156452,8 +156494,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-19706", +- "self_type" : "type-19768", ++ "referenced_type" : "type-19818", ++ "self_type" : "type-19830", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156461,8 +156503,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-19866", +- "self_type" : "type-19878", ++ "referenced_type" : "type-20032", ++ "self_type" : "type-20099", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156470,8 +156512,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-20080", +- "self_type" : "type-20147", ++ "referenced_type" : "type-20345", ++ "self_type" : "type-20372", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156479,8 +156521,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-20393", +- "self_type" : "type-20420", ++ "referenced_type" : "type-20526", ++ "self_type" : "type-20525", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156489,7 +156531,7 @@ + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", + "referenced_type" : "type-20574", +- "self_type" : "type-20573", ++ "self_type" : "type-20637", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156497,8 +156539,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-20622", +- "self_type" : "type-20685", ++ "referenced_type" : "type-20757", ++ "self_type" : "type-20787", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156506,8 +156548,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-20805", +- "self_type" : "type-20835", ++ "referenced_type" : "type-20854", ++ "self_type" : "type-20875", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156515,8 +156557,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-20902", +- "self_type" : "type-20923", ++ "referenced_type" : "type-20960", ++ "self_type" : "type-20974", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156524,8 +156566,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21008", +- "self_type" : "type-21022", ++ "referenced_type" : "type-21036", ++ "self_type" : "type-21117", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156533,8 +156575,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21084", +- "self_type" : "type-21165", ++ "referenced_type" : "type-21140", ++ "self_type" : "type-21155", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156542,8 +156584,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21188", +- "self_type" : "type-21203", ++ "referenced_type" : "type-21207", ++ "self_type" : "type-21261", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156551,8 +156593,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21255", +- "self_type" : "type-21309", ++ "referenced_type" : "type-21269", ++ "self_type" : "type-21290", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156560,8 +156602,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21317", +- "self_type" : "type-21338", ++ "referenced_type" : "type-21353", ++ "self_type" : "type-21370", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156569,8 +156611,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21401", +- "self_type" : "type-21418", ++ "referenced_type" : "type-21382", ++ "self_type" : "type-21387", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156578,17 +156620,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21430", +- "self_type" : "type-21435", ++ "referenced_type" : "type-21426", ++ "self_type" : "type-21588", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21474", +- "self_type" : "type-21636", ++ "referenced_type" : "type-21667", ++ "self_type" : "type-21712", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -156596,17 +156638,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21715", +- "self_type" : "type-21760", ++ "referenced_type" : "type-21758", ++ "self_type" : "type-21793", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21806", +- "self_type" : "type-21841", ++ "referenced_type" : "type-21851", ++ "self_type" : "type-21866", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156614,7 +156656,7 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-21899", ++ "referenced_type" : "type-21894", + "self_type" : "type-21914", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" +@@ -156623,8 +156665,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-22013", +- "self_type" : "type-22162", ++ "referenced_type" : "type-22012", ++ "self_type" : "type-22160", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156632,26 +156674,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-22227", +- "self_type" : "type-22302", ++ "referenced_type" : "type-22044", ++ "self_type" : "type-22056", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-22392", +- "self_type" : "type-22410", ++ "referenced_type" : "type-22212", ++ "self_type" : "type-22272", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-22480", +- "self_type" : "type-22500", ++ "referenced_type" : "type-22352", ++ "self_type" : "type-22368", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156659,8 +156701,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-22559", +- "self_type" : "type-22591", ++ "referenced_type" : "type-22413", ++ "self_type" : "type-22425", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156668,8 +156710,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-22588", +- "self_type" : "type-22587", ++ "referenced_type" : "type-22460", ++ "self_type" : "type-23209", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -156677,8 +156719,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-22667", +- "self_type" : "type-22681", ++ "referenced_type" : "type-22480", ++ "self_type" : "type-22502", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156686,8 +156728,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-22721", +- "self_type" : "type-22745", ++ "referenced_type" : "type-22581", ++ "self_type" : "type-22601", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156695,8 +156737,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-22884", +- "self_type" : "type-22913", ++ "referenced_type" : "type-2265", ++ "self_type" : "type-2322", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156704,8 +156746,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-23005", +- "self_type" : "type-23041", ++ "referenced_type" : "type-22650", ++ "self_type" : "type-22680", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156713,8 +156755,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-23266", +- "self_type" : "type-23265", ++ "referenced_type" : "type-22845", ++ "self_type" : "type-22878", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156722,8 +156764,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-23346", +- "self_type" : "type-23407", ++ "referenced_type" : "type-22978", ++ "self_type" : "type-23018", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156731,17 +156773,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-23359", +- "self_type" : "type-23848", ++ "referenced_type" : "type-23257", ++ "self_type" : "type-23256", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-2338", +- "self_type" : "type-2394", ++ "referenced_type" : "type-23339", ++ "self_type" : "type-23390", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156749,8 +156791,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-23487", +- "self_type" : "type-23501", ++ "referenced_type" : "type-23465", ++ "self_type" : "type-23479", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156758,8 +156800,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-23704", +- "self_type" : "type-23731", ++ "referenced_type" : "type-23692", ++ "self_type" : "type-23721", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156767,8 +156809,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-23880", +- "self_type" : "type-23903", ++ "referenced_type" : "type-23882", ++ "self_type" : "type-23906", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156776,8 +156818,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-23984", +- "self_type" : "type-24068", ++ "referenced_type" : "type-23987", ++ "self_type" : "type-24065", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156785,17 +156827,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-24173", +- "self_type" : "type-24235", ++ "referenced_type" : "type-24152", ++ "self_type" : "type-24632", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-24333", +- "self_type" : "type-24345", ++ "referenced_type" : "type-24175", ++ "self_type" : "type-24241", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156803,8 +156845,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-24486", +- "self_type" : "type-24544", ++ "referenced_type" : "type-24321", ++ "self_type" : "type-24330", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156812,8 +156854,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-24660", +- "self_type" : "type-24676", ++ "referenced_type" : "type-24463", ++ "self_type" : "type-24518", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156821,8 +156863,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-24752", +- "self_type" : "type-24774", ++ "referenced_type" : "type-24623", ++ "self_type" : "type-24639", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156830,8 +156872,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-24920", +- "self_type" : "type-25025", ++ "referenced_type" : "type-24708", ++ "self_type" : "type-24731", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156839,8 +156881,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-25059", +- "self_type" : "type-25058", ++ "referenced_type" : "type-24887", ++ "self_type" : "type-24994", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156848,8 +156890,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-25175", +- "self_type" : "type-25190", ++ "referenced_type" : "type-25030", ++ "self_type" : "type-25029", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156857,8 +156899,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-25200", +- "self_type" : "type-25325", ++ "referenced_type" : "type-2508", ++ "self_type" : "type-2507", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156866,8 +156908,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-25569", +- "self_type" : "type-25596", ++ "referenced_type" : "type-25157", ++ "self_type" : "type-25179", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156875,8 +156917,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-25753", +- "self_type" : "type-25752", ++ "referenced_type" : "type-25326", ++ "self_type" : "type-25383", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156884,8 +156926,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-2576", +- "self_type" : "type-2575", ++ "referenced_type" : "type-25623", ++ "self_type" : "type-25649", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156893,8 +156935,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-25801", +- "self_type" : "type-25864", ++ "referenced_type" : "type-25802", ++ "self_type" : "type-25801", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156902,8 +156944,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-25983", +- "self_type" : "type-26013", ++ "referenced_type" : "type-25850", ++ "self_type" : "type-25915", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156911,8 +156953,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-26080", +- "self_type" : "type-26101", ++ "referenced_type" : "type-26036", ++ "self_type" : "type-26066", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156920,8 +156962,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-26186", +- "self_type" : "type-26200", ++ "referenced_type" : "type-26127", ++ "self_type" : "type-26145", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156929,8 +156971,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-26262", +- "self_type" : "type-26343", ++ "referenced_type" : "type-26230", ++ "self_type" : "type-26244", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156938,8 +156980,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-26366", +- "self_type" : "type-26381", ++ "referenced_type" : "type-2627", ++ "self_type" : "type-2631", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156947,8 +156989,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-26433", +- "self_type" : "type-26487", ++ "referenced_type" : "type-26305", ++ "self_type" : "type-26385", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156956,8 +156998,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-26495", +- "self_type" : "type-26516", ++ "referenced_type" : "type-26408", ++ "self_type" : "type-26423", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156965,8 +157007,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-26579", +- "self_type" : "type-26596", ++ "referenced_type" : "type-26476", ++ "self_type" : "type-26523", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156974,8 +157016,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-26608", +- "self_type" : "type-26613", ++ "referenced_type" : "type-26529", ++ "self_type" : "type-26547", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -156983,17 +157025,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-26652", +- "self_type" : "type-26814", ++ "referenced_type" : "type-26607", ++ "self_type" : "type-26624", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-26893", +- "self_type" : "type-26938", ++ "referenced_type" : "type-26673", ++ "self_type" : "type-26839", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -157001,17 +157043,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-26984", +- "self_type" : "type-27019", ++ "referenced_type" : "type-26914", ++ "self_type" : "type-26961", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-27077", +- "self_type" : "type-27092", ++ "referenced_type" : "type-27009", ++ "self_type" : "type-27049", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157019,8 +157061,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-27198", +- "self_type" : "type-27347", ++ "referenced_type" : "type-27197", ++ "self_type" : "type-27346", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157028,8 +157070,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-27412", +- "self_type" : "type-27487", ++ "referenced_type" : "type-27411", ++ "self_type" : "type-27486", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -157037,8 +157079,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-27577", +- "self_type" : "type-27595", ++ "referenced_type" : "type-27576", ++ "self_type" : "type-27594", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157046,8 +157088,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-27665", +- "self_type" : "type-27685", ++ "referenced_type" : "type-27664", ++ "self_type" : "type-27684", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157055,8 +157097,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-27744", +- "self_type" : "type-27776", ++ "referenced_type" : "type-27743", ++ "self_type" : "type-27775", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157064,8 +157106,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-27773", +- "self_type" : "type-27772", ++ "referenced_type" : "type-27772", ++ "self_type" : "type-27771", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -157073,8 +157115,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-27852", +- "self_type" : "type-27866", ++ "referenced_type" : "type-27851", ++ "self_type" : "type-27865", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157082,8 +157124,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-27906", +- "self_type" : "type-27930", ++ "referenced_type" : "type-27905", ++ "self_type" : "type-27929", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157091,8 +157133,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-28069", +- "self_type" : "type-28098", ++ "referenced_type" : "type-28068", ++ "self_type" : "type-28097", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157100,17 +157142,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-28190", +- "self_type" : "type-28226", ++ "referenced_type" : "type-2817", ++ "self_type" : "type-2816", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-28451", +- "self_type" : "type-28450", ++ "referenced_type" : "type-28189", ++ "self_type" : "type-28225", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157118,8 +157160,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-28531", +- "self_type" : "type-28592", ++ "referenced_type" : "type-28450", ++ "self_type" : "type-28449", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157127,17 +157169,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-28544", +- "self_type" : "type-29033", ++ "referenced_type" : "type-28530", ++ "self_type" : "type-28591", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-2865", +- "self_type" : "type-2864", ++ "referenced_type" : "type-28543", ++ "self_type" : "type-29032", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -157145,8 +157187,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-28672", +- "self_type" : "type-28686", ++ "referenced_type" : "type-28671", ++ "self_type" : "type-28685", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157154,8 +157196,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-28889", +- "self_type" : "type-28916", ++ "referenced_type" : "type-28888", ++ "self_type" : "type-28915", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157163,17 +157205,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-29065", +- "self_type" : "type-29088", ++ "referenced_type" : "type-2903", ++ "self_type" : "type-2938", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-29169", +- "self_type" : "type-29253", ++ "referenced_type" : "type-29064", ++ "self_type" : "type-29087", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157181,8 +157223,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-29358", +- "self_type" : "type-29420", ++ "referenced_type" : "type-29168", ++ "self_type" : "type-29252", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157190,17 +157232,17 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-2951", +- "self_type" : "type-2986", ++ "referenced_type" : "type-29357", ++ "self_type" : "type-29419", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-29518", +- "self_type" : "type-29530", ++ "referenced_type" : "type-29517", ++ "self_type" : "type-29529", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157208,8 +157250,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-29671", +- "self_type" : "type-29729", ++ "referenced_type" : "type-29670", ++ "self_type" : "type-29728", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157217,8 +157259,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-29841", +- "self_type" : "type-29857", ++ "referenced_type" : "type-29840", ++ "self_type" : "type-29856", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157226,8 +157268,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-29933", +- "self_type" : "type-29953", ++ "referenced_type" : "type-29932", ++ "self_type" : "type-29952", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157235,8 +157277,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-30080", +- "self_type" : "type-30175", ++ "referenced_type" : "type-30079", ++ "self_type" : "type-30174", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157244,8 +157286,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-30204", +- "self_type" : "type-30203", ++ "referenced_type" : "type-30203", ++ "self_type" : "type-30202", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157253,8 +157295,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-30319", +- "self_type" : "type-30334", ++ "referenced_type" : "type-30318", ++ "self_type" : "type-30333", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157262,8 +157304,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-30344", +- "self_type" : "type-30469", ++ "referenced_type" : "type-30343", ++ "self_type" : "type-30468", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157271,8 +157313,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-30715", +- "self_type" : "type-30742", ++ "referenced_type" : "type-3057", ++ "self_type" : "type-3125", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157280,8 +157322,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-30899", +- "self_type" : "type-30898", ++ "referenced_type" : "type-30714", ++ "self_type" : "type-30741", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157289,8 +157331,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-30947", +- "self_type" : "type-31010", ++ "referenced_type" : "type-30898", ++ "self_type" : "type-30897", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157298,8 +157340,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-3105", +- "self_type" : "type-3173", ++ "referenced_type" : "type-30946", ++ "self_type" : "type-31009", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157307,8 +157349,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-31130", +- "self_type" : "type-31160", ++ "referenced_type" : "type-31129", ++ "self_type" : "type-31159", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157316,8 +157358,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-31227", +- "self_type" : "type-31248", ++ "referenced_type" : "type-31226", ++ "self_type" : "type-31247", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157325,8 +157367,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-31333", +- "self_type" : "type-31347", ++ "referenced_type" : "type-31332", ++ "self_type" : "type-31346", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157334,8 +157376,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-31409", +- "self_type" : "type-31490", ++ "referenced_type" : "type-31408", ++ "self_type" : "type-31489", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157343,8 +157385,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-31513", +- "self_type" : "type-31528", ++ "referenced_type" : "type-31512", ++ "self_type" : "type-31527", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157352,8 +157394,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-31580", +- "self_type" : "type-31634", ++ "referenced_type" : "type-31579", ++ "self_type" : "type-31633", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157361,8 +157403,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-31642", +- "self_type" : "type-31663", ++ "referenced_type" : "type-31641", ++ "self_type" : "type-31662", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157370,8 +157412,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-31726", +- "self_type" : "type-31743", ++ "referenced_type" : "type-31725", ++ "self_type" : "type-31742", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157379,8 +157421,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-31755", +- "self_type" : "type-31760", ++ "referenced_type" : "type-31754", ++ "self_type" : "type-31759", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157388,8 +157430,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-31799", +- "self_type" : "type-31961", ++ "referenced_type" : "type-31798", ++ "self_type" : "type-31960", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -157397,8 +157439,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-32040", +- "self_type" : "type-32085", ++ "referenced_type" : "type-32039", ++ "self_type" : "type-32084", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -157406,8 +157448,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-32131", +- "self_type" : "type-32166", ++ "referenced_type" : "type-32130", ++ "self_type" : "type-32165", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157415,8 +157457,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-32224", +- "self_type" : "type-32239", ++ "referenced_type" : "type-32223", ++ "self_type" : "type-32238", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157424,8 +157466,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-3420", +- "self_type" : "type-3453", ++ "referenced_type" : "type-3372", ++ "self_type" : "type-3405", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157433,8 +157475,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-3616", +- "self_type" : "type-3615", ++ "referenced_type" : "type-3568", ++ "self_type" : "type-3567", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157442,8 +157484,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-3678", +- "self_type" : "type-3777", ++ "referenced_type" : "type-3630", ++ "self_type" : "type-3729", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157451,8 +157493,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-3920", +- "self_type" : "type-3950", ++ "referenced_type" : "type-3872", ++ "self_type" : "type-3902", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157460,8 +157502,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-4018", +- "self_type" : "type-4087", ++ "referenced_type" : "type-3970", ++ "self_type" : "type-4039", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157469,8 +157511,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-4172", +- "self_type" : "type-4189", ++ "referenced_type" : "type-4124", ++ "self_type" : "type-4141", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157478,8 +157520,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-4258", +- "self_type" : "type-4364", ++ "referenced_type" : "type-4210", ++ "self_type" : "type-4316", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157487,8 +157529,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-4386", +- "self_type" : "type-4402", ++ "referenced_type" : "type-4338", ++ "self_type" : "type-4354", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157496,8 +157538,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-4456", +- "self_type" : "type-4509", ++ "referenced_type" : "type-4408", ++ "self_type" : "type-4461", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157505,8 +157547,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-4542", +- "self_type" : "type-4547", ++ "referenced_type" : "type-4494", ++ "self_type" : "type-4499", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157514,8 +157556,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-4845", +- "self_type" : "type-4844", ++ "referenced_type" : "type-4797", ++ "self_type" : "type-4796", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -157523,8 +157565,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-4931", +- "self_type" : "type-4966", ++ "referenced_type" : "type-4883", ++ "self_type" : "type-4918", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -157532,8 +157574,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-5085", +- "self_type" : "type-5153", ++ "referenced_type" : "type-5037", ++ "self_type" : "type-5105", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157541,8 +157583,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-5400", +- "self_type" : "type-5433", ++ "referenced_type" : "type-5352", ++ "self_type" : "type-5385", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157550,8 +157592,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-5594", +- "self_type" : "type-5593", ++ "referenced_type" : "type-5546", ++ "self_type" : "type-5545", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157559,8 +157601,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-5643", +- "self_type" : "type-5708", ++ "referenced_type" : "type-5595", ++ "self_type" : "type-5660", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157568,8 +157610,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-5828", +- "self_type" : "type-5858", ++ "referenced_type" : "type-5780", ++ "self_type" : "type-5810", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157577,8 +157619,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-5925", +- "self_type" : "type-5946", ++ "referenced_type" : "type-5877", ++ "self_type" : "type-5898", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157586,8 +157628,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-6031", +- "self_type" : "type-6045", ++ "referenced_type" : "type-5983", ++ "self_type" : "type-5997", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157595,8 +157637,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-6107", +- "self_type" : "type-6188", ++ "referenced_type" : "type-6059", ++ "self_type" : "type-6140", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157604,8 +157646,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-6211", +- "self_type" : "type-6226", ++ "referenced_type" : "type-6163", ++ "self_type" : "type-6178", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157613,26 +157655,26 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-624", +- "self_type" : "type-667", ++ "referenced_type" : "type-6230", ++ "self_type" : "type-6284", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-6278", +- "self_type" : "type-6332", ++ "referenced_type" : "type-624", ++ "self_type" : "type-667", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-6340", +- "self_type" : "type-6364", ++ "referenced_type" : "type-6292", ++ "self_type" : "type-6316", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157640,8 +157682,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-6429", +- "self_type" : "type-6446", ++ "referenced_type" : "type-6381", ++ "self_type" : "type-6398", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157649,8 +157691,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-6458", +- "self_type" : "type-6463", ++ "referenced_type" : "type-6410", ++ "self_type" : "type-6415", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157658,8 +157700,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-6544", +- "self_type" : "type-6770", ++ "referenced_type" : "type-6496", ++ "self_type" : "type-6722", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -157667,8 +157709,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-6902", +- "self_type" : "type-6954", ++ "referenced_type" : "type-6854", ++ "self_type" : "type-6906", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -157676,8 +157718,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-7012", +- "self_type" : "type-7047", ++ "referenced_type" : "type-6964", ++ "self_type" : "type-6999", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157685,8 +157727,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-7109", +- "self_type" : "type-7126", ++ "referenced_type" : "type-7061", ++ "self_type" : "type-7078", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157694,8 +157736,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-7292", +- "self_type" : "type-7548", ++ "referenced_type" : "type-7244", ++ "self_type" : "type-7500", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157703,8 +157745,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-7625", +- "self_type" : "type-7703", ++ "referenced_type" : "type-7577", ++ "self_type" : "type-7655", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -157712,8 +157754,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-7794", +- "self_type" : "type-7813", ++ "referenced_type" : "type-7746", ++ "self_type" : "type-7765", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157721,8 +157763,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-7883", +- "self_type" : "type-7918", ++ "referenced_type" : "type-7835", ++ "self_type" : "type-7870", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157730,8 +157772,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-7977", +- "self_type" : "type-8008", ++ "referenced_type" : "type-7929", ++ "self_type" : "type-7960", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157739,8 +157781,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-8005", +- "self_type" : "type-8004", ++ "referenced_type" : "type-7957", ++ "self_type" : "type-7956", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -157748,8 +157790,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-8084", +- "self_type" : "type-8098", ++ "referenced_type" : "type-8036", ++ "self_type" : "type-8050", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157766,8 +157808,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-8207", +- "self_type" : "type-8242", ++ "referenced_type" : "type-8159", ++ "self_type" : "type-8194", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -157775,8 +157817,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-8361", +- "self_type" : "type-8428", ++ "referenced_type" : "type-8313", ++ "self_type" : "type-8380", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157784,8 +157826,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-8674", +- "self_type" : "type-8698", ++ "referenced_type" : "type-8626", ++ "self_type" : "type-8650", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157793,8 +157835,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-8853", +- "self_type" : "type-8852", ++ "referenced_type" : "type-8805", ++ "self_type" : "type-8804", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157802,8 +157844,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-8901", +- "self_type" : "type-8965", ++ "referenced_type" : "type-8853", ++ "self_type" : "type-8917", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157811,8 +157853,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-9085", +- "self_type" : "type-9115", ++ "referenced_type" : "type-9037", ++ "self_type" : "type-9067", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157820,8 +157862,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-9182", +- "self_type" : "type-9203", ++ "referenced_type" : "type-9134", ++ "self_type" : "type-9155", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157829,8 +157871,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-9288", +- "self_type" : "type-9302", ++ "referenced_type" : "type-9240", ++ "self_type" : "type-9254", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157838,8 +157880,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-9364", +- "self_type" : "type-9445", ++ "referenced_type" : "type-9316", ++ "self_type" : "type-9397", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157847,8 +157889,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-9468", +- "self_type" : "type-9483", ++ "referenced_type" : "type-9420", ++ "self_type" : "type-9435", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157856,8 +157898,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-9535", +- "self_type" : "type-9589", ++ "referenced_type" : "type-9487", ++ "self_type" : "type-9541", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157865,8 +157907,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-9597", +- "self_type" : "type-9618", ++ "referenced_type" : "type-9549", ++ "self_type" : "type-9570", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157874,8 +157916,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-9681", +- "self_type" : "type-9698", ++ "referenced_type" : "type-9633", ++ "self_type" : "type-9650", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157883,8 +157925,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-9710", +- "self_type" : "type-9715", ++ "referenced_type" : "type-9662", ++ "self_type" : "type-9667", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arenastring.h" + }, +@@ -157892,8 +157934,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-9754", +- "self_type" : "type-9916", ++ "referenced_type" : "type-9706", ++ "self_type" : "type-9868", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -157901,8 +157943,8 @@ + "alignment" : 4, + "linker_set_key" : "std::basic_string, std::allocator > **", + "name" : "std::basic_string, std::allocator > **", +- "referenced_type" : "type-9994", +- "self_type" : "type-10039", ++ "referenced_type" : "type-9946", ++ "self_type" : "type-9991", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/wire_format_lite.h" + }, +@@ -157910,8 +157952,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > *", + "name" : "std::map, std::allocator > > *", +- "referenced_type" : "type-10623", +- "self_type" : "type-10622", ++ "referenced_type" : "type-10575", ++ "self_type" : "type-10574", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -157919,8 +157961,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > *", + "name" : "std::map, std::allocator > > *", +- "referenced_type" : "type-13914", +- "self_type" : "type-13913", ++ "referenced_type" : "type-13866", ++ "self_type" : "type-13865", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -157928,8 +157970,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > *", + "name" : "std::map, std::allocator > > *", +- "referenced_type" : "type-17778", +- "self_type" : "type-17777", ++ "referenced_type" : "type-17730", ++ "self_type" : "type-17729", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -157937,8 +157979,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > *", + "name" : "std::map, std::allocator > > *", +- "referenced_type" : "type-22307", +- "self_type" : "type-22306", ++ "referenced_type" : "type-22277", ++ "self_type" : "type-22276", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -157946,8 +157988,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > *", + "name" : "std::map, std::allocator > > *", +- "referenced_type" : "type-27492", +- "self_type" : "type-27491", ++ "referenced_type" : "type-27491", ++ "self_type" : "type-27490", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -157955,8 +157997,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > *", + "name" : "std::map, std::allocator > > *", +- "referenced_type" : "type-7708", +- "self_type" : "type-7707", ++ "referenced_type" : "type-7660", ++ "self_type" : "type-7659", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -157964,8 +158006,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > *", + "name" : "std::map, std::allocator > > *", +- "referenced_type" : "type-20019", +- "self_type" : "type-20018", ++ "referenced_type" : "type-19971", ++ "self_type" : "type-19970", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -157973,8 +158015,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > *", + "name" : "std::map, std::allocator > > *", +- "referenced_type" : "type-24479", +- "self_type" : "type-24478", ++ "referenced_type" : "type-24458", ++ "self_type" : "type-24457", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -157982,8 +158024,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > *", + "name" : "std::map, std::allocator > > *", +- "referenced_type" : "type-29664", +- "self_type" : "type-29663", ++ "referenced_type" : "type-29663", ++ "self_type" : "type-29662", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -157991,8 +158033,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > *", + "name" : "std::map, std::allocator > > *", +- "referenced_type" : "type-10528", +- "self_type" : "type-10527", ++ "referenced_type" : "type-10480", ++ "self_type" : "type-10479", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -158000,8 +158042,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > *", + "name" : "std::map, std::allocator > > *", +- "referenced_type" : "type-1334", +- "self_type" : "type-1333", ++ "referenced_type" : "type-1249", ++ "self_type" : "type-1248", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -158009,8 +158051,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > *", + "name" : "std::map, std::allocator > > *", +- "referenced_type" : "type-13819", +- "self_type" : "type-13818", ++ "referenced_type" : "type-13771", ++ "self_type" : "type-13770", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -158018,8 +158060,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > *", + "name" : "std::map, std::allocator > > *", +- "referenced_type" : "type-17683", +- "self_type" : "type-17682", ++ "referenced_type" : "type-17635", ++ "self_type" : "type-17634", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -158027,8 +158069,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > *", + "name" : "std::map, std::allocator > > *", +- "referenced_type" : "type-22212", +- "self_type" : "type-22211", ++ "referenced_type" : "type-22689", ++ "self_type" : "type-22688", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -158036,8 +158078,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > *", + "name" : "std::map, std::allocator > > *", +- "referenced_type" : "type-27397", +- "self_type" : "type-27396", ++ "referenced_type" : "type-2711", ++ "self_type" : "type-2710", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -158045,8 +158087,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > *", + "name" : "std::map, std::allocator > > *", +- "referenced_type" : "type-2759", +- "self_type" : "type-2758", ++ "referenced_type" : "type-27396", ++ "self_type" : "type-27395", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -158054,8 +158096,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > *", + "name" : "std::map, std::allocator > > *", +- "referenced_type" : "type-4739", +- "self_type" : "type-4738", ++ "referenced_type" : "type-4691", ++ "self_type" : "type-4690", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -158072,8 +158114,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator > > *", + "name" : "std::map, std::allocator > > *", +- "referenced_type" : "type-7609", +- "self_type" : "type-7608", ++ "referenced_type" : "type-7561", ++ "self_type" : "type-7560", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -158081,8 +158123,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *", + "name" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *", +- "referenced_type" : "type-12395", +- "self_type" : "type-12394", ++ "referenced_type" : "type-12347", ++ "self_type" : "type-12346", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158090,8 +158132,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *", + "name" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *", +- "referenced_type" : "type-16252", +- "self_type" : "type-16251", ++ "referenced_type" : "type-16204", ++ "self_type" : "type-16203", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158099,8 +158141,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *", + "name" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *", +- "referenced_type" : "type-20783", +- "self_type" : "type-20782", ++ "referenced_type" : "type-20735", ++ "self_type" : "type-20734", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158108,8 +158150,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *", + "name" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *", +- "referenced_type" : "type-25961", +- "self_type" : "type-25960", ++ "referenced_type" : "type-26014", ++ "self_type" : "type-26013", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158117,8 +158159,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *", + "name" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *", +- "referenced_type" : "type-31108", +- "self_type" : "type-31107", ++ "referenced_type" : "type-31107", ++ "self_type" : "type-31106", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158126,8 +158168,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *", + "name" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *", +- "referenced_type" : "type-3898", +- "self_type" : "type-3897", ++ "referenced_type" : "type-3850", ++ "self_type" : "type-3849", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158135,8 +158177,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *", + "name" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *", +- "referenced_type" : "type-5806", +- "self_type" : "type-5805", ++ "referenced_type" : "type-5758", ++ "self_type" : "type-5757", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158144,8 +158186,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *", + "name" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *", +- "referenced_type" : "type-9063", +- "self_type" : "type-9062", ++ "referenced_type" : "type-9015", ++ "self_type" : "type-9014", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158153,8 +158195,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *", + "name" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *", +- "referenced_type" : "type-12406", +- "self_type" : "type-12405", ++ "referenced_type" : "type-12358", ++ "self_type" : "type-12357", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158162,8 +158204,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *", + "name" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *", +- "referenced_type" : "type-16263", +- "self_type" : "type-16262", ++ "referenced_type" : "type-16215", ++ "self_type" : "type-16214", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158171,8 +158213,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *", + "name" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *", +- "referenced_type" : "type-20794", +- "self_type" : "type-20793", ++ "referenced_type" : "type-20746", ++ "self_type" : "type-20745", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158180,8 +158222,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *", + "name" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *", +- "referenced_type" : "type-25972", +- "self_type" : "type-25971", ++ "referenced_type" : "type-26025", ++ "self_type" : "type-26024", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158189,8 +158231,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *", + "name" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *", +- "referenced_type" : "type-31119", +- "self_type" : "type-31118", ++ "referenced_type" : "type-31118", ++ "self_type" : "type-31117", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158198,8 +158240,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *", + "name" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *", +- "referenced_type" : "type-3909", +- "self_type" : "type-3908", ++ "referenced_type" : "type-3861", ++ "self_type" : "type-3860", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158207,8 +158249,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *", + "name" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *", +- "referenced_type" : "type-5817", +- "self_type" : "type-5816", ++ "referenced_type" : "type-5769", ++ "self_type" : "type-5768", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158216,8 +158258,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *", + "name" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *", +- "referenced_type" : "type-9074", +- "self_type" : "type-9073", ++ "referenced_type" : "type-9026", ++ "self_type" : "type-9025", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158225,8 +158267,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *", +- "referenced_type" : "type-12222", +- "self_type" : "type-12221", ++ "referenced_type" : "type-12174", ++ "self_type" : "type-12173", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158234,8 +158276,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *", +- "referenced_type" : "type-16077", +- "self_type" : "type-16076", ++ "referenced_type" : "type-16029", ++ "self_type" : "type-16028", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158243,8 +158285,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *", +- "referenced_type" : "type-20609", +- "self_type" : "type-20608", ++ "referenced_type" : "type-20561", ++ "self_type" : "type-20560", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158252,8 +158294,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *", +- "referenced_type" : "type-25788", +- "self_type" : "type-25787", ++ "referenced_type" : "type-25838", ++ "self_type" : "type-25837", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158261,8 +158303,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *", +- "referenced_type" : "type-30934", +- "self_type" : "type-30933", ++ "referenced_type" : "type-30933", ++ "self_type" : "type-30932", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158270,8 +158312,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *", +- "referenced_type" : "type-3662", +- "self_type" : "type-3661", ++ "referenced_type" : "type-3614", ++ "self_type" : "type-3613", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158279,8 +158321,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *", +- "referenced_type" : "type-5630", +- "self_type" : "type-5629", ++ "referenced_type" : "type-5582", ++ "self_type" : "type-5581", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158288,8 +158330,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *", +- "referenced_type" : "type-8888", +- "self_type" : "type-8887", ++ "referenced_type" : "type-8840", ++ "self_type" : "type-8839", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158297,8 +158339,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *", + "name" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *", +- "referenced_type" : "type-12400", +- "self_type" : "type-12399", ++ "referenced_type" : "type-12352", ++ "self_type" : "type-12351", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158306,8 +158348,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *", + "name" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *", +- "referenced_type" : "type-16257", +- "self_type" : "type-16256", ++ "referenced_type" : "type-16209", ++ "self_type" : "type-16208", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158315,8 +158357,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *", + "name" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *", +- "referenced_type" : "type-20788", +- "self_type" : "type-20787", ++ "referenced_type" : "type-20740", ++ "self_type" : "type-20739", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158324,8 +158366,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *", + "name" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *", +- "referenced_type" : "type-25966", +- "self_type" : "type-25965", ++ "referenced_type" : "type-26019", ++ "self_type" : "type-26018", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158333,8 +158375,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *", + "name" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *", +- "referenced_type" : "type-31113", +- "self_type" : "type-31112", ++ "referenced_type" : "type-31112", ++ "self_type" : "type-31111", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158342,8 +158384,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *", + "name" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *", +- "referenced_type" : "type-3903", +- "self_type" : "type-3902", ++ "referenced_type" : "type-3855", ++ "self_type" : "type-3854", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158351,8 +158393,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *", + "name" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *", +- "referenced_type" : "type-5811", +- "self_type" : "type-5810", ++ "referenced_type" : "type-5763", ++ "self_type" : "type-5762", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158360,8 +158402,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *", + "name" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *", +- "referenced_type" : "type-9068", +- "self_type" : "type-9067", ++ "referenced_type" : "type-9020", ++ "self_type" : "type-9019", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158369,8 +158411,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *", + "name" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *", +- "referenced_type" : "type-12412", +- "self_type" : "type-12411", ++ "referenced_type" : "type-12364", ++ "self_type" : "type-12363", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158378,8 +158420,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *", + "name" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *", +- "referenced_type" : "type-16269", +- "self_type" : "type-16268", ++ "referenced_type" : "type-16221", ++ "self_type" : "type-16220", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158387,8 +158429,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *", + "name" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *", +- "referenced_type" : "type-20800", +- "self_type" : "type-20799", ++ "referenced_type" : "type-20752", ++ "self_type" : "type-20751", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158396,8 +158438,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *", + "name" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *", +- "referenced_type" : "type-25978", +- "self_type" : "type-25977", ++ "referenced_type" : "type-26031", ++ "self_type" : "type-26030", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158405,8 +158447,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *", + "name" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *", +- "referenced_type" : "type-31125", +- "self_type" : "type-31124", ++ "referenced_type" : "type-31124", ++ "self_type" : "type-31123", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158414,8 +158456,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *", + "name" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *", +- "referenced_type" : "type-3915", +- "self_type" : "type-3914", ++ "referenced_type" : "type-3867", ++ "self_type" : "type-3866", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158423,8 +158465,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *", + "name" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *", +- "referenced_type" : "type-5823", +- "self_type" : "type-5822", ++ "referenced_type" : "type-5775", ++ "self_type" : "type-5774", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158432,8 +158474,8 @@ + "alignment" : 4, + "linker_set_key" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *", + "name" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *", +- "referenced_type" : "type-9080", +- "self_type" : "type-9079", ++ "referenced_type" : "type-9032", ++ "self_type" : "type-9031", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -158441,8 +158483,8 @@ + "alignment" : 4, + "linker_set_key" : "std::pair *", + "name" : "std::pair *", +- "referenced_type" : "type-12242", +- "self_type" : "type-12241", ++ "referenced_type" : "type-12194", ++ "self_type" : "type-12193", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -158450,8 +158492,8 @@ + "alignment" : 4, + "linker_set_key" : "std::pair *", + "name" : "std::pair *", +- "referenced_type" : "type-16097", +- "self_type" : "type-16096", ++ "referenced_type" : "type-16049", ++ "self_type" : "type-16048", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -158459,8 +158501,8 @@ + "alignment" : 4, + "linker_set_key" : "std::pair *", + "name" : "std::pair *", +- "referenced_type" : "type-20629", +- "self_type" : "type-20628", ++ "referenced_type" : "type-20581", ++ "self_type" : "type-20580", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -158468,8 +158510,8 @@ + "alignment" : 4, + "linker_set_key" : "std::pair *", + "name" : "std::pair *", +- "referenced_type" : "type-25808", +- "self_type" : "type-25807", ++ "referenced_type" : "type-25859", ++ "self_type" : "type-25858", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -158477,8 +158519,8 @@ + "alignment" : 4, + "linker_set_key" : "std::pair *", + "name" : "std::pair *", +- "referenced_type" : "type-30954", +- "self_type" : "type-30953", ++ "referenced_type" : "type-30953", ++ "self_type" : "type-30952", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -158486,8 +158528,8 @@ + "alignment" : 4, + "linker_set_key" : "std::pair *", + "name" : "std::pair *", +- "referenced_type" : "type-3687", +- "self_type" : "type-3686", ++ "referenced_type" : "type-3639", ++ "self_type" : "type-3638", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -158495,8 +158537,8 @@ + "alignment" : 4, + "linker_set_key" : "std::pair *", + "name" : "std::pair *", +- "referenced_type" : "type-5650", +- "self_type" : "type-5649", ++ "referenced_type" : "type-5602", ++ "self_type" : "type-5601", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -158504,8 +158546,8 @@ + "alignment" : 4, + "linker_set_key" : "std::pair *", + "name" : "std::pair *", +- "referenced_type" : "type-8908", +- "self_type" : "type-8907", ++ "referenced_type" : "type-8860", ++ "self_type" : "type-8859", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -158513,8 +158555,8 @@ + "alignment" : 4, + "linker_set_key" : "std::pair *", + "name" : "std::pair *", +- "referenced_type" : "type-11220", +- "self_type" : "type-11219", ++ "referenced_type" : "type-11172", ++ "self_type" : "type-11171", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -158522,8 +158564,8 @@ + "alignment" : 4, + "linker_set_key" : "std::pair *", + "name" : "std::pair *", +- "referenced_type" : "type-14472", +- "self_type" : "type-14471", ++ "referenced_type" : "type-14424", ++ "self_type" : "type-14423", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -158531,8 +158573,8 @@ + "alignment" : 4, + "linker_set_key" : "std::pair *", + "name" : "std::pair *", +- "referenced_type" : "type-18336", +- "self_type" : "type-18335", ++ "referenced_type" : "type-18288", ++ "self_type" : "type-18287", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -158540,8 +158582,8 @@ + "alignment" : 4, + "linker_set_key" : "std::pair *", + "name" : "std::pair *", +- "referenced_type" : "type-22865", +- "self_type" : "type-22864", ++ "referenced_type" : "type-22820", ++ "self_type" : "type-22819", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -158549,8 +158591,8 @@ + "alignment" : 4, + "linker_set_key" : "std::pair *", + "name" : "std::pair *", +- "referenced_type" : "type-28050", +- "self_type" : "type-28049", ++ "referenced_type" : "type-28049", ++ "self_type" : "type-28048", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -158558,8 +158600,8 @@ + "alignment" : 4, + "linker_set_key" : "std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", + "name" : "std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", +- "referenced_type" : "type-13141", +- "self_type" : "type-13140", ++ "referenced_type" : "type-13093", ++ "self_type" : "type-13092", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -158567,8 +158609,8 @@ + "alignment" : 4, + "linker_set_key" : "std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", + "name" : "std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", +- "referenced_type" : "type-16997", +- "self_type" : "type-16996", ++ "referenced_type" : "type-16949", ++ "self_type" : "type-16948", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -158576,8 +158618,8 @@ + "alignment" : 4, + "linker_set_key" : "std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", + "name" : "std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", +- "referenced_type" : "type-21529", +- "self_type" : "type-21528", ++ "referenced_type" : "type-21481", ++ "self_type" : "type-21480", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -158585,8 +158627,8 @@ + "alignment" : 4, + "linker_set_key" : "std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", + "name" : "std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", +- "referenced_type" : "type-26707", +- "self_type" : "type-26706", ++ "referenced_type" : "type-26729", ++ "self_type" : "type-26728", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -158594,8 +158636,8 @@ + "alignment" : 4, + "linker_set_key" : "std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", + "name" : "std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", +- "referenced_type" : "type-31854", +- "self_type" : "type-31853", ++ "referenced_type" : "type-31853", ++ "self_type" : "type-31852", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -158603,8 +158645,8 @@ + "alignment" : 4, + "linker_set_key" : "std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", + "name" : "std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", +- "referenced_type" : "type-6638", +- "self_type" : "type-6637", ++ "referenced_type" : "type-6590", ++ "self_type" : "type-6589", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -158612,8 +158654,8 @@ + "alignment" : 4, + "linker_set_key" : "std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", + "name" : "std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > *", +- "referenced_type" : "type-9809", +- "self_type" : "type-9808", ++ "referenced_type" : "type-9761", ++ "self_type" : "type-9760", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -158621,8 +158663,8 @@ + "alignment" : 4, + "linker_set_key" : "std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", + "name" : "std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", +- "referenced_type" : "type-10420", +- "self_type" : "type-10419", ++ "referenced_type" : "type-10372", ++ "self_type" : "type-10371", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -158630,8 +158672,8 @@ + "alignment" : 4, + "linker_set_key" : "std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", + "name" : "std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", +- "referenced_type" : "type-13711", +- "self_type" : "type-13710", ++ "referenced_type" : "type-13663", ++ "self_type" : "type-13662", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -158639,8 +158681,8 @@ + "alignment" : 4, + "linker_set_key" : "std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", + "name" : "std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", +- "referenced_type" : "type-15087", +- "self_type" : "type-15086", ++ "referenced_type" : "type-15039", ++ "self_type" : "type-15038", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -158648,8 +158690,8 @@ + "alignment" : 4, + "linker_set_key" : "std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", + "name" : "std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", +- "referenced_type" : "type-17575", +- "self_type" : "type-17574", ++ "referenced_type" : "type-17527", ++ "self_type" : "type-17526", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -158657,8 +158699,8 @@ + "alignment" : 4, + "linker_set_key" : "std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", + "name" : "std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", +- "referenced_type" : "type-18871", +- "self_type" : "type-18870", ++ "referenced_type" : "type-18823", ++ "self_type" : "type-18822", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -158666,8 +158708,8 @@ + "alignment" : 4, + "linker_set_key" : "std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", + "name" : "std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", +- "referenced_type" : "type-22104", +- "self_type" : "type-22103", ++ "referenced_type" : "type-22103", ++ "self_type" : "type-22102", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -158675,8 +158717,8 @@ + "alignment" : 4, + "linker_set_key" : "std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", + "name" : "std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", +- "referenced_type" : "type-23400", +- "self_type" : "type-23399", ++ "referenced_type" : "type-23383", ++ "self_type" : "type-23382", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -158684,8 +158726,8 @@ + "alignment" : 4, + "linker_set_key" : "std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", + "name" : "std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", +- "referenced_type" : "type-27289", +- "self_type" : "type-27288", ++ "referenced_type" : "type-27288", ++ "self_type" : "type-27287", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -158693,8 +158735,8 @@ + "alignment" : 4, + "linker_set_key" : "std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", + "name" : "std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", +- "referenced_type" : "type-28585", +- "self_type" : "type-28584", ++ "referenced_type" : "type-28584", ++ "self_type" : "type-28583", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -158702,8 +158744,8 @@ + "alignment" : 4, + "linker_set_key" : "std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", + "name" : "std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > *", +- "referenced_type" : "type-7473", +- "self_type" : "type-7472", ++ "referenced_type" : "type-7425", ++ "self_type" : "type-7424", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -158711,8 +158753,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-12286", +- "self_type" : "type-12285", ++ "referenced_type" : "type-12238", ++ "self_type" : "type-12237", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -158720,8 +158762,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-12901", +- "self_type" : "type-12900", ++ "referenced_type" : "type-12853", ++ "self_type" : "type-12852", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -158729,8 +158771,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-13069", +- "self_type" : "type-13068", ++ "referenced_type" : "type-13021", ++ "self_type" : "type-13020", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -158738,8 +158780,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16141", +- "self_type" : "type-16140", ++ "referenced_type" : "type-16093", ++ "self_type" : "type-16092", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -158747,8 +158789,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16757", +- "self_type" : "type-16756", ++ "referenced_type" : "type-16709", ++ "self_type" : "type-16708", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -158756,8 +158798,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16925", +- "self_type" : "type-16924", ++ "referenced_type" : "type-16877", ++ "self_type" : "type-16876", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -158765,8 +158807,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20672", +- "self_type" : "type-20671", ++ "referenced_type" : "type-20624", ++ "self_type" : "type-20623", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -158774,8 +158816,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21289", +- "self_type" : "type-21288", ++ "referenced_type" : "type-21241", ++ "self_type" : "type-21240", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -158783,8 +158825,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21457", +- "self_type" : "type-21456", ++ "referenced_type" : "type-21409", ++ "self_type" : "type-21408", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -158792,8 +158834,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-25014", +- "self_type" : "type-25013", ++ "referenced_type" : "type-24983", ++ "self_type" : "type-24982", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h" + }, +@@ -158801,8 +158843,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-25851", +- "self_type" : "type-25850", ++ "referenced_type" : "type-25905", ++ "self_type" : "type-25904", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -158810,8 +158852,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-26467", +- "self_type" : "type-26466", ++ "referenced_type" : "type-26504", ++ "self_type" : "type-26503", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -158819,8 +158861,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-26635", +- "self_type" : "type-26634", ++ "referenced_type" : "type-26658", ++ "self_type" : "type-26657", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -158828,8 +158870,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-30165", +- "self_type" : "type-30164", ++ "referenced_type" : "type-30164", ++ "self_type" : "type-30163", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h" + }, +@@ -158837,8 +158879,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-30997", +- "self_type" : "type-30996", ++ "referenced_type" : "type-30996", ++ "self_type" : "type-30995", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -158846,8 +158888,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-31614", +- "self_type" : "type-31613", ++ "referenced_type" : "type-31613", ++ "self_type" : "type-31612", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -158855,8 +158897,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-31782", +- "self_type" : "type-31781", ++ "referenced_type" : "type-31781", ++ "self_type" : "type-31780", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -158864,8 +158906,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-3747", +- "self_type" : "type-3746", ++ "referenced_type" : "type-3699", ++ "self_type" : "type-3698", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -158873,8 +158915,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-4489", +- "self_type" : "type-4488", ++ "referenced_type" : "type-4441", ++ "self_type" : "type-4440", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -158882,8 +158924,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-5695", +- "self_type" : "type-5694", ++ "referenced_type" : "type-5647", ++ "self_type" : "type-5646", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -158891,8 +158933,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-6312", +- "self_type" : "type-6311", ++ "referenced_type" : "type-6264", ++ "self_type" : "type-6263", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -158900,8 +158942,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-6486", +- "self_type" : "type-6485", ++ "referenced_type" : "type-6438", ++ "self_type" : "type-6437", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -158909,8 +158951,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-8952", +- "self_type" : "type-8951", ++ "referenced_type" : "type-8904", ++ "self_type" : "type-8903", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -158918,8 +158960,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-9569", +- "self_type" : "type-9568", ++ "referenced_type" : "type-9521", ++ "self_type" : "type-9520", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, +@@ -158927,8 +158969,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-9737", +- "self_type" : "type-9736", ++ "referenced_type" : "type-9689", ++ "self_type" : "type-9688", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -158936,8 +158978,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-12490", +- "self_type" : "type-12489", ++ "referenced_type" : "type-12442", ++ "self_type" : "type-12441", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -158945,8 +158987,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16347", +- "self_type" : "type-16346", ++ "referenced_type" : "type-16299", ++ "self_type" : "type-16298", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -158954,8 +158996,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20878", +- "self_type" : "type-20877", ++ "referenced_type" : "type-20830", ++ "self_type" : "type-20829", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -158963,8 +159005,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-26056", +- "self_type" : "type-26055", ++ "referenced_type" : "type-26105", ++ "self_type" : "type-26104", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -158972,8 +159014,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-31203", +- "self_type" : "type-31202", ++ "referenced_type" : "type-31202", ++ "self_type" : "type-31201", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -158981,8 +159023,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-3993", +- "self_type" : "type-3992", ++ "referenced_type" : "type-3945", ++ "self_type" : "type-3944", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -158990,8 +159032,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-5901", +- "self_type" : "type-5900", ++ "referenced_type" : "type-5853", ++ "self_type" : "type-5852", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -158999,8 +159041,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-9158", +- "self_type" : "type-9157", ++ "referenced_type" : "type-9110", ++ "self_type" : "type-9109", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159008,8 +159050,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-12392", +- "self_type" : "type-12391", ++ "referenced_type" : "type-12344", ++ "self_type" : "type-12343", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159017,8 +159059,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16249", +- "self_type" : "type-16248", ++ "referenced_type" : "type-16201", ++ "self_type" : "type-16200", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159026,8 +159068,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20780", +- "self_type" : "type-20779", ++ "referenced_type" : "type-20732", ++ "self_type" : "type-20731", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159035,8 +159077,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-25958", +- "self_type" : "type-25957", ++ "referenced_type" : "type-26009", ++ "self_type" : "type-26008", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159044,8 +159086,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-31105", +- "self_type" : "type-31104", ++ "referenced_type" : "type-31104", ++ "self_type" : "type-31103", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159053,8 +159095,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-3895", +- "self_type" : "type-3894", ++ "referenced_type" : "type-3847", ++ "self_type" : "type-3846", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159062,8 +159104,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-5803", +- "self_type" : "type-5802", ++ "referenced_type" : "type-5755", ++ "self_type" : "type-5754", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159071,8 +159113,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-9060", +- "self_type" : "type-9059", ++ "referenced_type" : "type-9012", ++ "self_type" : "type-9011", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159080,8 +159122,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-12388", +- "self_type" : "type-12387", ++ "referenced_type" : "type-12340", ++ "self_type" : "type-12339", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159089,8 +159131,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16245", +- "self_type" : "type-16244", ++ "referenced_type" : "type-16197", ++ "self_type" : "type-16196", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159098,8 +159140,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20776", +- "self_type" : "type-20775", ++ "referenced_type" : "type-20728", ++ "self_type" : "type-20727", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159107,8 +159149,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-25954", +- "self_type" : "type-25953", ++ "referenced_type" : "type-26005", ++ "self_type" : "type-26004", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159116,8 +159158,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-31101", +- "self_type" : "type-31100", ++ "referenced_type" : "type-31100", ++ "self_type" : "type-31099", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159125,8 +159167,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-3891", +- "self_type" : "type-3890", ++ "referenced_type" : "type-3843", ++ "self_type" : "type-3842", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159134,8 +159176,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-5799", +- "self_type" : "type-5798", ++ "referenced_type" : "type-5751", ++ "self_type" : "type-5750", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159143,8 +159185,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-9056", +- "self_type" : "type-9055", ++ "referenced_type" : "type-9008", ++ "self_type" : "type-9007", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159152,8 +159194,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-10621", +- "self_type" : "type-10620", ++ "referenced_type" : "type-10573", ++ "self_type" : "type-10572", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159161,8 +159203,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-13912", +- "self_type" : "type-13911", ++ "referenced_type" : "type-13864", ++ "self_type" : "type-13863", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159170,8 +159212,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-17776", +- "self_type" : "type-17775", ++ "referenced_type" : "type-17728", ++ "self_type" : "type-17727", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159179,8 +159221,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-22305", +- "self_type" : "type-22304", ++ "referenced_type" : "type-22275", ++ "self_type" : "type-22274", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159188,8 +159230,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-27490", +- "self_type" : "type-27489", ++ "referenced_type" : "type-27489", ++ "self_type" : "type-27488", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159197,8 +159239,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-7706", +- "self_type" : "type-7705", ++ "referenced_type" : "type-7658", ++ "self_type" : "type-7657", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -159206,8 +159248,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-10036", +- "self_type" : "type-10035", ++ "referenced_type" : "type-10074", ++ "self_type" : "type-10073", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159215,8 +159257,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-10122", +- "self_type" : "type-10121", ++ "referenced_type" : "type-10147", ++ "self_type" : "type-10146", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159224,8 +159266,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-10195", +- "self_type" : "type-10194", ++ "referenced_type" : "type-10432", ++ "self_type" : "type-10431", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159233,8 +159275,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-10480", +- "self_type" : "type-10479", ++ "referenced_type" : "type-10582", ++ "self_type" : "type-10581", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159242,8 +159284,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-10630", +- "self_type" : "type-10629", ++ "referenced_type" : "type-10681", ++ "self_type" : "type-10680", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159251,8 +159293,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-10729", +- "self_type" : "type-10728", ++ "referenced_type" : "type-10770", ++ "self_type" : "type-10769", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159260,8 +159302,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-10818", +- "self_type" : "type-10817", ++ "referenced_type" : "type-10836", ++ "self_type" : "type-10835", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159269,8 +159311,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-10884", +- "self_type" : "type-10883", ++ "referenced_type" : "type-10951", ++ "self_type" : "type-10950", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159278,8 +159320,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-10999", +- "self_type" : "type-10998", ++ "referenced_type" : "type-11024", ++ "self_type" : "type-11023", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159287,8 +159329,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-11072", +- "self_type" : "type-11071", ++ "referenced_type" : "type-11223", ++ "self_type" : "type-11222", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159296,8 +159338,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-11271", +- "self_type" : "type-11270", ++ "referenced_type" : "type-11383", ++ "self_type" : "type-11382", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159305,8 +159347,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-11431", +- "self_type" : "type-11430", ++ "referenced_type" : "type-11635", ++ "self_type" : "type-11634", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159314,8 +159356,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-11683", +- "self_type" : "type-11682", ++ "referenced_type" : "type-11984", ++ "self_type" : "type-11983", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159323,8 +159365,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-12032", +- "self_type" : "type-12031", ++ "referenced_type" : "type-12253", ++ "self_type" : "type-12252", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159332,8 +159374,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-12301", +- "self_type" : "type-12300", ++ "referenced_type" : "type-12401", ++ "self_type" : "type-12400", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159341,8 +159383,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-12449", +- "self_type" : "type-12448", ++ "referenced_type" : "type-12489", ++ "self_type" : "type-12488", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159350,8 +159392,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-12537", +- "self_type" : "type-12536", ++ "referenced_type" : "type-12588", ++ "self_type" : "type-12587", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159359,8 +159401,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-12636", +- "self_type" : "type-12635", ++ "referenced_type" : "type-12731", ++ "self_type" : "type-12730", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159368,8 +159410,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-12779", +- "self_type" : "type-12778", ++ "referenced_type" : "type-12769", ++ "self_type" : "type-12768", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159377,8 +159419,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-12817", +- "self_type" : "type-12816", ++ "referenced_type" : "type-12876", ++ "self_type" : "type-12875", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159386,8 +159428,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-12924", +- "self_type" : "type-12923", ++ "referenced_type" : "type-12904", ++ "self_type" : "type-12903", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159395,8 +159437,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-12952", +- "self_type" : "type-12951", ++ "referenced_type" : "type-12984", ++ "self_type" : "type-12983", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159404,8 +159446,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-13032", +- "self_type" : "type-13031", ++ "referenced_type" : "type-13185", ++ "self_type" : "type-13184", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159413,8 +159455,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-13233", +- "self_type" : "type-13232", ++ "referenced_type" : "type-13321", ++ "self_type" : "type-13320", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159422,8 +159464,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-13369", +- "self_type" : "type-13368", ++ "referenced_type" : "type-13407", ++ "self_type" : "type-13406", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159431,8 +159473,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-13455", +- "self_type" : "type-13454", ++ "referenced_type" : "type-13480", ++ "self_type" : "type-13479", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159440,8 +159482,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-13528", +- "self_type" : "type-13527", ++ "referenced_type" : "type-13723", ++ "self_type" : "type-13722", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159449,8 +159491,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-13771", +- "self_type" : "type-13770", ++ "referenced_type" : "type-13873", ++ "self_type" : "type-13872", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159458,8 +159500,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-13921", +- "self_type" : "type-13920", ++ "referenced_type" : "type-13972", ++ "self_type" : "type-13971", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159467,8 +159509,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-14020", +- "self_type" : "type-14019", ++ "referenced_type" : "type-14061", ++ "self_type" : "type-14060", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159476,8 +159518,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-14109", +- "self_type" : "type-14108", ++ "referenced_type" : "type-14127", ++ "self_type" : "type-14126", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159485,8 +159527,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-14175", +- "self_type" : "type-14174", ++ "referenced_type" : "type-14242", ++ "self_type" : "type-14241", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159494,8 +159536,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-14290", +- "self_type" : "type-14289", ++ "referenced_type" : "type-14306", ++ "self_type" : "type-14305", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159503,8 +159545,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-14354", +- "self_type" : "type-14353", ++ "referenced_type" : "type-14474", ++ "self_type" : "type-14473", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159512,8 +159554,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-14522", +- "self_type" : "type-14521", ++ "referenced_type" : "type-14602", ++ "self_type" : "type-14601", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159521,8 +159563,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-14650", +- "self_type" : "type-14649", ++ "referenced_type" : "type-14835", ++ "self_type" : "type-14834", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159530,8 +159572,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-14883", +- "self_type" : "type-14882", ++ "referenced_type" : "type-15048", ++ "self_type" : "type-15047", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159539,8 +159581,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-15096", +- "self_type" : "type-15095", ++ "referenced_type" : "type-15142", ++ "self_type" : "type-15141", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159548,8 +159590,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-15190", +- "self_type" : "type-15189", ++ "referenced_type" : "type-15495", ++ "self_type" : "type-15494", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159557,8 +159599,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-15543", +- "self_type" : "type-15542", ++ "referenced_type" : "type-15840", ++ "self_type" : "type-15839", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159566,8 +159608,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-15888", +- "self_type" : "type-15887", ++ "referenced_type" : "type-16108", ++ "self_type" : "type-16107", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159575,8 +159617,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16156", +- "self_type" : "type-16155", ++ "referenced_type" : "type-16258", ++ "self_type" : "type-16257", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159584,8 +159626,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16306", +- "self_type" : "type-16305", ++ "referenced_type" : "type-16346", ++ "self_type" : "type-16345", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159593,8 +159635,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16394", +- "self_type" : "type-16393", ++ "referenced_type" : "type-16445", ++ "self_type" : "type-16444", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159602,8 +159644,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16493", +- "self_type" : "type-16492", ++ "referenced_type" : "type-1654", ++ "self_type" : "type-1653", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159611,8 +159653,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16635", +- "self_type" : "type-16634", ++ "referenced_type" : "type-16587", ++ "self_type" : "type-16586", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159620,8 +159662,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16673", +- "self_type" : "type-16672", ++ "referenced_type" : "type-16625", ++ "self_type" : "type-16624", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159629,8 +159671,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16780", +- "self_type" : "type-16779", ++ "referenced_type" : "type-16732", ++ "self_type" : "type-16731", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159638,8 +159680,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16808", +- "self_type" : "type-16807", ++ "referenced_type" : "type-16760", ++ "self_type" : "type-16759", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159647,8 +159689,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16888", +- "self_type" : "type-16887", ++ "referenced_type" : "type-16840", ++ "self_type" : "type-16839", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159656,8 +159698,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-17089", +- "self_type" : "type-17088", ++ "referenced_type" : "type-17041", ++ "self_type" : "type-17040", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159665,8 +159707,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-17225", +- "self_type" : "type-17224", ++ "referenced_type" : "type-17177", ++ "self_type" : "type-17176", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159674,8 +159716,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-17311", +- "self_type" : "type-17310", ++ "referenced_type" : "type-17263", ++ "self_type" : "type-17262", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159683,8 +159725,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-17384", +- "self_type" : "type-17383", ++ "referenced_type" : "type-17336", ++ "self_type" : "type-17335", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159692,8 +159734,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-1741", +- "self_type" : "type-1740", ++ "referenced_type" : "type-17587", ++ "self_type" : "type-17586", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159701,8 +159743,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-17635", +- "self_type" : "type-17634", ++ "referenced_type" : "type-17737", ++ "self_type" : "type-17736", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159710,8 +159752,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-17785", +- "self_type" : "type-17784", ++ "referenced_type" : "type-17836", ++ "self_type" : "type-17835", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159719,8 +159761,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-17884", +- "self_type" : "type-17883", ++ "referenced_type" : "type-17925", ++ "self_type" : "type-17924", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159728,8 +159770,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-17973", +- "self_type" : "type-17972", ++ "referenced_type" : "type-17991", ++ "self_type" : "type-17990", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159737,8 +159779,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-18039", +- "self_type" : "type-18038", ++ "referenced_type" : "type-18106", ++ "self_type" : "type-18105", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159746,8 +159788,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-18154", +- "self_type" : "type-18153", ++ "referenced_type" : "type-18170", ++ "self_type" : "type-18169", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159755,8 +159797,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-18218", +- "self_type" : "type-18217", ++ "referenced_type" : "type-18338", ++ "self_type" : "type-18337", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159764,8 +159806,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-18386", +- "self_type" : "type-18385", ++ "referenced_type" : "type-18466", ++ "self_type" : "type-18465", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159773,8 +159815,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-18514", +- "self_type" : "type-18513", ++ "referenced_type" : "type-18692", ++ "self_type" : "type-18691", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159782,8 +159824,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-18740", +- "self_type" : "type-18739", ++ "referenced_type" : "type-18832", ++ "self_type" : "type-18831", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159791,8 +159833,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-18880", +- "self_type" : "type-18879", ++ "referenced_type" : "type-18926", ++ "self_type" : "type-18925", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159800,8 +159842,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-18974", +- "self_type" : "type-18973", ++ "referenced_type" : "type-19164", ++ "self_type" : "type-19163", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159809,8 +159851,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-19212", +- "self_type" : "type-19211", ++ "referenced_type" : "type-19357", ++ "self_type" : "type-19356", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159818,8 +159860,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-19405", +- "self_type" : "type-19404", ++ "referenced_type" : "type-19552", ++ "self_type" : "type-19551", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159827,8 +159869,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-19600", +- "self_type" : "type-19599", ++ "referenced_type" : "type-19722", ++ "self_type" : "type-19721", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159836,8 +159878,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-19770", +- "self_type" : "type-19769", ++ "referenced_type" : "type-19832", ++ "self_type" : "type-19831", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159845,8 +159887,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-19880", +- "self_type" : "type-19879", ++ "referenced_type" : "type-20024", ++ "self_type" : "type-20023", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159854,8 +159896,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20072", +- "self_type" : "type-20071", ++ "referenced_type" : "type-20374", ++ "self_type" : "type-20373", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159863,8 +159905,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20422", +- "self_type" : "type-20421", ++ "referenced_type" : "type-20639", ++ "self_type" : "type-20638", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159872,8 +159914,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20687", +- "self_type" : "type-20686", ++ "referenced_type" : "type-20789", ++ "self_type" : "type-20788", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159881,8 +159923,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20837", +- "self_type" : "type-20836", ++ "referenced_type" : "type-20877", ++ "self_type" : "type-20876", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159890,8 +159932,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20925", +- "self_type" : "type-20924", ++ "referenced_type" : "type-20976", ++ "self_type" : "type-20975", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159899,8 +159941,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21024", +- "self_type" : "type-21023", ++ "referenced_type" : "type-21119", ++ "self_type" : "type-21118", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159908,8 +159950,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21167", +- "self_type" : "type-21166", ++ "referenced_type" : "type-21157", ++ "self_type" : "type-21156", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159917,8 +159959,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21205", +- "self_type" : "type-21204", ++ "referenced_type" : "type-21264", ++ "self_type" : "type-21263", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159926,8 +159968,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21312", +- "self_type" : "type-21311", ++ "referenced_type" : "type-21292", ++ "self_type" : "type-21291", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159935,8 +159977,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21340", +- "self_type" : "type-21339", ++ "referenced_type" : "type-21372", ++ "self_type" : "type-21371", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159944,8 +159986,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21420", +- "self_type" : "type-21419", ++ "referenced_type" : "type-21573", ++ "self_type" : "type-21572", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159953,8 +159995,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21621", +- "self_type" : "type-21620", ++ "referenced_type" : "type-21709", ++ "self_type" : "type-21708", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159962,8 +160004,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21757", +- "self_type" : "type-21756", ++ "referenced_type" : "type-21795", ++ "self_type" : "type-21794", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159971,8 +160013,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-21843", +- "self_type" : "type-21842", ++ "referenced_type" : "type-21868", ++ "self_type" : "type-21867", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159989,8 +160031,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-22164", +- "self_type" : "type-22163", ++ "referenced_type" : "type-22162", ++ "self_type" : "type-22161", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -159998,8 +160040,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-22314", +- "self_type" : "type-22313", ++ "referenced_type" : "type-22283", ++ "self_type" : "type-22282", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160007,8 +160049,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-22413", +- "self_type" : "type-22412", ++ "referenced_type" : "type-22370", ++ "self_type" : "type-22369", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160016,8 +160058,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-22502", +- "self_type" : "type-22501", ++ "referenced_type" : "type-22427", ++ "self_type" : "type-22426", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160025,8 +160067,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-22568", +- "self_type" : "type-22567", ++ "referenced_type" : "type-22488", ++ "self_type" : "type-22487", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160034,8 +160076,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-22683", +- "self_type" : "type-22682", ++ "referenced_type" : "type-22603", ++ "self_type" : "type-22602", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160043,8 +160085,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-22747", +- "self_type" : "type-22746", ++ "referenced_type" : "type-22682", ++ "self_type" : "type-22681", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160052,8 +160094,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-22915", +- "self_type" : "type-22914", ++ "referenced_type" : "type-22880", ++ "self_type" : "type-22879", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160061,8 +160103,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-23043", +- "self_type" : "type-23042", ++ "referenced_type" : "type-23020", ++ "self_type" : "type-23019", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160070,8 +160112,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-23269", +- "self_type" : "type-23268", ++ "referenced_type" : "type-2325", ++ "self_type" : "type-2324", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160079,8 +160121,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-23409", +- "self_type" : "type-23408", ++ "referenced_type" : "type-23260", ++ "self_type" : "type-23259", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160088,8 +160130,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-23503", +- "self_type" : "type-23502", ++ "referenced_type" : "type-23392", ++ "self_type" : "type-23391", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160097,8 +160139,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-23733", +- "self_type" : "type-23732", ++ "referenced_type" : "type-23481", ++ "self_type" : "type-23480", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160106,8 +160148,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-23905", +- "self_type" : "type-23904", ++ "referenced_type" : "type-23723", ++ "self_type" : "type-23722", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160115,8 +160157,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-2397", +- "self_type" : "type-2396", ++ "referenced_type" : "type-23908", ++ "self_type" : "type-23907", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160124,8 +160166,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-24070", +- "self_type" : "type-24069", ++ "referenced_type" : "type-24067", ++ "self_type" : "type-24066", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160133,8 +160175,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-24237", +- "self_type" : "type-24236", ++ "referenced_type" : "type-24243", ++ "self_type" : "type-24242", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160142,8 +160184,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-24347", +- "self_type" : "type-24346", ++ "referenced_type" : "type-24332", ++ "self_type" : "type-24331", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160151,8 +160193,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-24546", +- "self_type" : "type-24545", ++ "referenced_type" : "type-24520", ++ "self_type" : "type-24519", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160160,8 +160202,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-24678", +- "self_type" : "type-24677", ++ "referenced_type" : "type-24641", ++ "self_type" : "type-24640", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160169,8 +160211,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-24776", +- "self_type" : "type-24775", ++ "referenced_type" : "type-24733", ++ "self_type" : "type-24732", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160178,8 +160220,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-24880", +- "self_type" : "type-24879", ++ "referenced_type" : "type-24964", ++ "self_type" : "type-24963", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160187,8 +160229,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-24995", +- "self_type" : "type-24994", ++ "referenced_type" : "type-25033", ++ "self_type" : "type-25032", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160196,8 +160238,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-25062", +- "self_type" : "type-25061", ++ "referenced_type" : "type-25181", ++ "self_type" : "type-25180", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160205,8 +160247,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-25192", +- "self_type" : "type-25191", ++ "referenced_type" : "type-25318", ++ "self_type" : "type-25317", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160214,8 +160256,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-25598", +- "self_type" : "type-25597", ++ "referenced_type" : "type-25651", ++ "self_type" : "type-25650", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160223,8 +160265,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-25866", +- "self_type" : "type-25865", ++ "referenced_type" : "type-25917", ++ "self_type" : "type-25916", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160232,8 +160274,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-26015", +- "self_type" : "type-26014", ++ "referenced_type" : "type-26068", ++ "self_type" : "type-26067", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160241,8 +160283,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-26103", +- "self_type" : "type-26102", ++ "referenced_type" : "type-26147", ++ "self_type" : "type-26146", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160250,8 +160292,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-26202", +- "self_type" : "type-26201", ++ "referenced_type" : "type-26246", ++ "self_type" : "type-26245", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160259,8 +160301,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-26345", +- "self_type" : "type-26344", ++ "referenced_type" : "type-26387", ++ "self_type" : "type-26386", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160268,8 +160310,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-26383", +- "self_type" : "type-26382", ++ "referenced_type" : "type-26425", ++ "self_type" : "type-26424", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160277,8 +160319,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-26490", +- "self_type" : "type-26489", ++ "referenced_type" : "type-26525", ++ "self_type" : "type-26524", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160286,8 +160328,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-26518", +- "self_type" : "type-26517", ++ "referenced_type" : "type-26549", ++ "self_type" : "type-26548", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160295,8 +160337,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-26598", +- "self_type" : "type-26597", ++ "referenced_type" : "type-26626", ++ "self_type" : "type-26625", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160304,8 +160346,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-26799", +- "self_type" : "type-26798", ++ "referenced_type" : "type-26826", ++ "self_type" : "type-26825", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160313,8 +160355,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-26935", +- "self_type" : "type-26934", ++ "referenced_type" : "type-26958", ++ "self_type" : "type-26957", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160322,8 +160364,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-27021", +- "self_type" : "type-27020", ++ "referenced_type" : "type-27051", ++ "self_type" : "type-27050", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160331,8 +160373,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-27094", +- "self_type" : "type-27093", ++ "referenced_type" : "type-27348", ++ "self_type" : "type-27347", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160340,8 +160382,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-27349", +- "self_type" : "type-27348", ++ "referenced_type" : "type-27498", ++ "self_type" : "type-27497", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160349,8 +160391,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-27499", +- "self_type" : "type-27498", ++ "referenced_type" : "type-27597", ++ "self_type" : "type-27596", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160358,8 +160400,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-27598", +- "self_type" : "type-27597", ++ "referenced_type" : "type-27686", ++ "self_type" : "type-27685", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160367,8 +160409,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-27687", +- "self_type" : "type-27686", ++ "referenced_type" : "type-27752", ++ "self_type" : "type-27751", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160376,8 +160418,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-27753", +- "self_type" : "type-27752", ++ "referenced_type" : "type-27867", ++ "self_type" : "type-27866", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160385,8 +160427,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-27868", +- "self_type" : "type-27867", ++ "referenced_type" : "type-27931", ++ "self_type" : "type-27930", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160394,8 +160436,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-27932", +- "self_type" : "type-27931", ++ "referenced_type" : "type-28099", ++ "self_type" : "type-28098", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160403,8 +160445,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-28100", +- "self_type" : "type-28099", ++ "referenced_type" : "type-28227", ++ "self_type" : "type-28226", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160412,8 +160454,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-28228", +- "self_type" : "type-28227", ++ "referenced_type" : "type-28453", ++ "self_type" : "type-28452", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160421,8 +160463,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-28454", +- "self_type" : "type-28453", ++ "referenced_type" : "type-28593", ++ "self_type" : "type-28592", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160430,8 +160472,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-28594", +- "self_type" : "type-28593", ++ "referenced_type" : "type-28687", ++ "self_type" : "type-28686", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160439,8 +160481,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-28688", +- "self_type" : "type-28687", ++ "referenced_type" : "type-28917", ++ "self_type" : "type-28916", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160448,8 +160490,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-28918", +- "self_type" : "type-28917", ++ "referenced_type" : "type-29089", ++ "self_type" : "type-29088", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160457,8 +160499,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-29090", +- "self_type" : "type-29089", ++ "referenced_type" : "type-29254", ++ "self_type" : "type-29253", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160466,8 +160508,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-29255", +- "self_type" : "type-29254", ++ "referenced_type" : "type-29421", ++ "self_type" : "type-29420", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160475,8 +160517,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-29422", +- "self_type" : "type-29421", ++ "referenced_type" : "type-29531", ++ "self_type" : "type-29530", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160484,8 +160526,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-29532", +- "self_type" : "type-29531", ++ "referenced_type" : "type-29730", ++ "self_type" : "type-29729", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160493,8 +160535,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-29731", +- "self_type" : "type-29730", ++ "referenced_type" : "type-29858", ++ "self_type" : "type-29857", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160502,8 +160544,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-29859", +- "self_type" : "type-29858", ++ "referenced_type" : "type-29954", ++ "self_type" : "type-29953", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160511,8 +160553,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-29955", +- "self_type" : "type-29954", ++ "referenced_type" : "type-30058", ++ "self_type" : "type-30057", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160520,8 +160562,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-30059", +- "self_type" : "type-30058", ++ "referenced_type" : "type-30150", ++ "self_type" : "type-30149", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160529,8 +160571,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-30151", +- "self_type" : "type-30150", ++ "referenced_type" : "type-30206", ++ "self_type" : "type-30205", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160538,8 +160580,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-30207", +- "self_type" : "type-30206", ++ "referenced_type" : "type-30335", ++ "self_type" : "type-30334", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160547,8 +160589,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-30336", +- "self_type" : "type-30335", ++ "referenced_type" : "type-3049", ++ "self_type" : "type-3048", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160556,8 +160598,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-30744", +- "self_type" : "type-30743", ++ "referenced_type" : "type-30743", ++ "self_type" : "type-30742", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160565,8 +160607,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-3097", +- "self_type" : "type-3096", ++ "referenced_type" : "type-31011", ++ "self_type" : "type-31010", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160574,8 +160616,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-31012", +- "self_type" : "type-31011", ++ "referenced_type" : "type-31161", ++ "self_type" : "type-31160", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160583,8 +160625,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-31162", +- "self_type" : "type-31161", ++ "referenced_type" : "type-31249", ++ "self_type" : "type-31248", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160592,8 +160634,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-31250", +- "self_type" : "type-31249", ++ "referenced_type" : "type-31348", ++ "self_type" : "type-31347", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160601,8 +160643,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-31349", +- "self_type" : "type-31348", ++ "referenced_type" : "type-31491", ++ "self_type" : "type-31490", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160610,8 +160652,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-31492", +- "self_type" : "type-31491", ++ "referenced_type" : "type-31529", ++ "self_type" : "type-31528", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160619,8 +160661,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-31530", +- "self_type" : "type-31529", ++ "referenced_type" : "type-31636", ++ "self_type" : "type-31635", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160628,8 +160670,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-31637", +- "self_type" : "type-31636", ++ "referenced_type" : "type-31664", ++ "self_type" : "type-31663", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160637,8 +160679,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-31665", +- "self_type" : "type-31664", ++ "referenced_type" : "type-31744", ++ "self_type" : "type-31743", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160646,8 +160688,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-31745", +- "self_type" : "type-31744", ++ "referenced_type" : "type-31945", ++ "self_type" : "type-31944", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160655,8 +160697,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-31946", +- "self_type" : "type-31945", ++ "referenced_type" : "type-32081", ++ "self_type" : "type-32080", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160664,8 +160706,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-32082", +- "self_type" : "type-32081", ++ "referenced_type" : "type-32167", ++ "self_type" : "type-32166", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160673,8 +160715,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-32168", +- "self_type" : "type-32167", ++ "referenced_type" : "type-32240", ++ "self_type" : "type-32239", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160682,8 +160724,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-32241", +- "self_type" : "type-32240", ++ "referenced_type" : "type-3407", ++ "self_type" : "type-3406", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160691,8 +160733,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-3455", +- "self_type" : "type-3454", ++ "referenced_type" : "type-3731", ++ "self_type" : "type-3730", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160700,8 +160742,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-3779", +- "self_type" : "type-3778", ++ "referenced_type" : "type-3904", ++ "self_type" : "type-3903", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160709,8 +160751,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-3952", +- "self_type" : "type-3951", ++ "referenced_type" : "type-4041", ++ "self_type" : "type-4040", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160718,8 +160760,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-4089", +- "self_type" : "type-4088", ++ "referenced_type" : "type-4143", ++ "self_type" : "type-4142", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160727,8 +160769,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-4191", +- "self_type" : "type-4190", ++ "referenced_type" : "type-4318", ++ "self_type" : "type-4317", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160736,8 +160778,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-4366", +- "self_type" : "type-4365", ++ "referenced_type" : "type-4356", ++ "self_type" : "type-4355", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160745,8 +160787,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-4404", +- "self_type" : "type-4403", ++ "referenced_type" : "type-4464", ++ "self_type" : "type-4463", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160754,8 +160796,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-4512", +- "self_type" : "type-4511", ++ "referenced_type" : "type-5029", ++ "self_type" : "type-5028", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160763,8 +160805,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-5077", +- "self_type" : "type-5076", ++ "referenced_type" : "type-5387", ++ "self_type" : "type-5386", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160772,8 +160814,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-5435", +- "self_type" : "type-5434", ++ "referenced_type" : "type-5662", ++ "self_type" : "type-5661", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160781,8 +160823,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-5710", +- "self_type" : "type-5709", ++ "referenced_type" : "type-5812", ++ "self_type" : "type-5811", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160790,8 +160832,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-5860", +- "self_type" : "type-5859", ++ "referenced_type" : "type-5900", ++ "self_type" : "type-5899", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160799,8 +160841,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-5948", +- "self_type" : "type-5947", ++ "referenced_type" : "type-5999", ++ "self_type" : "type-5998", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160808,8 +160850,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-6047", +- "self_type" : "type-6046", ++ "referenced_type" : "type-6142", ++ "self_type" : "type-6141", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160817,8 +160859,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-6190", +- "self_type" : "type-6189", ++ "referenced_type" : "type-6180", ++ "self_type" : "type-6179", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160826,8 +160868,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-6228", +- "self_type" : "type-6227", ++ "referenced_type" : "type-6287", ++ "self_type" : "type-6286", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160835,8 +160877,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-6335", +- "self_type" : "type-6334", ++ "referenced_type" : "type-6318", ++ "self_type" : "type-6317", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160844,8 +160886,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-6366", +- "self_type" : "type-6365", ++ "referenced_type" : "type-6400", ++ "self_type" : "type-6399", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160853,8 +160895,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-6448", +- "self_type" : "type-6447", ++ "referenced_type" : "type-6704", ++ "self_type" : "type-6703", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160862,8 +160904,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-6752", +- "self_type" : "type-6751", ++ "referenced_type" : "type-6903", ++ "self_type" : "type-6902", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160871,8 +160913,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-6951", +- "self_type" : "type-6950", ++ "referenced_type" : "type-7001", ++ "self_type" : "type-7000", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160880,8 +160922,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-7049", +- "self_type" : "type-7048", ++ "referenced_type" : "type-7080", ++ "self_type" : "type-7079", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160889,8 +160931,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-7128", +- "self_type" : "type-7127", ++ "referenced_type" : "type-7502", ++ "self_type" : "type-7501", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160898,8 +160940,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-7550", +- "self_type" : "type-7549", ++ "referenced_type" : "type-7667", ++ "self_type" : "type-7666", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160907,8 +160949,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-7715", +- "self_type" : "type-7714", ++ "referenced_type" : "type-7768", ++ "self_type" : "type-7767", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160916,8 +160958,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-7816", +- "self_type" : "type-7815", ++ "referenced_type" : "type-7872", ++ "self_type" : "type-7871", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160925,8 +160967,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-7920", +- "self_type" : "type-7919", ++ "referenced_type" : "type-7938", ++ "self_type" : "type-7937", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160934,8 +160976,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-7986", +- "self_type" : "type-7985", ++ "referenced_type" : "type-8052", ++ "self_type" : "type-8051", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160943,8 +160985,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-8100", +- "self_type" : "type-8099", ++ "referenced_type" : "type-8305", ++ "self_type" : "type-8304", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160952,8 +160994,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-8353", +- "self_type" : "type-8352", ++ "referenced_type" : "type-8652", ++ "self_type" : "type-8651", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160961,8 +161003,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-8700", +- "self_type" : "type-8699", ++ "referenced_type" : "type-8919", ++ "self_type" : "type-8918", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160970,8 +161012,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-8967", +- "self_type" : "type-8966", ++ "referenced_type" : "type-9069", ++ "self_type" : "type-9068", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160979,8 +161021,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-9117", +- "self_type" : "type-9116", ++ "referenced_type" : "type-9157", ++ "self_type" : "type-9156", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160988,8 +161030,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-9205", +- "self_type" : "type-9204", ++ "referenced_type" : "type-9256", ++ "self_type" : "type-9255", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -160997,8 +161039,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-9304", +- "self_type" : "type-9303", ++ "referenced_type" : "type-9399", ++ "self_type" : "type-9398", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -161006,8 +161048,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-9447", +- "self_type" : "type-9446", ++ "referenced_type" : "type-9437", ++ "self_type" : "type-9436", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -161015,8 +161057,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-9485", +- "self_type" : "type-9484", ++ "referenced_type" : "type-9544", ++ "self_type" : "type-9543", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -161024,8 +161066,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-9592", +- "self_type" : "type-9591", ++ "referenced_type" : "type-9572", ++ "self_type" : "type-9571", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -161033,8 +161075,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-9620", +- "self_type" : "type-9619", ++ "referenced_type" : "type-9652", ++ "self_type" : "type-9651", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -161042,8 +161084,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-9700", +- "self_type" : "type-9699", ++ "referenced_type" : "type-9853", ++ "self_type" : "type-9852", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -161051,8 +161093,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-9901", +- "self_type" : "type-9900", ++ "referenced_type" : "type-9988", ++ "self_type" : "type-9987", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -161060,8 +161102,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-25016", +- "self_type" : "type-25015", ++ "referenced_type" : "type-24985", ++ "self_type" : "type-24984", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h" + }, +@@ -161069,8 +161111,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-30167", +- "self_type" : "type-30166", ++ "referenced_type" : "type-30166", ++ "self_type" : "type-30165", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h" + }, +@@ -161078,8 +161120,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-11261", +- "self_type" : "type-11260", ++ "referenced_type" : "type-11213", ++ "self_type" : "type-11212", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -161087,8 +161129,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-12273", +- "self_type" : "type-12272", ++ "referenced_type" : "type-12225", ++ "self_type" : "type-12224", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -161096,8 +161138,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-12434", +- "self_type" : "type-12433", ++ "referenced_type" : "type-12386", ++ "self_type" : "type-12385", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -161105,8 +161147,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-14512", +- "self_type" : "type-14511", ++ "referenced_type" : "type-14464", ++ "self_type" : "type-14463", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -161114,8 +161156,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16128", +- "self_type" : "type-16127", ++ "referenced_type" : "type-16080", ++ "self_type" : "type-16079", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -161123,8 +161165,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-16291", +- "self_type" : "type-16290", ++ "referenced_type" : "type-16243", ++ "self_type" : "type-16242", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -161132,8 +161174,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-18376", +- "self_type" : "type-18375", ++ "referenced_type" : "type-18328", ++ "self_type" : "type-18327", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -161141,8 +161183,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20659", +- "self_type" : "type-20658", ++ "referenced_type" : "type-20611", ++ "self_type" : "type-20610", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -161150,8 +161192,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-20822", +- "self_type" : "type-20821", ++ "referenced_type" : "type-20774", ++ "self_type" : "type-20773", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -161159,8 +161201,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-22905", +- "self_type" : "type-22904", ++ "referenced_type" : "type-22868", ++ "self_type" : "type-22867", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -161168,8 +161210,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-25022", +- "self_type" : "type-25021", ++ "referenced_type" : "type-24991", ++ "self_type" : "type-24990", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h" + }, +@@ -161177,8 +161219,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-25838", +- "self_type" : "type-25837", ++ "referenced_type" : "type-25889", ++ "self_type" : "type-25888", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -161186,8 +161228,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-26000", +- "self_type" : "type-25999", ++ "referenced_type" : "type-26053", ++ "self_type" : "type-26052", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -161195,8 +161237,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-28090", +- "self_type" : "type-28089", ++ "referenced_type" : "type-28089", ++ "self_type" : "type-28088", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -161204,8 +161246,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-30172", +- "self_type" : "type-30171", ++ "referenced_type" : "type-30171", ++ "self_type" : "type-30170", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h" + }, +@@ -161213,8 +161255,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-30984", +- "self_type" : "type-30983", ++ "referenced_type" : "type-30983", ++ "self_type" : "type-30982", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -161222,8 +161264,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-31147", +- "self_type" : "type-31146", ++ "referenced_type" : "type-31146", ++ "self_type" : "type-31145", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -161231,8 +161273,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-3732", +- "self_type" : "type-3731", ++ "referenced_type" : "type-3684", ++ "self_type" : "type-3683", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -161240,8 +161282,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-3937", +- "self_type" : "type-3936", ++ "referenced_type" : "type-3889", ++ "self_type" : "type-3888", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -161249,8 +161291,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-5682", +- "self_type" : "type-5681", ++ "referenced_type" : "type-5634", ++ "self_type" : "type-5633", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -161258,8 +161300,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-5845", +- "self_type" : "type-5844", ++ "referenced_type" : "type-5797", ++ "self_type" : "type-5796", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -161267,8 +161309,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-8939", +- "self_type" : "type-8938", ++ "referenced_type" : "type-8891", ++ "self_type" : "type-8890", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -161276,8 +161318,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector > *", + "name" : "std::vector > *", +- "referenced_type" : "type-9102", +- "self_type" : "type-9101", ++ "referenced_type" : "type-9054", ++ "self_type" : "type-9053", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -161285,8 +161327,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator > *, std::allocator, std::allocator > *> > *", + "name" : "std::vector, std::allocator > *, std::allocator, std::allocator > *> > *", +- "referenced_type" : "type-12390", +- "self_type" : "type-12389", ++ "referenced_type" : "type-12342", ++ "self_type" : "type-12341", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -161294,8 +161336,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator > *, std::allocator, std::allocator > *> > *", + "name" : "std::vector, std::allocator > *, std::allocator, std::allocator > *> > *", +- "referenced_type" : "type-16247", +- "self_type" : "type-16246", ++ "referenced_type" : "type-16199", ++ "self_type" : "type-16198", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -161303,8 +161345,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator > *, std::allocator, std::allocator > *> > *", + "name" : "std::vector, std::allocator > *, std::allocator, std::allocator > *> > *", +- "referenced_type" : "type-20778", +- "self_type" : "type-20777", ++ "referenced_type" : "type-20730", ++ "self_type" : "type-20729", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -161312,8 +161354,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator > *, std::allocator, std::allocator > *> > *", + "name" : "std::vector, std::allocator > *, std::allocator, std::allocator > *> > *", +- "referenced_type" : "type-25956", +- "self_type" : "type-25955", ++ "referenced_type" : "type-26007", ++ "self_type" : "type-26006", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -161321,8 +161363,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator > *, std::allocator, std::allocator > *> > *", + "name" : "std::vector, std::allocator > *, std::allocator, std::allocator > *> > *", +- "referenced_type" : "type-31103", +- "self_type" : "type-31102", ++ "referenced_type" : "type-31102", ++ "self_type" : "type-31101", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -161330,8 +161372,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator > *, std::allocator, std::allocator > *> > *", + "name" : "std::vector, std::allocator > *, std::allocator, std::allocator > *> > *", +- "referenced_type" : "type-3893", +- "self_type" : "type-3892", ++ "referenced_type" : "type-3845", ++ "self_type" : "type-3844", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -161339,8 +161381,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator > *, std::allocator, std::allocator > *> > *", + "name" : "std::vector, std::allocator > *, std::allocator, std::allocator > *> > *", +- "referenced_type" : "type-5801", +- "self_type" : "type-5800", ++ "referenced_type" : "type-5753", ++ "self_type" : "type-5752", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -161348,8 +161390,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator > *, std::allocator, std::allocator > *> > *", + "name" : "std::vector, std::allocator > *, std::allocator, std::allocator > *> > *", +- "referenced_type" : "type-9058", +- "self_type" : "type-9057", ++ "referenced_type" : "type-9010", ++ "self_type" : "type-9009", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stl_util.h" + }, +@@ -161357,17 +161399,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-10029", +- "self_type" : "type-10028", +- "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message.h" +- }, +- { +- "alignment" : 4, +- "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-10119", +- "self_type" : "type-10118", ++ "referenced_type" : "type-10071", ++ "self_type" : "type-10070", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_ops.h" + }, +@@ -161375,8 +161408,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-11238", +- "self_type" : "type-11237", ++ "referenced_type" : "type-11190", ++ "self_type" : "type-11189", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" + }, +@@ -161384,8 +161417,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-11498", +- "self_type" : "type-11497", ++ "referenced_type" : "type-11450", ++ "self_type" : "type-11449", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/parser.h" + }, +@@ -161393,8 +161426,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-12791", +- "self_type" : "type-12790", ++ "referenced_type" : "type-12743", ++ "self_type" : "type-12742", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -161402,8 +161435,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-13362", +- "self_type" : "type-13361", ++ "referenced_type" : "type-13314", ++ "self_type" : "type-13313", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -161411,8 +161444,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-13452", +- "self_type" : "type-13451", ++ "referenced_type" : "type-13404", ++ "self_type" : "type-13403", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_ops.h" + }, +@@ -161420,8 +161453,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-14490", +- "self_type" : "type-14489", ++ "referenced_type" : "type-14442", ++ "self_type" : "type-14441", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" + }, +@@ -161429,8 +161462,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-14718", +- "self_type" : "type-14717", ++ "referenced_type" : "type-14670", ++ "self_type" : "type-14669", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/parser.h" + }, +@@ -161438,8 +161471,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-16647", +- "self_type" : "type-16646", ++ "referenced_type" : "type-16599", ++ "self_type" : "type-16598", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -161447,8 +161480,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-17218", +- "self_type" : "type-17217", ++ "referenced_type" : "type-17170", ++ "self_type" : "type-17169", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -161456,8 +161489,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-17308", +- "self_type" : "type-17307", ++ "referenced_type" : "type-17260", ++ "self_type" : "type-17259", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_ops.h" + }, +@@ -161465,8 +161498,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-18354", +- "self_type" : "type-18353", ++ "referenced_type" : "type-18306", ++ "self_type" : "type-18305", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" + }, +@@ -161474,8 +161507,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-18582", +- "self_type" : "type-18581", ++ "referenced_type" : "type-18534", ++ "self_type" : "type-18533", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/parser.h" + }, +@@ -161483,8 +161516,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-21179", +- "self_type" : "type-21178", ++ "referenced_type" : "type-21131", ++ "self_type" : "type-21130", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -161492,8 +161525,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-21750", +- "self_type" : "type-21749", ++ "referenced_type" : "type-21702", ++ "self_type" : "type-21701", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -161501,8 +161534,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-21840", +- "self_type" : "type-21839", ++ "referenced_type" : "type-21792", ++ "self_type" : "type-21791", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_ops.h" + }, +@@ -161510,8 +161543,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-22883", +- "self_type" : "type-22882", ++ "referenced_type" : "type-22842", ++ "self_type" : "type-22841", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" + }, +@@ -161519,8 +161552,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-23111", +- "self_type" : "type-23110", ++ "referenced_type" : "type-23100", ++ "self_type" : "type-23099", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/parser.h" + }, +@@ -161528,8 +161561,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-258", +- "self_type" : "type-257", ++ "referenced_type" : "type-2575", ++ "self_type" : "type-2574", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -161537,8 +161570,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-26357", +- "self_type" : "type-26356", ++ "referenced_type" : "type-258", ++ "self_type" : "type-257", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -161546,26 +161579,26 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-26928", +- "self_type" : "type-26927", ++ "referenced_type" : "type-26919", ++ "self_type" : "type-26918", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/message.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-2697", +- "self_type" : "type-2696", ++ "referenced_type" : "type-26951", ++ "self_type" : "type-26950", + "size" : 4, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-27018", +- "self_type" : "type-27017", ++ "referenced_type" : "type-27048", ++ "self_type" : "type-27047", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_ops.h" + }, +@@ -161573,8 +161606,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-28068", +- "self_type" : "type-28067", ++ "referenced_type" : "type-28067", ++ "self_type" : "type-28066", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" + }, +@@ -161582,8 +161615,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-28296", +- "self_type" : "type-28295", ++ "referenced_type" : "type-28295", ++ "self_type" : "type-28294", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/parser.h" + }, +@@ -161591,8 +161624,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-31504", +- "self_type" : "type-31503", ++ "referenced_type" : "type-31503", ++ "self_type" : "type-31502", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -161600,8 +161633,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-32075", +- "self_type" : "type-32074", ++ "referenced_type" : "type-32074", ++ "self_type" : "type-32073", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -161609,8 +161642,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-32165", +- "self_type" : "type-32164", ++ "referenced_type" : "type-32164", ++ "self_type" : "type-32163", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_ops.h" + }, +@@ -161618,8 +161651,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-4377", +- "self_type" : "type-4376", ++ "referenced_type" : "type-4329", ++ "self_type" : "type-4328", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -161627,8 +161660,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-6202", +- "self_type" : "type-6201", ++ "referenced_type" : "type-6154", ++ "self_type" : "type-6153", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -161636,8 +161669,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-6941", +- "self_type" : "type-6940", ++ "referenced_type" : "type-6893", ++ "self_type" : "type-6892", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -161645,8 +161678,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-7046", +- "self_type" : "type-7045", ++ "referenced_type" : "type-6998", ++ "self_type" : "type-6997", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_ops.h" + }, +@@ -161654,8 +161687,8 @@ + "alignment" : 4, + "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", + "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", +- "referenced_type" : "type-9459", +- "self_type" : "type-9458", ++ "referenced_type" : "type-9411", ++ "self_type" : "type-9410", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -161668,6 +161701,15 @@ + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, ++ { ++ "alignment" : 4, ++ "linker_set_key" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", ++ "name" : "std::vector, std::allocator >, std::allocator, std::allocator > > > *", ++ "referenced_type" : "type-9981", ++ "self_type" : "type-9980", ++ "size" : 4, ++ "source_file" : "/external/protobuf/src/google/protobuf/message.h" ++ }, + { + "alignment" : 4, + "linker_set_key" : "unsigned char *", +@@ -161708,8 +161750,8 @@ + "alignment" : 4, + "linker_set_key" : "void (*)(const std::__1::basic_string &)", + "name" : "void (*)(const std::__1::basic_string &)", +- "referenced_type" : "type-6868", +- "self_type" : "type-6867", ++ "referenced_type" : "type-6820", ++ "self_type" : "type-6819", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -161744,8 +161786,8 @@ + "alignment" : 4, + "linker_set_key" : "void (*)(std::__1::pair *)", + "name" : "void (*)(std::__1::pair *)", +- "referenced_type" : "type-3685", +- "self_type" : "type-3684", ++ "referenced_type" : "type-3637", ++ "self_type" : "type-3636", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -161829,8 +161871,8 @@ + "is_const" : true, + "linker_set_key" : "char const[18]", + "name" : "char const[18]", +- "referenced_type" : "type-15359", +- "self_type" : "type-15361", ++ "referenced_type" : "type-15311", ++ "self_type" : "type-15313", + "size" : 18, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/constants.h" + }, +@@ -161839,8 +161881,8 @@ + "is_const" : true, + "linker_set_key" : "char const[20]", + "name" : "char const[20]", +- "referenced_type" : "type-15357", +- "self_type" : "type-15358", ++ "referenced_type" : "type-15309", ++ "self_type" : "type-15310", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/constants.h" + }, +@@ -161849,8 +161891,8 @@ + "is_const" : true, + "linker_set_key" : "char const[22]", + "name" : "char const[22]", +- "referenced_type" : "type-15366", +- "self_type" : "type-15367", ++ "referenced_type" : "type-15318", ++ "self_type" : "type-15319", + "size" : 22, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/constants.h" + }, +@@ -161859,8 +161901,8 @@ + "is_const" : true, + "linker_set_key" : "char const[23]", + "name" : "char const[23]", +- "referenced_type" : "type-15364", +- "self_type" : "type-15365", ++ "referenced_type" : "type-15316", ++ "self_type" : "type-15317", + "size" : 23, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/constants.h" + }, +@@ -161869,8 +161911,8 @@ + "is_const" : true, + "linker_set_key" : "char const[25]", + "name" : "char const[25]", +- "referenced_type" : "type-15370", +- "self_type" : "type-15371", ++ "referenced_type" : "type-15322", ++ "self_type" : "type-15323", + "size" : 25, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/constants.h" + }, +@@ -161879,8 +161921,8 @@ + "is_const" : true, + "linker_set_key" : "char const[26]", + "name" : "char const[26]", +- "referenced_type" : "type-15368", +- "self_type" : "type-15369", ++ "referenced_type" : "type-15320", ++ "self_type" : "type-15321", + "size" : 26, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/constants.h" + }, +@@ -161889,8 +161931,8 @@ + "is_const" : true, + "linker_set_key" : "char const[42]", + "name" : "char const[42]", +- "referenced_type" : "type-15372", +- "self_type" : "type-15373", ++ "referenced_type" : "type-15324", ++ "self_type" : "type-15325", + "size" : 42, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/constants.h" + }, +@@ -161899,8 +161941,8 @@ + "is_const" : true, + "linker_set_key" : "char const[43]", + "name" : "char const[43]", +- "referenced_type" : "type-15374", +- "self_type" : "type-15375", ++ "referenced_type" : "type-15326", ++ "self_type" : "type-15327", + "size" : 43, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/constants.h" + }, +@@ -161909,8 +161951,8 @@ + "is_const" : true, + "linker_set_key" : "char const[46]", + "name" : "char const[46]", +- "referenced_type" : "type-15362", +- "self_type" : "type-15363", ++ "referenced_type" : "type-15314", ++ "self_type" : "type-15315", + "size" : 46, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/constants.h" + }, +@@ -161918,8 +161960,8 @@ + "is_const" : true, + "linker_set_key" : "char const[]", + "name" : "char const[]", +- "referenced_type" : "type-2182", +- "self_type" : "type-2183", ++ "referenced_type" : "type-2113", ++ "self_type" : "type-2114", + "source_file" : "/external/protobuf/src/google/protobuf/any.h" + }, + { +@@ -161948,7 +161990,7 @@ + "linker_set_key" : "const char *const", + "name" : "const char *const", + "referenced_type" : "type-5", +- "self_type" : "type-3641", ++ "self_type" : "type-3593", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -161957,8 +161999,8 @@ + "is_const" : true, + "linker_set_key" : "const char *const[11]", + "name" : "const char *const[11]", +- "referenced_type" : "type-2040", +- "self_type" : "type-2041", ++ "referenced_type" : "type-1969", ++ "self_type" : "type-1970", + "size" : 44, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -161967,8 +162009,8 @@ + "is_const" : true, + "linker_set_key" : "const char *const[19]", + "name" : "const char *const[19]", +- "referenced_type" : "type-2038", +- "self_type" : "type-2039", ++ "referenced_type" : "type-1967", ++ "self_type" : "type-1968", + "size" : 76, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -161977,8 +162019,8 @@ + "is_const" : true, + "linker_set_key" : "const char *const[4]", + "name" : "const char *const[4]", +- "referenced_type" : "type-2042", +- "self_type" : "type-2043", ++ "referenced_type" : "type-1971", ++ "self_type" : "type-1972", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -161986,624 +162028,624 @@ + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-10044", +- "self_type" : "type-10043", ++ "referenced_type" : "type-10297", ++ "self_type" : "type-10296", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-10345", +- "self_type" : "type-10344", ++ "referenced_type" : "type-12643", ++ "self_type" : "type-12642", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-12691", +- "self_type" : "type-12690", ++ "referenced_type" : "type-12959", ++ "self_type" : "type-12958", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-13007", +- "self_type" : "type-13006", ++ "referenced_type" : "type-13210", ++ "self_type" : "type-13209", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-13258", +- "self_type" : "type-13257", ++ "referenced_type" : "type-13329", ++ "self_type" : "type-13328", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-13377", +- "self_type" : "type-13376", ++ "referenced_type" : "type-13588", ++ "self_type" : "type-13587", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-13636", +- "self_type" : "type-13635", ++ "referenced_type" : "type-15118", ++ "self_type" : "type-15117", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-15166", +- "self_type" : "type-15165", ++ "referenced_type" : "type-16499", ++ "self_type" : "type-16498", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-16547", +- "self_type" : "type-16546", ++ "referenced_type" : "type-16815", ++ "self_type" : "type-16814", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-16863", +- "self_type" : "type-16862", ++ "referenced_type" : "type-17066", ++ "self_type" : "type-17065", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-17114", +- "self_type" : "type-17113", ++ "referenced_type" : "type-17185", ++ "self_type" : "type-17184", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-17233", +- "self_type" : "type-17232", ++ "referenced_type" : "type-17452", ++ "self_type" : "type-17451", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-17500", +- "self_type" : "type-17499", ++ "referenced_type" : "type-18902", ++ "self_type" : "type-18901", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-18950", +- "self_type" : "type-18949", ++ "referenced_type" : "type-21031", ++ "self_type" : "type-21030", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-21079", +- "self_type" : "type-21078", ++ "referenced_type" : "type-21347", ++ "self_type" : "type-21346", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-21395", +- "self_type" : "type-21394", ++ "referenced_type" : "type-21598", ++ "self_type" : "type-21597", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-21646", +- "self_type" : "type-21645", ++ "referenced_type" : "type-21717", ++ "self_type" : "type-21716", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-21765", +- "self_type" : "type-21764", ++ "referenced_type" : "type-22024", ++ "self_type" : "type-22023", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-22029", +- "self_type" : "type-22028", ++ "referenced_type" : "type-23457", ++ "self_type" : "type-23456", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-23479", +- "self_type" : "type-23478", ++ "referenced_type" : "type-26300", ++ "self_type" : "type-26299", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-26257", +- "self_type" : "type-26256", ++ "referenced_type" : "type-26601", ++ "self_type" : "type-26600", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-26573", +- "self_type" : "type-26572", ++ "referenced_type" : "type-26848", ++ "self_type" : "type-26847", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-26824", +- "self_type" : "type-26823", ++ "referenced_type" : "type-26966", ++ "self_type" : "type-26965", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-26943", +- "self_type" : "type-26942", ++ "referenced_type" : "type-27213", ++ "self_type" : "type-27212", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-27214", +- "self_type" : "type-27213", ++ "referenced_type" : "type-28663", ++ "self_type" : "type-28662", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-28664", +- "self_type" : "type-28663", ++ "referenced_type" : "type-31403", ++ "self_type" : "type-31402", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-31404", +- "self_type" : "type-31403", ++ "referenced_type" : "type-31719", ++ "self_type" : "type-31718", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-31720", +- "self_type" : "type-31719", ++ "referenced_type" : "type-31970", ++ "self_type" : "type-31969", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-31971", +- "self_type" : "type-31970", ++ "referenced_type" : "type-32089", ++ "self_type" : "type-32088", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-32090", +- "self_type" : "type-32089", ++ "referenced_type" : "type-4202", ++ "self_type" : "type-4201", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-4250", +- "self_type" : "type-4249", ++ "referenced_type" : "type-6054", ++ "self_type" : "type-6053", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-6102", +- "self_type" : "type-6101", ++ "referenced_type" : "type-6375", ++ "self_type" : "type-6374", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-6423", +- "self_type" : "type-6422", ++ "referenced_type" : "type-6735", ++ "self_type" : "type-6734", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-6783", +- "self_type" : "type-6782", ++ "referenced_type" : "type-6911", ++ "self_type" : "type-6910", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-6959", +- "self_type" : "type-6958", ++ "referenced_type" : "type-7272", ++ "self_type" : "type-7271", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-7320", +- "self_type" : "type-7319", ++ "referenced_type" : "type-9311", ++ "self_type" : "type-9310", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-9359", +- "self_type" : "type-9358", ++ "referenced_type" : "type-9627", ++ "self_type" : "type-9626", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-9675", +- "self_type" : "type-9674", ++ "referenced_type" : "type-9878", ++ "self_type" : "type-9877", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::const_iterator", + "name" : "const class google::protobuf::Map::const_iterator", +- "referenced_type" : "type-9926", +- "self_type" : "type-9925", ++ "referenced_type" : "type-9996", ++ "self_type" : "type-9995", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-10047", +- "self_type" : "type-10046", ++ "referenced_type" : "type-10300", ++ "self_type" : "type-10299", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-10348", +- "self_type" : "type-10347", ++ "referenced_type" : "type-12646", ++ "self_type" : "type-12645", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-12694", +- "self_type" : "type-12693", ++ "referenced_type" : "type-12961", ++ "self_type" : "type-12960", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-13009", +- "self_type" : "type-13008", ++ "referenced_type" : "type-13213", ++ "self_type" : "type-13212", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-13261", +- "self_type" : "type-13260", ++ "referenced_type" : "type-13332", ++ "self_type" : "type-13331", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-13380", +- "self_type" : "type-13379", ++ "referenced_type" : "type-13591", ++ "self_type" : "type-13590", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-13639", +- "self_type" : "type-13638", ++ "referenced_type" : "type-15121", ++ "self_type" : "type-15120", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-15169", +- "self_type" : "type-15168", ++ "referenced_type" : "type-16502", ++ "self_type" : "type-16501", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-16550", +- "self_type" : "type-16549", ++ "referenced_type" : "type-16817", ++ "self_type" : "type-16816", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-16865", +- "self_type" : "type-16864", ++ "referenced_type" : "type-17069", ++ "self_type" : "type-17068", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-17117", +- "self_type" : "type-17116", ++ "referenced_type" : "type-17188", ++ "self_type" : "type-17187", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-17236", +- "self_type" : "type-17235", ++ "referenced_type" : "type-17455", ++ "self_type" : "type-17454", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-17503", +- "self_type" : "type-17502", ++ "referenced_type" : "type-18905", ++ "self_type" : "type-18904", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-18953", +- "self_type" : "type-18952", ++ "referenced_type" : "type-21034", ++ "self_type" : "type-21033", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-21082", +- "self_type" : "type-21081", ++ "referenced_type" : "type-21349", ++ "self_type" : "type-21348", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-21397", +- "self_type" : "type-21396", ++ "referenced_type" : "type-21601", ++ "self_type" : "type-21600", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-21649", +- "self_type" : "type-21648", ++ "referenced_type" : "type-21720", ++ "self_type" : "type-21719", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-21768", +- "self_type" : "type-21767", ++ "referenced_type" : "type-22027", ++ "self_type" : "type-22026", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-22032", +- "self_type" : "type-22031", ++ "referenced_type" : "type-23460", ++ "self_type" : "type-23459", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-23482", +- "self_type" : "type-23481", ++ "referenced_type" : "type-26303", ++ "self_type" : "type-26302", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-26260", +- "self_type" : "type-26259", ++ "referenced_type" : "type-26603", ++ "self_type" : "type-26602", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-26575", +- "self_type" : "type-26574", ++ "referenced_type" : "type-26851", ++ "self_type" : "type-26850", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-26827", +- "self_type" : "type-26826", ++ "referenced_type" : "type-26969", ++ "self_type" : "type-26968", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-26946", +- "self_type" : "type-26945", ++ "referenced_type" : "type-27216", ++ "self_type" : "type-27215", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-27217", +- "self_type" : "type-27216", ++ "referenced_type" : "type-28666", ++ "self_type" : "type-28665", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-28667", +- "self_type" : "type-28666", ++ "referenced_type" : "type-31406", ++ "self_type" : "type-31405", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-31407", +- "self_type" : "type-31406", ++ "referenced_type" : "type-31721", ++ "self_type" : "type-31720", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-31722", +- "self_type" : "type-31721", ++ "referenced_type" : "type-31973", ++ "self_type" : "type-31972", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-31974", +- "self_type" : "type-31973", ++ "referenced_type" : "type-32092", ++ "self_type" : "type-32091", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-32093", +- "self_type" : "type-32092", ++ "referenced_type" : "type-4205", ++ "self_type" : "type-4204", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-4253", +- "self_type" : "type-4252", ++ "referenced_type" : "type-6057", ++ "self_type" : "type-6056", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-6105", +- "self_type" : "type-6104", ++ "referenced_type" : "type-6377", ++ "self_type" : "type-6376", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-6425", +- "self_type" : "type-6424", ++ "referenced_type" : "type-6738", ++ "self_type" : "type-6737", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-6786", +- "self_type" : "type-6785", ++ "referenced_type" : "type-6914", ++ "self_type" : "type-6913", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-6962", +- "self_type" : "type-6961", ++ "referenced_type" : "type-7275", ++ "self_type" : "type-7274", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-7323", +- "self_type" : "type-7322", ++ "referenced_type" : "type-9314", ++ "self_type" : "type-9313", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-9362", +- "self_type" : "type-9361", ++ "referenced_type" : "type-9629", ++ "self_type" : "type-9628", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-9677", +- "self_type" : "type-9676", ++ "referenced_type" : "type-9881", ++ "self_type" : "type-9880", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const class google::protobuf::Map::iterator", + "name" : "const class google::protobuf::Map::iterator", +- "referenced_type" : "type-9929", +- "self_type" : "type-9928", ++ "referenced_type" : "type-9999", ++ "self_type" : "type-9998", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { +@@ -162631,8 +162673,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Any", + "name" : "const google::protobuf::Any", +- "referenced_type" : "type-1846", +- "self_type" : "type-2163", ++ "referenced_type" : "type-1759", ++ "self_type" : "type-2094", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -162641,8 +162683,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Any *const", + "name" : "const google::protobuf::Any *const", +- "referenced_type" : "type-2162", +- "self_type" : "type-2161", ++ "referenced_type" : "type-2093", ++ "self_type" : "type-2092", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -162651,8 +162693,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Api", + "name" : "const google::protobuf::Api", +- "referenced_type" : "type-2342", +- "self_type" : "type-2447", ++ "referenced_type" : "type-2269", ++ "self_type" : "type-2377", + "size" : 80, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -162661,8 +162703,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Api *const", + "name" : "const google::protobuf::Api *const", +- "referenced_type" : "type-2446", +- "self_type" : "type-2445", ++ "referenced_type" : "type-2376", ++ "self_type" : "type-2375", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -162701,8 +162743,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::BoolValue", + "name" : "const google::protobuf::BoolValue", +- "referenced_type" : "type-11054", +- "self_type" : "type-11123", ++ "referenced_type" : "type-11006", ++ "self_type" : "type-11075", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -162711,8 +162753,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::BoolValue *const", + "name" : "const google::protobuf::BoolValue *const", +- "referenced_type" : "type-11122", +- "self_type" : "type-11121", ++ "referenced_type" : "type-11074", ++ "self_type" : "type-11073", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -162721,8 +162763,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::BytesValue", + "name" : "const google::protobuf::BytesValue", +- "referenced_type" : "type-11056", +- "self_type" : "type-11131", ++ "referenced_type" : "type-11008", ++ "self_type" : "type-11083", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -162731,8 +162773,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::BytesValue *const", + "name" : "const google::protobuf::BytesValue *const", +- "referenced_type" : "type-11130", +- "self_type" : "type-11129", ++ "referenced_type" : "type-11082", ++ "self_type" : "type-11081", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -162741,8 +162783,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::DebugStringOptions", + "name" : "const google::protobuf::DebugStringOptions", +- "referenced_type" : "type-1956", +- "self_type" : "type-3729", ++ "referenced_type" : "type-1881", ++ "self_type" : "type-3681", + "size" : 3, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -162751,8 +162793,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Descriptor", + "name" : "const google::protobuf::Descriptor", +- "referenced_type" : "type-1958", +- "self_type" : "type-1975", ++ "referenced_type" : "type-1883", ++ "self_type" : "type-1901", + "size" : 88, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -162761,8 +162803,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Descriptor *const", + "name" : "const google::protobuf::Descriptor *const", +- "referenced_type" : "type-1974", +- "self_type" : "type-3694", ++ "referenced_type" : "type-1900", ++ "self_type" : "type-3646", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -162771,8 +162813,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Descriptor::ExtensionRange", + "name" : "const google::protobuf::Descriptor::ExtensionRange", +- "referenced_type" : "type-2021", +- "self_type" : "type-2028", ++ "referenced_type" : "type-1947", ++ "self_type" : "type-1958", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -162781,8 +162823,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Descriptor::ReservedRange", + "name" : "const google::protobuf::Descriptor::ReservedRange", +- "referenced_type" : "type-2023", +- "self_type" : "type-2030", ++ "referenced_type" : "type-1949", ++ "self_type" : "type-1960", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -162790,266 +162832,266 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-10802", +- "self_type" : "type-10801", ++ "referenced_type" : "type-10754", ++ "self_type" : "type-10753", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-11273", +- "self_type" : "type-11272", ++ "referenced_type" : "type-11225", ++ "self_type" : "type-11224", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-11565", +- "self_type" : "type-11564", ++ "referenced_type" : "type-11517", ++ "self_type" : "type-11516", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-11589", +- "self_type" : "type-11588", ++ "referenced_type" : "type-11541", ++ "self_type" : "type-11540", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-14093", +- "self_type" : "type-14092", ++ "referenced_type" : "type-1328", ++ "self_type" : "type-1327", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-1409", +- "self_type" : "type-1408", ++ "referenced_type" : "type-1395", ++ "self_type" : "type-1394", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-14524", +- "self_type" : "type-14523", ++ "referenced_type" : "type-14045", ++ "self_type" : "type-14044", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-1481", +- "self_type" : "type-1480", ++ "referenced_type" : "type-14476", ++ "self_type" : "type-14475", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-15424", +- "self_type" : "type-15423", ++ "referenced_type" : "type-1468", ++ "self_type" : "type-1467", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-15448", +- "self_type" : "type-15447", ++ "referenced_type" : "type-1492", ++ "self_type" : "type-1491", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-1545", +- "self_type" : "type-1544", ++ "referenced_type" : "type-15376", ++ "self_type" : "type-15375", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-1572", +- "self_type" : "type-1571", ++ "referenced_type" : "type-15400", ++ "self_type" : "type-15399", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-17957", +- "self_type" : "type-17956", ++ "referenced_type" : "type-17909", ++ "self_type" : "type-17908", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-18388", +- "self_type" : "type-18387", ++ "referenced_type" : "type-18340", ++ "self_type" : "type-18339", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { ++ "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-19214", +- "self_type" : "type-19213", +- "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" ++ "referenced_type" : "type-1889", ++ "self_type" : "type-1888", ++ "size" : 36, ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-19539", +- "self_type" : "type-19538", ++ "referenced_type" : "type-19166", ++ "self_type" : "type-19165", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { +- "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-1964", +- "self_type" : "type-1963", +- "size" : 36, +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ "referenced_type" : "type-19491", ++ "self_type" : "type-19490", ++ "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-22486", +- "self_type" : "type-22485", ++ "referenced_type" : "type-23010", ++ "self_type" : "type-23009", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-22917", +- "self_type" : "type-22916", ++ "referenced_type" : "type-23768", ++ "self_type" : "type-23767", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-23735", +- "self_type" : "type-23734", ++ "referenced_type" : "type-24585", ++ "self_type" : "type-24584", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-24009", +- "self_type" : "type-24008", ++ "referenced_type" : "type-24844", ++ "self_type" : "type-24843", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-27671", +- "self_type" : "type-27670", ++ "referenced_type" : "type-27670", ++ "self_type" : "type-27669", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-28102", +- "self_type" : "type-28101", ++ "referenced_type" : "type-2790", ++ "self_type" : "type-2789", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-2838", +- "self_type" : "type-2837", ++ "referenced_type" : "type-28101", ++ "self_type" : "type-28100", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-28920", +- "self_type" : "type-28919", ++ "referenced_type" : "type-2857", ++ "self_type" : "type-2856", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-2905", +- "self_type" : "type-2904", ++ "referenced_type" : "type-28919", ++ "self_type" : "type-28918", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-29194", +- "self_type" : "type-29193", ++ "referenced_type" : "type-29193", ++ "self_type" : "type-29192", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-2978", +- "self_type" : "type-2977", ++ "referenced_type" : "type-2930", ++ "self_type" : "type-2929", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-3002", +- "self_type" : "type-3001", ++ "referenced_type" : "type-2954", ++ "self_type" : "type-2953", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-4818", +- "self_type" : "type-4817", ++ "referenced_type" : "type-4770", ++ "self_type" : "type-4769", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-4885", +- "self_type" : "type-4884", ++ "referenced_type" : "type-4837", ++ "self_type" : "type-4836", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-4958", +- "self_type" : "type-4957", ++ "referenced_type" : "type-4910", ++ "self_type" : "type-4909", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-4982", +- "self_type" : "type-4981", ++ "referenced_type" : "type-4934", ++ "self_type" : "type-4933", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { +@@ -163072,32 +163114,32 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-7899", +- "self_type" : "type-7898", ++ "referenced_type" : "type-7851", ++ "self_type" : "type-7850", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-8161", +- "self_type" : "type-8160", ++ "referenced_type" : "type-8113", ++ "self_type" : "type-8112", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-8234", +- "self_type" : "type-8233", ++ "referenced_type" : "type-8186", ++ "self_type" : "type-8185", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorPool", + "name" : "const google::protobuf::DescriptorPool", +- "referenced_type" : "type-8258", +- "self_type" : "type-8257", ++ "referenced_type" : "type-8210", ++ "self_type" : "type-8209", + "source_file" : "/external/protobuf/src/google/protobuf/io/coded_stream.h" + }, + { +@@ -163121,8 +163163,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorProto", + "name" : "const google::protobuf::DescriptorProto", +- "referenced_type" : "type-1677", +- "self_type" : "type-1879", ++ "referenced_type" : "type-1591", ++ "self_type" : "type-1797", + "size" : 152, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -163131,8 +163173,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorProto *const", + "name" : "const google::protobuf::DescriptorProto *const", +- "referenced_type" : "type-1880", +- "self_type" : "type-4116", ++ "referenced_type" : "type-1798", ++ "self_type" : "type-4068", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -163141,8 +163183,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorProto_ExtensionRange", + "name" : "const google::protobuf::DescriptorProto_ExtensionRange", +- "referenced_type" : "type-1696", +- "self_type" : "type-1895", ++ "referenced_type" : "type-1610", ++ "self_type" : "type-1814", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -163151,8 +163193,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorProto_ExtensionRange *const", + "name" : "const google::protobuf::DescriptorProto_ExtensionRange *const", +- "referenced_type" : "type-1896", +- "self_type" : "type-4112", ++ "referenced_type" : "type-1815", ++ "self_type" : "type-4064", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -163161,8 +163203,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorProto_ReservedRange", + "name" : "const google::protobuf::DescriptorProto_ReservedRange", +- "referenced_type" : "type-1702", +- "self_type" : "type-1903", ++ "referenced_type" : "type-1616", ++ "self_type" : "type-1822", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -163171,8 +163213,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::DescriptorProto_ReservedRange *const", + "name" : "const google::protobuf::DescriptorProto_ReservedRange *const", +- "referenced_type" : "type-1904", +- "self_type" : "type-4114", ++ "referenced_type" : "type-1823", ++ "self_type" : "type-4066", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -163181,8 +163223,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::DoubleValue", + "name" : "const google::protobuf::DoubleValue", +- "referenced_type" : "type-11048", +- "self_type" : "type-11098", ++ "referenced_type" : "type-11000", ++ "self_type" : "type-11050", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -163191,8 +163233,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::DoubleValue *const", + "name" : "const google::protobuf::DoubleValue *const", +- "referenced_type" : "type-11097", +- "self_type" : "type-11096", ++ "referenced_type" : "type-11049", ++ "self_type" : "type-11048", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -163201,8 +163243,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Duration", + "name" : "const google::protobuf::Duration", +- "referenced_type" : "type-4178", +- "self_type" : "type-4216", ++ "referenced_type" : "type-4130", ++ "self_type" : "type-4168", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -163211,8 +163253,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Duration *const", + "name" : "const google::protobuf::Duration *const", +- "referenced_type" : "type-4215", +- "self_type" : "type-4214", ++ "referenced_type" : "type-4167", ++ "self_type" : "type-4166", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -163221,8 +163263,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::DynamicMessage::TypeInfo", + "name" : "const google::protobuf::DynamicMessage::TypeInfo", +- "referenced_type" : "type-12736", +- "self_type" : "type-12735", ++ "referenced_type" : "type-12688", ++ "self_type" : "type-12687", + "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -163231,8 +163273,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::DynamicMessage::TypeInfo", + "name" : "const google::protobuf::DynamicMessage::TypeInfo", +- "referenced_type" : "type-16592", +- "self_type" : "type-16591", ++ "referenced_type" : "type-16544", ++ "self_type" : "type-16543", + "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -163241,8 +163283,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::DynamicMessage::TypeInfo", + "name" : "const google::protobuf::DynamicMessage::TypeInfo", +- "referenced_type" : "type-21124", +- "self_type" : "type-21123", ++ "referenced_type" : "type-21076", ++ "self_type" : "type-21075", + "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -163251,8 +163293,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::DynamicMessage::TypeInfo", + "name" : "const google::protobuf::DynamicMessage::TypeInfo", +- "referenced_type" : "type-26302", +- "self_type" : "type-26301", ++ "referenced_type" : "type-26346", ++ "self_type" : "type-26345", + "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -163261,8 +163303,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::DynamicMessage::TypeInfo", + "name" : "const google::protobuf::DynamicMessage::TypeInfo", +- "referenced_type" : "type-31449", +- "self_type" : "type-31448", ++ "referenced_type" : "type-31448", ++ "self_type" : "type-31447", + "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -163271,8 +163313,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::DynamicMessage::TypeInfo", + "name" : "const google::protobuf::DynamicMessage::TypeInfo", +- "referenced_type" : "type-4318", +- "self_type" : "type-4317", ++ "referenced_type" : "type-4270", ++ "self_type" : "type-4269", + "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -163281,8 +163323,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::DynamicMessage::TypeInfo", + "name" : "const google::protobuf::DynamicMessage::TypeInfo", +- "referenced_type" : "type-6147", +- "self_type" : "type-6146", ++ "referenced_type" : "type-6099", ++ "self_type" : "type-6098", + "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -163291,8 +163333,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::DynamicMessage::TypeInfo", + "name" : "const google::protobuf::DynamicMessage::TypeInfo", +- "referenced_type" : "type-9404", +- "self_type" : "type-9403", ++ "referenced_type" : "type-9356", ++ "self_type" : "type-9355", + "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -163301,8 +163343,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Empty", + "name" : "const google::protobuf::Empty", +- "referenced_type" : "type-4395", +- "self_type" : "type-4430", ++ "referenced_type" : "type-4347", ++ "self_type" : "type-4382", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -163311,8 +163353,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Empty *const", + "name" : "const google::protobuf::Empty *const", +- "referenced_type" : "type-4429", +- "self_type" : "type-4428", ++ "referenced_type" : "type-4381", ++ "self_type" : "type-4380", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -163321,8 +163363,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Enum", + "name" : "const google::protobuf::Enum", +- "referenced_type" : "type-2495", +- "self_type" : "type-2498", ++ "referenced_type" : "type-2425", ++ "self_type" : "type-2428", + "size" : 60, + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, +@@ -163331,8 +163373,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Enum *const", + "name" : "const google::protobuf::Enum *const", +- "referenced_type" : "type-2500", +- "self_type" : "type-7953", ++ "referenced_type" : "type-2430", ++ "self_type" : "type-7905", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -163341,8 +163383,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumDescriptor", + "name" : "const google::protobuf::EnumDescriptor", +- "referenced_type" : "type-1973", +- "self_type" : "type-1981", ++ "referenced_type" : "type-1899", ++ "self_type" : "type-1907", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -163351,8 +163393,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumDescriptorProto", + "name" : "const google::protobuf::EnumDescriptorProto", +- "referenced_type" : "type-1688", +- "self_type" : "type-1883", ++ "referenced_type" : "type-1602", ++ "self_type" : "type-1801", + "size" : 40, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -163361,8 +163403,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumDescriptorProto *const", + "name" : "const google::protobuf::EnumDescriptorProto *const", +- "referenced_type" : "type-1884", +- "self_type" : "type-4122", ++ "referenced_type" : "type-1802", ++ "self_type" : "type-4074", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -163370,56 +163412,56 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-12135", +- "self_type" : "type-12134", ++ "referenced_type" : "type-12087", ++ "self_type" : "type-12086", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-13203", +- "self_type" : "type-13202", ++ "referenced_type" : "type-13155", ++ "self_type" : "type-13154", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-14754", +- "self_type" : "type-14753", ++ "referenced_type" : "type-14706", ++ "self_type" : "type-14705", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-14845", +- "self_type" : "type-14844", ++ "referenced_type" : "type-14797", ++ "self_type" : "type-14796", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-15108", +- "self_type" : "type-15107", ++ "referenced_type" : "type-15060", ++ "self_type" : "type-15059", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-15207", +- "self_type" : "type-15206", ++ "referenced_type" : "type-15159", ++ "self_type" : "type-15158", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-15990", +- "self_type" : "type-15989", ++ "referenced_type" : "type-15942", ++ "self_type" : "type-15941", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -163427,8 +163469,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-1694", +- "self_type" : "type-1977", ++ "referenced_type" : "type-1608", ++ "self_type" : "type-1903", + "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -163436,360 +163478,360 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-17059", +- "self_type" : "type-17058", ++ "referenced_type" : "type-17011", ++ "self_type" : "type-17010", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-18618", +- "self_type" : "type-18617", ++ "referenced_type" : "type-18570", ++ "self_type" : "type-18569", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-18702", +- "self_type" : "type-18701", ++ "referenced_type" : "type-18654", ++ "self_type" : "type-18653", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-18892", +- "self_type" : "type-18891", ++ "referenced_type" : "type-18844", ++ "self_type" : "type-18843", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-18989", +- "self_type" : "type-18988", ++ "referenced_type" : "type-18941", ++ "self_type" : "type-18940", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-19231", +- "self_type" : "type-19230", ++ "referenced_type" : "type-19183", ++ "self_type" : "type-19182", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-19562", +- "self_type" : "type-19561", ++ "referenced_type" : "type-19514", ++ "self_type" : "type-19513", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-19733", +- "self_type" : "type-19732", ++ "referenced_type" : "type-19685", ++ "self_type" : "type-19684", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-19899", +- "self_type" : "type-19898", ++ "referenced_type" : "type-19851", ++ "self_type" : "type-19850", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-20522", +- "self_type" : "type-20521", ++ "referenced_type" : "type-20474", ++ "self_type" : "type-20473", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-21591", +- "self_type" : "type-21590", ++ "referenced_type" : "type-21543", ++ "self_type" : "type-21542", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-23147", +- "self_type" : "type-23146", ++ "referenced_type" : "type-23132", ++ "self_type" : "type-23131", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-23231", +- "self_type" : "type-23230", ++ "referenced_type" : "type-23220", ++ "self_type" : "type-23219", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-23421", +- "self_type" : "type-23420", ++ "referenced_type" : "type-23404", ++ "self_type" : "type-23403", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-23518", +- "self_type" : "type-23517", ++ "referenced_type" : "type-23496", ++ "self_type" : "type-23495", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-23752", +- "self_type" : "type-23751", ++ "referenced_type" : "type-23739", ++ "self_type" : "type-23738", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-24032", +- "self_type" : "type-24031", ++ "referenced_type" : "type-24031", ++ "self_type" : "type-24030", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-24200", +- "self_type" : "type-24199", ++ "referenced_type" : "type-24205", ++ "self_type" : "type-24204", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-24364", +- "self_type" : "type-24363", ++ "referenced_type" : "type-24345", ++ "self_type" : "type-24344", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-24505", +- "self_type" : "type-24504", ++ "referenced_type" : "type-24483", ++ "self_type" : "type-24482", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-24788", +- "self_type" : "type-24787", ++ "referenced_type" : "type-2456", ++ "self_type" : "type-2455", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-24944", +- "self_type" : "type-24943", ++ "referenced_type" : "type-24746", ++ "self_type" : "type-24745", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-25073", +- "self_type" : "type-25072", ++ "referenced_type" : "type-24912", ++ "self_type" : "type-24911", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-2526", +- "self_type" : "type-2525", ++ "referenced_type" : "type-25044", ++ "self_type" : "type-25043", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-25701", +- "self_type" : "type-25700", ++ "referenced_type" : "type-25752", ++ "self_type" : "type-25751", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-26769", +- "self_type" : "type-26768", ++ "referenced_type" : "type-26791", ++ "self_type" : "type-26790", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-28332", +- "self_type" : "type-28331", ++ "referenced_type" : "type-28331", ++ "self_type" : "type-28330", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-28416", +- "self_type" : "type-28415", ++ "referenced_type" : "type-28415", ++ "self_type" : "type-28414", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-28606", +- "self_type" : "type-28605", ++ "referenced_type" : "type-28605", ++ "self_type" : "type-28604", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-28703", +- "self_type" : "type-28702", ++ "referenced_type" : "type-28702", ++ "self_type" : "type-28701", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-28937", +- "self_type" : "type-28936", ++ "referenced_type" : "type-28936", ++ "self_type" : "type-28935", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-29217", +- "self_type" : "type-29216", ++ "referenced_type" : "type-29216", ++ "self_type" : "type-29215", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-29385", +- "self_type" : "type-29384", ++ "referenced_type" : "type-29384", ++ "self_type" : "type-29383", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-29549", +- "self_type" : "type-29548", ++ "referenced_type" : "type-29548", ++ "self_type" : "type-29547", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-29690", +- "self_type" : "type-29689", ++ "referenced_type" : "type-29689", ++ "self_type" : "type-29688", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-29967", +- "self_type" : "type-29966", ++ "referenced_type" : "type-29966", ++ "self_type" : "type-29965", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-30100", +- "self_type" : "type-30099", ++ "referenced_type" : "type-30099", ++ "self_type" : "type-30098", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-30218", +- "self_type" : "type-30217", ++ "referenced_type" : "type-30217", ++ "self_type" : "type-30216", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-30847", +- "self_type" : "type-30846", ++ "referenced_type" : "type-30846", ++ "self_type" : "type-30845", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-31916", +- "self_type" : "type-31915", ++ "referenced_type" : "type-31915", ++ "self_type" : "type-31914", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-3564", +- "self_type" : "type-3563", ++ "referenced_type" : "type-3516", ++ "self_type" : "type-3515", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-5542", +- "self_type" : "type-5541", ++ "referenced_type" : "type-5494", ++ "self_type" : "type-5493", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-6715", +- "self_type" : "type-6714", ++ "referenced_type" : "type-6667", ++ "self_type" : "type-6666", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-8801", +- "self_type" : "type-8800", ++ "referenced_type" : "type-8753", ++ "self_type" : "type-8752", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions", + "name" : "const google::protobuf::EnumOptions", +- "referenced_type" : "type-9871", +- "self_type" : "type-9870", ++ "referenced_type" : "type-9823", ++ "self_type" : "type-9822", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -163797,8 +163839,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumOptions *const", + "name" : "const google::protobuf::EnumOptions *const", +- "referenced_type" : "type-1976", +- "self_type" : "type-4136", ++ "referenced_type" : "type-1902", ++ "self_type" : "type-4088", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -163807,8 +163849,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValue", + "name" : "const google::protobuf::EnumValue", +- "referenced_type" : "type-2299", +- "self_type" : "type-2373", ++ "referenced_type" : "type-2226", ++ "self_type" : "type-2301", + "size" : 40, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -163817,8 +163859,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValue *const", + "name" : "const google::protobuf::EnumValue *const", +- "referenced_type" : "type-2374", +- "self_type" : "type-7955", ++ "referenced_type" : "type-2302", ++ "self_type" : "type-7907", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -163827,8 +163869,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueDescriptor", + "name" : "const google::protobuf::EnumValueDescriptor", +- "referenced_type" : "type-1979", +- "self_type" : "type-2009", ++ "referenced_type" : "type-1905", ++ "self_type" : "type-1935", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -163837,8 +163879,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueDescriptorProto", + "name" : "const google::protobuf::EnumValueDescriptorProto", +- "referenced_type" : "type-1690", +- "self_type" : "type-1907", ++ "referenced_type" : "type-1604", ++ "self_type" : "type-1827", + "size" : 28, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -163847,8 +163889,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueDescriptorProto *const", + "name" : "const google::protobuf::EnumValueDescriptorProto *const", +- "referenced_type" : "type-1908", +- "self_type" : "type-4124", ++ "referenced_type" : "type-1828", ++ "self_type" : "type-4076", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -163856,56 +163898,56 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-12139", +- "self_type" : "type-12138", ++ "referenced_type" : "type-12091", ++ "self_type" : "type-12090", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-13207", +- "self_type" : "type-13206", ++ "referenced_type" : "type-13159", ++ "self_type" : "type-13158", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-14758", +- "self_type" : "type-14757", ++ "referenced_type" : "type-14710", ++ "self_type" : "type-14709", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-14849", +- "self_type" : "type-14848", ++ "referenced_type" : "type-14801", ++ "self_type" : "type-14800", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-15112", +- "self_type" : "type-15111", ++ "referenced_type" : "type-15064", ++ "self_type" : "type-15063", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-15212", +- "self_type" : "type-15211", ++ "referenced_type" : "type-15164", ++ "self_type" : "type-15163", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-15994", +- "self_type" : "type-15993", ++ "referenced_type" : "type-15946", ++ "self_type" : "type-15945", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -163913,8 +163955,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-1692", +- "self_type" : "type-1983", ++ "referenced_type" : "type-1606", ++ "self_type" : "type-1909", + "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -163922,360 +163964,360 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-17063", +- "self_type" : "type-17062", ++ "referenced_type" : "type-17015", ++ "self_type" : "type-17014", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-18622", +- "self_type" : "type-18621", ++ "referenced_type" : "type-18574", ++ "self_type" : "type-18573", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-18706", +- "self_type" : "type-18705", ++ "referenced_type" : "type-18658", ++ "self_type" : "type-18657", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-18896", +- "self_type" : "type-18895", ++ "referenced_type" : "type-18848", ++ "self_type" : "type-18847", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-18994", +- "self_type" : "type-18993", ++ "referenced_type" : "type-18946", ++ "self_type" : "type-18945", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-19235", +- "self_type" : "type-19234", ++ "referenced_type" : "type-19187", ++ "self_type" : "type-19186", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-19566", +- "self_type" : "type-19565", ++ "referenced_type" : "type-19518", ++ "self_type" : "type-19517", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-19737", +- "self_type" : "type-19736", ++ "referenced_type" : "type-19689", ++ "self_type" : "type-19688", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-19903", +- "self_type" : "type-19902", ++ "referenced_type" : "type-19855", ++ "self_type" : "type-19854", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-20526", +- "self_type" : "type-20525", ++ "referenced_type" : "type-20478", ++ "self_type" : "type-20477", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-21595", +- "self_type" : "type-21594", ++ "referenced_type" : "type-21547", ++ "self_type" : "type-21546", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-23151", +- "self_type" : "type-23150", ++ "referenced_type" : "type-23136", ++ "self_type" : "type-23135", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-23235", +- "self_type" : "type-23234", ++ "referenced_type" : "type-23224", ++ "self_type" : "type-23223", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-23425", +- "self_type" : "type-23424", ++ "referenced_type" : "type-23408", ++ "self_type" : "type-23407", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-23523", +- "self_type" : "type-23522", ++ "referenced_type" : "type-23501", ++ "self_type" : "type-23500", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-23756", +- "self_type" : "type-23755", ++ "referenced_type" : "type-23743", ++ "self_type" : "type-23742", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-24036", +- "self_type" : "type-24035", ++ "referenced_type" : "type-24035", ++ "self_type" : "type-24034", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-24204", +- "self_type" : "type-24203", ++ "referenced_type" : "type-24209", ++ "self_type" : "type-24208", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-24368", +- "self_type" : "type-24367", ++ "referenced_type" : "type-24349", ++ "self_type" : "type-24348", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-24509", +- "self_type" : "type-24508", ++ "referenced_type" : "type-24487", ++ "self_type" : "type-24486", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-24792", +- "self_type" : "type-24791", ++ "referenced_type" : "type-2460", ++ "self_type" : "type-2459", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-24948", +- "self_type" : "type-24947", ++ "referenced_type" : "type-24750", ++ "self_type" : "type-24749", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-25077", +- "self_type" : "type-25076", ++ "referenced_type" : "type-24916", ++ "self_type" : "type-24915", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-2530", +- "self_type" : "type-2529", ++ "referenced_type" : "type-25048", ++ "self_type" : "type-25047", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-25705", +- "self_type" : "type-25704", ++ "referenced_type" : "type-25756", ++ "self_type" : "type-25755", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-26773", +- "self_type" : "type-26772", ++ "referenced_type" : "type-26795", ++ "self_type" : "type-26794", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-28336", +- "self_type" : "type-28335", ++ "referenced_type" : "type-28335", ++ "self_type" : "type-28334", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-28420", +- "self_type" : "type-28419", ++ "referenced_type" : "type-28419", ++ "self_type" : "type-28418", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-28610", +- "self_type" : "type-28609", ++ "referenced_type" : "type-28609", ++ "self_type" : "type-28608", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-28708", +- "self_type" : "type-28707", ++ "referenced_type" : "type-28707", ++ "self_type" : "type-28706", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-28941", +- "self_type" : "type-28940", ++ "referenced_type" : "type-28940", ++ "self_type" : "type-28939", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-29221", +- "self_type" : "type-29220", ++ "referenced_type" : "type-29220", ++ "self_type" : "type-29219", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-29389", +- "self_type" : "type-29388", ++ "referenced_type" : "type-29388", ++ "self_type" : "type-29387", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-29553", +- "self_type" : "type-29552", ++ "referenced_type" : "type-29552", ++ "self_type" : "type-29551", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-29694", +- "self_type" : "type-29693", ++ "referenced_type" : "type-29693", ++ "self_type" : "type-29692", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-29971", +- "self_type" : "type-29970", ++ "referenced_type" : "type-29970", ++ "self_type" : "type-29969", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-30104", +- "self_type" : "type-30103", ++ "referenced_type" : "type-30103", ++ "self_type" : "type-30102", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-30222", +- "self_type" : "type-30221", ++ "referenced_type" : "type-30221", ++ "self_type" : "type-30220", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-30851", +- "self_type" : "type-30850", ++ "referenced_type" : "type-30850", ++ "self_type" : "type-30849", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-31920", +- "self_type" : "type-31919", ++ "referenced_type" : "type-31919", ++ "self_type" : "type-31918", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-3568", +- "self_type" : "type-3567", ++ "referenced_type" : "type-3520", ++ "self_type" : "type-3519", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-5546", +- "self_type" : "type-5545", ++ "referenced_type" : "type-5498", ++ "self_type" : "type-5497", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-6719", +- "self_type" : "type-6718", ++ "referenced_type" : "type-6671", ++ "self_type" : "type-6670", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-8805", +- "self_type" : "type-8804", ++ "referenced_type" : "type-8757", ++ "self_type" : "type-8756", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions", + "name" : "const google::protobuf::EnumValueOptions", +- "referenced_type" : "type-9875", +- "self_type" : "type-9874", ++ "referenced_type" : "type-9827", ++ "self_type" : "type-9826", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -164283,8 +164325,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::EnumValueOptions *const", + "name" : "const google::protobuf::EnumValueOptions *const", +- "referenced_type" : "type-1982", +- "self_type" : "type-4138", ++ "referenced_type" : "type-1908", ++ "self_type" : "type-4090", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -164293,8 +164335,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Field", + "name" : "const google::protobuf::Field", +- "referenced_type" : "type-2296", +- "self_type" : "type-2364", ++ "referenced_type" : "type-2223", ++ "self_type" : "type-2292", + "size" : 68, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -164303,8 +164345,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Field *const", + "name" : "const google::protobuf::Field *const", +- "referenced_type" : "type-2365", +- "self_type" : "type-7951", ++ "referenced_type" : "type-2293", ++ "self_type" : "type-7903", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -164312,32 +164354,32 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldDescriptor", + "name" : "const google::protobuf::FieldDescriptor", +- "referenced_type" : "type-10340", +- "self_type" : "type-10339", ++ "referenced_type" : "type-10292", ++ "self_type" : "type-10291", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldDescriptor", + "name" : "const google::protobuf::FieldDescriptor", +- "referenced_type" : "type-1305", +- "self_type" : "type-1304", ++ "referenced_type" : "type-1218", ++ "self_type" : "type-1217", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldDescriptor", + "name" : "const google::protobuf::FieldDescriptor", +- "referenced_type" : "type-13631", +- "self_type" : "type-13630", ++ "referenced_type" : "type-13583", ++ "self_type" : "type-13582", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldDescriptor", + "name" : "const google::protobuf::FieldDescriptor", +- "referenced_type" : "type-17495", +- "self_type" : "type-17494", ++ "referenced_type" : "type-17447", ++ "self_type" : "type-17446", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -164345,8 +164387,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldDescriptor", + "name" : "const google::protobuf::FieldDescriptor", +- "referenced_type" : "type-1996", +- "self_type" : "type-2004", ++ "referenced_type" : "type-1922", ++ "self_type" : "type-1930", + "size" : 88, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -164354,24 +164396,24 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldDescriptor", + "name" : "const google::protobuf::FieldDescriptor", +- "referenced_type" : "type-22024", +- "self_type" : "type-22023", ++ "referenced_type" : "type-22590", ++ "self_type" : "type-22589", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldDescriptor", + "name" : "const google::protobuf::FieldDescriptor", +- "referenced_type" : "type-27209", +- "self_type" : "type-27208", ++ "referenced_type" : "type-2680", ++ "self_type" : "type-2679", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldDescriptor", + "name" : "const google::protobuf::FieldDescriptor", +- "referenced_type" : "type-2728", +- "self_type" : "type-2727", ++ "referenced_type" : "type-27208", ++ "self_type" : "type-27207", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -164386,16 +164428,16 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldDescriptor", + "name" : "const google::protobuf::FieldDescriptor", +- "referenced_type" : "type-4708", +- "self_type" : "type-4707", ++ "referenced_type" : "type-4660", ++ "self_type" : "type-4659", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldDescriptor", + "name" : "const google::protobuf::FieldDescriptor", +- "referenced_type" : "type-7315", +- "self_type" : "type-7314", ++ "referenced_type" : "type-7267", ++ "self_type" : "type-7266", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -164403,8 +164445,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldDescriptor *const", + "name" : "const google::protobuf::FieldDescriptor *const", +- "referenced_type" : "type-2003", +- "self_type" : "type-3670", ++ "referenced_type" : "type-1929", ++ "self_type" : "type-3622", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -164413,8 +164455,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldDescriptor::CppType", + "name" : "const google::protobuf::FieldDescriptor::CppType", +- "referenced_type" : "type-2033", +- "self_type" : "type-6966", ++ "referenced_type" : "type-1962", ++ "self_type" : "type-6918", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection.h" + }, +@@ -164423,8 +164465,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldDescriptor::Label", + "name" : "const google::protobuf::FieldDescriptor::Label", +- "referenced_type" : "type-1998", +- "self_type" : "type-3798", ++ "referenced_type" : "type-1924", ++ "self_type" : "type-3750", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -164433,8 +164475,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldDescriptor::Type", + "name" : "const google::protobuf::FieldDescriptor::Type", +- "referenced_type" : "type-1997", +- "self_type" : "type-2159", ++ "referenced_type" : "type-1923", ++ "self_type" : "type-2090", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -164443,8 +164485,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldDescriptorProto", + "name" : "const google::protobuf::FieldDescriptorProto", +- "referenced_type" : "type-1679", +- "self_type" : "type-1891", ++ "referenced_type" : "type-1593", ++ "self_type" : "type-1810", + "size" : 56, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -164453,8 +164495,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldDescriptorProto *const", + "name" : "const google::protobuf::FieldDescriptorProto *const", +- "referenced_type" : "type-1892", +- "self_type" : "type-4118", ++ "referenced_type" : "type-1811", ++ "self_type" : "type-4070", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -164463,8 +164505,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldDescriptorProto_Label", + "name" : "const google::protobuf::FieldDescriptorProto_Label", +- "referenced_type" : "type-2195", +- "self_type" : "type-2207", ++ "referenced_type" : "type-2126", ++ "self_type" : "type-2138", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -164473,8 +164515,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldDescriptorProto_Type", + "name" : "const google::protobuf::FieldDescriptorProto_Type", +- "referenced_type" : "type-2193", +- "self_type" : "type-2206", ++ "referenced_type" : "type-2124", ++ "self_type" : "type-2137", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -164483,8 +164525,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldMask", + "name" : "const google::protobuf::FieldMask", +- "referenced_type" : "type-6346", +- "self_type" : "type-6395", ++ "referenced_type" : "type-6298", ++ "self_type" : "type-6347", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -164493,8 +164535,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldMask *const", + "name" : "const google::protobuf::FieldMask *const", +- "referenced_type" : "type-6394", +- "self_type" : "type-6393", ++ "referenced_type" : "type-6346", ++ "self_type" : "type-6345", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -164502,56 +164544,56 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-12131", +- "self_type" : "type-12130", ++ "referenced_type" : "type-12083", ++ "self_type" : "type-12082", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-13199", +- "self_type" : "type-13198", ++ "referenced_type" : "type-13151", ++ "self_type" : "type-13150", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-14750", +- "self_type" : "type-14749", ++ "referenced_type" : "type-14702", ++ "self_type" : "type-14701", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-14841", +- "self_type" : "type-14840", ++ "referenced_type" : "type-14793", ++ "self_type" : "type-14792", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-15104", +- "self_type" : "type-15103", ++ "referenced_type" : "type-15056", ++ "self_type" : "type-15055", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-15202", +- "self_type" : "type-15201", ++ "referenced_type" : "type-15154", ++ "self_type" : "type-15153", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-15986", +- "self_type" : "type-15985", ++ "referenced_type" : "type-15938", ++ "self_type" : "type-15937", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -164559,8 +164601,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-1681", +- "self_type" : "type-2006", ++ "referenced_type" : "type-1595", ++ "self_type" : "type-1932", + "size" : 60, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -164568,360 +164610,360 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-17055", +- "self_type" : "type-17054", ++ "referenced_type" : "type-17007", ++ "self_type" : "type-17006", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-18614", +- "self_type" : "type-18613", ++ "referenced_type" : "type-18566", ++ "self_type" : "type-18565", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-18698", +- "self_type" : "type-18697", ++ "referenced_type" : "type-18650", ++ "self_type" : "type-18649", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-18888", +- "self_type" : "type-18887", ++ "referenced_type" : "type-18840", ++ "self_type" : "type-18839", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-18984", +- "self_type" : "type-18983", ++ "referenced_type" : "type-18936", ++ "self_type" : "type-18935", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-19227", +- "self_type" : "type-19226", ++ "referenced_type" : "type-19179", ++ "self_type" : "type-19178", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-19558", +- "self_type" : "type-19557", ++ "referenced_type" : "type-19510", ++ "self_type" : "type-19509", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-19729", +- "self_type" : "type-19728", ++ "referenced_type" : "type-19681", ++ "self_type" : "type-19680", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-19893", +- "self_type" : "type-19892", ++ "referenced_type" : "type-19845", ++ "self_type" : "type-19844", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-20518", +- "self_type" : "type-20517", ++ "referenced_type" : "type-20470", ++ "self_type" : "type-20469", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-21587", +- "self_type" : "type-21586", ++ "referenced_type" : "type-21539", ++ "self_type" : "type-21538", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-23143", +- "self_type" : "type-23142", ++ "referenced_type" : "type-23128", ++ "self_type" : "type-23127", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-23227", +- "self_type" : "type-23226", ++ "referenced_type" : "type-23214", ++ "self_type" : "type-23213", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-23417", +- "self_type" : "type-23416", ++ "referenced_type" : "type-23400", ++ "self_type" : "type-23399", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-23513", +- "self_type" : "type-23512", ++ "referenced_type" : "type-23491", ++ "self_type" : "type-23490", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-23748", +- "self_type" : "type-23747", ++ "referenced_type" : "type-23733", ++ "self_type" : "type-23732", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-24028", +- "self_type" : "type-24027", ++ "referenced_type" : "type-24027", ++ "self_type" : "type-24026", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-24196", +- "self_type" : "type-24195", ++ "referenced_type" : "type-24201", ++ "self_type" : "type-24200", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-24358", +- "self_type" : "type-24357", ++ "referenced_type" : "type-24341", ++ "self_type" : "type-24340", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-24500", +- "self_type" : "type-24499", ++ "referenced_type" : "type-24479", ++ "self_type" : "type-24478", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-24784", +- "self_type" : "type-24783", ++ "referenced_type" : "type-2452", ++ "self_type" : "type-2451", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-24940", +- "self_type" : "type-24939", ++ "referenced_type" : "type-24740", ++ "self_type" : "type-24739", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-25069", +- "self_type" : "type-25068", ++ "referenced_type" : "type-24908", ++ "self_type" : "type-24907", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-2522", +- "self_type" : "type-2521", ++ "referenced_type" : "type-25040", ++ "self_type" : "type-25039", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-25697", +- "self_type" : "type-25696", ++ "referenced_type" : "type-25748", ++ "self_type" : "type-25747", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-26765", +- "self_type" : "type-26764", ++ "referenced_type" : "type-26787", ++ "self_type" : "type-26786", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-28328", +- "self_type" : "type-28327", ++ "referenced_type" : "type-28327", ++ "self_type" : "type-28326", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-28412", +- "self_type" : "type-28411", ++ "referenced_type" : "type-28411", ++ "self_type" : "type-28410", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-28602", +- "self_type" : "type-28601", ++ "referenced_type" : "type-28601", ++ "self_type" : "type-28600", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-28698", +- "self_type" : "type-28697", ++ "referenced_type" : "type-28697", ++ "self_type" : "type-28696", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-28933", +- "self_type" : "type-28932", ++ "referenced_type" : "type-28932", ++ "self_type" : "type-28931", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-29213", +- "self_type" : "type-29212", ++ "referenced_type" : "type-29212", ++ "self_type" : "type-29211", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-29381", +- "self_type" : "type-29380", ++ "referenced_type" : "type-29380", ++ "self_type" : "type-29379", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-29543", +- "self_type" : "type-29542", ++ "referenced_type" : "type-29542", ++ "self_type" : "type-29541", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-29685", +- "self_type" : "type-29684", ++ "referenced_type" : "type-29684", ++ "self_type" : "type-29683", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-29963", +- "self_type" : "type-29962", ++ "referenced_type" : "type-29962", ++ "self_type" : "type-29961", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-30096", +- "self_type" : "type-30095", ++ "referenced_type" : "type-30095", ++ "self_type" : "type-30094", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-30214", +- "self_type" : "type-30213", ++ "referenced_type" : "type-30213", ++ "self_type" : "type-30212", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-30843", +- "self_type" : "type-30842", ++ "referenced_type" : "type-30842", ++ "self_type" : "type-30841", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-31912", +- "self_type" : "type-31911", ++ "referenced_type" : "type-31911", ++ "self_type" : "type-31910", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-3560", +- "self_type" : "type-3559", ++ "referenced_type" : "type-3512", ++ "self_type" : "type-3511", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-5538", +- "self_type" : "type-5537", ++ "referenced_type" : "type-5490", ++ "self_type" : "type-5489", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-6711", +- "self_type" : "type-6710", ++ "referenced_type" : "type-6663", ++ "self_type" : "type-6662", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-8797", +- "self_type" : "type-8796", ++ "referenced_type" : "type-8749", ++ "self_type" : "type-8748", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions", + "name" : "const google::protobuf::FieldOptions", +- "referenced_type" : "type-9867", +- "self_type" : "type-9866", ++ "referenced_type" : "type-9819", ++ "self_type" : "type-9818", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -164929,8 +164971,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions *const", + "name" : "const google::protobuf::FieldOptions *const", +- "referenced_type" : "type-2005", +- "self_type" : "type-4134", ++ "referenced_type" : "type-1931", ++ "self_type" : "type-4086", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -164939,8 +164981,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions_CType", + "name" : "const google::protobuf::FieldOptions_CType", +- "referenced_type" : "type-2199", +- "self_type" : "type-2209", ++ "referenced_type" : "type-2130", ++ "self_type" : "type-2140", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -164949,8 +164991,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FieldOptions_JSType", + "name" : "const google::protobuf::FieldOptions_JSType", +- "referenced_type" : "type-2201", +- "self_type" : "type-2210", ++ "referenced_type" : "type-2132", ++ "self_type" : "type-2141", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -164959,8 +165001,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Field_Cardinality", + "name" : "const google::protobuf::Field_Cardinality", +- "referenced_type" : "type-2479", +- "self_type" : "type-2485", ++ "referenced_type" : "type-2409", ++ "self_type" : "type-2415", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, +@@ -164969,8 +165011,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Field_Kind", + "name" : "const google::protobuf::Field_Kind", +- "referenced_type" : "type-2477", +- "self_type" : "type-2484", ++ "referenced_type" : "type-2407", ++ "self_type" : "type-2414", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, +@@ -164979,8 +165021,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptor", + "name" : "const google::protobuf::FileDescriptor", +- "referenced_type" : "type-1961", +- "self_type" : "type-1960", ++ "referenced_type" : "type-1886", ++ "self_type" : "type-1885", + "size" : 88, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -164989,8 +165031,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptor *const", + "name" : "const google::protobuf::FileDescriptor *const", +- "referenced_type" : "type-1959", +- "self_type" : "type-3667", ++ "referenced_type" : "type-1884", ++ "self_type" : "type-3619", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -164999,8 +165041,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorProto", + "name" : "const google::protobuf::FileDescriptorProto", +- "referenced_type" : "type-1674", +- "self_type" : "type-1875", ++ "referenced_type" : "type-1587", ++ "self_type" : "type-1793", + "size" : 140, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -165009,8 +165051,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorProto *const", + "name" : "const google::protobuf::FileDescriptorProto *const", +- "referenced_type" : "type-1876", +- "self_type" : "type-3995", ++ "referenced_type" : "type-1794", ++ "self_type" : "type-3947", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -165019,8 +165061,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorSet", + "name" : "const google::protobuf::FileDescriptorSet", +- "referenced_type" : "type-2211", +- "self_type" : "type-2215", ++ "referenced_type" : "type-2142", ++ "self_type" : "type-2146", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -165029,8 +165071,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorSet *const", + "name" : "const google::protobuf::FileDescriptorSet *const", +- "referenced_type" : "type-2217", +- "self_type" : "type-4110", ++ "referenced_type" : "type-2148", ++ "self_type" : "type-4062", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -165038,354 +165080,346 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-10024", +- "self_type" : "type-10023", ++ "referenced_type" : "type-10054", ++ "self_type" : "type-10053", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-10102", +- "self_type" : "type-10101", ++ "referenced_type" : "type-10195", ++ "self_type" : "type-10194", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-10243", +- "self_type" : "type-10242", ++ "referenced_type" : "type-10438", ++ "self_type" : "type-10437", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-10486", +- "self_type" : "type-10485", ++ "referenced_type" : "type-10516", ++ "self_type" : "type-10515", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-10564", +- "self_type" : "type-10563", ++ "referenced_type" : "type-10685", ++ "self_type" : "type-10684", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-10733", +- "self_type" : "type-10732", ++ "referenced_type" : "type-10776", ++ "self_type" : "type-10775", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-10824", +- "self_type" : "type-10823", ++ "referenced_type" : "type-10868", ++ "self_type" : "type-10867", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-10916", +- "self_type" : "type-10915", ++ "referenced_type" : "type-10955", ++ "self_type" : "type-10954", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-11003", +- "self_type" : "type-11002", ++ "referenced_type" : "type-11029", ++ "self_type" : "type-11028", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-11077", +- "self_type" : "type-11076", ++ "referenced_type" : "type-11210", ++ "self_type" : "type-11209", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-11258", +- "self_type" : "type-11257", ++ "referenced_type" : "type-11372", ++ "self_type" : "type-11371", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-11420", +- "self_type" : "type-11419", ++ "referenced_type" : "type-11754", ++ "self_type" : "type-11753", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-11802", +- "self_type" : "type-11801", ++ "referenced_type" : "type-11989", ++ "self_type" : "type-11988", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-12037", +- "self_type" : "type-12036", ++ "referenced_type" : "type-12106", ++ "self_type" : "type-12105", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { ++ "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-12154", +- "self_type" : "type-12153", ++ "referenced_type" : "type-12230", ++ "self_type" : "type-12229", ++ "size" : 92, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +- "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-12278", +- "self_type" : "type-12277", +- "size" : 92, ++ "referenced_type" : "type-12381", ++ "self_type" : "type-12380", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-12429", +- "self_type" : "type-12428", ++ "referenced_type" : "type-12492", ++ "self_type" : "type-12491", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-12540", +- "self_type" : "type-12539", ++ "referenced_type" : "type-12595", ++ "self_type" : "type-12594", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-12643", +- "self_type" : "type-12642", ++ "referenced_type" : "type-12718", ++ "self_type" : "type-12717", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-12766", +- "self_type" : "type-12765", ++ "referenced_type" : "type-12772", ++ "self_type" : "type-12771", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-12820", +- "self_type" : "type-12819", ++ "referenced_type" : "type-12837", ++ "self_type" : "type-12836", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-12885", +- "self_type" : "type-12884", ++ "referenced_type" : "type-12911", ++ "self_type" : "type-12910", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-12959", +- "self_type" : "type-12958", ++ "referenced_type" : "type-12987", ++ "self_type" : "type-12986", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-13035", +- "self_type" : "type-13034", ++ "referenced_type" : "type-13174", ++ "self_type" : "type-13173", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-13222", +- "self_type" : "type-13221", ++ "referenced_type" : "type-13309", ++ "self_type" : "type-13308", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-13357", +- "self_type" : "type-13356", ++ "referenced_type" : "type-13387", ++ "self_type" : "type-13386", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-13435", +- "self_type" : "type-13434", ++ "referenced_type" : "type-13486", ++ "self_type" : "type-13485", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-13534", +- "self_type" : "type-13533", ++ "referenced_type" : "type-13729", ++ "self_type" : "type-13728", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-13777", +- "self_type" : "type-13776", ++ "referenced_type" : "type-13807", ++ "self_type" : "type-13806", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-13855", +- "self_type" : "type-13854", +- "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" +- }, +- { +- "is_const" : true, +- "linker_set_key" : "const google::protobuf::FileDescriptorTables", +- "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-14024", +- "self_type" : "type-14023", ++ "referenced_type" : "type-13976", ++ "self_type" : "type-13975", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-14115", +- "self_type" : "type-14114", ++ "referenced_type" : "type-14067", ++ "self_type" : "type-14066", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-14207", +- "self_type" : "type-14206", ++ "referenced_type" : "type-14159", ++ "self_type" : "type-14158", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-14294", +- "self_type" : "type-14293", ++ "referenced_type" : "type-14246", ++ "self_type" : "type-14245", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-14359", +- "self_type" : "type-14358", ++ "referenced_type" : "type-14311", ++ "self_type" : "type-14310", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-14509", +- "self_type" : "type-14508", ++ "referenced_type" : "type-14461", ++ "self_type" : "type-14460", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-14639", +- "self_type" : "type-14638", ++ "referenced_type" : "type-14591", ++ "self_type" : "type-14590", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-14774", +- "self_type" : "type-14773", ++ "referenced_type" : "type-14726", ++ "self_type" : "type-14725", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-14866", +- "self_type" : "type-14865", ++ "referenced_type" : "type-14818", ++ "self_type" : "type-14817", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-15130", +- "self_type" : "type-15129", ++ "referenced_type" : "type-15082", ++ "self_type" : "type-15081", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-15229", +- "self_type" : "type-15228", ++ "referenced_type" : "type-15181", ++ "self_type" : "type-15180", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-15659", +- "self_type" : "type-15658", ++ "referenced_type" : "type-15611", ++ "self_type" : "type-15610", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-15893", +- "self_type" : "type-15892", ++ "referenced_type" : "type-15845", ++ "self_type" : "type-15844", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-16009", +- "self_type" : "type-16008", ++ "referenced_type" : "type-15961", ++ "self_type" : "type-15960", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -165393,8 +165427,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-16133", +- "self_type" : "type-16132", ++ "referenced_type" : "type-16085", ++ "self_type" : "type-16084", + "size" : 92, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -165402,272 +165436,272 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-16286", +- "self_type" : "type-16285", ++ "referenced_type" : "type-16238", ++ "self_type" : "type-16237", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-16397", +- "self_type" : "type-16396", ++ "referenced_type" : "type-16349", ++ "self_type" : "type-16348", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-16499", +- "self_type" : "type-16498", ++ "referenced_type" : "type-16451", ++ "self_type" : "type-16450", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-16622", +- "self_type" : "type-16621", ++ "referenced_type" : "type-16574", ++ "self_type" : "type-16573", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-16676", +- "self_type" : "type-16675", ++ "referenced_type" : "type-16628", ++ "self_type" : "type-16627", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-16741", +- "self_type" : "type-16740", ++ "referenced_type" : "type-16693", ++ "self_type" : "type-16692", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-16815", +- "self_type" : "type-16814", ++ "referenced_type" : "type-16767", ++ "self_type" : "type-16766", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-16891", +- "self_type" : "type-16890", ++ "referenced_type" : "type-16843", ++ "self_type" : "type-16842", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-17078", +- "self_type" : "type-17077", ++ "referenced_type" : "type-17030", ++ "self_type" : "type-17029", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-17213", +- "self_type" : "type-17212", ++ "referenced_type" : "type-17165", ++ "self_type" : "type-17164", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-17291", +- "self_type" : "type-17290", ++ "referenced_type" : "type-17243", ++ "self_type" : "type-17242", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-17398", +- "self_type" : "type-17397", ++ "referenced_type" : "type-17350", ++ "self_type" : "type-17349", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-17641", +- "self_type" : "type-17640", ++ "referenced_type" : "type-17593", ++ "self_type" : "type-17592", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-17719", +- "self_type" : "type-17718", ++ "referenced_type" : "type-17671", ++ "self_type" : "type-17670", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-17888", +- "self_type" : "type-17887", ++ "referenced_type" : "type-17840", ++ "self_type" : "type-17839", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-17979", +- "self_type" : "type-17978", ++ "referenced_type" : "type-17931", ++ "self_type" : "type-17930", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-18071", +- "self_type" : "type-18070", ++ "referenced_type" : "type-18023", ++ "self_type" : "type-18022", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-18158", +- "self_type" : "type-18157", ++ "referenced_type" : "type-18110", ++ "self_type" : "type-18109", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-18223", +- "self_type" : "type-18222", ++ "referenced_type" : "type-18175", ++ "self_type" : "type-18174", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-18373", +- "self_type" : "type-18372", ++ "referenced_type" : "type-18325", ++ "self_type" : "type-18324", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-18503", +- "self_type" : "type-18502", ++ "referenced_type" : "type-18455", ++ "self_type" : "type-18454", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-18638", +- "self_type" : "type-18637", ++ "referenced_type" : "type-18590", ++ "self_type" : "type-18589", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-18723", +- "self_type" : "type-18722", ++ "referenced_type" : "type-18675", ++ "self_type" : "type-18674", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-18914", +- "self_type" : "type-18913", ++ "referenced_type" : "type-18866", ++ "self_type" : "type-18865", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-19011", +- "self_type" : "type-19010", ++ "referenced_type" : "type-18963", ++ "self_type" : "type-18962", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-19252", +- "self_type" : "type-19251", ++ "referenced_type" : "type-19204", ++ "self_type" : "type-19203", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-19409", +- "self_type" : "type-19408", ++ "referenced_type" : "type-19361", ++ "self_type" : "type-19360", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-19583", +- "self_type" : "type-19582", ++ "referenced_type" : "type-1940", ++ "self_type" : "type-1939", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-19753", +- "self_type" : "type-19752", ++ "referenced_type" : "type-19535", ++ "self_type" : "type-19534", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-19921", +- "self_type" : "type-19920", ++ "referenced_type" : "type-19705", ++ "self_type" : "type-19704", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-2014", +- "self_type" : "type-2013", ++ "referenced_type" : "type-19873", ++ "self_type" : "type-19872", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-20192", +- "self_type" : "type-20191", ++ "referenced_type" : "type-20144", ++ "self_type" : "type-20143", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-20427", +- "self_type" : "type-20426", ++ "referenced_type" : "type-20379", ++ "self_type" : "type-20378", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-20541", +- "self_type" : "type-20540", ++ "referenced_type" : "type-20493", ++ "self_type" : "type-20492", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -165675,8 +165709,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-20664", +- "self_type" : "type-20663", ++ "referenced_type" : "type-20616", ++ "self_type" : "type-20615", + "size" : 92, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -165684,328 +165718,328 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-20817", +- "self_type" : "type-20816", ++ "referenced_type" : "type-20769", ++ "self_type" : "type-20768", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-20928", +- "self_type" : "type-20927", ++ "referenced_type" : "type-20880", ++ "self_type" : "type-20879", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-21031", +- "self_type" : "type-21030", ++ "referenced_type" : "type-20983", ++ "self_type" : "type-20982", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-21154", +- "self_type" : "type-21153", ++ "referenced_type" : "type-21106", ++ "self_type" : "type-21105", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-21208", +- "self_type" : "type-21207", ++ "referenced_type" : "type-21160", ++ "self_type" : "type-21159", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-21273", +- "self_type" : "type-21272", ++ "referenced_type" : "type-21225", ++ "self_type" : "type-21224", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-21347", +- "self_type" : "type-21346", ++ "referenced_type" : "type-21299", ++ "self_type" : "type-21298", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-21423", +- "self_type" : "type-21422", ++ "referenced_type" : "type-21375", ++ "self_type" : "type-21374", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-21610", +- "self_type" : "type-21609", ++ "referenced_type" : "type-21562", ++ "self_type" : "type-21561", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-21745", +- "self_type" : "type-21744", ++ "referenced_type" : "type-21697", ++ "self_type" : "type-21696", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-21823", +- "self_type" : "type-21822", ++ "referenced_type" : "type-21775", ++ "self_type" : "type-21774", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-21927", +- "self_type" : "type-21926", ++ "referenced_type" : "type-21922", ++ "self_type" : "type-21921", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-22170", +- "self_type" : "type-22169", ++ "referenced_type" : "type-22166", ++ "self_type" : "type-22165", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-22248", +- "self_type" : "type-22247", ++ "referenced_type" : "type-22228", ++ "self_type" : "type-22227", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-22417", +- "self_type" : "type-22416", ++ "referenced_type" : "type-22374", ++ "self_type" : "type-22373", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-22508", +- "self_type" : "type-22507", ++ "referenced_type" : "type-22430", ++ "self_type" : "type-22429", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-22600", +- "self_type" : "type-22599", ++ "referenced_type" : "type-22506", ++ "self_type" : "type-22505", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-22687", +- "self_type" : "type-22686", ++ "referenced_type" : "type-22610", ++ "self_type" : "type-22609", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-22752", +- "self_type" : "type-22751", ++ "referenced_type" : "type-22691", ++ "self_type" : "type-22690", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-22902", +- "self_type" : "type-22901", ++ "referenced_type" : "type-22865", ++ "self_type" : "type-22864", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-23032", +- "self_type" : "type-23031", ++ "referenced_type" : "type-23002", ++ "self_type" : "type-23001", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-23167", +- "self_type" : "type-23166", ++ "referenced_type" : "type-23151", ++ "self_type" : "type-23150", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-23252", +- "self_type" : "type-23251", ++ "referenced_type" : "type-23242", ++ "self_type" : "type-23241", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-23443", +- "self_type" : "type-23442", ++ "referenced_type" : "type-2330", ++ "self_type" : "type-2329", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-23540", +- "self_type" : "type-23539", ++ "referenced_type" : "type-23423", ++ "self_type" : "type-23422", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-23773", +- "self_type" : "type-23772", ++ "referenced_type" : "type-23518", ++ "self_type" : "type-23517", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-23909", +- "self_type" : "type-23908", ++ "referenced_type" : "type-23760", ++ "self_type" : "type-23759", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-2400", +- "self_type" : "type-2399", ++ "referenced_type" : "type-23913", ++ "self_type" : "type-23912", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-24053", +- "self_type" : "type-24052", ++ "referenced_type" : "type-24050", ++ "self_type" : "type-24049", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-24220", +- "self_type" : "type-24219", ++ "referenced_type" : "type-24224", ++ "self_type" : "type-24223", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-24386", +- "self_type" : "type-24385", ++ "referenced_type" : "type-24367", ++ "self_type" : "type-24366", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-24527", +- "self_type" : "type-24526", ++ "referenced_type" : "type-24504", ++ "self_type" : "type-24503", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-24683", +- "self_type" : "type-24682", ++ "referenced_type" : "type-24644", ++ "self_type" : "type-24643", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-24808", +- "self_type" : "type-24807", ++ "referenced_type" : "type-2475", ++ "self_type" : "type-2474", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-24963", +- "self_type" : "type-24962", ++ "referenced_type" : "type-24768", ++ "self_type" : "type-24767", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-25094", +- "self_type" : "type-25093", ++ "referenced_type" : "type-24931", ++ "self_type" : "type-24930", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-25196", +- "self_type" : "type-25195", ++ "referenced_type" : "type-25066", ++ "self_type" : "type-25065", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-25368", +- "self_type" : "type-25367", ++ "referenced_type" : "type-25190", ++ "self_type" : "type-25189", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-2545", +- "self_type" : "type-2544", ++ "referenced_type" : "type-25421", ++ "self_type" : "type-25420", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-25603", +- "self_type" : "type-25602", ++ "referenced_type" : "type-25654", ++ "self_type" : "type-25653", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-25720", +- "self_type" : "type-25719", ++ "referenced_type" : "type-25771", ++ "self_type" : "type-25770", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -166013,8 +166047,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-25843", +- "self_type" : "type-25842", ++ "referenced_type" : "type-25896", ++ "self_type" : "type-25895", + "size" : 92, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -166022,312 +166056,312 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-25995", +- "self_type" : "type-25994", ++ "referenced_type" : "type-26050", ++ "self_type" : "type-26049", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-26106", +- "self_type" : "type-26105", ++ "referenced_type" : "type-26150", ++ "self_type" : "type-26149", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-26209", +- "self_type" : "type-26208", ++ "referenced_type" : "type-26249", ++ "self_type" : "type-26248", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-26332", +- "self_type" : "type-26331", ++ "referenced_type" : "type-26374", ++ "self_type" : "type-26373", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-26386", +- "self_type" : "type-26385", ++ "referenced_type" : "type-26428", ++ "self_type" : "type-26427", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-26451", +- "self_type" : "type-26450", ++ "referenced_type" : "type-26489", ++ "self_type" : "type-26488", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-26525", +- "self_type" : "type-26524", ++ "referenced_type" : "type-26552", ++ "self_type" : "type-26551", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-26601", +- "self_type" : "type-26600", ++ "referenced_type" : "type-26629", ++ "self_type" : "type-26628", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-26788", +- "self_type" : "type-26787", ++ "referenced_type" : "type-26811", ++ "self_type" : "type-26810", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-26923", +- "self_type" : "type-26922", ++ "referenced_type" : "type-26941", ++ "self_type" : "type-26940", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-27001", +- "self_type" : "type-27000", ++ "referenced_type" : "type-27030", ++ "self_type" : "type-27029", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-27112", +- "self_type" : "type-27111", ++ "referenced_type" : "type-27111", ++ "self_type" : "type-27110", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-27355", +- "self_type" : "type-27354", ++ "referenced_type" : "type-27354", ++ "self_type" : "type-27353", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-27433", +- "self_type" : "type-27432", ++ "referenced_type" : "type-27432", ++ "self_type" : "type-27431", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-27602", +- "self_type" : "type-27601", ++ "referenced_type" : "type-27601", ++ "self_type" : "type-27600", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-27693", +- "self_type" : "type-27692", ++ "referenced_type" : "type-27692", ++ "self_type" : "type-27691", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-27785", +- "self_type" : "type-27784", ++ "referenced_type" : "type-27784", ++ "self_type" : "type-27783", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-27872", +- "self_type" : "type-27871", ++ "referenced_type" : "type-27871", ++ "self_type" : "type-27870", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-27937", +- "self_type" : "type-27936", ++ "referenced_type" : "type-27936", ++ "self_type" : "type-27935", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-28087", +- "self_type" : "type-28086", ++ "referenced_type" : "type-28086", ++ "self_type" : "type-28085", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-28217", +- "self_type" : "type-28216", ++ "referenced_type" : "type-28216", ++ "self_type" : "type-28215", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-28352", +- "self_type" : "type-28351", ++ "referenced_type" : "type-28351", ++ "self_type" : "type-28350", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-28437", +- "self_type" : "type-28436", ++ "referenced_type" : "type-28436", ++ "self_type" : "type-28435", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-28628", +- "self_type" : "type-28627", ++ "referenced_type" : "type-28627", ++ "self_type" : "type-28626", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-28725", +- "self_type" : "type-28724", ++ "referenced_type" : "type-28724", ++ "self_type" : "type-28723", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-28958", +- "self_type" : "type-28957", ++ "referenced_type" : "type-28957", ++ "self_type" : "type-28956", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-29094", +- "self_type" : "type-29093", ++ "referenced_type" : "type-29093", ++ "self_type" : "type-29092", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-29238", +- "self_type" : "type-29237", ++ "referenced_type" : "type-29237", ++ "self_type" : "type-29236", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-29405", +- "self_type" : "type-29404", ++ "referenced_type" : "type-29404", ++ "self_type" : "type-29403", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-29571", +- "self_type" : "type-29570", ++ "referenced_type" : "type-29570", ++ "self_type" : "type-29569", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-29712", +- "self_type" : "type-29711", ++ "referenced_type" : "type-29711", ++ "self_type" : "type-29710", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-29864", +- "self_type" : "type-29863", ++ "referenced_type" : "type-29863", ++ "self_type" : "type-29862", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-29987", +- "self_type" : "type-29986", ++ "referenced_type" : "type-29986", ++ "self_type" : "type-29985", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-30119", +- "self_type" : "type-30118", ++ "referenced_type" : "type-30118", ++ "self_type" : "type-30117", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-30239", +- "self_type" : "type-30238", ++ "referenced_type" : "type-30238", ++ "self_type" : "type-30237", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-30340", +- "self_type" : "type-30339", ++ "referenced_type" : "type-30339", ++ "self_type" : "type-30338", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-30514", +- "self_type" : "type-30513", ++ "referenced_type" : "type-30513", ++ "self_type" : "type-30512", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-30749", +- "self_type" : "type-30748", ++ "referenced_type" : "type-30748", ++ "self_type" : "type-30747", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-30866", +- "self_type" : "type-30865", ++ "referenced_type" : "type-30865", ++ "self_type" : "type-30864", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -166335,8 +166369,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-30989", +- "self_type" : "type-30988", ++ "referenced_type" : "type-30988", ++ "self_type" : "type-30987", + "size" : 92, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -166344,112 +166378,112 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-31142", +- "self_type" : "type-31141", ++ "referenced_type" : "type-31141", ++ "self_type" : "type-31140", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-31253", +- "self_type" : "type-31252", ++ "referenced_type" : "type-31252", ++ "self_type" : "type-31251", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-31356", +- "self_type" : "type-31355", ++ "referenced_type" : "type-31355", ++ "self_type" : "type-31354", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-31479", +- "self_type" : "type-31478", ++ "referenced_type" : "type-31478", ++ "self_type" : "type-31477", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-31533", +- "self_type" : "type-31532", ++ "referenced_type" : "type-31532", ++ "self_type" : "type-31531", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-31598", +- "self_type" : "type-31597", ++ "referenced_type" : "type-31597", ++ "self_type" : "type-31596", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-31672", +- "self_type" : "type-31671", ++ "referenced_type" : "type-31671", ++ "self_type" : "type-31670", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-31748", +- "self_type" : "type-31747", ++ "referenced_type" : "type-3170", ++ "self_type" : "type-3169", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-31935", +- "self_type" : "type-31934", ++ "referenced_type" : "type-31747", ++ "self_type" : "type-31746", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-32070", +- "self_type" : "type-32069", ++ "referenced_type" : "type-31934", ++ "self_type" : "type-31933", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-32148", +- "self_type" : "type-32147", ++ "referenced_type" : "type-32069", ++ "self_type" : "type-32068", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-3218", +- "self_type" : "type-3217", ++ "referenced_type" : "type-32147", ++ "self_type" : "type-32146", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-3460", +- "self_type" : "type-3459", ++ "referenced_type" : "type-3412", ++ "self_type" : "type-3411", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-3583", +- "self_type" : "type-3582", ++ "referenced_type" : "type-3535", ++ "self_type" : "type-3534", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -166457,8 +166491,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-3738", +- "self_type" : "type-3737", ++ "referenced_type" : "type-3690", ++ "self_type" : "type-3689", + "size" : 92, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -166466,80 +166500,80 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-3932", +- "self_type" : "type-3931", ++ "referenced_type" : "type-3884", ++ "self_type" : "type-3883", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-4092", +- "self_type" : "type-4091", ++ "referenced_type" : "type-4044", ++ "self_type" : "type-4043", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-4198", +- "self_type" : "type-4197", ++ "referenced_type" : "type-4150", ++ "self_type" : "type-4149", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-4351", +- "self_type" : "type-4350", ++ "referenced_type" : "type-4303", ++ "self_type" : "type-4302", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-4407", +- "self_type" : "type-4406", ++ "referenced_type" : "type-4359", ++ "self_type" : "type-4358", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-4473", +- "self_type" : "type-4472", ++ "referenced_type" : "type-4425", ++ "self_type" : "type-4424", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-4659", +- "self_type" : "type-4658", ++ "referenced_type" : "type-4611", ++ "self_type" : "type-4610", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-5198", +- "self_type" : "type-5197", ++ "referenced_type" : "type-5150", ++ "self_type" : "type-5149", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-5440", +- "self_type" : "type-5439", ++ "referenced_type" : "type-5392", ++ "self_type" : "type-5391", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-5561", +- "self_type" : "type-5560", ++ "referenced_type" : "type-5513", ++ "self_type" : "type-5512", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -166547,8 +166581,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-5687", +- "self_type" : "type-5686", ++ "referenced_type" : "type-5639", ++ "self_type" : "type-5638", + "size" : 92, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -166556,168 +166590,168 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-5840", +- "self_type" : "type-5839", ++ "referenced_type" : "type-5792", ++ "self_type" : "type-5791", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-5951", +- "self_type" : "type-5950", ++ "referenced_type" : "type-5903", ++ "self_type" : "type-5902", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-6054", +- "self_type" : "type-6053", ++ "referenced_type" : "type-6006", ++ "self_type" : "type-6005", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-6177", +- "self_type" : "type-6176", ++ "referenced_type" : "type-6129", ++ "self_type" : "type-6128", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-6231", +- "self_type" : "type-6230", ++ "referenced_type" : "type-6183", ++ "self_type" : "type-6182", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-6296", +- "self_type" : "type-6295", ++ "referenced_type" : "type-6248", ++ "self_type" : "type-6247", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-6373", +- "self_type" : "type-6372", ++ "referenced_type" : "type-6325", ++ "self_type" : "type-6324", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-6451", +- "self_type" : "type-6450", ++ "referenced_type" : "type-6403", ++ "self_type" : "type-6402", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-6735", +- "self_type" : "type-6734", ++ "referenced_type" : "type-6687", ++ "self_type" : "type-6686", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-6936", +- "self_type" : "type-6935", ++ "referenced_type" : "type-6888", ++ "self_type" : "type-6887", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-7029", +- "self_type" : "type-7028", ++ "referenced_type" : "type-6981", ++ "self_type" : "type-6980", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-7155", +- "self_type" : "type-7154", ++ "referenced_type" : "type-7107", ++ "self_type" : "type-7106", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-7556", +- "self_type" : "type-7555", ++ "referenced_type" : "type-7508", ++ "self_type" : "type-7507", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-7646", +- "self_type" : "type-7645", ++ "referenced_type" : "type-7598", ++ "self_type" : "type-7597", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-7820", +- "self_type" : "type-7819", ++ "referenced_type" : "type-7772", ++ "self_type" : "type-7771", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-7926", +- "self_type" : "type-7925", ++ "referenced_type" : "type-7878", ++ "self_type" : "type-7877", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-8017", +- "self_type" : "type-8016", ++ "referenced_type" : "type-7969", ++ "self_type" : "type-7968", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-8104", +- "self_type" : "type-8103", ++ "referenced_type" : "type-8056", ++ "self_type" : "type-8055", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-8473", +- "self_type" : "type-8472", ++ "referenced_type" : "type-8425", ++ "self_type" : "type-8424", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-8705", +- "self_type" : "type-8704", ++ "referenced_type" : "type-8657", ++ "self_type" : "type-8656", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-8820", +- "self_type" : "type-8819", ++ "referenced_type" : "type-8772", ++ "self_type" : "type-8771", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -166725,8 +166759,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-8944", +- "self_type" : "type-8943", ++ "referenced_type" : "type-8896", ++ "self_type" : "type-8895", + "size" : 92, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -166734,136 +166768,136 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-9097", +- "self_type" : "type-9096", ++ "referenced_type" : "type-9049", ++ "self_type" : "type-9048", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-9208", +- "self_type" : "type-9207", ++ "referenced_type" : "type-9160", ++ "self_type" : "type-9159", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-9311", +- "self_type" : "type-9310", ++ "referenced_type" : "type-9263", ++ "self_type" : "type-9262", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-9434", +- "self_type" : "type-9433", ++ "referenced_type" : "type-9386", ++ "self_type" : "type-9385", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-9488", +- "self_type" : "type-9487", ++ "referenced_type" : "type-9440", ++ "self_type" : "type-9439", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-9553", +- "self_type" : "type-9552", ++ "referenced_type" : "type-9505", ++ "self_type" : "type-9504", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-9627", +- "self_type" : "type-9626", ++ "referenced_type" : "type-9579", ++ "self_type" : "type-9578", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-9703", +- "self_type" : "type-9702", ++ "referenced_type" : "type-9655", ++ "self_type" : "type-9654", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileDescriptorTables", + "name" : "const google::protobuf::FileDescriptorTables", +- "referenced_type" : "type-9890", +- "self_type" : "type-9889", ++ "referenced_type" : "type-9842", ++ "self_type" : "type-9841", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, +- "linker_set_key" : "const google::protobuf::FileOptions", +- "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-12151", +- "self_type" : "type-12150", ++ "linker_set_key" : "const google::protobuf::FileDescriptorTables", ++ "name" : "const google::protobuf::FileDescriptorTables", ++ "referenced_type" : "type-9976", ++ "self_type" : "type-9975", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-13219", +- "self_type" : "type-13218", ++ "referenced_type" : "type-12103", ++ "self_type" : "type-12102", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-14771", +- "self_type" : "type-14770", ++ "referenced_type" : "type-13171", ++ "self_type" : "type-13170", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-14863", +- "self_type" : "type-14862", ++ "referenced_type" : "type-14723", ++ "self_type" : "type-14722", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-15127", +- "self_type" : "type-15126", ++ "referenced_type" : "type-14815", ++ "self_type" : "type-14814", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-15226", +- "self_type" : "type-15225", ++ "referenced_type" : "type-15079", ++ "self_type" : "type-15078", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-16006", +- "self_type" : "type-16005", ++ "referenced_type" : "type-15178", ++ "self_type" : "type-15177", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-17075", +- "self_type" : "type-17074", ++ "referenced_type" : "type-15958", ++ "self_type" : "type-15957", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -166871,8 +166905,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-1712", +- "self_type" : "type-2011", ++ "referenced_type" : "type-1626", ++ "self_type" : "type-1937", + "size" : 80, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -166880,352 +166914,360 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-18635", +- "self_type" : "type-18634", ++ "referenced_type" : "type-17027", ++ "self_type" : "type-17026", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-18720", +- "self_type" : "type-18719", ++ "referenced_type" : "type-18587", ++ "self_type" : "type-18586", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-18911", +- "self_type" : "type-18910", ++ "referenced_type" : "type-18672", ++ "self_type" : "type-18671", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-19008", +- "self_type" : "type-19007", ++ "referenced_type" : "type-18863", ++ "self_type" : "type-18862", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-19249", +- "self_type" : "type-19248", ++ "referenced_type" : "type-18960", ++ "self_type" : "type-18959", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-19578", +- "self_type" : "type-19577", ++ "referenced_type" : "type-19201", ++ "self_type" : "type-19200", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-19750", +- "self_type" : "type-19749", ++ "referenced_type" : "type-19530", ++ "self_type" : "type-19529", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-19918", +- "self_type" : "type-19917", ++ "referenced_type" : "type-19702", ++ "self_type" : "type-19701", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-20538", +- "self_type" : "type-20537", ++ "referenced_type" : "type-19870", ++ "self_type" : "type-19869", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-21607", +- "self_type" : "type-21606", ++ "referenced_type" : "type-20490", ++ "self_type" : "type-20489", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-23164", +- "self_type" : "type-23163", ++ "referenced_type" : "type-21559", ++ "self_type" : "type-21558", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-23249", +- "self_type" : "type-23248", ++ "referenced_type" : "type-23148", ++ "self_type" : "type-23147", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-23440", +- "self_type" : "type-23439", ++ "referenced_type" : "type-23238", ++ "self_type" : "type-23237", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-23537", +- "self_type" : "type-23536", ++ "referenced_type" : "type-23420", ++ "self_type" : "type-23419", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-23770", +- "self_type" : "type-23769", ++ "referenced_type" : "type-23515", ++ "self_type" : "type-23514", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-24048", +- "self_type" : "type-24047", ++ "referenced_type" : "type-23757", ++ "self_type" : "type-23756", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-24217", +- "self_type" : "type-24216", ++ "referenced_type" : "type-24047", ++ "self_type" : "type-24046", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-24383", +- "self_type" : "type-24382", ++ "referenced_type" : "type-24221", ++ "self_type" : "type-24220", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-24523", +- "self_type" : "type-24522", ++ "referenced_type" : "type-24364", ++ "self_type" : "type-24363", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-24805", +- "self_type" : "type-24804", ++ "referenced_type" : "type-24501", ++ "self_type" : "type-24500", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-24960", +- "self_type" : "type-24959", ++ "referenced_type" : "type-2472", ++ "self_type" : "type-2471", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-25091", +- "self_type" : "type-25090", ++ "referenced_type" : "type-24764", ++ "self_type" : "type-24763", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-2542", +- "self_type" : "type-2541", ++ "referenced_type" : "type-24928", ++ "self_type" : "type-24927", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-25717", +- "self_type" : "type-25716", ++ "referenced_type" : "type-25062", ++ "self_type" : "type-25061", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-26785", +- "self_type" : "type-26784", ++ "referenced_type" : "type-25768", ++ "self_type" : "type-25767", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-28349", +- "self_type" : "type-28348", ++ "referenced_type" : "type-26808", ++ "self_type" : "type-26807", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-28434", +- "self_type" : "type-28433", ++ "referenced_type" : "type-28348", ++ "self_type" : "type-28347", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-28625", +- "self_type" : "type-28624", ++ "referenced_type" : "type-28433", ++ "self_type" : "type-28432", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-28722", +- "self_type" : "type-28721", ++ "referenced_type" : "type-28624", ++ "self_type" : "type-28623", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-28955", +- "self_type" : "type-28954", ++ "referenced_type" : "type-28721", ++ "self_type" : "type-28720", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-29233", +- "self_type" : "type-29232", ++ "referenced_type" : "type-28954", ++ "self_type" : "type-28953", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-29402", +- "self_type" : "type-29401", ++ "referenced_type" : "type-29232", ++ "self_type" : "type-29231", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-29568", +- "self_type" : "type-29567", ++ "referenced_type" : "type-29401", ++ "self_type" : "type-29400", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-29708", +- "self_type" : "type-29707", ++ "referenced_type" : "type-29567", ++ "self_type" : "type-29566", ++ "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" ++ }, ++ { ++ "is_const" : true, ++ "linker_set_key" : "const google::protobuf::FileOptions", ++ "name" : "const google::protobuf::FileOptions", ++ "referenced_type" : "type-29707", ++ "self_type" : "type-29706", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-29984", +- "self_type" : "type-29983", ++ "referenced_type" : "type-29983", ++ "self_type" : "type-29982", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-30116", +- "self_type" : "type-30115", ++ "referenced_type" : "type-30115", ++ "self_type" : "type-30114", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-30236", +- "self_type" : "type-30235", ++ "referenced_type" : "type-30235", ++ "self_type" : "type-30234", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-30863", +- "self_type" : "type-30862", ++ "referenced_type" : "type-30862", ++ "self_type" : "type-30861", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-31932", +- "self_type" : "type-31931", ++ "referenced_type" : "type-31931", ++ "self_type" : "type-31930", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-3580", +- "self_type" : "type-3579", ++ "referenced_type" : "type-3532", ++ "self_type" : "type-3531", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-5558", +- "self_type" : "type-5557", ++ "referenced_type" : "type-5510", ++ "self_type" : "type-5509", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-6732", +- "self_type" : "type-6731", ++ "referenced_type" : "type-6684", ++ "self_type" : "type-6683", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-8817", +- "self_type" : "type-8816", ++ "referenced_type" : "type-8769", ++ "self_type" : "type-8768", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions", + "name" : "const google::protobuf::FileOptions", +- "referenced_type" : "type-9887", +- "self_type" : "type-9886", ++ "referenced_type" : "type-9839", ++ "self_type" : "type-9838", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -167233,8 +167275,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions *const", + "name" : "const google::protobuf::FileOptions *const", +- "referenced_type" : "type-2010", +- "self_type" : "type-4130", ++ "referenced_type" : "type-1936", ++ "self_type" : "type-4082", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -167243,8 +167285,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FileOptions_OptimizeMode", + "name" : "const google::protobuf::FileOptions_OptimizeMode", +- "referenced_type" : "type-2197", +- "self_type" : "type-2208", ++ "referenced_type" : "type-2128", ++ "self_type" : "type-2139", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -167253,8 +167295,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FloatValue", + "name" : "const google::protobuf::FloatValue", +- "referenced_type" : "type-11049", +- "self_type" : "type-11102", ++ "referenced_type" : "type-11001", ++ "self_type" : "type-11054", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -167263,8 +167305,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::FloatValue *const", + "name" : "const google::protobuf::FloatValue *const", +- "referenced_type" : "type-11101", +- "self_type" : "type-11100", ++ "referenced_type" : "type-11053", ++ "self_type" : "type-11052", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -167273,8 +167315,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::GeneratedCodeInfo", + "name" : "const google::protobuf::GeneratedCodeInfo", +- "referenced_type" : "type-2261", +- "self_type" : "type-2265", ++ "referenced_type" : "type-2190", ++ "self_type" : "type-2194", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h" + }, +@@ -167283,8 +167325,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::GeneratedCodeInfo *const", + "name" : "const google::protobuf::GeneratedCodeInfo *const", +- "referenced_type" : "type-2267", +- "self_type" : "type-4154", ++ "referenced_type" : "type-2196", ++ "self_type" : "type-4106", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -167293,8 +167335,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::GeneratedCodeInfo_Annotation", + "name" : "const google::protobuf::GeneratedCodeInfo_Annotation", +- "referenced_type" : "type-1735", +- "self_type" : "type-1927", ++ "referenced_type" : "type-1648", ++ "self_type" : "type-1848", + "size" : 44, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -167303,8 +167345,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::GeneratedCodeInfo_Annotation *const", + "name" : "const google::protobuf::GeneratedCodeInfo_Annotation *const", +- "referenced_type" : "type-1928", +- "self_type" : "type-4152", ++ "referenced_type" : "type-1849", ++ "self_type" : "type-4104", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -167313,8 +167355,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Int32Value", + "name" : "const google::protobuf::Int32Value", +- "referenced_type" : "type-11052", +- "self_type" : "type-11114", ++ "referenced_type" : "type-11004", ++ "self_type" : "type-11066", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -167323,8 +167365,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Int32Value *const", + "name" : "const google::protobuf::Int32Value *const", +- "referenced_type" : "type-11113", +- "self_type" : "type-11112", ++ "referenced_type" : "type-11065", ++ "self_type" : "type-11064", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -167333,8 +167375,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Int64Value", + "name" : "const google::protobuf::Int64Value", +- "referenced_type" : "type-11050", +- "self_type" : "type-11106", ++ "referenced_type" : "type-11002", ++ "self_type" : "type-11058", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -167343,8 +167385,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Int64Value *const", + "name" : "const google::protobuf::Int64Value *const", +- "referenced_type" : "type-11105", +- "self_type" : "type-11104", ++ "referenced_type" : "type-11057", ++ "self_type" : "type-11056", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -167353,8 +167395,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::ListValue", + "name" : "const google::protobuf::ListValue", +- "referenced_type" : "type-7234", +- "self_type" : "type-7283", ++ "referenced_type" : "type-7186", ++ "self_type" : "type-7235", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -167363,8 +167405,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::ListValue *const", + "name" : "const google::protobuf::ListValue *const", +- "referenced_type" : "type-7606", +- "self_type" : "type-7605", ++ "referenced_type" : "type-7558", ++ "self_type" : "type-7557", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -167373,8 +167415,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Map::InnerMap", + "name" : "const google::protobuf::Map::InnerMap", +- "referenced_type" : "type-6513", +- "self_type" : "type-6653", ++ "referenced_type" : "type-6465", ++ "self_type" : "type-6605", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -167383,8 +167425,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Map::InnerMap::KeyCompare", + "name" : "const google::protobuf::Map::InnerMap::KeyCompare", +- "referenced_type" : "type-6648", +- "self_type" : "type-6649", ++ "referenced_type" : "type-6600", ++ "self_type" : "type-6601", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -167393,8 +167435,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Map::InnerMap::Node", + "name" : "const google::protobuf::Map::InnerMap::Node", +- "referenced_type" : "type-6584", +- "self_type" : "type-6632", ++ "referenced_type" : "type-6536", ++ "self_type" : "type-6584", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -167403,8 +167445,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Map::InnerMap::iterator_base::KeyValuePair>", + "name" : "const google::protobuf::Map::InnerMap::iterator_base::KeyValuePair>", +- "referenced_type" : "type-6657", +- "self_type" : "type-6656", ++ "referenced_type" : "type-6609", ++ "self_type" : "type-6608", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -167413,8 +167455,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Map::InnerMap::iterator_base::KeyValuePair>", + "name" : "const google::protobuf::Map::InnerMap::iterator_base::KeyValuePair>", +- "referenced_type" : "type-6651", +- "self_type" : "type-6661", ++ "referenced_type" : "type-6603", ++ "self_type" : "type-6613", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -167423,8 +167465,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Map::KeyValuePair", + "name" : "const google::protobuf::Map::KeyValuePair", +- "referenced_type" : "type-6515", +- "self_type" : "type-6579", ++ "referenced_type" : "type-6467", ++ "self_type" : "type-6531", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -167433,8 +167475,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Map::MapAllocator::KeyValuePair>", + "name" : "const google::protobuf::Map::MapAllocator::KeyValuePair>", +- "referenced_type" : "type-6514", +- "self_type" : "type-6562", ++ "referenced_type" : "type-6466", ++ "self_type" : "type-6514", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -167443,8 +167485,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Map::MapAllocator", + "name" : "const google::protobuf::Map::MapAllocator", +- "referenced_type" : "type-6591", +- "self_type" : "type-6617", ++ "referenced_type" : "type-6543", ++ "self_type" : "type-6569", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -167453,8 +167495,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Map::MapAllocator *> >", + "name" : "const google::protobuf::Map::MapAllocator *> >", +- "referenced_type" : "type-6595", +- "self_type" : "type-6603", ++ "referenced_type" : "type-6547", ++ "self_type" : "type-6555", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -167463,8 +167505,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Map::MapAllocator *> >", + "name" : "const google::protobuf::Map::MapAllocator *> >", +- "referenced_type" : "type-6509", +- "self_type" : "type-6568", ++ "referenced_type" : "type-6461", ++ "self_type" : "type-6520", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -167473,8 +167515,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Map::const_iterator", + "name" : "const google::protobuf::Map::const_iterator", +- "referenced_type" : "type-6674", +- "self_type" : "type-6681", ++ "referenced_type" : "type-6626", ++ "self_type" : "type-6633", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -167483,8 +167525,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Map::iterator", + "name" : "const google::protobuf::Map::iterator", +- "referenced_type" : "type-6688", +- "self_type" : "type-6696", ++ "referenced_type" : "type-6640", ++ "self_type" : "type-6648", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -167493,8 +167535,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Map::iterator_base", + "name" : "const google::protobuf::Map::iterator_base", +- "referenced_type" : "type-6668", +- "self_type" : "type-6671", ++ "referenced_type" : "type-6620", ++ "self_type" : "type-6623", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -167503,8 +167545,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Map, Value>::InnerMap", + "name" : "const google::protobuf::Map, Value>::InnerMap", +- "referenced_type" : "type-7205", +- "self_type" : "type-7495", ++ "referenced_type" : "type-7157", ++ "self_type" : "type-7447", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -167513,8 +167555,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Map, Value>::InnerMap::KeyCompare", + "name" : "const google::protobuf::Map, Value>::InnerMap::KeyCompare", +- "referenced_type" : "type-7489", +- "self_type" : "type-7490", ++ "referenced_type" : "type-7441", ++ "self_type" : "type-7442", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -167523,8 +167565,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Map, Value>::InnerMap::Node", + "name" : "const google::protobuf::Map, Value>::InnerMap::Node", +- "referenced_type" : "type-7426", +- "self_type" : "type-7480", ++ "referenced_type" : "type-7378", ++ "self_type" : "type-7432", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -167533,8 +167575,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Map, Value>::InnerMap::iterator_base, Value>::KeyValuePair>", + "name" : "const google::protobuf::Map, Value>::InnerMap::iterator_base, Value>::KeyValuePair>", +- "referenced_type" : "type-7502", +- "self_type" : "type-7501", ++ "referenced_type" : "type-7454", ++ "self_type" : "type-7453", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -167543,8 +167585,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Map, Value>::InnerMap::iterator_base, Value>::KeyValuePair>", + "name" : "const google::protobuf::Map, Value>::InnerMap::iterator_base, Value>::KeyValuePair>", +- "referenced_type" : "type-7493", +- "self_type" : "type-7506", ++ "referenced_type" : "type-7445", ++ "self_type" : "type-7458", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -167553,8 +167595,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Map, Value>::KeyValuePair", + "name" : "const google::protobuf::Map, Value>::KeyValuePair", +- "referenced_type" : "type-7209", +- "self_type" : "type-7420", ++ "referenced_type" : "type-7161", ++ "self_type" : "type-7372", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -167563,8 +167605,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Map, Value>::MapAllocator, Value>::KeyValuePair>", + "name" : "const google::protobuf::Map, Value>::MapAllocator, Value>::KeyValuePair>", +- "referenced_type" : "type-7207", +- "self_type" : "type-7401", ++ "referenced_type" : "type-7159", ++ "self_type" : "type-7353", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -167573,8 +167615,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Map, Value>::MapAllocator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *> >", + "name" : "const google::protobuf::Map, Value>::MapAllocator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *> >", +- "referenced_type" : "type-7436", +- "self_type" : "type-7444", ++ "referenced_type" : "type-7388", ++ "self_type" : "type-7396", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -167583,8 +167625,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Map, Value>::MapAllocator, std::allocator > *>", + "name" : "const google::protobuf::Map, Value>::MapAllocator, std::allocator > *>", +- "referenced_type" : "type-7432", +- "self_type" : "type-7460", ++ "referenced_type" : "type-7384", ++ "self_type" : "type-7412", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -167593,8 +167635,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Map, Value>::MapAllocator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *> >", + "name" : "const google::protobuf::Map, Value>::MapAllocator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *> >", +- "referenced_type" : "type-7242", +- "self_type" : "type-7406", ++ "referenced_type" : "type-7194", ++ "self_type" : "type-7358", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -167603,8 +167645,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Map, Value>::const_iterator", + "name" : "const google::protobuf::Map, Value>::const_iterator", +- "referenced_type" : "type-7519", +- "self_type" : "type-7526", ++ "referenced_type" : "type-7471", ++ "self_type" : "type-7478", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -167613,8 +167655,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Map, Value>::iterator", + "name" : "const google::protobuf::Map, Value>::iterator", +- "referenced_type" : "type-7533", +- "self_type" : "type-7542", ++ "referenced_type" : "type-7485", ++ "self_type" : "type-7494", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -167623,8 +167665,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Map, Value>::iterator_base", + "name" : "const google::protobuf::Map, Value>::iterator_base", +- "referenced_type" : "type-7513", +- "self_type" : "type-7516", ++ "referenced_type" : "type-7465", ++ "self_type" : "type-7468", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -167633,8 +167675,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Map", + "name" : "const google::protobuf::Map", +- "referenced_type" : "type-4277", +- "self_type" : "type-6700", ++ "referenced_type" : "type-4229", ++ "self_type" : "type-6652", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -167643,8 +167685,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Map, std::allocator >, google::protobuf::Value>", + "name" : "const google::protobuf::Map, std::allocator >, google::protobuf::Value>", +- "referenced_type" : "type-7201", +- "self_type" : "type-7309", ++ "referenced_type" : "type-7153", ++ "self_type" : "type-7261", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -167653,8 +167695,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapIterator", + "name" : "const google::protobuf::MapIterator", +- "referenced_type" : "type-4284", +- "self_type" : "type-4287", ++ "referenced_type" : "type-4236", ++ "self_type" : "type-4239", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, +@@ -167662,584 +167704,584 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-10107", +- "self_type" : "type-10106", ++ "referenced_type" : "type-10059", ++ "self_type" : "type-10058", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-10248", +- "self_type" : "type-10247", ++ "referenced_type" : "type-10200", ++ "self_type" : "type-10199", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-10590", +- "self_type" : "type-10589", ++ "referenced_type" : "type-10542", ++ "self_type" : "type-10541", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-10748", +- "self_type" : "type-10747", ++ "referenced_type" : "type-10700", ++ "self_type" : "type-10699", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-10836", +- "self_type" : "type-10835", ++ "referenced_type" : "type-10788", ++ "self_type" : "type-10787", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-10925", +- "self_type" : "type-10924", ++ "referenced_type" : "type-10877", ++ "self_type" : "type-10876", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-11009", +- "self_type" : "type-11008", ++ "referenced_type" : "type-10961", ++ "self_type" : "type-10960", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-11085", +- "self_type" : "type-11084", ++ "referenced_type" : "type-11037", ++ "self_type" : "type-11036", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-11278", +- "self_type" : "type-11277", ++ "referenced_type" : "type-11230", ++ "self_type" : "type-11229", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-11435", +- "self_type" : "type-11434", ++ "referenced_type" : "type-11387", ++ "self_type" : "type-11386", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-11893", +- "self_type" : "type-11892", ++ "referenced_type" : "type-11845", ++ "self_type" : "type-11844", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-12064", +- "self_type" : "type-12063", ++ "referenced_type" : "type-12016", ++ "self_type" : "type-12015", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-12168", +- "self_type" : "type-12167", ++ "referenced_type" : "type-12120", ++ "self_type" : "type-12119", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-12307", +- "self_type" : "type-12306", ++ "referenced_type" : "type-12259", ++ "self_type" : "type-12258", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-12454", +- "self_type" : "type-12453", ++ "referenced_type" : "type-12406", ++ "self_type" : "type-12405", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-12547", +- "self_type" : "type-12546", ++ "referenced_type" : "type-12499", ++ "self_type" : "type-12498", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-12648", +- "self_type" : "type-12647", ++ "referenced_type" : "type-12600", ++ "self_type" : "type-12599", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-12830", +- "self_type" : "type-12829", ++ "referenced_type" : "type-12782", ++ "self_type" : "type-12781", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-12910", +- "self_type" : "type-12909", ++ "referenced_type" : "type-12862", ++ "self_type" : "type-12861", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-12968", +- "self_type" : "type-12967", ++ "referenced_type" : "type-12920", ++ "self_type" : "type-12919", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-13440", +- "self_type" : "type-13439", ++ "referenced_type" : "type-13392", ++ "self_type" : "type-13391", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-13539", +- "self_type" : "type-13538", ++ "referenced_type" : "type-13491", ++ "self_type" : "type-13490", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-13881", +- "self_type" : "type-13880", ++ "referenced_type" : "type-13833", ++ "self_type" : "type-13832", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-14039", +- "self_type" : "type-14038", ++ "referenced_type" : "type-13991", ++ "self_type" : "type-13990", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-14127", +- "self_type" : "type-14126", ++ "referenced_type" : "type-14079", ++ "self_type" : "type-14078", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-14216", +- "self_type" : "type-14215", ++ "referenced_type" : "type-14168", ++ "self_type" : "type-14167", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-14300", +- "self_type" : "type-14299", ++ "referenced_type" : "type-14252", ++ "self_type" : "type-14251", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-14367", +- "self_type" : "type-14366", ++ "referenced_type" : "type-14319", ++ "self_type" : "type-14318", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-14529", +- "self_type" : "type-14528", ++ "referenced_type" : "type-14481", ++ "self_type" : "type-14480", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-14654", +- "self_type" : "type-14653", ++ "referenced_type" : "type-14606", ++ "self_type" : "type-14605", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-14789", +- "self_type" : "type-14788", ++ "referenced_type" : "type-14741", ++ "self_type" : "type-14740", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-14887", +- "self_type" : "type-14886", ++ "referenced_type" : "type-14839", ++ "self_type" : "type-14838", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-15247", +- "self_type" : "type-15246", ++ "referenced_type" : "type-15199", ++ "self_type" : "type-15198", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-15750", +- "self_type" : "type-15749", ++ "referenced_type" : "type-15702", ++ "self_type" : "type-15701", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-15920", +- "self_type" : "type-15919", ++ "referenced_type" : "type-15872", ++ "self_type" : "type-15871", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-16023", +- "self_type" : "type-16022", ++ "referenced_type" : "type-15975", ++ "self_type" : "type-15974", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-16162", +- "self_type" : "type-16161", ++ "referenced_type" : "type-16114", ++ "self_type" : "type-16113", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-16311", +- "self_type" : "type-16310", ++ "referenced_type" : "type-16263", ++ "self_type" : "type-16262", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-16404", +- "self_type" : "type-16403", ++ "referenced_type" : "type-16356", ++ "self_type" : "type-16355", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-16504", +- "self_type" : "type-16503", ++ "referenced_type" : "type-16456", ++ "self_type" : "type-16455", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-16686", +- "self_type" : "type-16685", ++ "referenced_type" : "type-16638", ++ "self_type" : "type-16637", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-16766", +- "self_type" : "type-16765", ++ "referenced_type" : "type-16718", ++ "self_type" : "type-16717", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-16824", +- "self_type" : "type-16823", ++ "referenced_type" : "type-16776", ++ "self_type" : "type-16775", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-17296", +- "self_type" : "type-17295", ++ "referenced_type" : "type-17248", ++ "self_type" : "type-17247", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-17403", +- "self_type" : "type-17402", ++ "referenced_type" : "type-17355", ++ "self_type" : "type-17354", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-17745", +- "self_type" : "type-17744", ++ "referenced_type" : "type-17697", ++ "self_type" : "type-17696", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-17903", +- "self_type" : "type-17902", ++ "referenced_type" : "type-17855", ++ "self_type" : "type-17854", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-17991", +- "self_type" : "type-17990", ++ "referenced_type" : "type-17943", ++ "self_type" : "type-17942", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-18080", +- "self_type" : "type-18079", ++ "referenced_type" : "type-18032", ++ "self_type" : "type-18031", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-18164", +- "self_type" : "type-18163", ++ "referenced_type" : "type-18116", ++ "self_type" : "type-18115", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-18231", +- "self_type" : "type-18230", ++ "referenced_type" : "type-18183", ++ "self_type" : "type-18182", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-18393", +- "self_type" : "type-18392", ++ "referenced_type" : "type-18345", ++ "self_type" : "type-18344", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-18518", +- "self_type" : "type-18517", ++ "referenced_type" : "type-18470", ++ "self_type" : "type-18469", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-18653", +- "self_type" : "type-18652", ++ "referenced_type" : "type-18605", ++ "self_type" : "type-18604", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-18744", +- "self_type" : "type-18743", ++ "referenced_type" : "type-18696", ++ "self_type" : "type-18695", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-19023", +- "self_type" : "type-19022", ++ "referenced_type" : "type-18975", ++ "self_type" : "type-18974", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-19266", +- "self_type" : "type-19265", ++ "referenced_type" : "type-19218", ++ "self_type" : "type-19217", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-19417", +- "self_type" : "type-19416", ++ "referenced_type" : "type-19369", ++ "self_type" : "type-19368", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-19604", +- "self_type" : "type-19603", ++ "referenced_type" : "type-19556", ++ "self_type" : "type-19555", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-19775", +- "self_type" : "type-19774", ++ "referenced_type" : "type-19727", ++ "self_type" : "type-19726", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-19934", +- "self_type" : "type-19933", ++ "referenced_type" : "type-19886", ++ "self_type" : "type-19885", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-20283", +- "self_type" : "type-20282", ++ "referenced_type" : "type-20235", ++ "self_type" : "type-20234", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-20454", +- "self_type" : "type-20453", ++ "referenced_type" : "type-20406", ++ "self_type" : "type-20405", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-20555", +- "self_type" : "type-20554", ++ "referenced_type" : "type-20507", ++ "self_type" : "type-20506", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-20693", +- "self_type" : "type-20692", ++ "referenced_type" : "type-20645", ++ "self_type" : "type-20644", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-20842", +- "self_type" : "type-20841", ++ "referenced_type" : "type-2076", ++ "self_type" : "type-2075", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-20935", +- "self_type" : "type-20934", ++ "referenced_type" : "type-20794", ++ "self_type" : "type-20793", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-21036", +- "self_type" : "type-21035", ++ "referenced_type" : "type-20887", ++ "self_type" : "type-20886", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-21218", +- "self_type" : "type-21217", ++ "referenced_type" : "type-20988", ++ "self_type" : "type-20987", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-21298", +- "self_type" : "type-21297", ++ "referenced_type" : "type-21170", ++ "self_type" : "type-21169", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-21356", +- "self_type" : "type-21355", ++ "referenced_type" : "type-21250", ++ "self_type" : "type-21249", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-2145", +- "self_type" : "type-2144", ++ "referenced_type" : "type-21308", ++ "self_type" : "type-21307", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-21828", +- "self_type" : "type-21827", ++ "referenced_type" : "type-21780", ++ "self_type" : "type-21779", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { +@@ -168254,608 +168296,608 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-22274", +- "self_type" : "type-22273", ++ "referenced_type" : "type-22247", ++ "self_type" : "type-22246", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-22432", +- "self_type" : "type-22431", ++ "referenced_type" : "type-22379", ++ "self_type" : "type-22378", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-22520", +- "self_type" : "type-22519", ++ "referenced_type" : "type-22437", ++ "self_type" : "type-22436", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-22609", +- "self_type" : "type-22608", ++ "referenced_type" : "type-22518", ++ "self_type" : "type-22517", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-22693", +- "self_type" : "type-22692", ++ "referenced_type" : "type-22617", ++ "self_type" : "type-22616", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-22760", +- "self_type" : "type-22759", ++ "referenced_type" : "type-22703", ++ "self_type" : "type-22702", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-22922", +- "self_type" : "type-22921", ++ "referenced_type" : "type-22886", ++ "self_type" : "type-22885", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-23047", +- "self_type" : "type-23046", ++ "referenced_type" : "type-23029", ++ "self_type" : "type-23028", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-23182", +- "self_type" : "type-23181", ++ "referenced_type" : "type-23167", ++ "self_type" : "type-23166", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-23273", +- "self_type" : "type-23272", ++ "referenced_type" : "type-23265", ++ "self_type" : "type-23264", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-23552", +- "self_type" : "type-23551", ++ "referenced_type" : "type-23532", ++ "self_type" : "type-23531", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-23787", +- "self_type" : "type-23786", ++ "referenced_type" : "type-2364", ++ "self_type" : "type-2363", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-23917", +- "self_type" : "type-23916", ++ "referenced_type" : "type-23774", ++ "self_type" : "type-23773", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-24074", +- "self_type" : "type-24073", ++ "referenced_type" : "type-23918", ++ "self_type" : "type-23917", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-24242", +- "self_type" : "type-24241", ++ "referenced_type" : "type-24072", ++ "self_type" : "type-24071", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-2434", +- "self_type" : "type-2433", ++ "referenced_type" : "type-24246", ++ "self_type" : "type-24245", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-24397", +- "self_type" : "type-24396", ++ "referenced_type" : "type-24378", ++ "self_type" : "type-24377", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-24552", +- "self_type" : "type-24551", ++ "referenced_type" : "type-24522", ++ "self_type" : "type-24521", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-24688", +- "self_type" : "type-24687", ++ "referenced_type" : "type-24650", ++ "self_type" : "type-24649", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-24819", +- "self_type" : "type-24818", ++ "referenced_type" : "type-24779", ++ "self_type" : "type-24778", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-24978", +- "self_type" : "type-24977", ++ "referenced_type" : "type-2489", ++ "self_type" : "type-2488", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-25105", +- "self_type" : "type-25104", ++ "referenced_type" : "type-24945", ++ "self_type" : "type-24944", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-25203", +- "self_type" : "type-25202", ++ "referenced_type" : "type-25078", ++ "self_type" : "type-25077", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-25459", +- "self_type" : "type-25458", ++ "referenced_type" : "type-25203", ++ "self_type" : "type-25202", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-2557", +- "self_type" : "type-2556", ++ "referenced_type" : "type-25510", ++ "self_type" : "type-25509", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-25630", +- "self_type" : "type-25629", ++ "referenced_type" : "type-25681", ++ "self_type" : "type-25680", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-25734", +- "self_type" : "type-25733", ++ "referenced_type" : "type-25783", ++ "self_type" : "type-25782", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-25872", +- "self_type" : "type-25871", ++ "referenced_type" : "type-25923", ++ "self_type" : "type-25922", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-26020", +- "self_type" : "type-26019", ++ "referenced_type" : "type-26073", ++ "self_type" : "type-26072", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-26113", +- "self_type" : "type-26112", ++ "referenced_type" : "type-26158", ++ "self_type" : "type-26157", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-26214", +- "self_type" : "type-26213", ++ "referenced_type" : "type-26256", ++ "self_type" : "type-26255", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-26396", +- "self_type" : "type-26395", ++ "referenced_type" : "type-26438", ++ "self_type" : "type-26437", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-26476", +- "self_type" : "type-26475", ++ "referenced_type" : "type-26512", ++ "self_type" : "type-26511", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-26534", +- "self_type" : "type-26533", ++ "referenced_type" : "type-26559", ++ "self_type" : "type-26558", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-27006", +- "self_type" : "type-27005", ++ "referenced_type" : "type-27036", ++ "self_type" : "type-27035", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-27117", +- "self_type" : "type-27116", ++ "referenced_type" : "type-27116", ++ "self_type" : "type-27115", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-27459", +- "self_type" : "type-27458", ++ "referenced_type" : "type-27458", ++ "self_type" : "type-27457", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-27617", +- "self_type" : "type-27616", ++ "referenced_type" : "type-27616", ++ "self_type" : "type-27615", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-27705", +- "self_type" : "type-27704", ++ "referenced_type" : "type-27704", ++ "self_type" : "type-27703", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-27794", +- "self_type" : "type-27793", ++ "referenced_type" : "type-27793", ++ "self_type" : "type-27792", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-27878", +- "self_type" : "type-27877", ++ "referenced_type" : "type-27877", ++ "self_type" : "type-27876", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-27945", +- "self_type" : "type-27944", ++ "referenced_type" : "type-27944", ++ "self_type" : "type-27943", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-28107", +- "self_type" : "type-28106", ++ "referenced_type" : "type-28106", ++ "self_type" : "type-28105", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-28232", +- "self_type" : "type-28231", ++ "referenced_type" : "type-28231", ++ "self_type" : "type-28230", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-28367", +- "self_type" : "type-28366", ++ "referenced_type" : "type-28366", ++ "self_type" : "type-28365", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-28458", +- "self_type" : "type-28457", ++ "referenced_type" : "type-28457", ++ "self_type" : "type-28456", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-28737", +- "self_type" : "type-28736", ++ "referenced_type" : "type-28736", ++ "self_type" : "type-28735", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-28972", +- "self_type" : "type-28971", ++ "referenced_type" : "type-28971", ++ "self_type" : "type-28970", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-29102", +- "self_type" : "type-29101", ++ "referenced_type" : "type-29101", ++ "self_type" : "type-29100", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-29259", +- "self_type" : "type-29258", ++ "referenced_type" : "type-29258", ++ "self_type" : "type-29257", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-29427", +- "self_type" : "type-29426", ++ "referenced_type" : "type-29426", ++ "self_type" : "type-29425", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-29582", +- "self_type" : "type-29581", ++ "referenced_type" : "type-29581", ++ "self_type" : "type-29580", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-29737", +- "self_type" : "type-29736", ++ "referenced_type" : "type-29736", ++ "self_type" : "type-29735", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-29869", +- "self_type" : "type-29868", ++ "referenced_type" : "type-29868", ++ "self_type" : "type-29867", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-29998", +- "self_type" : "type-29997", ++ "referenced_type" : "type-29997", ++ "self_type" : "type-29996", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-30134", +- "self_type" : "type-30133", ++ "referenced_type" : "type-30133", ++ "self_type" : "type-30132", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-30250", +- "self_type" : "type-30249", ++ "referenced_type" : "type-30249", ++ "self_type" : "type-30248", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-30347", +- "self_type" : "type-30346", ++ "referenced_type" : "type-30346", ++ "self_type" : "type-30345", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-30605", +- "self_type" : "type-30604", ++ "referenced_type" : "type-30604", ++ "self_type" : "type-30603", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-30776", +- "self_type" : "type-30775", ++ "referenced_type" : "type-30775", ++ "self_type" : "type-30774", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-30880", +- "self_type" : "type-30879", ++ "referenced_type" : "type-30879", ++ "self_type" : "type-30878", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-31018", +- "self_type" : "type-31017", ++ "referenced_type" : "type-31017", ++ "self_type" : "type-31016", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-31167", +- "self_type" : "type-31166", ++ "referenced_type" : "type-31166", ++ "self_type" : "type-31165", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-31260", +- "self_type" : "type-31259", ++ "referenced_type" : "type-31259", ++ "self_type" : "type-31258", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-31361", +- "self_type" : "type-31360", ++ "referenced_type" : "type-31360", ++ "self_type" : "type-31359", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-31543", +- "self_type" : "type-31542", ++ "referenced_type" : "type-31542", ++ "self_type" : "type-31541", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-31623", +- "self_type" : "type-31622", ++ "referenced_type" : "type-31622", ++ "self_type" : "type-31621", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-31681", +- "self_type" : "type-31680", ++ "referenced_type" : "type-31680", ++ "self_type" : "type-31679", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-32153", +- "self_type" : "type-32152", ++ "referenced_type" : "type-32152", ++ "self_type" : "type-32151", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-3310", +- "self_type" : "type-3309", ++ "referenced_type" : "type-3262", ++ "self_type" : "type-3261", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-3487", +- "self_type" : "type-3486", ++ "referenced_type" : "type-3439", ++ "self_type" : "type-3438", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-3597", +- "self_type" : "type-3596", ++ "referenced_type" : "type-3549", ++ "self_type" : "type-3548", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-3787", +- "self_type" : "type-3786", ++ "referenced_type" : "type-3739", ++ "self_type" : "type-3738", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-3957", +- "self_type" : "type-3956", ++ "referenced_type" : "type-3909", ++ "self_type" : "type-3908", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-4099", +- "self_type" : "type-4098", ++ "referenced_type" : "type-4051", ++ "self_type" : "type-4050", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-4203", +- "self_type" : "type-4202", ++ "referenced_type" : "type-4155", ++ "self_type" : "type-4154", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { +@@ -168863,8 +168905,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-4256", +- "self_type" : "type-4359", ++ "referenced_type" : "type-4208", ++ "self_type" : "type-4311", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -168872,240 +168914,240 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-4417", +- "self_type" : "type-4416", ++ "referenced_type" : "type-4369", ++ "self_type" : "type-4368", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-4498", +- "self_type" : "type-4497", ++ "referenced_type" : "type-4450", ++ "self_type" : "type-4449", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-4664", +- "self_type" : "type-4663", ++ "referenced_type" : "type-4616", ++ "self_type" : "type-4615", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-5290", +- "self_type" : "type-5289", ++ "referenced_type" : "type-5242", ++ "self_type" : "type-5241", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-5467", +- "self_type" : "type-5466", ++ "referenced_type" : "type-5419", ++ "self_type" : "type-5418", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-5575", +- "self_type" : "type-5574", ++ "referenced_type" : "type-5527", ++ "self_type" : "type-5526", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-5716", +- "self_type" : "type-5715", ++ "referenced_type" : "type-5668", ++ "self_type" : "type-5667", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-5865", +- "self_type" : "type-5864", ++ "referenced_type" : "type-5817", ++ "self_type" : "type-5816", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-5958", +- "self_type" : "type-5957", ++ "referenced_type" : "type-5910", ++ "self_type" : "type-5909", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-6059", +- "self_type" : "type-6058", ++ "referenced_type" : "type-6011", ++ "self_type" : "type-6010", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-6241", +- "self_type" : "type-6240", ++ "referenced_type" : "type-6193", ++ "self_type" : "type-6192", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-6321", +- "self_type" : "type-6320", ++ "referenced_type" : "type-6273", ++ "self_type" : "type-6272", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-6382", +- "self_type" : "type-6381", ++ "referenced_type" : "type-6334", ++ "self_type" : "type-6333", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-7034", +- "self_type" : "type-7033", ++ "referenced_type" : "type-6986", ++ "self_type" : "type-6985", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-7160", +- "self_type" : "type-7159", ++ "referenced_type" : "type-7112", ++ "self_type" : "type-7111", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-7675", +- "self_type" : "type-7674", ++ "referenced_type" : "type-7627", ++ "self_type" : "type-7626", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-7833", +- "self_type" : "type-7832", ++ "referenced_type" : "type-7785", ++ "self_type" : "type-7784", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-7938", +- "self_type" : "type-7937", ++ "referenced_type" : "type-7890", ++ "self_type" : "type-7889", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-8026", +- "self_type" : "type-8025", ++ "referenced_type" : "type-7978", ++ "self_type" : "type-7977", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-8110", +- "self_type" : "type-8109", ++ "referenced_type" : "type-8062", ++ "self_type" : "type-8061", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-8564", +- "self_type" : "type-8563", ++ "referenced_type" : "type-8516", ++ "self_type" : "type-8515", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-8732", +- "self_type" : "type-8731", ++ "referenced_type" : "type-8684", ++ "self_type" : "type-8683", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-8834", +- "self_type" : "type-8833", ++ "referenced_type" : "type-8786", ++ "self_type" : "type-8785", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-8973", +- "self_type" : "type-8972", ++ "referenced_type" : "type-8925", ++ "self_type" : "type-8924", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-9122", +- "self_type" : "type-9121", ++ "referenced_type" : "type-9074", ++ "self_type" : "type-9073", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-9215", +- "self_type" : "type-9214", ++ "referenced_type" : "type-9167", ++ "self_type" : "type-9166", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-9316", +- "self_type" : "type-9315", ++ "referenced_type" : "type-9268", ++ "self_type" : "type-9267", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-9498", +- "self_type" : "type-9497", ++ "referenced_type" : "type-9450", ++ "self_type" : "type-9449", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-9578", +- "self_type" : "type-9577", ++ "referenced_type" : "type-9530", ++ "self_type" : "type-9529", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapKey", + "name" : "const google::protobuf::MapKey", +- "referenced_type" : "type-9636", +- "self_type" : "type-9635", ++ "referenced_type" : "type-9588", ++ "self_type" : "type-9587", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { +@@ -169113,8 +169155,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapPair", + "name" : "const google::protobuf::MapPair", +- "referenced_type" : "type-6507", +- "self_type" : "type-6684", ++ "referenced_type" : "type-6459", ++ "self_type" : "type-6636", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -169123,8 +169165,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapPair, std::allocator >, google::protobuf::Value>", + "name" : "const google::protobuf::MapPair, std::allocator >, google::protobuf::Value>", +- "referenced_type" : "type-7212", +- "self_type" : "type-7529", ++ "referenced_type" : "type-7164", ++ "self_type" : "type-7481", + "size" : 48, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -169133,8 +169175,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::MapValueRef", + "name" : "const google::protobuf::MapValueRef", +- "referenced_type" : "type-4244", +- "self_type" : "type-4243", ++ "referenced_type" : "type-4196", ++ "self_type" : "type-4195", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -169142,96 +169184,96 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-10441", +- "self_type" : "type-10440", ++ "referenced_type" : "type-10393", ++ "self_type" : "type-10392", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-11173", +- "self_type" : "type-11172", ++ "referenced_type" : "type-11125", ++ "self_type" : "type-11124", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-11536", +- "self_type" : "type-11535", ++ "referenced_type" : "type-11488", ++ "self_type" : "type-11487", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-11548", +- "self_type" : "type-11547", ++ "referenced_type" : "type-11500", ++ "self_type" : "type-11499", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-1319", +- "self_type" : "type-1318", ++ "referenced_type" : "type-1231", ++ "self_type" : "type-1230", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-13732", +- "self_type" : "type-13731", ++ "referenced_type" : "type-13684", ++ "self_type" : "type-13683", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-14437", +- "self_type" : "type-14436", ++ "referenced_type" : "type-1385", ++ "self_type" : "type-1384", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-1468", +- "self_type" : "type-1467", ++ "referenced_type" : "type-14389", ++ "self_type" : "type-14388", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-15002", +- "self_type" : "type-15001", ++ "referenced_type" : "type-1439", ++ "self_type" : "type-1438", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-15125", +- "self_type" : "type-15124", ++ "referenced_type" : "type-1451", ++ "self_type" : "type-1450", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-1521", +- "self_type" : "type-1520", ++ "referenced_type" : "type-14954", ++ "self_type" : "type-14953", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-1533", +- "self_type" : "type-1532", ++ "referenced_type" : "type-15077", ++ "self_type" : "type-15076", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -169239,8 +169281,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-1686", +- "self_type" : "type-1872", ++ "referenced_type" : "type-1600", ++ "self_type" : "type-1790", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -169248,136 +169290,136 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-17596", +- "self_type" : "type-17595", ++ "referenced_type" : "type-17548", ++ "self_type" : "type-17547", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-18301", +- "self_type" : "type-18300", ++ "referenced_type" : "type-18253", ++ "self_type" : "type-18252", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-18821", +- "self_type" : "type-18820", ++ "referenced_type" : "type-18773", ++ "self_type" : "type-18772", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-18909", +- "self_type" : "type-18908", ++ "referenced_type" : "type-18861", ++ "self_type" : "type-18860", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-22125", +- "self_type" : "type-22124", ++ "referenced_type" : "type-22644", ++ "self_type" : "type-22643", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-22830", +- "self_type" : "type-22829", ++ "referenced_type" : "type-23658", ++ "self_type" : "type-23657", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-23350", +- "self_type" : "type-23349", ++ "referenced_type" : "type-24148", ++ "self_type" : "type-24147", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-23438", +- "self_type" : "type-23437", ++ "referenced_type" : "type-24240", ++ "self_type" : "type-24239", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-27310", +- "self_type" : "type-27309", ++ "referenced_type" : "type-2693", ++ "self_type" : "type-2692", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-2741", +- "self_type" : "type-2740", ++ "referenced_type" : "type-27309", ++ "self_type" : "type-27308", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-28015", +- "self_type" : "type-28014", ++ "referenced_type" : "type-28014", ++ "self_type" : "type-28013", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-28535", +- "self_type" : "type-28534", ++ "referenced_type" : "type-2847", ++ "self_type" : "type-2846", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-28623", +- "self_type" : "type-28622", ++ "referenced_type" : "type-28534", ++ "self_type" : "type-28533", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-2895", +- "self_type" : "type-2894", ++ "referenced_type" : "type-28622", ++ "self_type" : "type-28621", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-2949", +- "self_type" : "type-2948", ++ "referenced_type" : "type-2901", ++ "self_type" : "type-2900", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-2961", +- "self_type" : "type-2960", ++ "referenced_type" : "type-2913", ++ "self_type" : "type-2912", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-4721", +- "self_type" : "type-4720", ++ "referenced_type" : "type-4673", ++ "self_type" : "type-4672", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -169392,72 +169434,72 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-4875", +- "self_type" : "type-4874", ++ "referenced_type" : "type-4827", ++ "self_type" : "type-4826", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-4929", +- "self_type" : "type-4928", ++ "referenced_type" : "type-4881", ++ "self_type" : "type-4880", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-4941", +- "self_type" : "type-4940", ++ "referenced_type" : "type-4893", ++ "self_type" : "type-4892", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-746", +- "self_type" : "type-745", ++ "referenced_type" : "type-7452", ++ "self_type" : "type-7451", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-7500", +- "self_type" : "type-7499", ++ "referenced_type" : "type-746", ++ "self_type" : "type-745", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-813", +- "self_type" : "type-812", ++ "referenced_type" : "type-8103", ++ "self_type" : "type-8102", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-8151", +- "self_type" : "type-8150", ++ "referenced_type" : "type-813", ++ "self_type" : "type-812", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-8205", +- "self_type" : "type-8204", ++ "referenced_type" : "type-8157", ++ "self_type" : "type-8156", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message", + "name" : "const google::protobuf::Message", +- "referenced_type" : "type-8217", +- "self_type" : "type-8216", ++ "referenced_type" : "type-8169", ++ "self_type" : "type-8168", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -169473,8 +169515,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Message *const", + "name" : "const google::protobuf::Message *const", +- "referenced_type" : "type-2056", +- "self_type" : "type-6489", ++ "referenced_type" : "type-1986", ++ "self_type" : "type-6441", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -169492,56 +169534,56 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-12129", +- "self_type" : "type-12128", ++ "referenced_type" : "type-12081", ++ "self_type" : "type-12080", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-13193", +- "self_type" : "type-13192", ++ "referenced_type" : "type-13145", ++ "self_type" : "type-13144", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-14745", +- "self_type" : "type-14744", ++ "referenced_type" : "type-14697", ++ "self_type" : "type-14696", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-14834", +- "self_type" : "type-14833", ++ "referenced_type" : "type-14786", ++ "self_type" : "type-14785", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-15098", +- "self_type" : "type-15097", ++ "referenced_type" : "type-15050", ++ "self_type" : "type-15049", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-15192", +- "self_type" : "type-15191", ++ "referenced_type" : "type-15144", ++ "self_type" : "type-15143", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-15984", +- "self_type" : "type-15983", ++ "referenced_type" : "type-15936", ++ "self_type" : "type-15935", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -169549,8 +169591,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-1700", +- "self_type" : "type-2018", ++ "referenced_type" : "type-1614", ++ "self_type" : "type-1944", + "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -169558,360 +169600,360 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-17049", +- "self_type" : "type-17048", ++ "referenced_type" : "type-17001", ++ "self_type" : "type-17000", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-18609", +- "self_type" : "type-18608", ++ "referenced_type" : "type-18561", ++ "self_type" : "type-18560", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-18691", +- "self_type" : "type-18690", ++ "referenced_type" : "type-18643", ++ "self_type" : "type-18642", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-18882", +- "self_type" : "type-18881", ++ "referenced_type" : "type-18834", ++ "self_type" : "type-18833", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-18976", +- "self_type" : "type-18975", ++ "referenced_type" : "type-18928", ++ "self_type" : "type-18927", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-19216", +- "self_type" : "type-19215", ++ "referenced_type" : "type-19168", ++ "self_type" : "type-19167", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-19553", +- "self_type" : "type-19552", ++ "referenced_type" : "type-19505", ++ "self_type" : "type-19504", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-19722", +- "self_type" : "type-19721", ++ "referenced_type" : "type-19674", ++ "self_type" : "type-19673", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-19884", +- "self_type" : "type-19883", ++ "referenced_type" : "type-19836", ++ "self_type" : "type-19835", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-20516", +- "self_type" : "type-20515", ++ "referenced_type" : "type-20468", ++ "self_type" : "type-20467", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-21581", +- "self_type" : "type-21580", ++ "referenced_type" : "type-21533", ++ "self_type" : "type-21532", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-23138", +- "self_type" : "type-23137", ++ "referenced_type" : "type-23123", ++ "self_type" : "type-23122", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-23220", +- "self_type" : "type-23219", ++ "referenced_type" : "type-23208", ++ "self_type" : "type-23207", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-23411", +- "self_type" : "type-23410", ++ "referenced_type" : "type-23394", ++ "self_type" : "type-23393", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-23505", +- "self_type" : "type-23504", ++ "referenced_type" : "type-23483", ++ "self_type" : "type-23482", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-23737", +- "self_type" : "type-23736", ++ "referenced_type" : "type-23725", ++ "self_type" : "type-23724", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-24023", +- "self_type" : "type-24022", ++ "referenced_type" : "type-24020", ++ "self_type" : "type-24019", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-24189", +- "self_type" : "type-24188", ++ "referenced_type" : "type-24194", ++ "self_type" : "type-24193", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-24351", +- "self_type" : "type-24350", ++ "referenced_type" : "type-24334", ++ "self_type" : "type-24333", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-24493", +- "self_type" : "type-24492", ++ "referenced_type" : "type-24472", ++ "self_type" : "type-24471", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-24779", +- "self_type" : "type-24778", ++ "referenced_type" : "type-2450", ++ "self_type" : "type-2449", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-24935", +- "self_type" : "type-24934", ++ "referenced_type" : "type-24735", ++ "self_type" : "type-24734", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-25064", +- "self_type" : "type-25063", ++ "referenced_type" : "type-24903", ++ "self_type" : "type-24902", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-2520", +- "self_type" : "type-2519", ++ "referenced_type" : "type-25035", ++ "self_type" : "type-25034", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-25695", +- "self_type" : "type-25694", ++ "referenced_type" : "type-25746", ++ "self_type" : "type-25745", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-26759", +- "self_type" : "type-26758", ++ "referenced_type" : "type-26782", ++ "self_type" : "type-26781", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-28323", +- "self_type" : "type-28322", ++ "referenced_type" : "type-28322", ++ "self_type" : "type-28321", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-28405", +- "self_type" : "type-28404", ++ "referenced_type" : "type-28404", ++ "self_type" : "type-28403", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-28596", +- "self_type" : "type-28595", ++ "referenced_type" : "type-28595", ++ "self_type" : "type-28594", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-28690", +- "self_type" : "type-28689", ++ "referenced_type" : "type-28689", ++ "self_type" : "type-28688", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-28922", +- "self_type" : "type-28921", ++ "referenced_type" : "type-28921", ++ "self_type" : "type-28920", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-29208", +- "self_type" : "type-29207", ++ "referenced_type" : "type-29207", ++ "self_type" : "type-29206", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-29374", +- "self_type" : "type-29373", ++ "referenced_type" : "type-29373", ++ "self_type" : "type-29372", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-29536", +- "self_type" : "type-29535", ++ "referenced_type" : "type-29535", ++ "self_type" : "type-29534", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-29678", +- "self_type" : "type-29677", ++ "referenced_type" : "type-29677", ++ "self_type" : "type-29676", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-29958", +- "self_type" : "type-29957", ++ "referenced_type" : "type-29957", ++ "self_type" : "type-29956", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-30091", +- "self_type" : "type-30090", ++ "referenced_type" : "type-30090", ++ "self_type" : "type-30089", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-30209", +- "self_type" : "type-30208", ++ "referenced_type" : "type-30208", ++ "self_type" : "type-30207", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-30841", +- "self_type" : "type-30840", ++ "referenced_type" : "type-30840", ++ "self_type" : "type-30839", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-31906", +- "self_type" : "type-31905", ++ "referenced_type" : "type-31905", ++ "self_type" : "type-31904", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-3558", +- "self_type" : "type-3557", ++ "referenced_type" : "type-3510", ++ "self_type" : "type-3509", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-5536", +- "self_type" : "type-5535", ++ "referenced_type" : "type-5488", ++ "self_type" : "type-5487", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-6705", +- "self_type" : "type-6704", ++ "referenced_type" : "type-6657", ++ "self_type" : "type-6656", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-8795", +- "self_type" : "type-8794", ++ "referenced_type" : "type-8747", ++ "self_type" : "type-8746", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions", + "name" : "const google::protobuf::MessageOptions", +- "referenced_type" : "type-9861", +- "self_type" : "type-9860", ++ "referenced_type" : "type-9813", ++ "self_type" : "type-9812", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -169919,8 +169961,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::MessageOptions *const", + "name" : "const google::protobuf::MessageOptions *const", +- "referenced_type" : "type-2017", +- "self_type" : "type-4132", ++ "referenced_type" : "type-1943", ++ "self_type" : "type-4084", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -169929,8 +169971,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Method", + "name" : "const google::protobuf::Method", +- "referenced_type" : "type-2284", +- "self_type" : "type-2376", ++ "referenced_type" : "type-2213", ++ "self_type" : "type-2304", + "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -169939,8 +169981,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Method *const", + "name" : "const google::protobuf::Method *const", +- "referenced_type" : "type-2377", +- "self_type" : "type-2449", ++ "referenced_type" : "type-2305", ++ "self_type" : "type-2379", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -169949,8 +169991,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodDescriptor", + "name" : "const google::protobuf::MethodDescriptor", +- "referenced_type" : "type-1989", +- "self_type" : "type-2049", ++ "referenced_type" : "type-1915", ++ "self_type" : "type-1979", + "size" : 28, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -169959,8 +170001,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodDescriptorProto", + "name" : "const google::protobuf::MethodDescriptorProto", +- "referenced_type" : "type-1706", +- "self_type" : "type-1911", ++ "referenced_type" : "type-1620", ++ "self_type" : "type-1831", + "size" : 36, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -169969,8 +170011,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodDescriptorProto *const", + "name" : "const google::protobuf::MethodDescriptorProto *const", +- "referenced_type" : "type-1912", +- "self_type" : "type-4128", ++ "referenced_type" : "type-1832", ++ "self_type" : "type-4080", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -169978,426 +170020,426 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-12147", +- "self_type" : "type-12146", ++ "referenced_type" : "type-12099", ++ "self_type" : "type-12098", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-13215", +- "self_type" : "type-13214", ++ "referenced_type" : "type-13167", ++ "self_type" : "type-13166", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-14767", +- "self_type" : "type-14766", ++ "referenced_type" : "type-14719", ++ "self_type" : "type-14718", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-14857", +- "self_type" : "type-14856", ++ "referenced_type" : "type-14809", ++ "self_type" : "type-14808", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-15120", +- "self_type" : "type-15119", ++ "referenced_type" : "type-15072", ++ "self_type" : "type-15071", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-15221", +- "self_type" : "type-15220", ++ "referenced_type" : "type-15173", ++ "self_type" : "type-15172", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-16002", +- "self_type" : "type-16001", ++ "referenced_type" : "type-15954", ++ "self_type" : "type-15953", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { ++ "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-17071", +- "self_type" : "type-17070", ++ "referenced_type" : "type-1622", ++ "self_type" : "type-1919", ++ "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +- "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-1708", +- "self_type" : "type-1993", +- "size" : 52, ++ "referenced_type" : "type-17023", ++ "self_type" : "type-17022", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-18631", +- "self_type" : "type-18630", ++ "referenced_type" : "type-18583", ++ "self_type" : "type-18582", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-18714", +- "self_type" : "type-18713", ++ "referenced_type" : "type-18666", ++ "self_type" : "type-18665", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-18904", +- "self_type" : "type-18903", ++ "referenced_type" : "type-18856", ++ "self_type" : "type-18855", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-19003", +- "self_type" : "type-19002", ++ "referenced_type" : "type-18955", ++ "self_type" : "type-18954", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-19245", +- "self_type" : "type-19244", ++ "referenced_type" : "type-19197", ++ "self_type" : "type-19196", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-19574", +- "self_type" : "type-19573", ++ "referenced_type" : "type-19526", ++ "self_type" : "type-19525", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-19746", +- "self_type" : "type-19745", ++ "referenced_type" : "type-19698", ++ "self_type" : "type-19697", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-19913", +- "self_type" : "type-19912", ++ "referenced_type" : "type-19865", ++ "self_type" : "type-19864", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-20534", +- "self_type" : "type-20533", ++ "referenced_type" : "type-20486", ++ "self_type" : "type-20485", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-21603", +- "self_type" : "type-21602", ++ "referenced_type" : "type-21555", ++ "self_type" : "type-21554", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-23160", +- "self_type" : "type-23159", ++ "referenced_type" : "type-23144", ++ "self_type" : "type-23143", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-23243", +- "self_type" : "type-23242", ++ "referenced_type" : "type-23233", ++ "self_type" : "type-23232", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-23433", +- "self_type" : "type-23432", ++ "referenced_type" : "type-23416", ++ "self_type" : "type-23415", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-23532", +- "self_type" : "type-23531", ++ "referenced_type" : "type-23510", ++ "self_type" : "type-23509", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-23766", +- "self_type" : "type-23765", ++ "referenced_type" : "type-23753", ++ "self_type" : "type-23752", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-24044", +- "self_type" : "type-24043", ++ "referenced_type" : "type-24043", ++ "self_type" : "type-24042", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-24213", +- "self_type" : "type-24212", ++ "referenced_type" : "type-24217", ++ "self_type" : "type-24216", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-24378", +- "self_type" : "type-24377", ++ "referenced_type" : "type-24359", ++ "self_type" : "type-24358", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-24519", +- "self_type" : "type-24518", ++ "referenced_type" : "type-24497", ++ "self_type" : "type-24496", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-24800", +- "self_type" : "type-24799", ++ "referenced_type" : "type-2468", ++ "self_type" : "type-2467", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-24956", +- "self_type" : "type-24955", ++ "referenced_type" : "type-24760", ++ "self_type" : "type-24759", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-25085", +- "self_type" : "type-25084", ++ "referenced_type" : "type-24924", ++ "self_type" : "type-24923", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-2538", +- "self_type" : "type-2537", ++ "referenced_type" : "type-25056", ++ "self_type" : "type-25055", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-25713", +- "self_type" : "type-25712", ++ "referenced_type" : "type-25764", ++ "self_type" : "type-25763", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-26781", +- "self_type" : "type-26780", ++ "referenced_type" : "type-26803", ++ "self_type" : "type-26802", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-28345", +- "self_type" : "type-28344", ++ "referenced_type" : "type-28344", ++ "self_type" : "type-28343", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-28428", +- "self_type" : "type-28427", ++ "referenced_type" : "type-28427", ++ "self_type" : "type-28426", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-28618", +- "self_type" : "type-28617", ++ "referenced_type" : "type-28617", ++ "self_type" : "type-28616", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-28717", +- "self_type" : "type-28716", ++ "referenced_type" : "type-28716", ++ "self_type" : "type-28715", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-28951", +- "self_type" : "type-28950", ++ "referenced_type" : "type-28950", ++ "self_type" : "type-28949", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-29229", +- "self_type" : "type-29228", ++ "referenced_type" : "type-29228", ++ "self_type" : "type-29227", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-29398", +- "self_type" : "type-29397", ++ "referenced_type" : "type-29397", ++ "self_type" : "type-29396", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-29563", +- "self_type" : "type-29562", ++ "referenced_type" : "type-29562", ++ "self_type" : "type-29561", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-29704", +- "self_type" : "type-29703", ++ "referenced_type" : "type-29703", ++ "self_type" : "type-29702", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-29979", +- "self_type" : "type-29978", ++ "referenced_type" : "type-29978", ++ "self_type" : "type-29977", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-30112", +- "self_type" : "type-30111", ++ "referenced_type" : "type-30111", ++ "self_type" : "type-30110", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-30230", +- "self_type" : "type-30229", ++ "referenced_type" : "type-30229", ++ "self_type" : "type-30228", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-30859", +- "self_type" : "type-30858", ++ "referenced_type" : "type-30858", ++ "self_type" : "type-30857", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-31928", +- "self_type" : "type-31927", ++ "referenced_type" : "type-31927", ++ "self_type" : "type-31926", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-3576", +- "self_type" : "type-3575", ++ "referenced_type" : "type-3528", ++ "self_type" : "type-3527", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-5554", +- "self_type" : "type-5553", ++ "referenced_type" : "type-5506", ++ "self_type" : "type-5505", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-6728", +- "self_type" : "type-6727", ++ "referenced_type" : "type-6680", ++ "self_type" : "type-6679", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-8813", +- "self_type" : "type-8812", ++ "referenced_type" : "type-8765", ++ "self_type" : "type-8764", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions", + "name" : "const google::protobuf::MethodOptions", +- "referenced_type" : "type-9883", +- "self_type" : "type-9882", ++ "referenced_type" : "type-9835", ++ "self_type" : "type-9834", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -170405,8 +170447,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::MethodOptions *const", + "name" : "const google::protobuf::MethodOptions *const", +- "referenced_type" : "type-1992", +- "self_type" : "type-4142", ++ "referenced_type" : "type-1918", ++ "self_type" : "type-4094", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -170415,8 +170457,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Mixin", + "name" : "const google::protobuf::Mixin", +- "referenced_type" : "type-2288", +- "self_type" : "type-2380", ++ "referenced_type" : "type-2217", ++ "self_type" : "type-2308", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -170425,8 +170467,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Mixin *const", + "name" : "const google::protobuf::Mixin *const", +- "referenced_type" : "type-2381", +- "self_type" : "type-2451", ++ "referenced_type" : "type-2309", ++ "self_type" : "type-2381", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -170435,8 +170477,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::NullValue", + "name" : "const google::protobuf::NullValue", +- "referenced_type" : "type-7325", +- "self_type" : "type-7332", ++ "referenced_type" : "type-7277", ++ "self_type" : "type-7284", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/struct.pb.h" + }, +@@ -170445,8 +170487,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::OneofDescriptor", + "name" : "const google::protobuf::OneofDescriptor", +- "referenced_type" : "type-2001", +- "self_type" : "type-2000", ++ "referenced_type" : "type-1927", ++ "self_type" : "type-1926", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -170455,8 +170497,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::OneofDescriptorProto", + "name" : "const google::protobuf::OneofDescriptorProto", +- "referenced_type" : "type-1698", +- "self_type" : "type-1899", ++ "referenced_type" : "type-1612", ++ "self_type" : "type-1818", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -170465,8 +170507,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::OneofDescriptorProto *const", + "name" : "const google::protobuf::OneofDescriptorProto *const", +- "referenced_type" : "type-1900", +- "self_type" : "type-4120", ++ "referenced_type" : "type-1819", ++ "self_type" : "type-4072", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -170475,8 +170517,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Option", + "name" : "const google::protobuf::Option", +- "referenced_type" : "type-2286", +- "self_type" : "type-2368", ++ "referenced_type" : "type-2215", ++ "self_type" : "type-2296", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -170485,8 +170527,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Option *const", + "name" : "const google::protobuf::Option *const", +- "referenced_type" : "type-2369", +- "self_type" : "type-7957", ++ "referenced_type" : "type-2297", ++ "self_type" : "type-7909", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -170495,8 +170537,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Reflection", + "name" : "const google::protobuf::Reflection", +- "referenced_type" : "type-2142", +- "self_type" : "type-2141", ++ "referenced_type" : "type-2073", ++ "self_type" : "type-2072", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -170504,560 +170546,560 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-10161", +- "self_type" : "type-10160", ++ "referenced_type" : "type-10113", ++ "self_type" : "type-10112", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-10269", +- "self_type" : "type-10268", ++ "referenced_type" : "type-10221", ++ "self_type" : "type-10220", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-10315", +- "self_type" : "type-10314", ++ "referenced_type" : "type-10267", ++ "self_type" : "type-10266", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-10672", +- "self_type" : "type-10671", ++ "referenced_type" : "type-10624", ++ "self_type" : "type-10623", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-10773", +- "self_type" : "type-10772", ++ "referenced_type" : "type-10725", ++ "self_type" : "type-10724", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-10865", +- "self_type" : "type-10864", ++ "referenced_type" : "type-10817", ++ "self_type" : "type-10816", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-10976", +- "self_type" : "type-10975", ++ "referenced_type" : "type-10928", ++ "self_type" : "type-10927", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-11028", +- "self_type" : "type-11027", ++ "referenced_type" : "type-10980", ++ "self_type" : "type-10979", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-11142", +- "self_type" : "type-11141", ++ "referenced_type" : "type-11094", ++ "self_type" : "type-11093", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-11328", +- "self_type" : "type-11327", ++ "referenced_type" : "type-11280", ++ "self_type" : "type-11279", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-11486", +- "self_type" : "type-11485", ++ "referenced_type" : "type-11438", ++ "self_type" : "type-11437", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-11918", +- "self_type" : "type-11917", ++ "referenced_type" : "type-11870", ++ "self_type" : "type-11869", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-12091", +- "self_type" : "type-12090", ++ "referenced_type" : "type-12043", ++ "self_type" : "type-12042", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-12372", +- "self_type" : "type-12371", ++ "referenced_type" : "type-12324", ++ "self_type" : "type-12323", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-12473", +- "self_type" : "type-12472", ++ "referenced_type" : "type-12425", ++ "self_type" : "type-12424", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-12613", +- "self_type" : "type-12612", ++ "referenced_type" : "type-12565", ++ "self_type" : "type-12564", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-12671", +- "self_type" : "type-12670", ++ "referenced_type" : "type-12623", ++ "self_type" : "type-12622", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-12851", +- "self_type" : "type-12850", ++ "referenced_type" : "type-12803", ++ "self_type" : "type-12802", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-12989", +- "self_type" : "type-12988", ++ "referenced_type" : "type-12941", ++ "self_type" : "type-12940", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-13494", +- "self_type" : "type-13493", ++ "referenced_type" : "type-13446", ++ "self_type" : "type-13445", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-13560", +- "self_type" : "type-13559", ++ "referenced_type" : "type-13512", ++ "self_type" : "type-13511", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-13606", +- "self_type" : "type-13605", ++ "referenced_type" : "type-13558", ++ "self_type" : "type-13557", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-13963", +- "self_type" : "type-13962", ++ "referenced_type" : "type-13915", ++ "self_type" : "type-13914", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-14064", +- "self_type" : "type-14063", ++ "referenced_type" : "type-14016", ++ "self_type" : "type-14015", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-14156", +- "self_type" : "type-14155", ++ "referenced_type" : "type-14108", ++ "self_type" : "type-14107", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-14267", +- "self_type" : "type-14266", ++ "referenced_type" : "type-14219", ++ "self_type" : "type-14218", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-14319", +- "self_type" : "type-14318", ++ "referenced_type" : "type-14271", ++ "self_type" : "type-14270", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-14406", +- "self_type" : "type-14405", ++ "referenced_type" : "type-14358", ++ "self_type" : "type-14357", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-14579", +- "self_type" : "type-14578", ++ "referenced_type" : "type-14531", ++ "self_type" : "type-14530", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-14706", +- "self_type" : "type-14705", ++ "referenced_type" : "type-14658", ++ "self_type" : "type-14657", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-14945", +- "self_type" : "type-14944", ++ "referenced_type" : "type-14897", ++ "self_type" : "type-14896", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-15149", +- "self_type" : "type-15148", ++ "referenced_type" : "type-15101", ++ "self_type" : "type-15100", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-15306", +- "self_type" : "type-15305", ++ "referenced_type" : "type-15258", ++ "self_type" : "type-15257", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-15774", +- "self_type" : "type-15773", ++ "referenced_type" : "type-15726", ++ "self_type" : "type-15725", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-15947", +- "self_type" : "type-15946", ++ "referenced_type" : "type-15899", ++ "self_type" : "type-15898", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16227", +- "self_type" : "type-16226", ++ "referenced_type" : "type-16179", ++ "self_type" : "type-16178", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16330", +- "self_type" : "type-16329", ++ "referenced_type" : "type-16282", ++ "self_type" : "type-16281", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16470", +- "self_type" : "type-16469", ++ "referenced_type" : "type-16422", ++ "self_type" : "type-16421", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16527", +- "self_type" : "type-16526", ++ "referenced_type" : "type-16479", ++ "self_type" : "type-16478", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16707", +- "self_type" : "type-16706", ++ "referenced_type" : "type-16659", ++ "self_type" : "type-16658", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16845", +- "self_type" : "type-16844", ++ "referenced_type" : "type-16797", ++ "self_type" : "type-16796", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17350", +- "self_type" : "type-17349", ++ "referenced_type" : "type-17302", ++ "self_type" : "type-17301", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17424", +- "self_type" : "type-17423", ++ "referenced_type" : "type-17376", ++ "self_type" : "type-17375", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17470", +- "self_type" : "type-17469", ++ "referenced_type" : "type-17422", ++ "self_type" : "type-17421", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17827", +- "self_type" : "type-17826", ++ "referenced_type" : "type-17779", ++ "self_type" : "type-17778", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17928", +- "self_type" : "type-17927", ++ "referenced_type" : "type-17880", ++ "self_type" : "type-17879", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18020", +- "self_type" : "type-18019", ++ "referenced_type" : "type-17972", ++ "self_type" : "type-17971", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18131", +- "self_type" : "type-18130", ++ "referenced_type" : "type-18083", ++ "self_type" : "type-18082", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18183", +- "self_type" : "type-18182", ++ "referenced_type" : "type-18135", ++ "self_type" : "type-18134", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18270", +- "self_type" : "type-18269", ++ "referenced_type" : "type-18222", ++ "self_type" : "type-18221", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18443", +- "self_type" : "type-18442", ++ "referenced_type" : "type-18395", ++ "self_type" : "type-18394", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18570", +- "self_type" : "type-18569", ++ "referenced_type" : "type-18522", ++ "self_type" : "type-18521", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18802", +- "self_type" : "type-18801", ++ "referenced_type" : "type-18754", ++ "self_type" : "type-18753", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18933", +- "self_type" : "type-18932", ++ "referenced_type" : "type-18885", ++ "self_type" : "type-18884", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19082", +- "self_type" : "type-19081", ++ "referenced_type" : "type-19034", ++ "self_type" : "type-19033", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19322", +- "self_type" : "type-19321", ++ "referenced_type" : "type-19274", ++ "self_type" : "type-19273", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19466", +- "self_type" : "type-19465", ++ "referenced_type" : "type-19418", ++ "self_type" : "type-19417", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19670", +- "self_type" : "type-19669", ++ "referenced_type" : "type-19622", ++ "self_type" : "type-19621", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19839", +- "self_type" : "type-19838", ++ "referenced_type" : "type-19791", ++ "self_type" : "type-19790", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19995", +- "self_type" : "type-19994", ++ "referenced_type" : "type-19947", ++ "self_type" : "type-19946", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-20308", +- "self_type" : "type-20307", ++ "referenced_type" : "type-20260", ++ "self_type" : "type-20259", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-20481", +- "self_type" : "type-20480", ++ "referenced_type" : "type-20433", ++ "self_type" : "type-20432", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-20758", +- "self_type" : "type-20757", ++ "referenced_type" : "type-20710", ++ "self_type" : "type-20709", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-20861", +- "self_type" : "type-20860", ++ "referenced_type" : "type-20813", ++ "self_type" : "type-20812", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-21001", +- "self_type" : "type-21000", ++ "referenced_type" : "type-20953", ++ "self_type" : "type-20952", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-21059", +- "self_type" : "type-21058", ++ "referenced_type" : "type-21011", ++ "self_type" : "type-21010", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-21239", +- "self_type" : "type-21238", ++ "referenced_type" : "type-2107", ++ "self_type" : "type-2106", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-21377", +- "self_type" : "type-21376", ++ "referenced_type" : "type-21191", ++ "self_type" : "type-21190", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-2177", +- "self_type" : "type-2176", ++ "referenced_type" : "type-21329", ++ "self_type" : "type-21328", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-21882", +- "self_type" : "type-21881", ++ "referenced_type" : "type-21834", ++ "self_type" : "type-21833", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -171072,176 +171114,176 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-21999", +- "self_type" : "type-21998", ++ "referenced_type" : "type-21997", ++ "self_type" : "type-21996", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-22356", +- "self_type" : "type-22355", ++ "referenced_type" : "type-22323", ++ "self_type" : "type-22322", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-22457", +- "self_type" : "type-22456", ++ "referenced_type" : "type-22400", ++ "self_type" : "type-22399", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-22549", +- "self_type" : "type-22548", ++ "referenced_type" : "type-22468", ++ "self_type" : "type-22467", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-22660", +- "self_type" : "type-22659", ++ "referenced_type" : "type-22572", ++ "self_type" : "type-22571", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-22712", +- "self_type" : "type-22711", ++ "referenced_type" : "type-22637", ++ "self_type" : "type-22636", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-22799", +- "self_type" : "type-22798", ++ "referenced_type" : "type-22747", ++ "self_type" : "type-22746", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-22972", +- "self_type" : "type-22971", ++ "referenced_type" : "type-22939", ++ "self_type" : "type-22938", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23099", +- "self_type" : "type-23098", ++ "referenced_type" : "type-23084", ++ "self_type" : "type-23083", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23331", +- "self_type" : "type-23330", ++ "referenced_type" : "type-23326", ++ "self_type" : "type-23325", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23462", +- "self_type" : "type-23461", ++ "referenced_type" : "type-23440", ++ "self_type" : "type-23439", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23611", +- "self_type" : "type-23610", ++ "referenced_type" : "type-23592", ++ "self_type" : "type-23591", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23843", +- "self_type" : "type-23842", ++ "referenced_type" : "type-23832", ++ "self_type" : "type-23831", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23966", +- "self_type" : "type-23965", ++ "referenced_type" : "type-23970", ++ "self_type" : "type-23969", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24140", +- "self_type" : "type-24139", ++ "referenced_type" : "type-2397", ++ "self_type" : "type-2396", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24306", +- "self_type" : "type-24305", ++ "referenced_type" : "type-24136", ++ "self_type" : "type-24135", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24458", +- "self_type" : "type-24457", ++ "referenced_type" : "type-24307", ++ "self_type" : "type-24306", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24612", +- "self_type" : "type-24611", ++ "referenced_type" : "type-24437", ++ "self_type" : "type-24436", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-2465", +- "self_type" : "type-2464", ++ "referenced_type" : "type-24579", ++ "self_type" : "type-24578", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24740", +- "self_type" : "type-24739", ++ "referenced_type" : "type-24699", ++ "self_type" : "type-24698", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24874", +- "self_type" : "type-24873", ++ "referenced_type" : "type-24835", ++ "self_type" : "type-24834", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-25160", +- "self_type" : "type-25159", ++ "referenced_type" : "type-25136", ++ "self_type" : "type-25135", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -171256,938 +171298,938 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-25484", +- "self_type" : "type-25483", ++ "referenced_type" : "type-25535", ++ "self_type" : "type-25534", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-25657", +- "self_type" : "type-25656", ++ "referenced_type" : "type-25706", ++ "self_type" : "type-25705", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-25937", +- "self_type" : "type-25936", ++ "referenced_type" : "type-25990", ++ "self_type" : "type-25989", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-26039", +- "self_type" : "type-26038", ++ "referenced_type" : "type-26092", ++ "self_type" : "type-26091", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-26179", +- "self_type" : "type-26178", ++ "referenced_type" : "type-26223", ++ "self_type" : "type-26222", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-26237", +- "self_type" : "type-26236", ++ "referenced_type" : "type-26279", ++ "self_type" : "type-26278", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-26417", +- "self_type" : "type-26416", ++ "referenced_type" : "type-26459", ++ "self_type" : "type-26458", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-26555", +- "self_type" : "type-26554", ++ "referenced_type" : "type-26582", ++ "self_type" : "type-26581", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-27060", +- "self_type" : "type-27059", ++ "referenced_type" : "type-27090", ++ "self_type" : "type-27089", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-27138", +- "self_type" : "type-27137", ++ "referenced_type" : "type-27137", ++ "self_type" : "type-27136", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-27184", +- "self_type" : "type-27183", ++ "referenced_type" : "type-27183", ++ "self_type" : "type-27182", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-27541", +- "self_type" : "type-27540", ++ "referenced_type" : "type-27540", ++ "self_type" : "type-27539", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-27642", +- "self_type" : "type-27641", ++ "referenced_type" : "type-27641", ++ "self_type" : "type-27640", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-27734", +- "self_type" : "type-27733", ++ "referenced_type" : "type-27733", ++ "self_type" : "type-27732", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-27845", +- "self_type" : "type-27844", ++ "referenced_type" : "type-27844", ++ "self_type" : "type-27843", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-27897", +- "self_type" : "type-27896", ++ "referenced_type" : "type-27896", ++ "self_type" : "type-27895", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-27984", +- "self_type" : "type-27983", ++ "referenced_type" : "type-27983", ++ "self_type" : "type-27982", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-28157", +- "self_type" : "type-28156", ++ "referenced_type" : "type-28156", ++ "self_type" : "type-28155", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-28284", +- "self_type" : "type-28283", ++ "referenced_type" : "type-28283", ++ "self_type" : "type-28282", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-28516", +- "self_type" : "type-28515", ++ "referenced_type" : "type-28515", ++ "self_type" : "type-28514", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-28647", +- "self_type" : "type-28646", ++ "referenced_type" : "type-28646", ++ "self_type" : "type-28645", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-28796", +- "self_type" : "type-28795", ++ "referenced_type" : "type-28795", ++ "self_type" : "type-28794", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29028", +- "self_type" : "type-29027", ++ "referenced_type" : "type-29027", ++ "self_type" : "type-29026", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29151", +- "self_type" : "type-29150", ++ "referenced_type" : "type-29150", ++ "self_type" : "type-29149", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29325", +- "self_type" : "type-29324", ++ "referenced_type" : "type-29324", ++ "self_type" : "type-29323", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29491", +- "self_type" : "type-29490", ++ "referenced_type" : "type-29490", ++ "self_type" : "type-29489", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29643", +- "self_type" : "type-29642", ++ "referenced_type" : "type-29642", ++ "self_type" : "type-29641", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29797", +- "self_type" : "type-29796", ++ "referenced_type" : "type-29796", ++ "self_type" : "type-29795", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29921", +- "self_type" : "type-29920", ++ "referenced_type" : "type-29920", ++ "self_type" : "type-29919", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-30053", +- "self_type" : "type-30052", ++ "referenced_type" : "type-30052", ++ "self_type" : "type-30051", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-30305", +- "self_type" : "type-30304", ++ "referenced_type" : "type-30304", ++ "self_type" : "type-30303", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-30399", +- "self_type" : "type-30398", ++ "referenced_type" : "type-30398", ++ "self_type" : "type-30397", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-30630", +- "self_type" : "type-30629", ++ "referenced_type" : "type-30629", ++ "self_type" : "type-30628", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-30803", +- "self_type" : "type-30802", ++ "referenced_type" : "type-30802", ++ "self_type" : "type-30801", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-31083", +- "self_type" : "type-31082", ++ "referenced_type" : "type-31082", ++ "self_type" : "type-31081", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-31186", +- "self_type" : "type-31185", ++ "referenced_type" : "type-31185", ++ "self_type" : "type-31184", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-31326", +- "self_type" : "type-31325", ++ "referenced_type" : "type-31325", ++ "self_type" : "type-31324", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-31384", +- "self_type" : "type-31383", ++ "referenced_type" : "type-31383", ++ "self_type" : "type-31382", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-31564", +- "self_type" : "type-31563", ++ "referenced_type" : "type-31563", ++ "self_type" : "type-31562", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-31702", +- "self_type" : "type-31701", ++ "referenced_type" : "type-31701", ++ "self_type" : "type-31700", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-32207", +- "self_type" : "type-32206", ++ "referenced_type" : "type-32206", ++ "self_type" : "type-32205", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-3335", +- "self_type" : "type-3334", ++ "referenced_type" : "type-3287", ++ "self_type" : "type-3286", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-3514", +- "self_type" : "type-3513", ++ "referenced_type" : "type-3466", ++ "self_type" : "type-3465", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-3855", +- "self_type" : "type-3854", ++ "referenced_type" : "type-3807", ++ "self_type" : "type-3806", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-3976", +- "self_type" : "type-3975", ++ "referenced_type" : "type-3928", ++ "self_type" : "type-3927", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +- "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-411", +- "self_type" : "type-540", +- "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" ++ "referenced_type" : "type-4117", ++ "self_type" : "type-4116", ++ "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { ++ "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-4165", +- "self_type" : "type-4164", +- "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" ++ "referenced_type" : "type-411", ++ "self_type" : "type-540", ++ "size" : 12, ++ "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-4228", +- "self_type" : "type-4227", ++ "referenced_type" : "type-4180", ++ "self_type" : "type-4179", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-4440", +- "self_type" : "type-4439", ++ "referenced_type" : "type-4392", ++ "self_type" : "type-4391", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-4685", +- "self_type" : "type-4684", ++ "referenced_type" : "type-4637", ++ "self_type" : "type-4636", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-5315", +- "self_type" : "type-5314", ++ "referenced_type" : "type-5267", ++ "self_type" : "type-5266", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-5494", +- "self_type" : "type-5493", ++ "referenced_type" : "type-5446", ++ "self_type" : "type-5445", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-5781", +- "self_type" : "type-5780", ++ "referenced_type" : "type-5733", ++ "self_type" : "type-5732", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-5884", +- "self_type" : "type-5883", ++ "referenced_type" : "type-5836", ++ "self_type" : "type-5835", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-6024", +- "self_type" : "type-6023", ++ "referenced_type" : "type-5976", ++ "self_type" : "type-5975", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-6082", +- "self_type" : "type-6081", ++ "referenced_type" : "type-6034", ++ "self_type" : "type-6033", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-6262", +- "self_type" : "type-6261", ++ "referenced_type" : "type-6214", ++ "self_type" : "type-6213", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-6405", +- "self_type" : "type-6404", ++ "referenced_type" : "type-6357", ++ "self_type" : "type-6356", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-7088", +- "self_type" : "type-7087", ++ "referenced_type" : "type-7040", ++ "self_type" : "type-7039", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-7181", +- "self_type" : "type-7180", ++ "referenced_type" : "type-7133", ++ "self_type" : "type-7132", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-7268", +- "self_type" : "type-7267", ++ "referenced_type" : "type-7220", ++ "self_type" : "type-7219", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-7757", +- "self_type" : "type-7756", ++ "referenced_type" : "type-7709", ++ "self_type" : "type-7708", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-7860", +- "self_type" : "type-7859", ++ "referenced_type" : "type-7812", ++ "self_type" : "type-7811", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-7967", +- "self_type" : "type-7966", ++ "referenced_type" : "type-7919", ++ "self_type" : "type-7918", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-8077", +- "self_type" : "type-8076", ++ "referenced_type" : "type-8029", ++ "self_type" : "type-8028", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-8129", +- "self_type" : "type-8128", ++ "referenced_type" : "type-8081", ++ "self_type" : "type-8080", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-8589", +- "self_type" : "type-8588", ++ "referenced_type" : "type-8541", ++ "self_type" : "type-8540", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-8759", +- "self_type" : "type-8758", ++ "referenced_type" : "type-8711", ++ "self_type" : "type-8710", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-9038", +- "self_type" : "type-9037", ++ "referenced_type" : "type-8990", ++ "self_type" : "type-8989", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-9141", +- "self_type" : "type-9140", ++ "referenced_type" : "type-9093", ++ "self_type" : "type-9092", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-9281", +- "self_type" : "type-9280", ++ "referenced_type" : "type-9233", ++ "self_type" : "type-9232", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-9339", +- "self_type" : "type-9338", ++ "referenced_type" : "type-9291", ++ "self_type" : "type-9290", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-9519", +- "self_type" : "type-9518", ++ "referenced_type" : "type-9471", ++ "self_type" : "type-9470", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-9657", +- "self_type" : "type-9656", ++ "referenced_type" : "type-9609", ++ "self_type" : "type-9608", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-10157", +- "self_type" : "type-10156", ++ "referenced_type" : "type-10109", ++ "self_type" : "type-10108", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-10667", +- "self_type" : "type-10666", ++ "referenced_type" : "type-10619", ++ "self_type" : "type-10618", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-10972", +- "self_type" : "type-10971", ++ "referenced_type" : "type-10924", ++ "self_type" : "type-10923", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-11323", +- "self_type" : "type-11322", ++ "referenced_type" : "type-11275", ++ "self_type" : "type-11274", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-11482", +- "self_type" : "type-11481", ++ "referenced_type" : "type-11434", ++ "self_type" : "type-11433", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-12368", +- "self_type" : "type-12367", ++ "referenced_type" : "type-12320", ++ "self_type" : "type-12319", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-13490", +- "self_type" : "type-13489", ++ "referenced_type" : "type-13442", ++ "self_type" : "type-13441", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-13958", +- "self_type" : "type-13957", ++ "referenced_type" : "type-13910", ++ "self_type" : "type-13909", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-14263", +- "self_type" : "type-14262", ++ "referenced_type" : "type-14215", ++ "self_type" : "type-14214", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-14574", +- "self_type" : "type-14573", ++ "referenced_type" : "type-14526", ++ "self_type" : "type-14525", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-14702", +- "self_type" : "type-14701", ++ "referenced_type" : "type-14654", ++ "self_type" : "type-14653", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-14941", +- "self_type" : "type-14940", ++ "referenced_type" : "type-14893", ++ "self_type" : "type-14892", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-15302", +- "self_type" : "type-15301", ++ "referenced_type" : "type-15254", ++ "self_type" : "type-15253", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16223", +- "self_type" : "type-16222", ++ "referenced_type" : "type-16175", ++ "self_type" : "type-16174", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17346", +- "self_type" : "type-17345", ++ "referenced_type" : "type-17298", ++ "self_type" : "type-17297", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17822", +- "self_type" : "type-17821", ++ "referenced_type" : "type-17774", ++ "self_type" : "type-17773", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18127", +- "self_type" : "type-18126", ++ "referenced_type" : "type-18079", ++ "self_type" : "type-18078", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18438", +- "self_type" : "type-18437", ++ "referenced_type" : "type-18390", ++ "self_type" : "type-18389", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18566", +- "self_type" : "type-18565", ++ "referenced_type" : "type-18518", ++ "self_type" : "type-18517", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18798", +- "self_type" : "type-18797", ++ "referenced_type" : "type-18750", ++ "self_type" : "type-18749", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19078", +- "self_type" : "type-19077", ++ "referenced_type" : "type-19030", ++ "self_type" : "type-19029", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19318", +- "self_type" : "type-19317", ++ "referenced_type" : "type-19270", ++ "self_type" : "type-19269", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19462", +- "self_type" : "type-19461", ++ "referenced_type" : "type-19414", ++ "self_type" : "type-19413", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19666", +- "self_type" : "type-19665", ++ "referenced_type" : "type-19618", ++ "self_type" : "type-19617", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19834", +- "self_type" : "type-19833", ++ "referenced_type" : "type-19786", ++ "self_type" : "type-19785", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19991", +- "self_type" : "type-19990", ++ "referenced_type" : "type-19943", ++ "self_type" : "type-19942", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-20754", +- "self_type" : "type-20753", ++ "referenced_type" : "type-20706", ++ "self_type" : "type-20705", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-21878", +- "self_type" : "type-21877", ++ "referenced_type" : "type-21830", ++ "self_type" : "type-21829", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-22351", +- "self_type" : "type-22350", ++ "referenced_type" : "type-22319", ++ "self_type" : "type-22318", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-22656", +- "self_type" : "type-22655", ++ "referenced_type" : "type-22567", ++ "self_type" : "type-22566", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-22967", +- "self_type" : "type-22966", ++ "referenced_type" : "type-22935", ++ "self_type" : "type-22934", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23095", +- "self_type" : "type-23094", ++ "referenced_type" : "type-23080", ++ "self_type" : "type-23079", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23327", +- "self_type" : "type-23326", ++ "referenced_type" : "type-23322", ++ "self_type" : "type-23321", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23607", +- "self_type" : "type-23606", ++ "referenced_type" : "type-23588", ++ "self_type" : "type-23587", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23839", +- "self_type" : "type-23838", ++ "referenced_type" : "type-23827", ++ "self_type" : "type-23826", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23962", +- "self_type" : "type-23961", ++ "referenced_type" : "type-23966", ++ "self_type" : "type-23965", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24136", +- "self_type" : "type-24135", ++ "referenced_type" : "type-24132", ++ "self_type" : "type-24131", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24301", +- "self_type" : "type-24300", ++ "referenced_type" : "type-24303", ++ "self_type" : "type-24302", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24454", +- "self_type" : "type-24453", ++ "referenced_type" : "type-24433", ++ "self_type" : "type-24432", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24608", +- "self_type" : "type-24607", ++ "referenced_type" : "type-24575", ++ "self_type" : "type-24574", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24735", +- "self_type" : "type-24734", ++ "referenced_type" : "type-24695", ++ "self_type" : "type-24694", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24870", +- "self_type" : "type-24869", ++ "referenced_type" : "type-24831", ++ "self_type" : "type-24830", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-25156", +- "self_type" : "type-25155", ++ "referenced_type" : "type-25132", ++ "self_type" : "type-25131", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -172202,168 +172244,168 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-25933", +- "self_type" : "type-25932", ++ "referenced_type" : "type-25986", ++ "self_type" : "type-25985", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-27056", +- "self_type" : "type-27055", ++ "referenced_type" : "type-27086", ++ "self_type" : "type-27085", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-27536", +- "self_type" : "type-27535", ++ "referenced_type" : "type-27535", ++ "self_type" : "type-27534", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-27841", +- "self_type" : "type-27840", ++ "referenced_type" : "type-27840", ++ "self_type" : "type-27839", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-28152", +- "self_type" : "type-28151", ++ "referenced_type" : "type-28151", ++ "self_type" : "type-28150", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-28280", +- "self_type" : "type-28279", ++ "referenced_type" : "type-28279", ++ "self_type" : "type-28278", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-28512", +- "self_type" : "type-28511", ++ "referenced_type" : "type-28511", ++ "self_type" : "type-28510", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-28792", +- "self_type" : "type-28791", ++ "referenced_type" : "type-28791", ++ "self_type" : "type-28790", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29024", +- "self_type" : "type-29023", ++ "referenced_type" : "type-29023", ++ "self_type" : "type-29022", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29147", +- "self_type" : "type-29146", ++ "referenced_type" : "type-29146", ++ "self_type" : "type-29145", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29321", +- "self_type" : "type-29320", ++ "referenced_type" : "type-29320", ++ "self_type" : "type-29319", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29486", +- "self_type" : "type-29485", ++ "referenced_type" : "type-29485", ++ "self_type" : "type-29484", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29639", +- "self_type" : "type-29638", ++ "referenced_type" : "type-29638", ++ "self_type" : "type-29637", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29793", +- "self_type" : "type-29792", ++ "referenced_type" : "type-29792", ++ "self_type" : "type-29791", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29916", +- "self_type" : "type-29915", ++ "referenced_type" : "type-29915", ++ "self_type" : "type-29914", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-30049", +- "self_type" : "type-30048", ++ "referenced_type" : "type-30048", ++ "self_type" : "type-30047", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-30301", +- "self_type" : "type-30300", ++ "referenced_type" : "type-30300", ++ "self_type" : "type-30299", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-30395", +- "self_type" : "type-30394", ++ "referenced_type" : "type-30394", ++ "self_type" : "type-30393", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-31079", +- "self_type" : "type-31078", ++ "referenced_type" : "type-31078", ++ "self_type" : "type-31077", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-32203", +- "self_type" : "type-32202", ++ "referenced_type" : "type-32202", ++ "self_type" : "type-32201", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-3851", +- "self_type" : "type-3850", ++ "referenced_type" : "type-3803", ++ "self_type" : "type-3802", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -172380,560 +172422,560 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-5777", +- "self_type" : "type-5776", ++ "referenced_type" : "type-5729", ++ "self_type" : "type-5728", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-7084", +- "self_type" : "type-7083", ++ "referenced_type" : "type-7036", ++ "self_type" : "type-7035", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-7752", +- "self_type" : "type-7751", ++ "referenced_type" : "type-7704", ++ "self_type" : "type-7703", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-8073", +- "self_type" : "type-8072", ++ "referenced_type" : "type-8025", ++ "self_type" : "type-8024", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-9034", +- "self_type" : "type-9033", ++ "referenced_type" : "type-8986", ++ "self_type" : "type-8985", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-10153", +- "self_type" : "type-10152", ++ "referenced_type" : "type-10105", ++ "self_type" : "type-10104", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-10663", +- "self_type" : "type-10662", ++ "referenced_type" : "type-10615", ++ "self_type" : "type-10614", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-10967", +- "self_type" : "type-10966", ++ "referenced_type" : "type-10919", ++ "self_type" : "type-10918", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-11319", +- "self_type" : "type-11318", ++ "referenced_type" : "type-11271", ++ "self_type" : "type-11270", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-11478", +- "self_type" : "type-11477", ++ "referenced_type" : "type-11430", ++ "self_type" : "type-11429", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-12364", +- "self_type" : "type-12363", ++ "referenced_type" : "type-12316", ++ "self_type" : "type-12315", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-13486", +- "self_type" : "type-13485", ++ "referenced_type" : "type-13438", ++ "self_type" : "type-13437", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-13954", +- "self_type" : "type-13953", ++ "referenced_type" : "type-13906", ++ "self_type" : "type-13905", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-14258", +- "self_type" : "type-14257", ++ "referenced_type" : "type-14210", ++ "self_type" : "type-14209", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-14570", +- "self_type" : "type-14569", ++ "referenced_type" : "type-14522", ++ "self_type" : "type-14521", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-14698", +- "self_type" : "type-14697", ++ "referenced_type" : "type-14650", ++ "self_type" : "type-14649", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-14937", +- "self_type" : "type-14936", ++ "referenced_type" : "type-14889", ++ "self_type" : "type-14888", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-15298", +- "self_type" : "type-15297", ++ "referenced_type" : "type-15250", ++ "self_type" : "type-15249", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16219", +- "self_type" : "type-16218", ++ "referenced_type" : "type-16171", ++ "self_type" : "type-16170", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17342", +- "self_type" : "type-17341", ++ "referenced_type" : "type-17294", ++ "self_type" : "type-17293", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17818", +- "self_type" : "type-17817", ++ "referenced_type" : "type-17770", ++ "self_type" : "type-17769", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18122", +- "self_type" : "type-18121", ++ "referenced_type" : "type-18074", ++ "self_type" : "type-18073", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18434", +- "self_type" : "type-18433", ++ "referenced_type" : "type-18386", ++ "self_type" : "type-18385", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18562", +- "self_type" : "type-18561", ++ "referenced_type" : "type-18514", ++ "self_type" : "type-18513", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18794", +- "self_type" : "type-18793", ++ "referenced_type" : "type-18746", ++ "self_type" : "type-18745", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19074", +- "self_type" : "type-19073", ++ "referenced_type" : "type-19026", ++ "self_type" : "type-19025", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19313", +- "self_type" : "type-19312", ++ "referenced_type" : "type-19265", ++ "self_type" : "type-19264", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19458", +- "self_type" : "type-19457", ++ "referenced_type" : "type-19410", ++ "self_type" : "type-19409", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19662", +- "self_type" : "type-19661", ++ "referenced_type" : "type-19614", ++ "self_type" : "type-19613", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19830", +- "self_type" : "type-19829", ++ "referenced_type" : "type-19782", ++ "self_type" : "type-19781", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19987", +- "self_type" : "type-19986", ++ "referenced_type" : "type-19939", ++ "self_type" : "type-19938", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-20750", +- "self_type" : "type-20749", ++ "referenced_type" : "type-20702", ++ "self_type" : "type-20701", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-21874", +- "self_type" : "type-21873", ++ "referenced_type" : "type-21826", ++ "self_type" : "type-21825", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-22347", +- "self_type" : "type-22346", ++ "referenced_type" : "type-22315", ++ "self_type" : "type-22314", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-22651", +- "self_type" : "type-22650", ++ "referenced_type" : "type-22563", ++ "self_type" : "type-22562", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-22963", +- "self_type" : "type-22962", ++ "referenced_type" : "type-22931", ++ "self_type" : "type-22930", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23091", +- "self_type" : "type-23090", ++ "referenced_type" : "type-23075", ++ "self_type" : "type-23074", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23323", +- "self_type" : "type-23322", ++ "referenced_type" : "type-23318", ++ "self_type" : "type-23317", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23603", +- "self_type" : "type-23602", ++ "referenced_type" : "type-23584", ++ "self_type" : "type-23583", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23834", +- "self_type" : "type-23833", ++ "referenced_type" : "type-23823", ++ "self_type" : "type-23822", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23958", +- "self_type" : "type-23957", ++ "referenced_type" : "type-23962", ++ "self_type" : "type-23961", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24132", +- "self_type" : "type-24131", ++ "referenced_type" : "type-24128", ++ "self_type" : "type-24127", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24297", +- "self_type" : "type-24296", ++ "referenced_type" : "type-24299", ++ "self_type" : "type-24298", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24450", +- "self_type" : "type-24449", ++ "referenced_type" : "type-24429", ++ "self_type" : "type-24428", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24604", +- "self_type" : "type-24603", ++ "referenced_type" : "type-24569", ++ "self_type" : "type-24568", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24731", +- "self_type" : "type-24730", ++ "referenced_type" : "type-24691", ++ "self_type" : "type-24690", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24866", +- "self_type" : "type-24865", ++ "referenced_type" : "type-24827", ++ "self_type" : "type-24826", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-25152", +- "self_type" : "type-25151", ++ "referenced_type" : "type-25128", ++ "self_type" : "type-25127", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-25246", +- "self_type" : "type-25245", ++ "referenced_type" : "type-25247", ++ "self_type" : "type-25246", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-25929", +- "self_type" : "type-25928", ++ "referenced_type" : "type-25982", ++ "self_type" : "type-25981", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-27052", +- "self_type" : "type-27051", ++ "referenced_type" : "type-27082", ++ "self_type" : "type-27081", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-27532", +- "self_type" : "type-27531", ++ "referenced_type" : "type-27531", ++ "self_type" : "type-27530", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-27836", +- "self_type" : "type-27835", ++ "referenced_type" : "type-27835", ++ "self_type" : "type-27834", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-28148", +- "self_type" : "type-28147", ++ "referenced_type" : "type-28147", ++ "self_type" : "type-28146", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-28276", +- "self_type" : "type-28275", ++ "referenced_type" : "type-28275", ++ "self_type" : "type-28274", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-28508", +- "self_type" : "type-28507", ++ "referenced_type" : "type-28507", ++ "self_type" : "type-28506", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-28788", +- "self_type" : "type-28787", ++ "referenced_type" : "type-28787", ++ "self_type" : "type-28786", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29019", +- "self_type" : "type-29018", ++ "referenced_type" : "type-29018", ++ "self_type" : "type-29017", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29143", +- "self_type" : "type-29142", ++ "referenced_type" : "type-29142", ++ "self_type" : "type-29141", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29317", +- "self_type" : "type-29316", ++ "referenced_type" : "type-29316", ++ "self_type" : "type-29315", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29482", +- "self_type" : "type-29481", ++ "referenced_type" : "type-29481", ++ "self_type" : "type-29480", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29635", +- "self_type" : "type-29634", ++ "referenced_type" : "type-29634", ++ "self_type" : "type-29633", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29789", +- "self_type" : "type-29788", ++ "referenced_type" : "type-29788", ++ "self_type" : "type-29787", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29912", +- "self_type" : "type-29911", ++ "referenced_type" : "type-29911", ++ "self_type" : "type-29910", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-30045", +- "self_type" : "type-30044", ++ "referenced_type" : "type-30044", ++ "self_type" : "type-30043", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-30297", +- "self_type" : "type-30296", ++ "referenced_type" : "type-30296", ++ "self_type" : "type-30295", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-30390", +- "self_type" : "type-30389", ++ "referenced_type" : "type-30389", ++ "self_type" : "type-30388", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-31075", +- "self_type" : "type-31074", ++ "referenced_type" : "type-31074", ++ "self_type" : "type-31073", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-32199", +- "self_type" : "type-32198", ++ "referenced_type" : "type-32198", ++ "self_type" : "type-32197", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-3847", +- "self_type" : "type-3846", ++ "referenced_type" : "type-3799", ++ "self_type" : "type-3798", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -172950,248 +172992,248 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-5773", +- "self_type" : "type-5772", ++ "referenced_type" : "type-5725", ++ "self_type" : "type-5724", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-7080", +- "self_type" : "type-7079", ++ "referenced_type" : "type-7032", ++ "self_type" : "type-7031", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-7748", +- "self_type" : "type-7747", ++ "referenced_type" : "type-7700", ++ "self_type" : "type-7699", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-8068", +- "self_type" : "type-8067", ++ "referenced_type" : "type-8020", ++ "self_type" : "type-8019", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-9030", +- "self_type" : "type-9029", ++ "referenced_type" : "type-8982", ++ "self_type" : "type-8981", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-14921", +- "self_type" : "type-14920", ++ "referenced_type" : "type-14873", ++ "self_type" : "type-14872", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-15282", +- "self_type" : "type-15281", ++ "referenced_type" : "type-15234", ++ "self_type" : "type-15233", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18778", +- "self_type" : "type-18777", ++ "referenced_type" : "type-18730", ++ "self_type" : "type-18729", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19058", +- "self_type" : "type-19057", ++ "referenced_type" : "type-19010", ++ "self_type" : "type-19009", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19297", +- "self_type" : "type-19296", ++ "referenced_type" : "type-19249", ++ "self_type" : "type-19248", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19644", +- "self_type" : "type-19643", ++ "referenced_type" : "type-19596", ++ "self_type" : "type-19595", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19813", +- "self_type" : "type-19812", ++ "referenced_type" : "type-19765", ++ "self_type" : "type-19764", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19970", +- "self_type" : "type-19969", ++ "referenced_type" : "type-19922", ++ "self_type" : "type-19921", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23307", +- "self_type" : "type-23306", ++ "referenced_type" : "type-23302", ++ "self_type" : "type-23301", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23587", +- "self_type" : "type-23586", ++ "referenced_type" : "type-23568", ++ "self_type" : "type-23567", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23818", +- "self_type" : "type-23817", ++ "referenced_type" : "type-23807", ++ "self_type" : "type-23806", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24114", +- "self_type" : "type-24113", ++ "referenced_type" : "type-24112", ++ "self_type" : "type-24111", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24280", +- "self_type" : "type-24279", ++ "referenced_type" : "type-24282", ++ "self_type" : "type-24281", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24433", +- "self_type" : "type-24432", ++ "referenced_type" : "type-24413", ++ "self_type" : "type-24412", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24586", +- "self_type" : "type-24585", ++ "referenced_type" : "type-24553", ++ "self_type" : "type-24552", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24850", +- "self_type" : "type-24849", ++ "referenced_type" : "type-24810", ++ "self_type" : "type-24809", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-25136", +- "self_type" : "type-25135", ++ "referenced_type" : "type-25112", ++ "self_type" : "type-25111", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-28492", +- "self_type" : "type-28491", ++ "referenced_type" : "type-28491", ++ "self_type" : "type-28490", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-28772", +- "self_type" : "type-28771", ++ "referenced_type" : "type-28771", ++ "self_type" : "type-28770", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29003", +- "self_type" : "type-29002", ++ "referenced_type" : "type-29002", ++ "self_type" : "type-29001", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29299", +- "self_type" : "type-29298", ++ "referenced_type" : "type-29298", ++ "self_type" : "type-29297", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29465", +- "self_type" : "type-29464", ++ "referenced_type" : "type-29464", ++ "self_type" : "type-29463", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29618", +- "self_type" : "type-29617", ++ "referenced_type" : "type-29617", ++ "self_type" : "type-29616", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29771", +- "self_type" : "type-29770", ++ "referenced_type" : "type-29770", ++ "self_type" : "type-29769", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-30029", +- "self_type" : "type-30028", ++ "referenced_type" : "type-30028", ++ "self_type" : "type-30027", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-30281", +- "self_type" : "type-30280", ++ "referenced_type" : "type-30280", ++ "self_type" : "type-30279", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -173208,520 +173250,520 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-10141", +- "self_type" : "type-10140", ++ "referenced_type" : "type-10093", ++ "self_type" : "type-10092", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-10650", +- "self_type" : "type-10649", ++ "referenced_type" : "type-10602", ++ "self_type" : "type-10601", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-10955", +- "self_type" : "type-10954", ++ "referenced_type" : "type-10907", ++ "self_type" : "type-10906", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-11307", +- "self_type" : "type-11306", ++ "referenced_type" : "type-11259", ++ "self_type" : "type-11258", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-11466", +- "self_type" : "type-11465", ++ "referenced_type" : "type-11418", ++ "self_type" : "type-11417", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-12352", +- "self_type" : "type-12351", ++ "referenced_type" : "type-12304", ++ "self_type" : "type-12303", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-13474", +- "self_type" : "type-13473", ++ "referenced_type" : "type-13426", ++ "self_type" : "type-13425", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-13941", +- "self_type" : "type-13940", ++ "referenced_type" : "type-13893", ++ "self_type" : "type-13892", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-14246", +- "self_type" : "type-14245", ++ "referenced_type" : "type-14198", ++ "self_type" : "type-14197", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-14558", +- "self_type" : "type-14557", ++ "referenced_type" : "type-14510", ++ "self_type" : "type-14509", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-14686", +- "self_type" : "type-14685", ++ "referenced_type" : "type-14638", ++ "self_type" : "type-14637", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-14925", +- "self_type" : "type-14924", ++ "referenced_type" : "type-14877", ++ "self_type" : "type-14876", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-15286", +- "self_type" : "type-15285", ++ "referenced_type" : "type-15238", ++ "self_type" : "type-15237", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16207", +- "self_type" : "type-16206", ++ "referenced_type" : "type-16159", ++ "self_type" : "type-16158", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17330", +- "self_type" : "type-17329", ++ "referenced_type" : "type-17282", ++ "self_type" : "type-17281", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17805", +- "self_type" : "type-17804", ++ "referenced_type" : "type-17757", ++ "self_type" : "type-17756", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18110", +- "self_type" : "type-18109", ++ "referenced_type" : "type-18062", ++ "self_type" : "type-18061", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18422", +- "self_type" : "type-18421", ++ "referenced_type" : "type-18374", ++ "self_type" : "type-18373", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18550", +- "self_type" : "type-18549", ++ "referenced_type" : "type-18502", ++ "self_type" : "type-18501", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18782", +- "self_type" : "type-18781", ++ "referenced_type" : "type-18734", ++ "self_type" : "type-18733", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19062", +- "self_type" : "type-19061", ++ "referenced_type" : "type-19014", ++ "self_type" : "type-19013", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19301", +- "self_type" : "type-19300", ++ "referenced_type" : "type-19253", ++ "self_type" : "type-19252", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19446", +- "self_type" : "type-19445", ++ "referenced_type" : "type-19398", ++ "self_type" : "type-19397", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19648", +- "self_type" : "type-19647", ++ "referenced_type" : "type-19600", ++ "self_type" : "type-19599", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19817", +- "self_type" : "type-19816", ++ "referenced_type" : "type-19769", ++ "self_type" : "type-19768", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19974", +- "self_type" : "type-19973", ++ "referenced_type" : "type-19926", ++ "self_type" : "type-19925", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-20738", +- "self_type" : "type-20737", ++ "referenced_type" : "type-20690", ++ "self_type" : "type-20689", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-21862", +- "self_type" : "type-21861", ++ "referenced_type" : "type-21814", ++ "self_type" : "type-21813", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-22334", +- "self_type" : "type-22333", ++ "referenced_type" : "type-22302", ++ "self_type" : "type-22301", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-22639", +- "self_type" : "type-22638", ++ "referenced_type" : "type-22551", ++ "self_type" : "type-22550", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-22951", +- "self_type" : "type-22950", ++ "referenced_type" : "type-22917", ++ "self_type" : "type-22916", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23079", +- "self_type" : "type-23078", ++ "referenced_type" : "type-23062", ++ "self_type" : "type-23061", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23311", +- "self_type" : "type-23310", ++ "referenced_type" : "type-23306", ++ "self_type" : "type-23305", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23591", +- "self_type" : "type-23590", ++ "referenced_type" : "type-23572", ++ "self_type" : "type-23571", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23822", +- "self_type" : "type-23821", ++ "referenced_type" : "type-23811", ++ "self_type" : "type-23810", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23946", +- "self_type" : "type-23945", ++ "referenced_type" : "type-23949", ++ "self_type" : "type-23948", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24118", +- "self_type" : "type-24117", ++ "referenced_type" : "type-24116", ++ "self_type" : "type-24115", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24284", +- "self_type" : "type-24283", ++ "referenced_type" : "type-24286", ++ "self_type" : "type-24285", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24437", +- "self_type" : "type-24436", ++ "referenced_type" : "type-24417", ++ "self_type" : "type-24416", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24590", +- "self_type" : "type-24589", ++ "referenced_type" : "type-24557", ++ "self_type" : "type-24556", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24717", +- "self_type" : "type-24716", ++ "referenced_type" : "type-24679", ++ "self_type" : "type-24678", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24854", +- "self_type" : "type-24853", ++ "referenced_type" : "type-24814", ++ "self_type" : "type-24813", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-25140", +- "self_type" : "type-25139", ++ "referenced_type" : "type-25116", ++ "self_type" : "type-25115", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-25234", +- "self_type" : "type-25233", ++ "referenced_type" : "type-25235", ++ "self_type" : "type-25234", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-25917", +- "self_type" : "type-25916", ++ "referenced_type" : "type-25968", ++ "self_type" : "type-25967", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-27040", +- "self_type" : "type-27039", ++ "referenced_type" : "type-27070", ++ "self_type" : "type-27069", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-27519", +- "self_type" : "type-27518", ++ "referenced_type" : "type-27518", ++ "self_type" : "type-27517", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-27824", +- "self_type" : "type-27823", ++ "referenced_type" : "type-27823", ++ "self_type" : "type-27822", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-28136", +- "self_type" : "type-28135", ++ "referenced_type" : "type-28135", ++ "self_type" : "type-28134", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-28264", +- "self_type" : "type-28263", ++ "referenced_type" : "type-28263", ++ "self_type" : "type-28262", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-28496", +- "self_type" : "type-28495", ++ "referenced_type" : "type-28495", ++ "self_type" : "type-28494", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-28776", +- "self_type" : "type-28775", ++ "referenced_type" : "type-28775", ++ "self_type" : "type-28774", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29007", +- "self_type" : "type-29006", ++ "referenced_type" : "type-29006", ++ "self_type" : "type-29005", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29131", +- "self_type" : "type-29130", ++ "referenced_type" : "type-29130", ++ "self_type" : "type-29129", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29303", +- "self_type" : "type-29302", ++ "referenced_type" : "type-29302", ++ "self_type" : "type-29301", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29469", +- "self_type" : "type-29468", ++ "referenced_type" : "type-29468", ++ "self_type" : "type-29467", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29622", +- "self_type" : "type-29621", ++ "referenced_type" : "type-29621", ++ "self_type" : "type-29620", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29775", +- "self_type" : "type-29774", ++ "referenced_type" : "type-29774", ++ "self_type" : "type-29773", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29898", +- "self_type" : "type-29897", ++ "referenced_type" : "type-29897", ++ "self_type" : "type-29896", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-30033", +- "self_type" : "type-30032", ++ "referenced_type" : "type-30032", ++ "self_type" : "type-30031", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-30285", +- "self_type" : "type-30284", ++ "referenced_type" : "type-30284", ++ "self_type" : "type-30283", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-30378", +- "self_type" : "type-30377", ++ "referenced_type" : "type-30377", ++ "self_type" : "type-30376", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-31063", +- "self_type" : "type-31062", ++ "referenced_type" : "type-31062", ++ "self_type" : "type-31061", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-32187", +- "self_type" : "type-32186", ++ "referenced_type" : "type-32186", ++ "self_type" : "type-32185", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-3835", +- "self_type" : "type-3834", ++ "referenced_type" : "type-3787", ++ "self_type" : "type-3786", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -173738,560 +173780,560 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-5761", +- "self_type" : "type-5760", ++ "referenced_type" : "type-5713", ++ "self_type" : "type-5712", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-7068", +- "self_type" : "type-7067", ++ "referenced_type" : "type-7020", ++ "self_type" : "type-7019", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-7735", +- "self_type" : "type-7734", ++ "referenced_type" : "type-7687", ++ "self_type" : "type-7686", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-8056", +- "self_type" : "type-8055", ++ "referenced_type" : "type-8008", ++ "self_type" : "type-8007", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-9018", +- "self_type" : "type-9017", ++ "referenced_type" : "type-8970", ++ "self_type" : "type-8969", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-10145", +- "self_type" : "type-10144", ++ "referenced_type" : "type-10097", ++ "self_type" : "type-10096", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-10654", +- "self_type" : "type-10653", ++ "referenced_type" : "type-10606", ++ "self_type" : "type-10605", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-10959", +- "self_type" : "type-10958", ++ "referenced_type" : "type-10911", ++ "self_type" : "type-10910", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-11311", +- "self_type" : "type-11310", ++ "referenced_type" : "type-11263", ++ "self_type" : "type-11262", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-11470", +- "self_type" : "type-11469", ++ "referenced_type" : "type-11422", ++ "self_type" : "type-11421", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-12356", +- "self_type" : "type-12355", ++ "referenced_type" : "type-12308", ++ "self_type" : "type-12307", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-13478", +- "self_type" : "type-13477", ++ "referenced_type" : "type-13430", ++ "self_type" : "type-13429", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-13945", +- "self_type" : "type-13944", ++ "referenced_type" : "type-13897", ++ "self_type" : "type-13896", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-14250", +- "self_type" : "type-14249", ++ "referenced_type" : "type-14202", ++ "self_type" : "type-14201", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-14562", +- "self_type" : "type-14561", ++ "referenced_type" : "type-14514", ++ "self_type" : "type-14513", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-14690", +- "self_type" : "type-14689", ++ "referenced_type" : "type-14642", ++ "self_type" : "type-14641", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-14929", +- "self_type" : "type-14928", ++ "referenced_type" : "type-14881", ++ "self_type" : "type-14880", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-15290", +- "self_type" : "type-15289", ++ "referenced_type" : "type-15242", ++ "self_type" : "type-15241", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16211", +- "self_type" : "type-16210", ++ "referenced_type" : "type-16163", ++ "self_type" : "type-16162", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17334", +- "self_type" : "type-17333", ++ "referenced_type" : "type-17286", ++ "self_type" : "type-17285", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17809", +- "self_type" : "type-17808", ++ "referenced_type" : "type-17761", ++ "self_type" : "type-17760", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18114", +- "self_type" : "type-18113", ++ "referenced_type" : "type-18066", ++ "self_type" : "type-18065", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18426", +- "self_type" : "type-18425", ++ "referenced_type" : "type-18378", ++ "self_type" : "type-18377", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18554", +- "self_type" : "type-18553", ++ "referenced_type" : "type-18506", ++ "self_type" : "type-18505", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18786", +- "self_type" : "type-18785", ++ "referenced_type" : "type-18738", ++ "self_type" : "type-18737", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19066", +- "self_type" : "type-19065", ++ "referenced_type" : "type-19018", ++ "self_type" : "type-19017", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19305", +- "self_type" : "type-19304", ++ "referenced_type" : "type-19257", ++ "self_type" : "type-19256", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19450", +- "self_type" : "type-19449", ++ "referenced_type" : "type-19402", ++ "self_type" : "type-19401", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19654", +- "self_type" : "type-19653", ++ "referenced_type" : "type-19606", ++ "self_type" : "type-19605", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19821", +- "self_type" : "type-19820", ++ "referenced_type" : "type-19773", ++ "self_type" : "type-19772", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19978", +- "self_type" : "type-19977", ++ "referenced_type" : "type-19930", ++ "self_type" : "type-19929", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-20742", +- "self_type" : "type-20741", ++ "referenced_type" : "type-20694", ++ "self_type" : "type-20693", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-21866", +- "self_type" : "type-21865", ++ "referenced_type" : "type-21818", ++ "self_type" : "type-21817", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-22338", +- "self_type" : "type-22337", ++ "referenced_type" : "type-22307", ++ "self_type" : "type-22306", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-22643", +- "self_type" : "type-22642", ++ "referenced_type" : "type-22555", ++ "self_type" : "type-22554", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-22955", +- "self_type" : "type-22954", ++ "referenced_type" : "type-22922", ++ "self_type" : "type-22921", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23083", +- "self_type" : "type-23082", ++ "referenced_type" : "type-23066", ++ "self_type" : "type-23065", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23315", +- "self_type" : "type-23314", ++ "referenced_type" : "type-23310", ++ "self_type" : "type-23309", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23595", +- "self_type" : "type-23594", ++ "referenced_type" : "type-23576", ++ "self_type" : "type-23575", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23826", +- "self_type" : "type-23825", ++ "referenced_type" : "type-23815", ++ "self_type" : "type-23814", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23950", +- "self_type" : "type-23949", ++ "referenced_type" : "type-23954", ++ "self_type" : "type-23953", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24124", +- "self_type" : "type-24123", ++ "referenced_type" : "type-24120", ++ "self_type" : "type-24119", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24288", +- "self_type" : "type-24287", ++ "referenced_type" : "type-24290", ++ "self_type" : "type-24289", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24441", +- "self_type" : "type-24440", ++ "referenced_type" : "type-24421", ++ "self_type" : "type-24420", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24595", +- "self_type" : "type-24594", ++ "referenced_type" : "type-24561", ++ "self_type" : "type-24560", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24721", +- "self_type" : "type-24720", ++ "referenced_type" : "type-24683", ++ "self_type" : "type-24682", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24858", +- "self_type" : "type-24857", ++ "referenced_type" : "type-24818", ++ "self_type" : "type-24817", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-25144", +- "self_type" : "type-25143", ++ "referenced_type" : "type-25120", ++ "self_type" : "type-25119", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-25238", +- "self_type" : "type-25237", ++ "referenced_type" : "type-25239", ++ "self_type" : "type-25238", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-25921", +- "self_type" : "type-25920", ++ "referenced_type" : "type-25972", ++ "self_type" : "type-25971", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-27044", +- "self_type" : "type-27043", ++ "referenced_type" : "type-27074", ++ "self_type" : "type-27073", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-27523", +- "self_type" : "type-27522", ++ "referenced_type" : "type-27522", ++ "self_type" : "type-27521", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-27828", +- "self_type" : "type-27827", ++ "referenced_type" : "type-27827", ++ "self_type" : "type-27826", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-28140", +- "self_type" : "type-28139", ++ "referenced_type" : "type-28139", ++ "self_type" : "type-28138", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-28268", +- "self_type" : "type-28267", ++ "referenced_type" : "type-28267", ++ "self_type" : "type-28266", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-28500", +- "self_type" : "type-28499", ++ "referenced_type" : "type-28499", ++ "self_type" : "type-28498", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-28780", +- "self_type" : "type-28779", ++ "referenced_type" : "type-28779", ++ "self_type" : "type-28778", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29011", +- "self_type" : "type-29010", ++ "referenced_type" : "type-29010", ++ "self_type" : "type-29009", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29135", +- "self_type" : "type-29134", ++ "referenced_type" : "type-29134", ++ "self_type" : "type-29133", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29309", +- "self_type" : "type-29308", ++ "referenced_type" : "type-29308", ++ "self_type" : "type-29307", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29473", +- "self_type" : "type-29472", ++ "referenced_type" : "type-29472", ++ "self_type" : "type-29471", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29626", +- "self_type" : "type-29625", ++ "referenced_type" : "type-29625", ++ "self_type" : "type-29624", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29780", +- "self_type" : "type-29779", ++ "referenced_type" : "type-29779", ++ "self_type" : "type-29778", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29902", +- "self_type" : "type-29901", ++ "referenced_type" : "type-29901", ++ "self_type" : "type-29900", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-30037", +- "self_type" : "type-30036", ++ "referenced_type" : "type-30036", ++ "self_type" : "type-30035", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-30289", +- "self_type" : "type-30288", ++ "referenced_type" : "type-30288", ++ "self_type" : "type-30287", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-30382", +- "self_type" : "type-30381", ++ "referenced_type" : "type-30381", ++ "self_type" : "type-30380", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-31067", +- "self_type" : "type-31066", ++ "referenced_type" : "type-31066", ++ "self_type" : "type-31065", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-32191", +- "self_type" : "type-32190", ++ "referenced_type" : "type-32190", ++ "self_type" : "type-32189", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-3839", +- "self_type" : "type-3838", ++ "referenced_type" : "type-3791", ++ "self_type" : "type-3790", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -174308,560 +174350,560 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-5765", +- "self_type" : "type-5764", ++ "referenced_type" : "type-5717", ++ "self_type" : "type-5716", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-7072", +- "self_type" : "type-7071", ++ "referenced_type" : "type-7024", ++ "self_type" : "type-7023", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-7739", +- "self_type" : "type-7738", ++ "referenced_type" : "type-7691", ++ "self_type" : "type-7690", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-8060", +- "self_type" : "type-8059", ++ "referenced_type" : "type-8012", ++ "self_type" : "type-8011", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-9022", +- "self_type" : "type-9021", ++ "referenced_type" : "type-8974", ++ "self_type" : "type-8973", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-10149", +- "self_type" : "type-10148", ++ "referenced_type" : "type-10101", ++ "self_type" : "type-10100", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-10659", +- "self_type" : "type-10658", ++ "referenced_type" : "type-10611", ++ "self_type" : "type-10610", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-10963", +- "self_type" : "type-10962", ++ "referenced_type" : "type-10915", ++ "self_type" : "type-10914", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-11315", +- "self_type" : "type-11314", ++ "referenced_type" : "type-11267", ++ "self_type" : "type-11266", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-11474", +- "self_type" : "type-11473", ++ "referenced_type" : "type-11426", ++ "self_type" : "type-11425", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-12360", +- "self_type" : "type-12359", ++ "referenced_type" : "type-12312", ++ "self_type" : "type-12311", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-13482", +- "self_type" : "type-13481", ++ "referenced_type" : "type-13434", ++ "self_type" : "type-13433", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-13950", +- "self_type" : "type-13949", ++ "referenced_type" : "type-13902", ++ "self_type" : "type-13901", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-14254", +- "self_type" : "type-14253", ++ "referenced_type" : "type-14206", ++ "self_type" : "type-14205", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-14566", +- "self_type" : "type-14565", ++ "referenced_type" : "type-14518", ++ "self_type" : "type-14517", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-14694", +- "self_type" : "type-14693", ++ "referenced_type" : "type-14646", ++ "self_type" : "type-14645", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-14933", +- "self_type" : "type-14932", ++ "referenced_type" : "type-14885", ++ "self_type" : "type-14884", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-15294", +- "self_type" : "type-15293", ++ "referenced_type" : "type-15246", ++ "self_type" : "type-15245", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-16215", +- "self_type" : "type-16214", ++ "referenced_type" : "type-16167", ++ "self_type" : "type-16166", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17338", +- "self_type" : "type-17337", ++ "referenced_type" : "type-17290", ++ "self_type" : "type-17289", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-17814", +- "self_type" : "type-17813", ++ "referenced_type" : "type-17766", ++ "self_type" : "type-17765", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18118", +- "self_type" : "type-18117", ++ "referenced_type" : "type-18070", ++ "self_type" : "type-18069", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18430", +- "self_type" : "type-18429", ++ "referenced_type" : "type-18382", ++ "self_type" : "type-18381", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18558", +- "self_type" : "type-18557", ++ "referenced_type" : "type-18510", ++ "self_type" : "type-18509", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-18790", +- "self_type" : "type-18789", ++ "referenced_type" : "type-18742", ++ "self_type" : "type-18741", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19070", +- "self_type" : "type-19069", ++ "referenced_type" : "type-19022", ++ "self_type" : "type-19021", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19309", +- "self_type" : "type-19308", ++ "referenced_type" : "type-19261", ++ "self_type" : "type-19260", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19454", +- "self_type" : "type-19453", ++ "referenced_type" : "type-19406", ++ "self_type" : "type-19405", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19658", +- "self_type" : "type-19657", ++ "referenced_type" : "type-19610", ++ "self_type" : "type-19609", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19826", +- "self_type" : "type-19825", ++ "referenced_type" : "type-19778", ++ "self_type" : "type-19777", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-19982", +- "self_type" : "type-19981", ++ "referenced_type" : "type-19934", ++ "self_type" : "type-19933", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-20746", +- "self_type" : "type-20745", ++ "referenced_type" : "type-20698", ++ "self_type" : "type-20697", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-21870", +- "self_type" : "type-21869", ++ "referenced_type" : "type-21822", ++ "self_type" : "type-21821", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-22343", +- "self_type" : "type-22342", ++ "referenced_type" : "type-22311", ++ "self_type" : "type-22310", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-22647", +- "self_type" : "type-22646", ++ "referenced_type" : "type-22559", ++ "self_type" : "type-22558", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-22959", +- "self_type" : "type-22958", ++ "referenced_type" : "type-22926", ++ "self_type" : "type-22925", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23087", +- "self_type" : "type-23086", ++ "referenced_type" : "type-23071", ++ "self_type" : "type-23070", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23319", +- "self_type" : "type-23318", ++ "referenced_type" : "type-23314", ++ "self_type" : "type-23313", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23599", +- "self_type" : "type-23598", ++ "referenced_type" : "type-23580", ++ "self_type" : "type-23579", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23830", +- "self_type" : "type-23829", ++ "referenced_type" : "type-23819", ++ "self_type" : "type-23818", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-23954", +- "self_type" : "type-23953", ++ "referenced_type" : "type-23958", ++ "self_type" : "type-23957", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24128", +- "self_type" : "type-24127", ++ "referenced_type" : "type-24124", ++ "self_type" : "type-24123", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24293", +- "self_type" : "type-24292", ++ "referenced_type" : "type-24294", ++ "self_type" : "type-24293", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24445", +- "self_type" : "type-24444", ++ "referenced_type" : "type-24425", ++ "self_type" : "type-24424", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24599", +- "self_type" : "type-24598", ++ "referenced_type" : "type-24565", ++ "self_type" : "type-24564", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24725", +- "self_type" : "type-24724", ++ "referenced_type" : "type-24687", ++ "self_type" : "type-24686", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-24862", +- "self_type" : "type-24861", ++ "referenced_type" : "type-24823", ++ "self_type" : "type-24822", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-25148", +- "self_type" : "type-25147", ++ "referenced_type" : "type-25124", ++ "self_type" : "type-25123", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-25242", +- "self_type" : "type-25241", ++ "referenced_type" : "type-25243", ++ "self_type" : "type-25242", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-25925", +- "self_type" : "type-25924", ++ "referenced_type" : "type-25978", ++ "self_type" : "type-25977", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-27048", +- "self_type" : "type-27047", ++ "referenced_type" : "type-27078", ++ "self_type" : "type-27077", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-27528", +- "self_type" : "type-27527", ++ "referenced_type" : "type-27527", ++ "self_type" : "type-27526", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-27832", +- "self_type" : "type-27831", ++ "referenced_type" : "type-27831", ++ "self_type" : "type-27830", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-28144", +- "self_type" : "type-28143", ++ "referenced_type" : "type-28143", ++ "self_type" : "type-28142", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-28272", +- "self_type" : "type-28271", ++ "referenced_type" : "type-28271", ++ "self_type" : "type-28270", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-28504", +- "self_type" : "type-28503", ++ "referenced_type" : "type-28503", ++ "self_type" : "type-28502", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-28784", +- "self_type" : "type-28783", ++ "referenced_type" : "type-28783", ++ "self_type" : "type-28782", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29015", +- "self_type" : "type-29014", ++ "referenced_type" : "type-29014", ++ "self_type" : "type-29013", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29139", +- "self_type" : "type-29138", ++ "referenced_type" : "type-29138", ++ "self_type" : "type-29137", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29313", +- "self_type" : "type-29312", ++ "referenced_type" : "type-29312", ++ "self_type" : "type-29311", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29478", +- "self_type" : "type-29477", ++ "referenced_type" : "type-29477", ++ "self_type" : "type-29476", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29630", +- "self_type" : "type-29629", ++ "referenced_type" : "type-29629", ++ "self_type" : "type-29628", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29784", +- "self_type" : "type-29783", ++ "referenced_type" : "type-29783", ++ "self_type" : "type-29782", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-29906", +- "self_type" : "type-29905", ++ "referenced_type" : "type-29905", ++ "self_type" : "type-29904", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-30041", +- "self_type" : "type-30040", ++ "referenced_type" : "type-30040", ++ "self_type" : "type-30039", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-30293", +- "self_type" : "type-30292", ++ "referenced_type" : "type-30292", ++ "self_type" : "type-30291", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-30386", +- "self_type" : "type-30385", ++ "referenced_type" : "type-30385", ++ "self_type" : "type-30384", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-31071", +- "self_type" : "type-31070", ++ "referenced_type" : "type-31070", ++ "self_type" : "type-31069", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-32195", +- "self_type" : "type-32194", ++ "referenced_type" : "type-32194", ++ "self_type" : "type-32193", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-3843", +- "self_type" : "type-3842", ++ "referenced_type" : "type-3795", ++ "self_type" : "type-3794", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -174878,40 +174920,40 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-5769", +- "self_type" : "type-5768", ++ "referenced_type" : "type-5721", ++ "self_type" : "type-5720", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-7076", +- "self_type" : "type-7075", ++ "referenced_type" : "type-7028", ++ "self_type" : "type-7027", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-7744", +- "self_type" : "type-7743", ++ "referenced_type" : "type-7696", ++ "self_type" : "type-7695", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-8064", +- "self_type" : "type-8063", ++ "referenced_type" : "type-8016", ++ "self_type" : "type-8015", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedField", + "name" : "const google::protobuf::RepeatedField", +- "referenced_type" : "type-9026", +- "self_type" : "type-9025", ++ "referenced_type" : "type-8978", ++ "self_type" : "type-8977", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -174919,8 +174961,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-1676", +- "self_type" : "type-2067", ++ "referenced_type" : "type-1590", ++ "self_type" : "type-1999", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -174929,8 +174971,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-1695", +- "self_type" : "type-2089", ++ "referenced_type" : "type-1609", ++ "self_type" : "type-2022", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -174939,8 +174981,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-1701", +- "self_type" : "type-2099", ++ "referenced_type" : "type-1615", ++ "self_type" : "type-2032", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -174949,8 +174991,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-1687", +- "self_type" : "type-2073", ++ "referenced_type" : "type-1601", ++ "self_type" : "type-2005", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -174959,8 +175001,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-2417", +- "self_type" : "type-2418", ++ "referenced_type" : "type-2347", ++ "self_type" : "type-2348", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -174969,8 +175011,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-1689", +- "self_type" : "type-2104", ++ "referenced_type" : "type-1603", ++ "self_type" : "type-2037", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -174979,8 +175021,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-2404", +- "self_type" : "type-2405", ++ "referenced_type" : "type-2334", ++ "self_type" : "type-2335", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -174989,8 +175031,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-1678", +- "self_type" : "type-2083", ++ "referenced_type" : "type-1592", ++ "self_type" : "type-2016", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -174999,8 +175041,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-2061", +- "self_type" : "type-2062", ++ "referenced_type" : "type-1993", ++ "self_type" : "type-1994", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -175009,8 +175051,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-2133", +- "self_type" : "type-2134", ++ "referenced_type" : "type-2064", ++ "self_type" : "type-2065", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -175018,584 +175060,584 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-10115", +- "self_type" : "type-10114", ++ "referenced_type" : "type-10067", ++ "self_type" : "type-10066", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-10256", +- "self_type" : "type-10255", ++ "referenced_type" : "type-10208", ++ "self_type" : "type-10207", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-10756", +- "self_type" : "type-10755", ++ "referenced_type" : "type-10708", ++ "self_type" : "type-10707", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-10844", +- "self_type" : "type-10843", ++ "referenced_type" : "type-10796", ++ "self_type" : "type-10795", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-10934", +- "self_type" : "type-10933", ++ "referenced_type" : "type-10886", ++ "self_type" : "type-10885", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-11017", +- "self_type" : "type-11016", ++ "referenced_type" : "type-10969", ++ "self_type" : "type-10968", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-11093", +- "self_type" : "type-11092", ++ "referenced_type" : "type-11045", ++ "self_type" : "type-11044", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-11286", +- "self_type" : "type-11285", ++ "referenced_type" : "type-11238", ++ "self_type" : "type-11237", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-11443", +- "self_type" : "type-11442", ++ "referenced_type" : "type-11395", ++ "self_type" : "type-11394", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-11902", +- "self_type" : "type-11901", ++ "referenced_type" : "type-11854", ++ "self_type" : "type-11853", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-12072", +- "self_type" : "type-12071", ++ "referenced_type" : "type-12024", ++ "self_type" : "type-12023", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-12181", +- "self_type" : "type-12180", ++ "referenced_type" : "type-12133", ++ "self_type" : "type-12132", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-12315", +- "self_type" : "type-12314", ++ "referenced_type" : "type-12267", ++ "self_type" : "type-12266", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-12462", +- "self_type" : "type-12461", ++ "referenced_type" : "type-12414", ++ "self_type" : "type-12413", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-12555", +- "self_type" : "type-12554", ++ "referenced_type" : "type-12507", ++ "self_type" : "type-12506", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-12656", +- "self_type" : "type-12655", ++ "referenced_type" : "type-12608", ++ "self_type" : "type-12607", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-12838", +- "self_type" : "type-12837", ++ "referenced_type" : "type-12790", ++ "self_type" : "type-12789", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-12918", +- "self_type" : "type-12917", ++ "referenced_type" : "type-12870", ++ "self_type" : "type-12869", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-12976", +- "self_type" : "type-12975", ++ "referenced_type" : "type-12928", ++ "self_type" : "type-12927", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-13050", +- "self_type" : "type-13049", ++ "referenced_type" : "type-13002", ++ "self_type" : "type-13001", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-13448", +- "self_type" : "type-13447", ++ "referenced_type" : "type-13400", ++ "self_type" : "type-13399", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-13547", +- "self_type" : "type-13546", ++ "referenced_type" : "type-13499", ++ "self_type" : "type-13498", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-14047", +- "self_type" : "type-14046", ++ "referenced_type" : "type-13999", ++ "self_type" : "type-13998", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-14135", +- "self_type" : "type-14134", ++ "referenced_type" : "type-14087", ++ "self_type" : "type-14086", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-14225", +- "self_type" : "type-14224", ++ "referenced_type" : "type-14177", ++ "self_type" : "type-14176", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-14308", +- "self_type" : "type-14307", ++ "referenced_type" : "type-14260", ++ "self_type" : "type-14259", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-14375", +- "self_type" : "type-14374", ++ "referenced_type" : "type-14327", ++ "self_type" : "type-14326", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-14537", +- "self_type" : "type-14536", ++ "referenced_type" : "type-14489", ++ "self_type" : "type-14488", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-14662", +- "self_type" : "type-14661", ++ "referenced_type" : "type-14614", ++ "self_type" : "type-14613", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-14804", +- "self_type" : "type-14803", ++ "referenced_type" : "type-14756", ++ "self_type" : "type-14755", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-14895", +- "self_type" : "type-14894", ++ "referenced_type" : "type-14847", ++ "self_type" : "type-14846", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-15256", +- "self_type" : "type-15255", ++ "referenced_type" : "type-15208", ++ "self_type" : "type-15207", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-15759", +- "self_type" : "type-15758", ++ "referenced_type" : "type-15711", ++ "self_type" : "type-15710", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-15928", +- "self_type" : "type-15927", ++ "referenced_type" : "type-15880", ++ "self_type" : "type-15879", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16036", +- "self_type" : "type-16035", ++ "referenced_type" : "type-15988", ++ "self_type" : "type-15987", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16170", +- "self_type" : "type-16169", ++ "referenced_type" : "type-16122", ++ "self_type" : "type-16121", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16319", +- "self_type" : "type-16318", ++ "referenced_type" : "type-16271", ++ "self_type" : "type-16270", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16412", +- "self_type" : "type-16411", ++ "referenced_type" : "type-16364", ++ "self_type" : "type-16363", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16512", +- "self_type" : "type-16511", ++ "referenced_type" : "type-16464", ++ "self_type" : "type-16463", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16694", +- "self_type" : "type-16693", ++ "referenced_type" : "type-16646", ++ "self_type" : "type-16645", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16774", +- "self_type" : "type-16773", ++ "referenced_type" : "type-16726", ++ "self_type" : "type-16725", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16832", +- "self_type" : "type-16831", ++ "referenced_type" : "type-16784", ++ "self_type" : "type-16783", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16906", +- "self_type" : "type-16905", ++ "referenced_type" : "type-16858", ++ "self_type" : "type-16857", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17304", +- "self_type" : "type-17303", ++ "referenced_type" : "type-17256", ++ "self_type" : "type-17255", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17411", +- "self_type" : "type-17410", ++ "referenced_type" : "type-17363", ++ "self_type" : "type-17362", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17911", +- "self_type" : "type-17910", ++ "referenced_type" : "type-17863", ++ "self_type" : "type-17862", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17999", +- "self_type" : "type-17998", ++ "referenced_type" : "type-17951", ++ "self_type" : "type-17950", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18089", +- "self_type" : "type-18088", ++ "referenced_type" : "type-18041", ++ "self_type" : "type-18040", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18172", +- "self_type" : "type-18171", ++ "referenced_type" : "type-18124", ++ "self_type" : "type-18123", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18239", +- "self_type" : "type-18238", ++ "referenced_type" : "type-18191", ++ "self_type" : "type-18190", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18401", +- "self_type" : "type-18400", ++ "referenced_type" : "type-18353", ++ "self_type" : "type-18352", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18526", +- "self_type" : "type-18525", ++ "referenced_type" : "type-18478", ++ "self_type" : "type-18477", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18668", +- "self_type" : "type-18667", ++ "referenced_type" : "type-18620", ++ "self_type" : "type-18619", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18752", +- "self_type" : "type-18751", ++ "referenced_type" : "type-18704", ++ "self_type" : "type-18703", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19032", +- "self_type" : "type-19031", ++ "referenced_type" : "type-18984", ++ "self_type" : "type-18983", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19274", +- "self_type" : "type-19273", ++ "referenced_type" : "type-19226", ++ "self_type" : "type-19225", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19425", +- "self_type" : "type-19424", ++ "referenced_type" : "type-19377", ++ "self_type" : "type-19376", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19613", +- "self_type" : "type-19612", ++ "referenced_type" : "type-19565", ++ "self_type" : "type-19564", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19783", +- "self_type" : "type-19782", ++ "referenced_type" : "type-19735", ++ "self_type" : "type-19734", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19943", +- "self_type" : "type-19942", ++ "referenced_type" : "type-19895", ++ "self_type" : "type-19894", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20292", +- "self_type" : "type-20291", ++ "referenced_type" : "type-20244", ++ "self_type" : "type-20243", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20462", +- "self_type" : "type-20461", ++ "referenced_type" : "type-20414", ++ "self_type" : "type-20413", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20568", +- "self_type" : "type-20567", ++ "referenced_type" : "type-20520", ++ "self_type" : "type-20519", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20701", +- "self_type" : "type-20700", ++ "referenced_type" : "type-20653", ++ "self_type" : "type-20652", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20850", +- "self_type" : "type-20849", ++ "referenced_type" : "type-20802", ++ "self_type" : "type-20801", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20943", +- "self_type" : "type-20942", ++ "referenced_type" : "type-2087", ++ "self_type" : "type-2086", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21044", +- "self_type" : "type-21043", ++ "referenced_type" : "type-20895", ++ "self_type" : "type-20894", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21226", +- "self_type" : "type-21225", ++ "referenced_type" : "type-20996", ++ "self_type" : "type-20995", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21306", +- "self_type" : "type-21305", ++ "referenced_type" : "type-21178", ++ "self_type" : "type-21177", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21364", +- "self_type" : "type-21363", ++ "referenced_type" : "type-21258", ++ "self_type" : "type-21257", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21438", +- "self_type" : "type-21437", ++ "referenced_type" : "type-21316", ++ "self_type" : "type-21315", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-2156", +- "self_type" : "type-2155", ++ "referenced_type" : "type-21390", ++ "self_type" : "type-21389", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21836", +- "self_type" : "type-21835", ++ "referenced_type" : "type-21788", ++ "self_type" : "type-21787", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { +@@ -175610,608 +175652,608 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-22440", +- "self_type" : "type-22439", ++ "referenced_type" : "type-22387", ++ "self_type" : "type-22386", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-22528", +- "self_type" : "type-22527", ++ "referenced_type" : "type-22445", ++ "self_type" : "type-22444", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-22618", +- "self_type" : "type-22617", ++ "referenced_type" : "type-22527", ++ "self_type" : "type-22526", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-22701", +- "self_type" : "type-22700", ++ "referenced_type" : "type-22625", ++ "self_type" : "type-22624", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-22768", +- "self_type" : "type-22767", ++ "referenced_type" : "type-22711", ++ "self_type" : "type-22710", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-22930", +- "self_type" : "type-22929", ++ "referenced_type" : "type-22894", ++ "self_type" : "type-22893", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-23055", +- "self_type" : "type-23054", ++ "referenced_type" : "type-23037", ++ "self_type" : "type-23036", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-23197", +- "self_type" : "type-23196", ++ "referenced_type" : "type-23183", ++ "self_type" : "type-23182", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-23281", +- "self_type" : "type-23280", ++ "referenced_type" : "type-23274", ++ "self_type" : "type-23273", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-23561", +- "self_type" : "type-23560", ++ "referenced_type" : "type-23542", ++ "self_type" : "type-23541", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-23795", +- "self_type" : "type-23794", ++ "referenced_type" : "type-2372", ++ "self_type" : "type-2371", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-23925", +- "self_type" : "type-23924", ++ "referenced_type" : "type-23784", ++ "self_type" : "type-23783", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-24083", +- "self_type" : "type-24082", ++ "referenced_type" : "type-23926", ++ "self_type" : "type-23925", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-24250", +- "self_type" : "type-24249", ++ "referenced_type" : "type-24081", ++ "self_type" : "type-24080", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-24406", +- "self_type" : "type-24405", ++ "referenced_type" : "type-24254", ++ "self_type" : "type-24253", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-2442", +- "self_type" : "type-2441", ++ "referenced_type" : "type-24387", ++ "self_type" : "type-24386", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-24561", +- "self_type" : "type-24560", ++ "referenced_type" : "type-24530", ++ "self_type" : "type-24529", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-24696", +- "self_type" : "type-24695", ++ "referenced_type" : "type-24658", ++ "self_type" : "type-24657", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-24827", +- "self_type" : "type-24826", ++ "referenced_type" : "type-24787", ++ "self_type" : "type-24786", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-24991", +- "self_type" : "type-24990", ++ "referenced_type" : "type-24960", ++ "self_type" : "type-24959", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-25113", +- "self_type" : "type-25112", ++ "referenced_type" : "type-2502", ++ "self_type" : "type-2501", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-25211", +- "self_type" : "type-25210", ++ "referenced_type" : "type-25086", ++ "self_type" : "type-25085", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-25468", +- "self_type" : "type-25467", ++ "referenced_type" : "type-25213", ++ "self_type" : "type-25212", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-25638", +- "self_type" : "type-25637", ++ "referenced_type" : "type-25519", ++ "self_type" : "type-25518", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-2570", +- "self_type" : "type-2569", ++ "referenced_type" : "type-25689", ++ "self_type" : "type-25688", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-25747", +- "self_type" : "type-25746", ++ "referenced_type" : "type-25796", ++ "self_type" : "type-25795", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-25880", +- "self_type" : "type-25879", ++ "referenced_type" : "type-25931", ++ "self_type" : "type-25930", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-26028", +- "self_type" : "type-26027", ++ "referenced_type" : "type-26081", ++ "self_type" : "type-26080", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-26121", +- "self_type" : "type-26120", ++ "referenced_type" : "type-26166", ++ "self_type" : "type-26165", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-26222", +- "self_type" : "type-26221", ++ "referenced_type" : "type-26264", ++ "self_type" : "type-26263", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-26404", +- "self_type" : "type-26403", ++ "referenced_type" : "type-26446", ++ "self_type" : "type-26445", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-26484", +- "self_type" : "type-26483", ++ "referenced_type" : "type-26520", ++ "self_type" : "type-26519", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-26542", +- "self_type" : "type-26541", ++ "referenced_type" : "type-26567", ++ "self_type" : "type-26566", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-26616", +- "self_type" : "type-26615", ++ "referenced_type" : "type-26640", ++ "self_type" : "type-26639", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-27014", +- "self_type" : "type-27013", ++ "referenced_type" : "type-27044", ++ "self_type" : "type-27043", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-27125", +- "self_type" : "type-27124", ++ "referenced_type" : "type-27124", ++ "self_type" : "type-27123", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-27625", +- "self_type" : "type-27624", ++ "referenced_type" : "type-27624", ++ "self_type" : "type-27623", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-27713", +- "self_type" : "type-27712", ++ "referenced_type" : "type-27712", ++ "self_type" : "type-27711", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-27803", +- "self_type" : "type-27802", ++ "referenced_type" : "type-27802", ++ "self_type" : "type-27801", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-27886", +- "self_type" : "type-27885", ++ "referenced_type" : "type-27885", ++ "self_type" : "type-27884", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-27953", +- "self_type" : "type-27952", ++ "referenced_type" : "type-27952", ++ "self_type" : "type-27951", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-28115", +- "self_type" : "type-28114", ++ "referenced_type" : "type-28114", ++ "self_type" : "type-28113", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-28240", +- "self_type" : "type-28239", ++ "referenced_type" : "type-28239", ++ "self_type" : "type-28238", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-28382", +- "self_type" : "type-28381", ++ "referenced_type" : "type-28381", ++ "self_type" : "type-28380", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-28466", +- "self_type" : "type-28465", ++ "referenced_type" : "type-28465", ++ "self_type" : "type-28464", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-28746", +- "self_type" : "type-28745", ++ "referenced_type" : "type-28745", ++ "self_type" : "type-28744", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-28980", +- "self_type" : "type-28979", ++ "referenced_type" : "type-28979", ++ "self_type" : "type-28978", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-29110", +- "self_type" : "type-29109", ++ "referenced_type" : "type-29109", ++ "self_type" : "type-29108", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-29268", +- "self_type" : "type-29267", ++ "referenced_type" : "type-29267", ++ "self_type" : "type-29266", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-29435", +- "self_type" : "type-29434", ++ "referenced_type" : "type-29434", ++ "self_type" : "type-29433", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-29591", +- "self_type" : "type-29590", ++ "referenced_type" : "type-29590", ++ "self_type" : "type-29589", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-29746", +- "self_type" : "type-29745", ++ "referenced_type" : "type-29745", ++ "self_type" : "type-29744", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-29877", +- "self_type" : "type-29876", ++ "referenced_type" : "type-29876", ++ "self_type" : "type-29875", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-30006", +- "self_type" : "type-30005", ++ "referenced_type" : "type-30005", ++ "self_type" : "type-30004", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-30147", +- "self_type" : "type-30146", ++ "referenced_type" : "type-30146", ++ "self_type" : "type-30145", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-30258", +- "self_type" : "type-30257", ++ "referenced_type" : "type-30257", ++ "self_type" : "type-30256", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-30355", +- "self_type" : "type-30354", ++ "referenced_type" : "type-30354", ++ "self_type" : "type-30353", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-30614", +- "self_type" : "type-30613", ++ "referenced_type" : "type-30613", ++ "self_type" : "type-30612", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-30784", +- "self_type" : "type-30783", ++ "referenced_type" : "type-30783", ++ "self_type" : "type-30782", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-30893", +- "self_type" : "type-30892", ++ "referenced_type" : "type-30892", ++ "self_type" : "type-30891", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-31026", +- "self_type" : "type-31025", ++ "referenced_type" : "type-31025", ++ "self_type" : "type-31024", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-31175", +- "self_type" : "type-31174", ++ "referenced_type" : "type-31174", ++ "self_type" : "type-31173", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-31268", +- "self_type" : "type-31267", ++ "referenced_type" : "type-31267", ++ "self_type" : "type-31266", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-31369", +- "self_type" : "type-31368", ++ "referenced_type" : "type-31368", ++ "self_type" : "type-31367", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-31551", +- "self_type" : "type-31550", ++ "referenced_type" : "type-31550", ++ "self_type" : "type-31549", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-31631", +- "self_type" : "type-31630", ++ "referenced_type" : "type-31630", ++ "self_type" : "type-31629", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-31689", +- "self_type" : "type-31688", ++ "referenced_type" : "type-31688", ++ "self_type" : "type-31687", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-31763", +- "self_type" : "type-31762", ++ "referenced_type" : "type-31762", ++ "self_type" : "type-31761", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-32161", +- "self_type" : "type-32160", ++ "referenced_type" : "type-32160", ++ "self_type" : "type-32159", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-3319", +- "self_type" : "type-3318", ++ "referenced_type" : "type-3271", ++ "self_type" : "type-3270", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-3495", +- "self_type" : "type-3494", ++ "referenced_type" : "type-3447", ++ "self_type" : "type-3446", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-3610", +- "self_type" : "type-3609", ++ "referenced_type" : "type-3562", ++ "self_type" : "type-3561", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-3795", +- "self_type" : "type-3794", ++ "referenced_type" : "type-3747", ++ "self_type" : "type-3746", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-3965", +- "self_type" : "type-3964", ++ "referenced_type" : "type-3917", ++ "self_type" : "type-3916", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-4107", +- "self_type" : "type-4106", ++ "referenced_type" : "type-4059", ++ "self_type" : "type-4058", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-4211", +- "self_type" : "type-4210", ++ "referenced_type" : "type-4163", ++ "self_type" : "type-4162", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { +@@ -176219,8 +176261,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-4271", +- "self_type" : "type-4363", ++ "referenced_type" : "type-4223", ++ "self_type" : "type-4315", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -176228,1088 +176270,1088 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-4425", +- "self_type" : "type-4424", ++ "referenced_type" : "type-4377", ++ "self_type" : "type-4376", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-4506", +- "self_type" : "type-4505", ++ "referenced_type" : "type-4458", ++ "self_type" : "type-4457", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-4672", +- "self_type" : "type-4671", ++ "referenced_type" : "type-4624", ++ "self_type" : "type-4623", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-5299", +- "self_type" : "type-5298", ++ "referenced_type" : "type-5251", ++ "self_type" : "type-5250", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-5475", +- "self_type" : "type-5474", ++ "referenced_type" : "type-5427", ++ "self_type" : "type-5426", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-5588", +- "self_type" : "type-5587", ++ "referenced_type" : "type-5540", ++ "self_type" : "type-5539", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-5724", +- "self_type" : "type-5723", ++ "referenced_type" : "type-5676", ++ "self_type" : "type-5675", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-5873", +- "self_type" : "type-5872", ++ "referenced_type" : "type-5825", ++ "self_type" : "type-5824", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-5966", +- "self_type" : "type-5965", ++ "referenced_type" : "type-5918", ++ "self_type" : "type-5917", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-6067", +- "self_type" : "type-6066", ++ "referenced_type" : "type-6019", ++ "self_type" : "type-6018", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-6249", +- "self_type" : "type-6248", ++ "referenced_type" : "type-6201", ++ "self_type" : "type-6200", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-6329", +- "self_type" : "type-6328", ++ "referenced_type" : "type-6281", ++ "self_type" : "type-6280", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-6390", +- "self_type" : "type-6389", ++ "referenced_type" : "type-6342", ++ "self_type" : "type-6341", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-6466", +- "self_type" : "type-6465", ++ "referenced_type" : "type-6418", ++ "self_type" : "type-6417", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-7042", +- "self_type" : "type-7041", ++ "referenced_type" : "type-6994", ++ "self_type" : "type-6993", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-7168", +- "self_type" : "type-7167", ++ "referenced_type" : "type-7120", ++ "self_type" : "type-7119", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-7841", +- "self_type" : "type-7840", ++ "referenced_type" : "type-7793", ++ "self_type" : "type-7792", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-7946", +- "self_type" : "type-7945", ++ "referenced_type" : "type-7898", ++ "self_type" : "type-7897", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-8035", +- "self_type" : "type-8034", ++ "referenced_type" : "type-7987", ++ "self_type" : "type-7986", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-8118", +- "self_type" : "type-8117", ++ "referenced_type" : "type-8070", ++ "self_type" : "type-8069", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-8573", +- "self_type" : "type-8572", ++ "referenced_type" : "type-8525", ++ "self_type" : "type-8524", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-8740", +- "self_type" : "type-8739", ++ "referenced_type" : "type-8692", ++ "self_type" : "type-8691", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-8847", +- "self_type" : "type-8846", ++ "referenced_type" : "type-8799", ++ "self_type" : "type-8798", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-8981", +- "self_type" : "type-8980", ++ "referenced_type" : "type-8933", ++ "self_type" : "type-8932", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-9130", +- "self_type" : "type-9129", ++ "referenced_type" : "type-9082", ++ "self_type" : "type-9081", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-9223", +- "self_type" : "type-9222", ++ "referenced_type" : "type-9175", ++ "self_type" : "type-9174", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-9324", +- "self_type" : "type-9323", ++ "referenced_type" : "type-9276", ++ "self_type" : "type-9275", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-9506", +- "self_type" : "type-9505", ++ "referenced_type" : "type-9458", ++ "self_type" : "type-9457", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-9586", +- "self_type" : "type-9585", ++ "referenced_type" : "type-9538", ++ "self_type" : "type-9537", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-9644", +- "self_type" : "type-9643", ++ "referenced_type" : "type-9596", ++ "self_type" : "type-9595", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-9718", +- "self_type" : "type-9717", ++ "referenced_type" : "type-9670", ++ "self_type" : "type-9669", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-10164", +- "self_type" : "type-10163", ++ "referenced_type" : "type-10116", ++ "self_type" : "type-10115", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-10272", +- "self_type" : "type-10271", ++ "referenced_type" : "type-10224", ++ "self_type" : "type-10223", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-10318", +- "self_type" : "type-10317", ++ "referenced_type" : "type-10270", ++ "self_type" : "type-10269", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-10675", +- "self_type" : "type-10674", ++ "referenced_type" : "type-10627", ++ "self_type" : "type-10626", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-10776", +- "self_type" : "type-10775", ++ "referenced_type" : "type-10728", ++ "self_type" : "type-10727", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-10868", +- "self_type" : "type-10867", ++ "referenced_type" : "type-10820", ++ "self_type" : "type-10819", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-10979", +- "self_type" : "type-10978", ++ "referenced_type" : "type-10931", ++ "self_type" : "type-10930", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-11031", +- "self_type" : "type-11030", ++ "referenced_type" : "type-10983", ++ "self_type" : "type-10982", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-11147", +- "self_type" : "type-11146", ++ "referenced_type" : "type-11099", ++ "self_type" : "type-11098", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-11331", +- "self_type" : "type-11330", ++ "referenced_type" : "type-11283", ++ "self_type" : "type-11282", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-11489", +- "self_type" : "type-11488", ++ "referenced_type" : "type-11441", ++ "self_type" : "type-11440", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-11921", +- "self_type" : "type-11920", ++ "referenced_type" : "type-11873", ++ "self_type" : "type-11872", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-12094", +- "self_type" : "type-12093", ++ "referenced_type" : "type-12046", ++ "self_type" : "type-12045", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-12377", +- "self_type" : "type-12376", ++ "referenced_type" : "type-12329", ++ "self_type" : "type-12328", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-12476", +- "self_type" : "type-12475", ++ "referenced_type" : "type-12428", ++ "self_type" : "type-12427", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-12616", +- "self_type" : "type-12615", ++ "referenced_type" : "type-12568", ++ "self_type" : "type-12567", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-12674", +- "self_type" : "type-12673", ++ "referenced_type" : "type-12626", ++ "self_type" : "type-12625", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-12786", +- "self_type" : "type-12785", ++ "referenced_type" : "type-12738", ++ "self_type" : "type-12737", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-12854", +- "self_type" : "type-12853", ++ "referenced_type" : "type-12806", ++ "self_type" : "type-12805", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-12907", +- "self_type" : "type-12906", ++ "referenced_type" : "type-12859", ++ "self_type" : "type-12858", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-12992", +- "self_type" : "type-12991", ++ "referenced_type" : "type-12944", ++ "self_type" : "type-12943", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-13060", +- "self_type" : "type-13059", ++ "referenced_type" : "type-13012", ++ "self_type" : "type-13011", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-13299", +- "self_type" : "type-13298", ++ "referenced_type" : "type-13251", ++ "self_type" : "type-13250", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-13497", +- "self_type" : "type-13496", ++ "referenced_type" : "type-13449", ++ "self_type" : "type-13448", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-13563", +- "self_type" : "type-13562", ++ "referenced_type" : "type-13515", ++ "self_type" : "type-13514", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-13609", +- "self_type" : "type-13608", ++ "referenced_type" : "type-13561", ++ "self_type" : "type-13560", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-13966", +- "self_type" : "type-13965", ++ "referenced_type" : "type-13918", ++ "self_type" : "type-13917", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-14067", +- "self_type" : "type-14066", ++ "referenced_type" : "type-14019", ++ "self_type" : "type-14018", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-14159", +- "self_type" : "type-14158", ++ "referenced_type" : "type-14111", ++ "self_type" : "type-14110", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-14270", +- "self_type" : "type-14269", ++ "referenced_type" : "type-14222", ++ "self_type" : "type-14221", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-14322", +- "self_type" : "type-14321", ++ "referenced_type" : "type-14274", ++ "self_type" : "type-14273", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-14411", +- "self_type" : "type-14410", ++ "referenced_type" : "type-14363", ++ "self_type" : "type-14362", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-14582", +- "self_type" : "type-14581", ++ "referenced_type" : "type-14534", ++ "self_type" : "type-14533", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-14709", +- "self_type" : "type-14708", ++ "referenced_type" : "type-14661", ++ "self_type" : "type-14660", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-14948", +- "self_type" : "type-14947", ++ "referenced_type" : "type-14900", ++ "self_type" : "type-14899", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-15153", +- "self_type" : "type-15152", ++ "referenced_type" : "type-15105", ++ "self_type" : "type-15104", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-15309", +- "self_type" : "type-15308", ++ "referenced_type" : "type-15261", ++ "self_type" : "type-15260", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-15777", +- "self_type" : "type-15776", ++ "referenced_type" : "type-15729", ++ "self_type" : "type-15728", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-15950", +- "self_type" : "type-15949", ++ "referenced_type" : "type-15902", ++ "self_type" : "type-15901", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16232", +- "self_type" : "type-16231", ++ "referenced_type" : "type-16184", ++ "self_type" : "type-16183", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16333", +- "self_type" : "type-16332", ++ "referenced_type" : "type-16285", ++ "self_type" : "type-16284", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16473", +- "self_type" : "type-16472", ++ "referenced_type" : "type-16425", ++ "self_type" : "type-16424", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16530", +- "self_type" : "type-16529", ++ "referenced_type" : "type-16482", ++ "self_type" : "type-16481", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16642", +- "self_type" : "type-16641", ++ "referenced_type" : "type-16594", ++ "self_type" : "type-16593", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16710", +- "self_type" : "type-16709", ++ "referenced_type" : "type-16662", ++ "self_type" : "type-16661", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16763", +- "self_type" : "type-16762", ++ "referenced_type" : "type-16715", ++ "self_type" : "type-16714", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16848", +- "self_type" : "type-16847", ++ "referenced_type" : "type-16800", ++ "self_type" : "type-16799", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-16916", +- "self_type" : "type-16915", ++ "referenced_type" : "type-16868", ++ "self_type" : "type-16867", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17155", +- "self_type" : "type-17154", ++ "referenced_type" : "type-17107", ++ "self_type" : "type-17106", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17353", +- "self_type" : "type-17352", ++ "referenced_type" : "type-17305", ++ "self_type" : "type-17304", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17427", +- "self_type" : "type-17426", ++ "referenced_type" : "type-17379", ++ "self_type" : "type-17378", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17473", +- "self_type" : "type-17472", ++ "referenced_type" : "type-17425", ++ "self_type" : "type-17424", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17830", +- "self_type" : "type-17829", ++ "referenced_type" : "type-17782", ++ "self_type" : "type-17781", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-17931", +- "self_type" : "type-17930", ++ "referenced_type" : "type-17883", ++ "self_type" : "type-17882", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18023", +- "self_type" : "type-18022", ++ "referenced_type" : "type-17975", ++ "self_type" : "type-17974", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18134", +- "self_type" : "type-18133", ++ "referenced_type" : "type-18086", ++ "self_type" : "type-18085", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18186", +- "self_type" : "type-18185", ++ "referenced_type" : "type-18138", ++ "self_type" : "type-18137", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18275", +- "self_type" : "type-18274", ++ "referenced_type" : "type-18227", ++ "self_type" : "type-18226", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18446", +- "self_type" : "type-18445", ++ "referenced_type" : "type-18398", ++ "self_type" : "type-18397", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18573", +- "self_type" : "type-18572", ++ "referenced_type" : "type-18525", ++ "self_type" : "type-18524", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18805", +- "self_type" : "type-18804", ++ "referenced_type" : "type-18757", ++ "self_type" : "type-18756", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-18937", +- "self_type" : "type-18936", ++ "referenced_type" : "type-18889", ++ "self_type" : "type-18888", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19085", +- "self_type" : "type-19084", ++ "referenced_type" : "type-19037", ++ "self_type" : "type-19036", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19325", +- "self_type" : "type-19324", ++ "referenced_type" : "type-19277", ++ "self_type" : "type-19276", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19469", +- "self_type" : "type-19468", ++ "referenced_type" : "type-19421", ++ "self_type" : "type-19420", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19673", +- "self_type" : "type-19672", ++ "referenced_type" : "type-19625", ++ "self_type" : "type-19624", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19842", +- "self_type" : "type-19841", ++ "referenced_type" : "type-19794", ++ "self_type" : "type-19793", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-19998", +- "self_type" : "type-19997", ++ "referenced_type" : "type-19950", ++ "self_type" : "type-19949", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20311", +- "self_type" : "type-20310", ++ "referenced_type" : "type-20263", ++ "self_type" : "type-20262", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20484", +- "self_type" : "type-20483", ++ "referenced_type" : "type-20436", ++ "self_type" : "type-20435", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20763", +- "self_type" : "type-20762", ++ "referenced_type" : "type-20715", ++ "self_type" : "type-20714", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-20864", +- "self_type" : "type-20863", ++ "referenced_type" : "type-20816", ++ "self_type" : "type-20815", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21004", +- "self_type" : "type-21003", ++ "referenced_type" : "type-20956", ++ "self_type" : "type-20955", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21062", +- "self_type" : "type-21061", ++ "referenced_type" : "type-21014", ++ "self_type" : "type-21013", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21174", +- "self_type" : "type-21173", ++ "referenced_type" : "type-2110", ++ "self_type" : "type-2109", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21242", +- "self_type" : "type-21241", ++ "referenced_type" : "type-21126", ++ "self_type" : "type-21125", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21295", +- "self_type" : "type-21294", ++ "referenced_type" : "type-21194", ++ "self_type" : "type-21193", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21380", +- "self_type" : "type-21379", ++ "referenced_type" : "type-21247", ++ "self_type" : "type-21246", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21448", +- "self_type" : "type-21447", ++ "referenced_type" : "type-21332", ++ "self_type" : "type-21331", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21687", +- "self_type" : "type-21686", ++ "referenced_type" : "type-21400", ++ "self_type" : "type-21399", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-2180", +- "self_type" : "type-2179", ++ "referenced_type" : "type-21639", ++ "self_type" : "type-21638", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21885", +- "self_type" : "type-21884", ++ "referenced_type" : "type-21837", ++ "self_type" : "type-21836", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-21956", +- "self_type" : "type-21955", ++ "referenced_type" : "type-21958", ++ "self_type" : "type-21957", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-22002", +- "self_type" : "type-22001", ++ "referenced_type" : "type-22000", ++ "self_type" : "type-21999", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-22359", +- "self_type" : "type-22358", ++ "referenced_type" : "type-22326", ++ "self_type" : "type-22325", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-22460", +- "self_type" : "type-22459", ++ "referenced_type" : "type-22403", ++ "self_type" : "type-22402", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-22552", +- "self_type" : "type-22551", ++ "referenced_type" : "type-22471", ++ "self_type" : "type-22470", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-22663", +- "self_type" : "type-22662", ++ "referenced_type" : "type-22575", ++ "self_type" : "type-22574", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-22715", +- "self_type" : "type-22714", ++ "referenced_type" : "type-22640", ++ "self_type" : "type-22639", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-22804", +- "self_type" : "type-22803", ++ "referenced_type" : "type-22750", ++ "self_type" : "type-22749", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-22975", +- "self_type" : "type-22974", ++ "referenced_type" : "type-22942", ++ "self_type" : "type-22941", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-23102", +- "self_type" : "type-23101", ++ "referenced_type" : "type-23087", ++ "self_type" : "type-23086", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-23334", +- "self_type" : "type-23333", ++ "referenced_type" : "type-23329", ++ "self_type" : "type-23328", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-23466", +- "self_type" : "type-23465", ++ "referenced_type" : "type-23443", ++ "self_type" : "type-23442", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-23614", +- "self_type" : "type-23613", ++ "referenced_type" : "type-23595", ++ "self_type" : "type-23594", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-23846", +- "self_type" : "type-23845", ++ "referenced_type" : "type-23835", ++ "self_type" : "type-23834", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-23969", +- "self_type" : "type-23968", ++ "referenced_type" : "type-23973", ++ "self_type" : "type-23972", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-24143", +- "self_type" : "type-24142", ++ "referenced_type" : "type-2400", ++ "self_type" : "type-2399", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-24309", +- "self_type" : "type-24308", ++ "referenced_type" : "type-24139", ++ "self_type" : "type-24138", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-24461", +- "self_type" : "type-24460", ++ "referenced_type" : "type-24310", ++ "self_type" : "type-24309", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-24615", +- "self_type" : "type-24614", ++ "referenced_type" : "type-24440", ++ "self_type" : "type-24439", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-2470", +- "self_type" : "type-2469", ++ "referenced_type" : "type-24582", ++ "self_type" : "type-24581", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-24743", +- "self_type" : "type-24742", ++ "referenced_type" : "type-24702", ++ "self_type" : "type-24701", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-24877", +- "self_type" : "type-24876", ++ "referenced_type" : "type-24840", ++ "self_type" : "type-24839", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-25163", +- "self_type" : "type-25162", ++ "referenced_type" : "type-25140", ++ "self_type" : "type-25139", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -177324,738 +177366,738 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-25487", +- "self_type" : "type-25486", ++ "referenced_type" : "type-25538", ++ "self_type" : "type-25537", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-25660", +- "self_type" : "type-25659", ++ "referenced_type" : "type-25711", ++ "self_type" : "type-25710", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-25942", +- "self_type" : "type-25941", ++ "referenced_type" : "type-25993", ++ "self_type" : "type-25992", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-26042", +- "self_type" : "type-26041", ++ "referenced_type" : "type-26095", ++ "self_type" : "type-26094", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-26182", +- "self_type" : "type-26181", ++ "referenced_type" : "type-26226", ++ "self_type" : "type-26225", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-26240", +- "self_type" : "type-26239", ++ "referenced_type" : "type-26282", ++ "self_type" : "type-26281", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-26352", +- "self_type" : "type-26351", ++ "referenced_type" : "type-26395", ++ "self_type" : "type-26394", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-26420", +- "self_type" : "type-26419", ++ "referenced_type" : "type-26462", ++ "self_type" : "type-26461", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-26473", +- "self_type" : "type-26472", ++ "referenced_type" : "type-26509", ++ "self_type" : "type-26508", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-26558", +- "self_type" : "type-26557", ++ "referenced_type" : "type-26585", ++ "self_type" : "type-26584", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-26626", +- "self_type" : "type-26625", ++ "referenced_type" : "type-26648", ++ "self_type" : "type-26647", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-26865", +- "self_type" : "type-26864", ++ "referenced_type" : "type-26889", ++ "self_type" : "type-26888", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-27063", +- "self_type" : "type-27062", ++ "referenced_type" : "type-27093", ++ "self_type" : "type-27092", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-27141", +- "self_type" : "type-27140", ++ "referenced_type" : "type-27140", ++ "self_type" : "type-27139", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-27187", +- "self_type" : "type-27186", ++ "referenced_type" : "type-27186", ++ "self_type" : "type-27185", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-27544", +- "self_type" : "type-27543", ++ "referenced_type" : "type-27543", ++ "self_type" : "type-27542", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-27645", +- "self_type" : "type-27644", ++ "referenced_type" : "type-27644", ++ "self_type" : "type-27643", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-27737", +- "self_type" : "type-27736", ++ "referenced_type" : "type-27736", ++ "self_type" : "type-27735", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-27848", +- "self_type" : "type-27847", ++ "referenced_type" : "type-27847", ++ "self_type" : "type-27846", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-27900", +- "self_type" : "type-27899", ++ "referenced_type" : "type-27899", ++ "self_type" : "type-27898", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-27989", +- "self_type" : "type-27988", ++ "referenced_type" : "type-27988", ++ "self_type" : "type-27987", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-28160", +- "self_type" : "type-28159", ++ "referenced_type" : "type-28159", ++ "self_type" : "type-28158", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-28287", +- "self_type" : "type-28286", ++ "referenced_type" : "type-28286", ++ "self_type" : "type-28285", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-28519", +- "self_type" : "type-28518", ++ "referenced_type" : "type-28518", ++ "self_type" : "type-28517", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-28651", +- "self_type" : "type-28650", ++ "referenced_type" : "type-28650", ++ "self_type" : "type-28649", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-28799", +- "self_type" : "type-28798", ++ "referenced_type" : "type-28798", ++ "self_type" : "type-28797", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-29031", +- "self_type" : "type-29030", ++ "referenced_type" : "type-29030", ++ "self_type" : "type-29029", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-29154", +- "self_type" : "type-29153", ++ "referenced_type" : "type-29153", ++ "self_type" : "type-29152", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-29328", +- "self_type" : "type-29327", ++ "referenced_type" : "type-29327", ++ "self_type" : "type-29326", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-29494", +- "self_type" : "type-29493", ++ "referenced_type" : "type-29493", ++ "self_type" : "type-29492", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-29646", +- "self_type" : "type-29645", ++ "referenced_type" : "type-29645", ++ "self_type" : "type-29644", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-29800", +- "self_type" : "type-29799", ++ "referenced_type" : "type-29799", ++ "self_type" : "type-29798", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-29924", +- "self_type" : "type-29923", ++ "referenced_type" : "type-29923", ++ "self_type" : "type-29922", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-30056", +- "self_type" : "type-30055", ++ "referenced_type" : "type-30055", ++ "self_type" : "type-30054", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-30308", +- "self_type" : "type-30307", ++ "referenced_type" : "type-30307", ++ "self_type" : "type-30306", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-30402", +- "self_type" : "type-30401", ++ "referenced_type" : "type-30401", ++ "self_type" : "type-30400", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-30633", +- "self_type" : "type-30632", ++ "referenced_type" : "type-30632", ++ "self_type" : "type-30631", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-30806", +- "self_type" : "type-30805", ++ "referenced_type" : "type-30805", ++ "self_type" : "type-30804", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-31088", +- "self_type" : "type-31087", ++ "referenced_type" : "type-31087", ++ "self_type" : "type-31086", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-31189", +- "self_type" : "type-31188", ++ "referenced_type" : "type-31188", ++ "self_type" : "type-31187", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-31329", +- "self_type" : "type-31328", ++ "referenced_type" : "type-31328", ++ "self_type" : "type-31327", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-31387", +- "self_type" : "type-31386", ++ "referenced_type" : "type-31386", ++ "self_type" : "type-31385", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-31499", +- "self_type" : "type-31498", ++ "referenced_type" : "type-31498", ++ "self_type" : "type-31497", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-31567", +- "self_type" : "type-31566", ++ "referenced_type" : "type-31566", ++ "self_type" : "type-31565", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-31620", +- "self_type" : "type-31619", ++ "referenced_type" : "type-31619", ++ "self_type" : "type-31618", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-31705", +- "self_type" : "type-31704", ++ "referenced_type" : "type-31704", ++ "self_type" : "type-31703", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-31773", +- "self_type" : "type-31772", ++ "referenced_type" : "type-31772", ++ "self_type" : "type-31771", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-32012", +- "self_type" : "type-32011", ++ "referenced_type" : "type-32011", ++ "self_type" : "type-32010", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-32210", +- "self_type" : "type-32209", ++ "referenced_type" : "type-32209", ++ "self_type" : "type-32208", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-3338", +- "self_type" : "type-3337", ++ "referenced_type" : "type-3290", ++ "self_type" : "type-3289", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-3517", +- "self_type" : "type-3516", ++ "referenced_type" : "type-3469", ++ "self_type" : "type-3468", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-3860", +- "self_type" : "type-3859", ++ "referenced_type" : "type-3812", ++ "self_type" : "type-3811", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-3979", +- "self_type" : "type-3978", ++ "referenced_type" : "type-3931", ++ "self_type" : "type-3930", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-4168", +- "self_type" : "type-4167", ++ "referenced_type" : "type-4120", ++ "self_type" : "type-4119", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-4231", +- "self_type" : "type-4230", ++ "referenced_type" : "type-4183", ++ "self_type" : "type-4182", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-4372", +- "self_type" : "type-4371", ++ "referenced_type" : "type-4324", ++ "self_type" : "type-4323", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-4443", +- "self_type" : "type-4442", ++ "referenced_type" : "type-4395", ++ "self_type" : "type-4394", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-4495", +- "self_type" : "type-4494", ++ "referenced_type" : "type-4447", ++ "self_type" : "type-4446", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-4688", +- "self_type" : "type-4687", ++ "referenced_type" : "type-4640", ++ "self_type" : "type-4639", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-5318", +- "self_type" : "type-5317", ++ "referenced_type" : "type-5270", ++ "self_type" : "type-5269", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-5497", +- "self_type" : "type-5496", ++ "referenced_type" : "type-5449", ++ "self_type" : "type-5448", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-5786", +- "self_type" : "type-5785", ++ "referenced_type" : "type-5738", ++ "self_type" : "type-5737", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +- "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-584", +- "self_type" : "type-654", +- "size" : 16, ++ "referenced_type" : "type-5839", ++ "self_type" : "type-5838", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { ++ "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-5887", +- "self_type" : "type-5886", ++ "referenced_type" : "type-584", ++ "self_type" : "type-654", ++ "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-6027", +- "self_type" : "type-6026", ++ "referenced_type" : "type-5979", ++ "self_type" : "type-5978", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-6085", +- "self_type" : "type-6084", ++ "referenced_type" : "type-6037", ++ "self_type" : "type-6036", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-6197", +- "self_type" : "type-6196", ++ "referenced_type" : "type-6149", ++ "self_type" : "type-6148", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-6265", +- "self_type" : "type-6264", ++ "referenced_type" : "type-6217", ++ "self_type" : "type-6216", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-6318", +- "self_type" : "type-6317", ++ "referenced_type" : "type-6270", ++ "self_type" : "type-6269", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-6408", +- "self_type" : "type-6407", ++ "referenced_type" : "type-6360", ++ "self_type" : "type-6359", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-6477", +- "self_type" : "type-6476", ++ "referenced_type" : "type-6429", ++ "self_type" : "type-6428", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-6850", +- "self_type" : "type-6849", ++ "referenced_type" : "type-6802", ++ "self_type" : "type-6801", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-7091", +- "self_type" : "type-7090", ++ "referenced_type" : "type-7043", ++ "self_type" : "type-7042", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-7184", +- "self_type" : "type-7183", ++ "referenced_type" : "type-7136", ++ "self_type" : "type-7135", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-7271", +- "self_type" : "type-7270", ++ "referenced_type" : "type-7223", ++ "self_type" : "type-7222", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-7760", +- "self_type" : "type-7759", ++ "referenced_type" : "type-7712", ++ "self_type" : "type-7711", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-7863", +- "self_type" : "type-7862", ++ "referenced_type" : "type-7815", ++ "self_type" : "type-7814", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-7970", +- "self_type" : "type-7969", ++ "referenced_type" : "type-7922", ++ "self_type" : "type-7921", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-8080", +- "self_type" : "type-8079", ++ "referenced_type" : "type-8032", ++ "self_type" : "type-8031", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-8132", +- "self_type" : "type-8131", ++ "referenced_type" : "type-8084", ++ "self_type" : "type-8083", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-8592", +- "self_type" : "type-8591", ++ "referenced_type" : "type-8544", ++ "self_type" : "type-8543", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-8762", +- "self_type" : "type-8761", ++ "referenced_type" : "type-8714", ++ "self_type" : "type-8713", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-9043", +- "self_type" : "type-9042", ++ "referenced_type" : "type-8995", ++ "self_type" : "type-8994", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-9144", +- "self_type" : "type-9143", ++ "referenced_type" : "type-9096", ++ "self_type" : "type-9095", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-9284", +- "self_type" : "type-9283", ++ "referenced_type" : "type-9236", ++ "self_type" : "type-9235", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-9342", +- "self_type" : "type-9341", ++ "referenced_type" : "type-9294", ++ "self_type" : "type-9293", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-9454", +- "self_type" : "type-9453", ++ "referenced_type" : "type-9406", ++ "self_type" : "type-9405", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-9522", +- "self_type" : "type-9521", ++ "referenced_type" : "type-9474", ++ "self_type" : "type-9473", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-9575", +- "self_type" : "type-9574", ++ "referenced_type" : "type-9527", ++ "self_type" : "type-9526", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-9660", +- "self_type" : "type-9659", ++ "referenced_type" : "type-9612", ++ "self_type" : "type-9611", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-9728", +- "self_type" : "type-9727", ++ "referenced_type" : "type-9680", ++ "self_type" : "type-9679", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-9966", +- "self_type" : "type-9965", ++ "referenced_type" : "type-9918", ++ "self_type" : "type-9917", + "source_file" : "/external/protobuf/src/google/protobuf/extension_set.h" + }, + { +@@ -178073,8 +178115,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-2343", +- "self_type" : "type-2424", ++ "referenced_type" : "type-2270", ++ "self_type" : "type-2354", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -178083,8 +178125,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-1705", +- "self_type" : "type-2110", ++ "referenced_type" : "type-1619", ++ "self_type" : "type-2043", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -178093,8 +178135,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-2346", +- "self_type" : "type-2429", ++ "referenced_type" : "type-2273", ++ "self_type" : "type-2359", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -178103,8 +178145,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-1697", +- "self_type" : "type-2094", ++ "referenced_type" : "type-1611", ++ "self_type" : "type-2027", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -178113,8 +178155,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-2285", +- "self_type" : "type-2411", ++ "referenced_type" : "type-2214", ++ "self_type" : "type-2343", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -178123,8 +178165,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-1703", +- "self_type" : "type-2078", ++ "referenced_type" : "type-1617", ++ "self_type" : "type-2011", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -178133,8 +178175,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-1715", +- "self_type" : "type-2126", ++ "referenced_type" : "type-1629", ++ "self_type" : "type-2059", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -178143,8 +178185,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-1682", +- "self_type" : "type-2115", ++ "referenced_type" : "type-1596", ++ "self_type" : "type-2048", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -178153,8 +178195,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-1684", +- "self_type" : "type-2120", ++ "referenced_type" : "type-1598", ++ "self_type" : "type-2053", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -178163,8 +178205,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField", + "name" : "const google::protobuf::RepeatedPtrField", +- "referenced_type" : "type-7235", +- "self_type" : "type-7562", ++ "referenced_type" : "type-7187", ++ "self_type" : "type-7514", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -178173,8 +178215,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> >", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> >", +- "referenced_type" : "type-7575", +- "self_type" : "type-7576", ++ "referenced_type" : "type-7527", ++ "self_type" : "type-7528", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -178182,104 +178224,104 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > >", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > >", +- "referenced_type" : "type-12176", +- "self_type" : "type-12175", ++ "referenced_type" : "type-12128", ++ "self_type" : "type-12127", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > >", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > >", +- "referenced_type" : "type-14799", +- "self_type" : "type-14798", ++ "referenced_type" : "type-14751", ++ "self_type" : "type-14750", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > >", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > >", +- "referenced_type" : "type-16031", +- "self_type" : "type-16030", ++ "referenced_type" : "type-15983", ++ "self_type" : "type-15982", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > >", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > >", +- "referenced_type" : "type-18663", +- "self_type" : "type-18662", ++ "referenced_type" : "type-18615", ++ "self_type" : "type-18614", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > >", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > >", +- "referenced_type" : "type-20563", +- "self_type" : "type-20562", ++ "referenced_type" : "type-20515", ++ "self_type" : "type-20514", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > >", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > >", +- "referenced_type" : "type-23192", +- "self_type" : "type-23191", ++ "referenced_type" : "type-23178", ++ "self_type" : "type-23177", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > >", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > >", +- "referenced_type" : "type-24986", +- "self_type" : "type-24985", ++ "referenced_type" : "type-24955", ++ "self_type" : "type-24954", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > >", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > >", +- "referenced_type" : "type-2565", +- "self_type" : "type-2564", ++ "referenced_type" : "type-2497", ++ "self_type" : "type-2496", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > >", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > >", +- "referenced_type" : "type-25742", +- "self_type" : "type-25741", ++ "referenced_type" : "type-25791", ++ "self_type" : "type-25790", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > >", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > >", +- "referenced_type" : "type-28377", +- "self_type" : "type-28376", ++ "referenced_type" : "type-28376", ++ "self_type" : "type-28375", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > >", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > >", +- "referenced_type" : "type-30142", +- "self_type" : "type-30141", ++ "referenced_type" : "type-30141", ++ "self_type" : "type-30140", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > >", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > >", +- "referenced_type" : "type-30888", +- "self_type" : "type-30887", ++ "referenced_type" : "type-30887", ++ "self_type" : "type-30886", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > >", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > >", +- "referenced_type" : "type-3605", +- "self_type" : "type-3604", ++ "referenced_type" : "type-3557", ++ "self_type" : "type-3556", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { +@@ -178296,16 +178338,16 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > >", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > >", +- "referenced_type" : "type-5583", +- "self_type" : "type-5582", ++ "referenced_type" : "type-5535", ++ "self_type" : "type-5534", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::RepeatedPtrField, std::allocator > >", + "name" : "const google::protobuf::RepeatedPtrField, std::allocator > >", +- "referenced_type" : "type-8842", +- "self_type" : "type-8841", ++ "referenced_type" : "type-8794", ++ "self_type" : "type-8793", + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, + { +@@ -178313,8 +178355,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceDescriptor", + "name" : "const google::protobuf::ServiceDescriptor", +- "referenced_type" : "type-1985", +- "self_type" : "type-1991", ++ "referenced_type" : "type-1911", ++ "self_type" : "type-1917", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -178323,8 +178365,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceDescriptorProto", + "name" : "const google::protobuf::ServiceDescriptorProto", +- "referenced_type" : "type-1704", +- "self_type" : "type-1887", ++ "referenced_type" : "type-1618", ++ "self_type" : "type-1805", + "size" : 40, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -178333,8 +178375,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceDescriptorProto *const", + "name" : "const google::protobuf::ServiceDescriptorProto *const", +- "referenced_type" : "type-1888", +- "self_type" : "type-4126", ++ "referenced_type" : "type-1807", ++ "self_type" : "type-4078", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -178342,426 +178384,426 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-12143", +- "self_type" : "type-12142", ++ "referenced_type" : "type-12095", ++ "self_type" : "type-12094", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-13211", +- "self_type" : "type-13210", ++ "referenced_type" : "type-13163", ++ "self_type" : "type-13162", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-14762", +- "self_type" : "type-14761", ++ "referenced_type" : "type-14714", ++ "self_type" : "type-14713", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-14853", +- "self_type" : "type-14852", ++ "referenced_type" : "type-14805", ++ "self_type" : "type-14804", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-15116", +- "self_type" : "type-15115", ++ "referenced_type" : "type-15068", ++ "self_type" : "type-15067", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-15216", +- "self_type" : "type-15215", ++ "referenced_type" : "type-15168", ++ "self_type" : "type-15167", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-15998", +- "self_type" : "type-15997", ++ "referenced_type" : "type-15950", ++ "self_type" : "type-15949", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { ++ "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-17067", +- "self_type" : "type-17066", ++ "referenced_type" : "type-1624", ++ "self_type" : "type-1913", ++ "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +- "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-1710", +- "self_type" : "type-1987", +- "size" : 52, ++ "referenced_type" : "type-17019", ++ "self_type" : "type-17018", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-18626", +- "self_type" : "type-18625", ++ "referenced_type" : "type-18578", ++ "self_type" : "type-18577", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-18710", +- "self_type" : "type-18709", ++ "referenced_type" : "type-18662", ++ "self_type" : "type-18661", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-18900", +- "self_type" : "type-18899", ++ "referenced_type" : "type-18852", ++ "self_type" : "type-18851", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-18998", +- "self_type" : "type-18997", ++ "referenced_type" : "type-18950", ++ "self_type" : "type-18949", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-19241", +- "self_type" : "type-19240", ++ "referenced_type" : "type-19193", ++ "self_type" : "type-19192", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-19570", +- "self_type" : "type-19569", ++ "referenced_type" : "type-19522", ++ "self_type" : "type-19521", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-19741", +- "self_type" : "type-19740", ++ "referenced_type" : "type-19693", ++ "self_type" : "type-19692", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-19908", +- "self_type" : "type-19907", ++ "referenced_type" : "type-19860", ++ "self_type" : "type-19859", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-20530", +- "self_type" : "type-20529", ++ "referenced_type" : "type-20482", ++ "self_type" : "type-20481", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-21599", +- "self_type" : "type-21598", ++ "referenced_type" : "type-21551", ++ "self_type" : "type-21550", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-23155", +- "self_type" : "type-23154", ++ "referenced_type" : "type-23140", ++ "self_type" : "type-23139", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-23239", +- "self_type" : "type-23238", ++ "referenced_type" : "type-23228", ++ "self_type" : "type-23227", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-23429", +- "self_type" : "type-23428", ++ "referenced_type" : "type-23412", ++ "self_type" : "type-23411", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-23527", +- "self_type" : "type-23526", ++ "referenced_type" : "type-23505", ++ "self_type" : "type-23504", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-23762", +- "self_type" : "type-23761", ++ "referenced_type" : "type-23749", ++ "self_type" : "type-23748", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-24040", +- "self_type" : "type-24039", ++ "referenced_type" : "type-24039", ++ "self_type" : "type-24038", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-24208", +- "self_type" : "type-24207", ++ "referenced_type" : "type-24213", ++ "self_type" : "type-24212", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-24373", +- "self_type" : "type-24372", ++ "referenced_type" : "type-24354", ++ "self_type" : "type-24353", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-24513", +- "self_type" : "type-24512", ++ "referenced_type" : "type-24491", ++ "self_type" : "type-24490", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-24796", +- "self_type" : "type-24795", ++ "referenced_type" : "type-2464", ++ "self_type" : "type-2463", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-24952", +- "self_type" : "type-24951", ++ "referenced_type" : "type-24754", ++ "self_type" : "type-24753", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-25081", +- "self_type" : "type-25080", ++ "referenced_type" : "type-24920", ++ "self_type" : "type-24919", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-2534", +- "self_type" : "type-2533", ++ "referenced_type" : "type-25052", ++ "self_type" : "type-25051", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-25709", +- "self_type" : "type-25708", ++ "referenced_type" : "type-25760", ++ "self_type" : "type-25759", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-26777", +- "self_type" : "type-26776", ++ "referenced_type" : "type-26799", ++ "self_type" : "type-26798", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-28340", +- "self_type" : "type-28339", ++ "referenced_type" : "type-28339", ++ "self_type" : "type-28338", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-28424", +- "self_type" : "type-28423", ++ "referenced_type" : "type-28423", ++ "self_type" : "type-28422", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-28614", +- "self_type" : "type-28613", ++ "referenced_type" : "type-28613", ++ "self_type" : "type-28612", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-28712", +- "self_type" : "type-28711", ++ "referenced_type" : "type-28711", ++ "self_type" : "type-28710", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-28947", +- "self_type" : "type-28946", ++ "referenced_type" : "type-28946", ++ "self_type" : "type-28945", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-29225", +- "self_type" : "type-29224", ++ "referenced_type" : "type-29224", ++ "self_type" : "type-29223", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-29393", +- "self_type" : "type-29392", ++ "referenced_type" : "type-29392", ++ "self_type" : "type-29391", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-29558", +- "self_type" : "type-29557", ++ "referenced_type" : "type-29557", ++ "self_type" : "type-29556", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-29698", +- "self_type" : "type-29697", ++ "referenced_type" : "type-29697", ++ "self_type" : "type-29696", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-29975", +- "self_type" : "type-29974", ++ "referenced_type" : "type-29974", ++ "self_type" : "type-29973", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-30108", +- "self_type" : "type-30107", ++ "referenced_type" : "type-30107", ++ "self_type" : "type-30106", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-30226", +- "self_type" : "type-30225", ++ "referenced_type" : "type-30225", ++ "self_type" : "type-30224", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-30855", +- "self_type" : "type-30854", ++ "referenced_type" : "type-30854", ++ "self_type" : "type-30853", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-31924", +- "self_type" : "type-31923", ++ "referenced_type" : "type-31923", ++ "self_type" : "type-31922", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-3572", +- "self_type" : "type-3571", ++ "referenced_type" : "type-3524", ++ "self_type" : "type-3523", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-5550", +- "self_type" : "type-5549", ++ "referenced_type" : "type-5502", ++ "self_type" : "type-5501", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-6723", +- "self_type" : "type-6722", ++ "referenced_type" : "type-6675", ++ "self_type" : "type-6674", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-8809", +- "self_type" : "type-8808", ++ "referenced_type" : "type-8761", ++ "self_type" : "type-8760", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions", + "name" : "const google::protobuf::ServiceOptions", +- "referenced_type" : "type-9879", +- "self_type" : "type-9878", ++ "referenced_type" : "type-9831", ++ "self_type" : "type-9830", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -178769,8 +178811,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::ServiceOptions *const", + "name" : "const google::protobuf::ServiceOptions *const", +- "referenced_type" : "type-1986", +- "self_type" : "type-4140", ++ "referenced_type" : "type-1912", ++ "self_type" : "type-4092", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -178778,426 +178820,426 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-12157", +- "self_type" : "type-12156", ++ "referenced_type" : "type-12109", ++ "self_type" : "type-12108", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-13226", +- "self_type" : "type-13225", ++ "referenced_type" : "type-13178", ++ "self_type" : "type-13177", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-14777", +- "self_type" : "type-14776", ++ "referenced_type" : "type-14729", ++ "self_type" : "type-14728", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-14869", +- "self_type" : "type-14868", ++ "referenced_type" : "type-14821", ++ "self_type" : "type-14820", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-15133", +- "self_type" : "type-15132", ++ "referenced_type" : "type-15085", ++ "self_type" : "type-15084", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-15239", +- "self_type" : "type-15238", ++ "referenced_type" : "type-15191", ++ "self_type" : "type-15190", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-16012", +- "self_type" : "type-16011", ++ "referenced_type" : "type-15964", ++ "self_type" : "type-15963", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { ++ "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-17082", +- "self_type" : "type-17081", ++ "referenced_type" : "type-1628", ++ "self_type" : "type-1942", ++ "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +- "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-1714", +- "self_type" : "type-2016", +- "size" : 32, ++ "referenced_type" : "type-17034", ++ "self_type" : "type-17033", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-18641", +- "self_type" : "type-18640", ++ "referenced_type" : "type-18593", ++ "self_type" : "type-18592", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-18726", +- "self_type" : "type-18725", ++ "referenced_type" : "type-18678", ++ "self_type" : "type-18677", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-18917", +- "self_type" : "type-18916", ++ "referenced_type" : "type-18869", ++ "self_type" : "type-18868", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-19015", +- "self_type" : "type-19014", ++ "referenced_type" : "type-18967", ++ "self_type" : "type-18966", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-19256", +- "self_type" : "type-19255", ++ "referenced_type" : "type-19208", ++ "self_type" : "type-19207", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-19586", +- "self_type" : "type-19585", ++ "referenced_type" : "type-19538", ++ "self_type" : "type-19537", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-19756", +- "self_type" : "type-19755", ++ "referenced_type" : "type-19708", ++ "self_type" : "type-19707", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-19926", +- "self_type" : "type-19925", ++ "referenced_type" : "type-19878", ++ "self_type" : "type-19877", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-20544", +- "self_type" : "type-20543", ++ "referenced_type" : "type-20496", ++ "self_type" : "type-20495", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-21614", +- "self_type" : "type-21613", ++ "referenced_type" : "type-21566", ++ "self_type" : "type-21565", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-23170", +- "self_type" : "type-23169", ++ "referenced_type" : "type-23154", ++ "self_type" : "type-23153", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-23255", +- "self_type" : "type-23254", ++ "referenced_type" : "type-23245", ++ "self_type" : "type-23244", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-23446", +- "self_type" : "type-23445", ++ "referenced_type" : "type-23426", ++ "self_type" : "type-23425", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-23544", +- "self_type" : "type-23543", ++ "referenced_type" : "type-23522", ++ "self_type" : "type-23521", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-23777", +- "self_type" : "type-23776", ++ "referenced_type" : "type-23763", ++ "self_type" : "type-23762", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-24056", +- "self_type" : "type-24055", ++ "referenced_type" : "type-24053", ++ "self_type" : "type-24052", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-24223", +- "self_type" : "type-24222", ++ "referenced_type" : "type-24227", ++ "self_type" : "type-24226", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-24389", +- "self_type" : "type-24388", ++ "referenced_type" : "type-24370", ++ "self_type" : "type-24369", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-24530", +- "self_type" : "type-24529", ++ "referenced_type" : "type-24507", ++ "self_type" : "type-24506", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-24811", +- "self_type" : "type-24810", ++ "referenced_type" : "type-24771", ++ "self_type" : "type-24770", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-24966", +- "self_type" : "type-24965", ++ "referenced_type" : "type-2478", ++ "self_type" : "type-2477", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-25097", +- "self_type" : "type-25096", ++ "referenced_type" : "type-24934", ++ "self_type" : "type-24933", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-2548", +- "self_type" : "type-2547", ++ "referenced_type" : "type-25069", ++ "self_type" : "type-25068", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-25723", +- "self_type" : "type-25722", ++ "referenced_type" : "type-25774", ++ "self_type" : "type-25773", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-26792", +- "self_type" : "type-26791", ++ "referenced_type" : "type-26814", ++ "self_type" : "type-26813", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-28355", +- "self_type" : "type-28354", ++ "referenced_type" : "type-28354", ++ "self_type" : "type-28353", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-28440", +- "self_type" : "type-28439", ++ "referenced_type" : "type-28439", ++ "self_type" : "type-28438", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-28631", +- "self_type" : "type-28630", ++ "referenced_type" : "type-28630", ++ "self_type" : "type-28629", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-28729", +- "self_type" : "type-28728", ++ "referenced_type" : "type-28728", ++ "self_type" : "type-28727", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-28962", +- "self_type" : "type-28961", ++ "referenced_type" : "type-28961", ++ "self_type" : "type-28960", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-29241", +- "self_type" : "type-29240", ++ "referenced_type" : "type-29240", ++ "self_type" : "type-29239", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-29408", +- "self_type" : "type-29407", ++ "referenced_type" : "type-29407", ++ "self_type" : "type-29406", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-29574", +- "self_type" : "type-29573", ++ "referenced_type" : "type-29573", ++ "self_type" : "type-29572", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-29715", +- "self_type" : "type-29714", ++ "referenced_type" : "type-29714", ++ "self_type" : "type-29713", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-29990", +- "self_type" : "type-29989", ++ "referenced_type" : "type-29989", ++ "self_type" : "type-29988", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-30122", +- "self_type" : "type-30121", ++ "referenced_type" : "type-30121", ++ "self_type" : "type-30120", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-30242", +- "self_type" : "type-30241", ++ "referenced_type" : "type-30241", ++ "self_type" : "type-30240", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-30869", +- "self_type" : "type-30868", ++ "referenced_type" : "type-30868", ++ "self_type" : "type-30867", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-31939", +- "self_type" : "type-31938", ++ "referenced_type" : "type-31938", ++ "self_type" : "type-31937", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-3586", +- "self_type" : "type-3585", ++ "referenced_type" : "type-3538", ++ "self_type" : "type-3537", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-5564", +- "self_type" : "type-5563", ++ "referenced_type" : "type-5516", ++ "self_type" : "type-5515", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-6739", +- "self_type" : "type-6738", ++ "referenced_type" : "type-6691", ++ "self_type" : "type-6690", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-8823", +- "self_type" : "type-8822", ++ "referenced_type" : "type-8775", ++ "self_type" : "type-8774", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo", + "name" : "const google::protobuf::SourceCodeInfo", +- "referenced_type" : "type-9894", +- "self_type" : "type-9893", ++ "referenced_type" : "type-9846", ++ "self_type" : "type-9845", + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, + { +@@ -179205,8 +179247,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo *const", + "name" : "const google::protobuf::SourceCodeInfo *const", +- "referenced_type" : "type-2015", +- "self_type" : "type-4148", ++ "referenced_type" : "type-1941", ++ "self_type" : "type-4100", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -179215,8 +179257,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo_Location", + "name" : "const google::protobuf::SourceCodeInfo_Location", +- "referenced_type" : "type-1716", +- "self_type" : "type-1923", ++ "referenced_type" : "type-1630", ++ "self_type" : "type-1844", + "size" : 72, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -179225,8 +179267,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceCodeInfo_Location *const", + "name" : "const google::protobuf::SourceCodeInfo_Location *const", +- "referenced_type" : "type-1924", +- "self_type" : "type-4146", ++ "referenced_type" : "type-1845", ++ "self_type" : "type-4098", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -179235,8 +179277,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceContext", + "name" : "const google::protobuf::SourceContext", +- "referenced_type" : "type-2345", +- "self_type" : "type-2474", ++ "referenced_type" : "type-2272", ++ "self_type" : "type-2404", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/source_context.pb.h" + }, +@@ -179245,8 +179287,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::SourceContext *const", + "name" : "const google::protobuf::SourceContext *const", +- "referenced_type" : "type-2476", +- "self_type" : "type-4675", ++ "referenced_type" : "type-2406", ++ "self_type" : "type-4627", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -179265,8 +179307,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::StringValue", + "name" : "const google::protobuf::StringValue", +- "referenced_type" : "type-11055", +- "self_type" : "type-11127", ++ "referenced_type" : "type-11007", ++ "self_type" : "type-11079", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -179275,8 +179317,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::StringValue *const", + "name" : "const google::protobuf::StringValue *const", +- "referenced_type" : "type-11126", +- "self_type" : "type-11125", ++ "referenced_type" : "type-11078", ++ "self_type" : "type-11077", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -179285,8 +179327,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Struct", + "name" : "const google::protobuf::Struct", +- "referenced_type" : "type-7218", +- "self_type" : "type-7281", ++ "referenced_type" : "type-7170", ++ "self_type" : "type-7233", + "size" : 60, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -179295,8 +179337,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Struct *const", + "name" : "const google::protobuf::Struct *const", +- "referenced_type" : "type-7591", +- "self_type" : "type-7590", ++ "referenced_type" : "type-7543", ++ "self_type" : "type-7542", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -179305,8 +179347,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Syntax", + "name" : "const google::protobuf::Syntax", +- "referenced_type" : "type-2481", +- "self_type" : "type-2486", ++ "referenced_type" : "type-2411", ++ "self_type" : "type-2416", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, +@@ -179315,8 +179357,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::TextFormat::FieldValuePrinter", + "name" : "const google::protobuf::TextFormat::FieldValuePrinter", +- "referenced_type" : "type-3726", +- "self_type" : "type-3725", ++ "referenced_type" : "type-3678", ++ "self_type" : "type-3677", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -179325,8 +179367,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::TextFormat::FieldValuePrinter *const", + "name" : "const google::protobuf::TextFormat::FieldValuePrinter *const", +- "referenced_type" : "type-3724", +- "self_type" : "type-7775", ++ "referenced_type" : "type-3676", ++ "self_type" : "type-7727", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -179335,8 +179377,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::TextFormat::ParseInfoTree", + "name" : "const google::protobuf::TextFormat::ParseInfoTree", +- "referenced_type" : "type-3872", +- "self_type" : "type-7689", ++ "referenced_type" : "type-3824", ++ "self_type" : "type-7641", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, +@@ -179345,8 +179387,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::TextFormat::Printer", + "name" : "const google::protobuf::TextFormat::Printer", +- "referenced_type" : "type-3866", +- "self_type" : "type-7684", ++ "referenced_type" : "type-3818", ++ "self_type" : "type-7636", + "size" : 40, + "source_file" : "/external/protobuf/src/google/protobuf/text_format.h" + }, +@@ -179355,8 +179397,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Timestamp", + "name" : "const google::protobuf::Timestamp", +- "referenced_type" : "type-7806", +- "self_type" : "type-7847", ++ "referenced_type" : "type-7758", ++ "self_type" : "type-7799", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -179365,8 +179407,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Timestamp *const", + "name" : "const google::protobuf::Timestamp *const", +- "referenced_type" : "type-7846", +- "self_type" : "type-7845", ++ "referenced_type" : "type-7798", ++ "self_type" : "type-7797", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -179375,8 +179417,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Type", + "name" : "const google::protobuf::Type", +- "referenced_type" : "type-2487", +- "self_type" : "type-2490", ++ "referenced_type" : "type-2417", ++ "self_type" : "type-2420", + "size" : 76, + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h" + }, +@@ -179385,8 +179427,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Type *const", + "name" : "const google::protobuf::Type *const", +- "referenced_type" : "type-2492", +- "self_type" : "type-7949", ++ "referenced_type" : "type-2422", ++ "self_type" : "type-7901", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -179395,8 +179437,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::UInt32Value", + "name" : "const google::protobuf::UInt32Value", +- "referenced_type" : "type-11053", +- "self_type" : "type-11118", ++ "referenced_type" : "type-11005", ++ "self_type" : "type-11070", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -179405,8 +179447,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::UInt32Value *const", + "name" : "const google::protobuf::UInt32Value *const", +- "referenced_type" : "type-11117", +- "self_type" : "type-11116", ++ "referenced_type" : "type-11069", ++ "self_type" : "type-11068", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -179415,8 +179457,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::UInt64Value", + "name" : "const google::protobuf::UInt64Value", +- "referenced_type" : "type-11051", +- "self_type" : "type-11110", ++ "referenced_type" : "type-11003", ++ "self_type" : "type-11062", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -179425,8 +179467,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::UInt64Value *const", + "name" : "const google::protobuf::UInt64Value *const", +- "referenced_type" : "type-11109", +- "self_type" : "type-11108", ++ "referenced_type" : "type-11061", ++ "self_type" : "type-11060", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -179435,8 +179477,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::UninterpretedOption", + "name" : "const google::protobuf::UninterpretedOption", +- "referenced_type" : "type-1683", +- "self_type" : "type-1915", ++ "referenced_type" : "type-1597", ++ "self_type" : "type-1835", + "size" : 72, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -179445,8 +179487,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::UninterpretedOption *const", + "name" : "const google::protobuf::UninterpretedOption *const", +- "referenced_type" : "type-1916", +- "self_type" : "type-3804", ++ "referenced_type" : "type-1836", ++ "self_type" : "type-3756", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -179455,8 +179497,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::UninterpretedOption_NamePart", + "name" : "const google::protobuf::UninterpretedOption_NamePart", +- "referenced_type" : "type-1685", +- "self_type" : "type-1919", ++ "referenced_type" : "type-1599", ++ "self_type" : "type-1840", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -179465,8 +179507,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::UninterpretedOption_NamePart *const", + "name" : "const google::protobuf::UninterpretedOption_NamePart *const", +- "referenced_type" : "type-1920", +- "self_type" : "type-4144", ++ "referenced_type" : "type-1841", ++ "self_type" : "type-4096", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -179475,8 +179517,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::UnknownField", + "name" : "const google::protobuf::UnknownField", +- "referenced_type" : "type-1941", +- "self_type" : "type-1940", ++ "referenced_type" : "type-1866", ++ "self_type" : "type-1865", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -179485,8 +179527,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::UnknownFieldSet", + "name" : "const google::protobuf::UnknownFieldSet", +- "referenced_type" : "type-1739", +- "self_type" : "type-1937", ++ "referenced_type" : "type-1652", ++ "self_type" : "type-1862", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/unknown_field_set.h" + }, +@@ -179495,8 +179537,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Value", + "name" : "const google::protobuf::Value", +- "referenced_type" : "type-7215", +- "self_type" : "type-7290", ++ "referenced_type" : "type-7167", ++ "self_type" : "type-7242", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -179505,8 +179547,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::Value *const", + "name" : "const google::protobuf::Value *const", +- "referenced_type" : "type-7394", +- "self_type" : "type-7603", ++ "referenced_type" : "type-7346", ++ "self_type" : "type-7555", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -179515,8 +179557,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::compiler::Importer", + "name" : "const google::protobuf::compiler::Importer", +- "referenced_type" : "type-11365", +- "self_type" : "type-11367", ++ "referenced_type" : "type-11317", ++ "self_type" : "type-11319", + "size" : 72, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/importer.h" + }, +@@ -179525,8 +179567,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::compiler::Parser", + "name" : "const google::protobuf::compiler::Parser", +- "referenced_type" : "type-11336", +- "self_type" : "type-11355", ++ "referenced_type" : "type-11288", ++ "self_type" : "type-11307", + "size" : 56, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/parser.h" + }, +@@ -179535,8 +179577,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::compiler::Parser::LocationRecorder", + "name" : "const google::protobuf::compiler::Parser::LocationRecorder", +- "referenced_type" : "type-11347", +- "self_type" : "type-11493", ++ "referenced_type" : "type-11299", ++ "self_type" : "type-11445", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/parser.h" + }, +@@ -179545,8 +179587,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::compiler::Parser::MapField", + "name" : "const google::protobuf::compiler::Parser::MapField", +- "referenced_type" : "type-11351", +- "self_type" : "type-11499", ++ "referenced_type" : "type-11303", ++ "self_type" : "type-11451", + "size" : 36, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/parser.h" + }, +@@ -179555,8 +179597,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::compiler::SourceLocationTable", + "name" : "const google::protobuf::compiler::SourceLocationTable", +- "referenced_type" : "type-11341", +- "self_type" : "type-11503", ++ "referenced_type" : "type-11293", ++ "self_type" : "type-11455", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/compiler/parser.h" + }, +@@ -179575,8 +179617,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::hash", + "name" : "const google::protobuf::hash", +- "referenced_type" : "type-3690", +- "self_type" : "type-3692", ++ "referenced_type" : "type-3642", ++ "self_type" : "type-3644", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -179585,8 +179627,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::hash", + "name" : "const google::protobuf::hash", +- "referenced_type" : "type-4255", +- "self_type" : "type-4260", ++ "referenced_type" : "type-4207", ++ "self_type" : "type-4212", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -179605,8 +179647,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::hash", + "name" : "const google::protobuf::hash", +- "referenced_type" : "type-4306", +- "self_type" : "type-19711", ++ "referenced_type" : "type-4258", ++ "self_type" : "type-19663", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -179635,8 +179677,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::hash_map, google::protobuf::streq, std::allocator > >", + "name" : "const google::protobuf::hash_map, google::protobuf::streq, std::allocator > >", +- "referenced_type" : "type-3637", +- "self_type" : "type-3636", ++ "referenced_type" : "type-3589", ++ "self_type" : "type-3588", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -179645,8 +179687,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::hash_set, std::equal_to >", + "name" : "const google::protobuf::hash_set, std::equal_to >", +- "referenced_type" : "type-19512", +- "self_type" : "type-19860", ++ "referenced_type" : "type-19464", ++ "self_type" : "type-19812", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -179655,8 +179697,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::AnyMetadata", + "name" : "const google::protobuf::internal::AnyMetadata", +- "referenced_type" : "type-1847", +- "self_type" : "type-2579", ++ "referenced_type" : "type-1760", ++ "self_type" : "type-2511", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/any.h" + }, +@@ -179685,8 +179727,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::DynamicMapField", + "name" : "const google::protobuf::internal::DynamicMapField", +- "referenced_type" : "type-4276", +- "self_type" : "type-6790", ++ "referenced_type" : "type-4228", ++ "self_type" : "type-6742", + "size" : 48, + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, +@@ -179725,8 +179767,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::GeneratedMessageReflection", + "name" : "const google::protobuf::internal::GeneratedMessageReflection", +- "referenced_type" : "type-2204", +- "self_type" : "type-4300", ++ "referenced_type" : "type-2135", ++ "self_type" : "type-4252", + "size" : 56, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -179735,8 +179777,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::InternalMetadataWithArena", + "name" : "const google::protobuf::internal::InternalMetadataWithArena", +- "referenced_type" : "type-1675", +- "self_type" : "type-1950", ++ "referenced_type" : "type-1588", ++ "self_type" : "type-1874", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/metadata.h" + }, +@@ -179744,32 +179786,32 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0>", + "name" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0>", +- "referenced_type" : "type-15160", +- "self_type" : "type-15159", ++ "referenced_type" : "type-15112", ++ "self_type" : "type-15111", + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0>", + "name" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0>", +- "referenced_type" : "type-18944", +- "self_type" : "type-18943", ++ "referenced_type" : "type-18896", ++ "self_type" : "type-18895", + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0>", + "name" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0>", +- "referenced_type" : "type-23473", +- "self_type" : "type-23472", ++ "referenced_type" : "type-23450", ++ "self_type" : "type-23449", + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0>", + "name" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0>", +- "referenced_type" : "type-28658", +- "self_type" : "type-28657", ++ "referenced_type" : "type-28657", ++ "self_type" : "type-28656", + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, + { +@@ -179777,8 +179819,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0>", + "name" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0>", +- "referenced_type" : "type-7222", +- "self_type" : "type-7221", ++ "referenced_type" : "type-7174", ++ "self_type" : "type-7173", + "size" : 48, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -179787,8 +179829,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *const", + "name" : "const google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *const", +- "referenced_type" : "type-7220", +- "self_type" : "type-7585", ++ "referenced_type" : "type-7172", ++ "self_type" : "type-7537", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -179797,8 +179839,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::MapEntryBase", + "name" : "const google::protobuf::internal::MapEntryBase", +- "referenced_type" : "type-4262", +- "self_type" : "type-4263", ++ "referenced_type" : "type-4214", ++ "self_type" : "type-4215", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/map_entry.h" + }, +@@ -179807,8 +179849,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::MapEntryLite, Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0>::MapEntryWrapper, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0>", + "name" : "const google::protobuf::internal::MapEntryLite, Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0>::MapEntryWrapper, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0>", +- "referenced_type" : "type-7328", +- "self_type" : "type-7327", ++ "referenced_type" : "type-7280", ++ "self_type" : "type-7279", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/map_entry_lite.h" + }, +@@ -179817,8 +179859,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::MapEntryLite, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0>", + "name" : "const google::protobuf::internal::MapEntryLite, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0>", +- "referenced_type" : "type-7224", +- "self_type" : "type-7279", ++ "referenced_type" : "type-7176", ++ "self_type" : "type-7231", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -179827,8 +179869,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::MapEntryLite, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *const", + "name" : "const google::protobuf::internal::MapEntryLite, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *const", +- "referenced_type" : "type-7583", +- "self_type" : "type-7582", ++ "referenced_type" : "type-7535", ++ "self_type" : "type-7534", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -179837,8 +179879,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::MapField, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0>", + "name" : "const google::protobuf::internal::MapField, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0>", +- "referenced_type" : "type-7219", +- "self_type" : "type-7369", ++ "referenced_type" : "type-7171", ++ "self_type" : "type-7321", + "size" : 44, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -179847,8 +179889,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::MapField, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *const", + "name" : "const google::protobuf::internal::MapField, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *const", +- "referenced_type" : "type-7595", +- "self_type" : "type-7594", ++ "referenced_type" : "type-7547", ++ "self_type" : "type-7546", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -179857,8 +179899,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::MapFieldAccessor", + "name" : "const google::protobuf::internal::MapFieldAccessor", +- "referenced_type" : "type-6894", +- "self_type" : "type-7009", ++ "referenced_type" : "type-6846", ++ "self_type" : "type-6961", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -179867,8 +179909,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::MapFieldBase", + "name" : "const google::protobuf::internal::MapFieldBase", +- "referenced_type" : "type-4269", +- "self_type" : "type-4268", ++ "referenced_type" : "type-4221", ++ "self_type" : "type-4220", + "size" : 28, + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, +@@ -179877,8 +179919,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::MapFieldLite, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0>", + "name" : "const google::protobuf::internal::MapFieldLite, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0>", +- "referenced_type" : "type-7198", +- "self_type" : "type-7197", ++ "referenced_type" : "type-7150", ++ "self_type" : "type-7149", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -179887,8 +179929,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::RandomAccessRepeatedFieldAccessor", + "name" : "const google::protobuf::internal::RandomAccessRepeatedFieldAccessor", +- "referenced_type" : "type-6801", +- "self_type" : "type-6979", ++ "referenced_type" : "type-6753", ++ "self_type" : "type-6931", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -179897,8 +179939,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldAccessor", + "name" : "const google::protobuf::internal::RepeatedFieldAccessor", +- "referenced_type" : "type-6802", +- "self_type" : "type-6947", ++ "referenced_type" : "type-6754", ++ "self_type" : "type-6899", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h" + }, +@@ -179907,8 +179949,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldPrimitiveAccessor", + "name" : "const google::protobuf::internal::RepeatedFieldPrimitiveAccessor", +- "referenced_type" : "type-6830", +- "self_type" : "type-6833", ++ "referenced_type" : "type-6782", ++ "self_type" : "type-6785", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -179917,8 +179959,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldPrimitiveAccessor", + "name" : "const google::protobuf::internal::RepeatedFieldPrimitiveAccessor", +- "referenced_type" : "type-6825", +- "self_type" : "type-6828", ++ "referenced_type" : "type-6777", ++ "self_type" : "type-6780", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -179927,8 +179969,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldPrimitiveAccessor", + "name" : "const google::protobuf::internal::RepeatedFieldPrimitiveAccessor", +- "referenced_type" : "type-6820", +- "self_type" : "type-6823", ++ "referenced_type" : "type-6772", ++ "self_type" : "type-6775", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -179937,8 +179979,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldPrimitiveAccessor", + "name" : "const google::protobuf::internal::RepeatedFieldPrimitiveAccessor", +- "referenced_type" : "type-6799", +- "self_type" : "type-6798", ++ "referenced_type" : "type-6751", ++ "self_type" : "type-6750", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -179947,8 +179989,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldPrimitiveAccessor", + "name" : "const google::protobuf::internal::RepeatedFieldPrimitiveAccessor", +- "referenced_type" : "type-6809", +- "self_type" : "type-6812", ++ "referenced_type" : "type-6761", ++ "self_type" : "type-6764", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -179957,8 +179999,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldPrimitiveAccessor", + "name" : "const google::protobuf::internal::RepeatedFieldPrimitiveAccessor", +- "referenced_type" : "type-6804", +- "self_type" : "type-6807", ++ "referenced_type" : "type-6756", ++ "self_type" : "type-6759", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -179967,8 +180009,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldPrimitiveAccessor", + "name" : "const google::protobuf::internal::RepeatedFieldPrimitiveAccessor", +- "referenced_type" : "type-6814", +- "self_type" : "type-6818", ++ "referenced_type" : "type-6766", ++ "self_type" : "type-6770", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -179977,8 +180019,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldWrapper", + "name" : "const google::protobuf::internal::RepeatedFieldWrapper", +- "referenced_type" : "type-6831", +- "self_type" : "type-7000", ++ "referenced_type" : "type-6783", ++ "self_type" : "type-6952", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -179987,8 +180029,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldWrapper", + "name" : "const google::protobuf::internal::RepeatedFieldWrapper", +- "referenced_type" : "type-6826", +- "self_type" : "type-6997", ++ "referenced_type" : "type-6778", ++ "self_type" : "type-6949", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -179997,8 +180039,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldWrapper", + "name" : "const google::protobuf::internal::RepeatedFieldWrapper", +- "referenced_type" : "type-6821", +- "self_type" : "type-6994", ++ "referenced_type" : "type-6773", ++ "self_type" : "type-6946", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -180007,8 +180049,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldWrapper", + "name" : "const google::protobuf::internal::RepeatedFieldWrapper", +- "referenced_type" : "type-6800", +- "self_type" : "type-6982", ++ "referenced_type" : "type-6752", ++ "self_type" : "type-6934", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -180017,8 +180059,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldWrapper", + "name" : "const google::protobuf::internal::RepeatedFieldWrapper", +- "referenced_type" : "type-6810", +- "self_type" : "type-6988", ++ "referenced_type" : "type-6762", ++ "self_type" : "type-6940", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -180027,8 +180069,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldWrapper", + "name" : "const google::protobuf::internal::RepeatedFieldWrapper", +- "referenced_type" : "type-6805", +- "self_type" : "type-6985", ++ "referenced_type" : "type-6757", ++ "self_type" : "type-6937", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -180037,8 +180079,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::RepeatedFieldWrapper", + "name" : "const google::protobuf::internal::RepeatedFieldWrapper", +- "referenced_type" : "type-6815", +- "self_type" : "type-6991", ++ "referenced_type" : "type-6767", ++ "self_type" : "type-6943", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -180057,8 +180099,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::RepeatedPtrFieldMessageAccessor", + "name" : "const google::protobuf::internal::RepeatedPtrFieldMessageAccessor", +- "referenced_type" : "type-6842", +- "self_type" : "type-6845", ++ "referenced_type" : "type-6794", ++ "self_type" : "type-6797", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -180067,8 +180109,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::RepeatedPtrFieldStringAccessor", + "name" : "const google::protobuf::internal::RepeatedPtrFieldStringAccessor", +- "referenced_type" : "type-6835", +- "self_type" : "type-6840", ++ "referenced_type" : "type-6787", ++ "self_type" : "type-6792", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -180077,8 +180119,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::RepeatedPtrFieldWrapper", + "name" : "const google::protobuf::internal::RepeatedPtrFieldWrapper", +- "referenced_type" : "type-6843", +- "self_type" : "type-7006", ++ "referenced_type" : "type-6795", ++ "self_type" : "type-6958", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -180087,8 +180129,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::RepeatedPtrFieldWrapper, std::allocator > >", + "name" : "const google::protobuf::internal::RepeatedPtrFieldWrapper, std::allocator > >", +- "referenced_type" : "type-6836", +- "self_type" : "type-7003", ++ "referenced_type" : "type-6788", ++ "self_type" : "type-6955", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/reflection_internal.h" + }, +@@ -180097,8 +180139,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::RepeatedPtrIterator, std::allocator > >", + "name" : "const google::protobuf::internal::RepeatedPtrIterator, std::allocator > >", +- "referenced_type" : "type-3782", +- "self_type" : "type-3813", ++ "referenced_type" : "type-3734", ++ "self_type" : "type-3765", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -180107,8 +180149,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::RepeatedPtrIterator", + "name" : "const google::protobuf::internal::RepeatedPtrIterator", +- "referenced_type" : "type-6749", +- "self_type" : "type-6756", ++ "referenced_type" : "type-6701", ++ "self_type" : "type-6708", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -180117,8 +180159,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::RepeatedPtrIterator, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> >", + "name" : "const google::protobuf::internal::RepeatedPtrIterator, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> >", +- "referenced_type" : "type-7251", +- "self_type" : "type-7255", ++ "referenced_type" : "type-7203", ++ "self_type" : "type-7207", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -180127,8 +180169,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::RepeatedPtrIterator, std::allocator > >", + "name" : "const google::protobuf::internal::RepeatedPtrIterator, std::allocator > >", +- "referenced_type" : "type-3806", +- "self_type" : "type-3811", ++ "referenced_type" : "type-3758", ++ "self_type" : "type-3763", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -180137,8 +180179,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::RepeatedPtrOverPtrsIterator", + "name" : "const google::protobuf::internal::RepeatedPtrOverPtrsIterator", +- "referenced_type" : "type-7665", +- "self_type" : "type-7695", ++ "referenced_type" : "type-7617", ++ "self_type" : "type-7647", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, +@@ -180157,8 +180199,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::TypeDefinedMapFieldBase", + "name" : "const google::protobuf::internal::TypeDefinedMapFieldBase", +- "referenced_type" : "type-4283", +- "self_type" : "type-6775", ++ "referenced_type" : "type-4235", ++ "self_type" : "type-6727", + "size" : 28, + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, +@@ -180167,8 +180209,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::TypeDefinedMapFieldBase, std::allocator >, google::protobuf::Value>", + "name" : "const google::protobuf::internal::TypeDefinedMapFieldBase, std::allocator >, google::protobuf::Value>", +- "referenced_type" : "type-7230", +- "self_type" : "type-7311", ++ "referenced_type" : "type-7182", ++ "self_type" : "type-7263", + "size" : 28, + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h" + }, +@@ -180178,7 +180220,7 @@ + "linker_set_key" : "const google::protobuf::internal::WireFormatLite::WireType", + "name" : "const google::protobuf::internal::WireFormatLite::WireType", + "referenced_type" : "type-664", +- "self_type" : "type-4382", ++ "self_type" : "type-4334", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map_type_handler.h" + }, +@@ -180197,8 +180239,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_array", + "name" : "const google::protobuf::internal::scoped_array", +- "referenced_type" : "type-4334", +- "self_type" : "type-4340", ++ "referenced_type" : "type-4286", ++ "self_type" : "type-4292", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180208,7 +180250,7 @@ + "linker_set_key" : "const google::protobuf::internal::scoped_array", + "name" : "const google::protobuf::internal::scoped_array", + "referenced_type" : "type-779", +- "self_type" : "type-1664", ++ "self_type" : "type-1577", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180217,8 +180259,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-3723", +- "self_type" : "type-7638", ++ "referenced_type" : "type-3675", ++ "self_type" : "type-7590", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180227,8 +180269,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-4298", +- "self_type" : "type-4331", ++ "referenced_type" : "type-4250", ++ "self_type" : "type-4283", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180237,8 +180279,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-1822", +- "self_type" : "type-3691", ++ "referenced_type" : "type-1733", ++ "self_type" : "type-3643", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180247,8 +180289,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-3698", +- "self_type" : "type-4296", ++ "referenced_type" : "type-3650", ++ "self_type" : "type-4248", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180257,8 +180299,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-24922", +- "self_type" : "type-25024", ++ "referenced_type" : "type-24889", ++ "self_type" : "type-24993", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180267,8 +180309,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19923", +- "self_type" : "type-19932", ++ "referenced_type" : "type-19875", ++ "self_type" : "type-19884", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180277,8 +180319,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-3767", +- "self_type" : "type-3770", ++ "referenced_type" : "type-3719", ++ "self_type" : "type-3722", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180287,8 +180329,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr >", + "name" : "const google::protobuf::internal::scoped_ptr >", +- "referenced_type" : "type-19681", +- "self_type" : "type-19686", ++ "referenced_type" : "type-19633", ++ "self_type" : "type-19638", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180297,8 +180339,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr, std::allocator >, std::allocator, std::allocator > > > &, const google::protobuf::Field *> >", + "name" : "const google::protobuf::internal::scoped_ptr, std::allocator >, std::allocator, std::allocator > > > &, const google::protobuf::Field *> >", +- "referenced_type" : "type-15198", +- "self_type" : "type-15218", ++ "referenced_type" : "type-15150", ++ "self_type" : "type-15170", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180307,8 +180349,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr >", + "name" : "const google::protobuf::internal::scoped_ptr >", +- "referenced_type" : "type-25041", +- "self_type" : "type-25044", ++ "referenced_type" : "type-25011", ++ "self_type" : "type-25014", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180327,8 +180369,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19890", +- "self_type" : "type-19910", ++ "referenced_type" : "type-19842", ++ "self_type" : "type-19862", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180337,8 +180379,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-3735", +- "self_type" : "type-3748", ++ "referenced_type" : "type-3687", ++ "self_type" : "type-3700", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180347,8 +180389,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> >", + "name" : "const google::protobuf::internal::scoped_ptr, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> >", +- "referenced_type" : "type-7363", +- "self_type" : "type-7379", ++ "referenced_type" : "type-7315", ++ "self_type" : "type-7331", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180357,8 +180399,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19517", +- "self_type" : "type-19597", ++ "referenced_type" : "type-19469", ++ "self_type" : "type-19549", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180367,8 +180409,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-11249", +- "self_type" : "type-11255", ++ "referenced_type" : "type-11201", ++ "self_type" : "type-11207", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180377,8 +180419,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-24641", +- "self_type" : "type-24653", ++ "referenced_type" : "type-24609", ++ "self_type" : "type-24616", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180387,8 +180429,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-15230", +- "self_type" : "type-15245", ++ "referenced_type" : "type-15182", ++ "self_type" : "type-15197", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180397,8 +180439,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19198", +- "self_type" : "type-19220", ++ "referenced_type" : "type-19150", ++ "self_type" : "type-19172", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180407,8 +180449,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19518", +- "self_type" : "type-19608", ++ "referenced_type" : "type-19470", ++ "self_type" : "type-19560", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180417,8 +180459,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19494", +- "self_type" : "type-19676", ++ "referenced_type" : "type-19446", ++ "self_type" : "type-19628", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180427,8 +180469,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19491", +- "self_type" : "type-19679", ++ "referenced_type" : "type-19443", ++ "self_type" : "type-19631", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180437,8 +180479,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19497", +- "self_type" : "type-19634", ++ "referenced_type" : "type-19449", ++ "self_type" : "type-19586", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180447,8 +180489,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19507", +- "self_type" : "type-19592", ++ "referenced_type" : "type-19459", ++ "self_type" : "type-19544", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180457,8 +180499,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-19188", +- "self_type" : "type-19207", ++ "referenced_type" : "type-19140", ++ "self_type" : "type-19159", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180467,8 +180509,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::internal::scoped_ptr", + "name" : "const google::protobuf::internal::scoped_ptr", +- "referenced_type" : "type-24632", +- "self_type" : "type-24635", ++ "referenced_type" : "type-24600", ++ "self_type" : "type-24602", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/scoped_ptr.h" + }, +@@ -180478,7 +180520,7 @@ + "linker_set_key" : "const google::protobuf::io::ArrayInputStream", + "name" : "const google::protobuf::io::ArrayInputStream", + "referenced_type" : "type-764", +- "self_type" : "type-1640", ++ "self_type" : "type-1553", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h" + }, +@@ -180488,7 +180530,7 @@ + "linker_set_key" : "const google::protobuf::io::ArrayOutputStream", + "name" : "const google::protobuf::io::ArrayOutputStream", + "referenced_type" : "type-767", +- "self_type" : "type-1643", ++ "self_type" : "type-1557", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h" + }, +@@ -180517,8 +180559,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::io::ConcatenatingInputStream", + "name" : "const google::protobuf::io::ConcatenatingInputStream", +- "referenced_type" : "type-1615", +- "self_type" : "type-1619", ++ "referenced_type" : "type-1531", ++ "self_type" : "type-1535", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -180528,7 +180570,7 @@ + "linker_set_key" : "const google::protobuf::io::CopyingInputStreamAdaptor", + "name" : "const google::protobuf::io::CopyingInputStreamAdaptor", + "referenced_type" : "type-777", +- "self_type" : "type-1651", ++ "self_type" : "type-1565", + "size" : 40, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h" + }, +@@ -180538,7 +180580,7 @@ + "linker_set_key" : "const google::protobuf::io::CopyingOutputStreamAdaptor", + "name" : "const google::protobuf::io::CopyingOutputStreamAdaptor", + "referenced_type" : "type-784", +- "self_type" : "type-1654", ++ "self_type" : "type-1567", + "size" : 40, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h" + }, +@@ -180547,8 +180589,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::io::FileInputStream", + "name" : "const google::protobuf::io::FileInputStream", +- "referenced_type" : "type-1584", +- "self_type" : "type-1588", ++ "referenced_type" : "type-1503", ++ "self_type" : "type-1506", + "size" : 64, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -180557,8 +180599,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::io::FileOutputStream", + "name" : "const google::protobuf::io::FileOutputStream", +- "referenced_type" : "type-1591", +- "self_type" : "type-1594", ++ "referenced_type" : "type-1509", ++ "self_type" : "type-1512", + "size" : 64, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -180567,8 +180609,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::io::GzipInputStream", + "name" : "const google::protobuf::io::GzipInputStream", +- "referenced_type" : "type-11179", +- "self_type" : "type-11184", ++ "referenced_type" : "type-11131", ++ "self_type" : "type-11136", + "size" : 96, + "source_file" : "/external/protobuf/src/google/protobuf/io/gzip_stream.h" + }, +@@ -180577,8 +180619,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::io::GzipOutputStream", + "name" : "const google::protobuf::io::GzipOutputStream", +- "referenced_type" : "type-11186", +- "self_type" : "type-11194", ++ "referenced_type" : "type-11138", ++ "self_type" : "type-11146", + "size" : 84, + "source_file" : "/external/protobuf/src/google/protobuf/io/gzip_stream.h" + }, +@@ -180587,8 +180629,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::io::GzipOutputStream::Options", + "name" : "const google::protobuf::io::GzipOutputStream::Options", +- "referenced_type" : "type-11189", +- "self_type" : "type-11192", ++ "referenced_type" : "type-11141", ++ "self_type" : "type-11144", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/io/gzip_stream.h" + }, +@@ -180597,8 +180639,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::io::IstreamInputStream", + "name" : "const google::protobuf::io::IstreamInputStream", +- "referenced_type" : "type-1597", +- "self_type" : "type-1603", ++ "referenced_type" : "type-1515", ++ "self_type" : "type-1520", + "size" : 56, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -180608,7 +180650,7 @@ + "linker_set_key" : "const google::protobuf::io::LazyStringOutputStream", + "name" : "const google::protobuf::io::LazyStringOutputStream", + "referenced_type" : "type-770", +- "self_type" : "type-1649", ++ "self_type" : "type-1563", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h" + }, +@@ -180617,8 +180659,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::io::LimitingInputStream", + "name" : "const google::protobuf::io::LimitingInputStream", +- "referenced_type" : "type-1621", +- "self_type" : "type-1623", ++ "referenced_type" : "type-1539", ++ "self_type" : "type-1541", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -180627,8 +180669,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::io::OstreamOutputStream", + "name" : "const google::protobuf::io::OstreamOutputStream", +- "referenced_type" : "type-1606", +- "self_type" : "type-1611", ++ "referenced_type" : "type-1523", ++ "self_type" : "type-1528", + "size" : 56, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -180637,8 +180679,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::io::Printer", + "name" : "const google::protobuf::io::Printer", +- "referenced_type" : "type-11203", +- "self_type" : "type-11212", ++ "referenced_type" : "type-11155", ++ "self_type" : "type-11164", + "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -180648,7 +180690,7 @@ + "linker_set_key" : "const google::protobuf::io::StringOutputStream", + "name" : "const google::protobuf::io::StringOutputStream", + "referenced_type" : "type-769", +- "self_type" : "type-1646", ++ "self_type" : "type-1560", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h" + }, +@@ -180657,8 +180699,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::io::Tokenizer::Token", + "name" : "const google::protobuf::io::Tokenizer::Token", +- "referenced_type" : "type-3882", +- "self_type" : "type-3887", ++ "referenced_type" : "type-3834", ++ "self_type" : "type-3839", + "size" : 28, + "source_file" : "/external/protobuf/src/google/protobuf/io/tokenizer.h" + }, +@@ -180737,8 +180779,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::strings::internal::SubstituteArg", + "name" : "const google::protobuf::strings::internal::SubstituteArg", +- "referenced_type" : "type-3632", +- "self_type" : "type-3634", ++ "referenced_type" : "type-3584", ++ "self_type" : "type-3586", + "size" : 40, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/substitute.h" + }, +@@ -180767,8 +180809,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::DefaultFieldComparator", + "name" : "const google::protobuf::util::DefaultFieldComparator", +- "referenced_type" : "type-14817", +- "self_type" : "type-14825", ++ "referenced_type" : "type-14769", ++ "self_type" : "type-14777", + "size" : 48, + "source_file" : "/external/protobuf/src/google/protobuf/util/field_comparator.h" + }, +@@ -180776,24 +180818,24 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::FieldContext", + "name" : "const google::protobuf::util::FieldContext", +- "referenced_type" : "type-14823", +- "self_type" : "type-14822", ++ "referenced_type" : "type-14775", ++ "self_type" : "type-14774", + "source_file" : "/external/protobuf/src/google/protobuf/util/field_comparator.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::FieldContext", + "name" : "const google::protobuf::util::FieldContext", +- "referenced_type" : "type-18680", +- "self_type" : "type-18679", ++ "referenced_type" : "type-18632", ++ "self_type" : "type-18631", + "source_file" : "/external/protobuf/src/google/protobuf/util/field_comparator.h" + }, + { + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::FieldContext", + "name" : "const google::protobuf::util::FieldContext", +- "referenced_type" : "type-23209", +- "self_type" : "type-23208", ++ "referenced_type" : "type-23197", ++ "self_type" : "type-23196", + "source_file" : "/external/protobuf/src/google/protobuf/util/field_comparator.h" + }, + { +@@ -180801,8 +180843,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::FieldContext", + "name" : "const google::protobuf::util::FieldContext", +- "referenced_type" : "type-25018", +- "self_type" : "type-25017", ++ "referenced_type" : "type-24987", ++ "self_type" : "type-24986", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h" + }, +@@ -180810,8 +180852,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::FieldContext", + "name" : "const google::protobuf::util::FieldContext", +- "referenced_type" : "type-28394", +- "self_type" : "type-28393", ++ "referenced_type" : "type-28393", ++ "self_type" : "type-28392", + "source_file" : "/external/protobuf/src/google/protobuf/util/field_comparator.h" + }, + { +@@ -180819,8 +180861,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::FieldMaskUtil::MergeOptions", + "name" : "const google::protobuf::util::FieldMaskUtil::MergeOptions", +- "referenced_type" : "type-14952", +- "self_type" : "type-14951", ++ "referenced_type" : "type-14904", ++ "self_type" : "type-14903", + "size" : 2, + "source_file" : "/external/protobuf/src/google/protobuf/util/field_mask_util.h" + }, +@@ -180829,8 +180871,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::JsonOptions", + "name" : "const google::protobuf::util::JsonOptions", +- "referenced_type" : "type-24757", +- "self_type" : "type-24759", ++ "referenced_type" : "type-24715", ++ "self_type" : "type-24718", + "size" : 2, + "source_file" : "/external/protobuf/src/google/protobuf/util/json_util.h" + }, +@@ -180839,8 +180881,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::MessageDifferencer::MapKeyComparator", + "name" : "const google::protobuf::util::MessageDifferencer::MapKeyComparator", +- "referenced_type" : "type-24900", +- "self_type" : "type-24899", ++ "referenced_type" : "type-24867", ++ "self_type" : "type-24866", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -180849,8 +180891,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::MessageDifferencer::MapKeyComparator *const", + "name" : "const google::protobuf::util::MessageDifferencer::MapKeyComparator *const", +- "referenced_type" : "type-24898", +- "self_type" : "type-24927", ++ "referenced_type" : "type-24865", ++ "self_type" : "type-24896", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -180859,8 +180901,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::MessageDifferencer::SpecificField", + "name" : "const google::protobuf::util::MessageDifferencer::SpecificField", +- "referenced_type" : "type-24996", +- "self_type" : "type-25002", ++ "referenced_type" : "type-24965", ++ "self_type" : "type-24971", + "size" : 36, + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h" + }, +@@ -180879,8 +180921,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::StatusOr", + "name" : "const google::protobuf::util::StatusOr", +- "referenced_type" : "type-15029", +- "self_type" : "type-15338", ++ "referenced_type" : "type-14981", ++ "self_type" : "type-15290", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -180889,8 +180931,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::StatusOr", + "name" : "const google::protobuf::util::StatusOr", +- "referenced_type" : "type-20003", +- "self_type" : "type-20006", ++ "referenced_type" : "type-19955", ++ "self_type" : "type-19958", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -180899,8 +180941,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::StatusOr", + "name" : "const google::protobuf::util::StatusOr", +- "referenced_type" : "type-15325", +- "self_type" : "type-15326", ++ "referenced_type" : "type-15277", ++ "self_type" : "type-15278", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -180909,8 +180951,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::StatusOr", + "name" : "const google::protobuf::util::StatusOr", +- "referenced_type" : "type-15023", +- "self_type" : "type-15334", ++ "referenced_type" : "type-14975", ++ "self_type" : "type-15286", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -180919,8 +180961,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::StatusOr", + "name" : "const google::protobuf::util::StatusOr", +- "referenced_type" : "type-15025", +- "self_type" : "type-15336", ++ "referenced_type" : "type-14977", ++ "self_type" : "type-15288", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -180929,8 +180971,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::StatusOr", + "name" : "const google::protobuf::util::StatusOr", +- "referenced_type" : "type-15013", +- "self_type" : "type-15015", ++ "referenced_type" : "type-14965", ++ "self_type" : "type-14967", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -180939,8 +180981,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::StatusOr", + "name" : "const google::protobuf::util::StatusOr", +- "referenced_type" : "type-15019", +- "self_type" : "type-15330", ++ "referenced_type" : "type-14971", ++ "self_type" : "type-15282", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -180949,8 +180991,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::StatusOr, std::allocator > >", + "name" : "const google::protobuf::util::StatusOr, std::allocator > >", +- "referenced_type" : "type-15031", +- "self_type" : "type-15340", ++ "referenced_type" : "type-14983", ++ "self_type" : "type-15292", + "size" : 28, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -180959,8 +181001,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::StatusOr", + "name" : "const google::protobuf::util::StatusOr", +- "referenced_type" : "type-15017", +- "self_type" : "type-15328", ++ "referenced_type" : "type-14969", ++ "self_type" : "type-15280", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -180969,8 +181011,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::StatusOr", + "name" : "const google::protobuf::util::StatusOr", +- "referenced_type" : "type-15021", +- "self_type" : "type-15332", ++ "referenced_type" : "type-14973", ++ "self_type" : "type-15284", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/statusor.h" + }, +@@ -180979,8 +181021,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::converter::DataPiece", + "name" : "const google::protobuf::util::converter::DataPiece", +- "referenced_type" : "type-15044", +- "self_type" : "type-15048", ++ "referenced_type" : "type-14996", ++ "self_type" : "type-15000", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/datapiece.h" + }, +@@ -180989,8 +181031,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::converter::DefaultValueObjectWriter::Node", + "name" : "const google::protobuf::util::converter::DefaultValueObjectWriter::Node", +- "referenced_type" : "type-15232", +- "self_type" : "type-15355", ++ "referenced_type" : "type-15184", ++ "self_type" : "type-15307", + "size" : 88, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h" + }, +@@ -180999,8 +181041,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::converter::LocationTrackerInterface", + "name" : "const google::protobuf::util::converter::LocationTrackerInterface", +- "referenced_type" : "type-15385", +- "self_type" : "type-15384", ++ "referenced_type" : "type-15337", ++ "self_type" : "type-15336", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/error_listener.h" + }, +@@ -181009,8 +181051,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::converter::ObjectLocationTracker", + "name" : "const google::protobuf::util::converter::ObjectLocationTracker", +- "referenced_type" : "type-19692", +- "self_type" : "type-19696", ++ "referenced_type" : "type-19644", ++ "self_type" : "type-19648", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/object_location_tracker.h" + }, +@@ -181019,8 +181061,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::converter::ObjectSource", + "name" : "const google::protobuf::util::converter::ObjectSource", +- "referenced_type" : "type-19374", +- "self_type" : "type-19476", ++ "referenced_type" : "type-19326", ++ "self_type" : "type-19428", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/object_source.h" + }, +@@ -181029,8 +181071,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::converter::ObjectWriter", + "name" : "const google::protobuf::util::converter::ObjectWriter", +- "referenced_type" : "type-15344", +- "self_type" : "type-15346", ++ "referenced_type" : "type-15296", ++ "self_type" : "type-15298", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/object_writer.h" + }, +@@ -181039,8 +181081,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::converter::ProtoStreamObjectSource", + "name" : "const google::protobuf::util::converter::ProtoStreamObjectSource", +- "referenced_type" : "type-19372", +- "self_type" : "type-19371", ++ "referenced_type" : "type-19324", ++ "self_type" : "type-19323", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -181049,8 +181091,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::converter::ProtoStreamObjectWriter::Item", + "name" : "const google::protobuf::util::converter::ProtoStreamObjectWriter::Item", +- "referenced_type" : "type-19493", +- "self_type" : "type-19689", ++ "referenced_type" : "type-19445", ++ "self_type" : "type-19641", + "size" : 40, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, +@@ -181059,8 +181101,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::converter::ProtoStreamObjectWriter::Options", + "name" : "const google::protobuf::util::converter::ProtoStreamObjectWriter::Options", +- "referenced_type" : "type-19505", +- "self_type" : "type-19504", ++ "referenced_type" : "type-19457", ++ "self_type" : "type-19456", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h" + }, +@@ -181069,8 +181111,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::converter::ProtoWriter::ProtoElement", + "name" : "const google::protobuf::util::converter::ProtoWriter::ProtoElement", +- "referenced_type" : "type-19509", +- "self_type" : "type-19683", ++ "referenced_type" : "type-19461", ++ "self_type" : "type-19635", + "size" : 64, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/proto_writer.h" + }, +@@ -181079,8 +181121,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::converter::StructuredObjectWriter::BaseElement", + "name" : "const google::protobuf::util::converter::StructuredObjectWriter::BaseElement", +- "referenced_type" : "type-19187", +- "self_type" : "type-19193", ++ "referenced_type" : "type-19139", ++ "self_type" : "type-19145", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/structured_objectwriter.h" + }, +@@ -181089,8 +181131,8 @@ + "is_const" : true, + "linker_set_key" : "const google::protobuf::util::converter::TypeInfo", + "name" : "const google::protobuf::util::converter::TypeInfo", +- "referenced_type" : "type-15342", +- "self_type" : "type-15350", ++ "referenced_type" : "type-15294", ++ "self_type" : "type-15302", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h" + }, +@@ -181108,312 +181150,312 @@ + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-10041", +- "self_type" : "type-10040", ++ "referenced_type" : "type-10294", ++ "self_type" : "type-10293", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-10342", +- "self_type" : "type-10341", ++ "referenced_type" : "type-12640", ++ "self_type" : "type-12639", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-12688", +- "self_type" : "type-12687", ++ "referenced_type" : "type-13032", ++ "self_type" : "type-13031", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-13080", +- "self_type" : "type-13079", ++ "referenced_type" : "type-13207", ++ "self_type" : "type-13206", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-13255", +- "self_type" : "type-13254", ++ "referenced_type" : "type-13326", ++ "self_type" : "type-13325", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-13374", +- "self_type" : "type-13373", ++ "referenced_type" : "type-13585", ++ "self_type" : "type-13584", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-13633", +- "self_type" : "type-13632", ++ "referenced_type" : "type-15115", ++ "self_type" : "type-15114", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-15163", +- "self_type" : "type-15162", ++ "referenced_type" : "type-16496", ++ "self_type" : "type-16495", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-16544", +- "self_type" : "type-16543", ++ "referenced_type" : "type-16888", ++ "self_type" : "type-16887", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-16936", +- "self_type" : "type-16935", ++ "referenced_type" : "type-17063", ++ "self_type" : "type-17062", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-17111", +- "self_type" : "type-17110", ++ "referenced_type" : "type-17182", ++ "self_type" : "type-17181", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-17230", +- "self_type" : "type-17229", ++ "referenced_type" : "type-17449", ++ "self_type" : "type-17448", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-17497", +- "self_type" : "type-17496", ++ "referenced_type" : "type-18899", ++ "self_type" : "type-18898", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-18947", +- "self_type" : "type-18946", ++ "referenced_type" : "type-21028", ++ "self_type" : "type-21027", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-21076", +- "self_type" : "type-21075", ++ "referenced_type" : "type-21420", ++ "self_type" : "type-21419", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-21468", +- "self_type" : "type-21467", ++ "referenced_type" : "type-21595", ++ "self_type" : "type-21594", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-21643", +- "self_type" : "type-21642", ++ "referenced_type" : "type-21714", ++ "self_type" : "type-21713", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-21762", +- "self_type" : "type-21761", ++ "referenced_type" : "type-22021", ++ "self_type" : "type-22020", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-22026", +- "self_type" : "type-22025", ++ "referenced_type" : "type-23454", ++ "self_type" : "type-23453", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-23476", +- "self_type" : "type-23475", ++ "referenced_type" : "type-26297", ++ "self_type" : "type-26296", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-26254", +- "self_type" : "type-26253", ++ "referenced_type" : "type-26670", ++ "self_type" : "type-26669", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-26646", +- "self_type" : "type-26645", ++ "referenced_type" : "type-26845", ++ "self_type" : "type-26844", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-26821", +- "self_type" : "type-26820", ++ "referenced_type" : "type-26963", ++ "self_type" : "type-26962", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-26940", +- "self_type" : "type-26939", ++ "referenced_type" : "type-27210", ++ "self_type" : "type-27209", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-27211", +- "self_type" : "type-27210", ++ "referenced_type" : "type-28660", ++ "self_type" : "type-28659", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-28661", +- "self_type" : "type-28660", ++ "referenced_type" : "type-31400", ++ "self_type" : "type-31399", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-31401", +- "self_type" : "type-31400", ++ "referenced_type" : "type-31792", ++ "self_type" : "type-31791", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-31793", +- "self_type" : "type-31792", ++ "referenced_type" : "type-31967", ++ "self_type" : "type-31966", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-31968", +- "self_type" : "type-31967", ++ "referenced_type" : "type-32086", ++ "self_type" : "type-32085", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-32087", +- "self_type" : "type-32086", ++ "referenced_type" : "type-4199", ++ "self_type" : "type-4198", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-4247", +- "self_type" : "type-4246", ++ "referenced_type" : "type-6051", ++ "self_type" : "type-6050", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-6099", +- "self_type" : "type-6098", ++ "referenced_type" : "type-6450", ++ "self_type" : "type-6449", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-6498", +- "self_type" : "type-6497", ++ "referenced_type" : "type-6732", ++ "self_type" : "type-6731", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-6780", +- "self_type" : "type-6779", ++ "referenced_type" : "type-6908", ++ "self_type" : "type-6907", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-6956", +- "self_type" : "type-6955", ++ "referenced_type" : "type-7269", ++ "self_type" : "type-7268", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-7317", +- "self_type" : "type-7316", ++ "referenced_type" : "type-9308", ++ "self_type" : "type-9307", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-9356", +- "self_type" : "type-9355", ++ "referenced_type" : "type-9700", ++ "self_type" : "type-9699", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-9748", +- "self_type" : "type-9747", ++ "referenced_type" : "type-9875", ++ "self_type" : "type-9874", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { + "is_const" : true, + "linker_set_key" : "const iterator_base", + "name" : "const iterator_base", +- "referenced_type" : "type-9923", +- "self_type" : "type-9922", ++ "referenced_type" : "type-9993", ++ "self_type" : "type-9992", + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, + { +@@ -181471,8 +181513,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> >", + "name" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> >", +- "referenced_type" : "type-13171", +- "self_type" : "type-13170", ++ "referenced_type" : "type-13123", ++ "self_type" : "type-13122", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181481,8 +181523,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> >", + "name" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> >", +- "referenced_type" : "type-17027", +- "self_type" : "type-17026", ++ "referenced_type" : "type-16979", ++ "self_type" : "type-16978", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181491,8 +181533,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> >", + "name" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> >", +- "referenced_type" : "type-21559", +- "self_type" : "type-21558", ++ "referenced_type" : "type-21511", ++ "self_type" : "type-21510", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181501,8 +181543,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> >", + "name" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> >", +- "referenced_type" : "type-26737", +- "self_type" : "type-26736", ++ "referenced_type" : "type-26759", ++ "self_type" : "type-26758", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181511,8 +181553,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> >", + "name" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> >", +- "referenced_type" : "type-31884", +- "self_type" : "type-31883", ++ "referenced_type" : "type-31883", ++ "self_type" : "type-31882", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181521,8 +181563,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> >", + "name" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> >", +- "referenced_type" : "type-6679", +- "self_type" : "type-6678", ++ "referenced_type" : "type-6631", ++ "self_type" : "type-6630", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181531,8 +181573,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> >", + "name" : "const std::__map_const_iterator *>, std::__tree_node *>, void *> *, int> >", +- "referenced_type" : "type-9839", +- "self_type" : "type-9838", ++ "referenced_type" : "type-9791", ++ "self_type" : "type-9790", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181541,8 +181583,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", + "name" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", +- "referenced_type" : "type-10458", +- "self_type" : "type-10457", ++ "referenced_type" : "type-10410", ++ "self_type" : "type-10409", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181551,8 +181593,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", + "name" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", +- "referenced_type" : "type-13749", +- "self_type" : "type-13748", ++ "referenced_type" : "type-13701", ++ "self_type" : "type-13700", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181561,8 +181603,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", + "name" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", +- "referenced_type" : "type-17613", +- "self_type" : "type-17612", ++ "referenced_type" : "type-17565", ++ "self_type" : "type-17564", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181571,8 +181613,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", + "name" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", +- "referenced_type" : "type-22142", +- "self_type" : "type-22141", ++ "referenced_type" : "type-22141", ++ "self_type" : "type-22140", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181581,8 +181623,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", + "name" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", +- "referenced_type" : "type-27327", +- "self_type" : "type-27326", ++ "referenced_type" : "type-27326", ++ "self_type" : "type-27325", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181591,8 +181633,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", + "name" : "const std::__map_const_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", +- "referenced_type" : "type-7524", +- "self_type" : "type-7523", ++ "referenced_type" : "type-7476", ++ "self_type" : "type-7475", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181601,8 +181643,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> >", + "name" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> >", +- "referenced_type" : "type-13181", +- "self_type" : "type-13180", ++ "referenced_type" : "type-13133", ++ "self_type" : "type-13132", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181611,8 +181653,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> >", + "name" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> >", +- "referenced_type" : "type-17037", +- "self_type" : "type-17036", ++ "referenced_type" : "type-16989", ++ "self_type" : "type-16988", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181621,8 +181663,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> >", + "name" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> >", +- "referenced_type" : "type-21569", +- "self_type" : "type-21568", ++ "referenced_type" : "type-21521", ++ "self_type" : "type-21520", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181631,8 +181673,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> >", + "name" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> >", +- "referenced_type" : "type-26747", +- "self_type" : "type-26746", ++ "referenced_type" : "type-26769", ++ "self_type" : "type-26768", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181641,8 +181683,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> >", + "name" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> >", +- "referenced_type" : "type-31894", +- "self_type" : "type-31893", ++ "referenced_type" : "type-31893", ++ "self_type" : "type-31892", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181651,8 +181693,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> >", + "name" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> >", +- "referenced_type" : "type-6693", +- "self_type" : "type-6692", ++ "referenced_type" : "type-6645", ++ "self_type" : "type-6644", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181661,8 +181703,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> >", + "name" : "const std::__map_iterator *>, std::__tree_node *>, void *> *, int> >", +- "referenced_type" : "type-9849", +- "self_type" : "type-9848", ++ "referenced_type" : "type-9801", ++ "self_type" : "type-9800", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181671,8 +181713,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", + "name" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", +- "referenced_type" : "type-10468", +- "self_type" : "type-10467", ++ "referenced_type" : "type-10420", ++ "self_type" : "type-10419", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181681,8 +181723,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", + "name" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", +- "referenced_type" : "type-13759", +- "self_type" : "type-13758", ++ "referenced_type" : "type-13711", ++ "self_type" : "type-13710", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181691,8 +181733,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", + "name" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", +- "referenced_type" : "type-15092", +- "self_type" : "type-15091", ++ "referenced_type" : "type-15044", ++ "self_type" : "type-15043", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181701,8 +181743,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", + "name" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", +- "referenced_type" : "type-17623", +- "self_type" : "type-17622", ++ "referenced_type" : "type-17575", ++ "self_type" : "type-17574", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181711,8 +181753,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", + "name" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", +- "referenced_type" : "type-18876", +- "self_type" : "type-18875", ++ "referenced_type" : "type-18828", ++ "self_type" : "type-18827", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181721,8 +181763,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", + "name" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", +- "referenced_type" : "type-22152", +- "self_type" : "type-22151", ++ "referenced_type" : "type-22151", ++ "self_type" : "type-22150", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181731,8 +181773,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", + "name" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", +- "referenced_type" : "type-23405", +- "self_type" : "type-23404", ++ "referenced_type" : "type-23388", ++ "self_type" : "type-23387", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181741,8 +181783,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", + "name" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", +- "referenced_type" : "type-27337", +- "self_type" : "type-27336", ++ "referenced_type" : "type-27336", ++ "self_type" : "type-27335", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181751,8 +181793,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", + "name" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", +- "referenced_type" : "type-28590", +- "self_type" : "type-28589", ++ "referenced_type" : "type-28589", ++ "self_type" : "type-28588", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181761,8 +181803,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", + "name" : "const std::__map_iterator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> *, int> >", +- "referenced_type" : "type-7538", +- "self_type" : "type-7537", ++ "referenced_type" : "type-7490", ++ "self_type" : "type-7489", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181771,8 +181813,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node", + "name" : "const std::__tree_node", +- "referenced_type" : "type-13133", +- "self_type" : "type-13132", ++ "referenced_type" : "type-13085", ++ "self_type" : "type-13084", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181781,8 +181823,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node", + "name" : "const std::__tree_node", +- "referenced_type" : "type-16989", +- "self_type" : "type-16988", ++ "referenced_type" : "type-16941", ++ "self_type" : "type-16940", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181791,8 +181833,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node", + "name" : "const std::__tree_node", +- "referenced_type" : "type-21521", +- "self_type" : "type-21520", ++ "referenced_type" : "type-21473", ++ "self_type" : "type-21472", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181801,8 +181843,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node", + "name" : "const std::__tree_node", +- "referenced_type" : "type-26699", +- "self_type" : "type-26698", ++ "referenced_type" : "type-26720", ++ "self_type" : "type-26719", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181811,8 +181853,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node", + "name" : "const std::__tree_node", +- "referenced_type" : "type-31846", +- "self_type" : "type-31845", ++ "referenced_type" : "type-31845", ++ "self_type" : "type-31844", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181821,8 +181863,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node", + "name" : "const std::__tree_node", +- "referenced_type" : "type-6624", +- "self_type" : "type-6623", ++ "referenced_type" : "type-6576", ++ "self_type" : "type-6575", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181831,8 +181873,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node", + "name" : "const std::__tree_node", +- "referenced_type" : "type-9801", +- "self_type" : "type-9800", ++ "referenced_type" : "type-9753", ++ "self_type" : "type-9752", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181841,8 +181883,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node *>, void *>", + "name" : "const std::__tree_node *>, void *>", +- "referenced_type" : "type-13123", +- "self_type" : "type-13122", ++ "referenced_type" : "type-13075", ++ "self_type" : "type-13074", + "size" : 40, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181851,8 +181893,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node *>, void *>", + "name" : "const std::__tree_node *>, void *>", +- "referenced_type" : "type-16979", +- "self_type" : "type-16978", ++ "referenced_type" : "type-16931", ++ "self_type" : "type-16930", + "size" : 40, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181861,8 +181903,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node *>, void *>", + "name" : "const std::__tree_node *>, void *>", +- "referenced_type" : "type-21511", +- "self_type" : "type-21510", ++ "referenced_type" : "type-21463", ++ "self_type" : "type-21462", + "size" : 40, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181871,8 +181913,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node *>, void *>", + "name" : "const std::__tree_node *>, void *>", +- "referenced_type" : "type-26689", +- "self_type" : "type-26688", ++ "referenced_type" : "type-26712", ++ "self_type" : "type-26711", + "size" : 40, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181881,8 +181923,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node *>, void *>", + "name" : "const std::__tree_node *>, void *>", +- "referenced_type" : "type-31836", +- "self_type" : "type-31835", ++ "referenced_type" : "type-31835", ++ "self_type" : "type-31834", + "size" : 40, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181891,8 +181933,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node *>, void *>", + "name" : "const std::__tree_node *>, void *>", +- "referenced_type" : "type-6608", +- "self_type" : "type-6607", ++ "referenced_type" : "type-6560", ++ "self_type" : "type-6559", + "size" : 40, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181901,8 +181943,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node *>, void *>", + "name" : "const std::__tree_node *>, void *>", +- "referenced_type" : "type-9791", +- "self_type" : "type-9790", ++ "referenced_type" : "type-9743", ++ "self_type" : "type-9742", + "size" : 40, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181911,8 +181953,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *>", + "name" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *>", +- "referenced_type" : "type-10408", +- "self_type" : "type-10407", ++ "referenced_type" : "type-10360", ++ "self_type" : "type-10359", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181921,8 +181963,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *>", + "name" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *>", +- "referenced_type" : "type-13699", +- "self_type" : "type-13698", ++ "referenced_type" : "type-13651", ++ "self_type" : "type-13650", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181931,8 +181973,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *>", + "name" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *>", +- "referenced_type" : "type-17563", +- "self_type" : "type-17562", ++ "referenced_type" : "type-17515", ++ "self_type" : "type-17514", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181941,8 +181983,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *>", + "name" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *>", +- "referenced_type" : "type-22092", +- "self_type" : "type-22091", ++ "referenced_type" : "type-22091", ++ "self_type" : "type-22090", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181951,8 +181993,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *>", + "name" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *>", +- "referenced_type" : "type-27277", +- "self_type" : "type-27276", ++ "referenced_type" : "type-27276", ++ "self_type" : "type-27275", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181961,8 +182003,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *>", + "name" : "const std::__tree_node, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *>", +- "referenced_type" : "type-7450", +- "self_type" : "type-7449", ++ "referenced_type" : "type-7402", ++ "self_type" : "type-7401", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181971,8 +182013,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node, std::allocator > *, void *>", + "name" : "const std::__tree_node, std::allocator > *, void *>", +- "referenced_type" : "type-10416", +- "self_type" : "type-10415", ++ "referenced_type" : "type-10368", ++ "self_type" : "type-10367", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181981,8 +182023,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node, std::allocator > *, void *>", + "name" : "const std::__tree_node, std::allocator > *, void *>", +- "referenced_type" : "type-13707", +- "self_type" : "type-13706", ++ "referenced_type" : "type-13659", ++ "self_type" : "type-13658", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -181991,8 +182033,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node, std::allocator > *, void *>", + "name" : "const std::__tree_node, std::allocator > *, void *>", +- "referenced_type" : "type-17571", +- "self_type" : "type-17570", ++ "referenced_type" : "type-17523", ++ "self_type" : "type-17522", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -182001,8 +182043,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node, std::allocator > *, void *>", + "name" : "const std::__tree_node, std::allocator > *, void *>", +- "referenced_type" : "type-22100", +- "self_type" : "type-22099", ++ "referenced_type" : "type-22099", ++ "self_type" : "type-22098", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -182011,8 +182053,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node, std::allocator > *, void *>", + "name" : "const std::__tree_node, std::allocator > *, void *>", +- "referenced_type" : "type-27285", +- "self_type" : "type-27284", ++ "referenced_type" : "type-27284", ++ "self_type" : "type-27283", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -182021,8 +182063,8 @@ + "is_const" : true, + "linker_set_key" : "const std::__tree_node, std::allocator > *, void *>", + "name" : "const std::__tree_node, std::allocator > *, void *>", +- "referenced_type" : "type-7465", +- "self_type" : "type-7464", ++ "referenced_type" : "type-7417", ++ "self_type" : "type-7416", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -182031,8 +182073,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-12256", +- "self_type" : "type-12255", ++ "referenced_type" : "type-12208", ++ "self_type" : "type-12207", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182041,8 +182083,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-16111", +- "self_type" : "type-16110", ++ "referenced_type" : "type-16063", ++ "self_type" : "type-16062", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182051,8 +182093,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-20643", +- "self_type" : "type-20642", ++ "referenced_type" : "type-20595", ++ "self_type" : "type-20594", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182061,8 +182103,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-25822", +- "self_type" : "type-25821", ++ "referenced_type" : "type-25873", ++ "self_type" : "type-25872", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182071,8 +182113,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-30968", +- "self_type" : "type-30967", ++ "referenced_type" : "type-30967", ++ "self_type" : "type-30966", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182081,8 +182123,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-3704", +- "self_type" : "type-3703", ++ "referenced_type" : "type-3656", ++ "self_type" : "type-3655", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182091,8 +182133,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-5664", +- "self_type" : "type-5663", ++ "referenced_type" : "type-5616", ++ "self_type" : "type-5615", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182101,8 +182143,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-8922", +- "self_type" : "type-8921", ++ "referenced_type" : "type-8874", ++ "self_type" : "type-8873", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182111,8 +182153,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator &)> >", + "name" : "const std::allocator &)> >", +- "referenced_type" : "type-10002", +- "self_type" : "type-10001", ++ "referenced_type" : "type-13287", ++ "self_type" : "type-13286", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182121,8 +182163,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator &)> >", + "name" : "const std::allocator &)> >", +- "referenced_type" : "type-13335", +- "self_type" : "type-13334", ++ "referenced_type" : "type-17143", ++ "self_type" : "type-17142", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182131,8 +182173,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator &)> >", + "name" : "const std::allocator &)> >", +- "referenced_type" : "type-17191", +- "self_type" : "type-17190", ++ "referenced_type" : "type-21675", ++ "self_type" : "type-21674", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182141,8 +182183,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator &)> >", + "name" : "const std::allocator &)> >", +- "referenced_type" : "type-21723", +- "self_type" : "type-21722", ++ "referenced_type" : "type-26923", ++ "self_type" : "type-26922", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182151,8 +182193,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator &)> >", + "name" : "const std::allocator &)> >", +- "referenced_type" : "type-26901", +- "self_type" : "type-26900", ++ "referenced_type" : "type-32047", ++ "self_type" : "type-32046", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182161,8 +182203,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator &)> >", + "name" : "const std::allocator &)> >", +- "referenced_type" : "type-32048", +- "self_type" : "type-32047", ++ "referenced_type" : "type-6862", ++ "self_type" : "type-6861", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182171,8 +182213,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator &)> >", + "name" : "const std::allocator &)> >", +- "referenced_type" : "type-6910", +- "self_type" : "type-6909", ++ "referenced_type" : "type-9954", ++ "self_type" : "type-9953", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182181,8 +182223,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-12744", +- "self_type" : "type-12743", ++ "referenced_type" : "type-12696", ++ "self_type" : "type-12695", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182191,8 +182233,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-16600", +- "self_type" : "type-16599", ++ "referenced_type" : "type-16552", ++ "self_type" : "type-16551", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182201,8 +182243,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-21132", +- "self_type" : "type-21131", ++ "referenced_type" : "type-21084", ++ "self_type" : "type-21083", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182211,8 +182253,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-26310", +- "self_type" : "type-26309", ++ "referenced_type" : "type-26354", ++ "self_type" : "type-26353", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182221,8 +182263,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-31457", +- "self_type" : "type-31456", ++ "referenced_type" : "type-31456", ++ "self_type" : "type-31455", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182231,8 +182273,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-4328", +- "self_type" : "type-4327", ++ "referenced_type" : "type-4280", ++ "self_type" : "type-4279", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182241,8 +182283,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-6155", +- "self_type" : "type-6154", ++ "referenced_type" : "type-6107", ++ "self_type" : "type-6106", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182251,8 +182293,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-9412", +- "self_type" : "type-9411", ++ "referenced_type" : "type-9364", ++ "self_type" : "type-9363", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182261,8 +182303,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-10008", +- "self_type" : "type-10007", ++ "referenced_type" : "type-13293", ++ "self_type" : "type-13292", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182271,8 +182313,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-13341", +- "self_type" : "type-13340", ++ "referenced_type" : "type-17149", ++ "self_type" : "type-17148", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182281,8 +182323,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-17197", +- "self_type" : "type-17196", ++ "referenced_type" : "type-21681", ++ "self_type" : "type-21680", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182291,8 +182333,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-21729", +- "self_type" : "type-21728", ++ "referenced_type" : "type-26929", ++ "self_type" : "type-26928", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182301,8 +182343,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-26907", +- "self_type" : "type-26906", ++ "referenced_type" : "type-32053", ++ "self_type" : "type-32052", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182311,8 +182353,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-32054", +- "self_type" : "type-32053", ++ "referenced_type" : "type-6868", ++ "self_type" : "type-6867", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182321,8 +182363,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator >", + "name" : "const std::allocator >", +- "referenced_type" : "type-6916", +- "self_type" : "type-6915", ++ "referenced_type" : "type-9960", ++ "self_type" : "type-9959", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182331,8 +182373,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> >", + "name" : "const std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> >", +- "referenced_type" : "type-19536", +- "self_type" : "type-19535", ++ "referenced_type" : "type-19488", ++ "self_type" : "type-19487", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182351,8 +182393,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> >", + "name" : "const std::allocator, std::allocator >, Status (*)(ProtoStreamObjectWriter *, const DataPiece &)> >", +- "referenced_type" : "type-29191", +- "self_type" : "type-29190", ++ "referenced_type" : "type-29190", ++ "self_type" : "type-29189", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182361,8 +182403,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> >", + "name" : "const std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> >", +- "referenced_type" : "type-19394", +- "self_type" : "type-19393", ++ "referenced_type" : "type-19346", ++ "self_type" : "type-19345", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182371,8 +182413,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> >", + "name" : "const std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> >", +- "referenced_type" : "type-23894", +- "self_type" : "type-23893", ++ "referenced_type" : "type-23896", ++ "self_type" : "type-23895", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182381,8 +182423,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> >", + "name" : "const std::allocator, std::allocator >, Status (*)(const ProtoStreamObjectSource *, const Type &, StringPiece, ObjectWriter *)> >", +- "referenced_type" : "type-29079", +- "self_type" : "type-29078", ++ "referenced_type" : "type-29078", ++ "self_type" : "type-29077", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182391,8 +182433,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> >", + "name" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> >", +- "referenced_type" : "type-12264", +- "self_type" : "type-12263", ++ "referenced_type" : "type-12216", ++ "self_type" : "type-12215", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182401,8 +182443,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> >", + "name" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> >", +- "referenced_type" : "type-16119", +- "self_type" : "type-16118", ++ "referenced_type" : "type-16071", ++ "self_type" : "type-16070", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182411,8 +182453,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> >", + "name" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> >", +- "referenced_type" : "type-20651", +- "self_type" : "type-20650", ++ "referenced_type" : "type-20603", ++ "self_type" : "type-20602", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182421,8 +182463,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> >", + "name" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> >", +- "referenced_type" : "type-25830", +- "self_type" : "type-25829", ++ "referenced_type" : "type-25881", ++ "self_type" : "type-25880", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182431,8 +182473,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> >", + "name" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> >", +- "referenced_type" : "type-30976", +- "self_type" : "type-30975", ++ "referenced_type" : "type-30975", ++ "self_type" : "type-30974", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182441,8 +182483,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> >", + "name" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> >", +- "referenced_type" : "type-3712", +- "self_type" : "type-3711", ++ "referenced_type" : "type-3664", ++ "self_type" : "type-3663", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182451,8 +182493,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> >", + "name" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> >", +- "referenced_type" : "type-5672", +- "self_type" : "type-5671", ++ "referenced_type" : "type-5624", ++ "self_type" : "type-5623", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182461,8 +182503,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> >", + "name" : "const std::allocator, std::allocator >, const google::protobuf::SourceCodeInfo_Location *> >", +- "referenced_type" : "type-8930", +- "self_type" : "type-8929", ++ "referenced_type" : "type-8882", ++ "self_type" : "type-8881", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182471,8 +182513,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> >", + "name" : "const std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> >", +- "referenced_type" : "type-11406", +- "self_type" : "type-11405", ++ "referenced_type" : "type-11358", ++ "self_type" : "type-11357", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182481,8 +182523,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> >", + "name" : "const std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> >", +- "referenced_type" : "type-14625", +- "self_type" : "type-14624", ++ "referenced_type" : "type-14577", ++ "self_type" : "type-14576", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182491,8 +182533,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> >", + "name" : "const std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> >", +- "referenced_type" : "type-18489", +- "self_type" : "type-18488", ++ "referenced_type" : "type-18441", ++ "self_type" : "type-18440", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182501,8 +182543,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> >", + "name" : "const std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> >", +- "referenced_type" : "type-23018", +- "self_type" : "type-23017", ++ "referenced_type" : "type-22990", ++ "self_type" : "type-22989", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182511,8 +182553,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> >", + "name" : "const std::allocator, std::allocator >, google::protobuf::FieldDescriptorProto_Type> >", +- "referenced_type" : "type-28203", +- "self_type" : "type-28202", ++ "referenced_type" : "type-28202", ++ "self_type" : "type-28201", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182521,8 +182563,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, int> >", + "name" : "const std::allocator, std::allocator >, int> >", +- "referenced_type" : "type-15321", +- "self_type" : "type-15320", ++ "referenced_type" : "type-15273", ++ "self_type" : "type-15272", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182531,8 +182573,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, int> >", + "name" : "const std::allocator, std::allocator >, int> >", +- "referenced_type" : "type-19092", +- "self_type" : "type-19091", ++ "referenced_type" : "type-19044", ++ "self_type" : "type-19043", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182541,8 +182583,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, int> >", + "name" : "const std::allocator, std::allocator >, int> >", +- "referenced_type" : "type-23621", +- "self_type" : "type-23620", ++ "referenced_type" : "type-23603", ++ "self_type" : "type-23602", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182551,8 +182593,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, std::allocator >, int> >", + "name" : "const std::allocator, std::allocator >, int> >", +- "referenced_type" : "type-28806", +- "self_type" : "type-28805", ++ "referenced_type" : "type-28805", ++ "self_type" : "type-28804", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182561,8 +182603,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, google::protobuf::internal::ExtensionInfo> >", + "name" : "const std::allocator, google::protobuf::internal::ExtensionInfo> >", +- "referenced_type" : "type-10364", +- "self_type" : "type-10363", ++ "referenced_type" : "type-10316", ++ "self_type" : "type-10315", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182571,8 +182613,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, google::protobuf::internal::ExtensionInfo> >", + "name" : "const std::allocator, google::protobuf::internal::ExtensionInfo> >", +- "referenced_type" : "type-1312", +- "self_type" : "type-1311", ++ "referenced_type" : "type-1225", ++ "self_type" : "type-1224", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182581,8 +182623,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, google::protobuf::internal::ExtensionInfo> >", + "name" : "const std::allocator, google::protobuf::internal::ExtensionInfo> >", +- "referenced_type" : "type-13655", +- "self_type" : "type-13654", ++ "referenced_type" : "type-13607", ++ "self_type" : "type-13606", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182591,8 +182633,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, google::protobuf::internal::ExtensionInfo> >", + "name" : "const std::allocator, google::protobuf::internal::ExtensionInfo> >", +- "referenced_type" : "type-17519", +- "self_type" : "type-17518", ++ "referenced_type" : "type-17471", ++ "self_type" : "type-17470", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182601,8 +182643,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, google::protobuf::internal::ExtensionInfo> >", + "name" : "const std::allocator, google::protobuf::internal::ExtensionInfo> >", +- "referenced_type" : "type-22048", +- "self_type" : "type-22047", ++ "referenced_type" : "type-22606", ++ "self_type" : "type-22605", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182611,8 +182653,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, google::protobuf::internal::ExtensionInfo> >", + "name" : "const std::allocator, google::protobuf::internal::ExtensionInfo> >", +- "referenced_type" : "type-27233", +- "self_type" : "type-27232", ++ "referenced_type" : "type-2687", ++ "self_type" : "type-2686", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182621,8 +182663,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, google::protobuf::internal::ExtensionInfo> >", + "name" : "const std::allocator, google::protobuf::internal::ExtensionInfo> >", +- "referenced_type" : "type-2735", +- "self_type" : "type-2734", ++ "referenced_type" : "type-27232", ++ "self_type" : "type-27231", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182631,8 +182673,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, google::protobuf::internal::ExtensionInfo> >", + "name" : "const std::allocator, google::protobuf::internal::ExtensionInfo> >", +- "referenced_type" : "type-468", +- "self_type" : "type-467", ++ "referenced_type" : "type-4667", ++ "self_type" : "type-4666", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182641,8 +182683,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, google::protobuf::internal::ExtensionInfo> >", + "name" : "const std::allocator, google::protobuf::internal::ExtensionInfo> >", +- "referenced_type" : "type-4715", +- "self_type" : "type-4714", ++ "referenced_type" : "type-468", ++ "self_type" : "type-467", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182651,8 +182693,8 @@ + "is_const" : true, + "linker_set_key" : "const std::allocator, google::protobuf::internal::ExtensionInfo> >", + "name" : "const std::allocator, google::protobuf::internal::ExtensionInfo> >", +- "referenced_type" : "type-7345", +- "self_type" : "type-7344", ++ "referenced_type" : "type-7297", ++ "self_type" : "type-7296", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -182671,58 +182713,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-10090", +- "self_type" : "type-10089", +- "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" +- }, +- { +- "alignment" : 4, +- "is_const" : true, +- "linker_set_key" : "const std::basic_string, std::allocator >", +- "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-10100", +- "self_type" : "type-10099", +- "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" +- }, +- { +- "alignment" : 4, +- "is_const" : true, +- "linker_set_key" : "const std::basic_string, std::allocator >", +- "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-10173", +- "self_type" : "type-10172", +- "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" +- }, +- { +- "alignment" : 4, +- "is_const" : true, +- "linker_set_key" : "const std::basic_string, std::allocator >", +- "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-10185", +- "self_type" : "type-10184", +- "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" +- }, +- { +- "alignment" : 4, +- "is_const" : true, +- "linker_set_key" : "const std::basic_string, std::allocator >", +- "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-10279", +- "self_type" : "type-10278", +- "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" +- }, +- { +- "alignment" : 4, +- "is_const" : true, +- "linker_set_key" : "const std::basic_string, std::allocator >", +- "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-10292", +- "self_type" : "type-10291", ++ "referenced_type" : "type-10042", ++ "self_type" : "type-10041", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -182731,8 +182723,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1035", +- "self_type" : "type-1034", ++ "referenced_type" : "type-10052", ++ "self_type" : "type-10051", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -182741,8 +182733,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1041", +- "self_type" : "type-1040", ++ "referenced_type" : "type-10125", ++ "self_type" : "type-10124", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -182751,8 +182743,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-10534", +- "self_type" : "type-10533", ++ "referenced_type" : "type-10137", ++ "self_type" : "type-10136", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -182761,8 +182753,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-10548", +- "self_type" : "type-10547", ++ "referenced_type" : "type-10231", ++ "self_type" : "type-10230", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -182771,8 +182763,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-10716", +- "self_type" : "type-10715", ++ "referenced_type" : "type-10244", ++ "self_type" : "type-10243", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -182781,8 +182773,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-10804", +- "self_type" : "type-10803", ++ "referenced_type" : "type-1035", ++ "self_type" : "type-1034", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -182791,8 +182783,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-10880", +- "self_type" : "type-10879", ++ "referenced_type" : "type-1041", ++ "self_type" : "type-1040", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -182801,8 +182793,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-10989", +- "self_type" : "type-10988", ++ "referenced_type" : "type-10486", ++ "self_type" : "type-10485", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -182811,8 +182803,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-11044", +- "self_type" : "type-11043", ++ "referenced_type" : "type-10500", ++ "self_type" : "type-10499", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -182821,8 +182813,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-11082", +- "self_type" : "type-11081", ++ "referenced_type" : "type-10668", ++ "self_type" : "type-10667", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -182831,8 +182823,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-11177", +- "self_type" : "type-11176", ++ "referenced_type" : "type-10756", ++ "self_type" : "type-10755", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -182841,8 +182833,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-11199", +- "self_type" : "type-11198", ++ "referenced_type" : "type-10832", ++ "self_type" : "type-10831", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -182851,8 +182843,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-11225", +- "self_type" : "type-11224", ++ "referenced_type" : "type-10941", ++ "self_type" : "type-10940", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -182861,8 +182853,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-11233", +- "self_type" : "type-11232", ++ "referenced_type" : "type-10996", ++ "self_type" : "type-10995", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -182871,8 +182863,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-11244", +- "self_type" : "type-11243", ++ "referenced_type" : "type-11034", ++ "self_type" : "type-11033", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -182881,8 +182873,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-11252", +- "self_type" : "type-11251", ++ "referenced_type" : "type-11129", ++ "self_type" : "type-11128", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -182891,8 +182883,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1128", +- "self_type" : "type-1127", ++ "referenced_type" : "type-11151", ++ "self_type" : "type-11150", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -182901,8 +182893,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-11393", +- "self_type" : "type-11392", ++ "referenced_type" : "type-11177", ++ "self_type" : "type-11176", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -182911,8 +182903,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-11413", +- "self_type" : "type-11412", ++ "referenced_type" : "type-11185", ++ "self_type" : "type-11184", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -182921,8 +182913,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-11524", +- "self_type" : "type-11523", ++ "referenced_type" : "type-11196", ++ "self_type" : "type-11195", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -182931,8 +182923,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-11543", +- "self_type" : "type-11542", ++ "referenced_type" : "type-11204", ++ "self_type" : "type-11203", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -182941,8 +182933,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-11586", +- "self_type" : "type-11585", ++ "referenced_type" : "type-1128", ++ "self_type" : "type-1127", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -182951,8 +182943,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-11598", +- "self_type" : "type-11597", ++ "referenced_type" : "type-11345", ++ "self_type" : "type-11344", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -182961,8 +182953,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-11634", +- "self_type" : "type-11633", ++ "referenced_type" : "type-11365", ++ "self_type" : "type-11364", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -182971,8 +182963,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-11667", +- "self_type" : "type-11666", ++ "referenced_type" : "type-11476", ++ "self_type" : "type-11475", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -182981,18 +182973,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-116", +- "self_type" : "type-115", ++ "referenced_type" : "type-11495", ++ "self_type" : "type-11494", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-11703", +- "self_type" : "type-11702", ++ "referenced_type" : "type-11538", ++ "self_type" : "type-11537", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183001,18 +182993,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-11760", +- "self_type" : "type-11759", ++ "referenced_type" : "type-11550", ++ "self_type" : "type-11549", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-12011", +- "self_type" : "type-12010", ++ "referenced_type" : "type-11586", ++ "self_type" : "type-11585", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183021,8 +183013,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-12024", +- "self_type" : "type-12023", ++ "referenced_type" : "type-11619", ++ "self_type" : "type-11618", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183031,8 +183023,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-12088", +- "self_type" : "type-12087", ++ "referenced_type" : "type-11655", ++ "self_type" : "type-11654", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183041,8 +183033,28 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-12121", +- "self_type" : "type-12120", ++ "referenced_type" : "type-116", ++ "self_type" : "type-115", ++ "size" : 12, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ }, ++ { ++ "alignment" : 4, ++ "is_const" : true, ++ "linker_set_key" : "const std::basic_string, std::allocator >", ++ "name" : "const std::basic_string, std::allocator >", ++ "referenced_type" : "type-11712", ++ "self_type" : "type-11711", ++ "size" : 12, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ }, ++ { ++ "alignment" : 4, ++ "is_const" : true, ++ "linker_set_key" : "const std::basic_string, std::allocator >", ++ "name" : "const std::basic_string, std::allocator >", ++ "referenced_type" : "type-11963", ++ "self_type" : "type-11962", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183051,8 +183063,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-12126", +- "self_type" : "type-12125", ++ "referenced_type" : "type-11976", ++ "self_type" : "type-11975", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183061,8 +183073,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-12214", +- "self_type" : "type-12213", ++ "referenced_type" : "type-12040", ++ "self_type" : "type-12039", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183071,18 +183083,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-12233", +- "self_type" : "type-12232", ++ "referenced_type" : "type-1205", ++ "self_type" : "type-1204", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1230", +- "self_type" : "type-1229", ++ "referenced_type" : "type-12073", ++ "self_type" : "type-12072", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183091,8 +183103,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1236", +- "self_type" : "type-1235", ++ "referenced_type" : "type-12078", ++ "self_type" : "type-12077", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183101,8 +183113,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-12375", +- "self_type" : "type-12374", ++ "referenced_type" : "type-12166", ++ "self_type" : "type-12165", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183111,8 +183123,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-12424", +- "self_type" : "type-12423", ++ "referenced_type" : "type-12185", ++ "self_type" : "type-12184", ++ "size" : 12, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ }, ++ { ++ "alignment" : 4, ++ "is_const" : true, ++ "linker_set_key" : "const std::basic_string, std::allocator >", ++ "name" : "const std::basic_string, std::allocator >", ++ "referenced_type" : "type-12327", ++ "self_type" : "type-12326", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183121,8 +183143,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-12451", +- "self_type" : "type-12450", ++ "referenced_type" : "type-12376", ++ "self_type" : "type-12375", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183131,8 +183153,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-12521", +- "self_type" : "type-12520", ++ "referenced_type" : "type-12403", ++ "self_type" : "type-12402", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183141,8 +183163,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-12524", +- "self_type" : "type-12523", ++ "referenced_type" : "type-12473", ++ "self_type" : "type-12472", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183151,8 +183173,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-12599", +- "self_type" : "type-12598", ++ "referenced_type" : "type-12476", ++ "self_type" : "type-12475", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183161,8 +183183,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-12628", +- "self_type" : "type-12627", ++ "referenced_type" : "type-12551", ++ "self_type" : "type-12550", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183171,8 +183193,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-12727", +- "self_type" : "type-12726", ++ "referenced_type" : "type-12580", ++ "self_type" : "type-12579", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183181,8 +183203,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-12771", +- "self_type" : "type-12770", ++ "referenced_type" : "type-12679", ++ "self_type" : "type-12678", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183191,8 +183213,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-12807", +- "self_type" : "type-12806", ++ "referenced_type" : "type-12723", ++ "self_type" : "type-12722", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183201,8 +183223,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-12828", +- "self_type" : "type-12827", ++ "referenced_type" : "type-12759", ++ "self_type" : "type-12758", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183211,8 +183233,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-12872", +- "self_type" : "type-12871", ++ "referenced_type" : "type-12780", ++ "self_type" : "type-12779", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183221,8 +183243,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-12879", +- "self_type" : "type-12878", ++ "referenced_type" : "type-12824", ++ "self_type" : "type-12823", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183231,8 +183253,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1290", +- "self_type" : "type-1289", ++ "referenced_type" : "type-12831", ++ "self_type" : "type-12830", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183241,8 +183263,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-12938", +- "self_type" : "type-12937", ++ "referenced_type" : "type-12890", ++ "self_type" : "type-12889", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183251,8 +183273,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-13003", +- "self_type" : "type-13002", ++ "referenced_type" : "type-12955", ++ "self_type" : "type-12954", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183261,8 +183283,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-13018", +- "self_type" : "type-13017", ++ "referenced_type" : "type-12970", ++ "self_type" : "type-12969", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183271,8 +183293,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-13041", +- "self_type" : "type-13040", ++ "referenced_type" : "type-12993", ++ "self_type" : "type-12992", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183281,8 +183303,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-13089", +- "self_type" : "type-13088", ++ "referenced_type" : "type-13041", ++ "self_type" : "type-13040", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183291,8 +183313,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-13313", +- "self_type" : "type-13312", ++ "referenced_type" : "type-13265", ++ "self_type" : "type-13264", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183301,8 +183323,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-13423", +- "self_type" : "type-13422", ++ "referenced_type" : "type-13375", ++ "self_type" : "type-13374", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183311,8 +183333,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-13433", +- "self_type" : "type-13432", ++ "referenced_type" : "type-13385", ++ "self_type" : "type-13384", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183321,8 +183343,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-13506", +- "self_type" : "type-13505", ++ "referenced_type" : "type-13458", ++ "self_type" : "type-13457", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183331,8 +183353,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-13518", +- "self_type" : "type-13517", ++ "referenced_type" : "type-13470", ++ "self_type" : "type-13469", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183341,8 +183363,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-13570", +- "self_type" : "type-13569", ++ "referenced_type" : "type-13522", ++ "self_type" : "type-13521", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183351,8 +183373,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-13583", +- "self_type" : "type-13582", ++ "referenced_type" : "type-13535", ++ "self_type" : "type-13534", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183361,8 +183383,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-13825", +- "self_type" : "type-13824", ++ "referenced_type" : "type-13777", ++ "self_type" : "type-13776", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183371,8 +183393,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1382", +- "self_type" : "type-1381", ++ "referenced_type" : "type-1377", ++ "self_type" : "type-1376", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183381,8 +183403,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-13839", +- "self_type" : "type-13838", ++ "referenced_type" : "type-13791", ++ "self_type" : "type-13790", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183401,8 +183423,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-14007", +- "self_type" : "type-14006", ++ "referenced_type" : "type-1391", ++ "self_type" : "type-1390", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183411,8 +183433,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-14095", +- "self_type" : "type-14094", ++ "referenced_type" : "type-13959", ++ "self_type" : "type-13958", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183421,8 +183443,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-14171", +- "self_type" : "type-14170", ++ "referenced_type" : "type-14047", ++ "self_type" : "type-14046", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183431,8 +183453,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-14280", +- "self_type" : "type-14279", ++ "referenced_type" : "type-1410", ++ "self_type" : "type-1409", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183441,8 +183463,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-14335", +- "self_type" : "type-14334", ++ "referenced_type" : "type-14123", ++ "self_type" : "type-14122", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183451,8 +183473,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-14364", +- "self_type" : "type-14363", ++ "referenced_type" : "type-14232", ++ "self_type" : "type-14231", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183461,8 +183483,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-14441", +- "self_type" : "type-14440", ++ "referenced_type" : "type-1427", ++ "self_type" : "type-1426", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183471,8 +183493,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-14455", +- "self_type" : "type-14454", ++ "referenced_type" : "type-14287", ++ "self_type" : "type-14286", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183481,8 +183503,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-14477", +- "self_type" : "type-14476", ++ "referenced_type" : "type-14316", ++ "self_type" : "type-14315", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183491,8 +183513,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-14485", +- "self_type" : "type-14484", ++ "referenced_type" : "type-14393", ++ "self_type" : "type-14392", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183501,8 +183523,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-14496", +- "self_type" : "type-14495", ++ "referenced_type" : "type-14407", ++ "self_type" : "type-14406", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183511,8 +183533,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-14503", +- "self_type" : "type-14502", ++ "referenced_type" : "type-14429", ++ "self_type" : "type-14428", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183521,8 +183543,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1458", +- "self_type" : "type-1457", ++ "referenced_type" : "type-14437", ++ "self_type" : "type-14436", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183531,8 +183553,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-14617", +- "self_type" : "type-14616", ++ "referenced_type" : "type-14448", ++ "self_type" : "type-14447", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183541,8 +183563,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-14632", +- "self_type" : "type-14631", ++ "referenced_type" : "type-14455", ++ "self_type" : "type-14454", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183551,8 +183573,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-14743", +- "self_type" : "type-14742", ++ "referenced_type" : "type-1446", ++ "self_type" : "type-1445", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183561,8 +183583,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1476", +- "self_type" : "type-1475", ++ "referenced_type" : "type-14569", ++ "self_type" : "type-14568", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183571,8 +183593,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-14784", +- "self_type" : "type-14783", ++ "referenced_type" : "type-14584", ++ "self_type" : "type-14583", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183581,18 +183603,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-14831", +- "self_type" : "type-14830", ++ "referenced_type" : "type-14695", ++ "self_type" : "type-14694", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-148", +- "self_type" : "type-147", ++ "referenced_type" : "type-14736", ++ "self_type" : "type-14735", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183601,18 +183623,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15004", +- "self_type" : "type-15003", ++ "referenced_type" : "type-14783", ++ "self_type" : "type-14782", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15076", +- "self_type" : "type-15075", ++ "referenced_type" : "type-1489", ++ "self_type" : "type-1488", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183621,8 +183643,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1511", +- "self_type" : "type-1510", ++ "referenced_type" : "type-148", ++ "self_type" : "type-147", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183631,8 +183653,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15182", +- "self_type" : "type-15181", ++ "referenced_type" : "type-14956", ++ "self_type" : "type-14955", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183641,8 +183663,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1527", +- "self_type" : "type-1526", ++ "referenced_type" : "type-1501", ++ "self_type" : "type-1500", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183651,8 +183673,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15392", +- "self_type" : "type-15391", ++ "referenced_type" : "type-15028", ++ "self_type" : "type-15027", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183661,8 +183683,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15409", +- "self_type" : "type-15408", ++ "referenced_type" : "type-15134", ++ "self_type" : "type-15133", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183671,8 +183693,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15418", +- "self_type" : "type-15417", ++ "referenced_type" : "type-15344", ++ "self_type" : "type-15343", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183681,8 +183703,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15445", +- "self_type" : "type-15444", ++ "referenced_type" : "type-15361", ++ "self_type" : "type-15360", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183691,8 +183713,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15457", +- "self_type" : "type-15456", ++ "referenced_type" : "type-15370", ++ "self_type" : "type-15369", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183701,8 +183723,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15493", +- "self_type" : "type-15492", ++ "referenced_type" : "type-15397", ++ "self_type" : "type-15396", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183711,8 +183733,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15526", +- "self_type" : "type-15525", ++ "referenced_type" : "type-15409", ++ "self_type" : "type-15408", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183721,8 +183743,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15559", +- "self_type" : "type-15558", ++ "referenced_type" : "type-15445", ++ "self_type" : "type-15444", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183731,18 +183753,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15617", +- "self_type" : "type-15616", ++ "referenced_type" : "type-15478", ++ "self_type" : "type-15477", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1569", +- "self_type" : "type-1568", ++ "referenced_type" : "type-1548", ++ "self_type" : "type-1547", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183751,8 +183773,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-156", +- "self_type" : "type-155", ++ "referenced_type" : "type-15511", ++ "self_type" : "type-15510", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183761,18 +183783,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1582", +- "self_type" : "type-1581", ++ "referenced_type" : "type-15569", ++ "self_type" : "type-15568", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15867", +- "self_type" : "type-15866", ++ "referenced_type" : "type-156", ++ "self_type" : "type-155", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183781,8 +183803,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15880", +- "self_type" : "type-15879", ++ "referenced_type" : "type-15819", ++ "self_type" : "type-15818", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183791,8 +183813,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15944", +- "self_type" : "type-15943", ++ "referenced_type" : "type-1582", ++ "self_type" : "type-1581", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183801,8 +183823,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15976", +- "self_type" : "type-15975", ++ "referenced_type" : "type-15832", ++ "self_type" : "type-15831", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183811,8 +183833,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-15981", +- "self_type" : "type-15980", ++ "referenced_type" : "type-15896", ++ "self_type" : "type-15895", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183821,8 +183843,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16069", +- "self_type" : "type-16068", ++ "referenced_type" : "type-15928", ++ "self_type" : "type-15927", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183831,18 +183853,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16088", +- "self_type" : "type-16087", ++ "referenced_type" : "type-15933", ++ "self_type" : "type-15932", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16230", +- "self_type" : "type-16229", ++ "referenced_type" : "type-16021", ++ "self_type" : "type-16020", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183851,8 +183873,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16281", +- "self_type" : "type-16280", ++ "referenced_type" : "type-16040", ++ "self_type" : "type-16039", ++ "size" : 12, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ }, ++ { ++ "alignment" : 4, ++ "is_const" : true, ++ "linker_set_key" : "const std::basic_string, std::allocator >", ++ "name" : "const std::basic_string, std::allocator >", ++ "referenced_type" : "type-16182", ++ "self_type" : "type-16181", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183861,8 +183893,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16308", +- "self_type" : "type-16307", ++ "referenced_type" : "type-16233", ++ "self_type" : "type-16232", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183871,8 +183903,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1633", +- "self_type" : "type-1632", ++ "referenced_type" : "type-16260", ++ "self_type" : "type-16259", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183881,8 +183913,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16378", +- "self_type" : "type-16377", ++ "referenced_type" : "type-16330", ++ "self_type" : "type-16329", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183891,8 +183923,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16381", +- "self_type" : "type-16380", ++ "referenced_type" : "type-16333", ++ "self_type" : "type-16332", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183901,8 +183933,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16456", +- "self_type" : "type-16455", ++ "referenced_type" : "type-16408", ++ "self_type" : "type-16407", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183911,8 +183943,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16485", +- "self_type" : "type-16484", ++ "referenced_type" : "type-16437", ++ "self_type" : "type-16436", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183921,8 +183953,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16583", +- "self_type" : "type-16582", ++ "referenced_type" : "type-16535", ++ "self_type" : "type-16534", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183931,8 +183963,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16627", +- "self_type" : "type-16626", ++ "referenced_type" : "type-16579", ++ "self_type" : "type-16578", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183941,8 +183973,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16663", +- "self_type" : "type-16662", ++ "referenced_type" : "type-16615", ++ "self_type" : "type-16614", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183951,8 +183983,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16684", +- "self_type" : "type-16683", ++ "referenced_type" : "type-16636", ++ "self_type" : "type-16635", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183961,8 +183993,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1670", +- "self_type" : "type-1669", ++ "referenced_type" : "type-16680", ++ "self_type" : "type-16679", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183971,8 +184003,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16728", +- "self_type" : "type-16727", ++ "referenced_type" : "type-16687", ++ "self_type" : "type-16686", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183981,8 +184013,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16735", +- "self_type" : "type-16734", ++ "referenced_type" : "type-16746", ++ "self_type" : "type-16745", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -183991,8 +184023,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16794", +- "self_type" : "type-16793", ++ "referenced_type" : "type-16811", ++ "self_type" : "type-16810", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184001,8 +184033,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16859", +- "self_type" : "type-16858", ++ "referenced_type" : "type-16826", ++ "self_type" : "type-16825", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184011,8 +184043,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16874", +- "self_type" : "type-16873", ++ "referenced_type" : "type-16849", ++ "self_type" : "type-16848", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184031,8 +184063,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-16945", +- "self_type" : "type-16944", ++ "referenced_type" : "type-17121", ++ "self_type" : "type-17120", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184041,8 +184073,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17169", +- "self_type" : "type-17168", ++ "referenced_type" : "type-171", ++ "self_type" : "type-170", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184051,18 +184083,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1718", +- "self_type" : "type-1717", ++ "referenced_type" : "type-17231", ++ "self_type" : "type-17230", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-171", +- "self_type" : "type-170", ++ "referenced_type" : "type-17241", ++ "self_type" : "type-17240", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184071,8 +184103,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17279", +- "self_type" : "type-17278", ++ "referenced_type" : "type-17314", ++ "self_type" : "type-17313", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184081,8 +184113,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17289", +- "self_type" : "type-17288", ++ "referenced_type" : "type-17326", ++ "self_type" : "type-17325", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184091,8 +184123,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17362", +- "self_type" : "type-17361", ++ "referenced_type" : "type-17386", ++ "self_type" : "type-17385", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184101,8 +184133,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17374", +- "self_type" : "type-17373", ++ "referenced_type" : "type-17399", ++ "self_type" : "type-17398", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184111,8 +184143,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17434", +- "self_type" : "type-17433", ++ "referenced_type" : "type-17641", ++ "self_type" : "type-17640", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184121,8 +184153,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17447", +- "self_type" : "type-17446", ++ "referenced_type" : "type-17655", ++ "self_type" : "type-17654", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184131,8 +184163,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17689", +- "self_type" : "type-17688", ++ "referenced_type" : "type-17823", ++ "self_type" : "type-17822", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184141,8 +184173,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17703", +- "self_type" : "type-17702", ++ "referenced_type" : "type-1786", ++ "self_type" : "type-1785", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184151,8 +184183,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17871", +- "self_type" : "type-17870", ++ "referenced_type" : "type-17911", ++ "self_type" : "type-17910", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184161,8 +184193,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-17959", +- "self_type" : "type-17958", ++ "referenced_type" : "type-17987", ++ "self_type" : "type-17986", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184171,8 +184203,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18035", +- "self_type" : "type-18034", ++ "referenced_type" : "type-18096", ++ "self_type" : "type-18095", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184181,8 +184213,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18144", +- "self_type" : "type-18143", ++ "referenced_type" : "type-18151", ++ "self_type" : "type-18150", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184191,8 +184223,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18199", +- "self_type" : "type-18198", ++ "referenced_type" : "type-18180", ++ "self_type" : "type-18179", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184211,8 +184243,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18228", +- "self_type" : "type-18227", ++ "referenced_type" : "type-18257", ++ "self_type" : "type-18256", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184221,8 +184253,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18305", +- "self_type" : "type-18304", ++ "referenced_type" : "type-18271", ++ "self_type" : "type-18270", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184231,8 +184263,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18319", +- "self_type" : "type-18318", ++ "referenced_type" : "type-18293", ++ "self_type" : "type-18292", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184241,8 +184273,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18341", +- "self_type" : "type-18340", ++ "referenced_type" : "type-18301", ++ "self_type" : "type-18300", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184251,8 +184283,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18349", +- "self_type" : "type-18348", ++ "referenced_type" : "type-18312", ++ "self_type" : "type-18311", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184261,8 +184293,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18360", +- "self_type" : "type-18359", ++ "referenced_type" : "type-18319", ++ "self_type" : "type-18318", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184271,8 +184303,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18367", +- "self_type" : "type-18366", ++ "referenced_type" : "type-18433", ++ "self_type" : "type-18432", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184281,8 +184313,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18481", +- "self_type" : "type-18480", ++ "referenced_type" : "type-18448", ++ "self_type" : "type-18447", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184291,8 +184323,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18496", +- "self_type" : "type-18495", ++ "referenced_type" : "type-18559", ++ "self_type" : "type-18558", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184301,8 +184333,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18607", +- "self_type" : "type-18606", ++ "referenced_type" : "type-18600", ++ "self_type" : "type-18599", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184311,18 +184343,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18648", +- "self_type" : "type-18647", ++ "referenced_type" : "type-1861", ++ "self_type" : "type-1860", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18688", +- "self_type" : "type-18687", ++ "referenced_type" : "type-18640", ++ "self_type" : "type-18639", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -184331,8 +184363,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-1869", +- "self_type" : "type-1868", ++ "referenced_type" : "type-18775", ++ "self_type" : "type-18774", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184341,8 +184373,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18823", +- "self_type" : "type-18822", ++ "referenced_type" : "type-18812", ++ "self_type" : "type-18811", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184351,8 +184383,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18860", +- "self_type" : "type-18859", ++ "referenced_type" : "type-18918", ++ "self_type" : "type-18917", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184361,8 +184393,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-18966", +- "self_type" : "type-18965", ++ "referenced_type" : "type-19103", ++ "self_type" : "type-19102", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184371,8 +184403,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19151", +- "self_type" : "type-19150", ++ "referenced_type" : "type-19117", ++ "self_type" : "type-19116", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184381,8 +184413,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19165", +- "self_type" : "type-19164", ++ "referenced_type" : "type-19125", ++ "self_type" : "type-19124", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184391,8 +184423,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19173", +- "self_type" : "type-19172", ++ "referenced_type" : "type-19130", ++ "self_type" : "type-19129", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184401,8 +184433,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19178", +- "self_type" : "type-19177", ++ "referenced_type" : "type-19305", ++ "self_type" : "type-19304", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184411,8 +184443,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19353", +- "self_type" : "type-19352", ++ "referenced_type" : "type-19310", ++ "self_type" : "type-19309", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184421,8 +184453,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19358", +- "self_type" : "type-19357", ++ "referenced_type" : "type-19339", ++ "self_type" : "type-19338", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184431,8 +184463,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19387", +- "self_type" : "type-19386", ++ "referenced_type" : "type-19472", ++ "self_type" : "type-19471", ++ "size" : 12, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ }, ++ { ++ "alignment" : 4, ++ "is_const" : true, ++ "linker_set_key" : "const std::basic_string, std::allocator >", ++ "name" : "const std::basic_string, std::allocator >", ++ "referenced_type" : "type-19475", ++ "self_type" : "type-19474", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184451,8 +184493,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19520", +- "self_type" : "type-19519", ++ "referenced_type" : "type-19647", ++ "self_type" : "type-19646", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184461,8 +184503,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19523", +- "self_type" : "type-19522", ++ "referenced_type" : "type-19661", ++ "self_type" : "type-19660", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184471,8 +184513,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19695", +- "self_type" : "type-19694", ++ "referenced_type" : "type-19821", ++ "self_type" : "type-19820", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184481,8 +184523,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19709", +- "self_type" : "type-19708", ++ "referenced_type" : "type-19917", ++ "self_type" : "type-19916", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184491,8 +184533,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19869", +- "self_type" : "type-19868", ++ "referenced_type" : "type-20007", ++ "self_type" : "type-20006", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184501,8 +184543,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-19965", +- "self_type" : "type-19964", ++ "referenced_type" : "type-20044", ++ "self_type" : "type-20043", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184511,18 +184553,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20055", +- "self_type" : "type-20054", ++ "referenced_type" : "type-20102", ++ "self_type" : "type-20101", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20092", +- "self_type" : "type-20091", ++ "referenced_type" : "type-20353", ++ "self_type" : "type-20352", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184531,18 +184573,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20150", +- "self_type" : "type-20149", ++ "referenced_type" : "type-20366", ++ "self_type" : "type-20365", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20401", +- "self_type" : "type-20400", ++ "referenced_type" : "type-20430", ++ "self_type" : "type-20429", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184551,8 +184593,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20414", +- "self_type" : "type-20413", ++ "referenced_type" : "type-20460", ++ "self_type" : "type-20459", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184561,8 +184603,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20478", +- "self_type" : "type-20477", ++ "referenced_type" : "type-20465", ++ "self_type" : "type-20464", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184571,8 +184613,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20508", +- "self_type" : "type-20507", ++ "referenced_type" : "type-20553", ++ "self_type" : "type-20552", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184581,18 +184623,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20513", +- "self_type" : "type-20512", ++ "referenced_type" : "type-20572", ++ "self_type" : "type-20571", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20601", +- "self_type" : "type-20600", ++ "referenced_type" : "type-20713", ++ "self_type" : "type-20712", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184601,18 +184643,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20620", +- "self_type" : "type-20619", ++ "referenced_type" : "type-20764", ++ "self_type" : "type-20763", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20761", +- "self_type" : "type-20760", ++ "referenced_type" : "type-20791", ++ "self_type" : "type-20790", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184621,8 +184663,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20812", +- "self_type" : "type-20811", ++ "referenced_type" : "type-20861", ++ "self_type" : "type-20860", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184631,8 +184673,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20839", +- "self_type" : "type-20838", ++ "referenced_type" : "type-20864", ++ "self_type" : "type-20863", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184651,8 +184693,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20909", +- "self_type" : "type-20908", ++ "referenced_type" : "type-20939", ++ "self_type" : "type-20938", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184661,8 +184703,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20912", +- "self_type" : "type-20911", ++ "referenced_type" : "type-20968", ++ "self_type" : "type-20967", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184671,8 +184713,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-20987", +- "self_type" : "type-20986", ++ "referenced_type" : "type-21067", ++ "self_type" : "type-21066", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184681,8 +184723,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21016", +- "self_type" : "type-21015", ++ "referenced_type" : "type-21111", ++ "self_type" : "type-21110", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184691,8 +184733,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21115", +- "self_type" : "type-21114", ++ "referenced_type" : "type-21147", ++ "self_type" : "type-21146", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184701,8 +184743,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21159", +- "self_type" : "type-21158", ++ "referenced_type" : "type-21168", ++ "self_type" : "type-21167", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184711,8 +184753,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21195", +- "self_type" : "type-21194", ++ "referenced_type" : "type-21212", ++ "self_type" : "type-21211", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184721,8 +184763,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21216", +- "self_type" : "type-21215", ++ "referenced_type" : "type-21219", ++ "self_type" : "type-21218", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184731,8 +184773,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21260", +- "self_type" : "type-21259", ++ "referenced_type" : "type-21278", ++ "self_type" : "type-21277", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184741,8 +184783,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21267", +- "self_type" : "type-21266", ++ "referenced_type" : "type-21343", ++ "self_type" : "type-21342", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184751,8 +184793,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21326", +- "self_type" : "type-21325", ++ "referenced_type" : "type-21358", ++ "self_type" : "type-21357", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184761,8 +184803,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21391", +- "self_type" : "type-21390", ++ "referenced_type" : "type-21381", ++ "self_type" : "type-21380", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184771,8 +184813,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21406", +- "self_type" : "type-21405", ++ "referenced_type" : "type-21429", ++ "self_type" : "type-21428", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184781,8 +184823,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21429", +- "self_type" : "type-21428", ++ "referenced_type" : "type-21653", ++ "self_type" : "type-21652", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184791,8 +184833,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21477", +- "self_type" : "type-21476", ++ "referenced_type" : "type-21763", ++ "self_type" : "type-21762", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184801,8 +184843,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21701", +- "self_type" : "type-21700", ++ "referenced_type" : "type-21773", ++ "self_type" : "type-21772", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184811,8 +184853,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21811", +- "self_type" : "type-21810", ++ "referenced_type" : "type-21846", ++ "self_type" : "type-21845", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184821,8 +184863,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21821", +- "self_type" : "type-21820", ++ "referenced_type" : "type-21858", ++ "self_type" : "type-21857", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184831,8 +184873,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21894", +- "self_type" : "type-21893", ++ "referenced_type" : "type-21888", ++ "self_type" : "type-21887", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184841,8 +184883,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21906", +- "self_type" : "type-21905", ++ "referenced_type" : "type-21902", ++ "self_type" : "type-21901", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184851,8 +184893,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21963", +- "self_type" : "type-21962", ++ "referenced_type" : "type-21971", ++ "self_type" : "type-21970", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184861,8 +184903,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-21976", +- "self_type" : "type-21975", ++ "referenced_type" : "type-21979", ++ "self_type" : "type-21978", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184871,8 +184913,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2219", +- "self_type" : "type-2218", ++ "referenced_type" : "type-22039", ++ "self_type" : "type-22038", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184881,8 +184923,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-22218", +- "self_type" : "type-22217", ++ "referenced_type" : "type-22205", ++ "self_type" : "type-22204", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184891,8 +184933,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-22232", +- "self_type" : "type-22231", ++ "referenced_type" : "type-22217", ++ "self_type" : "type-22216", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184901,8 +184943,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-22400", +- "self_type" : "type-22399", ++ "referenced_type" : "type-22359", ++ "self_type" : "type-22358", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184911,8 +184953,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-22488", +- "self_type" : "type-22487", ++ "referenced_type" : "type-22418", ++ "self_type" : "type-22417", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184921,8 +184963,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-22564", +- "self_type" : "type-22563", ++ "referenced_type" : "type-22485", ++ "self_type" : "type-22484", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184931,8 +184973,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-22673", +- "self_type" : "type-22672", ++ "referenced_type" : "type-22511", ++ "self_type" : "type-22510", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184941,8 +184983,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-22728", +- "self_type" : "type-22727", ++ "referenced_type" : "type-22586", ++ "self_type" : "type-22585", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184951,8 +184993,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-22757", +- "self_type" : "type-22756", ++ "referenced_type" : "type-22657", ++ "self_type" : "type-22656", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184961,8 +185003,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-22834", +- "self_type" : "type-22833", ++ "referenced_type" : "type-22786", ++ "self_type" : "type-22785", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184971,8 +185013,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-22848", +- "self_type" : "type-22847", ++ "referenced_type" : "type-22803", ++ "self_type" : "type-22802", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184981,8 +185023,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-22870", +- "self_type" : "type-22869", ++ "referenced_type" : "type-22825", ++ "self_type" : "type-22824", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -184991,8 +185033,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-22878", +- "self_type" : "type-22877", ++ "referenced_type" : "type-22837", ++ "self_type" : "type-22836", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185001,8 +185043,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-22889", +- "self_type" : "type-22888", ++ "referenced_type" : "type-22850", ++ "self_type" : "type-22849", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185011,8 +185053,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-22896", +- "self_type" : "type-22895", ++ "referenced_type" : "type-22884", ++ "self_type" : "type-22883", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185021,8 +185063,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-23010", +- "self_type" : "type-23009", ++ "referenced_type" : "type-2288", ++ "self_type" : "type-2287", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185031,8 +185073,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-23025", +- "self_type" : "type-23024", ++ "referenced_type" : "type-22983", ++ "self_type" : "type-22982", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185041,8 +185083,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-23136", +- "self_type" : "type-23135", ++ "referenced_type" : "type-23121", ++ "self_type" : "type-23120", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185051,8 +185093,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-23177", +- "self_type" : "type-23176", ++ "referenced_type" : "type-2314", ++ "self_type" : "type-2313", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185061,8 +185103,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-23217", +- "self_type" : "type-23216", ++ "referenced_type" : "type-23205", ++ "self_type" : "type-23204", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -185071,8 +185113,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-23352", +- "self_type" : "type-23351", ++ "referenced_type" : "type-23342", ++ "self_type" : "type-23341", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185081,8 +185123,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-23389", +- "self_type" : "type-23388", ++ "referenced_type" : "type-23471", ++ "self_type" : "type-23470", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185091,8 +185133,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-23495", +- "self_type" : "type-23494", ++ "referenced_type" : "type-23528", ++ "self_type" : "type-23527", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185101,8 +185143,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2360", +- "self_type" : "type-2359", ++ "referenced_type" : "type-23665", ++ "self_type" : "type-23664", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185111,8 +185153,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-23680", +- "self_type" : "type-23679", ++ "referenced_type" : "type-23679", ++ "self_type" : "type-23678", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185121,8 +185163,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-23694", +- "self_type" : "type-23693", ++ "referenced_type" : "type-23690", ++ "self_type" : "type-23689", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185131,8 +185173,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-23702", +- "self_type" : "type-23701", ++ "referenced_type" : "type-23695", ++ "self_type" : "type-23694", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185151,8 +185193,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-23863", +- "self_type" : "type-23862", ++ "referenced_type" : "type-23856", ++ "self_type" : "type-23855", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185161,8 +185203,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-23868", +- "self_type" : "type-23867", ++ "referenced_type" : "type-23865", ++ "self_type" : "type-23864", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185171,8 +185213,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2387", +- "self_type" : "type-2386", ++ "referenced_type" : "type-23889", ++ "self_type" : "type-23888", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185181,8 +185223,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-23887", +- "self_type" : "type-23886", ++ "referenced_type" : "type-2394", ++ "self_type" : "type-2393", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185191,8 +185233,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-23995", +- "self_type" : "type-23994", ++ "referenced_type" : "type-23986", ++ "self_type" : "type-23985", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185201,8 +185243,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-23998", +- "self_type" : "type-23997", ++ "referenced_type" : "type-23999", ++ "self_type" : "type-23998", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185211,8 +185253,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-24162", +- "self_type" : "type-24161", ++ "referenced_type" : "type-24178", ++ "self_type" : "type-24177", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185221,8 +185263,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-24176", +- "self_type" : "type-24175", ++ "referenced_type" : "type-24184", ++ "self_type" : "type-24183", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185231,8 +185273,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-24336", +- "self_type" : "type-24335", ++ "referenced_type" : "type-24324", ++ "self_type" : "type-24323", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185241,8 +185283,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-24428", +- "self_type" : "type-24427", ++ "referenced_type" : "type-2442", ++ "self_type" : "type-2441", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185251,8 +185293,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-24489", +- "self_type" : "type-24488", ++ "referenced_type" : "type-24466", ++ "self_type" : "type-24465", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185261,8 +185303,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-24667", +- "self_type" : "type-24666", ++ "referenced_type" : "type-2447", ++ "self_type" : "type-2446", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185271,8 +185313,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-24670", +- "self_type" : "type-24669", ++ "referenced_type" : "type-24630", ++ "self_type" : "type-24629", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185281,8 +185323,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2468", +- "self_type" : "type-2467", ++ "referenced_type" : "type-24711", ++ "self_type" : "type-24710", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185291,8 +185333,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-24755", +- "self_type" : "type-24754", ++ "referenced_type" : "type-24838", ++ "self_type" : "type-24837", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185301,8 +185343,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-24930", +- "self_type" : "type-24929", ++ "referenced_type" : "type-24899", ++ "self_type" : "type-24898", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185311,8 +185353,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-25057", +- "self_type" : "type-25056", ++ "referenced_type" : "type-25010", ++ "self_type" : "type-25009", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185321,8 +185363,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-250", +- "self_type" : "type-249", ++ "referenced_type" : "type-25028", ++ "self_type" : "type-25027", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185331,8 +185373,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2512", +- "self_type" : "type-2511", ++ "referenced_type" : "type-250", ++ "self_type" : "type-249", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185341,8 +185383,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2517", +- "self_type" : "type-2516", ++ "referenced_type" : "type-25165", ++ "self_type" : "type-25164", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185351,8 +185393,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-25182", +- "self_type" : "type-25181", ++ "referenced_type" : "type-2518", ++ "self_type" : "type-2517", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185361,8 +185403,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-25270", +- "self_type" : "type-25269", ++ "referenced_type" : "type-25261", ++ "self_type" : "type-25260", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185371,18 +185413,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-25328", +- "self_type" : "type-25327", ++ "referenced_type" : "type-2526", ++ "self_type" : "type-2525", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-25577", +- "self_type" : "type-25576", ++ "referenced_type" : "type-25300", ++ "self_type" : "type-25299", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185391,18 +185433,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-25590", +- "self_type" : "type-25589", ++ "referenced_type" : "type-25304", ++ "self_type" : "type-25303", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-25654", +- "self_type" : "type-25653", ++ "referenced_type" : "type-2531", ++ "self_type" : "type-2530", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185411,8 +185453,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-25687", +- "self_type" : "type-25686", ++ "referenced_type" : "type-25334", ++ "self_type" : "type-25333", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185421,8 +185463,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-25692", +- "self_type" : "type-25691", ++ "referenced_type" : "type-2540", ++ "self_type" : "type-2539", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185431,8 +185473,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-25780", +- "self_type" : "type-25779", ++ "referenced_type" : "type-2550", ++ "self_type" : "type-2549", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185441,18 +185483,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-25799", +- "self_type" : "type-25798", ++ "referenced_type" : "type-25564", ++ "self_type" : "type-25563", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2591", +- "self_type" : "type-2590", ++ "referenced_type" : "type-25630", ++ "self_type" : "type-25629", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185461,8 +185503,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-25940", +- "self_type" : "type-25939", ++ "referenced_type" : "type-25643", ++ "self_type" : "type-25642", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185471,8 +185513,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2596", +- "self_type" : "type-2595", ++ "referenced_type" : "type-2569", ++ "self_type" : "type-2568", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185481,8 +185523,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-25990", +- "self_type" : "type-25989", ++ "referenced_type" : "type-25709", ++ "self_type" : "type-25708", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185491,8 +185533,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-26017", +- "self_type" : "type-26016", ++ "referenced_type" : "type-25738", ++ "self_type" : "type-25737", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185501,8 +185543,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2603", +- "self_type" : "type-2602", ++ "referenced_type" : "type-25743", ++ "self_type" : "type-25742", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185511,8 +185553,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-26087", +- "self_type" : "type-26086", ++ "referenced_type" : "type-2581", ++ "self_type" : "type-2580", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185521,28 +185563,28 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-26090", +- "self_type" : "type-26089", ++ "referenced_type" : "type-25848", ++ "self_type" : "type-25847", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2611", +- "self_type" : "type-2610", ++ "referenced_type" : "type-2587", ++ "self_type" : "type-2586", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-26165", +- "self_type" : "type-26164", ++ "referenced_type" : "type-25893", ++ "self_type" : "type-25892", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185551,8 +185593,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2618", +- "self_type" : "type-2617", ++ "referenced_type" : "type-25975", ++ "self_type" : "type-25974", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185561,8 +185603,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-26194", +- "self_type" : "type-26193", ++ "referenced_type" : "type-26043", ++ "self_type" : "type-26042", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185571,8 +185613,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2627", +- "self_type" : "type-2626", ++ "referenced_type" : "type-26070", ++ "self_type" : "type-26069", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185581,8 +185623,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-26293", +- "self_type" : "type-26292", ++ "referenced_type" : "type-26139", ++ "self_type" : "type-26138", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185591,18 +185633,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-26337", +- "self_type" : "type-26336", ++ "referenced_type" : "type-26155", ++ "self_type" : "type-26154", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2633", +- "self_type" : "type-2632", ++ "referenced_type" : "type-2620", ++ "self_type" : "type-2619", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185611,8 +185653,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2635", +- "self_type" : "type-2634", ++ "referenced_type" : "type-26238", ++ "self_type" : "type-26237", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185621,8 +185663,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-26373", +- "self_type" : "type-26372", ++ "referenced_type" : "type-2626", ++ "self_type" : "type-2625", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185631,8 +185673,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-26394", +- "self_type" : "type-26393", ++ "referenced_type" : "type-26272", ++ "self_type" : "type-26271", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185641,8 +185683,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-26438", +- "self_type" : "type-26437", ++ "referenced_type" : "type-26337", ++ "self_type" : "type-26336", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185651,8 +185693,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-26445", +- "self_type" : "type-26444", ++ "referenced_type" : "type-26369", ++ "self_type" : "type-26368", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185661,8 +185703,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2645", +- "self_type" : "type-2644", ++ "referenced_type" : "type-26393", ++ "self_type" : "type-26392", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185671,8 +185713,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-264", +- "self_type" : "type-263", ++ "referenced_type" : "type-26398", ++ "self_type" : "type-26397", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185681,8 +185723,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-26504", +- "self_type" : "type-26503", ++ "referenced_type" : "type-26415", ++ "self_type" : "type-26414", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185691,8 +185733,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2653", +- "self_type" : "type-2652", ++ "referenced_type" : "type-26472", ++ "self_type" : "type-26471", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185701,8 +185743,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-26569", +- "self_type" : "type-26568", ++ "referenced_type" : "type-26481", ++ "self_type" : "type-26480", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185711,8 +185753,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-26584", +- "self_type" : "type-26583", ++ "referenced_type" : "type-264", ++ "self_type" : "type-263", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185721,8 +185763,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-26607", +- "self_type" : "type-26606", ++ "referenced_type" : "type-26527", ++ "self_type" : "type-26526", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185731,8 +185773,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2662", +- "self_type" : "type-2661", ++ "referenced_type" : "type-26537", ++ "self_type" : "type-26536", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185741,8 +185783,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-26655", +- "self_type" : "type-26654", ++ "referenced_type" : "type-26579", ++ "self_type" : "type-26578", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185751,8 +185793,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2672", +- "self_type" : "type-2671", ++ "referenced_type" : "type-2660", ++ "self_type" : "type-2659", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185761,8 +185803,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-26879", +- "self_type" : "type-26878", ++ "referenced_type" : "type-26612", ++ "self_type" : "type-26611", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185771,8 +185813,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2692", +- "self_type" : "type-2691", ++ "referenced_type" : "type-26634", ++ "self_type" : "type-26633", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185781,8 +185823,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-26989", +- "self_type" : "type-26988", ++ "referenced_type" : "type-26676", ++ "self_type" : "type-26675", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185791,8 +185833,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-26999", +- "self_type" : "type-26998", ++ "referenced_type" : "type-2667", ++ "self_type" : "type-2666", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185801,8 +185843,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2702", +- "self_type" : "type-2701", ++ "referenced_type" : "type-26859", ++ "self_type" : "type-26858", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185811,8 +185853,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-27072", +- "self_type" : "type-27071", ++ "referenced_type" : "type-26899", ++ "self_type" : "type-26898", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185821,8 +185863,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2707", +- "self_type" : "type-2706", ++ "referenced_type" : "type-26949", ++ "self_type" : "type-26948", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185831,8 +185873,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-27084", +- "self_type" : "type-27083", ++ "referenced_type" : "type-27014", ++ "self_type" : "type-27013", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185841,8 +185883,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-270", +- "self_type" : "type-269", ++ "referenced_type" : "type-27024", ++ "self_type" : "type-27023", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185851,8 +185893,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-27148", +- "self_type" : "type-27147", ++ "referenced_type" : "type-270", ++ "self_type" : "type-269", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185861,8 +185903,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2715", +- "self_type" : "type-2714", ++ "referenced_type" : "type-27147", ++ "self_type" : "type-27146", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185871,8 +185913,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-27161", +- "self_type" : "type-27160", ++ "referenced_type" : "type-27160", ++ "self_type" : "type-27159", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185881,8 +185923,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-27403", +- "self_type" : "type-27402", ++ "referenced_type" : "type-27402", ++ "self_type" : "type-27401", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185891,8 +185933,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-27417", +- "self_type" : "type-27416", ++ "referenced_type" : "type-27416", ++ "self_type" : "type-27415", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185901,8 +185943,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-27585", +- "self_type" : "type-27584", ++ "referenced_type" : "type-27584", ++ "self_type" : "type-27583", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185911,8 +185953,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-27673", +- "self_type" : "type-27672", ++ "referenced_type" : "type-27672", ++ "self_type" : "type-27671", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185921,8 +185963,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-27749", +- "self_type" : "type-27748", ++ "referenced_type" : "type-27748", ++ "self_type" : "type-27747", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185931,8 +185973,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-27858", +- "self_type" : "type-27857", ++ "referenced_type" : "type-27857", ++ "self_type" : "type-27856", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185941,8 +185983,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-27913", +- "self_type" : "type-27912", ++ "referenced_type" : "type-27912", ++ "self_type" : "type-27911", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185951,8 +185993,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-27942", +- "self_type" : "type-27941", ++ "referenced_type" : "type-27941", ++ "self_type" : "type-27940", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185961,8 +186003,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-28019", +- "self_type" : "type-28018", ++ "referenced_type" : "type-28018", ++ "self_type" : "type-28017", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185971,8 +186013,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-28033", +- "self_type" : "type-28032", ++ "referenced_type" : "type-28032", ++ "self_type" : "type-28031", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185981,8 +186023,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-28055", +- "self_type" : "type-28054", ++ "referenced_type" : "type-28054", ++ "self_type" : "type-28053", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -185991,8 +186033,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-28063", +- "self_type" : "type-28062", ++ "referenced_type" : "type-28062", ++ "self_type" : "type-28061", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186001,8 +186043,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-28074", +- "self_type" : "type-28073", ++ "referenced_type" : "type-28073", ++ "self_type" : "type-28072", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186011,8 +186053,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-28081", +- "self_type" : "type-28080", ++ "referenced_type" : "type-28080", ++ "self_type" : "type-28079", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186021,8 +186063,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-28195", +- "self_type" : "type-28194", ++ "referenced_type" : "type-28194", ++ "self_type" : "type-28193", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186031,8 +186073,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-28210", +- "self_type" : "type-28209", ++ "referenced_type" : "type-28209", ++ "self_type" : "type-28208", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186041,8 +186083,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-28321", +- "self_type" : "type-28320", ++ "referenced_type" : "type-28320", ++ "self_type" : "type-28319", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186051,8 +186093,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-28362", +- "self_type" : "type-28361", ++ "referenced_type" : "type-28361", ++ "self_type" : "type-28360", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186061,28 +186103,28 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-28402", +- "self_type" : "type-28401", ++ "referenced_type" : "type-2839", ++ "self_type" : "type-2838", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-28537", +- "self_type" : "type-28536", ++ "referenced_type" : "type-28401", ++ "self_type" : "type-28400", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-28574", +- "self_type" : "type-28573", ++ "referenced_type" : "type-28536", ++ "self_type" : "type-28535", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186091,8 +186133,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-28680", +- "self_type" : "type-28679", ++ "referenced_type" : "type-2853", ++ "self_type" : "type-2852", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186101,8 +186143,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-28865", +- "self_type" : "type-28864", ++ "referenced_type" : "type-28573", ++ "self_type" : "type-28572", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186111,8 +186153,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-28879", +- "self_type" : "type-28878", ++ "referenced_type" : "type-28679", ++ "self_type" : "type-28678", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186121,8 +186163,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2887", +- "self_type" : "type-2886", ++ "referenced_type" : "type-2872", ++ "self_type" : "type-2871", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186131,8 +186173,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-28887", +- "self_type" : "type-28886", ++ "referenced_type" : "type-28864", ++ "self_type" : "type-28863", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186141,8 +186183,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-28892", +- "self_type" : "type-28891", ++ "referenced_type" : "type-28878", ++ "self_type" : "type-28877", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186151,8 +186193,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2901", +- "self_type" : "type-2900", ++ "referenced_type" : "type-28886", ++ "self_type" : "type-28885", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186161,8 +186203,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-29048", +- "self_type" : "type-29047", ++ "referenced_type" : "type-28891", ++ "self_type" : "type-28890", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186171,8 +186213,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-29053", +- "self_type" : "type-29052", ++ "referenced_type" : "type-2889", ++ "self_type" : "type-2888", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186181,8 +186223,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-29072", +- "self_type" : "type-29071", ++ "referenced_type" : "type-29047", ++ "self_type" : "type-29046", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186191,8 +186233,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-29180", +- "self_type" : "type-29179", ++ "referenced_type" : "type-29052", ++ "self_type" : "type-29051", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186201,8 +186243,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-29183", +- "self_type" : "type-29182", ++ "referenced_type" : "type-29071", ++ "self_type" : "type-29070", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186211,8 +186253,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2920", +- "self_type" : "type-2919", ++ "referenced_type" : "type-2908", ++ "self_type" : "type-2907", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186221,8 +186263,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-29347", +- "self_type" : "type-29346", ++ "referenced_type" : "type-29179", ++ "self_type" : "type-29178", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186231,8 +186273,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-29361", +- "self_type" : "type-29360", ++ "referenced_type" : "type-29182", ++ "self_type" : "type-29181", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186241,8 +186283,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2937", +- "self_type" : "type-2936", ++ "referenced_type" : "type-29346", ++ "self_type" : "type-29345", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186251,8 +186293,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-29521", +- "self_type" : "type-29520", ++ "referenced_type" : "type-29360", ++ "self_type" : "type-29359", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186261,8 +186303,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2956", +- "self_type" : "type-2955", ++ "referenced_type" : "type-2951", ++ "self_type" : "type-2950", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186271,8 +186313,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-29613", +- "self_type" : "type-29612", ++ "referenced_type" : "type-29520", ++ "self_type" : "type-29519", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186281,8 +186323,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-29674", +- "self_type" : "type-29673", ++ "referenced_type" : "type-29612", ++ "self_type" : "type-29611", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186291,8 +186333,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-29848", +- "self_type" : "type-29847", ++ "referenced_type" : "type-2963", ++ "self_type" : "type-2962", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186301,8 +186343,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-29851", +- "self_type" : "type-29850", ++ "referenced_type" : "type-29673", ++ "self_type" : "type-29672", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186311,8 +186353,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-29936", +- "self_type" : "type-29935", ++ "referenced_type" : "type-29847", ++ "self_type" : "type-29846", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186321,8 +186363,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-2999", +- "self_type" : "type-2998", ++ "referenced_type" : "type-29850", ++ "self_type" : "type-29849", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186331,8 +186373,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-30086", +- "self_type" : "type-30085", ++ "referenced_type" : "type-29935", ++ "self_type" : "type-29934", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186341,8 +186383,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3011", +- "self_type" : "type-3010", ++ "referenced_type" : "type-2999", ++ "self_type" : "type-2998", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186351,8 +186393,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-30202", +- "self_type" : "type-30201", ++ "referenced_type" : "type-30085", ++ "self_type" : "type-30084", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186361,8 +186403,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-30326", +- "self_type" : "type-30325", ++ "referenced_type" : "type-30201", ++ "self_type" : "type-30200", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186371,8 +186413,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-30414", +- "self_type" : "type-30413", ++ "referenced_type" : "type-30325", ++ "self_type" : "type-30324", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186381,18 +186423,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-30472", +- "self_type" : "type-30471", ++ "referenced_type" : "type-3032", ++ "self_type" : "type-3031", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3047", +- "self_type" : "type-3046", ++ "referenced_type" : "type-30413", ++ "self_type" : "type-30412", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186401,18 +186443,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-30723", +- "self_type" : "type-30722", ++ "referenced_type" : "type-30471", ++ "self_type" : "type-30470", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-30736", +- "self_type" : "type-30735", ++ "referenced_type" : "type-3069", ++ "self_type" : "type-3068", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186421,8 +186463,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-30800", +- "self_type" : "type-30799", ++ "referenced_type" : "type-30722", ++ "self_type" : "type-30721", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186431,8 +186473,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3080", +- "self_type" : "type-3079", ++ "referenced_type" : "type-30735", ++ "self_type" : "type-30734", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186441,8 +186483,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-30833", +- "self_type" : "type-30832", ++ "referenced_type" : "type-30799", ++ "self_type" : "type-30798", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186451,8 +186493,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-30838", +- "self_type" : "type-30837", ++ "referenced_type" : "type-30832", ++ "self_type" : "type-30831", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186461,8 +186503,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-30926", +- "self_type" : "type-30925", ++ "referenced_type" : "type-30837", ++ "self_type" : "type-30836", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186471,28 +186513,28 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-30945", +- "self_type" : "type-30944", ++ "referenced_type" : "type-30925", ++ "self_type" : "type-30924", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-31086", +- "self_type" : "type-31085", ++ "referenced_type" : "type-30944", ++ "self_type" : "type-30943", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-31137", +- "self_type" : "type-31136", ++ "referenced_type" : "type-31085", ++ "self_type" : "type-31084", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186501,8 +186543,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-31164", +- "self_type" : "type-31163", ++ "referenced_type" : "type-31136", ++ "self_type" : "type-31135", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186511,8 +186553,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3117", +- "self_type" : "type-3116", ++ "referenced_type" : "type-31163", ++ "self_type" : "type-31162", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186521,8 +186563,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-31234", +- "self_type" : "type-31233", ++ "referenced_type" : "type-31233", ++ "self_type" : "type-31232", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186531,8 +186573,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-31237", +- "self_type" : "type-31236", ++ "referenced_type" : "type-31236", ++ "self_type" : "type-31235", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186541,18 +186583,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-31312", +- "self_type" : "type-31311", ++ "referenced_type" : "type-3128", ++ "self_type" : "type-3127", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-31341", +- "self_type" : "type-31340", ++ "referenced_type" : "type-31311", ++ "self_type" : "type-31310", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186561,8 +186603,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-31440", +- "self_type" : "type-31439", ++ "referenced_type" : "type-31340", ++ "self_type" : "type-31339", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186571,8 +186613,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-31484", +- "self_type" : "type-31483", ++ "referenced_type" : "type-31439", ++ "self_type" : "type-31438", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186581,8 +186623,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-31520", +- "self_type" : "type-31519", ++ "referenced_type" : "type-31483", ++ "self_type" : "type-31482", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186591,8 +186633,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-31541", +- "self_type" : "type-31540", ++ "referenced_type" : "type-31519", ++ "self_type" : "type-31518", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186601,8 +186643,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-31585", +- "self_type" : "type-31584", ++ "referenced_type" : "type-31540", ++ "self_type" : "type-31539", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186611,8 +186653,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-31592", +- "self_type" : "type-31591", ++ "referenced_type" : "type-31584", ++ "self_type" : "type-31583", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186621,8 +186663,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-31651", +- "self_type" : "type-31650", ++ "referenced_type" : "type-31591", ++ "self_type" : "type-31590", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186631,8 +186673,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-31716", +- "self_type" : "type-31715", ++ "referenced_type" : "type-31650", ++ "self_type" : "type-31649", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186641,8 +186683,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-31731", +- "self_type" : "type-31730", ++ "referenced_type" : "type-31715", ++ "self_type" : "type-31714", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186651,8 +186693,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-31754", +- "self_type" : "type-31753", ++ "referenced_type" : "type-31730", ++ "self_type" : "type-31729", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186661,18 +186703,18 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3176", +- "self_type" : "type-3175", ++ "referenced_type" : "type-31753", ++ "self_type" : "type-31752", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-31802", +- "self_type" : "type-31801", ++ "referenced_type" : "type-31801", ++ "self_type" : "type-31800", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186681,8 +186723,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-32026", +- "self_type" : "type-32025", ++ "referenced_type" : "type-32025", ++ "self_type" : "type-32024", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186691,8 +186733,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-32136", +- "self_type" : "type-32135", ++ "referenced_type" : "type-32135", ++ "self_type" : "type-32134", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186701,8 +186743,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-32146", +- "self_type" : "type-32145", ++ "referenced_type" : "type-32145", ++ "self_type" : "type-32144", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186711,8 +186753,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-32219", +- "self_type" : "type-32218", ++ "referenced_type" : "type-32218", ++ "self_type" : "type-32217", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186721,8 +186763,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-32231", +- "self_type" : "type-32230", ++ "referenced_type" : "type-32230", ++ "self_type" : "type-32229", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186751,8 +186793,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3428", +- "self_type" : "type-3427", ++ "referenced_type" : "type-3380", ++ "self_type" : "type-3379", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186761,8 +186803,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3447", +- "self_type" : "type-3446", ++ "referenced_type" : "type-3399", ++ "self_type" : "type-3398", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186771,8 +186813,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3511", +- "self_type" : "type-3510", ++ "referenced_type" : "type-3463", ++ "self_type" : "type-3462", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186781,8 +186823,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3550", +- "self_type" : "type-3549", ++ "referenced_type" : "type-3502", ++ "self_type" : "type-3501", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186791,8 +186833,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3555", +- "self_type" : "type-3554", ++ "referenced_type" : "type-3507", ++ "self_type" : "type-3506", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186801,8 +186843,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3648", +- "self_type" : "type-3647", ++ "referenced_type" : "type-3600", ++ "self_type" : "type-3599", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186811,8 +186853,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3674", +- "self_type" : "type-3673", ++ "referenced_type" : "type-3626", ++ "self_type" : "type-3625", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -186821,8 +186863,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3858", +- "self_type" : "type-3857", ++ "referenced_type" : "type-3810", ++ "self_type" : "type-3809", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186831,8 +186873,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3927", +- "self_type" : "type-3926", ++ "referenced_type" : "type-3879", ++ "self_type" : "type-3878", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186841,8 +186883,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-3954", +- "self_type" : "type-3953", ++ "referenced_type" : "type-3906", ++ "self_type" : "type-3905", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186851,8 +186893,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-4073", +- "self_type" : "type-4072", ++ "referenced_type" : "type-4025", ++ "self_type" : "type-4024", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186861,8 +186903,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-4076", +- "self_type" : "type-4075", ++ "referenced_type" : "type-4028", ++ "self_type" : "type-4027", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186881,8 +186923,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-4151", +- "self_type" : "type-4150", ++ "referenced_type" : "type-4103", ++ "self_type" : "type-4102", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186891,8 +186933,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-4183", +- "self_type" : "type-4182", ++ "referenced_type" : "type-4135", ++ "self_type" : "type-4134", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186901,8 +186943,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-4302", +- "self_type" : "type-4301", ++ "referenced_type" : "type-4254", ++ "self_type" : "type-4253", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186911,8 +186953,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-4356", +- "self_type" : "type-4355", ++ "referenced_type" : "type-4308", ++ "self_type" : "type-4307", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186921,8 +186963,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-435", +- "self_type" : "type-434", ++ "referenced_type" : "type-4345", ++ "self_type" : "type-4344", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186931,8 +186973,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-4393", +- "self_type" : "type-4392", ++ "referenced_type" : "type-435", ++ "self_type" : "type-434", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186941,8 +186983,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-4415", +- "self_type" : "type-4414", ++ "referenced_type" : "type-4367", ++ "self_type" : "type-4366", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186951,8 +186993,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-4461", +- "self_type" : "type-4460", ++ "referenced_type" : "type-4413", ++ "self_type" : "type-4412", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186961,8 +187003,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-4467", +- "self_type" : "type-4466", ++ "referenced_type" : "type-4419", ++ "self_type" : "type-4418", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186971,8 +187013,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-4535", +- "self_type" : "type-4534", ++ "referenced_type" : "type-4487", ++ "self_type" : "type-4486", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186981,8 +187023,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-4541", +- "self_type" : "type-4540", ++ "referenced_type" : "type-4493", ++ "self_type" : "type-4492", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -186991,8 +187033,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-4577", +- "self_type" : "type-4576", ++ "referenced_type" : "type-4529", ++ "self_type" : "type-4528", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187001,8 +187043,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-4695", +- "self_type" : "type-4694", ++ "referenced_type" : "type-4647", ++ "self_type" : "type-4646", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187011,8 +187053,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-4867", +- "self_type" : "type-4866", ++ "referenced_type" : "type-4819", ++ "self_type" : "type-4818", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187021,8 +187063,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-4881", +- "self_type" : "type-4880", ++ "referenced_type" : "type-4833", ++ "self_type" : "type-4832", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187031,8 +187073,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-4900", +- "self_type" : "type-4899", ++ "referenced_type" : "type-4852", ++ "self_type" : "type-4851", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187041,8 +187083,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-4917", +- "self_type" : "type-4916", ++ "referenced_type" : "type-4869", ++ "self_type" : "type-4868", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187051,8 +187093,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-4936", +- "self_type" : "type-4935", ++ "referenced_type" : "type-4888", ++ "self_type" : "type-4887", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187061,8 +187103,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-4979", +- "self_type" : "type-4978", ++ "referenced_type" : "type-4931", ++ "self_type" : "type-4930", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187071,8 +187113,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-4991", +- "self_type" : "type-4990", ++ "referenced_type" : "type-4943", ++ "self_type" : "type-4942", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187081,8 +187123,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-5027", +- "self_type" : "type-5026", ++ "referenced_type" : "type-4979", ++ "self_type" : "type-4978", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187091,8 +187133,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-5060", +- "self_type" : "type-5059", ++ "referenced_type" : "type-5012", ++ "self_type" : "type-5011", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187101,8 +187143,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-5097", +- "self_type" : "type-5096", ++ "referenced_type" : "type-5049", ++ "self_type" : "type-5048", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187111,8 +187153,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-5156", +- "self_type" : "type-5155", ++ "referenced_type" : "type-5108", ++ "self_type" : "type-5107", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, +@@ -187121,8 +187163,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-5408", +- "self_type" : "type-5407", ++ "referenced_type" : "type-5360", ++ "self_type" : "type-5359", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187131,8 +187173,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-5427", +- "self_type" : "type-5426", ++ "referenced_type" : "type-5379", ++ "self_type" : "type-5378", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187141,8 +187183,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-5491", +- "self_type" : "type-5490", ++ "referenced_type" : "type-5443", ++ "self_type" : "type-5442", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187151,8 +187193,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-5528", +- "self_type" : "type-5527", ++ "referenced_type" : "type-5480", ++ "self_type" : "type-5479", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187161,8 +187203,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-5533", +- "self_type" : "type-5532", ++ "referenced_type" : "type-5485", ++ "self_type" : "type-5484", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187171,8 +187213,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-5622", +- "self_type" : "type-5621", ++ "referenced_type" : "type-5574", ++ "self_type" : "type-5573", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187181,8 +187223,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-5641", +- "self_type" : "type-5640", ++ "referenced_type" : "type-5593", ++ "self_type" : "type-5592", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -187191,8 +187233,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-5784", +- "self_type" : "type-5783", ++ "referenced_type" : "type-5736", ++ "self_type" : "type-5735", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187201,8 +187243,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-5835", +- "self_type" : "type-5834", ++ "referenced_type" : "type-5787", ++ "self_type" : "type-5786", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187211,8 +187253,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-5862", +- "self_type" : "type-5861", ++ "referenced_type" : "type-5814", ++ "self_type" : "type-5813", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187221,8 +187263,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-5932", +- "self_type" : "type-5931", ++ "referenced_type" : "type-5884", ++ "self_type" : "type-5883", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187231,8 +187273,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-5935", +- "self_type" : "type-5934", ++ "referenced_type" : "type-5887", ++ "self_type" : "type-5886", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187241,8 +187283,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-6010", +- "self_type" : "type-6009", ++ "referenced_type" : "type-5962", ++ "self_type" : "type-5961", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187251,8 +187293,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-6039", +- "self_type" : "type-6038", ++ "referenced_type" : "type-5991", ++ "self_type" : "type-5990", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187261,8 +187303,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-6138", +- "self_type" : "type-6137", ++ "referenced_type" : "type-6090", ++ "self_type" : "type-6089", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187271,8 +187313,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-6182", +- "self_type" : "type-6181", ++ "referenced_type" : "type-6134", ++ "self_type" : "type-6133", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187281,8 +187323,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-6218", +- "self_type" : "type-6217", ++ "referenced_type" : "type-6170", ++ "self_type" : "type-6169", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187291,8 +187333,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-6239", +- "self_type" : "type-6238", ++ "referenced_type" : "type-6191", ++ "self_type" : "type-6190", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187301,8 +187343,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-6283", +- "self_type" : "type-6282", ++ "referenced_type" : "type-6235", ++ "self_type" : "type-6234", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187311,8 +187353,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-6290", +- "self_type" : "type-6289", ++ "referenced_type" : "type-6242", ++ "self_type" : "type-6241", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187321,8 +187363,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-6352", +- "self_type" : "type-6351", ++ "referenced_type" : "type-6304", ++ "self_type" : "type-6303", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187331,8 +187373,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-6419", +- "self_type" : "type-6418", ++ "referenced_type" : "type-6371", ++ "self_type" : "type-6370", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187341,8 +187383,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-6434", +- "self_type" : "type-6433", ++ "referenced_type" : "type-6386", ++ "self_type" : "type-6385", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187351,8 +187393,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-6457", +- "self_type" : "type-6456", ++ "referenced_type" : "type-6409", ++ "self_type" : "type-6408", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187361,8 +187403,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-6552", +- "self_type" : "type-6551", ++ "referenced_type" : "type-6504", ++ "self_type" : "type-6503", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187371,8 +187413,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-6871", +- "self_type" : "type-6870", ++ "referenced_type" : "type-6823", ++ "self_type" : "type-6822", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187381,8 +187423,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-7017", +- "self_type" : "type-7016", ++ "referenced_type" : "type-6969", ++ "self_type" : "type-6968", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187391,8 +187433,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-7027", +- "self_type" : "type-7026", ++ "referenced_type" : "type-6979", ++ "self_type" : "type-6978", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187401,8 +187443,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-7100", +- "self_type" : "type-7099", ++ "referenced_type" : "type-7052", ++ "self_type" : "type-7051", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187411,8 +187453,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-7118", +- "self_type" : "type-7117", ++ "referenced_type" : "type-7070", ++ "self_type" : "type-7069", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187421,8 +187463,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-7191", +- "self_type" : "type-7190", ++ "referenced_type" : "type-7143", ++ "self_type" : "type-7142", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187431,8 +187473,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-7214", +- "self_type" : "type-7213", ++ "referenced_type" : "type-7166", ++ "self_type" : "type-7165", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187461,8 +187503,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-7615", +- "self_type" : "type-7614", ++ "referenced_type" : "type-7567", ++ "self_type" : "type-7566", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187471,8 +187513,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-7630", +- "self_type" : "type-7629", ++ "referenced_type" : "type-7582", ++ "self_type" : "type-7581", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187481,8 +187523,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-7802", +- "self_type" : "type-7801", ++ "referenced_type" : "type-7754", ++ "self_type" : "type-7753", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187501,8 +187543,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-7906", +- "self_type" : "type-7905", ++ "referenced_type" : "type-7858", ++ "self_type" : "type-7857", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187511,8 +187553,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-7982", +- "self_type" : "type-7981", ++ "referenced_type" : "type-7934", ++ "self_type" : "type-7933", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187531,8 +187573,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-8090", +- "self_type" : "type-8089", ++ "referenced_type" : "type-8042", ++ "self_type" : "type-8041", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187541,8 +187583,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-8143", +- "self_type" : "type-8142", ++ "referenced_type" : "type-8095", ++ "self_type" : "type-8094", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187551,8 +187593,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-8157", +- "self_type" : "type-8156", ++ "referenced_type" : "type-8109", ++ "self_type" : "type-8108", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187561,8 +187603,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-8176", +- "self_type" : "type-8175", ++ "referenced_type" : "type-8128", ++ "self_type" : "type-8127", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187571,8 +187613,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-8193", +- "self_type" : "type-8192", ++ "referenced_type" : "type-8145", ++ "self_type" : "type-8144", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187581,8 +187623,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-820", +- "self_type" : "type-819", ++ "referenced_type" : "type-8164", ++ "self_type" : "type-8163", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187591,8 +187633,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-8212", +- "self_type" : "type-8211", ++ "referenced_type" : "type-8207", ++ "self_type" : "type-8206", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187601,8 +187643,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-8255", +- "self_type" : "type-8254", ++ "referenced_type" : "type-820", ++ "self_type" : "type-819", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187611,8 +187653,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-8267", +- "self_type" : "type-8266", ++ "referenced_type" : "type-8219", ++ "self_type" : "type-8218", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187621,8 +187663,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-8303", +- "self_type" : "type-8302", ++ "referenced_type" : "type-8255", ++ "self_type" : "type-8254", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187631,8 +187673,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-8336", +- "self_type" : "type-8335", ++ "referenced_type" : "type-8288", ++ "self_type" : "type-8287", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187641,8 +187683,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-8372", +- "self_type" : "type-8371", ++ "referenced_type" : "type-8324", ++ "self_type" : "type-8323", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187651,8 +187693,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-8431", +- "self_type" : "type-8430", ++ "referenced_type" : "type-8383", ++ "self_type" : "type-8382", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/logging.h" + }, +@@ -187661,8 +187703,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-867", +- "self_type" : "type-866", ++ "referenced_type" : "type-8634", ++ "self_type" : "type-8633", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187671,8 +187713,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-8682", +- "self_type" : "type-8681", ++ "referenced_type" : "type-8644", ++ "self_type" : "type-8643", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187681,8 +187723,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-8692", +- "self_type" : "type-8691", ++ "referenced_type" : "type-867", ++ "self_type" : "type-866", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187691,8 +187733,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-8756", +- "self_type" : "type-8755", ++ "referenced_type" : "type-8708", ++ "self_type" : "type-8707", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187701,8 +187743,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-8787", +- "self_type" : "type-8786", ++ "referenced_type" : "type-8739", ++ "self_type" : "type-8738", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187711,8 +187753,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-8792", +- "self_type" : "type-8791", ++ "referenced_type" : "type-8744", ++ "self_type" : "type-8743", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187721,8 +187763,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-8880", +- "self_type" : "type-8879", ++ "referenced_type" : "type-8832", ++ "self_type" : "type-8831", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187731,11 +187773,21 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-8899", +- "self_type" : "type-8898", ++ "referenced_type" : "type-8851", ++ "self_type" : "type-8850", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, ++ { ++ "alignment" : 4, ++ "is_const" : true, ++ "linker_set_key" : "const std::basic_string, std::allocator >", ++ "name" : "const std::basic_string, std::allocator >", ++ "referenced_type" : "type-8993", ++ "self_type" : "type-8992", ++ "size" : 12, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" ++ }, + { + "alignment" : 4, + "is_const" : true, +@@ -187751,8 +187803,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-9041", +- "self_type" : "type-9040", ++ "referenced_type" : "type-9044", ++ "self_type" : "type-9043", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187761,8 +187813,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-9092", +- "self_type" : "type-9091", ++ "referenced_type" : "type-9071", ++ "self_type" : "type-9070", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187771,8 +187823,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-9119", +- "self_type" : "type-9118", ++ "referenced_type" : "type-9141", ++ "self_type" : "type-9140", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187781,8 +187833,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-9189", +- "self_type" : "type-9188", ++ "referenced_type" : "type-9144", ++ "self_type" : "type-9143", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187791,8 +187843,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-9192", +- "self_type" : "type-9191", ++ "referenced_type" : "type-9219", ++ "self_type" : "type-9218", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187811,8 +187863,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-9267", +- "self_type" : "type-9266", ++ "referenced_type" : "type-9248", ++ "self_type" : "type-9247", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187831,8 +187883,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-9296", +- "self_type" : "type-9295", ++ "referenced_type" : "type-933", ++ "self_type" : "type-932", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187841,8 +187893,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-933", +- "self_type" : "type-932", ++ "referenced_type" : "type-9347", ++ "self_type" : "type-9346", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187851,8 +187903,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-9395", +- "self_type" : "type-9394", ++ "referenced_type" : "type-9391", ++ "self_type" : "type-9390", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187871,8 +187923,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-9439", +- "self_type" : "type-9438", ++ "referenced_type" : "type-9427", ++ "self_type" : "type-9426", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187881,8 +187933,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-946", +- "self_type" : "type-945", ++ "referenced_type" : "type-9448", ++ "self_type" : "type-9447", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187891,8 +187943,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-9475", +- "self_type" : "type-9474", ++ "referenced_type" : "type-946", ++ "self_type" : "type-945", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187901,8 +187953,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-9496", +- "self_type" : "type-9495", ++ "referenced_type" : "type-9492", ++ "self_type" : "type-9491", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187911,8 +187963,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-9540", +- "self_type" : "type-9539", ++ "referenced_type" : "type-9499", ++ "self_type" : "type-9498", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187921,8 +187973,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-9547", +- "self_type" : "type-9546", ++ "referenced_type" : "type-9558", ++ "self_type" : "type-9557", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187941,8 +187993,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-9606", +- "self_type" : "type-9605", ++ "referenced_type" : "type-9623", ++ "self_type" : "type-9622", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187951,8 +188003,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-965", +- "self_type" : "type-964", ++ "referenced_type" : "type-9638", ++ "self_type" : "type-9637", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187961,8 +188013,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-9671", +- "self_type" : "type-9670", ++ "referenced_type" : "type-965", ++ "self_type" : "type-964", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187971,8 +188023,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-9686", +- "self_type" : "type-9685", ++ "referenced_type" : "type-9661", ++ "self_type" : "type-9660", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -187986,16 +188038,6 @@ + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +- { +- "alignment" : 4, +- "is_const" : true, +- "linker_set_key" : "const std::basic_string, std::allocator >", +- "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-9757", +- "self_type" : "type-9756", +- "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" +- }, + { + "alignment" : 4, + "is_const" : true, +@@ -188011,8 +188053,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-996", +- "self_type" : "type-995", ++ "referenced_type" : "type-9932", ++ "self_type" : "type-9931", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -188021,8 +188063,8 @@ + "is_const" : true, + "linker_set_key" : "const std::basic_string, std::allocator >", + "name" : "const std::basic_string, std::allocator >", +- "referenced_type" : "type-9980", +- "self_type" : "type-9979", ++ "referenced_type" : "type-996", ++ "self_type" : "type-995", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/common.h" + }, +@@ -188031,8 +188073,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-10005", +- "self_type" : "type-10004", ++ "referenced_type" : "type-12693", ++ "self_type" : "type-12692", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188041,8 +188083,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-12741", +- "self_type" : "type-12740", ++ "referenced_type" : "type-13290", ++ "self_type" : "type-13289", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188051,8 +188093,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-13338", +- "self_type" : "type-13337", ++ "referenced_type" : "type-16549", ++ "self_type" : "type-16548", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188061,8 +188103,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-16597", +- "self_type" : "type-16596", ++ "referenced_type" : "type-17146", ++ "self_type" : "type-17145", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188071,8 +188113,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-17194", +- "self_type" : "type-17193", ++ "referenced_type" : "type-21081", ++ "self_type" : "type-21080", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188081,8 +188123,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-21129", +- "self_type" : "type-21128", ++ "referenced_type" : "type-21678", ++ "self_type" : "type-21677", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188091,8 +188133,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-21726", +- "self_type" : "type-21725", ++ "referenced_type" : "type-26351", ++ "self_type" : "type-26350", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188101,8 +188143,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-26307", +- "self_type" : "type-26306", ++ "referenced_type" : "type-26926", ++ "self_type" : "type-26925", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188111,8 +188153,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-26904", +- "self_type" : "type-26903", ++ "referenced_type" : "type-31453", ++ "self_type" : "type-31452", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188121,8 +188163,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-31454", +- "self_type" : "type-31453", ++ "referenced_type" : "type-32050", ++ "self_type" : "type-32049", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188131,8 +188173,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-32051", +- "self_type" : "type-32050", ++ "referenced_type" : "type-4277", ++ "self_type" : "type-4276", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188141,8 +188183,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-4325", +- "self_type" : "type-4324", ++ "referenced_type" : "type-6104", ++ "self_type" : "type-6103", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188151,8 +188193,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-6152", +- "self_type" : "type-6151", ++ "referenced_type" : "type-6865", ++ "self_type" : "type-6864", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188161,8 +188203,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-6913", +- "self_type" : "type-6912", ++ "referenced_type" : "type-9361", ++ "self_type" : "type-9360", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188171,8 +188213,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-9409", +- "self_type" : "type-9408", ++ "referenced_type" : "type-9957", ++ "self_type" : "type-9956", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188181,8 +188223,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-13102", +- "self_type" : "type-13101", ++ "referenced_type" : "type-13054", ++ "self_type" : "type-13053", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -188191,8 +188233,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-16958", +- "self_type" : "type-16957", ++ "referenced_type" : "type-16910", ++ "self_type" : "type-16909", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -188201,8 +188243,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-21490", +- "self_type" : "type-21489", ++ "referenced_type" : "type-21442", ++ "self_type" : "type-21441", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -188211,8 +188253,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-26668", +- "self_type" : "type-26667", ++ "referenced_type" : "type-26689", ++ "self_type" : "type-26688", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -188221,8 +188263,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-31815", +- "self_type" : "type-31814", ++ "referenced_type" : "type-31814", ++ "self_type" : "type-31813", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -188231,8 +188273,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-6566", +- "self_type" : "type-6565", ++ "referenced_type" : "type-6518", ++ "self_type" : "type-6517", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -188241,8 +188283,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to", + "name" : "const std::equal_to", +- "referenced_type" : "type-9770", +- "self_type" : "type-9769", ++ "referenced_type" : "type-9722", ++ "self_type" : "type-9721", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -188251,8 +188293,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-10385", +- "self_type" : "type-10384", ++ "referenced_type" : "type-10337", ++ "self_type" : "type-10336", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -188261,8 +188303,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-11403", +- "self_type" : "type-11402", ++ "referenced_type" : "type-11355", ++ "self_type" : "type-11354", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188271,8 +188313,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-12261", +- "self_type" : "type-12260", ++ "referenced_type" : "type-12213", ++ "self_type" : "type-12212", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188281,8 +188323,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-13676", +- "self_type" : "type-13675", ++ "referenced_type" : "type-13628", ++ "self_type" : "type-13627", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -188291,8 +188333,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-14622", +- "self_type" : "type-14621", ++ "referenced_type" : "type-14574", ++ "self_type" : "type-14573", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188301,8 +188343,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-15318", +- "self_type" : "type-15317", ++ "referenced_type" : "type-15270", ++ "self_type" : "type-15269", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188311,8 +188353,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-16116", +- "self_type" : "type-16115", ++ "referenced_type" : "type-16068", ++ "self_type" : "type-16067", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188321,8 +188363,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-17540", +- "self_type" : "type-17539", ++ "referenced_type" : "type-17492", ++ "self_type" : "type-17491", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -188331,8 +188373,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-18486", +- "self_type" : "type-18485", ++ "referenced_type" : "type-18438", ++ "self_type" : "type-18437", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188341,8 +188383,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-19089", +- "self_type" : "type-19088", ++ "referenced_type" : "type-19041", ++ "self_type" : "type-19040", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188351,8 +188393,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-19391", +- "self_type" : "type-19390", ++ "referenced_type" : "type-19343", ++ "self_type" : "type-19342", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188361,8 +188403,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-19533", +- "self_type" : "type-19532", ++ "referenced_type" : "type-19485", ++ "self_type" : "type-19484", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188371,8 +188413,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-20648", +- "self_type" : "type-20647", ++ "referenced_type" : "type-20600", ++ "self_type" : "type-20599", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188381,8 +188423,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-22069", +- "self_type" : "type-22068", ++ "referenced_type" : "type-22067", ++ "self_type" : "type-22066", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -188391,8 +188433,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-23015", +- "self_type" : "type-23014", ++ "referenced_type" : "type-22987", ++ "self_type" : "type-22986", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188401,8 +188443,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-23618", +- "self_type" : "type-23617", ++ "referenced_type" : "type-23600", ++ "self_type" : "type-23599", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188411,8 +188453,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-23891", +- "self_type" : "type-23890", ++ "referenced_type" : "type-23893", ++ "self_type" : "type-23892", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188431,8 +188473,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-25827", +- "self_type" : "type-25826", ++ "referenced_type" : "type-25878", ++ "self_type" : "type-25877", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188441,8 +188483,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-27254", +- "self_type" : "type-27253", ++ "referenced_type" : "type-27253", ++ "self_type" : "type-27252", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -188451,8 +188493,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-28200", +- "self_type" : "type-28199", ++ "referenced_type" : "type-28199", ++ "self_type" : "type-28198", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188461,8 +188503,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-28803", +- "self_type" : "type-28802", ++ "referenced_type" : "type-28802", ++ "self_type" : "type-28801", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188471,8 +188513,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-29076", +- "self_type" : "type-29075", ++ "referenced_type" : "type-29075", ++ "self_type" : "type-29074", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188481,8 +188523,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-29188", +- "self_type" : "type-29187", ++ "referenced_type" : "type-29187", ++ "self_type" : "type-29186", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188491,8 +188533,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-30973", +- "self_type" : "type-30972", ++ "referenced_type" : "type-30972", ++ "self_type" : "type-30971", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188501,8 +188543,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-3709", +- "self_type" : "type-3708", ++ "referenced_type" : "type-3661", ++ "self_type" : "type-3660", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188511,8 +188553,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-5669", +- "self_type" : "type-5668", ++ "referenced_type" : "type-5621", ++ "self_type" : "type-5620", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188521,8 +188563,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-7404", +- "self_type" : "type-7403", ++ "referenced_type" : "type-7356", ++ "self_type" : "type-7355", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -188531,8 +188573,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to, std::allocator > >", + "name" : "const std::equal_to, std::allocator > >", +- "referenced_type" : "type-8927", +- "self_type" : "type-8926", ++ "referenced_type" : "type-8879", ++ "self_type" : "type-8878", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188541,8 +188583,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to >", + "name" : "const std::equal_to >", +- "referenced_type" : "type-10361", +- "self_type" : "type-10360", ++ "referenced_type" : "type-10313", ++ "self_type" : "type-10312", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188551,8 +188593,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to >", + "name" : "const std::equal_to >", +- "referenced_type" : "type-1309", +- "self_type" : "type-1308", ++ "referenced_type" : "type-1222", ++ "self_type" : "type-1221", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188561,8 +188603,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to >", + "name" : "const std::equal_to >", +- "referenced_type" : "type-13652", +- "self_type" : "type-13651", ++ "referenced_type" : "type-13604", ++ "self_type" : "type-13603", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188571,8 +188613,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to >", + "name" : "const std::equal_to >", +- "referenced_type" : "type-17516", +- "self_type" : "type-17515", ++ "referenced_type" : "type-17468", ++ "self_type" : "type-17467", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188581,8 +188623,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to >", + "name" : "const std::equal_to >", +- "referenced_type" : "type-22045", +- "self_type" : "type-22044", ++ "referenced_type" : "type-22599", ++ "self_type" : "type-22598", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188591,8 +188633,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to >", + "name" : "const std::equal_to >", +- "referenced_type" : "type-27230", +- "self_type" : "type-27229", ++ "referenced_type" : "type-2684", ++ "self_type" : "type-2683", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188601,8 +188643,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to >", + "name" : "const std::equal_to >", +- "referenced_type" : "type-2732", +- "self_type" : "type-2731", ++ "referenced_type" : "type-27229", ++ "self_type" : "type-27228", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188621,8 +188663,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to >", + "name" : "const std::equal_to >", +- "referenced_type" : "type-4712", +- "self_type" : "type-4711", ++ "referenced_type" : "type-4664", ++ "self_type" : "type-4663", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188631,8 +188673,8 @@ + "is_const" : true, + "linker_set_key" : "const std::equal_to >", + "name" : "const std::equal_to >", +- "referenced_type" : "type-7342", +- "self_type" : "type-7341", ++ "referenced_type" : "type-7294", ++ "self_type" : "type-7293", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -188641,8 +188683,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator > >", + "name" : "const std::map, std::allocator > >", +- "referenced_type" : "type-10692", +- "self_type" : "type-10691", ++ "referenced_type" : "type-10644", ++ "self_type" : "type-10643", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188651,8 +188693,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator > >", + "name" : "const std::map, std::allocator > >", +- "referenced_type" : "type-13983", +- "self_type" : "type-13982", ++ "referenced_type" : "type-13935", ++ "self_type" : "type-13934", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188661,8 +188703,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator > >", + "name" : "const std::map, std::allocator > >", +- "referenced_type" : "type-17847", +- "self_type" : "type-17846", ++ "referenced_type" : "type-17799", ++ "self_type" : "type-17798", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188671,8 +188713,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator > >", + "name" : "const std::map, std::allocator > >", +- "referenced_type" : "type-22376", +- "self_type" : "type-22375", ++ "referenced_type" : "type-22338", ++ "self_type" : "type-22337", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188681,8 +188723,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator > >", + "name" : "const std::map, std::allocator > >", +- "referenced_type" : "type-27561", +- "self_type" : "type-27560", ++ "referenced_type" : "type-27560", ++ "self_type" : "type-27559", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188691,8 +188733,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator > >", + "name" : "const std::map, std::allocator > >", +- "referenced_type" : "type-7778", +- "self_type" : "type-7777", ++ "referenced_type" : "type-7730", ++ "self_type" : "type-7729", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188701,8 +188743,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > >", + "name" : "const std::map >, std::less, std::allocator > > > >", +- "referenced_type" : "type-10704", +- "self_type" : "type-10703", ++ "referenced_type" : "type-10656", ++ "self_type" : "type-10655", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188711,8 +188753,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > >", + "name" : "const std::map >, std::less, std::allocator > > > >", +- "referenced_type" : "type-13995", +- "self_type" : "type-13994", ++ "referenced_type" : "type-13947", ++ "self_type" : "type-13946", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188721,8 +188763,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > >", + "name" : "const std::map >, std::less, std::allocator > > > >", +- "referenced_type" : "type-17859", +- "self_type" : "type-17858", ++ "referenced_type" : "type-17811", ++ "self_type" : "type-17810", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188731,8 +188773,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > >", + "name" : "const std::map >, std::less, std::allocator > > > >", +- "referenced_type" : "type-22388", +- "self_type" : "type-22387", ++ "referenced_type" : "type-22350", ++ "self_type" : "type-22349", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188741,8 +188783,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > >", + "name" : "const std::map >, std::less, std::allocator > > > >", +- "referenced_type" : "type-27573", +- "self_type" : "type-27572", ++ "referenced_type" : "type-27572", ++ "self_type" : "type-27571", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188751,8 +188793,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > >", + "name" : "const std::map >, std::less, std::allocator > > > >", +- "referenced_type" : "type-7790", +- "self_type" : "type-7789", ++ "referenced_type" : "type-7742", ++ "self_type" : "type-7741", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188761,8 +188803,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > >", + "name" : "const std::map >, std::less, std::allocator > > > >", +- "referenced_type" : "type-10698", +- "self_type" : "type-10697", ++ "referenced_type" : "type-10650", ++ "self_type" : "type-10649", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188771,8 +188813,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > >", + "name" : "const std::map >, std::less, std::allocator > > > >", +- "referenced_type" : "type-13989", +- "self_type" : "type-13988", ++ "referenced_type" : "type-13941", ++ "self_type" : "type-13940", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188781,8 +188823,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > >", + "name" : "const std::map >, std::less, std::allocator > > > >", +- "referenced_type" : "type-17853", +- "self_type" : "type-17852", ++ "referenced_type" : "type-17805", ++ "self_type" : "type-17804", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188791,8 +188833,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > >", + "name" : "const std::map >, std::less, std::allocator > > > >", +- "referenced_type" : "type-22382", +- "self_type" : "type-22381", ++ "referenced_type" : "type-22344", ++ "self_type" : "type-22343", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188801,8 +188843,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > >", + "name" : "const std::map >, std::less, std::allocator > > > >", +- "referenced_type" : "type-27567", +- "self_type" : "type-27566", ++ "referenced_type" : "type-27566", ++ "self_type" : "type-27565", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188811,8 +188853,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map >, std::less, std::allocator > > > >", + "name" : "const std::map >, std::less, std::allocator > > > >", +- "referenced_type" : "type-7784", +- "self_type" : "type-7783", ++ "referenced_type" : "type-7736", ++ "self_type" : "type-7735", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188821,8 +188863,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator > >", + "name" : "const std::map, std::allocator > >", +- "referenced_type" : "type-20015", +- "self_type" : "type-20014", ++ "referenced_type" : "type-19967", ++ "self_type" : "type-19966", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188831,8 +188873,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator > >", + "name" : "const std::map, std::allocator > >", +- "referenced_type" : "type-24475", +- "self_type" : "type-24474", ++ "referenced_type" : "type-24454", ++ "self_type" : "type-24453", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188841,8 +188883,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator > >", + "name" : "const std::map, std::allocator > >", +- "referenced_type" : "type-29660", +- "self_type" : "type-29659", ++ "referenced_type" : "type-29659", ++ "self_type" : "type-29658", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188851,8 +188893,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > >", + "name" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > >", +- "referenced_type" : "type-12493", +- "self_type" : "type-12492", ++ "referenced_type" : "type-12445", ++ "self_type" : "type-12444", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188861,8 +188903,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > >", + "name" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > >", +- "referenced_type" : "type-16350", +- "self_type" : "type-16349", ++ "referenced_type" : "type-16302", ++ "self_type" : "type-16301", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188871,8 +188913,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > >", + "name" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > >", +- "referenced_type" : "type-20881", +- "self_type" : "type-20880", ++ "referenced_type" : "type-20833", ++ "self_type" : "type-20832", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188881,8 +188923,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > >", + "name" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > >", +- "referenced_type" : "type-26059", +- "self_type" : "type-26058", ++ "referenced_type" : "type-26108", ++ "self_type" : "type-26107", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188891,8 +188933,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > >", + "name" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > >", +- "referenced_type" : "type-31206", +- "self_type" : "type-31205", ++ "referenced_type" : "type-31205", ++ "self_type" : "type-31204", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188901,8 +188943,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > >", + "name" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > >", +- "referenced_type" : "type-3997", +- "self_type" : "type-3996", ++ "referenced_type" : "type-3949", ++ "self_type" : "type-3948", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188911,8 +188953,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > >", + "name" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > >", +- "referenced_type" : "type-5904", +- "self_type" : "type-5903", ++ "referenced_type" : "type-5856", ++ "self_type" : "type-5855", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188921,8 +188963,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > >", + "name" : "const std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > >", +- "referenced_type" : "type-9161", +- "self_type" : "type-9160", ++ "referenced_type" : "type-9113", ++ "self_type" : "type-9112", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188931,8 +188973,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > >", + "name" : "const std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > >", +- "referenced_type" : "type-11210", +- "self_type" : "type-11209", ++ "referenced_type" : "type-11162", ++ "self_type" : "type-11161", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -188941,8 +188983,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > >", + "name" : "const std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > >", +- "referenced_type" : "type-14462", +- "self_type" : "type-14461", ++ "referenced_type" : "type-14414", ++ "self_type" : "type-14413", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -188951,8 +188993,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > >", + "name" : "const std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > >", +- "referenced_type" : "type-18326", +- "self_type" : "type-18325", ++ "referenced_type" : "type-18278", ++ "self_type" : "type-18277", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -188961,8 +189003,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > >", + "name" : "const std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > >", +- "referenced_type" : "type-22855", +- "self_type" : "type-22854", ++ "referenced_type" : "type-22811", ++ "self_type" : "type-22810", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -188971,8 +189013,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > >", + "name" : "const std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > >", +- "referenced_type" : "type-28040", +- "self_type" : "type-28039", ++ "referenced_type" : "type-28039", ++ "self_type" : "type-28038", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -188981,8 +189023,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > >", + "name" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > >", +- "referenced_type" : "type-12505", +- "self_type" : "type-12504", ++ "referenced_type" : "type-12457", ++ "self_type" : "type-12456", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -188991,8 +189033,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > >", + "name" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > >", +- "referenced_type" : "type-16362", +- "self_type" : "type-16361", ++ "referenced_type" : "type-16314", ++ "self_type" : "type-16313", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189001,8 +189043,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > >", + "name" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > >", +- "referenced_type" : "type-20893", +- "self_type" : "type-20892", ++ "referenced_type" : "type-20845", ++ "self_type" : "type-20844", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189011,8 +189053,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > >", + "name" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > >", +- "referenced_type" : "type-26071", +- "self_type" : "type-26070", ++ "referenced_type" : "type-26120", ++ "self_type" : "type-26119", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189021,8 +189063,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > >", + "name" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > >", +- "referenced_type" : "type-31218", +- "self_type" : "type-31217", ++ "referenced_type" : "type-31217", ++ "self_type" : "type-31216", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189031,8 +189073,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > >", + "name" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > >", +- "referenced_type" : "type-4009", +- "self_type" : "type-4008", ++ "referenced_type" : "type-3961", ++ "self_type" : "type-3960", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189041,8 +189083,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > >", + "name" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > >", +- "referenced_type" : "type-5916", +- "self_type" : "type-5915", ++ "referenced_type" : "type-5868", ++ "self_type" : "type-5867", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189051,8 +189093,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > >", + "name" : "const std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > >", +- "referenced_type" : "type-9173", +- "self_type" : "type-9172", ++ "referenced_type" : "type-9125", ++ "self_type" : "type-9124", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189061,8 +189103,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::pair, std::less >, std::allocator, std::pair > > >", + "name" : "const std::map, std::pair, std::less >, std::allocator, std::pair > > >", +- "referenced_type" : "type-11516", +- "self_type" : "type-11515", ++ "referenced_type" : "type-11468", ++ "self_type" : "type-11467", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189071,8 +189113,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::pair, std::less >, std::allocator, std::pair > > >", + "name" : "const std::map, std::pair, std::less >, std::allocator, std::pair > > >", +- "referenced_type" : "type-14736", +- "self_type" : "type-14735", ++ "referenced_type" : "type-14688", ++ "self_type" : "type-14687", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189081,8 +189123,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::pair, std::less >, std::allocator, std::pair > > >", + "name" : "const std::map, std::pair, std::less >, std::allocator, std::pair > > >", +- "referenced_type" : "type-18600", +- "self_type" : "type-18599", ++ "referenced_type" : "type-18552", ++ "self_type" : "type-18551", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189091,8 +189133,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::pair, std::less >, std::allocator, std::pair > > >", + "name" : "const std::map, std::pair, std::less >, std::allocator, std::pair > > >", +- "referenced_type" : "type-23129", +- "self_type" : "type-23128", ++ "referenced_type" : "type-23114", ++ "self_type" : "type-23113", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189101,8 +189143,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::pair, std::less >, std::allocator, std::pair > > >", + "name" : "const std::map, std::pair, std::less >, std::allocator, std::pair > > >", +- "referenced_type" : "type-28314", +- "self_type" : "type-28313", ++ "referenced_type" : "type-28313", ++ "self_type" : "type-28312", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189111,8 +189153,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > >", + "name" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > >", +- "referenced_type" : "type-12496", +- "self_type" : "type-12495", ++ "referenced_type" : "type-12448", ++ "self_type" : "type-12447", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189121,8 +189163,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > >", + "name" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > >", +- "referenced_type" : "type-16353", +- "self_type" : "type-16352", ++ "referenced_type" : "type-16305", ++ "self_type" : "type-16304", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189131,8 +189173,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > >", + "name" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > >", +- "referenced_type" : "type-20884", +- "self_type" : "type-20883", ++ "referenced_type" : "type-20836", ++ "self_type" : "type-20835", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189141,8 +189183,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > >", + "name" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > >", +- "referenced_type" : "type-26062", +- "self_type" : "type-26061", ++ "referenced_type" : "type-26111", ++ "self_type" : "type-26110", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189151,8 +189193,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > >", + "name" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > >", +- "referenced_type" : "type-31209", +- "self_type" : "type-31208", ++ "referenced_type" : "type-31208", ++ "self_type" : "type-31207", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189161,8 +189203,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > >", + "name" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > >", +- "referenced_type" : "type-4000", +- "self_type" : "type-3999", ++ "referenced_type" : "type-3952", ++ "self_type" : "type-3951", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189171,8 +189213,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > >", + "name" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > >", +- "referenced_type" : "type-5907", +- "self_type" : "type-5906", ++ "referenced_type" : "type-5859", ++ "self_type" : "type-5858", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189181,8 +189223,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > >", + "name" : "const std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > >", +- "referenced_type" : "type-9164", +- "self_type" : "type-9163", ++ "referenced_type" : "type-9116", ++ "self_type" : "type-9115", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189191,8 +189233,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > >", + "name" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > >", +- "referenced_type" : "type-12508", +- "self_type" : "type-12507", ++ "referenced_type" : "type-12460", ++ "self_type" : "type-12459", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189201,8 +189243,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > >", + "name" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > >", +- "referenced_type" : "type-16365", +- "self_type" : "type-16364", ++ "referenced_type" : "type-16317", ++ "self_type" : "type-16316", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189211,8 +189253,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > >", + "name" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > >", +- "referenced_type" : "type-20896", +- "self_type" : "type-20895", ++ "referenced_type" : "type-20848", ++ "self_type" : "type-20847", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189221,8 +189263,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > >", + "name" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > >", +- "referenced_type" : "type-26074", +- "self_type" : "type-26073", ++ "referenced_type" : "type-26123", ++ "self_type" : "type-26122", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189231,8 +189273,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > >", + "name" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > >", +- "referenced_type" : "type-31221", +- "self_type" : "type-31220", ++ "referenced_type" : "type-31220", ++ "self_type" : "type-31219", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189241,8 +189283,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > >", + "name" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > >", +- "referenced_type" : "type-4012", +- "self_type" : "type-4011", ++ "referenced_type" : "type-3964", ++ "self_type" : "type-3963", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189251,8 +189293,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > >", + "name" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > >", +- "referenced_type" : "type-5919", +- "self_type" : "type-5918", ++ "referenced_type" : "type-5871", ++ "self_type" : "type-5870", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189261,8 +189303,8 @@ + "is_const" : true, + "linker_set_key" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > >", + "name" : "const std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > >", +- "referenced_type" : "type-9176", +- "self_type" : "type-9175", ++ "referenced_type" : "type-9128", ++ "self_type" : "type-9127", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189271,8 +189313,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-12219", +- "self_type" : "type-12218", ++ "referenced_type" : "type-12171", ++ "self_type" : "type-12170", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189281,8 +189323,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-16074", +- "self_type" : "type-16073", ++ "referenced_type" : "type-16026", ++ "self_type" : "type-16025", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189291,8 +189333,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-20606", +- "self_type" : "type-20605", ++ "referenced_type" : "type-20558", ++ "self_type" : "type-20557", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189301,8 +189343,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-25785", +- "self_type" : "type-25784", ++ "referenced_type" : "type-25835", ++ "self_type" : "type-25834", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189311,8 +189353,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-30931", +- "self_type" : "type-30930", ++ "referenced_type" : "type-30930", ++ "self_type" : "type-30929", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189321,8 +189363,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-3659", +- "self_type" : "type-3658", ++ "referenced_type" : "type-3611", ++ "self_type" : "type-3610", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189331,8 +189373,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-5627", +- "self_type" : "type-5626", ++ "referenced_type" : "type-5579", ++ "self_type" : "type-5578", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189341,8 +189383,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-8885", +- "self_type" : "type-8884", ++ "referenced_type" : "type-8837", ++ "self_type" : "type-8836", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189351,8 +189393,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair &)>", + "name" : "const std::pair &)>", +- "referenced_type" : "type-13316", +- "self_type" : "type-13315", ++ "referenced_type" : "type-13268", ++ "self_type" : "type-13267", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189361,8 +189403,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair &)>", + "name" : "const std::pair &)>", +- "referenced_type" : "type-17172", +- "self_type" : "type-17171", ++ "referenced_type" : "type-17124", ++ "self_type" : "type-17123", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189371,8 +189413,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair &)>", + "name" : "const std::pair &)>", +- "referenced_type" : "type-21704", +- "self_type" : "type-21703", ++ "referenced_type" : "type-21656", ++ "self_type" : "type-21655", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189381,8 +189423,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair &)>", + "name" : "const std::pair &)>", +- "referenced_type" : "type-26882", +- "self_type" : "type-26881", ++ "referenced_type" : "type-26902", ++ "self_type" : "type-26901", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189391,8 +189433,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair &)>", + "name" : "const std::pair &)>", +- "referenced_type" : "type-32029", +- "self_type" : "type-32028", ++ "referenced_type" : "type-32028", ++ "self_type" : "type-32027", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189401,8 +189443,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair &)>", + "name" : "const std::pair &)>", +- "referenced_type" : "type-6876", +- "self_type" : "type-6875", ++ "referenced_type" : "type-6828", ++ "self_type" : "type-6827", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189411,8 +189453,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair &)>", + "name" : "const std::pair &)>", +- "referenced_type" : "type-9983", +- "self_type" : "type-9982", ++ "referenced_type" : "type-9935", ++ "self_type" : "type-9934", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189421,8 +189463,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-12212", +- "self_type" : "type-12211", ++ "referenced_type" : "type-12164", ++ "self_type" : "type-12163", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189431,8 +189473,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-16067", +- "self_type" : "type-16066", ++ "referenced_type" : "type-16019", ++ "self_type" : "type-16018", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189441,8 +189483,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-20599", +- "self_type" : "type-20598", ++ "referenced_type" : "type-20551", ++ "self_type" : "type-20550", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189451,8 +189493,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-25778", +- "self_type" : "type-25777", ++ "referenced_type" : "type-25830", ++ "self_type" : "type-25829", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189461,8 +189503,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-30924", +- "self_type" : "type-30923", ++ "referenced_type" : "type-30923", ++ "self_type" : "type-30922", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189471,8 +189513,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-3646", +- "self_type" : "type-3645", ++ "referenced_type" : "type-3598", ++ "self_type" : "type-3597", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189481,8 +189523,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-5620", +- "self_type" : "type-5619", ++ "referenced_type" : "type-5572", ++ "self_type" : "type-5571", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189491,8 +189533,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-8878", +- "self_type" : "type-8877", ++ "referenced_type" : "type-8830", ++ "self_type" : "type-8829", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189501,8 +189543,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-13320", +- "self_type" : "type-13319", ++ "referenced_type" : "type-13272", ++ "self_type" : "type-13271", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189511,8 +189553,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-17176", +- "self_type" : "type-17175", ++ "referenced_type" : "type-17128", ++ "self_type" : "type-17127", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189521,8 +189563,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-21708", +- "self_type" : "type-21707", ++ "referenced_type" : "type-21660", ++ "self_type" : "type-21659", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189531,8 +189573,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-26886", +- "self_type" : "type-26885", ++ "referenced_type" : "type-26906", ++ "self_type" : "type-26905", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189541,8 +189583,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-32033", +- "self_type" : "type-32032", ++ "referenced_type" : "type-32032", ++ "self_type" : "type-32031", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189551,8 +189593,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-6881", +- "self_type" : "type-6880", ++ "referenced_type" : "type-6833", ++ "self_type" : "type-6832", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189561,8 +189603,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-9987", +- "self_type" : "type-9986", ++ "referenced_type" : "type-9939", ++ "self_type" : "type-9938", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189571,8 +189613,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-11519", +- "self_type" : "type-11518", ++ "referenced_type" : "type-11471", ++ "self_type" : "type-11470", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189581,8 +189623,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-14739", +- "self_type" : "type-14738", ++ "referenced_type" : "type-14691", ++ "self_type" : "type-14690", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189591,8 +189633,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-18603", +- "self_type" : "type-18602", ++ "referenced_type" : "type-18555", ++ "self_type" : "type-18554", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189601,8 +189643,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-23132", +- "self_type" : "type-23131", ++ "referenced_type" : "type-23117", ++ "self_type" : "type-23116", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189611,8 +189653,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-28317", +- "self_type" : "type-28316", ++ "referenced_type" : "type-28316", ++ "self_type" : "type-28315", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189621,8 +189663,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-10289", +- "self_type" : "type-10288", ++ "referenced_type" : "type-10241", ++ "self_type" : "type-10240", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -189631,8 +189673,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-1298", +- "self_type" : "type-1297", ++ "referenced_type" : "type-1212", ++ "self_type" : "type-1211", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -189641,8 +189683,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-13580", +- "self_type" : "type-13579", ++ "referenced_type" : "type-13532", ++ "self_type" : "type-13531", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -189651,8 +189693,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-17444", +- "self_type" : "type-17443", ++ "referenced_type" : "type-17396", ++ "self_type" : "type-17395", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -189661,8 +189703,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-21973", +- "self_type" : "type-21972", ++ "referenced_type" : "type-22531", ++ "self_type" : "type-22530", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -189671,8 +189713,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-27158", +- "self_type" : "type-27157", ++ "referenced_type" : "type-2674", ++ "self_type" : "type-2673", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -189681,8 +189723,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-2722", +- "self_type" : "type-2721", ++ "referenced_type" : "type-27157", ++ "self_type" : "type-27156", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -189701,8 +189743,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-4702", +- "self_type" : "type-4701", ++ "referenced_type" : "type-4654", ++ "self_type" : "type-4653", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -189711,8 +189753,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-7248", +- "self_type" : "type-7247", ++ "referenced_type" : "type-7200", ++ "self_type" : "type-7199", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/hash.h" + }, +@@ -189721,8 +189763,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-20024", +- "self_type" : "type-20023", ++ "referenced_type" : "type-19976", ++ "self_type" : "type-19975", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189731,8 +189773,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-24484", +- "self_type" : "type-24483", ++ "referenced_type" : "type-24461", ++ "self_type" : "type-24460", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189741,8 +189783,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-29669", +- "self_type" : "type-29668", ++ "referenced_type" : "type-29668", ++ "self_type" : "type-29667", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189751,8 +189793,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *>", + "name" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *>", +- "referenced_type" : "type-12397", +- "self_type" : "type-12396", ++ "referenced_type" : "type-12349", ++ "self_type" : "type-12348", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189761,8 +189803,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *>", + "name" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *>", +- "referenced_type" : "type-16254", +- "self_type" : "type-16253", ++ "referenced_type" : "type-16206", ++ "self_type" : "type-16205", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189771,8 +189813,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *>", + "name" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *>", +- "referenced_type" : "type-20785", +- "self_type" : "type-20784", ++ "referenced_type" : "type-20737", ++ "self_type" : "type-20736", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189781,8 +189823,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *>", + "name" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *>", +- "referenced_type" : "type-25963", +- "self_type" : "type-25962", ++ "referenced_type" : "type-26016", ++ "self_type" : "type-26015", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189791,8 +189833,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *>", + "name" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *>", +- "referenced_type" : "type-31110", +- "self_type" : "type-31109", ++ "referenced_type" : "type-31109", ++ "self_type" : "type-31108", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189801,8 +189843,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *>", + "name" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *>", +- "referenced_type" : "type-3900", +- "self_type" : "type-3899", ++ "referenced_type" : "type-3852", ++ "self_type" : "type-3851", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189811,8 +189853,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *>", + "name" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *>", +- "referenced_type" : "type-5808", +- "self_type" : "type-5807", ++ "referenced_type" : "type-5760", ++ "self_type" : "type-5759", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189821,8 +189863,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *>", + "name" : "const std::pair, std::allocator >, const google::protobuf::FileDescriptorProto *>", +- "referenced_type" : "type-9065", +- "self_type" : "type-9064", ++ "referenced_type" : "type-9017", ++ "self_type" : "type-9016", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189831,8 +189873,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>", + "name" : "const std::pair, std::allocator >, int>", +- "referenced_type" : "type-15378", +- "self_type" : "type-15377", ++ "referenced_type" : "type-15330", ++ "self_type" : "type-15329", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189841,8 +189883,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>", + "name" : "const std::pair, std::allocator >, int>", +- "referenced_type" : "type-19140", +- "self_type" : "type-19139", ++ "referenced_type" : "type-19092", ++ "self_type" : "type-19091", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189851,8 +189893,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>", + "name" : "const std::pair, std::allocator >, int>", +- "referenced_type" : "type-23669", +- "self_type" : "type-23668", ++ "referenced_type" : "type-23653", ++ "self_type" : "type-23652", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189861,8 +189903,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>", + "name" : "const std::pair, std::allocator >, int>", +- "referenced_type" : "type-28854", +- "self_type" : "type-28853", ++ "referenced_type" : "type-28853", ++ "self_type" : "type-28852", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189871,8 +189913,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, std::pair >", + "name" : "const std::pair, std::allocator >, std::pair >", +- "referenced_type" : "type-12409", +- "self_type" : "type-12408", ++ "referenced_type" : "type-12361", ++ "self_type" : "type-12360", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189881,8 +189923,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, std::pair >", + "name" : "const std::pair, std::allocator >, std::pair >", +- "referenced_type" : "type-16266", +- "self_type" : "type-16265", ++ "referenced_type" : "type-16218", ++ "self_type" : "type-16217", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189891,8 +189933,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, std::pair >", + "name" : "const std::pair, std::allocator >, std::pair >", +- "referenced_type" : "type-20797", +- "self_type" : "type-20796", ++ "referenced_type" : "type-20749", ++ "self_type" : "type-20748", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189901,8 +189943,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, std::pair >", + "name" : "const std::pair, std::allocator >, std::pair >", +- "referenced_type" : "type-25975", +- "self_type" : "type-25974", ++ "referenced_type" : "type-26028", ++ "self_type" : "type-26027", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189911,8 +189953,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, std::pair >", + "name" : "const std::pair, std::allocator >, std::pair >", +- "referenced_type" : "type-31122", +- "self_type" : "type-31121", ++ "referenced_type" : "type-31121", ++ "self_type" : "type-31120", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189921,8 +189963,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, std::pair >", + "name" : "const std::pair, std::allocator >, std::pair >", +- "referenced_type" : "type-3912", +- "self_type" : "type-3911", ++ "referenced_type" : "type-3864", ++ "self_type" : "type-3863", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189931,8 +189973,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, std::pair >", + "name" : "const std::pair, std::allocator >, std::pair >", +- "referenced_type" : "type-5820", +- "self_type" : "type-5819", ++ "referenced_type" : "type-5772", ++ "self_type" : "type-5771", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189941,8 +189983,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, std::pair >", + "name" : "const std::pair, std::allocator >, std::pair >", +- "referenced_type" : "type-9077", +- "self_type" : "type-9076", ++ "referenced_type" : "type-9029", ++ "self_type" : "type-9028", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189951,8 +189993,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, const google::protobuf::FieldDescriptor *>", + "name" : "const std::pair, const google::protobuf::FieldDescriptor *>", +- "referenced_type" : "type-12225", +- "self_type" : "type-12224", ++ "referenced_type" : "type-12177", ++ "self_type" : "type-12176", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189961,8 +190003,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, const google::protobuf::FieldDescriptor *>", + "name" : "const std::pair, const google::protobuf::FieldDescriptor *>", +- "referenced_type" : "type-16080", +- "self_type" : "type-16079", ++ "referenced_type" : "type-16032", ++ "self_type" : "type-16031", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189971,8 +190013,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, const google::protobuf::FieldDescriptor *>", + "name" : "const std::pair, const google::protobuf::FieldDescriptor *>", +- "referenced_type" : "type-20612", +- "self_type" : "type-20611", ++ "referenced_type" : "type-20564", ++ "self_type" : "type-20563", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189981,8 +190023,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, const google::protobuf::FieldDescriptor *>", + "name" : "const std::pair, const google::protobuf::FieldDescriptor *>", +- "referenced_type" : "type-25791", +- "self_type" : "type-25790", ++ "referenced_type" : "type-25841", ++ "self_type" : "type-25840", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -189991,8 +190033,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, const google::protobuf::FieldDescriptor *>", + "name" : "const std::pair, const google::protobuf::FieldDescriptor *>", +- "referenced_type" : "type-30937", +- "self_type" : "type-30936", ++ "referenced_type" : "type-30936", ++ "self_type" : "type-30935", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190001,8 +190043,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, const google::protobuf::FieldDescriptor *>", + "name" : "const std::pair, const google::protobuf::FieldDescriptor *>", +- "referenced_type" : "type-3665", +- "self_type" : "type-3664", ++ "referenced_type" : "type-3617", ++ "self_type" : "type-3616", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190011,8 +190053,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, const google::protobuf::FieldDescriptor *>", + "name" : "const std::pair, const google::protobuf::FieldDescriptor *>", +- "referenced_type" : "type-5633", +- "self_type" : "type-5632", ++ "referenced_type" : "type-5585", ++ "self_type" : "type-5584", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190021,8 +190063,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, const google::protobuf::FieldDescriptor *>", + "name" : "const std::pair, const google::protobuf::FieldDescriptor *>", +- "referenced_type" : "type-8891", +- "self_type" : "type-8890", ++ "referenced_type" : "type-8843", ++ "self_type" : "type-8842", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190031,8 +190073,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, google::protobuf::internal::ExtensionInfo>", + "name" : "const std::pair, google::protobuf::internal::ExtensionInfo>", +- "referenced_type" : "type-10923", +- "self_type" : "type-10922", ++ "referenced_type" : "type-10875", ++ "self_type" : "type-10874", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190041,8 +190083,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, google::protobuf::internal::ExtensionInfo>", + "name" : "const std::pair, google::protobuf::internal::ExtensionInfo>", +- "referenced_type" : "type-14214", +- "self_type" : "type-14213", ++ "referenced_type" : "type-1366", ++ "self_type" : "type-1365", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190051,8 +190093,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, google::protobuf::internal::ExtensionInfo>", + "name" : "const std::pair, google::protobuf::internal::ExtensionInfo>", +- "referenced_type" : "type-1447", +- "self_type" : "type-1446", ++ "referenced_type" : "type-14166", ++ "self_type" : "type-14165", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190061,8 +190103,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, google::protobuf::internal::ExtensionInfo>", + "name" : "const std::pair, google::protobuf::internal::ExtensionInfo>", +- "referenced_type" : "type-18078", +- "self_type" : "type-18077", ++ "referenced_type" : "type-18030", ++ "self_type" : "type-18029", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190071,8 +190113,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, google::protobuf::internal::ExtensionInfo>", + "name" : "const std::pair, google::protobuf::internal::ExtensionInfo>", +- "referenced_type" : "type-22607", +- "self_type" : "type-22606", ++ "referenced_type" : "type-23276", ++ "self_type" : "type-23275", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190081,8 +190123,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, google::protobuf::internal::ExtensionInfo>", + "name" : "const std::pair, google::protobuf::internal::ExtensionInfo>", +- "referenced_type" : "type-27792", +- "self_type" : "type-27791", ++ "referenced_type" : "type-27791", ++ "self_type" : "type-27790", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190091,8 +190133,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, google::protobuf::internal::ExtensionInfo>", + "name" : "const std::pair, google::protobuf::internal::ExtensionInfo>", +- "referenced_type" : "type-2876", +- "self_type" : "type-2875", ++ "referenced_type" : "type-2828", ++ "self_type" : "type-2827", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190101,8 +190143,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, google::protobuf::internal::ExtensionInfo>", + "name" : "const std::pair, google::protobuf::internal::ExtensionInfo>", +- "referenced_type" : "type-4856", +- "self_type" : "type-4855", ++ "referenced_type" : "type-4808", ++ "self_type" : "type-4807", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190121,8 +190163,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, google::protobuf::internal::ExtensionInfo>", + "name" : "const std::pair, google::protobuf::internal::ExtensionInfo>", +- "referenced_type" : "type-8024", +- "self_type" : "type-8023", ++ "referenced_type" : "type-7976", ++ "self_type" : "type-7975", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190131,8 +190173,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *>", + "name" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *>", +- "referenced_type" : "type-12403", +- "self_type" : "type-12402", ++ "referenced_type" : "type-12355", ++ "self_type" : "type-12354", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190141,8 +190183,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *>", + "name" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *>", +- "referenced_type" : "type-16260", +- "self_type" : "type-16259", ++ "referenced_type" : "type-16212", ++ "self_type" : "type-16211", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190151,8 +190193,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *>", + "name" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *>", +- "referenced_type" : "type-20791", +- "self_type" : "type-20790", ++ "referenced_type" : "type-20743", ++ "self_type" : "type-20742", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190161,8 +190203,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *>", + "name" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *>", +- "referenced_type" : "type-25969", +- "self_type" : "type-25968", ++ "referenced_type" : "type-26022", ++ "self_type" : "type-26021", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190171,8 +190213,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *>", + "name" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *>", +- "referenced_type" : "type-31116", +- "self_type" : "type-31115", ++ "referenced_type" : "type-31115", ++ "self_type" : "type-31114", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190181,8 +190223,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *>", + "name" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *>", +- "referenced_type" : "type-3906", +- "self_type" : "type-3905", ++ "referenced_type" : "type-3858", ++ "self_type" : "type-3857", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190191,8 +190233,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *>", + "name" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *>", +- "referenced_type" : "type-5814", +- "self_type" : "type-5813", ++ "referenced_type" : "type-5766", ++ "self_type" : "type-5765", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190201,8 +190243,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *>", + "name" : "const std::pair, std::allocator >, int>, const google::protobuf::FileDescriptorProto *>", +- "referenced_type" : "type-9071", +- "self_type" : "type-9070", ++ "referenced_type" : "type-9023", ++ "self_type" : "type-9022", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190211,8 +190253,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>, std::pair >", + "name" : "const std::pair, std::allocator >, int>, std::pair >", +- "referenced_type" : "type-12415", +- "self_type" : "type-12414", ++ "referenced_type" : "type-12367", ++ "self_type" : "type-12366", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190221,8 +190263,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>, std::pair >", + "name" : "const std::pair, std::allocator >, int>, std::pair >", +- "referenced_type" : "type-16272", +- "self_type" : "type-16271", ++ "referenced_type" : "type-16224", ++ "self_type" : "type-16223", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190231,8 +190273,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>, std::pair >", + "name" : "const std::pair, std::allocator >, int>, std::pair >", +- "referenced_type" : "type-20803", +- "self_type" : "type-20802", ++ "referenced_type" : "type-20755", ++ "self_type" : "type-20754", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190241,8 +190283,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>, std::pair >", + "name" : "const std::pair, std::allocator >, int>, std::pair >", +- "referenced_type" : "type-25981", +- "self_type" : "type-25980", ++ "referenced_type" : "type-26034", ++ "self_type" : "type-26033", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190251,8 +190293,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>, std::pair >", + "name" : "const std::pair, std::allocator >, int>, std::pair >", +- "referenced_type" : "type-31128", +- "self_type" : "type-31127", ++ "referenced_type" : "type-31127", ++ "self_type" : "type-31126", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190261,8 +190303,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>, std::pair >", + "name" : "const std::pair, std::allocator >, int>, std::pair >", +- "referenced_type" : "type-3918", +- "self_type" : "type-3917", ++ "referenced_type" : "type-3870", ++ "self_type" : "type-3869", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190271,8 +190313,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>, std::pair >", + "name" : "const std::pair, std::allocator >, int>, std::pair >", +- "referenced_type" : "type-5826", +- "self_type" : "type-5825", ++ "referenced_type" : "type-5778", ++ "self_type" : "type-5777", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190281,8 +190323,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>, std::pair >", + "name" : "const std::pair, std::allocator >, int>, std::pair >", +- "referenced_type" : "type-9083", +- "self_type" : "type-9082", ++ "referenced_type" : "type-9035", ++ "self_type" : "type-9034", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190291,8 +190333,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-12503", +- "self_type" : "type-12502", ++ "referenced_type" : "type-12455", ++ "self_type" : "type-12454", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190301,8 +190343,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-16360", +- "self_type" : "type-16359", ++ "referenced_type" : "type-16312", ++ "self_type" : "type-16311", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190311,8 +190353,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-20891", +- "self_type" : "type-20890", ++ "referenced_type" : "type-20843", ++ "self_type" : "type-20842", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190321,8 +190363,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-26069", +- "self_type" : "type-26068", ++ "referenced_type" : "type-26118", ++ "self_type" : "type-26117", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190331,8 +190373,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-31216", +- "self_type" : "type-31215", ++ "referenced_type" : "type-31215", ++ "self_type" : "type-31214", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190341,8 +190383,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-4007", +- "self_type" : "type-4006", ++ "referenced_type" : "type-3959", ++ "self_type" : "type-3958", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190351,8 +190393,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-5914", +- "self_type" : "type-5913", ++ "referenced_type" : "type-5866", ++ "self_type" : "type-5865", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190361,8 +190403,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-9171", +- "self_type" : "type-9170", ++ "referenced_type" : "type-9123", ++ "self_type" : "type-9122", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190371,8 +190413,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-11514", +- "self_type" : "type-11513", ++ "referenced_type" : "type-11466", ++ "self_type" : "type-11465", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190381,8 +190423,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-14734", +- "self_type" : "type-14733", ++ "referenced_type" : "type-14686", ++ "self_type" : "type-14685", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190391,8 +190433,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-18598", +- "self_type" : "type-18597", ++ "referenced_type" : "type-18550", ++ "self_type" : "type-18549", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190401,8 +190443,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-23127", +- "self_type" : "type-23126", ++ "referenced_type" : "type-23112", ++ "self_type" : "type-23111", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190411,8 +190453,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair", + "name" : "const std::pair", +- "referenced_type" : "type-28312", +- "self_type" : "type-28311", ++ "referenced_type" : "type-28311", ++ "self_type" : "type-28310", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190421,8 +190463,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>", + "name" : "const std::pair, std::allocator >, int>", +- "referenced_type" : "type-12499", +- "self_type" : "type-12498", ++ "referenced_type" : "type-12451", ++ "self_type" : "type-12450", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190431,8 +190473,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>", + "name" : "const std::pair, std::allocator >, int>", +- "referenced_type" : "type-16356", +- "self_type" : "type-16355", ++ "referenced_type" : "type-16308", ++ "self_type" : "type-16307", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190441,8 +190483,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>", + "name" : "const std::pair, std::allocator >, int>", +- "referenced_type" : "type-20887", +- "self_type" : "type-20886", ++ "referenced_type" : "type-20839", ++ "self_type" : "type-20838", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190451,8 +190493,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>", + "name" : "const std::pair, std::allocator >, int>", +- "referenced_type" : "type-26065", +- "self_type" : "type-26064", ++ "referenced_type" : "type-26114", ++ "self_type" : "type-26113", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190461,8 +190503,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>", + "name" : "const std::pair, std::allocator >, int>", +- "referenced_type" : "type-31212", +- "self_type" : "type-31211", ++ "referenced_type" : "type-31211", ++ "self_type" : "type-31210", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190471,8 +190513,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>", + "name" : "const std::pair, std::allocator >, int>", +- "referenced_type" : "type-4003", +- "self_type" : "type-4002", ++ "referenced_type" : "type-3955", ++ "self_type" : "type-3954", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190481,8 +190523,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>", + "name" : "const std::pair, std::allocator >, int>", +- "referenced_type" : "type-5910", +- "self_type" : "type-5909", ++ "referenced_type" : "type-5862", ++ "self_type" : "type-5861", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190491,8 +190533,8 @@ + "is_const" : true, + "linker_set_key" : "const std::pair, std::allocator >, int>", + "name" : "const std::pair, std::allocator >, int>", +- "referenced_type" : "type-9167", +- "self_type" : "type-9166", ++ "referenced_type" : "type-9119", ++ "self_type" : "type-9118", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190501,8 +190543,8 @@ + "is_const" : true, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator >", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator >", +- "referenced_type" : "type-13144", +- "self_type" : "type-13143", ++ "referenced_type" : "type-13096", ++ "self_type" : "type-13095", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -190511,8 +190553,8 @@ + "is_const" : true, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator >", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator >", +- "referenced_type" : "type-17000", +- "self_type" : "type-16999", ++ "referenced_type" : "type-16952", ++ "self_type" : "type-16951", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -190521,8 +190563,8 @@ + "is_const" : true, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator >", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator >", +- "referenced_type" : "type-21532", +- "self_type" : "type-21531", ++ "referenced_type" : "type-21484", ++ "self_type" : "type-21483", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -190531,8 +190573,8 @@ + "is_const" : true, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator >", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator >", +- "referenced_type" : "type-26710", +- "self_type" : "type-26709", ++ "referenced_type" : "type-26731", ++ "self_type" : "type-26730", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -190541,8 +190583,8 @@ + "is_const" : true, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator >", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator >", +- "referenced_type" : "type-31857", +- "self_type" : "type-31856", ++ "referenced_type" : "type-31856", ++ "self_type" : "type-31855", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -190551,8 +190593,8 @@ + "is_const" : true, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator >", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator >", +- "referenced_type" : "type-6641", +- "self_type" : "type-6640", ++ "referenced_type" : "type-6593", ++ "self_type" : "type-6592", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -190561,8 +190603,8 @@ + "is_const" : true, + "linker_set_key" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator >", + "name" : "const std::set::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator >", +- "referenced_type" : "type-9812", +- "self_type" : "type-9811", ++ "referenced_type" : "type-9764", ++ "self_type" : "type-9763", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -190571,8 +190613,8 @@ + "is_const" : true, + "linker_set_key" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> >", + "name" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> >", +- "referenced_type" : "type-10422", +- "self_type" : "type-10421", ++ "referenced_type" : "type-10374", ++ "self_type" : "type-10373", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -190581,8 +190623,8 @@ + "is_const" : true, + "linker_set_key" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> >", + "name" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> >", +- "referenced_type" : "type-13713", +- "self_type" : "type-13712", ++ "referenced_type" : "type-13665", ++ "self_type" : "type-13664", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -190591,8 +190633,8 @@ + "is_const" : true, + "linker_set_key" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> >", + "name" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> >", +- "referenced_type" : "type-17577", +- "self_type" : "type-17576", ++ "referenced_type" : "type-17529", ++ "self_type" : "type-17528", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -190601,8 +190643,8 @@ + "is_const" : true, + "linker_set_key" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> >", + "name" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> >", +- "referenced_type" : "type-22106", +- "self_type" : "type-22105", ++ "referenced_type" : "type-22105", ++ "self_type" : "type-22104", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -190611,8 +190653,8 @@ + "is_const" : true, + "linker_set_key" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> >", + "name" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> >", +- "referenced_type" : "type-27291", +- "self_type" : "type-27290", ++ "referenced_type" : "type-27290", ++ "self_type" : "type-27289", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -190621,8 +190663,8 @@ + "is_const" : true, + "linker_set_key" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> >", + "name" : "const std::set, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> >", +- "referenced_type" : "type-7475", +- "self_type" : "type-7474", ++ "referenced_type" : "type-7427", ++ "self_type" : "type-7426", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -190631,8 +190673,8 @@ + "is_const" : true, + "linker_set_key" : "const std::set, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator > > >", + "name" : "const std::set, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-24658", +- "self_type" : "type-24657", ++ "referenced_type" : "type-24621", ++ "self_type" : "type-24620", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190641,8 +190683,8 @@ + "is_const" : true, + "linker_set_key" : "const std::set, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator > > >", + "name" : "const std::set, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-29839", +- "self_type" : "type-29838", ++ "referenced_type" : "type-29838", ++ "self_type" : "type-29837", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -190651,8 +190693,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-10013", +- "self_type" : "type-10012", ++ "referenced_type" : "type-10047", ++ "self_type" : "type-10046", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190661,8 +190703,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-10095", +- "self_type" : "type-10094", ++ "referenced_type" : "type-10140", ++ "self_type" : "type-10139", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190671,8 +190713,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-10188", +- "self_type" : "type-10187", ++ "referenced_type" : "type-1020", ++ "self_type" : "type-1019", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190681,8 +190723,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-1020", +- "self_type" : "type-1019", ++ "referenced_type" : "type-10331", ++ "self_type" : "type-10330", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190691,8 +190733,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-10379", +- "self_type" : "type-10378", ++ "referenced_type" : "type-10436", ++ "self_type" : "type-10435", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190701,8 +190743,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-10484", +- "self_type" : "type-10483", ++ "referenced_type" : "type-10531", ++ "self_type" : "type-10530", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190711,8 +190753,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-10579", +- "self_type" : "type-10578", ++ "referenced_type" : "type-1059", ++ "self_type" : "type-1058", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190721,8 +190763,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-1059", +- "self_type" : "type-1058", ++ "referenced_type" : "type-10673", ++ "self_type" : "type-10672", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190731,8 +190773,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-10721", +- "self_type" : "type-10720", ++ "referenced_type" : "type-10763", ++ "self_type" : "type-10762", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190741,8 +190783,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-10811", +- "self_type" : "type-10810", ++ "referenced_type" : "type-10853", ++ "self_type" : "type-10852", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190751,8 +190793,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-10901", +- "self_type" : "type-10900", ++ "referenced_type" : "type-10946", ++ "self_type" : "type-10945", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190761,8 +190803,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-10994", +- "self_type" : "type-10993", ++ "referenced_type" : "type-11010", ++ "self_type" : "type-11009", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190771,8 +190813,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-11058", +- "self_type" : "type-11057", ++ "referenced_type" : "type-11166", ++ "self_type" : "type-11165", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190781,8 +190823,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-11214", +- "self_type" : "type-11213", ++ "referenced_type" : "type-11219", ++ "self_type" : "type-11218", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190791,8 +190833,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-11267", +- "self_type" : "type-11266", ++ "referenced_type" : "type-11377", ++ "self_type" : "type-11376", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190801,8 +190843,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-11425", +- "self_type" : "type-11424", ++ "referenced_type" : "type-11454", ++ "self_type" : "type-11453", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190811,8 +190853,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-11502", +- "self_type" : "type-11501", ++ "referenced_type" : "type-11503", ++ "self_type" : "type-11502", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190821,8 +190863,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-11551", +- "self_type" : "type-11550", ++ "referenced_type" : "type-11531", ++ "self_type" : "type-11530", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190831,8 +190873,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-11579", +- "self_type" : "type-11578", ++ "referenced_type" : "type-11704", ++ "self_type" : "type-11703", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190841,8 +190883,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-11752", +- "self_type" : "type-11751", ++ "referenced_type" : "type-11979", ++ "self_type" : "type-11978", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190851,8 +190893,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-12027", +- "self_type" : "type-12026", ++ "referenced_type" : "type-12117", ++ "self_type" : "type-12116", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190861,8 +190903,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-1215", +- "self_type" : "type-1214", ++ "referenced_type" : "type-12249", ++ "self_type" : "type-12248", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190871,8 +190913,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-12165", +- "self_type" : "type-12164", ++ "referenced_type" : "type-1235", ++ "self_type" : "type-1234", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190881,8 +190923,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-12297", +- "self_type" : "type-12296", ++ "referenced_type" : "type-12397", ++ "self_type" : "type-12396", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190891,8 +190933,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-12445", +- "self_type" : "type-12444", ++ "referenced_type" : "type-12481", ++ "self_type" : "type-12480", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190901,8 +190943,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-12529", +- "self_type" : "type-12528", ++ "referenced_type" : "type-12583", ++ "self_type" : "type-12582", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190911,8 +190953,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-1254", +- "self_type" : "type-1253", ++ "referenced_type" : "type-12710", ++ "self_type" : "type-12709", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190921,8 +190963,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-12631", +- "self_type" : "type-12630", ++ "referenced_type" : "type-12762", ++ "self_type" : "type-12761", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190931,8 +190973,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-12758", +- "self_type" : "type-12757", ++ "referenced_type" : "type-12845", ++ "self_type" : "type-12844", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190941,8 +190983,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-12810", +- "self_type" : "type-12809", ++ "referenced_type" : "type-12894", ++ "self_type" : "type-12893", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190951,8 +190993,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-12893", +- "self_type" : "type-12892", ++ "referenced_type" : "type-12898", ++ "self_type" : "type-12897", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190961,8 +191003,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-12942", +- "self_type" : "type-12941", ++ "referenced_type" : "type-12976", ++ "self_type" : "type-12975", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190971,8 +191013,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-12946", +- "self_type" : "type-12945", ++ "referenced_type" : "type-13044", ++ "self_type" : "type-13043", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190981,8 +191023,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-13024", +- "self_type" : "type-13023", ++ "referenced_type" : "type-13081", ++ "self_type" : "type-13080", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -190991,8 +191033,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-13092", +- "self_type" : "type-13091", ++ "referenced_type" : "type-13298", ++ "self_type" : "type-13297", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191001,8 +191043,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-13129", +- "self_type" : "type-13128", ++ "referenced_type" : "type-13380", ++ "self_type" : "type-13379", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191011,8 +191053,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-1322", +- "self_type" : "type-1321", ++ "referenced_type" : "type-13473", ++ "self_type" : "type-13472", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191021,8 +191063,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-13346", +- "self_type" : "type-13345", ++ "referenced_type" : "type-13622", ++ "self_type" : "type-13621", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191031,8 +191073,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-13428", +- "self_type" : "type-13427", ++ "referenced_type" : "type-13727", ++ "self_type" : "type-13726", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191041,8 +191083,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-13521", +- "self_type" : "type-13520", ++ "referenced_type" : "type-13822", ++ "self_type" : "type-13821", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191051,8 +191093,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-13670", +- "self_type" : "type-13669", ++ "referenced_type" : "type-1387", ++ "self_type" : "type-1386", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191061,8 +191103,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-13775", +- "self_type" : "type-13774", ++ "referenced_type" : "type-13964", ++ "self_type" : "type-13963", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191071,8 +191113,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-13870", +- "self_type" : "type-13869", ++ "referenced_type" : "type-14054", ++ "self_type" : "type-14053", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191081,8 +191123,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-14012", +- "self_type" : "type-14011", ++ "referenced_type" : "type-14144", ++ "self_type" : "type-14143", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191091,8 +191133,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-14102", +- "self_type" : "type-14101", ++ "referenced_type" : "type-1421", ++ "self_type" : "type-1420", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191101,8 +191143,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-14192", +- "self_type" : "type-14191", ++ "referenced_type" : "type-14237", ++ "self_type" : "type-14236", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191111,8 +191153,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-14285", +- "self_type" : "type-14284", ++ "referenced_type" : "type-14292", ++ "self_type" : "type-14291", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191121,8 +191163,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-14340", +- "self_type" : "type-14339", ++ "referenced_type" : "type-14418", ++ "self_type" : "type-14417", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191131,8 +191173,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-14466", +- "self_type" : "type-14465", ++ "referenced_type" : "type-14470", ++ "self_type" : "type-14469", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191141,8 +191183,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-14518", +- "self_type" : "type-14517", ++ "referenced_type" : "type-1454", ++ "self_type" : "type-1453", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191151,8 +191193,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-14644", +- "self_type" : "type-14643", ++ "referenced_type" : "type-14596", ++ "self_type" : "type-14595", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191161,8 +191203,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-1471", +- "self_type" : "type-1470", ++ "referenced_type" : "type-14674", ++ "self_type" : "type-14673", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191171,8 +191213,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-14722", +- "self_type" : "type-14721", ++ "referenced_type" : "type-14738", ++ "self_type" : "type-14737", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191181,8 +191223,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-14786", +- "self_type" : "type-14785", ++ "referenced_type" : "type-14827", ++ "self_type" : "type-14826", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191191,8 +191233,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-14875", +- "self_type" : "type-14874", ++ "referenced_type" : "type-1482", ++ "self_type" : "type-1481", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191201,8 +191243,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-15073", +- "self_type" : "type-15072", ++ "referenced_type" : "type-15025", ++ "self_type" : "type-15024", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191211,8 +191253,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-1507", +- "self_type" : "type-1506", ++ "referenced_type" : "type-15094", ++ "self_type" : "type-15093", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191221,8 +191263,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-15142", +- "self_type" : "type-15141", ++ "referenced_type" : "type-15137", ++ "self_type" : "type-15136", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191231,8 +191273,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-15185", +- "self_type" : "type-15184", ++ "referenced_type" : "type-15390", ++ "self_type" : "type-15389", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191241,8 +191283,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-1535", +- "self_type" : "type-1534", ++ "referenced_type" : "type-15561", ++ "self_type" : "type-15560", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191251,8 +191293,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-15438", +- "self_type" : "type-15437", ++ "referenced_type" : "type-15835", ++ "self_type" : "type-15834", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191261,8 +191303,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-1559", +- "self_type" : "type-1558", ++ "referenced_type" : "type-15972", ++ "self_type" : "type-15971", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191271,8 +191313,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-15609", +- "self_type" : "type-15608", ++ "referenced_type" : "type-16104", ++ "self_type" : "type-16103", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191281,8 +191323,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-15883", +- "self_type" : "type-15882", ++ "referenced_type" : "type-16254", ++ "self_type" : "type-16253", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191291,8 +191333,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16020", +- "self_type" : "type-16019", ++ "referenced_type" : "type-16338", ++ "self_type" : "type-16337", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191301,8 +191343,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16152", +- "self_type" : "type-16151", ++ "referenced_type" : "type-16440", ++ "self_type" : "type-16439", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191311,8 +191353,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16302", +- "self_type" : "type-16301", ++ "referenced_type" : "type-16566", ++ "self_type" : "type-16565", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191321,8 +191363,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16386", +- "self_type" : "type-16385", ++ "referenced_type" : "type-16618", ++ "self_type" : "type-16617", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191331,8 +191373,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16488", +- "self_type" : "type-16487", ++ "referenced_type" : "type-16701", ++ "self_type" : "type-16700", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191341,8 +191383,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16614", +- "self_type" : "type-16613", ++ "referenced_type" : "type-16750", ++ "self_type" : "type-16749", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191351,8 +191393,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16666", +- "self_type" : "type-16665", ++ "referenced_type" : "type-16754", ++ "self_type" : "type-16753", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191361,8 +191403,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16749", +- "self_type" : "type-16748", ++ "referenced_type" : "type-16832", ++ "self_type" : "type-16831", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191371,8 +191413,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16798", +- "self_type" : "type-16797", ++ "referenced_type" : "type-16900", ++ "self_type" : "type-16899", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191381,8 +191423,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16802", +- "self_type" : "type-16801", ++ "referenced_type" : "type-16937", ++ "self_type" : "type-16936", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191391,8 +191433,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16880", +- "self_type" : "type-16879", ++ "referenced_type" : "type-17154", ++ "self_type" : "type-17153", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191401,8 +191443,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16948", +- "self_type" : "type-16947", ++ "referenced_type" : "type-17236", ++ "self_type" : "type-17235", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191411,8 +191453,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-16985", +- "self_type" : "type-16984", ++ "referenced_type" : "type-17329", ++ "self_type" : "type-17328", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191421,8 +191463,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-17202", +- "self_type" : "type-17201", ++ "referenced_type" : "type-17486", ++ "self_type" : "type-17485", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191431,8 +191473,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-17284", +- "self_type" : "type-17283", ++ "referenced_type" : "type-17591", ++ "self_type" : "type-17590", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191441,8 +191483,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-17377", +- "self_type" : "type-17376", ++ "referenced_type" : "type-17686", ++ "self_type" : "type-17685", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191451,8 +191493,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-17534", +- "self_type" : "type-17533", ++ "referenced_type" : "type-17828", ++ "self_type" : "type-17827", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191461,8 +191503,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-17639", +- "self_type" : "type-17638", ++ "referenced_type" : "type-17918", ++ "self_type" : "type-17917", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191471,8 +191513,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-17734", +- "self_type" : "type-17733", ++ "referenced_type" : "type-18008", ++ "self_type" : "type-18007", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191481,8 +191523,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-17876", +- "self_type" : "type-17875", ++ "referenced_type" : "type-18101", ++ "self_type" : "type-18100", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191491,8 +191533,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-17966", +- "self_type" : "type-17965", ++ "referenced_type" : "type-18156", ++ "self_type" : "type-18155", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191501,8 +191543,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18056", +- "self_type" : "type-18055", ++ "referenced_type" : "type-18282", ++ "self_type" : "type-18281", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191511,8 +191553,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18149", +- "self_type" : "type-18148", ++ "referenced_type" : "type-18334", ++ "self_type" : "type-18333", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191521,8 +191563,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18204", +- "self_type" : "type-18203", ++ "referenced_type" : "type-18460", ++ "self_type" : "type-18459", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191531,8 +191573,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18330", +- "self_type" : "type-18329", ++ "referenced_type" : "type-1852", ++ "self_type" : "type-1851", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191541,8 +191583,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18382", +- "self_type" : "type-18381", ++ "referenced_type" : "type-18538", ++ "self_type" : "type-18537", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191551,8 +191593,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18508", +- "self_type" : "type-18507", ++ "referenced_type" : "type-18602", ++ "self_type" : "type-18601", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191561,8 +191603,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18586", +- "self_type" : "type-18585", ++ "referenced_type" : "type-18684", ++ "self_type" : "type-18683", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191571,8 +191613,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18650", +- "self_type" : "type-18649", ++ "referenced_type" : "type-18809", ++ "self_type" : "type-18808", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191581,8 +191623,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18732", +- "self_type" : "type-18731", ++ "referenced_type" : "type-18878", ++ "self_type" : "type-18877", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191591,8 +191633,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18857", +- "self_type" : "type-18856", ++ "referenced_type" : "type-18921", ++ "self_type" : "type-18920", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191601,8 +191643,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18926", +- "self_type" : "type-18925", ++ "referenced_type" : "type-19156", ++ "self_type" : "type-19155", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191611,8 +191653,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-18969", +- "self_type" : "type-18968", ++ "referenced_type" : "type-19352", ++ "self_type" : "type-19351", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191621,8 +191663,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-19204", +- "self_type" : "type-19203", ++ "referenced_type" : "type-19366", ++ "self_type" : "type-19365", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191631,8 +191673,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-1930", +- "self_type" : "type-1929", ++ "referenced_type" : "type-19547", ++ "self_type" : "type-19546", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191641,8 +191683,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-19400", +- "self_type" : "type-19399", ++ "referenced_type" : "type-19717", ++ "self_type" : "type-19716", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191651,8 +191693,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-19414", +- "self_type" : "type-19413", ++ "referenced_type" : "type-19826", ++ "self_type" : "type-19825", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191661,8 +191703,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-19595", +- "self_type" : "type-19594", ++ "referenced_type" : "type-20094", ++ "self_type" : "type-20093", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191671,8 +191713,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-19765", +- "self_type" : "type-19764", ++ "referenced_type" : "type-20369", ++ "self_type" : "type-20368", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191681,8 +191723,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-19874", +- "self_type" : "type-19873", ++ "referenced_type" : "type-20504", ++ "self_type" : "type-20503", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191691,8 +191733,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-20142", +- "self_type" : "type-20141", ++ "referenced_type" : "type-20635", ++ "self_type" : "type-20634", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191701,8 +191743,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-20417", +- "self_type" : "type-20416", ++ "referenced_type" : "type-20785", ++ "self_type" : "type-20784", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191711,8 +191753,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-20552", +- "self_type" : "type-20551", ++ "referenced_type" : "type-20869", ++ "self_type" : "type-20868", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191721,8 +191763,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-20683", +- "self_type" : "type-20682", ++ "referenced_type" : "type-20971", ++ "self_type" : "type-20970", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191731,8 +191773,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-20833", +- "self_type" : "type-20832", ++ "referenced_type" : "type-21098", ++ "self_type" : "type-21097", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191741,8 +191783,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-20917", +- "self_type" : "type-20916", ++ "referenced_type" : "type-21150", ++ "self_type" : "type-21149", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191751,8 +191793,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21019", +- "self_type" : "type-21018", ++ "referenced_type" : "type-21233", ++ "self_type" : "type-21232", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191761,8 +191803,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21146", +- "self_type" : "type-21145", ++ "referenced_type" : "type-21282", ++ "self_type" : "type-21281", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191771,8 +191813,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21198", +- "self_type" : "type-21197", ++ "referenced_type" : "type-21286", ++ "self_type" : "type-21285", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191781,8 +191823,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21281", +- "self_type" : "type-21280", ++ "referenced_type" : "type-21364", ++ "self_type" : "type-21363", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191791,8 +191833,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21330", +- "self_type" : "type-21329", ++ "referenced_type" : "type-21432", ++ "self_type" : "type-21431", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191801,8 +191843,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21334", +- "self_type" : "type-21333", ++ "referenced_type" : "type-21469", ++ "self_type" : "type-21468", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191811,8 +191853,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21412", +- "self_type" : "type-21411", ++ "referenced_type" : "type-21686", ++ "self_type" : "type-21685", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191821,8 +191863,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21480", +- "self_type" : "type-21479", ++ "referenced_type" : "type-21768", ++ "self_type" : "type-21767", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191831,8 +191873,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21517", +- "self_type" : "type-21516", ++ "referenced_type" : "type-21861", ++ "self_type" : "type-21860", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191841,8 +191883,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21734", +- "self_type" : "type-21733", ++ "referenced_type" : "type-21908", ++ "self_type" : "type-21907", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191851,8 +191893,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21816", +- "self_type" : "type-21815", ++ "referenced_type" : "type-21912", ++ "self_type" : "type-21911", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191861,8 +191903,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-21909", +- "self_type" : "type-21908", ++ "referenced_type" : "type-22059", ++ "self_type" : "type-22058", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191871,8 +191913,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-22063", +- "self_type" : "type-22062", ++ "referenced_type" : "type-22176", ++ "self_type" : "type-22175", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191881,8 +191923,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-22168", +- "self_type" : "type-22167", ++ "referenced_type" : "type-22237", ++ "self_type" : "type-22236", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191891,8 +191933,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-22263", +- "self_type" : "type-22262", ++ "referenced_type" : "type-22364", ++ "self_type" : "type-22363", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191901,8 +191943,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-22405", +- "self_type" : "type-22404", ++ "referenced_type" : "type-22421", ++ "self_type" : "type-22420", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191911,8 +191953,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-22495", +- "self_type" : "type-22494", ++ "referenced_type" : "type-22499", ++ "self_type" : "type-22498", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191921,8 +191963,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-22585", +- "self_type" : "type-22584", ++ "referenced_type" : "type-22596", ++ "self_type" : "type-22595", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191931,8 +191973,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-22678", +- "self_type" : "type-22677", ++ "referenced_type" : "type-22660", ++ "self_type" : "type-22659", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191941,8 +191983,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-22733", +- "self_type" : "type-22732", ++ "referenced_type" : "type-22665", ++ "self_type" : "type-22664", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191951,8 +191993,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-22859", +- "self_type" : "type-22858", ++ "referenced_type" : "type-22875", ++ "self_type" : "type-22874", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191961,8 +192003,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-22911", +- "self_type" : "type-22910", ++ "referenced_type" : "type-23015", ++ "self_type" : "type-23014", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191971,8 +192013,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-23037", +- "self_type" : "type-23036", ++ "referenced_type" : "type-23162", ++ "self_type" : "type-23161", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191981,8 +192023,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-23115", +- "self_type" : "type-23114", ++ "referenced_type" : "type-2318", ++ "self_type" : "type-2317", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -191991,8 +192033,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-23179", +- "self_type" : "type-23178", ++ "referenced_type" : "type-23252", ++ "self_type" : "type-23251", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192001,8 +192043,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-23261", +- "self_type" : "type-23260", ++ "referenced_type" : "type-23372", ++ "self_type" : "type-23371", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192011,8 +192053,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-23386", +- "self_type" : "type-23385", ++ "referenced_type" : "type-23474", ++ "self_type" : "type-23473", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192021,8 +192063,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-23455", +- "self_type" : "type-23454", ++ "referenced_type" : "type-23681", ++ "self_type" : "type-23680", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192031,8 +192073,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-23498", +- "self_type" : "type-23497", ++ "referenced_type" : "type-23715", ++ "self_type" : "type-23714", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192041,8 +192083,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-23725", +- "self_type" : "type-23724", ++ "referenced_type" : "type-23903", ++ "self_type" : "type-23902", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192051,8 +192093,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-2389", +- "self_type" : "type-2388", ++ "referenced_type" : "type-23932", ++ "self_type" : "type-23931", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192061,8 +192103,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-23900", +- "self_type" : "type-23899", ++ "referenced_type" : "type-24062", ++ "self_type" : "type-24061", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192071,8 +192113,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-23914", +- "self_type" : "type-23913", ++ "referenced_type" : "type-24236", ++ "self_type" : "type-24235", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192081,8 +192123,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-24065", +- "self_type" : "type-24064", ++ "referenced_type" : "type-24279", ++ "self_type" : "type-24278", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192091,8 +192133,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-24232", +- "self_type" : "type-24231", ++ "referenced_type" : "type-24327", ++ "self_type" : "type-24326", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192101,8 +192143,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-24341", +- "self_type" : "type-24340", ++ "referenced_type" : "type-24516", ++ "self_type" : "type-24515", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192111,8 +192153,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-24541", +- "self_type" : "type-24540", ++ "referenced_type" : "type-24636", ++ "self_type" : "type-24635", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192121,8 +192163,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-24672", +- "self_type" : "type-24671", ++ "referenced_type" : "type-24714", ++ "self_type" : "type-24713", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192131,8 +192173,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-24770", +- "self_type" : "type-24769", ++ "referenced_type" : "type-24727", ++ "self_type" : "type-24726", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192141,8 +192183,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-24974", +- "self_type" : "type-24973", ++ "referenced_type" : "type-2486", ++ "self_type" : "type-2485", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192151,8 +192193,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-25053", +- "self_type" : "type-25052", ++ "referenced_type" : "type-24942", ++ "self_type" : "type-24941", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192161,8 +192203,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-25185", +- "self_type" : "type-25184", ++ "referenced_type" : "type-25024", ++ "self_type" : "type-25023", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192171,8 +192213,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-25320", +- "self_type" : "type-25319", ++ "referenced_type" : "type-25175", ++ "self_type" : "type-25174", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192181,8 +192223,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-2554", +- "self_type" : "type-2553", ++ "referenced_type" : "type-25379", ++ "self_type" : "type-25378", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192191,8 +192233,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-25593", +- "self_type" : "type-25592", ++ "referenced_type" : "type-25645", ++ "self_type" : "type-25644", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192201,8 +192243,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-25731", +- "self_type" : "type-25730", ++ "referenced_type" : "type-25780", ++ "self_type" : "type-25779", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192211,8 +192253,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-25862", +- "self_type" : "type-25861", ++ "referenced_type" : "type-25913", ++ "self_type" : "type-25912", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192221,8 +192263,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-26011", +- "self_type" : "type-26010", ++ "referenced_type" : "type-2605", ++ "self_type" : "type-2604", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192231,8 +192273,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-26095", +- "self_type" : "type-26094", ++ "referenced_type" : "type-26064", ++ "self_type" : "type-26063", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192241,8 +192283,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-26197", +- "self_type" : "type-26196", ++ "referenced_type" : "type-26142", ++ "self_type" : "type-26141", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192251,8 +192293,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-26324", +- "self_type" : "type-26323", ++ "referenced_type" : "type-26241", ++ "self_type" : "type-26240", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192261,8 +192303,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-26376", +- "self_type" : "type-26375", ++ "referenced_type" : "type-26364", ++ "self_type" : "type-26363", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192271,8 +192313,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-26459", +- "self_type" : "type-26458", ++ "referenced_type" : "type-2640", ++ "self_type" : "type-2639", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192281,8 +192323,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-26508", +- "self_type" : "type-26507", ++ "referenced_type" : "type-26418", ++ "self_type" : "type-26417", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192291,8 +192333,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-26512", +- "self_type" : "type-26511", ++ "referenced_type" : "type-26497", ++ "self_type" : "type-26496", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192301,8 +192343,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-26590", +- "self_type" : "type-26589", ++ "referenced_type" : "type-26542", ++ "self_type" : "type-26541", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192311,8 +192353,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-26658", +- "self_type" : "type-26657", ++ "referenced_type" : "type-26618", ++ "self_type" : "type-26617", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192321,8 +192363,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-26695", +- "self_type" : "type-26694", ++ "referenced_type" : "type-26679", ++ "self_type" : "type-26678", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192331,8 +192373,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-26912", +- "self_type" : "type-26911", ++ "referenced_type" : "type-26932", ++ "self_type" : "type-26931", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192341,8 +192383,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-26994", +- "self_type" : "type-26993", ++ "referenced_type" : "type-2697", ++ "self_type" : "type-2696", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192351,8 +192393,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-27087", +- "self_type" : "type-27086", ++ "referenced_type" : "type-27020", ++ "self_type" : "type-27019", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192361,8 +192403,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-27248", +- "self_type" : "type-27247", ++ "referenced_type" : "type-27247", ++ "self_type" : "type-27246", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192371,8 +192413,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-27353", +- "self_type" : "type-27352", ++ "referenced_type" : "type-27352", ++ "self_type" : "type-27351", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192381,8 +192423,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-27448", +- "self_type" : "type-27447", ++ "referenced_type" : "type-27447", ++ "self_type" : "type-27446", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192391,8 +192433,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-2745", +- "self_type" : "type-2744", ++ "referenced_type" : "type-27589", ++ "self_type" : "type-27588", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192401,8 +192443,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-27590", +- "self_type" : "type-27589", ++ "referenced_type" : "type-27679", ++ "self_type" : "type-27678", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192411,8 +192453,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-27680", +- "self_type" : "type-27679", ++ "referenced_type" : "type-27769", ++ "self_type" : "type-27768", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192421,8 +192463,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-27770", +- "self_type" : "type-27769", ++ "referenced_type" : "type-27862", ++ "self_type" : "type-27861", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192431,8 +192473,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-27863", +- "self_type" : "type-27862", ++ "referenced_type" : "type-27917", ++ "self_type" : "type-27916", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192441,8 +192483,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-27918", +- "self_type" : "type-27917", ++ "referenced_type" : "type-28043", ++ "self_type" : "type-28042", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192451,8 +192493,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-28044", +- "self_type" : "type-28043", ++ "referenced_type" : "type-28095", ++ "self_type" : "type-28094", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192461,8 +192503,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-28096", +- "self_type" : "type-28095", ++ "referenced_type" : "type-28221", ++ "self_type" : "type-28220", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192471,8 +192513,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-28222", +- "self_type" : "type-28221", ++ "referenced_type" : "type-28299", ++ "self_type" : "type-28298", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192481,8 +192523,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-28300", +- "self_type" : "type-28299", ++ "referenced_type" : "type-28363", ++ "self_type" : "type-28362", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192491,8 +192533,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-28364", +- "self_type" : "type-28363", ++ "referenced_type" : "type-28445", ++ "self_type" : "type-28444", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192501,8 +192543,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-28446", +- "self_type" : "type-28445", ++ "referenced_type" : "type-2849", ++ "self_type" : "type-2848", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192511,8 +192553,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-28571", +- "self_type" : "type-28570", ++ "referenced_type" : "type-28570", ++ "self_type" : "type-28569", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192521,8 +192563,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-28640", +- "self_type" : "type-28639", ++ "referenced_type" : "type-28639", ++ "self_type" : "type-28638", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192531,8 +192573,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-28683", +- "self_type" : "type-28682", ++ "referenced_type" : "type-28682", ++ "self_type" : "type-28681", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192541,8 +192583,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-28910", +- "self_type" : "type-28909", ++ "referenced_type" : "type-2883", ++ "self_type" : "type-2882", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192551,8 +192593,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-2897", +- "self_type" : "type-2896", ++ "referenced_type" : "type-28909", ++ "self_type" : "type-28908", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192561,8 +192603,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-29085", +- "self_type" : "type-29084", ++ "referenced_type" : "type-29084", ++ "self_type" : "type-29083", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192571,8 +192613,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-29099", +- "self_type" : "type-29098", ++ "referenced_type" : "type-29098", ++ "self_type" : "type-29097", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192581,8 +192623,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-29250", +- "self_type" : "type-29249", ++ "referenced_type" : "type-2916", ++ "self_type" : "type-2915", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192591,8 +192633,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-2931", +- "self_type" : "type-2930", ++ "referenced_type" : "type-29249", ++ "self_type" : "type-29248", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192601,8 +192643,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-29417", +- "self_type" : "type-29416", ++ "referenced_type" : "type-29416", ++ "self_type" : "type-29415", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192611,8 +192653,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-29526", +- "self_type" : "type-29525", ++ "referenced_type" : "type-2944", ++ "self_type" : "type-2943", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192621,8 +192663,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-2964", +- "self_type" : "type-2963", ++ "referenced_type" : "type-29525", ++ "self_type" : "type-29524", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192641,8 +192683,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-29726", +- "self_type" : "type-29725", ++ "referenced_type" : "type-29725", ++ "self_type" : "type-29724", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192651,8 +192693,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-29853", +- "self_type" : "type-29852", ++ "referenced_type" : "type-29852", ++ "self_type" : "type-29851", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192661,8 +192703,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-2992", +- "self_type" : "type-2991", ++ "referenced_type" : "type-29948", ++ "self_type" : "type-29947", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192671,8 +192713,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-29949", +- "self_type" : "type-29948", ++ "referenced_type" : "type-30129", ++ "self_type" : "type-30128", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192681,8 +192723,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-30130", +- "self_type" : "type-30129", ++ "referenced_type" : "type-30197", ++ "self_type" : "type-30196", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192691,8 +192733,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-30198", +- "self_type" : "type-30197", ++ "referenced_type" : "type-30328", ++ "self_type" : "type-30327", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192701,8 +192743,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-30329", +- "self_type" : "type-30328", ++ "referenced_type" : "type-30463", ++ "self_type" : "type-30462", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192711,8 +192753,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-30464", +- "self_type" : "type-30463", ++ "referenced_type" : "type-30738", ++ "self_type" : "type-30737", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192721,8 +192763,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-30739", +- "self_type" : "type-30738", ++ "referenced_type" : "type-30876", ++ "self_type" : "type-30875", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192731,8 +192773,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-30877", +- "self_type" : "type-30876", ++ "referenced_type" : "type-31007", ++ "self_type" : "type-31006", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192741,8 +192783,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-31008", +- "self_type" : "type-31007", ++ "referenced_type" : "type-31157", ++ "self_type" : "type-31156", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192751,8 +192793,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-31158", +- "self_type" : "type-31157", ++ "referenced_type" : "type-3120", ++ "self_type" : "type-3119", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192761,8 +192803,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-31242", +- "self_type" : "type-31241", ++ "referenced_type" : "type-31241", ++ "self_type" : "type-31240", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192771,8 +192813,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-31344", +- "self_type" : "type-31343", ++ "referenced_type" : "type-31343", ++ "self_type" : "type-31342", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192781,8 +192823,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-31471", +- "self_type" : "type-31470", ++ "referenced_type" : "type-31470", ++ "self_type" : "type-31469", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192791,8 +192833,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-31523", +- "self_type" : "type-31522", ++ "referenced_type" : "type-31522", ++ "self_type" : "type-31521", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192801,8 +192843,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-31606", +- "self_type" : "type-31605", ++ "referenced_type" : "type-31605", ++ "self_type" : "type-31604", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192811,8 +192853,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-31655", +- "self_type" : "type-31654", ++ "referenced_type" : "type-31654", ++ "self_type" : "type-31653", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192821,8 +192863,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-31659", +- "self_type" : "type-31658", ++ "referenced_type" : "type-31658", ++ "self_type" : "type-31657", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192831,8 +192873,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-3168", +- "self_type" : "type-3167", ++ "referenced_type" : "type-31736", ++ "self_type" : "type-31735", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192841,8 +192883,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-31737", +- "self_type" : "type-31736", ++ "referenced_type" : "type-31804", ++ "self_type" : "type-31803", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192851,8 +192893,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-31805", +- "self_type" : "type-31804", ++ "referenced_type" : "type-31841", ++ "self_type" : "type-31840", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192861,8 +192903,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-31842", +- "self_type" : "type-31841", ++ "referenced_type" : "type-32058", ++ "self_type" : "type-32057", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192871,8 +192913,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-32059", +- "self_type" : "type-32058", ++ "referenced_type" : "type-32140", ++ "self_type" : "type-32139", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192881,8 +192923,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-32141", +- "self_type" : "type-32140", ++ "referenced_type" : "type-32233", ++ "self_type" : "type-32232", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192891,8 +192933,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-32234", +- "self_type" : "type-32233", ++ "referenced_type" : "type-3402", ++ "self_type" : "type-3401", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192901,8 +192943,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-3450", +- "self_type" : "type-3449", ++ "referenced_type" : "type-3546", ++ "self_type" : "type-3545", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192911,8 +192953,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-3594", +- "self_type" : "type-3593", ++ "referenced_type" : "type-3727", ++ "self_type" : "type-3726", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192921,8 +192963,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-3775", +- "self_type" : "type-3774", ++ "referenced_type" : "type-3900", ++ "self_type" : "type-3899", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192931,8 +192973,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-3948", +- "self_type" : "type-3947", ++ "referenced_type" : "type-4033", ++ "self_type" : "type-4032", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192941,8 +192983,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-4081", +- "self_type" : "type-4080", ++ "referenced_type" : "type-4138", ++ "self_type" : "type-4137", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192951,8 +192993,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-4186", +- "self_type" : "type-4185", ++ "referenced_type" : "type-4295", ++ "self_type" : "type-4294", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192961,8 +193003,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-4343", +- "self_type" : "type-4342", ++ "referenced_type" : "type-4349", ++ "self_type" : "type-4348", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192971,8 +193013,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-4397", +- "self_type" : "type-4396", ++ "referenced_type" : "type-4433", ++ "self_type" : "type-4432", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192981,8 +193023,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-4481", +- "self_type" : "type-4480", ++ "referenced_type" : "type-4472", ++ "self_type" : "type-4471", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -192991,8 +193033,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-4520", +- "self_type" : "type-4519", ++ "referenced_type" : "type-4508", ++ "self_type" : "type-4507", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193001,8 +193043,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-4556", +- "self_type" : "type-4555", ++ "referenced_type" : "type-4677", ++ "self_type" : "type-4676", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193011,8 +193053,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-4725", +- "self_type" : "type-4724", ++ "referenced_type" : "type-4829", ++ "self_type" : "type-4828", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193031,8 +193073,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-4877", +- "self_type" : "type-4876", ++ "referenced_type" : "type-4863", ++ "self_type" : "type-4862", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193041,8 +193083,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-4911", +- "self_type" : "type-4910", ++ "referenced_type" : "type-4896", ++ "self_type" : "type-4895", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193051,8 +193093,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-4944", +- "self_type" : "type-4943", ++ "referenced_type" : "type-4924", ++ "self_type" : "type-4923", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193061,8 +193103,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-4972", +- "self_type" : "type-4971", ++ "referenced_type" : "type-5100", ++ "self_type" : "type-5099", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193071,8 +193113,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-5148", +- "self_type" : "type-5147", ++ "referenced_type" : "type-5382", ++ "self_type" : "type-5381", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193081,8 +193123,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-5430", +- "self_type" : "type-5429", ++ "referenced_type" : "type-5524", ++ "self_type" : "type-5523", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193091,8 +193133,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-5572", +- "self_type" : "type-5571", ++ "referenced_type" : "type-5658", ++ "self_type" : "type-5657", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193101,8 +193143,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-5706", +- "self_type" : "type-5705", ++ "referenced_type" : "type-5808", ++ "self_type" : "type-5807", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193111,8 +193153,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-5856", +- "self_type" : "type-5855", ++ "referenced_type" : "type-5892", ++ "self_type" : "type-5891", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193121,8 +193163,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-5940", +- "self_type" : "type-5939", ++ "referenced_type" : "type-5994", ++ "self_type" : "type-5993", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193131,8 +193173,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-6042", +- "self_type" : "type-6041", ++ "referenced_type" : "type-6121", ++ "self_type" : "type-6120", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193141,8 +193183,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-6169", +- "self_type" : "type-6168", ++ "referenced_type" : "type-6173", ++ "self_type" : "type-6172", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193151,8 +193193,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-6221", +- "self_type" : "type-6220", ++ "referenced_type" : "type-6256", ++ "self_type" : "type-6255", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193161,8 +193203,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-6304", +- "self_type" : "type-6303", ++ "referenced_type" : "type-6308", ++ "self_type" : "type-6307", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193171,8 +193213,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-6356", +- "self_type" : "type-6355", ++ "referenced_type" : "type-6312", ++ "self_type" : "type-6311", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193181,8 +193223,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-6360", +- "self_type" : "type-6359", ++ "referenced_type" : "type-6392", ++ "self_type" : "type-6391", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193191,8 +193233,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-6440", +- "self_type" : "type-6439", ++ "referenced_type" : "type-6508", ++ "self_type" : "type-6507", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193201,8 +193243,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-6556", +- "self_type" : "type-6555", ++ "referenced_type" : "type-6572", ++ "self_type" : "type-6571", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193211,8 +193253,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-6620", +- "self_type" : "type-6619", ++ "referenced_type" : "type-6875", ++ "self_type" : "type-6874", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193221,8 +193263,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-6923", +- "self_type" : "type-6922", ++ "referenced_type" : "type-6974", ++ "self_type" : "type-6973", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193231,8 +193273,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-7022", +- "self_type" : "type-7021", ++ "referenced_type" : "type-7073", ++ "self_type" : "type-7072", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193241,8 +193283,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-7121", +- "self_type" : "type-7120", ++ "referenced_type" : "type-7350", ++ "self_type" : "type-7349", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193251,8 +193293,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-7398", +- "self_type" : "type-7397", ++ "referenced_type" : "type-748", ++ "self_type" : "type-747", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193261,8 +193303,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-748", +- "self_type" : "type-747", ++ "referenced_type" : "type-7506", ++ "self_type" : "type-7505", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193271,8 +193313,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-7554", +- "self_type" : "type-7553", ++ "referenced_type" : "type-7613", ++ "self_type" : "type-7612", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193281,8 +193323,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-7661", +- "self_type" : "type-7660", ++ "referenced_type" : "type-7760", ++ "self_type" : "type-7759", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193291,8 +193333,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-7808", +- "self_type" : "type-7807", ++ "referenced_type" : "type-7865", ++ "self_type" : "type-7864", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193301,8 +193343,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-7913", +- "self_type" : "type-7912", ++ "referenced_type" : "type-7954", ++ "self_type" : "type-7953", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193321,8 +193363,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-8002", +- "self_type" : "type-8001", ++ "referenced_type" : "type-8047", ++ "self_type" : "type-8046", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193331,8 +193373,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-8095", +- "self_type" : "type-8094", ++ "referenced_type" : "type-8105", ++ "self_type" : "type-8104", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193341,8 +193383,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-8153", +- "self_type" : "type-8152", ++ "referenced_type" : "type-8139", ++ "self_type" : "type-8138", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193351,8 +193393,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-8187", +- "self_type" : "type-8186", ++ "referenced_type" : "type-8172", ++ "self_type" : "type-8171", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193361,8 +193403,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-8220", +- "self_type" : "type-8219", ++ "referenced_type" : "type-8200", ++ "self_type" : "type-8199", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193371,8 +193413,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-8248", +- "self_type" : "type-8247", ++ "referenced_type" : "type-828", ++ "self_type" : "type-827", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193381,8 +193423,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-828", +- "self_type" : "type-827", ++ "referenced_type" : "type-8375", ++ "self_type" : "type-8374", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193391,8 +193433,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-8423", +- "self_type" : "type-8422", ++ "referenced_type" : "type-860", ++ "self_type" : "type-859", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193401,8 +193443,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-860", +- "self_type" : "type-859", ++ "referenced_type" : "type-8647", ++ "self_type" : "type-8646", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193411,8 +193453,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-8695", +- "self_type" : "type-8694", ++ "referenced_type" : "type-8783", ++ "self_type" : "type-8782", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193421,8 +193463,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-8831", +- "self_type" : "type-8830", ++ "referenced_type" : "type-8915", ++ "self_type" : "type-8914", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193431,8 +193473,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-8963", +- "self_type" : "type-8962", ++ "referenced_type" : "type-9065", ++ "self_type" : "type-9064", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193441,8 +193483,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-9113", +- "self_type" : "type-9112", ++ "referenced_type" : "type-9149", ++ "self_type" : "type-9148", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193451,8 +193493,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-9197", +- "self_type" : "type-9196", ++ "referenced_type" : "type-9251", ++ "self_type" : "type-9250", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193461,8 +193503,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-9299", +- "self_type" : "type-9298", ++ "referenced_type" : "type-9378", ++ "self_type" : "type-9377", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193471,8 +193513,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-9426", +- "self_type" : "type-9425", ++ "referenced_type" : "type-9430", ++ "self_type" : "type-9429", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193481,8 +193523,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-9478", +- "self_type" : "type-9477", ++ "referenced_type" : "type-9513", ++ "self_type" : "type-9512", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193491,8 +193533,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-9561", +- "self_type" : "type-9560", ++ "referenced_type" : "type-9562", ++ "self_type" : "type-9561", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193501,8 +193543,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-9610", +- "self_type" : "type-9609", ++ "referenced_type" : "type-9566", ++ "self_type" : "type-9565", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193511,8 +193553,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-9614", +- "self_type" : "type-9613", ++ "referenced_type" : "type-9644", ++ "self_type" : "type-9643", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193521,8 +193563,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-9692", +- "self_type" : "type-9691", ++ "referenced_type" : "type-9712", ++ "self_type" : "type-9711", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193531,8 +193573,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-9760", +- "self_type" : "type-9759", ++ "referenced_type" : "type-9749", ++ "self_type" : "type-9748", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193541,8 +193583,8 @@ + "is_const" : true, + "linker_set_key" : "const std::type_info", + "name" : "const std::type_info", +- "referenced_type" : "type-9797", +- "self_type" : "type-9796", ++ "referenced_type" : "type-9965", ++ "self_type" : "type-9964", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h" + }, +@@ -193551,8 +193593,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-24647", +- "self_type" : "type-24646", ++ "referenced_type" : "type-24613", ++ "self_type" : "type-24612", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/type_info_test_helper.h" + }, +@@ -193561,8 +193603,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-29828", +- "self_type" : "type-29827", ++ "referenced_type" : "type-29827", ++ "self_type" : "type-29826", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/util/internal/type_info_test_helper.h" + }, +@@ -193571,8 +193613,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-13066", +- "self_type" : "type-13065", ++ "referenced_type" : "type-13018", ++ "self_type" : "type-13017", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -193581,8 +193623,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-16922", +- "self_type" : "type-16921", ++ "referenced_type" : "type-16874", ++ "self_type" : "type-16873", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -193591,8 +193633,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-21454", +- "self_type" : "type-21453", ++ "referenced_type" : "type-21406", ++ "self_type" : "type-21405", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -193601,8 +193643,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-25006", +- "self_type" : "type-25005", ++ "referenced_type" : "type-24975", ++ "self_type" : "type-24974", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h" + }, +@@ -193611,8 +193653,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-26632", +- "self_type" : "type-26631", ++ "referenced_type" : "type-26654", ++ "self_type" : "type-26653", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -193621,8 +193663,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-30158", +- "self_type" : "type-30157", ++ "referenced_type" : "type-30157", ++ "self_type" : "type-30156", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h" + }, +@@ -193631,8 +193673,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-31779", +- "self_type" : "type-31778", ++ "referenced_type" : "type-31778", ++ "self_type" : "type-31777", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -193641,8 +193683,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-6483", +- "self_type" : "type-6482", ++ "referenced_type" : "type-6435", ++ "self_type" : "type-6434", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -193651,8 +193693,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-9734", +- "self_type" : "type-9733", ++ "referenced_type" : "type-9686", ++ "self_type" : "type-9685", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/generated_message_reflection.h" + }, +@@ -193661,8 +193703,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-12442", +- "self_type" : "type-12441", ++ "referenced_type" : "type-12394", ++ "self_type" : "type-12393", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -193671,8 +193713,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-16299", +- "self_type" : "type-16298", ++ "referenced_type" : "type-16251", ++ "self_type" : "type-16250", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -193681,8 +193723,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-20830", +- "self_type" : "type-20829", ++ "referenced_type" : "type-20782", ++ "self_type" : "type-20781", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -193691,8 +193733,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-26008", +- "self_type" : "type-26007", ++ "referenced_type" : "type-26061", ++ "self_type" : "type-26060", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -193701,8 +193743,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-31155", +- "self_type" : "type-31154", ++ "referenced_type" : "type-31154", ++ "self_type" : "type-31153", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -193711,8 +193753,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-3945", +- "self_type" : "type-3944", ++ "referenced_type" : "type-3897", ++ "self_type" : "type-3896", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -193721,8 +193763,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-5853", +- "self_type" : "type-5852", ++ "referenced_type" : "type-5805", ++ "self_type" : "type-5804", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -193731,8 +193773,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-9110", +- "self_type" : "type-9109", ++ "referenced_type" : "type-9062", ++ "self_type" : "type-9061", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h" + }, +@@ -193741,8 +193783,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-10702", +- "self_type" : "type-10701", ++ "referenced_type" : "type-10654", ++ "self_type" : "type-10653", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -193751,8 +193793,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-13993", +- "self_type" : "type-13992", ++ "referenced_type" : "type-13945", ++ "self_type" : "type-13944", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -193761,8 +193803,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-17857", +- "self_type" : "type-17856", ++ "referenced_type" : "type-17809", ++ "self_type" : "type-17808", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -193771,8 +193813,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-22386", +- "self_type" : "type-22385", ++ "referenced_type" : "type-22348", ++ "self_type" : "type-22347", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -193781,8 +193823,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-27571", +- "self_type" : "type-27570", ++ "referenced_type" : "type-27570", ++ "self_type" : "type-27569", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -193791,8 +193833,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-7788", +- "self_type" : "type-7787", ++ "referenced_type" : "type-7740", ++ "self_type" : "type-7739", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -193801,8 +193843,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-10696", +- "self_type" : "type-10695", ++ "referenced_type" : "type-10648", ++ "self_type" : "type-10647", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -193811,8 +193853,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-13987", +- "self_type" : "type-13986", ++ "referenced_type" : "type-13939", ++ "self_type" : "type-13938", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -193821,8 +193863,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-17851", +- "self_type" : "type-17850", ++ "referenced_type" : "type-17803", ++ "self_type" : "type-17802", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -193831,8 +193873,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-22380", +- "self_type" : "type-22379", ++ "referenced_type" : "type-22342", ++ "self_type" : "type-22341", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -193841,8 +193883,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-27565", +- "self_type" : "type-27564", ++ "referenced_type" : "type-27564", ++ "self_type" : "type-27563", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -193851,8 +193893,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-7782", +- "self_type" : "type-7781", ++ "referenced_type" : "type-7734", ++ "self_type" : "type-7733", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -193861,8 +193903,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-24905", +- "self_type" : "type-24904", ++ "referenced_type" : "type-24872", ++ "self_type" : "type-24871", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -193871,8 +193913,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-30077", +- "self_type" : "type-30076", ++ "referenced_type" : "type-30076", ++ "self_type" : "type-30075", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/type_traits.h" + }, +@@ -193881,8 +193923,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-11217", +- "self_type" : "type-11216", ++ "referenced_type" : "type-11169", ++ "self_type" : "type-11168", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -193891,8 +193933,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-12281", +- "self_type" : "type-12280", ++ "referenced_type" : "type-12233", ++ "self_type" : "type-12232", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -193901,8 +193943,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-14469", +- "self_type" : "type-14468", ++ "referenced_type" : "type-14421", ++ "self_type" : "type-14420", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -193911,8 +193953,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-16136", +- "self_type" : "type-16135", ++ "referenced_type" : "type-16088", ++ "self_type" : "type-16087", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -193921,8 +193963,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-18333", +- "self_type" : "type-18332", ++ "referenced_type" : "type-18285", ++ "self_type" : "type-18284", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -193931,8 +193973,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-20667", +- "self_type" : "type-20666", ++ "referenced_type" : "type-20619", ++ "self_type" : "type-20618", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -193941,8 +193983,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-22862", +- "self_type" : "type-22861", ++ "referenced_type" : "type-22816", ++ "self_type" : "type-22815", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -193951,8 +193993,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-25846", +- "self_type" : "type-25845", ++ "referenced_type" : "type-25899", ++ "self_type" : "type-25898", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -193961,8 +194003,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-28047", +- "self_type" : "type-28046", ++ "referenced_type" : "type-28046", ++ "self_type" : "type-28045", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -193971,8 +194013,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-30992", +- "self_type" : "type-30991", ++ "referenced_type" : "type-30991", ++ "self_type" : "type-30990", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -193981,8 +194023,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-3741", +- "self_type" : "type-3740", ++ "referenced_type" : "type-3693", ++ "self_type" : "type-3692", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -193991,8 +194033,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-5690", +- "self_type" : "type-5689", ++ "referenced_type" : "type-5642", ++ "self_type" : "type-5641", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -194001,8 +194043,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >", + "name" : "const std::vector >", +- "referenced_type" : "type-8947", +- "self_type" : "type-8946", ++ "referenced_type" : "type-8899", ++ "self_type" : "type-8898", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -194011,8 +194053,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-10168", +- "self_type" : "type-10167", ++ "referenced_type" : "type-10120", ++ "self_type" : "type-10119", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194021,8 +194063,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-10539", +- "self_type" : "type-10538", ++ "referenced_type" : "type-10491", ++ "self_type" : "type-10490", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194031,8 +194073,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-10686", +- "self_type" : "type-10685", ++ "referenced_type" : "type-10638", ++ "self_type" : "type-10637", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194041,8 +194083,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-11228", +- "self_type" : "type-11227", ++ "referenced_type" : "type-11180", ++ "self_type" : "type-11179", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194051,8 +194093,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-11386", +- "self_type" : "type-11385", ++ "referenced_type" : "type-11338", ++ "self_type" : "type-11337", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194061,8 +194103,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-11510", +- "self_type" : "type-11509", ++ "referenced_type" : "type-11462", ++ "self_type" : "type-11461", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194071,8 +194113,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-11672", +- "self_type" : "type-11671", ++ "referenced_type" : "type-11624", ++ "self_type" : "type-11623", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194081,8 +194123,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-12201", +- "self_type" : "type-12200", ++ "referenced_type" : "type-12153", ++ "self_type" : "type-12152", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194091,8 +194133,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-12487", +- "self_type" : "type-12486", ++ "referenced_type" : "type-12439", ++ "self_type" : "type-12438", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194101,8 +194143,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-12533", +- "self_type" : "type-12532", ++ "referenced_type" : "type-12485", ++ "self_type" : "type-12484", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, +@@ -194111,8 +194153,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-12638", +- "self_type" : "type-12637", ++ "referenced_type" : "type-12590", ++ "self_type" : "type-12589", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194121,8 +194163,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-12826", +- "self_type" : "type-12825", ++ "referenced_type" : "type-12778", ++ "self_type" : "type-12777", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194131,8 +194173,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-13305", +- "self_type" : "type-13304", ++ "referenced_type" : "type-13257", ++ "self_type" : "type-13256", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194141,8 +194183,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-13501", +- "self_type" : "type-13500", ++ "referenced_type" : "type-13453", ++ "self_type" : "type-13452", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194151,8 +194193,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-13830", +- "self_type" : "type-13829", ++ "referenced_type" : "type-13782", ++ "self_type" : "type-13781", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194161,8 +194203,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-13977", +- "self_type" : "type-13976", ++ "referenced_type" : "type-13929", ++ "self_type" : "type-13928", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194171,8 +194213,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-14480", +- "self_type" : "type-14479", ++ "referenced_type" : "type-14432", ++ "self_type" : "type-14431", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194181,8 +194223,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-14610", +- "self_type" : "type-14609", ++ "referenced_type" : "type-14562", ++ "self_type" : "type-14561", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194191,8 +194233,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-14730", +- "self_type" : "type-14729", ++ "referenced_type" : "type-14682", ++ "self_type" : "type-14681", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194201,8 +194243,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-14957", +- "self_type" : "type-14956", ++ "referenced_type" : "type-14909", ++ "self_type" : "type-14908", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194211,8 +194253,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-15172", +- "self_type" : "type-15171", ++ "referenced_type" : "type-15124", ++ "self_type" : "type-15123", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194221,8 +194263,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-15180", +- "self_type" : "type-15179", ++ "referenced_type" : "type-15132", ++ "self_type" : "type-15131", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -194231,8 +194273,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-15403", +- "self_type" : "type-15402", ++ "referenced_type" : "type-15355", ++ "self_type" : "type-15354", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194241,8 +194283,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-15531", +- "self_type" : "type-15530", ++ "referenced_type" : "type-15483", ++ "self_type" : "type-15482", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194251,8 +194293,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-1555", +- "self_type" : "type-1554", ++ "referenced_type" : "type-16008", ++ "self_type" : "type-16007", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194261,8 +194303,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-16056", +- "self_type" : "type-16055", ++ "referenced_type" : "type-16296", ++ "self_type" : "type-16295", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194271,8 +194313,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-16344", +- "self_type" : "type-16343", ++ "referenced_type" : "type-1632", ++ "self_type" : "type-1631", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194281,8 +194323,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-16390", +- "self_type" : "type-16389", ++ "referenced_type" : "type-16342", ++ "self_type" : "type-16341", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, +@@ -194291,8 +194333,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-16495", +- "self_type" : "type-16494", ++ "referenced_type" : "type-16447", ++ "self_type" : "type-16446", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194301,8 +194343,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-16682", +- "self_type" : "type-16681", ++ "referenced_type" : "type-16634", ++ "self_type" : "type-16633", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194311,8 +194353,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-17161", +- "self_type" : "type-17160", ++ "referenced_type" : "type-17113", ++ "self_type" : "type-17112", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194321,8 +194363,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-17357", +- "self_type" : "type-17356", ++ "referenced_type" : "type-17309", ++ "self_type" : "type-17308", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194331,8 +194373,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-17694", +- "self_type" : "type-17693", ++ "referenced_type" : "type-17646", ++ "self_type" : "type-17645", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194341,8 +194383,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-17841", +- "self_type" : "type-17840", ++ "referenced_type" : "type-17793", ++ "self_type" : "type-17792", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194351,8 +194393,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-18344", +- "self_type" : "type-18343", ++ "referenced_type" : "type-18296", ++ "self_type" : "type-18295", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194361,8 +194403,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-18474", +- "self_type" : "type-18473", ++ "referenced_type" : "type-18426", ++ "self_type" : "type-18425", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194371,8 +194413,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-18594", +- "self_type" : "type-18593", ++ "referenced_type" : "type-18546", ++ "self_type" : "type-18545", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194381,8 +194423,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-18812", +- "self_type" : "type-18811", ++ "referenced_type" : "type-18764", ++ "self_type" : "type-18763", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194391,8 +194433,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-18956", +- "self_type" : "type-18955", ++ "referenced_type" : "type-18908", ++ "self_type" : "type-18907", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194401,8 +194443,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-18964", +- "self_type" : "type-18963", ++ "referenced_type" : "type-18916", ++ "self_type" : "type-18915", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -194411,8 +194453,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-19159", +- "self_type" : "type-19158", ++ "referenced_type" : "type-19111", ++ "self_type" : "type-19110", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194421,8 +194463,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-19329", +- "self_type" : "type-19328", ++ "referenced_type" : "type-19281", ++ "self_type" : "type-19280", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194431,8 +194473,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-19348", +- "self_type" : "type-19347", ++ "referenced_type" : "type-19300", ++ "self_type" : "type-19299", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194441,8 +194483,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-19362", +- "self_type" : "type-19361", ++ "referenced_type" : "type-19314", ++ "self_type" : "type-19313", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194451,8 +194493,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-19700", +- "self_type" : "type-19699", ++ "referenced_type" : "type-19652", ++ "self_type" : "type-19651", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194461,8 +194503,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-19857", +- "self_type" : "type-19856", ++ "referenced_type" : "type-19809", ++ "self_type" : "type-19808", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194471,28 +194513,28 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-199", +- "self_type" : "type-198", ++ "referenced_type" : "type-19964", ++ "self_type" : "type-19963", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-20012", +- "self_type" : "type-20011", ++ "referenced_type" : "type-199", ++ "self_type" : "type-198", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-20060", +- "self_type" : "type-20059", ++ "referenced_type" : "type-20012", ++ "self_type" : "type-20011", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194501,8 +194543,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-20588", +- "self_type" : "type-20587", ++ "referenced_type" : "type-20540", ++ "self_type" : "type-20539", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194511,8 +194553,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-20875", +- "self_type" : "type-20874", ++ "referenced_type" : "type-20827", ++ "self_type" : "type-20826", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194521,8 +194563,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-20921", +- "self_type" : "type-20920", ++ "referenced_type" : "type-20873", ++ "self_type" : "type-20872", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, +@@ -194531,8 +194573,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-21026", +- "self_type" : "type-21025", ++ "referenced_type" : "type-20978", ++ "self_type" : "type-20977", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194541,8 +194583,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-21214", +- "self_type" : "type-21213", ++ "referenced_type" : "type-21166", ++ "self_type" : "type-21165", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194561,18 +194603,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-21693", +- "self_type" : "type-21692", +- "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" +- }, +- { +- "alignment" : 4, +- "is_const" : true, +- "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-21889", +- "self_type" : "type-21888", ++ "referenced_type" : "type-21645", ++ "self_type" : "type-21644", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194581,8 +194613,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-22223", +- "self_type" : "type-22222", ++ "referenced_type" : "type-21841", ++ "self_type" : "type-21840", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194591,8 +194623,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-22370", +- "self_type" : "type-22369", ++ "referenced_type" : "type-21882", ++ "self_type" : "type-21881", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194601,8 +194633,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-22873", +- "self_type" : "type-22872", ++ "referenced_type" : "type-22210", ++ "self_type" : "type-22209", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194611,8 +194643,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-23003", +- "self_type" : "type-23002", ++ "referenced_type" : "type-22332", ++ "self_type" : "type-22331", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194621,8 +194653,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-23123", +- "self_type" : "type-23122", ++ "referenced_type" : "type-22830", ++ "self_type" : "type-22829", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194631,8 +194663,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-23341", +- "self_type" : "type-23340", ++ "referenced_type" : "type-22974", ++ "self_type" : "type-22973", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194641,8 +194673,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-23485", +- "self_type" : "type-23484", ++ "referenced_type" : "type-23108", ++ "self_type" : "type-23107", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194651,18 +194683,18 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-23493", +- "self_type" : "type-23492", ++ "referenced_type" : "type-23336", ++ "self_type" : "type-23335", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-23688", +- "self_type" : "type-23687", ++ "referenced_type" : "type-23463", ++ "self_type" : "type-23462", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194671,18 +194703,18 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-23850", +- "self_type" : "type-23849", ++ "referenced_type" : "type-23469", ++ "self_type" : "type-23468", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-23858", +- "self_type" : "type-23857", ++ "referenced_type" : "type-23673", ++ "self_type" : "type-23672", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194691,8 +194723,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-23872", +- "self_type" : "type-23871", ++ "referenced_type" : "type-23839", ++ "self_type" : "type-23838", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194701,8 +194733,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-24167", +- "self_type" : "type-24166", ++ "referenced_type" : "type-23850", ++ "self_type" : "type-23849", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194711,8 +194743,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-24324", +- "self_type" : "type-24323", ++ "referenced_type" : "type-23874", ++ "self_type" : "type-23873", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194721,8 +194753,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-24472", +- "self_type" : "type-24471", ++ "referenced_type" : "type-24169", ++ "self_type" : "type-24168", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194731,8 +194763,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-24620", +- "self_type" : "type-24619", ++ "referenced_type" : "type-24316", ++ "self_type" : "type-24315", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194741,8 +194773,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-24727", +- "self_type" : "type-24726", ++ "referenced_type" : "type-24451", ++ "self_type" : "type-24450", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194751,8 +194783,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-24746", +- "self_type" : "type-24745", ++ "referenced_type" : "type-24592", ++ "self_type" : "type-24591", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194761,8 +194793,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-24882", +- "self_type" : "type-24881", ++ "referenced_type" : "type-24634", ++ "self_type" : "type-24633", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194771,8 +194803,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-25039", +- "self_type" : "type-25038", ++ "referenced_type" : "type-24705", ++ "self_type" : "type-24704", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194781,8 +194813,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-25172", +- "self_type" : "type-25171", ++ "referenced_type" : "type-24846", ++ "self_type" : "type-24845", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194791,8 +194823,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-25264", +- "self_type" : "type-25263", ++ "referenced_type" : "type-25007", ++ "self_type" : "type-25006", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194801,8 +194833,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-25767", +- "self_type" : "type-25766", ++ "referenced_type" : "type-25152", ++ "self_type" : "type-25151", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194811,8 +194843,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-26053", +- "self_type" : "type-26052", ++ "referenced_type" : "type-25265", ++ "self_type" : "type-25264", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194821,28 +194853,28 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-2608", +- "self_type" : "type-2607", ++ "referenced_type" : "type-2545", ++ "self_type" : "type-2544", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-26099", +- "self_type" : "type-26098", ++ "referenced_type" : "type-2553", ++ "self_type" : "type-2552", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-26204", +- "self_type" : "type-26203", ++ "referenced_type" : "type-2579", ++ "self_type" : "type-2578", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194851,8 +194883,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-262", +- "self_type" : "type-261", ++ "referenced_type" : "type-25819", ++ "self_type" : "type-25818", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194861,8 +194893,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-26392", +- "self_type" : "type-26391", ++ "referenced_type" : "type-26102", ++ "self_type" : "type-26101", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194871,18 +194903,18 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-2667", +- "self_type" : "type-2666", ++ "referenced_type" : "type-26136", ++ "self_type" : "type-26135", + "size" : 12, +- "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, + { + "alignment" : 4, + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-2677", +- "self_type" : "type-2676", ++ "referenced_type" : "type-262", ++ "self_type" : "type-261", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194891,8 +194923,18 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-26871", +- "self_type" : "type-26870", ++ "referenced_type" : "type-26597", ++ "self_type" : "type-26596", ++ "size" : 12, ++ "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" ++ }, ++ { ++ "alignment" : 4, ++ "is_const" : true, ++ "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", ++ "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", ++ "referenced_type" : "type-26651", ++ "self_type" : "type-26650", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194901,8 +194943,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-2700", +- "self_type" : "type-2699", ++ "referenced_type" : "type-26892", ++ "self_type" : "type-26891", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194911,8 +194953,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-27067", +- "self_type" : "type-27066", ++ "referenced_type" : "type-26947", ++ "self_type" : "type-26946", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194921,8 +194963,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-27408", +- "self_type" : "type-27407", ++ "referenced_type" : "type-27407", ++ "self_type" : "type-27406", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194931,8 +194973,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-27555", +- "self_type" : "type-27554", ++ "referenced_type" : "type-27554", ++ "self_type" : "type-27553", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194941,8 +194983,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-28058", +- "self_type" : "type-28057", ++ "referenced_type" : "type-28057", ++ "self_type" : "type-28056", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194951,8 +194993,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-28188", +- "self_type" : "type-28187", ++ "referenced_type" : "type-28187", ++ "self_type" : "type-28186", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194961,8 +195003,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-28308", +- "self_type" : "type-28307", ++ "referenced_type" : "type-28307", ++ "self_type" : "type-28306", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194971,8 +195013,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-28526", +- "self_type" : "type-28525", ++ "referenced_type" : "type-28525", ++ "self_type" : "type-28524", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194981,8 +195023,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-28670", +- "self_type" : "type-28669", ++ "referenced_type" : "type-28669", ++ "self_type" : "type-28668", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -194991,8 +195033,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-28678", +- "self_type" : "type-28677", ++ "referenced_type" : "type-28677", ++ "self_type" : "type-28676", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/callback.h" + }, +@@ -195001,8 +195043,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-28873", +- "self_type" : "type-28872", ++ "referenced_type" : "type-28872", ++ "self_type" : "type-28871", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195011,8 +195053,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-29035", +- "self_type" : "type-29034", ++ "referenced_type" : "type-29034", ++ "self_type" : "type-29033", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195021,8 +195063,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-29043", +- "self_type" : "type-29042", ++ "referenced_type" : "type-29042", ++ "self_type" : "type-29041", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195031,8 +195073,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-29057", +- "self_type" : "type-29056", ++ "referenced_type" : "type-29056", ++ "self_type" : "type-29055", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195041,8 +195083,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-29352", +- "self_type" : "type-29351", ++ "referenced_type" : "type-29351", ++ "self_type" : "type-29350", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195051,8 +195093,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-29509", +- "self_type" : "type-29508", ++ "referenced_type" : "type-29508", ++ "self_type" : "type-29507", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195061,8 +195103,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-29657", +- "self_type" : "type-29656", ++ "referenced_type" : "type-29656", ++ "self_type" : "type-29655", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195071,8 +195113,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-29805", +- "self_type" : "type-29804", ++ "referenced_type" : "type-29804", ++ "self_type" : "type-29803", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195081,8 +195123,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-29908", +- "self_type" : "type-29907", ++ "referenced_type" : "type-29907", ++ "self_type" : "type-29906", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195091,8 +195133,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-29927", +- "self_type" : "type-29926", ++ "referenced_type" : "type-29926", ++ "self_type" : "type-29925", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195101,8 +195143,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-30061", +- "self_type" : "type-30060", ++ "referenced_type" : "type-30060", ++ "self_type" : "type-30059", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195111,8 +195153,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-30189", +- "self_type" : "type-30188", ++ "referenced_type" : "type-30188", ++ "self_type" : "type-30187", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195121,8 +195163,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-30316", +- "self_type" : "type-30315", ++ "referenced_type" : "type-30315", ++ "self_type" : "type-30314", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195131,8 +195173,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-30408", +- "self_type" : "type-30407", ++ "referenced_type" : "type-3037", ++ "self_type" : "type-3036", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195141,8 +195183,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-3085", +- "self_type" : "type-3084", ++ "referenced_type" : "type-30407", ++ "self_type" : "type-30406", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195151,8 +195193,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-30913", +- "self_type" : "type-30912", ++ "referenced_type" : "type-30912", ++ "self_type" : "type-30911", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195161,8 +195203,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-31200", +- "self_type" : "type-31199", ++ "referenced_type" : "type-31199", ++ "self_type" : "type-31198", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195171,8 +195213,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-31246", +- "self_type" : "type-31245", ++ "referenced_type" : "type-31245", ++ "self_type" : "type-31244", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, +@@ -195181,8 +195223,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-31351", +- "self_type" : "type-31350", ++ "referenced_type" : "type-31350", ++ "self_type" : "type-31349", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195191,8 +195233,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-31539", +- "self_type" : "type-31538", ++ "referenced_type" : "type-31538", ++ "self_type" : "type-31537", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195201,8 +195243,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-32018", +- "self_type" : "type-32017", ++ "referenced_type" : "type-32017", ++ "self_type" : "type-32016", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195211,8 +195253,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-32214", +- "self_type" : "type-32213", ++ "referenced_type" : "type-32213", ++ "self_type" : "type-32212", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195221,8 +195263,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-3630", +- "self_type" : "type-3629", ++ "referenced_type" : "type-3582", ++ "self_type" : "type-3581", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195231,8 +195273,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-3990", +- "self_type" : "type-3989", ++ "referenced_type" : "type-3942", ++ "self_type" : "type-3941", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195241,8 +195283,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-4085", +- "self_type" : "type-4084", ++ "referenced_type" : "type-4037", ++ "self_type" : "type-4036", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, +@@ -195251,8 +195293,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-4193", +- "self_type" : "type-4192", ++ "referenced_type" : "type-4145", ++ "self_type" : "type-4144", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195261,8 +195303,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-4413", +- "self_type" : "type-4412", ++ "referenced_type" : "type-4365", ++ "self_type" : "type-4364", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195271,8 +195313,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-5065", +- "self_type" : "type-5064", ++ "referenced_type" : "type-5017", ++ "self_type" : "type-5016", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195281,8 +195323,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-5608", +- "self_type" : "type-5607", ++ "referenced_type" : "type-5560", ++ "self_type" : "type-5559", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195291,8 +195333,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-5898", +- "self_type" : "type-5897", ++ "referenced_type" : "type-5850", ++ "self_type" : "type-5849", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195301,8 +195343,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-5944", +- "self_type" : "type-5943", ++ "referenced_type" : "type-5896", ++ "self_type" : "type-5895", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, +@@ -195311,8 +195353,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-6049", +- "self_type" : "type-6048", ++ "referenced_type" : "type-6001", ++ "self_type" : "type-6000", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195321,8 +195363,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-6237", +- "self_type" : "type-6236", ++ "referenced_type" : "type-6189", ++ "self_type" : "type-6188", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195331,8 +195373,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-6856", +- "self_type" : "type-6855", ++ "referenced_type" : "type-6808", ++ "self_type" : "type-6807", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195341,8 +195383,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-7095", +- "self_type" : "type-7094", ++ "referenced_type" : "type-7047", ++ "self_type" : "type-7046", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195351,8 +195393,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-7620", +- "self_type" : "type-7619", ++ "referenced_type" : "type-7572", ++ "self_type" : "type-7571", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195361,8 +195403,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-7771", +- "self_type" : "type-7770", ++ "referenced_type" : "type-7723", ++ "self_type" : "type-7722", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195371,8 +195413,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-8341", +- "self_type" : "type-8340", ++ "referenced_type" : "type-8293", ++ "self_type" : "type-8292", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195391,8 +195433,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-883", +- "self_type" : "type-882", ++ "referenced_type" : "type-8819", ++ "self_type" : "type-8818", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195401,8 +195443,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-8867", +- "self_type" : "type-8866", ++ "referenced_type" : "type-883", ++ "self_type" : "type-882", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195411,8 +195453,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-9155", +- "self_type" : "type-9154", ++ "referenced_type" : "type-9107", ++ "self_type" : "type-9106", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195421,8 +195463,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-9201", +- "self_type" : "type-9200", ++ "referenced_type" : "type-9153", ++ "self_type" : "type-9152", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/stringprintf.h" + }, +@@ -195431,8 +195473,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-9306", +- "self_type" : "type-9305", ++ "referenced_type" : "type-9258", ++ "self_type" : "type-9257", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195441,8 +195483,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-9494", +- "self_type" : "type-9493", ++ "referenced_type" : "type-9446", ++ "self_type" : "type-9445", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195471,8 +195513,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-994", +- "self_type" : "type-993", ++ "referenced_type" : "type-9924", ++ "self_type" : "type-9923", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195481,8 +195523,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", + "name" : "const std::vector, std::allocator >, std::allocator, std::allocator > > >", +- "referenced_type" : "type-9972", +- "self_type" : "type-9971", ++ "referenced_type" : "type-994", ++ "self_type" : "type-993", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/strutil.h" + }, +@@ -195491,8 +195533,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >, std::allocator > > >", + "name" : "const std::vector >, std::allocator > > >", +- "referenced_type" : "type-25009", +- "self_type" : "type-25008", ++ "referenced_type" : "type-24978", ++ "self_type" : "type-24977", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h" + }, +@@ -195501,8 +195543,8 @@ + "is_const" : true, + "linker_set_key" : "const std::vector >, std::allocator > > >", + "name" : "const std::vector >, std::allocator > > >", +- "referenced_type" : "type-30161", +- "self_type" : "type-30160", ++ "referenced_type" : "type-30160", ++ "self_type" : "type-30159", + "size" : 12, + "source_file" : "/external/protobuf/src/google/protobuf/util/message_differencer.h" + }, +@@ -195511,8 +195553,8 @@ + "is_const" : true, + "linker_set_key" : "const timeval", + "name" : "const timeval", +- "referenced_type" : "type-25167", +- "self_type" : "type-25166", ++ "referenced_type" : "type-25144", ++ "self_type" : "type-25143", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, +@@ -195521,8 +195563,8 @@ + "is_const" : true, + "linker_set_key" : "const timeval", + "name" : "const timeval", +- "referenced_type" : "type-30311", +- "self_type" : "type-30310", ++ "referenced_type" : "type-30310", ++ "self_type" : "type-30309", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/util/time_util.h" + }, +@@ -195530,816 +195572,808 @@ + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-10038", +- "self_type" : "type-10037", ++ "referenced_type" : "type-10076", ++ "self_type" : "type-10075", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-10124", +- "self_type" : "type-10123", ++ "referenced_type" : "type-10214", ++ "self_type" : "type-10213", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-10262", +- "self_type" : "type-10261", ++ "referenced_type" : "type-10260", ++ "self_type" : "type-10259", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-10308", +- "self_type" : "type-10307", ++ "referenced_type" : "type-10568", ++ "self_type" : "type-10567", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-10616", +- "self_type" : "type-10615", ++ "referenced_type" : "type-10715", ++ "self_type" : "type-10714", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-10763", +- "self_type" : "type-10762", ++ "referenced_type" : "type-10717", ++ "self_type" : "type-10716", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-10765", +- "self_type" : "type-10764", ++ "referenced_type" : "type-10810", ++ "self_type" : "type-10809", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-10858", +- "self_type" : "type-10857", ++ "referenced_type" : "type-10890", ++ "self_type" : "type-10889", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-10938", +- "self_type" : "type-10937", ++ "referenced_type" : "type-10973", ++ "self_type" : "type-10972", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-11021", +- "self_type" : "type-11020", ++ "referenced_type" : "type-11086", ++ "self_type" : "type-11085", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-11134", +- "self_type" : "type-11133", +- "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" +- }, +- { +- "is_const" : true, +- "linker_set_key" : "const typename iterator::difference_type", +- "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-11265", +- "self_type" : "type-11264", ++ "referenced_type" : "type-11217", ++ "self_type" : "type-11216", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-11290", +- "self_type" : "type-11289", ++ "referenced_type" : "type-11242", ++ "self_type" : "type-11241", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-11449", +- "self_type" : "type-11448", ++ "referenced_type" : "type-11401", ++ "self_type" : "type-11400", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-11527", +- "self_type" : "type-11526", ++ "referenced_type" : "type-11479", ++ "self_type" : "type-11478", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-11562", +- "self_type" : "type-11561", ++ "referenced_type" : "type-11514", ++ "self_type" : "type-11513", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-11910", +- "self_type" : "type-11909", ++ "referenced_type" : "type-11862", ++ "self_type" : "type-11861", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-12082", +- "self_type" : "type-12081", ++ "referenced_type" : "type-12034", ++ "self_type" : "type-12033", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-12335", +- "self_type" : "type-12334", ++ "referenced_type" : "type-12287", ++ "self_type" : "type-12286", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-12466", +- "self_type" : "type-12465", ++ "referenced_type" : "type-12418", ++ "self_type" : "type-12417", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-12605", +- "self_type" : "type-12604", ++ "referenced_type" : "type-12557", ++ "self_type" : "type-12556", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-12663", +- "self_type" : "type-12662", ++ "referenced_type" : "type-12615", ++ "self_type" : "type-12614", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-12781", +- "self_type" : "type-12780", ++ "referenced_type" : "type-12733", ++ "self_type" : "type-12732", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-12844", +- "self_type" : "type-12843", ++ "referenced_type" : "type-12796", ++ "self_type" : "type-12795", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-12899", +- "self_type" : "type-12898", ++ "referenced_type" : "type-12851", ++ "self_type" : "type-12850", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-12982", +- "self_type" : "type-12981", ++ "referenced_type" : "type-12934", ++ "self_type" : "type-12933", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-13056", +- "self_type" : "type-13055", ++ "referenced_type" : "type-13008", ++ "self_type" : "type-13007", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-13242", +- "self_type" : "type-13241", ++ "referenced_type" : "type-1314", ++ "self_type" : "type-1313", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-13371", +- "self_type" : "type-13370", ++ "referenced_type" : "type-13194", ++ "self_type" : "type-13193", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-13457", +- "self_type" : "type-13456", ++ "referenced_type" : "type-13323", ++ "self_type" : "type-13322", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-13553", +- "self_type" : "type-13552", ++ "referenced_type" : "type-13409", ++ "self_type" : "type-13408", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-13599", +- "self_type" : "type-13598", ++ "referenced_type" : "type-13505", ++ "self_type" : "type-13504", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-13907", +- "self_type" : "type-13906", ++ "referenced_type" : "type-13551", ++ "self_type" : "type-13550", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-1395", +- "self_type" : "type-1394", ++ "referenced_type" : "type-13859", ++ "self_type" : "type-13858", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-14054", +- "self_type" : "type-14053", ++ "referenced_type" : "type-1393", ++ "self_type" : "type-1392", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-14056", +- "self_type" : "type-14055", ++ "referenced_type" : "type-14006", ++ "self_type" : "type-14005", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-14149", +- "self_type" : "type-14148", ++ "referenced_type" : "type-14008", ++ "self_type" : "type-14007", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-14229", +- "self_type" : "type-14228", ++ "referenced_type" : "type-14101", ++ "self_type" : "type-14100", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-14312", +- "self_type" : "type-14311", ++ "referenced_type" : "type-14181", ++ "self_type" : "type-14180", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-14398", +- "self_type" : "type-14397", ++ "referenced_type" : "type-14264", ++ "self_type" : "type-14263", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-14516", +- "self_type" : "type-14515", ++ "referenced_type" : "type-1430", ++ "self_type" : "type-1429", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-14541", +- "self_type" : "type-14540", ++ "referenced_type" : "type-14350", ++ "self_type" : "type-14349", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-14669", +- "self_type" : "type-14668", ++ "referenced_type" : "type-14468", ++ "self_type" : "type-14467", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-1479", +- "self_type" : "type-1478", ++ "referenced_type" : "type-14493", ++ "self_type" : "type-14492", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-14837", +- "self_type" : "type-14836", ++ "referenced_type" : "type-14621", ++ "self_type" : "type-14620", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-14901", +- "self_type" : "type-14900", ++ "referenced_type" : "type-1465", ++ "self_type" : "type-1464", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-1513", +- "self_type" : "type-1512", ++ "referenced_type" : "type-14789", ++ "self_type" : "type-14788", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-15140", +- "self_type" : "type-15139", ++ "referenced_type" : "type-14853", ++ "self_type" : "type-14852", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-15261", +- "self_type" : "type-15260", ++ "referenced_type" : "type-15092", ++ "self_type" : "type-15091", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-15421", +- "self_type" : "type-15420", ++ "referenced_type" : "type-15213", ++ "self_type" : "type-15212", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-1543", +- "self_type" : "type-1542", ++ "referenced_type" : "type-15373", ++ "self_type" : "type-15372", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-15767", +- "self_type" : "type-15766", ++ "referenced_type" : "type-15719", ++ "self_type" : "type-15718", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-15938", +- "self_type" : "type-15937", ++ "referenced_type" : "type-15890", ++ "self_type" : "type-15889", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-16190", +- "self_type" : "type-16189", ++ "referenced_type" : "type-16142", ++ "self_type" : "type-16141", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-16323", +- "self_type" : "type-16322", ++ "referenced_type" : "type-16275", ++ "self_type" : "type-16274", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-16462", +- "self_type" : "type-16461", ++ "referenced_type" : "type-16414", ++ "self_type" : "type-16413", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-16519", +- "self_type" : "type-16518", ++ "referenced_type" : "type-16471", ++ "self_type" : "type-16470", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-16637", +- "self_type" : "type-16636", ++ "referenced_type" : "type-16589", ++ "self_type" : "type-16588", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-16700", +- "self_type" : "type-16699", ++ "referenced_type" : "type-16652", ++ "self_type" : "type-16651", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-16755", +- "self_type" : "type-16754", ++ "referenced_type" : "type-16707", ++ "self_type" : "type-16706", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-16838", +- "self_type" : "type-16837", ++ "referenced_type" : "type-16790", ++ "self_type" : "type-16789", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-16912", +- "self_type" : "type-16911", ++ "referenced_type" : "type-16864", ++ "self_type" : "type-16863", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-17098", +- "self_type" : "type-17097", ++ "referenced_type" : "type-17050", ++ "self_type" : "type-17049", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-17227", +- "self_type" : "type-17226", ++ "referenced_type" : "type-17179", ++ "self_type" : "type-17178", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-17313", +- "self_type" : "type-17312", ++ "referenced_type" : "type-17265", ++ "self_type" : "type-17264", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-17417", +- "self_type" : "type-17416", ++ "referenced_type" : "type-17369", ++ "self_type" : "type-17368", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-17463", +- "self_type" : "type-17462", ++ "referenced_type" : "type-17415", ++ "self_type" : "type-17414", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-17771", +- "self_type" : "type-17770", ++ "referenced_type" : "type-17723", ++ "self_type" : "type-17722", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-17918", +- "self_type" : "type-17917", ++ "referenced_type" : "type-17870", ++ "self_type" : "type-17869", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-17920", +- "self_type" : "type-17919", ++ "referenced_type" : "type-17872", ++ "self_type" : "type-17871", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18013", +- "self_type" : "type-18012", ++ "referenced_type" : "type-17965", ++ "self_type" : "type-17964", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18093", +- "self_type" : "type-18092", ++ "referenced_type" : "type-18045", ++ "self_type" : "type-18044", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18176", +- "self_type" : "type-18175", ++ "referenced_type" : "type-18128", ++ "self_type" : "type-18127", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18262", +- "self_type" : "type-18261", ++ "referenced_type" : "type-18214", ++ "self_type" : "type-18213", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18380", +- "self_type" : "type-18379", ++ "referenced_type" : "type-18332", ++ "self_type" : "type-18331", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18405", +- "self_type" : "type-18404", ++ "referenced_type" : "type-18357", ++ "self_type" : "type-18356", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18533", +- "self_type" : "type-18532", ++ "referenced_type" : "type-18485", ++ "self_type" : "type-18484", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18694", +- "self_type" : "type-18693", ++ "referenced_type" : "type-18646", ++ "self_type" : "type-18645", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18758", +- "self_type" : "type-18757", ++ "referenced_type" : "type-18710", ++ "self_type" : "type-18709", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-18924", +- "self_type" : "type-18923", ++ "referenced_type" : "type-18876", ++ "self_type" : "type-18875", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-19037", +- "self_type" : "type-19036", ++ "referenced_type" : "type-18989", ++ "self_type" : "type-18988", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-19196", +- "self_type" : "type-19195", ++ "referenced_type" : "type-19148", ++ "self_type" : "type-19147", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-19278", +- "self_type" : "type-19277", ++ "referenced_type" : "type-19230", ++ "self_type" : "type-19229", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-19429", +- "self_type" : "type-19428", ++ "referenced_type" : "type-19381", ++ "self_type" : "type-19380", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-19622", +- "self_type" : "type-19621", ++ "referenced_type" : "type-19574", ++ "self_type" : "type-19573", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-19791", +- "self_type" : "type-19790", ++ "referenced_type" : "type-19743", ++ "self_type" : "type-19742", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-19947", +- "self_type" : "type-19946", ++ "referenced_type" : "type-19899", ++ "self_type" : "type-19898", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-20300", +- "self_type" : "type-20299", ++ "referenced_type" : "type-20252", ++ "self_type" : "type-20251", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-20472", +- "self_type" : "type-20471", ++ "referenced_type" : "type-20424", ++ "self_type" : "type-20423", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-20721", +- "self_type" : "type-20720", ++ "referenced_type" : "type-20673", ++ "self_type" : "type-20672", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-20854", +- "self_type" : "type-20853", ++ "referenced_type" : "type-20806", ++ "self_type" : "type-20805", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-20993", +- "self_type" : "type-20992", ++ "referenced_type" : "type-20945", ++ "self_type" : "type-20944", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-21051", +- "self_type" : "type-21050", ++ "referenced_type" : "type-2099", ++ "self_type" : "type-2098", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-21169", +- "self_type" : "type-21168", ++ "referenced_type" : "type-21003", ++ "self_type" : "type-21002", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-21232", +- "self_type" : "type-21231", ++ "referenced_type" : "type-21121", ++ "self_type" : "type-21120", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-21287", +- "self_type" : "type-21286", ++ "referenced_type" : "type-21184", ++ "self_type" : "type-21183", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-21370", +- "self_type" : "type-21369", ++ "referenced_type" : "type-21239", ++ "self_type" : "type-21238", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-21444", +- "self_type" : "type-21443", ++ "referenced_type" : "type-21322", ++ "self_type" : "type-21321", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-21630", +- "self_type" : "type-21629", ++ "referenced_type" : "type-21396", ++ "self_type" : "type-21395", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-2168", +- "self_type" : "type-2167", ++ "referenced_type" : "type-21582", ++ "self_type" : "type-21581", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-21759", +- "self_type" : "type-21758", ++ "referenced_type" : "type-21711", ++ "self_type" : "type-21710", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-21845", +- "self_type" : "type-21844", ++ "referenced_type" : "type-21797", ++ "self_type" : "type-21796", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -196354,832 +196388,832 @@ + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-21992", +- "self_type" : "type-21991", ++ "referenced_type" : "type-21990", ++ "self_type" : "type-21989", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-22300", +- "self_type" : "type-22299", ++ "referenced_type" : "type-22271", ++ "self_type" : "type-22270", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-22447", +- "self_type" : "type-22446", ++ "referenced_type" : "type-22393", ++ "self_type" : "type-22392", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-22449", +- "self_type" : "type-22448", ++ "referenced_type" : "type-22459", ++ "self_type" : "type-22458", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-22542", +- "self_type" : "type-22541", ++ "referenced_type" : "type-22533", ++ "self_type" : "type-22532", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-22622", +- "self_type" : "type-22621", ++ "referenced_type" : "type-22630", ++ "self_type" : "type-22629", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-22705", +- "self_type" : "type-22704", ++ "referenced_type" : "type-22738", ++ "self_type" : "type-22737", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-22791", +- "self_type" : "type-22790", ++ "referenced_type" : "type-22898", ++ "self_type" : "type-22897", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-22909", +- "self_type" : "type-22908", ++ "referenced_type" : "type-22961", ++ "self_type" : "type-22960", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-22934", +- "self_type" : "type-22933", ++ "referenced_type" : "type-23043", ++ "self_type" : "type-23042", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-23062", +- "self_type" : "type-23061", ++ "referenced_type" : "type-23283", ++ "self_type" : "type-23282", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-23223", +- "self_type" : "type-23222", ++ "referenced_type" : "type-23433", ++ "self_type" : "type-23432", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-23287", +- "self_type" : "type-23286", ++ "referenced_type" : "type-23547", ++ "self_type" : "type-23546", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-23453", +- "self_type" : "type-23452", ++ "referenced_type" : "type-23737", ++ "self_type" : "type-23736", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-23566", +- "self_type" : "type-23565", ++ "referenced_type" : "type-23788", ++ "self_type" : "type-23787", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-23720", +- "self_type" : "type-23719", ++ "referenced_type" : "type-2384", ++ "self_type" : "type-2383", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-23799", +- "self_type" : "type-23798", ++ "referenced_type" : "type-23930", ++ "self_type" : "type-23929", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-23929", +- "self_type" : "type-23928", ++ "referenced_type" : "type-24009", ++ "self_type" : "type-24008", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-24092", +- "self_type" : "type-24091", ++ "referenced_type" : "type-24090", ++ "self_type" : "type-24089", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-24258", +- "self_type" : "type-24257", ++ "referenced_type" : "type-24260", ++ "self_type" : "type-24259", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-24410", +- "self_type" : "type-24409", ++ "referenced_type" : "type-24392", ++ "self_type" : "type-24391", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-2454", +- "self_type" : "type-2453", ++ "referenced_type" : "type-24534", ++ "self_type" : "type-24533", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-24566", +- "self_type" : "type-24565", ++ "referenced_type" : "type-24571", ++ "self_type" : "type-24570", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-24700", +- "self_type" : "type-24699", ++ "referenced_type" : "type-24662", ++ "self_type" : "type-24661", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-24831", +- "self_type" : "type-24830", ++ "referenced_type" : "type-24791", ++ "self_type" : "type-24790", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-25117", +- "self_type" : "type-25116", ++ "referenced_type" : "type-25090", ++ "self_type" : "type-25089", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-25216", +- "self_type" : "type-25215", ++ "referenced_type" : "type-25217", ++ "self_type" : "type-25216", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-25476", +- "self_type" : "type-25475", ++ "referenced_type" : "type-25527", ++ "self_type" : "type-25526", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-25648", +- "self_type" : "type-25647", ++ "referenced_type" : "type-25699", ++ "self_type" : "type-25698", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-25900", +- "self_type" : "type-25899", ++ "referenced_type" : "type-25951", ++ "self_type" : "type-25950", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-26032", +- "self_type" : "type-26031", ++ "referenced_type" : "type-26085", ++ "self_type" : "type-26084", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-26171", +- "self_type" : "type-26170", ++ "referenced_type" : "type-26216", ++ "self_type" : "type-26215", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-26229", +- "self_type" : "type-26228", ++ "referenced_type" : "type-26270", ++ "self_type" : "type-26269", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-26347", +- "self_type" : "type-26346", ++ "referenced_type" : "type-26389", ++ "self_type" : "type-26388", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-26410", +- "self_type" : "type-26409", ++ "referenced_type" : "type-26452", ++ "self_type" : "type-26451", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-26465", +- "self_type" : "type-26464", ++ "referenced_type" : "type-26502", ++ "self_type" : "type-26501", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-26548", +- "self_type" : "type-26547", ++ "referenced_type" : "type-26573", ++ "self_type" : "type-26572", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-26622", +- "self_type" : "type-26621", ++ "referenced_type" : "type-26644", ++ "self_type" : "type-26643", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-26808", +- "self_type" : "type-26807", ++ "referenced_type" : "type-26834", ++ "self_type" : "type-26833", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-26937", +- "self_type" : "type-26936", ++ "referenced_type" : "type-26960", ++ "self_type" : "type-26959", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-27023", +- "self_type" : "type-27022", ++ "referenced_type" : "type-27053", ++ "self_type" : "type-27052", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-27131", +- "self_type" : "type-27130", ++ "referenced_type" : "type-27130", ++ "self_type" : "type-27129", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-27177", +- "self_type" : "type-27176", ++ "referenced_type" : "type-27176", ++ "self_type" : "type-27175", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-27485", +- "self_type" : "type-27484", ++ "referenced_type" : "type-27484", ++ "self_type" : "type-27483", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-27632", +- "self_type" : "type-27631", ++ "referenced_type" : "type-27631", ++ "self_type" : "type-27630", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-27634", +- "self_type" : "type-27633", ++ "referenced_type" : "type-27633", ++ "self_type" : "type-27632", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-27727", +- "self_type" : "type-27726", ++ "referenced_type" : "type-27726", ++ "self_type" : "type-27725", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-27807", +- "self_type" : "type-27806", ++ "referenced_type" : "type-2776", ++ "self_type" : "type-2775", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-27890", +- "self_type" : "type-27889", ++ "referenced_type" : "type-27806", ++ "self_type" : "type-27805", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-27976", +- "self_type" : "type-27975", ++ "referenced_type" : "type-27889", ++ "self_type" : "type-27888", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-28094", +- "self_type" : "type-28093", ++ "referenced_type" : "type-27975", ++ "self_type" : "type-27974", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-28119", +- "self_type" : "type-28118", ++ "referenced_type" : "type-28093", ++ "self_type" : "type-28092", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-28247", +- "self_type" : "type-28246", ++ "referenced_type" : "type-28118", ++ "self_type" : "type-28117", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-2824", +- "self_type" : "type-2823", ++ "referenced_type" : "type-28246", ++ "self_type" : "type-28245", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-28408", +- "self_type" : "type-28407", ++ "referenced_type" : "type-28407", ++ "self_type" : "type-28406", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-28472", +- "self_type" : "type-28471", ++ "referenced_type" : "type-28471", ++ "self_type" : "type-28470", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-28638", +- "self_type" : "type-28637", ++ "referenced_type" : "type-2855", ++ "self_type" : "type-2854", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-28751", +- "self_type" : "type-28750", ++ "referenced_type" : "type-28637", ++ "self_type" : "type-28636", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-28905", +- "self_type" : "type-28904", ++ "referenced_type" : "type-28750", ++ "self_type" : "type-28749", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-28984", +- "self_type" : "type-28983", ++ "referenced_type" : "type-28904", ++ "self_type" : "type-28903", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-2903", +- "self_type" : "type-2902", ++ "referenced_type" : "type-2892", ++ "self_type" : "type-2891", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-29114", +- "self_type" : "type-29113", ++ "referenced_type" : "type-28983", ++ "self_type" : "type-28982", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-29277", +- "self_type" : "type-29276", ++ "referenced_type" : "type-29113", ++ "self_type" : "type-29112", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-2940", +- "self_type" : "type-2939", ++ "referenced_type" : "type-29276", ++ "self_type" : "type-29275", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-29443", +- "self_type" : "type-29442", ++ "referenced_type" : "type-2927", ++ "self_type" : "type-2926", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-29595", +- "self_type" : "type-29594", ++ "referenced_type" : "type-29442", ++ "self_type" : "type-29441", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-29751", +- "self_type" : "type-29750", ++ "referenced_type" : "type-29594", ++ "self_type" : "type-29593", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-2975", +- "self_type" : "type-2974", ++ "referenced_type" : "type-29750", ++ "self_type" : "type-29749", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-29881", +- "self_type" : "type-29880", ++ "referenced_type" : "type-29880", ++ "self_type" : "type-29879", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-30010", +- "self_type" : "type-30009", ++ "referenced_type" : "type-30009", ++ "self_type" : "type-30008", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-30262", +- "self_type" : "type-30261", ++ "referenced_type" : "type-30261", ++ "self_type" : "type-30260", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-30360", +- "self_type" : "type-30359", ++ "referenced_type" : "type-30359", ++ "self_type" : "type-30358", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-30622", +- "self_type" : "type-30621", ++ "referenced_type" : "type-30621", ++ "self_type" : "type-30620", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-30794", +- "self_type" : "type-30793", ++ "referenced_type" : "type-30793", ++ "self_type" : "type-30792", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-31046", +- "self_type" : "type-31045", ++ "referenced_type" : "type-31045", ++ "self_type" : "type-31044", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-31179", +- "self_type" : "type-31178", ++ "referenced_type" : "type-31178", ++ "self_type" : "type-31177", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-31318", +- "self_type" : "type-31317", ++ "referenced_type" : "type-31317", ++ "self_type" : "type-31316", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-31376", +- "self_type" : "type-31375", ++ "referenced_type" : "type-31375", ++ "self_type" : "type-31374", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-31494", +- "self_type" : "type-31493", ++ "referenced_type" : "type-31493", ++ "self_type" : "type-31492", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-31557", +- "self_type" : "type-31556", ++ "referenced_type" : "type-31556", ++ "self_type" : "type-31555", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-31612", +- "self_type" : "type-31611", ++ "referenced_type" : "type-31611", ++ "self_type" : "type-31610", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-31695", +- "self_type" : "type-31694", ++ "referenced_type" : "type-31694", ++ "self_type" : "type-31693", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-31769", +- "self_type" : "type-31768", ++ "referenced_type" : "type-31768", ++ "self_type" : "type-31767", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-31955", +- "self_type" : "type-31954", ++ "referenced_type" : "type-31954", ++ "self_type" : "type-31953", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-32084", +- "self_type" : "type-32083", ++ "referenced_type" : "type-32083", ++ "self_type" : "type-32082", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-32170", +- "self_type" : "type-32169", ++ "referenced_type" : "type-32169", ++ "self_type" : "type-32168", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-3327", +- "self_type" : "type-3326", ++ "referenced_type" : "type-3279", ++ "self_type" : "type-3278", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-3505", +- "self_type" : "type-3504", ++ "referenced_type" : "type-3457", ++ "self_type" : "type-3456", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-3818", +- "self_type" : "type-3817", ++ "referenced_type" : "type-3770", ++ "self_type" : "type-3769", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-3969", +- "self_type" : "type-3968", ++ "referenced_type" : "type-3921", ++ "self_type" : "type-3920", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-4157", +- "self_type" : "type-4156", ++ "referenced_type" : "type-4109", ++ "self_type" : "type-4108", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-4220", +- "self_type" : "type-4219", ++ "referenced_type" : "type-4172", ++ "self_type" : "type-4171", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-4368", +- "self_type" : "type-4367", ++ "referenced_type" : "type-4320", ++ "self_type" : "type-4319", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-4433", +- "self_type" : "type-4432", ++ "referenced_type" : "type-4385", ++ "self_type" : "type-4384", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-4487", +- "self_type" : "type-4486", ++ "referenced_type" : "type-4439", ++ "self_type" : "type-4438", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-4678", +- "self_type" : "type-4677", ++ "referenced_type" : "type-4630", ++ "self_type" : "type-4629", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-4804", +- "self_type" : "type-4803", ++ "referenced_type" : "type-4756", ++ "self_type" : "type-4755", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-4883", +- "self_type" : "type-4882", ++ "referenced_type" : "type-4835", ++ "self_type" : "type-4834", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-4920", +- "self_type" : "type-4919", ++ "referenced_type" : "type-4872", ++ "self_type" : "type-4871", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-4955", +- "self_type" : "type-4954", ++ "referenced_type" : "type-4907", ++ "self_type" : "type-4906", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-5307", +- "self_type" : "type-5306", ++ "referenced_type" : "type-5259", ++ "self_type" : "type-5258", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-5485", +- "self_type" : "type-5484", ++ "referenced_type" : "type-5437", ++ "self_type" : "type-5436", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-5744", +- "self_type" : "type-5743", ++ "referenced_type" : "type-5696", ++ "self_type" : "type-5695", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-5877", +- "self_type" : "type-5876", ++ "referenced_type" : "type-5829", ++ "self_type" : "type-5828", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -197194,96 +197228,96 @@ + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-6016", +- "self_type" : "type-6015", ++ "referenced_type" : "type-5968", ++ "self_type" : "type-5967", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-6074", +- "self_type" : "type-6073", ++ "referenced_type" : "type-6026", ++ "self_type" : "type-6025", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-6192", +- "self_type" : "type-6191", ++ "referenced_type" : "type-6144", ++ "self_type" : "type-6143", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-6255", +- "self_type" : "type-6254", ++ "referenced_type" : "type-6207", ++ "self_type" : "type-6206", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-6310", +- "self_type" : "type-6309", ++ "referenced_type" : "type-6262", ++ "self_type" : "type-6261", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-6398", +- "self_type" : "type-6397", ++ "referenced_type" : "type-6350", ++ "self_type" : "type-6349", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-6473", +- "self_type" : "type-6472", ++ "referenced_type" : "type-6425", ++ "self_type" : "type-6424", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-6762", +- "self_type" : "type-6761", ++ "referenced_type" : "type-6714", ++ "self_type" : "type-6713", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-6953", +- "self_type" : "type-6952", ++ "referenced_type" : "type-6905", ++ "self_type" : "type-6904", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-7051", +- "self_type" : "type-7050", ++ "referenced_type" : "type-7003", ++ "self_type" : "type-7002", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-7174", +- "self_type" : "type-7173", ++ "referenced_type" : "type-7126", ++ "self_type" : "type-7125", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-7261", +- "self_type" : "type-7260", ++ "referenced_type" : "type-7213", ++ "self_type" : "type-7212", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -197298,40 +197332,40 @@ + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-7701", +- "self_type" : "type-7700", ++ "referenced_type" : "type-7653", ++ "self_type" : "type-7652", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-7850", +- "self_type" : "type-7849", ++ "referenced_type" : "type-7802", ++ "self_type" : "type-7801", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-7852", +- "self_type" : "type-7851", ++ "referenced_type" : "type-7804", ++ "self_type" : "type-7803", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-7960", +- "self_type" : "type-7959", ++ "referenced_type" : "type-7912", ++ "self_type" : "type-7911", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-8039", +- "self_type" : "type-8038", ++ "referenced_type" : "type-7991", ++ "self_type" : "type-7990", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -197346,32 +197380,32 @@ + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-8122", +- "self_type" : "type-8121", ++ "referenced_type" : "type-8074", ++ "self_type" : "type-8073", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-8159", +- "self_type" : "type-8158", ++ "referenced_type" : "type-8111", ++ "self_type" : "type-8110", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-8196", +- "self_type" : "type-8195", ++ "referenced_type" : "type-8148", ++ "self_type" : "type-8147", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-8231", +- "self_type" : "type-8230", ++ "referenced_type" : "type-8183", ++ "self_type" : "type-8182", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -197386,96 +197420,104 @@ + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-8581", +- "self_type" : "type-8580", ++ "referenced_type" : "type-8533", ++ "self_type" : "type-8532", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-8750", +- "self_type" : "type-8749", ++ "referenced_type" : "type-8702", ++ "self_type" : "type-8701", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-9001", +- "self_type" : "type-9000", ++ "referenced_type" : "type-8953", ++ "self_type" : "type-8952", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-9134", +- "self_type" : "type-9133", ++ "referenced_type" : "type-9086", ++ "self_type" : "type-9085", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-9273", +- "self_type" : "type-9272", ++ "referenced_type" : "type-9225", ++ "self_type" : "type-9224", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-9331", +- "self_type" : "type-9330", ++ "referenced_type" : "type-9283", ++ "self_type" : "type-9282", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-9449", +- "self_type" : "type-9448", ++ "referenced_type" : "type-9401", ++ "self_type" : "type-9400", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-9512", +- "self_type" : "type-9511", ++ "referenced_type" : "type-9464", ++ "self_type" : "type-9463", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-9567", +- "self_type" : "type-9566", ++ "referenced_type" : "type-9519", ++ "self_type" : "type-9518", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-9650", +- "self_type" : "type-9649", ++ "referenced_type" : "type-9602", ++ "self_type" : "type-9601", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-9724", +- "self_type" : "type-9723", ++ "referenced_type" : "type-9676", ++ "self_type" : "type-9675", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { + "is_const" : true, + "linker_set_key" : "const typename iterator::difference_type", + "name" : "const typename iterator::difference_type", +- "referenced_type" : "type-9910", +- "self_type" : "type-9909", ++ "referenced_type" : "type-9862", ++ "self_type" : "type-9861", ++ "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" ++ }, ++ { ++ "is_const" : true, ++ "linker_set_key" : "const typename iterator::difference_type", ++ "name" : "const typename iterator::difference_type", ++ "referenced_type" : "type-9990", ++ "self_type" : "type-9989", + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h" + }, + { +@@ -197572,8 +197614,8 @@ + "is_const" : true, + "linker_set_key" : "google::protobuf::FieldDescriptor::CppType const[19]", + "name" : "google::protobuf::FieldDescriptor::CppType const[19]", +- "referenced_type" : "type-2036", +- "self_type" : "type-2037", ++ "referenced_type" : "type-1965", ++ "self_type" : "type-1966", + "size" : 76, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h" + }, +@@ -197582,8 +197624,8 @@ + "is_const" : true, + "linker_set_key" : "google::protobuf::MapPair *const", + "name" : "google::protobuf::MapPair *const", +- "referenced_type" : "type-6506", +- "self_type" : "type-6646", ++ "referenced_type" : "type-6458", ++ "self_type" : "type-6598", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -197592,8 +197634,8 @@ + "is_const" : true, + "linker_set_key" : "google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *const", + "name" : "google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *const", +- "referenced_type" : "type-7211", +- "self_type" : "type-7487", ++ "referenced_type" : "type-7163", ++ "self_type" : "type-7439", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h" + }, +@@ -197602,8 +197644,8 @@ + "is_const" : true, + "linker_set_key" : "google::protobuf::Message *const", + "name" : "google::protobuf::Message *const", +- "referenced_type" : "type-1842", +- "self_type" : "type-4478", ++ "referenced_type" : "type-1754", ++ "self_type" : "type-4430", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197613,7 +197655,7 @@ + "linker_set_key" : "google::protobuf::StringPiece *const", + "name" : "google::protobuf::StringPiece *const", + "referenced_type" : "type-55", +- "self_type" : "type-20017", ++ "self_type" : "type-19969", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -197622,8 +197664,8 @@ + "is_const" : true, + "linker_set_key" : "google::protobuf::UninterpretedOption *const", + "name" : "google::protobuf::UninterpretedOption *const", +- "referenced_type" : "type-1914", +- "self_type" : "type-11446", ++ "referenced_type" : "type-1834", ++ "self_type" : "type-11398", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197632,8 +197674,8 @@ + "is_const" : true, + "linker_set_key" : "google::protobuf::hash_map, google::protobuf::streq, std::allocator > > *const", + "name" : "google::protobuf::hash_map, google::protobuf::streq, std::allocator > > *const", +- "referenced_type" : "type-3657", +- "self_type" : "type-3656", ++ "referenced_type" : "type-3609", ++ "self_type" : "type-3608", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -197642,8 +197684,8 @@ + "is_const" : true, + "linker_set_key" : "google::protobuf::hash_map &), google::protobuf::hash, google::protobuf::streq, std::allocator &)> > > *const", + "name" : "google::protobuf::hash_map &), google::protobuf::hash, google::protobuf::streq, std::allocator &)> > > *const", +- "referenced_type" : "type-6874", +- "self_type" : "type-6873", ++ "referenced_type" : "type-6826", ++ "self_type" : "type-6825", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -197652,8 +197694,8 @@ + "is_const" : true, + "linker_set_key" : "google::protobuf::hash_map, std::equal_to, std::allocator > > *const", + "name" : "google::protobuf::hash_map, std::equal_to, std::allocator > > *const", +- "referenced_type" : "type-6879", +- "self_type" : "type-6878", ++ "referenced_type" : "type-6831", ++ "self_type" : "type-6830", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -197662,8 +197704,8 @@ + "is_const" : true, + "linker_set_key" : "google::protobuf::hash_map, std::allocator >, int, google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, int> > > *const", + "name" : "google::protobuf::hash_map, std::allocator >, int, google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > >, std::allocator, std::allocator >, int> > > *const", +- "referenced_type" : "type-15316", +- "self_type" : "type-15376", ++ "referenced_type" : "type-15268", ++ "self_type" : "type-15328", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -197682,8 +197724,8 @@ + "is_const" : true, + "linker_set_key" : "google::protobuf::hash_set, std::equal_to > *const", + "name" : "google::protobuf::hash_set, std::equal_to > *const", +- "referenced_type" : "type-19713", +- "self_type" : "type-19862", ++ "referenced_type" : "type-19665", ++ "self_type" : "type-19814", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -197692,8 +197734,8 @@ + "is_const" : true, + "linker_set_key" : "google::protobuf::hash_set, std::allocator >, google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > > > *const", + "name" : "google::protobuf::hash_set, std::allocator >, google::protobuf::hash, std::allocator > >, std::equal_to, std::allocator > > > *const", +- "referenced_type" : "type-3718", +- "self_type" : "type-19703", ++ "referenced_type" : "type-3670", ++ "self_type" : "type-19655", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -197702,8 +197744,8 @@ + "is_const" : true, + "linker_set_key" : "google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *const", + "name" : "google::protobuf::internal::MapEntry, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *const", +- "referenced_type" : "type-7223", +- "self_type" : "type-7587", ++ "referenced_type" : "type-7175", ++ "self_type" : "type-7539", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197712,8 +197754,8 @@ + "is_const" : true, + "linker_set_key" : "google::protobuf::internal::MapField, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *const", + "name" : "google::protobuf::internal::MapField, std::allocator >, google::protobuf::Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> *const", +- "referenced_type" : "type-7600", +- "self_type" : "type-7599", ++ "referenced_type" : "type-7552", ++ "self_type" : "type-7551", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197748,8 +197790,8 @@ + "is_const" : true, + "linker_set_key" : "google::protobuf::io::AnnotationCollector *const", + "name" : "google::protobuf::io::AnnotationCollector *const", +- "referenced_type" : "type-11202", +- "self_type" : "type-11207", ++ "referenced_type" : "type-11154", ++ "self_type" : "type-11159", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -197759,7 +197801,7 @@ + "linker_set_key" : "google::protobuf::io::ZeroCopyInputStream *const", + "name" : "google::protobuf::io::ZeroCopyInputStream *const", + "referenced_type" : "type-793", +- "self_type" : "type-1617", ++ "self_type" : "type-1533", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h" + }, +@@ -197769,7 +197811,7 @@ + "linker_set_key" : "google::protobuf::io::ZeroCopyOutputStream *const", + "name" : "google::protobuf::io::ZeroCopyOutputStream *const", + "referenced_type" : "type-741", +- "self_type" : "type-11204", ++ "self_type" : "type-11156", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/io/printer.h" + }, +@@ -197778,8 +197820,8 @@ + "is_const" : true, + "linker_set_key" : "google::protobuf::util::converter::JsonObjectWriter::Element *const", + "name" : "google::protobuf::util::converter::JsonObjectWriter::Element *const", +- "referenced_type" : "type-19185", +- "self_type" : "type-19184", ++ "referenced_type" : "type-19137", ++ "self_type" : "type-19136", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197788,8 +197830,8 @@ + "is_const" : true, + "linker_set_key" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Item *const", + "name" : "google::protobuf::util::converter::ProtoStreamObjectWriter::Item *const", +- "referenced_type" : "type-19492", +- "self_type" : "type-19618", ++ "referenced_type" : "type-19444", ++ "self_type" : "type-19570", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197798,8 +197840,8 @@ + "is_const" : true, + "linker_set_key" : "google::protobuf::util::converter::ProtoWriter::ProtoElement *const", + "name" : "google::protobuf::util::converter::ProtoWriter::ProtoElement *const", +- "referenced_type" : "type-19508", +- "self_type" : "type-19787", ++ "referenced_type" : "type-19460", ++ "self_type" : "type-19739", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197808,8 +197850,8 @@ + "is_const" : true, + "linker_set_key" : "google::protobuf::util::converter::StructuredObjectWriter::BaseElement *const", + "name" : "google::protobuf::util::converter::StructuredObjectWriter::BaseElement *const", +- "referenced_type" : "type-19189", +- "self_type" : "type-19616", ++ "referenced_type" : "type-19141", ++ "self_type" : "type-19568", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197818,8 +197860,8 @@ + "is_const" : true, + "linker_set_key" : "std::basic_string, std::allocator > *const", + "name" : "std::basic_string, std::allocator > *const", +- "referenced_type" : "type-12235", +- "self_type" : "type-12322", ++ "referenced_type" : "type-12187", ++ "self_type" : "type-12274", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197828,8 +197870,8 @@ + "is_const" : true, + "linker_set_key" : "std::basic_string, std::allocator > *const", + "name" : "std::basic_string, std::allocator > *const", +- "referenced_type" : "type-14880", +- "self_type" : "type-14898", ++ "referenced_type" : "type-14832", ++ "self_type" : "type-14850", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197838,8 +197880,8 @@ + "is_const" : true, + "linker_set_key" : "std::basic_string, std::allocator > *const", + "name" : "std::basic_string, std::allocator > *const", +- "referenced_type" : "type-16090", +- "self_type" : "type-16177", ++ "referenced_type" : "type-16042", ++ "self_type" : "type-16129", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197848,8 +197890,8 @@ + "is_const" : true, + "linker_set_key" : "std::basic_string, std::allocator > *const", + "name" : "std::basic_string, std::allocator > *const", +- "referenced_type" : "type-18737", +- "self_type" : "type-18755", ++ "referenced_type" : "type-18689", ++ "self_type" : "type-18707", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197858,8 +197900,8 @@ + "is_const" : true, + "linker_set_key" : "std::basic_string, std::allocator > *const", + "name" : "std::basic_string, std::allocator > *const", +- "referenced_type" : "type-20622", +- "self_type" : "type-20708", ++ "referenced_type" : "type-20574", ++ "self_type" : "type-20660", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197868,8 +197910,8 @@ + "is_const" : true, + "linker_set_key" : "std::basic_string, std::allocator > *const", + "name" : "std::basic_string, std::allocator > *const", +- "referenced_type" : "type-23266", +- "self_type" : "type-23284", ++ "referenced_type" : "type-23257", ++ "self_type" : "type-23279", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197878,8 +197920,8 @@ + "is_const" : true, + "linker_set_key" : "std::basic_string, std::allocator > *const", + "name" : "std::basic_string, std::allocator > *const", +- "referenced_type" : "type-25801", +- "self_type" : "type-25887", ++ "referenced_type" : "type-25850", ++ "self_type" : "type-25938", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197888,8 +197930,8 @@ + "is_const" : true, + "linker_set_key" : "std::basic_string, std::allocator > *const", + "name" : "std::basic_string, std::allocator > *const", +- "referenced_type" : "type-28451", +- "self_type" : "type-28469", ++ "referenced_type" : "type-28450", ++ "self_type" : "type-28468", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197898,8 +197940,8 @@ + "is_const" : true, + "linker_set_key" : "std::basic_string, std::allocator > *const", + "name" : "std::basic_string, std::allocator > *const", +- "referenced_type" : "type-30947", +- "self_type" : "type-31033", ++ "referenced_type" : "type-30946", ++ "self_type" : "type-31032", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197908,8 +197950,8 @@ + "is_const" : true, + "linker_set_key" : "std::basic_string, std::allocator > *const", + "name" : "std::basic_string, std::allocator > *const", +- "referenced_type" : "type-3678", +- "self_type" : "type-3802", ++ "referenced_type" : "type-3630", ++ "self_type" : "type-3754", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197918,8 +197960,8 @@ + "is_const" : true, + "linker_set_key" : "std::basic_string, std::allocator > *const", + "name" : "std::basic_string, std::allocator > *const", +- "referenced_type" : "type-5643", +- "self_type" : "type-5731", ++ "referenced_type" : "type-5595", ++ "self_type" : "type-5683", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197928,8 +197970,8 @@ + "is_const" : true, + "linker_set_key" : "std::basic_string, std::allocator > *const", + "name" : "std::basic_string, std::allocator > *const", +- "referenced_type" : "type-8901", +- "self_type" : "type-8988", ++ "referenced_type" : "type-8853", ++ "self_type" : "type-8940", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/casts.h" + }, +@@ -197938,8 +197980,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator > > *const", + "name" : "std::map, std::allocator > > *const", +- "referenced_type" : "type-20018", +- "self_type" : "type-20020", ++ "referenced_type" : "type-19970", ++ "self_type" : "type-19972", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -197948,8 +197990,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator > > *const", + "name" : "std::map, std::allocator > > *const", +- "referenced_type" : "type-24478", +- "self_type" : "type-24480", ++ "referenced_type" : "type-24457", ++ "self_type" : "type-24459", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -197958,8 +198000,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator > > *const", + "name" : "std::map, std::allocator > > *const", +- "referenced_type" : "type-29663", +- "self_type" : "type-29665", ++ "referenced_type" : "type-29662", ++ "self_type" : "type-29664", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -197968,8 +198010,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *const", + "name" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *const", +- "referenced_type" : "type-12394", +- "self_type" : "type-12393", ++ "referenced_type" : "type-12346", ++ "self_type" : "type-12345", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -197978,8 +198020,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *const", + "name" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *const", +- "referenced_type" : "type-16251", +- "self_type" : "type-16250", ++ "referenced_type" : "type-16203", ++ "self_type" : "type-16202", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -197988,8 +198030,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *const", + "name" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *const", +- "referenced_type" : "type-20782", +- "self_type" : "type-20781", ++ "referenced_type" : "type-20734", ++ "self_type" : "type-20733", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -197998,8 +198040,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *const", + "name" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *const", +- "referenced_type" : "type-25960", +- "self_type" : "type-25959", ++ "referenced_type" : "type-26013", ++ "self_type" : "type-26012", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198008,8 +198050,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *const", + "name" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *const", +- "referenced_type" : "type-31107", +- "self_type" : "type-31106", ++ "referenced_type" : "type-31106", ++ "self_type" : "type-31105", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198018,8 +198060,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *const", + "name" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *const", +- "referenced_type" : "type-3897", +- "self_type" : "type-3896", ++ "referenced_type" : "type-3849", ++ "self_type" : "type-3848", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198028,8 +198070,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *const", + "name" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *const", +- "referenced_type" : "type-5805", +- "self_type" : "type-5804", ++ "referenced_type" : "type-5757", ++ "self_type" : "type-5756", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198038,8 +198080,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *const", + "name" : "std::map, std::allocator >, const google::protobuf::FileDescriptorProto *, std::less, std::allocator > >, std::allocator, std::allocator >, const google::protobuf::FileDescriptorProto *> > > *const", +- "referenced_type" : "type-9062", +- "self_type" : "type-9061", ++ "referenced_type" : "type-9014", ++ "self_type" : "type-9013", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198048,8 +198090,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *const", + "name" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *const", +- "referenced_type" : "type-12405", +- "self_type" : "type-12407", ++ "referenced_type" : "type-12357", ++ "self_type" : "type-12359", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198058,8 +198100,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *const", + "name" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *const", +- "referenced_type" : "type-16262", +- "self_type" : "type-16264", ++ "referenced_type" : "type-16214", ++ "self_type" : "type-16216", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198068,8 +198110,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *const", + "name" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *const", +- "referenced_type" : "type-20793", +- "self_type" : "type-20795", ++ "referenced_type" : "type-20745", ++ "self_type" : "type-20747", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198078,8 +198120,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *const", + "name" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *const", +- "referenced_type" : "type-25971", +- "self_type" : "type-25973", ++ "referenced_type" : "type-26024", ++ "self_type" : "type-26026", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198088,8 +198130,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *const", + "name" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *const", +- "referenced_type" : "type-31118", +- "self_type" : "type-31120", ++ "referenced_type" : "type-31117", ++ "self_type" : "type-31119", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198098,8 +198140,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *const", + "name" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *const", +- "referenced_type" : "type-3908", +- "self_type" : "type-3910", ++ "referenced_type" : "type-3860", ++ "self_type" : "type-3862", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198108,8 +198150,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *const", + "name" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *const", +- "referenced_type" : "type-5816", +- "self_type" : "type-5818", ++ "referenced_type" : "type-5768", ++ "self_type" : "type-5770", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198118,8 +198160,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *const", + "name" : "std::map, std::allocator >, std::pair, std::less, std::allocator > >, std::allocator, std::allocator >, std::pair > > > *const", +- "referenced_type" : "type-9073", +- "self_type" : "type-9075", ++ "referenced_type" : "type-9025", ++ "self_type" : "type-9027", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198128,8 +198170,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *const", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *const", +- "referenced_type" : "type-12221", +- "self_type" : "type-12223", ++ "referenced_type" : "type-12173", ++ "self_type" : "type-12175", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198138,8 +198180,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *const", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *const", +- "referenced_type" : "type-16076", +- "self_type" : "type-16078", ++ "referenced_type" : "type-16028", ++ "self_type" : "type-16030", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198148,8 +198190,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *const", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *const", +- "referenced_type" : "type-20608", +- "self_type" : "type-20610", ++ "referenced_type" : "type-20560", ++ "self_type" : "type-20562", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198158,8 +198200,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *const", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *const", +- "referenced_type" : "type-25787", +- "self_type" : "type-25789", ++ "referenced_type" : "type-25837", ++ "self_type" : "type-25839", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198168,8 +198210,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *const", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *const", +- "referenced_type" : "type-30933", +- "self_type" : "type-30935", ++ "referenced_type" : "type-30932", ++ "self_type" : "type-30934", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198178,8 +198220,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *const", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *const", +- "referenced_type" : "type-3661", +- "self_type" : "type-3663", ++ "referenced_type" : "type-3613", ++ "self_type" : "type-3615", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198188,8 +198230,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *const", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *const", +- "referenced_type" : "type-5629", +- "self_type" : "type-5631", ++ "referenced_type" : "type-5581", ++ "self_type" : "type-5583", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198198,8 +198240,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *const", + "name" : "std::map, const google::protobuf::FieldDescriptor *, std::less >, std::allocator, const google::protobuf::FieldDescriptor *> > > *const", +- "referenced_type" : "type-8887", +- "self_type" : "type-8889", ++ "referenced_type" : "type-8839", ++ "self_type" : "type-8841", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198208,8 +198250,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *const", + "name" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *const", +- "referenced_type" : "type-12399", +- "self_type" : "type-12401", ++ "referenced_type" : "type-12351", ++ "self_type" : "type-12353", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198218,8 +198260,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *const", + "name" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *const", +- "referenced_type" : "type-16256", +- "self_type" : "type-16258", ++ "referenced_type" : "type-16208", ++ "self_type" : "type-16210", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198228,8 +198270,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *const", + "name" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *const", +- "referenced_type" : "type-20787", +- "self_type" : "type-20789", ++ "referenced_type" : "type-20739", ++ "self_type" : "type-20741", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198238,8 +198280,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *const", + "name" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *const", +- "referenced_type" : "type-25965", +- "self_type" : "type-25967", ++ "referenced_type" : "type-26018", ++ "self_type" : "type-26020", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198248,8 +198290,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *const", + "name" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *const", +- "referenced_type" : "type-31112", +- "self_type" : "type-31114", ++ "referenced_type" : "type-31111", ++ "self_type" : "type-31113", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198258,8 +198300,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *const", + "name" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *const", +- "referenced_type" : "type-3902", +- "self_type" : "type-3904", ++ "referenced_type" : "type-3854", ++ "self_type" : "type-3856", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198268,8 +198310,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *const", + "name" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *const", +- "referenced_type" : "type-5810", +- "self_type" : "type-5812", ++ "referenced_type" : "type-5762", ++ "self_type" : "type-5764", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198278,8 +198320,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *const", + "name" : "std::map, std::allocator >, int>, const google::protobuf::FileDescriptorProto *, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, const google::protobuf::FileDescriptorProto *> > > *const", +- "referenced_type" : "type-9067", +- "self_type" : "type-9069", ++ "referenced_type" : "type-9019", ++ "self_type" : "type-9021", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198288,8 +198330,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *const", + "name" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *const", +- "referenced_type" : "type-12411", +- "self_type" : "type-12413", ++ "referenced_type" : "type-12363", ++ "self_type" : "type-12365", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198298,8 +198340,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *const", + "name" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *const", +- "referenced_type" : "type-16268", +- "self_type" : "type-16270", ++ "referenced_type" : "type-16220", ++ "self_type" : "type-16222", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198308,8 +198350,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *const", + "name" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *const", +- "referenced_type" : "type-20799", +- "self_type" : "type-20801", ++ "referenced_type" : "type-20751", ++ "self_type" : "type-20753", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198318,8 +198360,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *const", + "name" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *const", +- "referenced_type" : "type-25977", +- "self_type" : "type-25979", ++ "referenced_type" : "type-26030", ++ "self_type" : "type-26032", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198328,8 +198370,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *const", + "name" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *const", +- "referenced_type" : "type-31124", +- "self_type" : "type-31126", ++ "referenced_type" : "type-31123", ++ "self_type" : "type-31125", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198338,8 +198380,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *const", + "name" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *const", +- "referenced_type" : "type-3914", +- "self_type" : "type-3916", ++ "referenced_type" : "type-3866", ++ "self_type" : "type-3868", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198348,8 +198390,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *const", + "name" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *const", +- "referenced_type" : "type-5822", +- "self_type" : "type-5824", ++ "referenced_type" : "type-5774", ++ "self_type" : "type-5776", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198358,8 +198400,8 @@ + "is_const" : true, + "linker_set_key" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *const", + "name" : "std::map, std::allocator >, int>, std::pair, std::less, std::allocator >, int> >, std::allocator, std::allocator >, int>, std::pair > > > *const", +- "referenced_type" : "type-9079", +- "self_type" : "type-9081", ++ "referenced_type" : "type-9031", ++ "self_type" : "type-9033", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198378,8 +198420,8 @@ + "is_const" : true, + "linker_set_key" : "void (*const)(const std::__1::basic_string &)", + "name" : "void (*const)(const std::__1::basic_string &)", +- "referenced_type" : "type-6867", +- "self_type" : "type-6883", ++ "referenced_type" : "type-6819", ++ "self_type" : "type-6835", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/map_util.h" + }, +@@ -198411,7 +198453,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -198420,7 +198462,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -198450,14 +198492,14 @@ + "access" : "private", + "field_name" : "_any_metadata_", + "field_offset" : 192, +- "referenced_type" : "type-1847" ++ "referenced_type" : "type-1760" + } + ], + "linker_set_key" : "google::protobuf::Any", + "name" : "google::protobuf::Any", + "record_kind" : "class", +- "referenced_type" : "type-1846", +- "self_type" : "type-1846", ++ "referenced_type" : "type-1759", ++ "self_type" : "type-1759", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/any.pb.h", + "unique_id" : "_ZTSN6google8protobuf3AnyE", +@@ -198548,7 +198590,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -198557,7 +198599,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -198575,13 +198617,13 @@ + "access" : "private", + "field_name" : "methods_", + "field_offset" : 128, +- "referenced_type" : "type-2343" ++ "referenced_type" : "type-2270" + }, + { + "access" : "private", + "field_name" : "options_", + "field_offset" : 256, +- "referenced_type" : "type-2285" ++ "referenced_type" : "type-2214" + }, + { + "access" : "private", +@@ -198593,13 +198635,13 @@ + "access" : "private", + "field_name" : "source_context_", + "field_offset" : 416, +- "referenced_type" : "type-2344" ++ "referenced_type" : "type-2271" + }, + { + "access" : "private", + "field_name" : "mixins_", + "field_offset" : 448, +- "referenced_type" : "type-2346" ++ "referenced_type" : "type-2273" + }, + { + "access" : "private", +@@ -198617,8 +198659,8 @@ + "linker_set_key" : "google::protobuf::Api", + "name" : "google::protobuf::Api", + "record_kind" : "class", +- "referenced_type" : "type-2342", +- "self_type" : "type-2342", ++ "referenced_type" : "type-2269", ++ "self_type" : "type-2269", + "size" : 80, + "source_file" : "/external/protobuf/src/google/protobuf/api.pb.h", + "unique_id" : "_ZTSN6google8protobuf3ApiE", +@@ -198872,11 +198914,11 @@ + ], + "linker_set_key" : "google::protobuf::Arena::is_arena_constructable", + "name" : "google::protobuf::Arena::is_arena_constructable", +- "referenced_type" : "type-6570", +- "self_type" : "type-6570", ++ "referenced_type" : "type-6522", ++ "self_type" : "type-6522", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-4256" ], ++ "template_args" : [ "type-4208" ], + "unique_id" : "_ZTSN6google8protobuf5Arena22is_arena_constructableINS0_6MapKeyEEE" + }, + { +@@ -198889,11 +198931,11 @@ + ], + "linker_set_key" : "google::protobuf::Arena::is_arena_constructable", + "name" : "google::protobuf::Arena::is_arena_constructable", +- "referenced_type" : "type-6571", +- "self_type" : "type-6571", ++ "referenced_type" : "type-6523", ++ "self_type" : "type-6523", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-4244" ], ++ "template_args" : [ "type-4196" ], + "unique_id" : "_ZTSN6google8protobuf5Arena22is_arena_constructableINS0_11MapValueRefEEE" + }, + { +@@ -198906,11 +198948,11 @@ + ], + "linker_set_key" : "google::protobuf::Arena::is_arena_constructable", + "name" : "google::protobuf::Arena::is_arena_constructable", +- "referenced_type" : "type-7408", +- "self_type" : "type-7408", ++ "referenced_type" : "type-7360", ++ "self_type" : "type-7360", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-7215" ], ++ "template_args" : [ "type-7167" ], + "unique_id" : "_ZTSN6google8protobuf5Arena22is_arena_constructableINS0_5ValueEEE" + }, + { +@@ -198923,11 +198965,11 @@ + ], + "linker_set_key" : "google::protobuf::Arena::is_arena_constructable, std::allocator > >", + "name" : "google::protobuf::Arena::is_arena_constructable, std::allocator > >", +- "referenced_type" : "type-7409", +- "self_type" : "type-7409", ++ "referenced_type" : "type-7361", ++ "self_type" : "type-7361", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-7410" ], ++ "template_args" : [ "type-7362" ], + "unique_id" : "_ZTSN6google8protobuf5Arena22is_arena_constructableINSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEEEE" + }, + { +@@ -198940,11 +198982,11 @@ + ], + "linker_set_key" : "google::protobuf::Arena::is_destructor_skippable", + "name" : "google::protobuf::Arena::is_destructor_skippable", +- "referenced_type" : "type-6572", +- "self_type" : "type-6572", ++ "referenced_type" : "type-6524", ++ "self_type" : "type-6524", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-4256" ], ++ "template_args" : [ "type-4208" ], + "unique_id" : "_ZTSN6google8protobuf5Arena23is_destructor_skippableINS0_6MapKeyEEE" + }, + { +@@ -198957,11 +198999,11 @@ + ], + "linker_set_key" : "google::protobuf::Arena::is_destructor_skippable", + "name" : "google::protobuf::Arena::is_destructor_skippable", +- "referenced_type" : "type-6575", +- "self_type" : "type-6575", ++ "referenced_type" : "type-6527", ++ "self_type" : "type-6527", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-4244" ], ++ "template_args" : [ "type-4196" ], + "unique_id" : "_ZTSN6google8protobuf5Arena23is_destructor_skippableINS0_11MapValueRefEEE" + }, + { +@@ -198974,11 +199016,11 @@ + ], + "linker_set_key" : "google::protobuf::Arena::is_destructor_skippable", + "name" : "google::protobuf::Arena::is_destructor_skippable", +- "referenced_type" : "type-7413", +- "self_type" : "type-7413", ++ "referenced_type" : "type-7365", ++ "self_type" : "type-7365", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-7215" ], ++ "template_args" : [ "type-7167" ], + "unique_id" : "_ZTSN6google8protobuf5Arena23is_destructor_skippableINS0_5ValueEEE" + }, + { +@@ -198991,11 +199033,11 @@ + ], + "linker_set_key" : "google::protobuf::Arena::is_destructor_skippable, std::allocator > >", + "name" : "google::protobuf::Arena::is_destructor_skippable, std::allocator > >", +- "referenced_type" : "type-7411", +- "self_type" : "type-7411", ++ "referenced_type" : "type-7363", ++ "self_type" : "type-7363", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/arena.h", +- "template_args" : [ "type-7412" ], ++ "template_args" : [ "type-7364" ], + "unique_id" : "_ZTSN6google8protobuf5Arena23is_destructor_skippableINSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEEEE" + }, + { +@@ -199076,7 +199118,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -199085,7 +199127,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -199109,8 +199151,8 @@ + "linker_set_key" : "google::protobuf::BoolValue", + "name" : "google::protobuf::BoolValue", + "record_kind" : "class", +- "referenced_type" : "type-11054", +- "self_type" : "type-11054", ++ "referenced_type" : "type-11006", ++ "self_type" : "type-11006", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h", + "unique_id" : "_ZTSN6google8protobuf9BoolValueE", +@@ -199201,7 +199243,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -199210,7 +199252,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -199234,8 +199276,8 @@ + "linker_set_key" : "google::protobuf::BytesValue", + "name" : "google::protobuf::BytesValue", + "record_kind" : "class", +- "referenced_type" : "type-11056", +- "self_type" : "type-11056", ++ "referenced_type" : "type-11008", ++ "self_type" : "type-11008", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h", + "unique_id" : "_ZTSN6google8protobuf10BytesValueE", +@@ -199375,8 +199417,8 @@ + ], + "linker_set_key" : "google::protobuf::DebugStringOptions", + "name" : "google::protobuf::DebugStringOptions", +- "referenced_type" : "type-1956", +- "self_type" : "type-1956", ++ "referenced_type" : "type-1881", ++ "self_type" : "type-1881", + "size" : 3, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h", + "unique_id" : "_ZTSN6google8protobuf18DebugStringOptionsE" +@@ -199388,31 +199430,31 @@ + { + "access" : "private", + "field_name" : "name_", +- "referenced_type" : "type-1934" ++ "referenced_type" : "type-1857" + }, + { + "access" : "private", + "field_name" : "full_name_", + "field_offset" : 32, +- "referenced_type" : "type-1934" ++ "referenced_type" : "type-1857" + }, + { + "access" : "private", + "field_name" : "file_", + "field_offset" : 64, +- "referenced_type" : "type-1959" ++ "referenced_type" : "type-1884" + }, + { + "access" : "private", + "field_name" : "containing_type_", + "field_offset" : 96, +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { + "access" : "private", + "field_name" : "options_", + "field_offset" : 128, +- "referenced_type" : "type-2017" ++ "referenced_type" : "type-1943" + }, + { + "access" : "private", +@@ -199436,7 +199478,7 @@ + "access" : "private", + "field_name" : "fields_", + "field_offset" : 224, +- "referenced_type" : "type-1995" ++ "referenced_type" : "type-1921" + }, + { + "access" : "private", +@@ -199448,7 +199490,7 @@ + "access" : "private", + "field_name" : "oneof_decls_", + "field_offset" : 288, +- "referenced_type" : "type-2019" ++ "referenced_type" : "type-1945" + }, + { + "access" : "private", +@@ -199460,7 +199502,7 @@ + "access" : "private", + "field_name" : "nested_types_", + "field_offset" : 352, +- "referenced_type" : "type-1971" ++ "referenced_type" : "type-1897" + }, + { + "access" : "private", +@@ -199472,7 +199514,7 @@ + "access" : "private", + "field_name" : "enum_types_", + "field_offset" : 416, +- "referenced_type" : "type-1972" ++ "referenced_type" : "type-1898" + }, + { + "access" : "private", +@@ -199484,7 +199526,7 @@ + "access" : "private", + "field_name" : "extension_ranges_", + "field_offset" : 480, +- "referenced_type" : "type-2020" ++ "referenced_type" : "type-1946" + }, + { + "access" : "private", +@@ -199496,7 +199538,7 @@ + "access" : "private", + "field_name" : "extensions_", + "field_offset" : 544, +- "referenced_type" : "type-1995" ++ "referenced_type" : "type-1921" + }, + { + "access" : "private", +@@ -199508,7 +199550,7 @@ + "access" : "private", + "field_name" : "reserved_ranges_", + "field_offset" : 608, +- "referenced_type" : "type-2022" ++ "referenced_type" : "type-1948" + }, + { + "access" : "private", +@@ -199520,14 +199562,14 @@ + "access" : "private", + "field_name" : "reserved_names_", + "field_offset" : 672, +- "referenced_type" : "type-2024" ++ "referenced_type" : "type-1950" + } + ], + "linker_set_key" : "google::protobuf::Descriptor", + "name" : "google::protobuf::Descriptor", + "record_kind" : "class", +- "referenced_type" : "type-1958", +- "self_type" : "type-1958", ++ "referenced_type" : "type-1883", ++ "self_type" : "type-1883", + "size" : 88, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h", + "unique_id" : "_ZTSN6google8protobuf10DescriptorE" +@@ -199548,8 +199590,8 @@ + ], + "linker_set_key" : "google::protobuf::Descriptor::ExtensionRange", + "name" : "google::protobuf::Descriptor::ExtensionRange", +- "referenced_type" : "type-2021", +- "self_type" : "type-2021", ++ "referenced_type" : "type-1947", ++ "self_type" : "type-1947", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h", + "unique_id" : "_ZTSN6google8protobuf10Descriptor14ExtensionRangeE" +@@ -199570,8 +199612,8 @@ + ], + "linker_set_key" : "google::protobuf::Descriptor::ReservedRange", + "name" : "google::protobuf::Descriptor::ReservedRange", +- "referenced_type" : "type-2023", +- "self_type" : "type-2023", ++ "referenced_type" : "type-1949", ++ "self_type" : "type-1949", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h", + "unique_id" : "_ZTSN6google8protobuf10Descriptor13ReservedRangeE" +@@ -199581,8 +199623,8 @@ + "linker_set_key" : "google::protobuf::DescriptorDatabase", + "name" : "google::protobuf::DescriptorDatabase", + "record_kind" : "class", +- "referenced_type" : "type-3744", +- "self_type" : "type-3744", ++ "referenced_type" : "type-3696", ++ "self_type" : "type-3696", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h", + "unique_id" : "_ZTSN6google8protobuf18DescriptorDatabaseE", +@@ -199633,25 +199675,25 @@ + "access" : "private", + "field_name" : "fallback_database_", + "field_offset" : 32, +- "referenced_type" : "type-1965" ++ "referenced_type" : "type-1890" + }, + { + "access" : "private", + "field_name" : "default_error_collector_", + "field_offset" : 64, +- "referenced_type" : "type-1967" ++ "referenced_type" : "type-1892" + }, + { + "access" : "private", + "field_name" : "underlay_", + "field_offset" : 96, +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + }, + { + "access" : "private", + "field_name" : "tables_", + "field_offset" : 128, +- "referenced_type" : "type-1822" ++ "referenced_type" : "type-1733" + }, + { + "access" : "private", +@@ -199675,14 +199717,14 @@ + "access" : "private", + "field_name" : "unused_import_track_files_", + "field_offset" : 192, +- "referenced_type" : "type-1969" ++ "referenced_type" : "type-1894" + } + ], + "linker_set_key" : "google::protobuf::DescriptorPool", + "name" : "google::protobuf::DescriptorPool", + "record_kind" : "class", +- "referenced_type" : "type-1964", +- "self_type" : "type-1964", ++ "referenced_type" : "type-1889", ++ "self_type" : "type-1889", + "size" : 36, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h", + "unique_id" : "_ZTSN6google8protobuf14DescriptorPoolE" +@@ -199692,8 +199734,8 @@ + "linker_set_key" : "google::protobuf::DescriptorPool::ErrorCollector", + "name" : "google::protobuf::DescriptorPool::ErrorCollector", + "record_kind" : "class", +- "referenced_type" : "type-1968", +- "self_type" : "type-1968", ++ "referenced_type" : "type-1893", ++ "self_type" : "type-1893", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h", + "unique_id" : "_ZTSN6google8protobuf14DescriptorPool14ErrorCollectorE", +@@ -199728,7 +199770,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3744" ++ "referenced_type" : "type-3696" + } + ], + "fields" : +@@ -199737,14 +199779,14 @@ + "access" : "private", + "field_name" : "pool_", + "field_offset" : 32, +- "referenced_type" : "type-3764" ++ "referenced_type" : "type-3716" + } + ], + "linker_set_key" : "google::protobuf::DescriptorPoolDatabase", + "name" : "google::protobuf::DescriptorPoolDatabase", + "record_kind" : "class", +- "referenced_type" : "type-3763", +- "self_type" : "type-3763", ++ "referenced_type" : "type-3715", ++ "self_type" : "type-3715", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h", + "unique_id" : "_ZTSN6google8protobuf22DescriptorPoolDatabaseE", +@@ -199784,7 +199826,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -199793,7 +199835,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -199817,49 +199859,49 @@ + "access" : "private", + "field_name" : "field_", + "field_offset" : 160, +- "referenced_type" : "type-1678" ++ "referenced_type" : "type-1592" + }, + { + "access" : "private", + "field_name" : "extension_", + "field_offset" : 288, +- "referenced_type" : "type-1678" ++ "referenced_type" : "type-1592" + }, + { + "access" : "private", + "field_name" : "nested_type_", + "field_offset" : 416, +- "referenced_type" : "type-1676" ++ "referenced_type" : "type-1590" + }, + { + "access" : "private", + "field_name" : "enum_type_", + "field_offset" : 544, +- "referenced_type" : "type-1687" ++ "referenced_type" : "type-1601" + }, + { + "access" : "private", + "field_name" : "extension_range_", + "field_offset" : 672, +- "referenced_type" : "type-1695" ++ "referenced_type" : "type-1609" + }, + { + "access" : "private", + "field_name" : "oneof_decl_", + "field_offset" : 800, +- "referenced_type" : "type-1697" ++ "referenced_type" : "type-1611" + }, + { + "access" : "private", + "field_name" : "options_", + "field_offset" : 928, +- "referenced_type" : "type-1699" ++ "referenced_type" : "type-1613" + }, + { + "access" : "private", + "field_name" : "reserved_range_", + "field_offset" : 960, +- "referenced_type" : "type-1701" ++ "referenced_type" : "type-1615" + }, + { + "access" : "private", +@@ -199871,8 +199913,8 @@ + "linker_set_key" : "google::protobuf::DescriptorProto", + "name" : "google::protobuf::DescriptorProto", + "record_kind" : "class", +- "referenced_type" : "type-1677", +- "self_type" : "type-1677", ++ "referenced_type" : "type-1591", ++ "self_type" : "type-1591", + "size" : 152, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h", + "unique_id" : "_ZTSN6google8protobuf15DescriptorProtoE", +@@ -199963,7 +200005,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -199972,7 +200014,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -200002,8 +200044,8 @@ + "linker_set_key" : "google::protobuf::DescriptorProto_ExtensionRange", + "name" : "google::protobuf::DescriptorProto_ExtensionRange", + "record_kind" : "class", +- "referenced_type" : "type-1696", +- "self_type" : "type-1696", ++ "referenced_type" : "type-1610", ++ "self_type" : "type-1610", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h", + "unique_id" : "_ZTSN6google8protobuf30DescriptorProto_ExtensionRangeE", +@@ -200094,7 +200136,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -200103,7 +200145,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -200133,8 +200175,8 @@ + "linker_set_key" : "google::protobuf::DescriptorProto_ReservedRange", + "name" : "google::protobuf::DescriptorProto_ReservedRange", + "record_kind" : "class", +- "referenced_type" : "type-1702", +- "self_type" : "type-1702", ++ "referenced_type" : "type-1616", ++ "self_type" : "type-1616", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h", + "unique_id" : "_ZTSN6google8protobuf29DescriptorProto_ReservedRangeE", +@@ -200225,7 +200267,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -200234,7 +200276,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -200258,8 +200300,8 @@ + "linker_set_key" : "google::protobuf::DoubleValue", + "name" : "google::protobuf::DoubleValue", + "record_kind" : "class", +- "referenced_type" : "type-11048", +- "self_type" : "type-11048", ++ "referenced_type" : "type-11000", ++ "self_type" : "type-11000", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h", + "unique_id" : "_ZTSN6google8protobuf11DoubleValueE", +@@ -200350,7 +200392,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -200359,7 +200401,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -200389,8 +200431,8 @@ + "linker_set_key" : "google::protobuf::Duration", + "name" : "google::protobuf::Duration", + "record_kind" : "class", +- "referenced_type" : "type-4178", +- "self_type" : "type-4178", ++ "referenced_type" : "type-4130", ++ "self_type" : "type-4130", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/duration.pb.h", + "unique_id" : "_ZTSN6google8protobuf8DurationE", +@@ -200481,7 +200523,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2152" ++ "referenced_type" : "type-2083" + } + ], + "fields" : +@@ -200490,7 +200532,7 @@ + "access" : "private", + "field_name" : "pool_", + "field_offset" : 32, +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + }, + { + "access" : "private", +@@ -200502,7 +200544,7 @@ + "access" : "private", + "field_name" : "prototypes_", + "field_offset" : 96, +- "referenced_type" : "type-3698" ++ "referenced_type" : "type-3650" + }, + { + "access" : "private", +@@ -200514,8 +200556,8 @@ + "linker_set_key" : "google::protobuf::DynamicMessageFactory", + "name" : "google::protobuf::DynamicMessageFactory", + "record_kind" : "class", +- "referenced_type" : "type-3863", +- "self_type" : "type-3863", ++ "referenced_type" : "type-3815", ++ "self_type" : "type-3815", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/dynamic_message.h", + "unique_id" : "_ZTSN6google8protobuf21DynamicMessageFactoryE", +@@ -200546,7 +200588,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -200555,7 +200597,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -200573,8 +200615,8 @@ + "linker_set_key" : "google::protobuf::Empty", + "name" : "google::protobuf::Empty", + "record_kind" : "class", +- "referenced_type" : "type-4395", +- "self_type" : "type-4395", ++ "referenced_type" : "type-4347", ++ "self_type" : "type-4347", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/empty.pb.h", + "unique_id" : "_ZTSN6google8protobuf5EmptyE", +@@ -200665,7 +200707,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3744" ++ "referenced_type" : "type-3696" + } + ], + "fields" : +@@ -200674,20 +200716,20 @@ + "access" : "private", + "field_name" : "index_", + "field_offset" : 32, +- "referenced_type" : "type-3756" ++ "referenced_type" : "type-3708" + }, + { + "access" : "private", + "field_name" : "files_to_delete_", + "field_offset" : 320, +- "referenced_type" : "type-3762" ++ "referenced_type" : "type-3714" + } + ], + "linker_set_key" : "google::protobuf::EncodedDescriptorDatabase", + "name" : "google::protobuf::EncodedDescriptorDatabase", + "record_kind" : "class", +- "referenced_type" : "type-3761", +- "self_type" : "type-3761", ++ "referenced_type" : "type-3713", ++ "self_type" : "type-3713", + "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h", + "unique_id" : "_ZTSN6google8protobuf25EncodedDescriptorDatabaseE", +@@ -200727,7 +200769,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -200736,7 +200778,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -200754,19 +200796,19 @@ + "access" : "private", + "field_name" : "enumvalue_", + "field_offset" : 128, +- "referenced_type" : "type-2417" ++ "referenced_type" : "type-2347" + }, + { + "access" : "private", + "field_name" : "options_", + "field_offset" : 256, +- "referenced_type" : "type-2285" ++ "referenced_type" : "type-2214" + }, + { + "access" : "private", + "field_name" : "source_context_", + "field_offset" : 384, +- "referenced_type" : "type-2344" ++ "referenced_type" : "type-2271" + }, + { + "access" : "private", +@@ -200784,8 +200826,8 @@ + "linker_set_key" : "google::protobuf::Enum", + "name" : "google::protobuf::Enum", + "record_kind" : "class", +- "referenced_type" : "type-2495", +- "self_type" : "type-2495", ++ "referenced_type" : "type-2425", ++ "self_type" : "type-2425", + "size" : 60, + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h", + "unique_id" : "_ZTSN6google8protobuf4EnumE", +@@ -200878,31 +200920,31 @@ + { + "access" : "private", + "field_name" : "name_", +- "referenced_type" : "type-1934" ++ "referenced_type" : "type-1857" + }, + { + "access" : "private", + "field_name" : "full_name_", + "field_offset" : 32, +- "referenced_type" : "type-1934" ++ "referenced_type" : "type-1857" + }, + { + "access" : "private", + "field_name" : "file_", + "field_offset" : 64, +- "referenced_type" : "type-1959" ++ "referenced_type" : "type-1884" + }, + { + "access" : "private", + "field_name" : "containing_type_", + "field_offset" : 96, +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { + "access" : "private", + "field_name" : "options_", + "field_offset" : 128, +- "referenced_type" : "type-1976" ++ "referenced_type" : "type-1902" + }, + { + "access" : "private", +@@ -200926,14 +200968,14 @@ + "access" : "private", + "field_name" : "values_", + "field_offset" : 224, +- "referenced_type" : "type-1978" ++ "referenced_type" : "type-1904" + } + ], + "linker_set_key" : "google::protobuf::EnumDescriptor", + "name" : "google::protobuf::EnumDescriptor", + "record_kind" : "class", +- "referenced_type" : "type-1973", +- "self_type" : "type-1973", ++ "referenced_type" : "type-1899", ++ "self_type" : "type-1899", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h", + "unique_id" : "_ZTSN6google8protobuf14EnumDescriptorE" +@@ -200943,7 +200985,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -200952,7 +200994,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -200976,20 +201018,20 @@ + "access" : "private", + "field_name" : "value_", + "field_offset" : 160, +- "referenced_type" : "type-1689" ++ "referenced_type" : "type-1603" + }, + { + "access" : "private", + "field_name" : "options_", + "field_offset" : 288, +- "referenced_type" : "type-1693" ++ "referenced_type" : "type-1607" + } + ], + "linker_set_key" : "google::protobuf::EnumDescriptorProto", + "name" : "google::protobuf::EnumDescriptorProto", + "record_kind" : "class", +- "referenced_type" : "type-1688", +- "self_type" : "type-1688", ++ "referenced_type" : "type-1602", ++ "self_type" : "type-1602", + "size" : 40, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h", + "unique_id" : "_ZTSN6google8protobuf19EnumDescriptorProtoE", +@@ -201080,7 +201122,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -201095,7 +201137,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 160, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -201113,7 +201155,7 @@ + "access" : "private", + "field_name" : "uninterpreted_option_", + "field_offset" : 256, +- "referenced_type" : "type-1682" ++ "referenced_type" : "type-1596" + }, + { + "access" : "private", +@@ -201131,8 +201173,8 @@ + "linker_set_key" : "google::protobuf::EnumOptions", + "name" : "google::protobuf::EnumOptions", + "record_kind" : "class", +- "referenced_type" : "type-1694", +- "self_type" : "type-1694", ++ "referenced_type" : "type-1608", ++ "self_type" : "type-1608", + "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h", + "unique_id" : "_ZTSN6google8protobuf11EnumOptionsE", +@@ -201223,7 +201265,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -201232,7 +201274,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -201250,7 +201292,7 @@ + "access" : "private", + "field_name" : "options_", + "field_offset" : 128, +- "referenced_type" : "type-2285" ++ "referenced_type" : "type-2214" + }, + { + "access" : "private", +@@ -201268,8 +201310,8 @@ + "linker_set_key" : "google::protobuf::EnumValue", + "name" : "google::protobuf::EnumValue", + "record_kind" : "class", +- "referenced_type" : "type-2299", +- "self_type" : "type-2299", ++ "referenced_type" : "type-2226", ++ "self_type" : "type-2226", + "size" : 40, + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h", + "unique_id" : "_ZTSN6google8protobuf9EnumValueE", +@@ -201362,13 +201404,13 @@ + { + "access" : "private", + "field_name" : "name_", +- "referenced_type" : "type-1934" ++ "referenced_type" : "type-1857" + }, + { + "access" : "private", + "field_name" : "full_name_", + "field_offset" : 32, +- "referenced_type" : "type-1934" ++ "referenced_type" : "type-1857" + }, + { + "access" : "private", +@@ -201380,20 +201422,20 @@ + "access" : "private", + "field_name" : "type_", + "field_offset" : 96, +- "referenced_type" : "type-1980" ++ "referenced_type" : "type-1906" + }, + { + "access" : "private", + "field_name" : "options_", + "field_offset" : 128, +- "referenced_type" : "type-1982" ++ "referenced_type" : "type-1908" + } + ], + "linker_set_key" : "google::protobuf::EnumValueDescriptor", + "name" : "google::protobuf::EnumValueDescriptor", + "record_kind" : "class", +- "referenced_type" : "type-1979", +- "self_type" : "type-1979", ++ "referenced_type" : "type-1905", ++ "self_type" : "type-1905", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h", + "unique_id" : "_ZTSN6google8protobuf19EnumValueDescriptorE" +@@ -201403,7 +201445,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -201412,7 +201454,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -201436,7 +201478,7 @@ + "access" : "private", + "field_name" : "options_", + "field_offset" : 160, +- "referenced_type" : "type-1691" ++ "referenced_type" : "type-1605" + }, + { + "access" : "private", +@@ -201448,8 +201490,8 @@ + "linker_set_key" : "google::protobuf::EnumValueDescriptorProto", + "name" : "google::protobuf::EnumValueDescriptorProto", + "record_kind" : "class", +- "referenced_type" : "type-1690", +- "self_type" : "type-1690", ++ "referenced_type" : "type-1604", ++ "self_type" : "type-1604", + "size" : 28, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h", + "unique_id" : "_ZTSN6google8protobuf24EnumValueDescriptorProtoE", +@@ -201540,7 +201582,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -201555,7 +201597,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 160, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -201573,7 +201615,7 @@ + "access" : "private", + "field_name" : "uninterpreted_option_", + "field_offset" : 256, +- "referenced_type" : "type-1682" ++ "referenced_type" : "type-1596" + }, + { + "access" : "private", +@@ -201585,8 +201627,8 @@ + "linker_set_key" : "google::protobuf::EnumValueOptions", + "name" : "google::protobuf::EnumValueOptions", + "record_kind" : "class", +- "referenced_type" : "type-1692", +- "self_type" : "type-1692", ++ "referenced_type" : "type-1606", ++ "self_type" : "type-1606", + "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h", + "unique_id" : "_ZTSN6google8protobuf16EnumValueOptionsE", +@@ -201677,7 +201719,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -201686,7 +201728,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -201734,7 +201776,7 @@ + "access" : "private", + "field_name" : "options_", + "field_offset" : 288, +- "referenced_type" : "type-2285" ++ "referenced_type" : "type-2214" + }, + { + "access" : "private", +@@ -201764,8 +201806,8 @@ + "linker_set_key" : "google::protobuf::Field", + "name" : "google::protobuf::Field", + "record_kind" : "class", +- "referenced_type" : "type-2296", +- "self_type" : "type-2296", ++ "referenced_type" : "type-2223", ++ "self_type" : "type-2223", + "size" : 68, + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h", + "unique_id" : "_ZTSN6google8protobuf5FieldE", +@@ -201858,25 +201900,25 @@ + { + "access" : "private", + "field_name" : "name_", +- "referenced_type" : "type-1934" ++ "referenced_type" : "type-1857" + }, + { + "access" : "private", + "field_name" : "full_name_", + "field_offset" : 32, +- "referenced_type" : "type-1934" ++ "referenced_type" : "type-1857" + }, + { + "access" : "private", + "field_name" : "lowercase_name_", + "field_offset" : 64, +- "referenced_type" : "type-1934" ++ "referenced_type" : "type-1857" + }, + { + "access" : "private", + "field_name" : "camelcase_name_", + "field_offset" : 96, +- "referenced_type" : "type-1934" ++ "referenced_type" : "type-1857" + }, + { + "access" : "private", +@@ -201888,13 +201930,13 @@ + "access" : "private", + "field_name" : "json_name_", + "field_offset" : 160, +- "referenced_type" : "type-1934" ++ "referenced_type" : "type-1857" + }, + { + "access" : "private", + "field_name" : "file_", + "field_offset" : 192, +- "referenced_type" : "type-1959" ++ "referenced_type" : "type-1884" + }, + { + "access" : "private", +@@ -201906,13 +201948,13 @@ + "access" : "private", + "field_name" : "type_", + "field_offset" : 256, +- "referenced_type" : "type-1997" ++ "referenced_type" : "type-1923" + }, + { + "access" : "private", + "field_name" : "label_", + "field_offset" : 288, +- "referenced_type" : "type-1998" ++ "referenced_type" : "type-1924" + }, + { + "access" : "private", +@@ -201930,37 +201972,37 @@ + "access" : "private", + "field_name" : "containing_type_", + "field_offset" : 384, +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { + "access" : "private", + "field_name" : "containing_oneof_", + "field_offset" : 416, +- "referenced_type" : "type-1999" ++ "referenced_type" : "type-1925" + }, + { + "access" : "private", + "field_name" : "extension_scope_", + "field_offset" : 448, +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { + "access" : "private", + "field_name" : "message_type_", + "field_offset" : 480, +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { + "access" : "private", + "field_name" : "enum_type_", + "field_offset" : 512, +- "referenced_type" : "type-1980" ++ "referenced_type" : "type-1906" + }, + { + "access" : "private", + "field_name" : "options_", + "field_offset" : 544, +- "referenced_type" : "type-2005" ++ "referenced_type" : "type-1931" + }, + { + "access" : "private", +@@ -201971,14 +202013,14 @@ + { + "access" : "private", + "field_offset" : 640, +- "referenced_type" : "type-2007" ++ "referenced_type" : "type-1933" + } + ], + "linker_set_key" : "google::protobuf::FieldDescriptor", + "name" : "google::protobuf::FieldDescriptor", + "record_kind" : "class", +- "referenced_type" : "type-1996", +- "self_type" : "type-1996", ++ "referenced_type" : "type-1922", ++ "self_type" : "type-1922", + "size" : 88, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h", + "unique_id" : "_ZTSN6google8protobuf15FieldDescriptorE" +@@ -202018,19 +202060,19 @@ + }, + { + "field_name" : "default_value_enum_", +- "referenced_type" : "type-2008" ++ "referenced_type" : "type-1934" + }, + { + "field_name" : "default_value_string_", +- "referenced_type" : "type-1934" ++ "referenced_type" : "type-1857" + } + ], + "is_anonymous" : true, + "linker_set_key" : "google::protobuf::FieldDescriptor::(anonymous union at external/protobuf/src/google/protobuf/descriptor.h:705:3) at external/protobuf/src/google/protobuf/descriptor.h:705:3", + "name" : "google::protobuf::FieldDescriptor::(anonymous union at external/protobuf/src/google/protobuf/descriptor.h:705:3) at external/protobuf/src/google/protobuf/descriptor.h:705:3", + "record_kind" : "union", +- "referenced_type" : "type-2007", +- "self_type" : "type-2007", ++ "referenced_type" : "type-1933", ++ "self_type" : "type-1933", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h", + "unique_id" : "_ZTSN6google8protobuf15FieldDescriptorUt_E" +@@ -202040,7 +202082,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -202049,7 +202091,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -202121,14 +202163,14 @@ + "access" : "private", + "field_name" : "options_", + "field_offset" : 416, +- "referenced_type" : "type-1680" ++ "referenced_type" : "type-1594" + } + ], + "linker_set_key" : "google::protobuf::FieldDescriptorProto", + "name" : "google::protobuf::FieldDescriptorProto", + "record_kind" : "class", +- "referenced_type" : "type-1679", +- "self_type" : "type-1679", ++ "referenced_type" : "type-1593", ++ "self_type" : "type-1593", + "size" : 56, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h", + "unique_id" : "_ZTSN6google8protobuf20FieldDescriptorProtoE", +@@ -202219,7 +202261,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -202228,7 +202270,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -202252,8 +202294,8 @@ + "linker_set_key" : "google::protobuf::FieldMask", + "name" : "google::protobuf::FieldMask", + "record_kind" : "class", +- "referenced_type" : "type-6346", +- "self_type" : "type-6346", ++ "referenced_type" : "type-6298", ++ "self_type" : "type-6298", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/field_mask.pb.h", + "unique_id" : "_ZTSN6google8protobuf9FieldMaskE", +@@ -202344,7 +202386,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -202359,7 +202401,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 160, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -202389,7 +202431,7 @@ + "access" : "private", + "field_name" : "uninterpreted_option_", + "field_offset" : 320, +- "referenced_type" : "type-1682" ++ "referenced_type" : "type-1596" + }, + { + "access" : "private", +@@ -202419,8 +202461,8 @@ + "linker_set_key" : "google::protobuf::FieldOptions", + "name" : "google::protobuf::FieldOptions", + "record_kind" : "class", +- "referenced_type" : "type-1681", +- "self_type" : "type-1681", ++ "referenced_type" : "type-1595", ++ "self_type" : "type-1595", + "size" : 60, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h", + "unique_id" : "_ZTSN6google8protobuf12FieldOptionsE", +@@ -202513,19 +202555,19 @@ + { + "access" : "private", + "field_name" : "name_", +- "referenced_type" : "type-1934" ++ "referenced_type" : "type-1857" + }, + { + "access" : "private", + "field_name" : "package_", + "field_offset" : 32, +- "referenced_type" : "type-1934" ++ "referenced_type" : "type-1857" + }, + { + "access" : "private", + "field_name" : "pool_", + "field_offset" : 64, +- "referenced_type" : "type-1962" ++ "referenced_type" : "type-1887" + }, + { + "access" : "private", +@@ -202537,7 +202579,7 @@ + "access" : "private", + "field_name" : "dependencies_", + "field_offset" : 128, +- "referenced_type" : "type-1970" ++ "referenced_type" : "type-1895" + }, + { + "access" : "private", +@@ -202573,7 +202615,7 @@ + "access" : "private", + "field_name" : "message_types_", + "field_offset" : 320, +- "referenced_type" : "type-1971" ++ "referenced_type" : "type-1897" + }, + { + "access" : "private", +@@ -202585,7 +202627,7 @@ + "access" : "private", + "field_name" : "enum_types_", + "field_offset" : 384, +- "referenced_type" : "type-1972" ++ "referenced_type" : "type-1898" + }, + { + "access" : "private", +@@ -202597,7 +202639,7 @@ + "access" : "private", + "field_name" : "services_", + "field_offset" : 448, +- "referenced_type" : "type-1984" ++ "referenced_type" : "type-1910" + }, + { + "access" : "private", +@@ -202609,7 +202651,7 @@ + "access" : "private", + "field_name" : "syntax_", + "field_offset" : 512, +- "referenced_type" : "type-1994" ++ "referenced_type" : "type-1920" + }, + { + "access" : "private", +@@ -202621,32 +202663,32 @@ + "access" : "private", + "field_name" : "extensions_", + "field_offset" : 576, +- "referenced_type" : "type-1995" ++ "referenced_type" : "type-1921" + }, + { + "access" : "private", + "field_name" : "options_", + "field_offset" : 608, +- "referenced_type" : "type-2010" ++ "referenced_type" : "type-1936" + }, + { + "access" : "private", + "field_name" : "tables_", + "field_offset" : 640, +- "referenced_type" : "type-2012" ++ "referenced_type" : "type-1938" + }, + { + "access" : "private", + "field_name" : "source_code_info_", + "field_offset" : 672, +- "referenced_type" : "type-2015" ++ "referenced_type" : "type-1941" + } + ], + "linker_set_key" : "google::protobuf::FileDescriptor", + "name" : "google::protobuf::FileDescriptor", + "record_kind" : "class", +- "referenced_type" : "type-1961", +- "self_type" : "type-1961", ++ "referenced_type" : "type-1886", ++ "self_type" : "type-1886", + "size" : 88, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h", + "unique_id" : "_ZTSN6google8protobuf14FileDescriptorE" +@@ -202656,7 +202698,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -202665,7 +202707,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -202713,37 +202755,37 @@ + "access" : "private", + "field_name" : "message_type_", + "field_offset" : 512, +- "referenced_type" : "type-1676" ++ "referenced_type" : "type-1590" + }, + { + "access" : "private", + "field_name" : "enum_type_", + "field_offset" : 640, +- "referenced_type" : "type-1687" ++ "referenced_type" : "type-1601" + }, + { + "access" : "private", + "field_name" : "service_", + "field_offset" : 768, +- "referenced_type" : "type-1703" ++ "referenced_type" : "type-1617" + }, + { + "access" : "private", + "field_name" : "extension_", + "field_offset" : 896, +- "referenced_type" : "type-1678" ++ "referenced_type" : "type-1592" + }, + { + "access" : "private", + "field_name" : "options_", + "field_offset" : 1024, +- "referenced_type" : "type-1711" ++ "referenced_type" : "type-1625" + }, + { + "access" : "private", + "field_name" : "source_code_info_", + "field_offset" : 1056, +- "referenced_type" : "type-1713" ++ "referenced_type" : "type-1627" + }, + { + "access" : "private", +@@ -202755,8 +202797,8 @@ + "linker_set_key" : "google::protobuf::FileDescriptorProto", + "name" : "google::protobuf::FileDescriptorProto", + "record_kind" : "class", +- "referenced_type" : "type-1674", +- "self_type" : "type-1674", ++ "referenced_type" : "type-1587", ++ "self_type" : "type-1587", + "size" : 140, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h", + "unique_id" : "_ZTSN6google8protobuf19FileDescriptorProtoE", +@@ -202847,7 +202889,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -202856,7 +202898,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -202874,14 +202916,14 @@ + "access" : "private", + "field_name" : "file_", + "field_offset" : 128, +- "referenced_type" : "type-2061" ++ "referenced_type" : "type-1993" + } + ], + "linker_set_key" : "google::protobuf::FileDescriptorSet", + "name" : "google::protobuf::FileDescriptorSet", + "record_kind" : "class", +- "referenced_type" : "type-2211", +- "self_type" : "type-2211", ++ "referenced_type" : "type-2142", ++ "self_type" : "type-2142", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h", + "unique_id" : "_ZTSN6google8protobuf17FileDescriptorSetE", +@@ -202972,7 +203014,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -202987,7 +203029,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 160, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -203065,7 +203107,7 @@ + "access" : "private", + "field_name" : "uninterpreted_option_", + "field_offset" : 480, +- "referenced_type" : "type-1682" ++ "referenced_type" : "type-1596" + }, + { + "access" : "private", +@@ -203095,8 +203137,8 @@ + "linker_set_key" : "google::protobuf::FileOptions", + "name" : "google::protobuf::FileOptions", + "record_kind" : "class", +- "referenced_type" : "type-1712", +- "self_type" : "type-1712", ++ "referenced_type" : "type-1626", ++ "self_type" : "type-1626", + "size" : 80, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h", + "unique_id" : "_ZTSN6google8protobuf11FileOptionsE", +@@ -203187,7 +203229,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -203196,7 +203238,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -203220,8 +203262,8 @@ + "linker_set_key" : "google::protobuf::FloatValue", + "name" : "google::protobuf::FloatValue", + "record_kind" : "class", +- "referenced_type" : "type-11049", +- "self_type" : "type-11049", ++ "referenced_type" : "type-11001", ++ "self_type" : "type-11001", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h", + "unique_id" : "_ZTSN6google8protobuf10FloatValueE", +@@ -203312,7 +203354,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -203321,7 +203363,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -203339,14 +203381,14 @@ + "access" : "private", + "field_name" : "annotation_", + "field_offset" : 128, +- "referenced_type" : "type-2133" ++ "referenced_type" : "type-2064" + } + ], + "linker_set_key" : "google::protobuf::GeneratedCodeInfo", + "name" : "google::protobuf::GeneratedCodeInfo", + "record_kind" : "class", +- "referenced_type" : "type-2261", +- "self_type" : "type-2261", ++ "referenced_type" : "type-2190", ++ "self_type" : "type-2190", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h", + "unique_id" : "_ZTSN6google8protobuf17GeneratedCodeInfoE", +@@ -203437,7 +203479,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -203446,7 +203488,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -203494,8 +203536,8 @@ + "linker_set_key" : "google::protobuf::GeneratedCodeInfo_Annotation", + "name" : "google::protobuf::GeneratedCodeInfo_Annotation", + "record_kind" : "class", +- "referenced_type" : "type-1735", +- "self_type" : "type-1735", ++ "referenced_type" : "type-1648", ++ "self_type" : "type-1648", + "size" : 44, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h", + "unique_id" : "_ZTSN6google8protobuf28GeneratedCodeInfo_AnnotationE", +@@ -203605,7 +203647,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -203614,7 +203656,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -203638,8 +203680,8 @@ + "linker_set_key" : "google::protobuf::Int32Value", + "name" : "google::protobuf::Int32Value", + "record_kind" : "class", +- "referenced_type" : "type-11052", +- "self_type" : "type-11052", ++ "referenced_type" : "type-11004", ++ "self_type" : "type-11004", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h", + "unique_id" : "_ZTSN6google8protobuf10Int32ValueE", +@@ -203730,7 +203772,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -203739,7 +203781,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -203763,8 +203805,8 @@ + "linker_set_key" : "google::protobuf::Int64Value", + "name" : "google::protobuf::Int64Value", + "record_kind" : "class", +- "referenced_type" : "type-11050", +- "self_type" : "type-11050", ++ "referenced_type" : "type-11002", ++ "self_type" : "type-11002", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/wrappers.pb.h", + "unique_id" : "_ZTSN6google8protobuf10Int64ValueE", +@@ -203855,7 +203897,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -203864,7 +203906,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -203876,7 +203918,7 @@ + "access" : "private", + "field_name" : "values_", + "field_offset" : 96, +- "referenced_type" : "type-7235" ++ "referenced_type" : "type-7187" + }, + { + "access" : "private", +@@ -203888,8 +203930,8 @@ + "linker_set_key" : "google::protobuf::ListValue", + "name" : "google::protobuf::ListValue", + "record_kind" : "class", +- "referenced_type" : "type-7234", +- "self_type" : "type-7234", ++ "referenced_type" : "type-7186", ++ "self_type" : "type-7186", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/struct.pb.h", + "unique_id" : "_ZTSN6google8protobuf9ListValueE", +@@ -203993,19 +204035,19 @@ + [ + { + "field_name" : "elements_", +- "referenced_type" : "type-4279" ++ "referenced_type" : "type-4231" + }, + { + "field_name" : "deprecated_elements_", +- "referenced_type" : "type-4281" ++ "referenced_type" : "type-4233" + } + ], + "is_anonymous" : true, + "linker_set_key" : "google::protobuf::Map::(anonymous union at external/protobuf/src/google/protobuf/map.h:1667:3) at external/protobuf/src/google/protobuf/map.h:1667:3", + "name" : "google::protobuf::Map::(anonymous union at external/protobuf/src/google/protobuf/map.h:1667:3) at external/protobuf/src/google/protobuf/map.h:1667:3", + "record_kind" : "union", +- "referenced_type" : "type-4278", +- "self_type" : "type-4278", ++ "referenced_type" : "type-4230", ++ "self_type" : "type-4230", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", + "unique_id" : "_ZTSN6google8protobuf3MapINS0_6MapKeyENS0_11MapValueRefEEUt_E" +@@ -204017,7 +204059,7 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-4255" ++ "referenced_type" : "type-4207" + } + ], + "fields" : +@@ -204055,14 +204097,14 @@ + "access" : "private", + "field_name" : "alloc_", + "field_offset" : 160, +- "referenced_type" : "type-6514" ++ "referenced_type" : "type-6466" + } + ], + "linker_set_key" : "google::protobuf::Map::InnerMap", + "name" : "google::protobuf::Map::InnerMap", + "record_kind" : "class", +- "referenced_type" : "type-6513", +- "self_type" : "type-6513", ++ "referenced_type" : "type-6465", ++ "self_type" : "type-6465", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", + "unique_id" : "_ZTSN6google8protobuf3MapINS0_6MapKeyENS0_11MapValueRefEE8InnerMapE" +@@ -204072,8 +204114,8 @@ + "alignment" : 1, + "linker_set_key" : "google::protobuf::Map::InnerMap::KeyCompare", + "name" : "google::protobuf::Map::InnerMap::KeyCompare", +- "referenced_type" : "type-6648", +- "self_type" : "type-6648", ++ "referenced_type" : "type-6600", ++ "self_type" : "type-6600", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", + "unique_id" : "_ZTSN6google8protobuf3MapINS0_6MapKeyENS0_11MapValueRefEE8InnerMap10KeyCompareE" +@@ -204085,18 +204127,18 @@ + [ + { + "field_name" : "kv", +- "referenced_type" : "type-6515" ++ "referenced_type" : "type-6467" + }, + { + "field_name" : "next", + "field_offset" : 192, +- "referenced_type" : "type-6585" ++ "referenced_type" : "type-6537" + } + ], + "linker_set_key" : "google::protobuf::Map::InnerMap::Node", + "name" : "google::protobuf::Map::InnerMap::Node", +- "referenced_type" : "type-6584", +- "self_type" : "type-6584", ++ "referenced_type" : "type-6536", ++ "self_type" : "type-6536", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", + "unique_id" : "_ZTSN6google8protobuf3MapINS0_6MapKeyENS0_11MapValueRefEE8InnerMap4NodeE" +@@ -204107,12 +204149,12 @@ + [ + { + "field_name" : "node_", +- "referenced_type" : "type-6585" ++ "referenced_type" : "type-6537" + }, + { + "field_name" : "m_", + "field_offset" : 32, +- "referenced_type" : "type-6652" ++ "referenced_type" : "type-6604" + }, + { + "field_name" : "bucket_index_", +@@ -204122,17 +204164,17 @@ + { + "field_name" : "tree_it_", + "field_offset" : 96, +- "referenced_type" : "type-6658" ++ "referenced_type" : "type-6610" + } + ], + "linker_set_key" : "google::protobuf::Map::InnerMap::iterator_base::KeyValuePair>", + "name" : "google::protobuf::Map::InnerMap::iterator_base::KeyValuePair>", + "record_kind" : "class", +- "referenced_type" : "type-6657", +- "self_type" : "type-6657", ++ "referenced_type" : "type-6609", ++ "self_type" : "type-6609", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-6579" ], ++ "template_args" : [ "type-6531" ], + "unique_id" : "_ZTSN6google8protobuf3MapINS0_6MapKeyENS0_11MapValueRefEE8InnerMap13iterator_baseIKNS4_12KeyValuePairEEE" + }, + { +@@ -204141,12 +204183,12 @@ + [ + { + "field_name" : "node_", +- "referenced_type" : "type-6585" ++ "referenced_type" : "type-6537" + }, + { + "field_name" : "m_", + "field_offset" : 32, +- "referenced_type" : "type-6652" ++ "referenced_type" : "type-6604" + }, + { + "field_name" : "bucket_index_", +@@ -204156,17 +204198,17 @@ + { + "field_name" : "tree_it_", + "field_offset" : 96, +- "referenced_type" : "type-6654" ++ "referenced_type" : "type-6606" + } + ], + "linker_set_key" : "google::protobuf::Map::InnerMap::iterator_base::KeyValuePair>", + "name" : "google::protobuf::Map::InnerMap::iterator_base::KeyValuePair>", + "record_kind" : "class", +- "referenced_type" : "type-6651", +- "self_type" : "type-6651", ++ "referenced_type" : "type-6603", ++ "self_type" : "type-6603", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-6515" ], ++ "template_args" : [ "type-6467" ], + "unique_id" : "_ZTSN6google8protobuf3MapINS0_6MapKeyENS0_11MapValueRefEE8InnerMap13iterator_baseINS4_12KeyValuePairEEE" + }, + { +@@ -204177,20 +204219,20 @@ + { + "access" : "private", + "field_name" : "k_", +- "referenced_type" : "type-4256" ++ "referenced_type" : "type-4208" + }, + { + "access" : "private", + "field_name" : "v_", + "field_offset" : 128, +- "referenced_type" : "type-6506" ++ "referenced_type" : "type-6458" + } + ], + "linker_set_key" : "google::protobuf::Map::KeyValuePair", + "name" : "google::protobuf::Map::KeyValuePair", + "record_kind" : "class", +- "referenced_type" : "type-6515", +- "self_type" : "type-6515", ++ "referenced_type" : "type-6467", ++ "self_type" : "type-6467", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", + "unique_id" : "_ZTSN6google8protobuf3MapINS0_6MapKeyENS0_11MapValueRefEE12KeyValuePairE" +@@ -204199,41 +204241,41 @@ + "alignment" : 1, + "linker_set_key" : "google::protobuf::Map::MapAllocator::rebind::InnerMap::Node>", + "name" : "google::protobuf::Map::MapAllocator::rebind::InnerMap::Node>", +- "referenced_type" : "type-6583", +- "self_type" : "type-6583", ++ "referenced_type" : "type-6535", ++ "self_type" : "type-6535", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-6584" ], ++ "template_args" : [ "type-6536" ], + "unique_id" : "_ZTSN6google8protobuf3MapINS0_6MapKeyENS0_11MapValueRefEE12MapAllocatorINS4_12KeyValuePairEE6rebindINS4_8InnerMap4NodeEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "google::protobuf::Map::MapAllocator::rebind", + "name" : "google::protobuf::Map::MapAllocator::rebind", +- "referenced_type" : "type-6581", +- "self_type" : "type-6581", ++ "referenced_type" : "type-6533", ++ "self_type" : "type-6533", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-4383" ], ++ "template_args" : [ "type-4335" ], + "unique_id" : "_ZTSN6google8protobuf3MapINS0_6MapKeyENS0_11MapValueRefEE12MapAllocatorINS4_12KeyValuePairEE6rebindIPS2_EE" + }, + { + "alignment" : 1, + "linker_set_key" : "google::protobuf::Map::MapAllocator::rebind::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > >", + "name" : "google::protobuf::Map::MapAllocator::rebind::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > >", +- "referenced_type" : "type-6586", +- "self_type" : "type-6586", ++ "referenced_type" : "type-6538", ++ "self_type" : "type-6538", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-6587" ], ++ "template_args" : [ "type-6539" ], + "unique_id" : "_ZTSN6google8protobuf3MapINS0_6MapKeyENS0_11MapValueRefEE12MapAllocatorINS4_12KeyValuePairEE6rebindINSt3__13setIPS2_NS4_8InnerMap10KeyCompareENS5_ISB_EEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "google::protobuf::Map::MapAllocator::rebind", + "name" : "google::protobuf::Map::MapAllocator::rebind", +- "referenced_type" : "type-6582", +- "self_type" : "type-6582", ++ "referenced_type" : "type-6534", ++ "self_type" : "type-6534", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", + "template_args" : [ "type-201" ], +@@ -204243,44 +204285,44 @@ + "alignment" : 1, + "linker_set_key" : "google::protobuf::Map::MapAllocator::rebind >", + "name" : "google::protobuf::Map::MapAllocator::rebind >", +- "referenced_type" : "type-6593", +- "self_type" : "type-6593", ++ "referenced_type" : "type-6545", ++ "self_type" : "type-6545", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-6594" ], ++ "template_args" : [ "type-6546" ], + "unique_id" : "_ZTSN6google8protobuf3MapINS0_6MapKeyENS0_11MapValueRefEE12MapAllocatorIPS2_E6rebindINSt3__111__tree_nodeIS6_PvEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "google::protobuf::Map::MapAllocator<__tree_node >::rebind >", + "name" : "google::protobuf::Map::MapAllocator<__tree_node >::rebind >", +- "referenced_type" : "type-6626", +- "self_type" : "type-6626", ++ "referenced_type" : "type-6578", ++ "self_type" : "type-6578", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-6627" ], ++ "template_args" : [ "type-6579" ], + "unique_id" : "_ZTSN6google8protobuf3MapINS0_6MapKeyENS0_11MapValueRefEE12MapAllocatorINSt3__111__tree_nodeIPS2_PvEEE6rebindINS6_16__tree_node_baseIS9_EEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "google::protobuf::Map::MapAllocator<__tree_node<__value_type *>, void *> >::rebind >", + "name" : "google::protobuf::Map::MapAllocator<__tree_node<__value_type *>, void *> >::rebind >", +- "referenced_type" : "type-6610", +- "self_type" : "type-6610", ++ "referenced_type" : "type-6562", ++ "self_type" : "type-6562", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-6611" ], ++ "template_args" : [ "type-6563" ], + "unique_id" : "_ZTSN6google8protobuf3MapINS0_6MapKeyENS0_11MapValueRefEE12MapAllocatorINSt3__111__tree_nodeINS6_12__value_typeIS2_PNS0_7MapPairIS2_S3_EEEEPvEEE6rebindINS6_16__tree_node_baseISD_EEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "google::protobuf::Map::MapAllocator<__value_type *> >::rebind *>, void *> >", + "name" : "google::protobuf::Map::MapAllocator<__value_type *> >::rebind *>, void *> >", +- "referenced_type" : "type-6598", +- "self_type" : "type-6598", ++ "referenced_type" : "type-6550", ++ "self_type" : "type-6550", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-6599" ], ++ "template_args" : [ "type-6551" ], + "unique_id" : "_ZTSN6google8protobuf3MapINS0_6MapKeyENS0_11MapValueRefEE12MapAllocatorINSt3__112__value_typeIS2_PNS0_7MapPairIS2_S3_EEEEE6rebindINS6_11__tree_nodeISB_PvEEEE" + }, + { +@@ -204296,11 +204338,11 @@ + "linker_set_key" : "google::protobuf::Map::MapAllocator::InnerMap::Node>", + "name" : "google::protobuf::Map::MapAllocator::InnerMap::Node>", + "record_kind" : "class", +- "referenced_type" : "type-6630", +- "self_type" : "type-6630", ++ "referenced_type" : "type-6582", ++ "self_type" : "type-6582", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-6584" ], ++ "template_args" : [ "type-6536" ], + "unique_id" : "_ZTSN6google8protobuf3MapINS0_6MapKeyENS0_11MapValueRefEE12MapAllocatorINS4_8InnerMap4NodeEEE" + }, + { +@@ -204316,11 +204358,11 @@ + "linker_set_key" : "google::protobuf::Map::MapAllocator::KeyValuePair>", + "name" : "google::protobuf::Map::MapAllocator::KeyValuePair>", + "record_kind" : "class", +- "referenced_type" : "type-6514", +- "self_type" : "type-6514", ++ "referenced_type" : "type-6466", ++ "self_type" : "type-6466", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-6515" ], ++ "template_args" : [ "type-6467" ], + "unique_id" : "_ZTSN6google8protobuf3MapINS0_6MapKeyENS0_11MapValueRefEE12MapAllocatorINS4_12KeyValuePairEEE" + }, + { +@@ -204336,22 +204378,22 @@ + "linker_set_key" : "google::protobuf::Map::MapAllocator", + "name" : "google::protobuf::Map::MapAllocator", + "record_kind" : "class", +- "referenced_type" : "type-6591", +- "self_type" : "type-6591", ++ "referenced_type" : "type-6543", ++ "self_type" : "type-6543", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-4383" ], ++ "template_args" : [ "type-4335" ], + "unique_id" : "_ZTSN6google8protobuf3MapINS0_6MapKeyENS0_11MapValueRefEE12MapAllocatorIPS2_EE" + }, + { + "alignment" : 1, + "linker_set_key" : "google::protobuf::Map::MapAllocator *> >::rebind *> >", + "name" : "google::protobuf::Map::MapAllocator *> >::rebind *> >", +- "referenced_type" : "type-6589", +- "self_type" : "type-6589", ++ "referenced_type" : "type-6541", ++ "self_type" : "type-6541", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-6590" ], ++ "template_args" : [ "type-6542" ], + "unique_id" : "_ZTSN6google8protobuf3MapINS0_6MapKeyENS0_11MapValueRefEE12MapAllocatorINSt3__14pairIKS2_PNS0_7MapPairIS2_S3_EEEEE6rebindINS6_12__value_typeIS2_SB_EEEE" + }, + { +@@ -204367,11 +204409,11 @@ + "linker_set_key" : "google::protobuf::Map::MapAllocator >", + "name" : "google::protobuf::Map::MapAllocator >", + "record_kind" : "class", +- "referenced_type" : "type-6614", +- "self_type" : "type-6614", ++ "referenced_type" : "type-6566", ++ "self_type" : "type-6566", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-6615" ], ++ "template_args" : [ "type-6567" ], + "unique_id" : "_ZTSN6google8protobuf3MapINS0_6MapKeyENS0_11MapValueRefEE12MapAllocatorINSt3__111__tree_nodeIPS2_PvEEEE" + }, + { +@@ -204387,11 +204429,11 @@ + "linker_set_key" : "google::protobuf::Map::MapAllocator *>, void *> >", + "name" : "google::protobuf::Map::MapAllocator *>, void *> >", + "record_kind" : "class", +- "referenced_type" : "type-6600", +- "self_type" : "type-6600", ++ "referenced_type" : "type-6552", ++ "self_type" : "type-6552", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-6601" ], ++ "template_args" : [ "type-6553" ], + "unique_id" : "_ZTSN6google8protobuf3MapINS0_6MapKeyENS0_11MapValueRefEE12MapAllocatorINSt3__111__tree_nodeINS6_12__value_typeIS2_PNS0_7MapPairIS2_S3_EEEEPvEEEE" + }, + { +@@ -204407,11 +204449,11 @@ + "linker_set_key" : "google::protobuf::Map::MapAllocator >", + "name" : "google::protobuf::Map::MapAllocator >", + "record_kind" : "class", +- "referenced_type" : "type-6612", +- "self_type" : "type-6612", ++ "referenced_type" : "type-6564", ++ "self_type" : "type-6564", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-6613" ], ++ "template_args" : [ "type-6565" ], + "unique_id" : "_ZTSN6google8protobuf3MapINS0_6MapKeyENS0_11MapValueRefEE12MapAllocatorINSt3__116__tree_node_baseIPvEEEE" + }, + { +@@ -204427,11 +204469,11 @@ + "linker_set_key" : "google::protobuf::Map::MapAllocator *> >", + "name" : "google::protobuf::Map::MapAllocator *> >", + "record_kind" : "class", +- "referenced_type" : "type-6595", +- "self_type" : "type-6595", ++ "referenced_type" : "type-6547", ++ "self_type" : "type-6547", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-6596" ], ++ "template_args" : [ "type-6548" ], + "unique_id" : "_ZTSN6google8protobuf3MapINS0_6MapKeyENS0_11MapValueRefEE12MapAllocatorINSt3__112__value_typeIS2_PNS0_7MapPairIS2_S3_EEEEEE" + }, + { +@@ -204447,11 +204489,11 @@ + "linker_set_key" : "google::protobuf::Map::MapAllocator *> >", + "name" : "google::protobuf::Map::MapAllocator *> >", + "record_kind" : "class", +- "referenced_type" : "type-6509", +- "self_type" : "type-6509", ++ "referenced_type" : "type-6461", ++ "self_type" : "type-6461", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-6510" ], ++ "template_args" : [ "type-6462" ], + "unique_id" : "_ZTSN6google8protobuf3MapINS0_6MapKeyENS0_11MapValueRefEE12MapAllocatorINSt3__14pairIKS2_PNS0_7MapPairIS2_S3_EEEEEE" + }, + { +@@ -204467,11 +204509,11 @@ + "linker_set_key" : "google::protobuf::Map::MapAllocator::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > >", + "name" : "google::protobuf::Map::MapAllocator::InnerMap::KeyCompare, google::protobuf::Map::MapAllocator > >", + "record_kind" : "class", +- "referenced_type" : "type-6634", +- "self_type" : "type-6634", ++ "referenced_type" : "type-6586", ++ "self_type" : "type-6586", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-6635" ], ++ "template_args" : [ "type-6587" ], + "unique_id" : "_ZTSN6google8protobuf3MapINS0_6MapKeyENS0_11MapValueRefEE12MapAllocatorINSt3__13setIPS2_NS4_8InnerMap10KeyCompareENS5_IS8_EEEEEE" + }, + { +@@ -204487,8 +204529,8 @@ + "linker_set_key" : "google::protobuf::Map::MapAllocator", + "name" : "google::protobuf::Map::MapAllocator", + "record_kind" : "class", +- "referenced_type" : "type-6628", +- "self_type" : "type-6628", ++ "referenced_type" : "type-6580", ++ "self_type" : "type-6580", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", + "template_args" : [ "type-201" ], +@@ -204500,10 +204542,10 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-6668" ++ "referenced_type" : "type-6620" + }, + { +- "referenced_type" : "type-6676" ++ "referenced_type" : "type-6628" + } + ], + "fields" : +@@ -204512,20 +204554,20 @@ + "access" : "private", + "field_name" : "it_", + "field_offset" : 32, +- "referenced_type" : "type-6657" ++ "referenced_type" : "type-6609" + }, + { + "access" : "private", + "field_name" : "dit_", + "field_offset" : 160, +- "referenced_type" : "type-6675" ++ "referenced_type" : "type-6627" + } + ], + "linker_set_key" : "google::protobuf::Map::const_iterator", + "name" : "google::protobuf::Map::const_iterator", + "record_kind" : "class", +- "referenced_type" : "type-6674", +- "self_type" : "type-6674", ++ "referenced_type" : "type-6626", ++ "self_type" : "type-6626", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", + "unique_id" : "_ZTSN6google8protobuf3MapINS0_6MapKeyENS0_11MapValueRefEE14const_iteratorE" +@@ -204536,10 +204578,10 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-6668" ++ "referenced_type" : "type-6620" + }, + { +- "referenced_type" : "type-6690" ++ "referenced_type" : "type-6642" + } + ], + "fields" : +@@ -204548,20 +204590,20 @@ + "access" : "private", + "field_name" : "it_", + "field_offset" : 32, +- "referenced_type" : "type-6651" ++ "referenced_type" : "type-6603" + }, + { + "access" : "private", + "field_name" : "dit_", + "field_offset" : 160, +- "referenced_type" : "type-6689" ++ "referenced_type" : "type-6641" + } + ], + "linker_set_key" : "google::protobuf::Map::iterator", + "name" : "google::protobuf::Map::iterator", + "record_kind" : "class", +- "referenced_type" : "type-6688", +- "self_type" : "type-6688", ++ "referenced_type" : "type-6640", ++ "self_type" : "type-6640", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", + "unique_id" : "_ZTSN6google8protobuf3MapINS0_6MapKeyENS0_11MapValueRefEE8iteratorE" +@@ -204573,14 +204615,14 @@ + { + "access" : "private", + "field_name" : "iterator_style_", +- "referenced_type" : "type-6669" ++ "referenced_type" : "type-6621" + } + ], + "linker_set_key" : "google::protobuf::Map::iterator_base", + "name" : "google::protobuf::Map::iterator_base", + "record_kind" : "class", +- "referenced_type" : "type-6668", +- "self_type" : "type-6668", ++ "referenced_type" : "type-6620", ++ "self_type" : "type-6620", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", + "unique_id" : "_ZTSN6google8protobuf3MapINS0_6MapKeyENS0_11MapValueRefEE13iterator_baseE" +@@ -204592,19 +204634,19 @@ + [ + { + "field_name" : "elements_", +- "referenced_type" : "type-7204" ++ "referenced_type" : "type-7156" + }, + { + "field_name" : "deprecated_elements_", +- "referenced_type" : "type-7237" ++ "referenced_type" : "type-7189" + } + ], + "is_anonymous" : true, + "linker_set_key" : "google::protobuf::Map, Value>::(anonymous union at external/protobuf/src/google/protobuf/map.h:1667:3) at external/protobuf/src/google/protobuf/map.h:1667:3", + "name" : "google::protobuf::Map, Value>::(anonymous union at external/protobuf/src/google/protobuf/map.h:1667:3) at external/protobuf/src/google/protobuf/map.h:1667:3", + "record_kind" : "union", +- "referenced_type" : "type-7203", +- "self_type" : "type-7203", ++ "referenced_type" : "type-7155", ++ "self_type" : "type-7155", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", + "unique_id" : "_ZTSN6google8protobuf3MapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS0_5ValueEEUt_E" +@@ -204654,14 +204696,14 @@ + "access" : "private", + "field_name" : "alloc_", + "field_offset" : 160, +- "referenced_type" : "type-7207" ++ "referenced_type" : "type-7159" + } + ], + "linker_set_key" : "google::protobuf::Map, Value>::InnerMap", + "name" : "google::protobuf::Map, Value>::InnerMap", + "record_kind" : "class", +- "referenced_type" : "type-7205", +- "self_type" : "type-7205", ++ "referenced_type" : "type-7157", ++ "self_type" : "type-7157", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", + "unique_id" : "_ZTSN6google8protobuf3MapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS0_5ValueEE8InnerMapE" +@@ -204671,8 +204713,8 @@ + "alignment" : 1, + "linker_set_key" : "google::protobuf::Map, Value>::InnerMap::KeyCompare", + "name" : "google::protobuf::Map, Value>::InnerMap::KeyCompare", +- "referenced_type" : "type-7489", +- "self_type" : "type-7489", ++ "referenced_type" : "type-7441", ++ "self_type" : "type-7441", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", + "unique_id" : "_ZTSN6google8protobuf3MapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS0_5ValueEE8InnerMap10KeyCompareE" +@@ -204684,18 +204726,18 @@ + [ + { + "field_name" : "kv", +- "referenced_type" : "type-7209" ++ "referenced_type" : "type-7161" + }, + { + "field_name" : "next", + "field_offset" : 128, +- "referenced_type" : "type-7427" ++ "referenced_type" : "type-7379" + } + ], + "linker_set_key" : "google::protobuf::Map, Value>::InnerMap::Node", + "name" : "google::protobuf::Map, Value>::InnerMap::Node", +- "referenced_type" : "type-7426", +- "self_type" : "type-7426", ++ "referenced_type" : "type-7378", ++ "self_type" : "type-7378", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", + "unique_id" : "_ZTSN6google8protobuf3MapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS0_5ValueEE8InnerMap4NodeE" +@@ -204706,12 +204748,12 @@ + [ + { + "field_name" : "node_", +- "referenced_type" : "type-7427" ++ "referenced_type" : "type-7379" + }, + { + "field_name" : "m_", + "field_offset" : 32, +- "referenced_type" : "type-7494" ++ "referenced_type" : "type-7446" + }, + { + "field_name" : "bucket_index_", +@@ -204721,17 +204763,17 @@ + { + "field_name" : "tree_it_", + "field_offset" : 96, +- "referenced_type" : "type-7503" ++ "referenced_type" : "type-7455" + } + ], + "linker_set_key" : "google::protobuf::Map, Value>::InnerMap::iterator_base, Value>::KeyValuePair>", + "name" : "google::protobuf::Map, Value>::InnerMap::iterator_base, Value>::KeyValuePair>", + "record_kind" : "class", +- "referenced_type" : "type-7502", +- "self_type" : "type-7502", ++ "referenced_type" : "type-7454", ++ "self_type" : "type-7454", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-7420" ], ++ "template_args" : [ "type-7372" ], + "unique_id" : "_ZTSN6google8protobuf3MapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS0_5ValueEE8InnerMap13iterator_baseIKNSA_12KeyValuePairEEE" + }, + { +@@ -204740,12 +204782,12 @@ + [ + { + "field_name" : "node_", +- "referenced_type" : "type-7427" ++ "referenced_type" : "type-7379" + }, + { + "field_name" : "m_", + "field_offset" : 32, +- "referenced_type" : "type-7494" ++ "referenced_type" : "type-7446" + }, + { + "field_name" : "bucket_index_", +@@ -204755,17 +204797,17 @@ + { + "field_name" : "tree_it_", + "field_offset" : 96, +- "referenced_type" : "type-7496" ++ "referenced_type" : "type-7448" + } + ], + "linker_set_key" : "google::protobuf::Map, Value>::InnerMap::iterator_base, Value>::KeyValuePair>", + "name" : "google::protobuf::Map, Value>::InnerMap::iterator_base, Value>::KeyValuePair>", + "record_kind" : "class", +- "referenced_type" : "type-7493", +- "self_type" : "type-7493", ++ "referenced_type" : "type-7445", ++ "self_type" : "type-7445", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-7209" ], ++ "template_args" : [ "type-7161" ], + "unique_id" : "_ZTSN6google8protobuf3MapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS0_5ValueEE8InnerMap13iterator_baseINSA_12KeyValuePairEEE" + }, + { +@@ -204776,20 +204818,20 @@ + { + "access" : "private", + "field_name" : "k_", +- "referenced_type" : "type-7210" ++ "referenced_type" : "type-7162" + }, + { + "access" : "private", + "field_name" : "v_", + "field_offset" : 96, +- "referenced_type" : "type-7211" ++ "referenced_type" : "type-7163" + } + ], + "linker_set_key" : "google::protobuf::Map, Value>::KeyValuePair", + "name" : "google::protobuf::Map, Value>::KeyValuePair", + "record_kind" : "class", +- "referenced_type" : "type-7209", +- "self_type" : "type-7209", ++ "referenced_type" : "type-7161", ++ "self_type" : "type-7161", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", + "unique_id" : "_ZTSN6google8protobuf3MapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS0_5ValueEE12KeyValuePairE" +@@ -204798,41 +204840,41 @@ + "alignment" : 1, + "linker_set_key" : "google::protobuf::Map, Value>::MapAllocator::rebind, Value>::InnerMap::Node>", + "name" : "google::protobuf::Map, Value>::MapAllocator::rebind, Value>::InnerMap::Node>", +- "referenced_type" : "type-7425", +- "self_type" : "type-7425", ++ "referenced_type" : "type-7377", ++ "self_type" : "type-7377", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-7426" ], ++ "template_args" : [ "type-7378" ], + "unique_id" : "_ZTSN6google8protobuf3MapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS0_5ValueEE12MapAllocatorINSA_12KeyValuePairEE6rebindINSA_8InnerMap4NodeEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "google::protobuf::Map, Value>::MapAllocator::rebind, std::allocator > *>", + "name" : "google::protobuf::Map, Value>::MapAllocator::rebind, std::allocator > *>", +- "referenced_type" : "type-7422", +- "self_type" : "type-7422", ++ "referenced_type" : "type-7374", ++ "self_type" : "type-7374", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-7292" ], ++ "template_args" : [ "type-7244" ], + "unique_id" : "_ZTSN6google8protobuf3MapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS0_5ValueEE12MapAllocatorINSA_12KeyValuePairEE6rebindIPS8_EE" + }, + { + "alignment" : 1, + "linker_set_key" : "google::protobuf::Map, Value>::MapAllocator::rebind, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > >", + "name" : "google::protobuf::Map, Value>::MapAllocator::rebind, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > >", +- "referenced_type" : "type-7423", +- "self_type" : "type-7423", ++ "referenced_type" : "type-7375", ++ "self_type" : "type-7375", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-7424" ], ++ "template_args" : [ "type-7376" ], + "unique_id" : "_ZTSN6google8protobuf3MapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS0_5ValueEE12MapAllocatorINSA_12KeyValuePairEE6rebindINS2_3setIPS8_NSA_8InnerMap10KeyCompareENSB_ISG_EEEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "google::protobuf::Map, Value>::MapAllocator::rebind", + "name" : "google::protobuf::Map, Value>::MapAllocator::rebind", +- "referenced_type" : "type-7428", +- "self_type" : "type-7428", ++ "referenced_type" : "type-7380", ++ "self_type" : "type-7380", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", + "template_args" : [ "type-201" ], +@@ -204842,44 +204884,44 @@ + "alignment" : 1, + "linker_set_key" : "google::protobuf::Map, Value>::MapAllocator<__tree_node<__value_type, MapPair, Value> *>, void *> >::rebind >", + "name" : "google::protobuf::Map, Value>::MapAllocator<__tree_node<__value_type, MapPair, Value> *>, void *> >::rebind >", +- "referenced_type" : "type-7452", +- "self_type" : "type-7452", ++ "referenced_type" : "type-7404", ++ "self_type" : "type-7404", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-7453" ], ++ "template_args" : [ "type-7405" ], + "unique_id" : "_ZTSN6google8protobuf3MapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS0_5ValueEE12MapAllocatorINS2_11__tree_nodeINS2_12__value_typeIS8_PNS0_7MapPairIS8_S9_EEEEPvEEE6rebindINS2_16__tree_node_baseISI_EEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "google::protobuf::Map, Value>::MapAllocator<__tree_node *, void *> >::rebind >", + "name" : "google::protobuf::Map, Value>::MapAllocator<__tree_node *, void *> >::rebind >", +- "referenced_type" : "type-7467", +- "self_type" : "type-7467", ++ "referenced_type" : "type-7419", ++ "self_type" : "type-7419", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-7468" ], ++ "template_args" : [ "type-7420" ], + "unique_id" : "_ZTSN6google8protobuf3MapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS0_5ValueEE12MapAllocatorINS2_11__tree_nodeIPS8_PvEEE6rebindINS2_16__tree_node_baseISE_EEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "google::protobuf::Map, Value>::MapAllocator<__value_type, MapPair, Value> *> >::rebind, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> >", + "name" : "google::protobuf::Map, Value>::MapAllocator<__value_type, MapPair, Value> *> >::rebind, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> >", +- "referenced_type" : "type-7439", +- "self_type" : "type-7439", ++ "referenced_type" : "type-7391", ++ "self_type" : "type-7391", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-7440" ], ++ "template_args" : [ "type-7392" ], + "unique_id" : "_ZTSN6google8protobuf3MapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS0_5ValueEE12MapAllocatorINS2_12__value_typeIS8_PNS0_7MapPairIS8_S9_EEEEE6rebindINS2_11__tree_nodeISG_PvEEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "google::protobuf::Map, Value>::MapAllocator *>::rebind, std::allocator > *, void *> >", + "name" : "google::protobuf::Map, Value>::MapAllocator *>::rebind, std::allocator > *, void *> >", +- "referenced_type" : "type-7434", +- "self_type" : "type-7434", ++ "referenced_type" : "type-7386", ++ "self_type" : "type-7386", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-7435" ], ++ "template_args" : [ "type-7387" ], + "unique_id" : "_ZTSN6google8protobuf3MapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS0_5ValueEE12MapAllocatorIPS8_E6rebindINS2_11__tree_nodeISC_PvEEEE" + }, + { +@@ -204895,11 +204937,11 @@ + "linker_set_key" : "google::protobuf::Map, Value>::MapAllocator, Value>::InnerMap::Node>", + "name" : "google::protobuf::Map, Value>::MapAllocator, Value>::InnerMap::Node>", + "record_kind" : "class", +- "referenced_type" : "type-7478", +- "self_type" : "type-7478", ++ "referenced_type" : "type-7430", ++ "self_type" : "type-7430", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-7426" ], ++ "template_args" : [ "type-7378" ], + "unique_id" : "_ZTSN6google8protobuf3MapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS0_5ValueEE12MapAllocatorINSA_8InnerMap4NodeEEE" + }, + { +@@ -204915,22 +204957,22 @@ + "linker_set_key" : "google::protobuf::Map, Value>::MapAllocator, Value>::KeyValuePair>", + "name" : "google::protobuf::Map, Value>::MapAllocator, Value>::KeyValuePair>", + "record_kind" : "class", +- "referenced_type" : "type-7207", +- "self_type" : "type-7207", ++ "referenced_type" : "type-7159", ++ "self_type" : "type-7159", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-7209" ], ++ "template_args" : [ "type-7161" ], + "unique_id" : "_ZTSN6google8protobuf3MapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS0_5ValueEE12MapAllocatorINSA_12KeyValuePairEEE" + }, + { + "alignment" : 1, + "linker_set_key" : "google::protobuf::Map, Value>::MapAllocator, MapPair, Value> *> >::rebind, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *> >", + "name" : "google::protobuf::Map, Value>::MapAllocator, MapPair, Value> *> >::rebind, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *> >", +- "referenced_type" : "type-7430", +- "self_type" : "type-7430", ++ "referenced_type" : "type-7382", ++ "self_type" : "type-7382", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-7431" ], ++ "template_args" : [ "type-7383" ], + "unique_id" : "_ZTSN6google8protobuf3MapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS0_5ValueEE12MapAllocatorINS2_4pairIKS8_PNS0_7MapPairIS8_S9_EEEEE6rebindINS2_12__value_typeIS8_SG_EEEE" + }, + { +@@ -204946,11 +204988,11 @@ + "linker_set_key" : "google::protobuf::Map, Value>::MapAllocator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> >", + "name" : "google::protobuf::Map, Value>::MapAllocator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *>, void *> >", + "record_kind" : "class", +- "referenced_type" : "type-7441", +- "self_type" : "type-7441", ++ "referenced_type" : "type-7393", ++ "self_type" : "type-7393", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-7442" ], ++ "template_args" : [ "type-7394" ], + "unique_id" : "_ZTSN6google8protobuf3MapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS0_5ValueEE12MapAllocatorINS2_11__tree_nodeINS2_12__value_typeIS8_PNS0_7MapPairIS8_S9_EEEEPvEEEE" + }, + { +@@ -204966,11 +205008,11 @@ + "linker_set_key" : "google::protobuf::Map, Value>::MapAllocator, std::allocator > *, void *> >", + "name" : "google::protobuf::Map, Value>::MapAllocator, std::allocator > *, void *> >", + "record_kind" : "class", +- "referenced_type" : "type-7457", +- "self_type" : "type-7457", ++ "referenced_type" : "type-7409", ++ "self_type" : "type-7409", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-7458" ], ++ "template_args" : [ "type-7410" ], + "unique_id" : "_ZTSN6google8protobuf3MapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS0_5ValueEE12MapAllocatorINS2_11__tree_nodeIPS8_PvEEEE" + }, + { +@@ -204986,11 +205028,11 @@ + "linker_set_key" : "google::protobuf::Map, Value>::MapAllocator >", + "name" : "google::protobuf::Map, Value>::MapAllocator >", + "record_kind" : "class", +- "referenced_type" : "type-7455", +- "self_type" : "type-7455", ++ "referenced_type" : "type-7407", ++ "self_type" : "type-7407", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-7456" ], ++ "template_args" : [ "type-7408" ], + "unique_id" : "_ZTSN6google8protobuf3MapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS0_5ValueEE12MapAllocatorINS2_16__tree_node_baseIPvEEEE" + }, + { +@@ -205006,11 +205048,11 @@ + "linker_set_key" : "google::protobuf::Map, Value>::MapAllocator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *> >", + "name" : "google::protobuf::Map, Value>::MapAllocator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *> >", + "record_kind" : "class", +- "referenced_type" : "type-7436", +- "self_type" : "type-7436", ++ "referenced_type" : "type-7388", ++ "self_type" : "type-7388", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-7437" ], ++ "template_args" : [ "type-7389" ], + "unique_id" : "_ZTSN6google8protobuf3MapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS0_5ValueEE12MapAllocatorINS2_12__value_typeIS8_PNS0_7MapPairIS8_S9_EEEEEE" + }, + { +@@ -205026,11 +205068,11 @@ + "linker_set_key" : "google::protobuf::Map, Value>::MapAllocator, std::allocator > *>", + "name" : "google::protobuf::Map, Value>::MapAllocator, std::allocator > *>", + "record_kind" : "class", +- "referenced_type" : "type-7432", +- "self_type" : "type-7432", ++ "referenced_type" : "type-7384", ++ "self_type" : "type-7384", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-7292" ], ++ "template_args" : [ "type-7244" ], + "unique_id" : "_ZTSN6google8protobuf3MapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS0_5ValueEE12MapAllocatorIPS8_EE" + }, + { +@@ -205046,11 +205088,11 @@ + "linker_set_key" : "google::protobuf::Map, Value>::MapAllocator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *> >", + "name" : "google::protobuf::Map, Value>::MapAllocator, std::allocator >, google::protobuf::MapPair, std::allocator >, google::protobuf::Value> *> >", + "record_kind" : "class", +- "referenced_type" : "type-7242", +- "self_type" : "type-7242", ++ "referenced_type" : "type-7194", ++ "self_type" : "type-7194", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-7243" ], ++ "template_args" : [ "type-7195" ], + "unique_id" : "_ZTSN6google8protobuf3MapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS0_5ValueEE12MapAllocatorINS2_4pairIKS8_PNS0_7MapPairIS8_S9_EEEEEE" + }, + { +@@ -205066,11 +205108,11 @@ + "linker_set_key" : "google::protobuf::Map, Value>::MapAllocator, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > >", + "name" : "google::protobuf::Map, Value>::MapAllocator, std::allocator > *, google::protobuf::Map, Value>::InnerMap::KeyCompare, google::protobuf::Map, Value>::MapAllocator, std::allocator > *> > >", + "record_kind" : "class", +- "referenced_type" : "type-7469", +- "self_type" : "type-7469", ++ "referenced_type" : "type-7421", ++ "self_type" : "type-7421", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-7470" ], ++ "template_args" : [ "type-7422" ], + "unique_id" : "_ZTSN6google8protobuf3MapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS0_5ValueEE12MapAllocatorINS2_3setIPS8_NSA_8InnerMap10KeyCompareENSB_ISD_EEEEEE" + }, + { +@@ -205086,8 +205128,8 @@ + "linker_set_key" : "google::protobuf::Map, Value>::MapAllocator", + "name" : "google::protobuf::Map, Value>::MapAllocator", + "record_kind" : "class", +- "referenced_type" : "type-7482", +- "self_type" : "type-7482", ++ "referenced_type" : "type-7434", ++ "self_type" : "type-7434", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", + "template_args" : [ "type-201" ], +@@ -205099,10 +205141,10 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-7513" ++ "referenced_type" : "type-7465" + }, + { +- "referenced_type" : "type-7521" ++ "referenced_type" : "type-7473" + } + ], + "fields" : +@@ -205111,20 +205153,20 @@ + "access" : "private", + "field_name" : "it_", + "field_offset" : 32, +- "referenced_type" : "type-7502" ++ "referenced_type" : "type-7454" + }, + { + "access" : "private", + "field_name" : "dit_", + "field_offset" : 160, +- "referenced_type" : "type-7520" ++ "referenced_type" : "type-7472" + } + ], + "linker_set_key" : "google::protobuf::Map, Value>::const_iterator", + "name" : "google::protobuf::Map, Value>::const_iterator", + "record_kind" : "class", +- "referenced_type" : "type-7519", +- "self_type" : "type-7519", ++ "referenced_type" : "type-7471", ++ "self_type" : "type-7471", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", + "unique_id" : "_ZTSN6google8protobuf3MapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS0_5ValueEE14const_iteratorE" +@@ -205135,10 +205177,10 @@ + [ + { + "access" : "private", +- "referenced_type" : "type-7513" ++ "referenced_type" : "type-7465" + }, + { +- "referenced_type" : "type-7535" ++ "referenced_type" : "type-7487" + } + ], + "fields" : +@@ -205147,20 +205189,20 @@ + "access" : "private", + "field_name" : "it_", + "field_offset" : 32, +- "referenced_type" : "type-7493" ++ "referenced_type" : "type-7445" + }, + { + "access" : "private", + "field_name" : "dit_", + "field_offset" : 160, +- "referenced_type" : "type-7534" ++ "referenced_type" : "type-7486" + } + ], + "linker_set_key" : "google::protobuf::Map, Value>::iterator", + "name" : "google::protobuf::Map, Value>::iterator", + "record_kind" : "class", +- "referenced_type" : "type-7533", +- "self_type" : "type-7533", ++ "referenced_type" : "type-7485", ++ "self_type" : "type-7485", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", + "unique_id" : "_ZTSN6google8protobuf3MapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS0_5ValueEE8iteratorE" +@@ -205172,14 +205214,14 @@ + { + "access" : "private", + "field_name" : "iterator_style_", +- "referenced_type" : "type-7514" ++ "referenced_type" : "type-7466" + } + ], + "linker_set_key" : "google::protobuf::Map, Value>::iterator_base", + "name" : "google::protobuf::Map, Value>::iterator_base", + "record_kind" : "class", +- "referenced_type" : "type-7513", +- "self_type" : "type-7513", ++ "referenced_type" : "type-7465", ++ "self_type" : "type-7465", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", + "unique_id" : "_ZTSN6google8protobuf3MapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS0_5ValueEE13iterator_baseE" +@@ -205208,17 +205250,17 @@ + { + "access" : "private", + "field_offset" : 96, +- "referenced_type" : "type-4278" ++ "referenced_type" : "type-4230" + } + ], + "linker_set_key" : "google::protobuf::Map", + "name" : "google::protobuf::Map", + "record_kind" : "class", +- "referenced_type" : "type-4277", +- "self_type" : "type-4277", ++ "referenced_type" : "type-4229", ++ "self_type" : "type-4229", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-4256", "type-4244" ], ++ "template_args" : [ "type-4208", "type-4196" ], + "unique_id" : "_ZTSN6google8protobuf3MapINS0_6MapKeyENS0_11MapValueRefEEE" + }, + { +@@ -205245,17 +205287,17 @@ + { + "access" : "private", + "field_offset" : 96, +- "referenced_type" : "type-7203" ++ "referenced_type" : "type-7155" + } + ], + "linker_set_key" : "google::protobuf::Map, std::allocator >, google::protobuf::Value>", + "name" : "google::protobuf::Map, std::allocator >, google::protobuf::Value>", + "record_kind" : "class", +- "referenced_type" : "type-7201", +- "self_type" : "type-7201", ++ "referenced_type" : "type-7153", ++ "self_type" : "type-7153", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-7244", "type-7215" ], ++ "template_args" : [ "type-7196", "type-7167" ], + "unique_id" : "_ZTSN6google8protobuf3MapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS0_5ValueEEE" + }, + { +@@ -205271,26 +205313,26 @@ + "access" : "private", + "field_name" : "map_", + "field_offset" : 32, +- "referenced_type" : "type-4285" ++ "referenced_type" : "type-4237" + }, + { + "access" : "private", + "field_name" : "key_", + "field_offset" : 64, +- "referenced_type" : "type-4256" ++ "referenced_type" : "type-4208" + }, + { + "access" : "private", + "field_name" : "value_", + "field_offset" : 192, +- "referenced_type" : "type-4244" ++ "referenced_type" : "type-4196" + } + ], + "linker_set_key" : "google::protobuf::MapIterator", + "name" : "google::protobuf::MapIterator", + "record_kind" : "class", +- "referenced_type" : "type-4284", +- "self_type" : "type-4284", ++ "referenced_type" : "type-4236", ++ "self_type" : "type-4236", + "size" : 32, + "source_file" : "/external/protobuf/src/google/protobuf/map_field.h", + "unique_id" : "_ZTSN6google8protobuf11MapIteratorE" +@@ -205302,7 +205344,7 @@ + { + "access" : "private", + "field_name" : "val_", +- "referenced_type" : "type-4257" ++ "referenced_type" : "type-4209" + }, + { + "access" : "private", +@@ -205314,8 +205356,8 @@ + "linker_set_key" : "google::protobuf::MapKey", + "name" : "google::protobuf::MapKey", + "record_kind" : "class", +- "referenced_type" : "type-4256", +- "self_type" : "type-4256", ++ "referenced_type" : "type-4208", ++ "self_type" : "type-4208", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", + "unique_id" : "_ZTSN6google8protobuf6MapKeyE" +@@ -205327,7 +205369,7 @@ + [ + { + "field_name" : "string_value_", +- "referenced_type" : "type-4258" ++ "referenced_type" : "type-4210" + }, + { + "field_name" : "int64_value_", +@@ -205353,8 +205395,8 @@ + "linker_set_key" : "google::protobuf::MapKey::KeyValue", + "name" : "google::protobuf::MapKey::KeyValue", + "record_kind" : "union", +- "referenced_type" : "type-4257", +- "self_type" : "type-4257", ++ "referenced_type" : "type-4209", ++ "self_type" : "type-4209", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", + "unique_id" : "_ZTSN6google8protobuf6MapKey8KeyValueE" +@@ -205365,22 +205407,22 @@ + [ + { + "field_name" : "first", +- "referenced_type" : "type-4359" ++ "referenced_type" : "type-4311" + }, + { + "field_name" : "second", + "field_offset" : 128, +- "referenced_type" : "type-4244" ++ "referenced_type" : "type-4196" + } + ], + "linker_set_key" : "google::protobuf::MapPair", + "name" : "google::protobuf::MapPair", + "record_kind" : "class", +- "referenced_type" : "type-6507", +- "self_type" : "type-6507", ++ "referenced_type" : "type-6459", ++ "self_type" : "type-6459", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-4256", "type-4244" ], ++ "template_args" : [ "type-4208", "type-4196" ], + "unique_id" : "_ZTSN6google8protobuf7MapPairINS0_6MapKeyENS0_11MapValueRefEEE" + }, + { +@@ -205389,22 +205431,22 @@ + [ + { + "field_name" : "first", +- "referenced_type" : "type-7213" ++ "referenced_type" : "type-7165" + }, + { + "field_name" : "second", + "field_offset" : 128, +- "referenced_type" : "type-7215" ++ "referenced_type" : "type-7167" + } + ], + "linker_set_key" : "google::protobuf::MapPair, std::allocator >, google::protobuf::Value>", + "name" : "google::protobuf::MapPair, std::allocator >, google::protobuf::Value>", + "record_kind" : "class", +- "referenced_type" : "type-7212", +- "self_type" : "type-7212", ++ "referenced_type" : "type-7164", ++ "self_type" : "type-7164", + "size" : 48, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", +- "template_args" : [ "type-7236", "type-7215" ], ++ "template_args" : [ "type-7188", "type-7167" ], + "unique_id" : "_ZTSN6google8protobuf7MapPairINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS0_5ValueEEE" + }, + { +@@ -205426,8 +205468,8 @@ + "linker_set_key" : "google::protobuf::MapValueRef", + "name" : "google::protobuf::MapValueRef", + "record_kind" : "class", +- "referenced_type" : "type-4244", +- "self_type" : "type-4244", ++ "referenced_type" : "type-4196", ++ "self_type" : "type-4196", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/map.h", + "unique_id" : "_ZTSN6google8protobuf11MapValueRefE" +@@ -205580,8 +205622,8 @@ + "linker_set_key" : "google::protobuf::MathUtil", + "name" : "google::protobuf::MathUtil", + "record_kind" : "class", +- "referenced_type" : "type-14811", +- "self_type" : "type-14811", ++ "referenced_type" : "type-14763", ++ "self_type" : "type-14763", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/stubs/mathutil.h", + "unique_id" : "_ZTSN6google8protobuf8MathUtilE" +@@ -205591,7 +205633,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-3744" ++ "referenced_type" : "type-3696" + } + ], + "fields" : +@@ -205600,14 +205642,14 @@ + "access" : "private", + "field_name" : "sources_", + "field_offset" : 32, +- "referenced_type" : "type-3766" ++ "referenced_type" : "type-3718" + } + ], + "linker_set_key" : "google::protobuf::MergedDescriptorDatabase", + "name" : "google::protobuf::MergedDescriptorDatabase", + "record_kind" : "class", +- "referenced_type" : "type-3765", +- "self_type" : "type-3765", ++ "referenced_type" : "type-3717", ++ "self_type" : "type-3717", + "size" : 16, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor_database.h", + "unique_id" : "_ZTSN6google8protobuf24MergedDescriptorDatabaseE", +@@ -205653,8 +205695,8 @@ + "linker_set_key" : "google::protobuf::Message", + "name" : "google::protobuf::Message", + "record_kind" : "class", +- "referenced_type" : "type-1686", +- "self_type" : "type-1686", ++ "referenced_type" : "type-1600", ++ "self_type" : "type-1600", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h", + "unique_id" : "_ZTSN6google8protobuf7MessageE", +@@ -205748,8 +205790,8 @@ + "linker_set_key" : "google::protobuf::MessageFactory", + "name" : "google::protobuf::MessageFactory", + "record_kind" : "class", +- "referenced_type" : "type-2152", +- "self_type" : "type-2152", ++ "referenced_type" : "type-2083", ++ "self_type" : "type-2083", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h", + "unique_id" : "_ZTSN6google8protobuf14MessageFactoryE", +@@ -205861,7 +205903,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -205876,7 +205918,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 160, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -205894,7 +205936,7 @@ + "access" : "private", + "field_name" : "uninterpreted_option_", + "field_offset" : 256, +- "referenced_type" : "type-1682" ++ "referenced_type" : "type-1596" + }, + { + "access" : "private", +@@ -205924,8 +205966,8 @@ + "linker_set_key" : "google::protobuf::MessageOptions", + "name" : "google::protobuf::MessageOptions", + "record_kind" : "class", +- "referenced_type" : "type-1700", +- "self_type" : "type-1700", ++ "referenced_type" : "type-1614", ++ "self_type" : "type-1614", + "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h", + "unique_id" : "_ZTSN6google8protobuf14MessageOptionsE", +@@ -206017,18 +206059,18 @@ + [ + { + "field_name" : "descriptor", +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { + "field_name" : "reflection", + "field_offset" : 32, +- "referenced_type" : "type-2140" ++ "referenced_type" : "type-2071" + } + ], + "linker_set_key" : "google::protobuf::Metadata", + "name" : "google::protobuf::Metadata", +- "referenced_type" : "type-2139", +- "self_type" : "type-2139", ++ "referenced_type" : "type-2070", ++ "self_type" : "type-2070", + "size" : 8, + "source_file" : "/external/protobuf/src/google/protobuf/message.h", + "unique_id" : "_ZTSN6google8protobuf8MetadataE" +@@ -206038,7 +206080,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -206047,7 +206089,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -206095,7 +206137,7 @@ + "access" : "private", + "field_name" : "options_", + "field_offset" : 256, +- "referenced_type" : "type-2285" ++ "referenced_type" : "type-2214" + }, + { + "access" : "private", +@@ -206107,8 +206149,8 @@ + "linker_set_key" : "google::protobuf::Method", + "name" : "google::protobuf::Method", + "record_kind" : "class", +- "referenced_type" : "type-2284", +- "self_type" : "type-2284", ++ "referenced_type" : "type-2213", ++ "self_type" : "type-2213", + "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/api.pb.h", + "unique_id" : "_ZTSN6google8protobuf6MethodE", +@@ -206201,37 +206243,37 @@ + { + "access" : "private", + "field_name" : "name_", +- "referenced_type" : "type-1934" ++ "referenced_type" : "type-1857" + }, + { + "access" : "private", + "field_name" : "full_name_", + "field_offset" : 32, +- "referenced_type" : "type-1934" ++ "referenced_type" : "type-1857" + }, + { + "access" : "private", + "field_name" : "service_", + "field_offset" : 64, +- "referenced_type" : "type-1990" ++ "referenced_type" : "type-1916" + }, + { + "access" : "private", + "field_name" : "input_type_", + "field_offset" : 96, +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { + "access" : "private", + "field_name" : "output_type_", + "field_offset" : 128, +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { + "access" : "private", + "field_name" : "options_", + "field_offset" : 160, +- "referenced_type" : "type-1992" ++ "referenced_type" : "type-1918" + }, + { + "access" : "private", +@@ -206249,8 +206291,8 @@ + "linker_set_key" : "google::protobuf::MethodDescriptor", + "name" : "google::protobuf::MethodDescriptor", + "record_kind" : "class", +- "referenced_type" : "type-1989", +- "self_type" : "type-1989", ++ "referenced_type" : "type-1915", ++ "self_type" : "type-1915", + "size" : 28, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h", + "unique_id" : "_ZTSN6google8protobuf16MethodDescriptorE" +@@ -206260,7 +206302,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -206269,7 +206311,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -206305,7 +206347,7 @@ + "access" : "private", + "field_name" : "options_", + "field_offset" : 224, +- "referenced_type" : "type-1707" ++ "referenced_type" : "type-1621" + }, + { + "access" : "private", +@@ -206323,8 +206365,8 @@ + "linker_set_key" : "google::protobuf::MethodDescriptorProto", + "name" : "google::protobuf::MethodDescriptorProto", + "record_kind" : "class", +- "referenced_type" : "type-1706", +- "self_type" : "type-1706", ++ "referenced_type" : "type-1620", ++ "self_type" : "type-1620", + "size" : 36, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h", + "unique_id" : "_ZTSN6google8protobuf21MethodDescriptorProtoE", +@@ -206415,7 +206457,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -206430,7 +206472,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 160, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -206448,7 +206490,7 @@ + "access" : "private", + "field_name" : "uninterpreted_option_", + "field_offset" : 256, +- "referenced_type" : "type-1682" ++ "referenced_type" : "type-1596" + }, + { + "access" : "private", +@@ -206460,8 +206502,8 @@ + "linker_set_key" : "google::protobuf::MethodOptions", + "name" : "google::protobuf::MethodOptions", + "record_kind" : "class", +- "referenced_type" : "type-1708", +- "self_type" : "type-1708", ++ "referenced_type" : "type-1622", ++ "self_type" : "type-1622", + "size" : 52, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h", + "unique_id" : "_ZTSN6google8protobuf13MethodOptionsE", +@@ -206552,7 +206594,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -206561,7 +206603,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -206591,8 +206633,8 @@ + "linker_set_key" : "google::protobuf::Mixin", + "name" : "google::protobuf::Mixin", + "record_kind" : "class", +- "referenced_type" : "type-2288", +- "self_type" : "type-2288", ++ "referenced_type" : "type-2217", ++ "self_type" : "type-2217", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/api.pb.h", + "unique_id" : "_ZTSN6google8protobuf5MixinE", +@@ -206685,19 +206727,19 @@ + { + "access" : "private", + "field_name" : "name_", +- "referenced_type" : "type-1934" ++ "referenced_type" : "type-1857" + }, + { + "access" : "private", + "field_name" : "full_name_", + "field_offset" : 32, +- "referenced_type" : "type-1934" ++ "referenced_type" : "type-1857" + }, + { + "access" : "private", + "field_name" : "containing_type_", + "field_offset" : 64, +- "referenced_type" : "type-1974" ++ "referenced_type" : "type-1900" + }, + { + "access" : "private", +@@ -206715,14 +206757,14 @@ + "access" : "private", + "field_name" : "fields_", + "field_offset" : 160, +- "referenced_type" : "type-2002" ++ "referenced_type" : "type-1928" + } + ], + "linker_set_key" : "google::protobuf::OneofDescriptor", + "name" : "google::protobuf::OneofDescriptor", + "record_kind" : "class", +- "referenced_type" : "type-2001", +- "self_type" : "type-2001", ++ "referenced_type" : "type-1927", ++ "self_type" : "type-1927", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.h", + "unique_id" : "_ZTSN6google8protobuf15OneofDescriptorE" +@@ -206732,7 +206774,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -206741,7 +206783,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -206765,8 +206807,8 @@ + "linker_set_key" : "google::protobuf::OneofDescriptorProto", + "name" : "google::protobuf::OneofDescriptorProto", + "record_kind" : "class", +- "referenced_type" : "type-1698", +- "self_type" : "type-1698", ++ "referenced_type" : "type-1612", ++ "self_type" : "type-1612", + "size" : 20, + "source_file" : "/external/protobuf/src/google/protobuf/descriptor.pb.h", + "unique_id" : "_ZTSN6google8protobuf20OneofDescriptorProtoE", +@@ -206857,7 +206899,7 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1686" ++ "referenced_type" : "type-1600" + } + ], + "fields" : +@@ -206866,7 +206908,7 @@ + "access" : "private", + "field_name" : "_internal_metadata_", + "field_offset" : 32, +- "referenced_type" : "type-1675" ++ "referenced_type" : "type-1588" + }, + { + "access" : "private", +@@ -206884,7 +206926,7 @@ + "access" : "private", + "field_name" : "value_", + "field_offset" : 128, +- "referenced_type" : "type-1845" ++ "referenced_type" : "type-1758" + }, + { + "access" : "private", +@@ -206896,8 +206938,8 @@ + "linker_set_key" : "google::protobuf::Option", + "name" : "google::protobuf::Option", + "record_kind" : "class", +- "referenced_type" : "type-2286", +- "self_type" : "type-2286", ++ "referenced_type" : "type-2215", ++ "self_type" : "type-2215", + "size" : 24, + "source_file" : "/external/protobuf/src/google/protobuf/type.pb.h", + "unique_id" : "_ZTSN6google8protobuf6OptionE", +@@ -206988,8 +207030,8 @@ + "linker_set_key" : "google::protobuf::Reflection", + "name" : "google::protobuf::Reflection", + "record_kind" : "class", +- "referenced_type" : "type-2142", +- "self_type" : "type-2142", ++ "referenced_type" : "type-2073", ++ "self_type" : "type-2073", + "size" : 4, + "source_file" : "/external/protobuf/src/google/protobuf/message.h", + "unique_id" : "_ZTSN6google8protobuf10ReflectionE", +@@ -207742,14 +207784,14 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1877" ++ "referenced_type" : "type-1795" + } + ], + "linker_set_key" : "google::protobuf::RepeatedPtrField::TypeHandler", + "name" : "google::protobuf::RepeatedPtrField::TypeHandler", + "record_kind" : "class", +- "referenced_type" : "type-2072", +- "self_type" : "type-2072", ++ "referenced_type" : "type-2004", ++ "self_type" : "type-2004", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h", + "unique_id" : "_ZTSN6google8protobuf16RepeatedPtrFieldINS0_15DescriptorProtoEE11TypeHandlerE" +@@ -207760,14 +207802,14 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1893" ++ "referenced_type" : "type-1812" + } + ], + "linker_set_key" : "google::protobuf::RepeatedPtrField::TypeHandler", + "name" : "google::protobuf::RepeatedPtrField::TypeHandler", + "record_kind" : "class", +- "referenced_type" : "type-2093", +- "self_type" : "type-2093", ++ "referenced_type" : "type-2026", ++ "self_type" : "type-2026", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h", + "unique_id" : "_ZTSN6google8protobuf16RepeatedPtrFieldINS0_30DescriptorProto_ExtensionRangeEE11TypeHandlerE" +@@ -207778,14 +207820,14 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1901" ++ "referenced_type" : "type-1820" + } + ], + "linker_set_key" : "google::protobuf::RepeatedPtrField::TypeHandler", + "name" : "google::protobuf::RepeatedPtrField::TypeHandler", + "record_kind" : "class", +- "referenced_type" : "type-2103", +- "self_type" : "type-2103", ++ "referenced_type" : "type-2036", ++ "self_type" : "type-2036", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h", + "unique_id" : "_ZTSN6google8protobuf16RepeatedPtrFieldINS0_29DescriptorProto_ReservedRangeEE11TypeHandlerE" +@@ -207796,14 +207838,14 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1881" ++ "referenced_type" : "type-1799" + } + ], + "linker_set_key" : "google::protobuf::RepeatedPtrField::TypeHandler", + "name" : "google::protobuf::RepeatedPtrField::TypeHandler", + "record_kind" : "class", +- "referenced_type" : "type-2077", +- "self_type" : "type-2077", ++ "referenced_type" : "type-2010", ++ "self_type" : "type-2010", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h", + "unique_id" : "_ZTSN6google8protobuf16RepeatedPtrFieldINS0_19EnumDescriptorProtoEE11TypeHandlerE" +@@ -207814,14 +207856,14 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2371" ++ "referenced_type" : "type-2299" + } + ], + "linker_set_key" : "google::protobuf::RepeatedPtrField::TypeHandler", + "name" : "google::protobuf::RepeatedPtrField::TypeHandler", + "record_kind" : "class", +- "referenced_type" : "type-2422", +- "self_type" : "type-2422", ++ "referenced_type" : "type-2352", ++ "self_type" : "type-2352", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h", + "unique_id" : "_ZTSN6google8protobuf16RepeatedPtrFieldINS0_9EnumValueEE11TypeHandlerE" +@@ -207832,14 +207874,14 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1905" ++ "referenced_type" : "type-1824" + } + ], + "linker_set_key" : "google::protobuf::RepeatedPtrField::TypeHandler", + "name" : "google::protobuf::RepeatedPtrField::TypeHandler", + "record_kind" : "class", +- "referenced_type" : "type-2109", +- "self_type" : "type-2109", ++ "referenced_type" : "type-2042", ++ "self_type" : "type-2042", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h", + "unique_id" : "_ZTSN6google8protobuf16RepeatedPtrFieldINS0_24EnumValueDescriptorProtoEE11TypeHandlerE" +@@ -207850,14 +207892,14 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2362" ++ "referenced_type" : "type-2290" + } + ], + "linker_set_key" : "google::protobuf::RepeatedPtrField::TypeHandler", + "name" : "google::protobuf::RepeatedPtrField::TypeHandler", + "record_kind" : "class", +- "referenced_type" : "type-2409", +- "self_type" : "type-2409", ++ "referenced_type" : "type-2341", ++ "self_type" : "type-2341", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h", + "unique_id" : "_ZTSN6google8protobuf16RepeatedPtrFieldINS0_5FieldEE11TypeHandlerE" +@@ -207868,14 +207910,14 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1889" ++ "referenced_type" : "type-1808" + } + ], + "linker_set_key" : "google::protobuf::RepeatedPtrField::TypeHandler", + "name" : "google::protobuf::RepeatedPtrField::TypeHandler", + "record_kind" : "class", +- "referenced_type" : "type-2087", +- "self_type" : "type-2087", ++ "referenced_type" : "type-2020", ++ "self_type" : "type-2020", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h", + "unique_id" : "_ZTSN6google8protobuf16RepeatedPtrFieldINS0_20FieldDescriptorProtoEE11TypeHandlerE" +@@ -207886,14 +207928,14 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1873" ++ "referenced_type" : "type-1791" + } + ], + "linker_set_key" : "google::protobuf::RepeatedPtrField::TypeHandler", + "name" : "google::protobuf::RepeatedPtrField::TypeHandler", + "record_kind" : "class", +- "referenced_type" : "type-2066", +- "self_type" : "type-2066", ++ "referenced_type" : "type-1998", ++ "self_type" : "type-1998", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h", + "unique_id" : "_ZTSN6google8protobuf16RepeatedPtrFieldINS0_19FileDescriptorProtoEE11TypeHandlerE" +@@ -207904,14 +207946,14 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1925" ++ "referenced_type" : "type-1846" + } + ], + "linker_set_key" : "google::protobuf::RepeatedPtrField::TypeHandler", + "name" : "google::protobuf::RepeatedPtrField::TypeHandler", + "record_kind" : "class", +- "referenced_type" : "type-2138", +- "self_type" : "type-2138", ++ "referenced_type" : "type-2069", ++ "self_type" : "type-2069", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h", + "unique_id" : "_ZTSN6google8protobuf16RepeatedPtrFieldINS0_28GeneratedCodeInfo_AnnotationEE11TypeHandlerE" +@@ -207922,14 +207964,14 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-7395" ++ "referenced_type" : "type-7347" + } + ], + "linker_set_key" : "google::protobuf::RepeatedPtrField, Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> >::TypeHandler", + "name" : "google::protobuf::RepeatedPtrField, Value, google::protobuf::internal::WireFormatLite::TYPE_STRING, google::protobuf::internal::WireFormatLite::TYPE_MESSAGE, 0> >::TypeHandler", + "record_kind" : "class", +- "referenced_type" : "type-7580", +- "self_type" : "type-7580", ++ "referenced_type" : "type-7532", ++ "self_type" : "type-7532", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h", + "unique_id" : "_ZTSN6google8protobuf16RepeatedPtrFieldINS0_8internal8MapEntryINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS0_5ValueELNS2_14WireFormatLite9FieldTypeE9ELSD_11ELi0EEEE11TypeHandlerE" +@@ -207946,8 +207988,8 @@ + "linker_set_key" : "google::protobuf::RepeatedPtrField::TypeHandler", + "name" : "google::protobuf::RepeatedPtrField::TypeHandler", + "record_kind" : "class", +- "referenced_type" : "type-4358", +- "self_type" : "type-4358", ++ "referenced_type" : "type-4310", ++ "self_type" : "type-4310", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h", + "unique_id" : "_ZTSN6google8protobuf16RepeatedPtrFieldINS0_7MessageEE11TypeHandlerE" +@@ -207994,14 +208036,14 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2375" ++ "referenced_type" : "type-2303" + } + ], + "linker_set_key" : "google::protobuf::RepeatedPtrField::TypeHandler", + "name" : "google::protobuf::RepeatedPtrField::TypeHandler", + "record_kind" : "class", +- "referenced_type" : "type-2427", +- "self_type" : "type-2427", ++ "referenced_type" : "type-2357", ++ "self_type" : "type-2357", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h", + "unique_id" : "_ZTSN6google8protobuf16RepeatedPtrFieldINS0_6MethodEE11TypeHandlerE" +@@ -208012,14 +208054,14 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1909" ++ "referenced_type" : "type-1829" + } + ], + "linker_set_key" : "google::protobuf::RepeatedPtrField::TypeHandler", + "name" : "google::protobuf::RepeatedPtrField::TypeHandler", + "record_kind" : "class", +- "referenced_type" : "type-2114", +- "self_type" : "type-2114", ++ "referenced_type" : "type-2047", ++ "self_type" : "type-2047", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h", + "unique_id" : "_ZTSN6google8protobuf16RepeatedPtrFieldINS0_21MethodDescriptorProtoEE11TypeHandlerE" +@@ -208030,14 +208072,14 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2379" ++ "referenced_type" : "type-2307" + } + ], + "linker_set_key" : "google::protobuf::RepeatedPtrField::TypeHandler", + "name" : "google::protobuf::RepeatedPtrField::TypeHandler", + "record_kind" : "class", +- "referenced_type" : "type-2432", +- "self_type" : "type-2432", ++ "referenced_type" : "type-2362", ++ "self_type" : "type-2362", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h", + "unique_id" : "_ZTSN6google8protobuf16RepeatedPtrFieldINS0_5MixinEE11TypeHandlerE" +@@ -208048,14 +208090,14 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-1897" ++ "referenced_type" : "type-1816" + } + ], + "linker_set_key" : "google::protobuf::RepeatedPtrField::TypeHandler", + "name" : "google::protobuf::RepeatedPtrField::TypeHandler", + "record_kind" : "class", +- "referenced_type" : "type-2098", +- "self_type" : "type-2098", ++ "referenced_type" : "type-2031", ++ "self_type" : "type-2031", + "size" : 1, + "source_file" : "/external/protobuf/src/google/protobuf/repeated_field.h", + "unique_id" : "_ZTSN6google8protobuf16RepeatedPtrFieldINS0_20OneofDescriptorProtoEE11TypeHandlerE" +@@ -208066,14 +208108,14 @@ + "base_specifiers" : + [ + { +- "referenced_type" : "type-2366" ++ "referenced_type" : "type-2294" + } + ], + "linker_set_key" : "google::protobuf::RepeatedPtrField